KVM: PPC: Always use the GPR accessors

iamjpn · mpe · commit 0e85b7df9cb0 · 2023-09-14T22:04:23.000+10:00
Always use the GPR accessor functions. This will be important later for Nested APIv2 support which requires additional functionality for accessing and modifying VCPU state. Signed-off-by: Jordan Niethe <jniethe5@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20230914030600.16993-2-jniethe5@gmail.com
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
@@ -786,12 +786,12 @@ long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn,
 	idx = (ioba >> stt->page_shift) - stt->offset;
 	page = stt->pages[idx / TCES_PER_PAGE];
 	if (!page) {
-		vcpu->arch.regs.gpr[4] = 0;
+		kvmppc_set_gpr(vcpu, 4, 0);
 		return H_SUCCESS;
 	}
 	tbl = (u64 *)page_address(page);
 
-	vcpu->arch.regs.gpr[4] = tbl[idx % TCES_PER_PAGE];
+	kvmppc_set_gpr(vcpu, 4, tbl[idx % TCES_PER_PAGE]);
 
 	return H_SUCCESS;
 }
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
@@ -1267,10 +1267,14 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)
 			return RESUME_HOST;
 		break;
 #endif
-	case H_RANDOM:
-		if (!arch_get_random_seed_longs(&vcpu->arch.regs.gpr[4], 1))
+	case H_RANDOM: {
+		unsigned long rand;
+
+		if (!arch_get_random_seed_longs(&rand, 1))
 			ret = H_HARDWARE;
+		kvmppc_set_gpr(vcpu, 4, rand);
 		break;
+	}
 	case H_RPT_INVALIDATE:
 		ret = kvmppc_h_rpt_invalidate(vcpu, kvmppc_get_gpr(vcpu, 4),
 					      kvmppc_get_gpr(vcpu, 5),
diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -182,9 +182,13 @@ EXPORT_SYMBOL_GPL(kvmppc_hwrng_present);
 
 long kvmppc_rm_h_random(struct kvm_vcpu *vcpu)
 {
+	unsigned long rand;
+
 	if (ppc_md.get_random_seed &&
-	    ppc_md.get_random_seed(&vcpu->arch.regs.gpr[4]))
+	    ppc_md.get_random_seed(&rand)) {
+		kvmppc_set_gpr(vcpu, 4, rand);
 		return H_SUCCESS;
+	}
 
 	return H_HARDWARE;
 }
diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@ -776,8 +776,8 @@ long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,
 			r = rev[i].guest_rpte | (r & (HPTE_R_R | HPTE_R_C));
 			r &= ~HPTE_GR_RESERVED;
 		}
-		vcpu->arch.regs.gpr[4 + i * 2] = v;
-		vcpu->arch.regs.gpr[5 + i * 2] = r;
+		kvmppc_set_gpr(vcpu, 4 + i * 2, v);
+		kvmppc_set_gpr(vcpu, 5 + i * 2, r);
 	}
 	return H_SUCCESS;
 }
@@ -824,7 +824,7 @@ long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags,
 			}
 		}
 	}
-	vcpu->arch.regs.gpr[4] = gr;
+	kvmppc_set_gpr(vcpu, 4, gr);
 	ret = H_SUCCESS;
  out:
 	unlock_hpte(hpte, v & ~HPTE_V_HVLOCK);
@@ -872,7 +872,7 @@ long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags,
 			kvmppc_set_dirty_from_hpte(kvm, v, gr);
 		}
 	}
-	vcpu->arch.regs.gpr[4] = gr;
+	kvmppc_set_gpr(vcpu, 4, gr);
 	ret = H_SUCCESS;
  out:
 	unlock_hpte(hpte, v & ~HPTE_V_HVLOCK);
diff --git a/arch/powerpc/kvm/book3s_hv_rm_xics.c b/arch/powerpc/kvm/book3s_hv_rm_xics.c
@@ -481,7 +481,7 @@ static void icp_rm_down_cppr(struct kvmppc_xics *xics, struct kvmppc_icp *icp,
 
 unsigned long xics_rm_h_xirr_x(struct kvm_vcpu *vcpu)
 {
-	vcpu->arch.regs.gpr[5] = get_tb();
+	kvmppc_set_gpr(vcpu, 5, get_tb());
 	return xics_rm_h_xirr(vcpu);
 }
 
@@ -518,7 +518,7 @@ unsigned long xics_rm_h_xirr(struct kvm_vcpu *vcpu)
 	} while (!icp_rm_try_update(icp, old_state, new_state));
 
 	/* Return the result in GPR4 */
-	vcpu->arch.regs.gpr[4] = xirr;
+	kvmppc_set_gpr(vcpu, 4, xirr);
 
 	return check_too_hard(xics, icp);
 }
diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
@@ -328,7 +328,7 @@ static unsigned long xive_vm_h_xirr(struct kvm_vcpu *vcpu)
 	 */
 
 	/* Return interrupt and old CPPR in GPR4 */
-	vcpu->arch.regs.gpr[4] = hirq | (old_cppr << 24);
+	kvmppc_set_gpr(vcpu, 4, hirq | (old_cppr << 24));
 
 	return H_SUCCESS;
 }
@@ -364,7 +364,7 @@ static unsigned long xive_vm_h_ipoll(struct kvm_vcpu *vcpu, unsigned long server
 	hirq = xive_vm_scan_interrupts(xc, pending, scan_poll);
 
 	/* Return interrupt and old CPPR in GPR4 */
-	vcpu->arch.regs.gpr[4] = hirq | (xc->cppr << 24);
+	kvmppc_set_gpr(vcpu, 4, hirq | (xc->cppr << 24));
 
 	return H_SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -786,12 +786,12 @@ long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn,`
`786`	`786`	`idx = (ioba >> stt->page_shift) - stt->offset;`
`787`	`787`	`page = stt->pages[idx / TCES_PER_PAGE];`
`788`	`788`	`if (!page) {`
`789`		`- vcpu->arch.regs.gpr[4] = 0;`
	`789`	`+ kvmppc_set_gpr(vcpu, 4, 0);`
`790`	`790`	`return H_SUCCESS;`
`791`	`791`	`}`
`792`	`792`	`tbl = (u64 *)page_address(page);`
`793`	`793`
`794`		`- vcpu->arch.regs.gpr[4] = tbl[idx % TCES_PER_PAGE];`
	`794`	`+ kvmppc_set_gpr(vcpu, 4, tbl[idx % TCES_PER_PAGE]);`
`795`	`795`
`796`	`796`	`return H_SUCCESS;`
`797`	`797`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,9 +182,13 @@ EXPORT_SYMBOL_GPL(kvmppc_hwrng_present);`
`182`	`182`
`183`	`183`	`long kvmppc_rm_h_random(struct kvm_vcpu *vcpu)`
`184`	`184`	`{`
	`185`	`+ unsigned long rand;`
	`186`	`+`
`185`	`187`	`if (ppc_md.get_random_seed &&`
`186`		`- ppc_md.get_random_seed(&vcpu->arch.regs.gpr[4]))`
	`188`	`+ ppc_md.get_random_seed(&rand)) {`
	`189`	`+ kvmppc_set_gpr(vcpu, 4, rand);`
`187`	`190`	`return H_SUCCESS;`
	`191`	`+ }`
`188`	`192`
`189`	`193`	`return H_HARDWARE;`
`190`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -776,8 +776,8 @@ long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,`
`776`	`776`	`r = rev[i].guest_rpte \| (r & (HPTE_R_R \| HPTE_R_C));`
`777`	`777`	`r &= ~HPTE_GR_RESERVED;`
`778`	`778`	`}`
`779`		`- vcpu->arch.regs.gpr[4 + i * 2] = v;`
`780`		`- vcpu->arch.regs.gpr[5 + i * 2] = r;`
	`779`	`+ kvmppc_set_gpr(vcpu, 4 + i * 2, v);`
	`780`	`+ kvmppc_set_gpr(vcpu, 5 + i * 2, r);`
`781`	`781`	`}`
`782`	`782`	`return H_SUCCESS;`
`783`	`783`	`}`
`@@ -824,7 +824,7 @@ long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags,`
`824`	`824`	`}`
`825`	`825`	`}`
`826`	`826`	`}`
`827`		`- vcpu->arch.regs.gpr[4] = gr;`
	`827`	`+ kvmppc_set_gpr(vcpu, 4, gr);`
`828`	`828`	`ret = H_SUCCESS;`
`829`	`829`	`out:`
`830`	`830`	`unlock_hpte(hpte, v & ~HPTE_V_HVLOCK);`
`@@ -872,7 +872,7 @@ long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags,`
`872`	`872`	`kvmppc_set_dirty_from_hpte(kvm, v, gr);`
`873`	`873`	`}`
`874`	`874`	`}`
`875`		`- vcpu->arch.regs.gpr[4] = gr;`
	`875`	`+ kvmppc_set_gpr(vcpu, 4, gr);`
`876`	`876`	`ret = H_SUCCESS;`
`877`	`877`	`out:`
`878`	`878`	`unlock_hpte(hpte, v & ~HPTE_V_HVLOCK);`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ static void icp_rm_down_cppr(struct kvmppc_xics xics, struct kvmppc_icp icp,`
`481`	`481`
`482`	`482`	`unsigned long xics_rm_h_xirr_x(struct kvm_vcpu *vcpu)`
`483`	`483`	`{`
`484`		`- vcpu->arch.regs.gpr[5] = get_tb();`
	`484`	`+ kvmppc_set_gpr(vcpu, 5, get_tb());`
`485`	`485`	`return xics_rm_h_xirr(vcpu);`
`486`	`486`	`}`
`487`	`487`
`@@ -518,7 +518,7 @@ unsigned long xics_rm_h_xirr(struct kvm_vcpu *vcpu)`
`518`	`518`	`} while (!icp_rm_try_update(icp, old_state, new_state));`
`519`	`519`
`520`	`520`	`/* Return the result in GPR4 */`
`521`		`- vcpu->arch.regs.gpr[4] = xirr;`
	`521`	`+ kvmppc_set_gpr(vcpu, 4, xirr);`
`522`	`522`
`523`	`523`	`return check_too_hard(xics, icp);`
`524`	`524`	`}`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ static unsigned long xive_vm_h_xirr(struct kvm_vcpu *vcpu)`
`328`	`328`	`*/`
`329`	`329`
`330`	`330`	`/* Return interrupt and old CPPR in GPR4 */`
`331`		`- vcpu->arch.regs.gpr[4] = hirq \| (old_cppr << 24);`
	`331`	`+ kvmppc_set_gpr(vcpu, 4, hirq \| (old_cppr << 24));`
`332`	`332`
`333`	`333`	`return H_SUCCESS;`
`334`	`334`	`}`
`@@ -364,7 +364,7 @@ static unsigned long xive_vm_h_ipoll(struct kvm_vcpu *vcpu, unsigned long server`
`364`	`364`	`hirq = xive_vm_scan_interrupts(xc, pending, scan_poll);`
`365`	`365`
`366`	`366`	`/* Return interrupt and old CPPR in GPR4 */`
`367`		`- vcpu->arch.regs.gpr[4] = hirq \| (xc->cppr << 24);`
	`367`	`+ kvmppc_set_gpr(vcpu, 4, hirq \| (xc->cppr << 24));`
`368`	`368`
`369`	`369`	`return H_SUCCESS;`
`370`	`370`	`}`