KVM: PPC: Book3S HV: Nested guest migration fixes
Subsystems (4)
v2 cover KVM: PPC: Book3S HV: Nested guest migration fixes
The series fixes the issues exposed by the kvm-unit-tests[1] sprs-migration test.
The SDAR, MMCR3 were seen to have some typo/refactoring bugs. The first two patches fix them.
The remaining patches take care of save-restoring the guest state elements for DEXCR, HASHKEYR and HASHPKEYR SPRs with PHYP during entry-exit. The KVM_PPC_REG too for them are missing which are added for use by the QEMU.
References:
[1]: https://github.com/kvm-unit-tests/kvm-unit-tests
---
Changelog:
v1: https://lore.kernel.org/kvm/171741555734.11675.17428208097186191736.stgit@c0c876608f2d/
- Reordered the patches in a way to introduce the SPRs first as
suggested.
- Added Reviewed-bys to the reviewed ones.
- Added 2 more patches to handle the hashpkeyr state
Shivaprasad G Bhat (8):
KVM: PPC: Book3S HV: Fix the set_one_reg for MMCR3
KVM: PPC: Book3S HV: Fix the get_one_reg of SDAR
KVM: PPC: Book3S HV: Add one-reg interface for DEXCR register
KVM: PPC: Book3S HV nestedv2: Keep nested guest DEXCR in sync
KVM: PPC: Book3S HV: Add one-reg interface for HASHKEYR register
KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHKEYR in sync
KVM: PPC: Book3S HV: Add one-reg interface for HASHPKEYR register
KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHPKEYR in sync
Documentation/virt/kvm/api.rst | 3 +++ arch/powerpc/include/asm/kvm_host.h | 3 +++ arch/powerpc/include/uapi/asm/kvm.h | 3 +++ arch/powerpc/kvm/book3s_hv.c | 22 ++++++++++++++++++++-- arch/powerpc/kvm/book3s_hv.h | 3 +++ arch/powerpc/kvm/book3s_hv_nestedv2.c | 18 ++++++++++++++++++ 6 files changed, 50 insertions(+), 2 deletions(-)
--
Signature
PATCH v2 1/8 KVM: PPC: Book3S HV: Fix the set_one_reg for MMCR3
The kvmppc_set_one_reg_hv() wrongly get() the value instead of set() for MMCR3. Fix the same.
--- arch/powerpc/kvm/book3s_hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv.c +1 -1
@@ -2540,7 +2540,7 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, vcpu->arch.mmcrs =set_reg_val (id, *val);break ;case KVM_REG_PPC_MMCR3 : - *val =get_reg_val (id, vcpu->arch.mmcr[3 ]); +kvmppc_set_mmcr_hv (vcpu,3 ,set_reg_val (id, *val));break ; case KVM_REG_PPC_PMC1 ... KVM_REG_PPC_PMC8: i = id -KVM_REG_PPC_PMC1 ;
PATCH v2 2/8 KVM: PPC: Book3S HV: Fix the get_one_reg of SDAR
In reply to Shivaprasad G BhatThe kvmppc_get_one_reg_hv() for SDAR is wrongly getting the SIAR instead of SDAR, possibly a paste error emanating from the previous refactoring.
Patch fixes the wrong get_one_reg() for the same.
--- arch/powerpc/kvm/book3s_hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv.c +1 -1
@@ -2305,7 +2305,7 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, *val =get_reg_val (id,kvmppc_get_siar_hv (vcpu));break ;case KVM_REG_PPC_SDAR : - *val =get_reg_val (id,kvmppc_get_siar_hv (vcpu)); + *val =get_reg_val (id,kvmppc_get_sdar_hv (vcpu));break ;case KVM_REG_PPC_SIER : *val =get_reg_val (id,kvmppc_get_sier_hv (vcpu,0 ));
PATCH v2 3/8 KVM: PPC: Book3S HV: Add one-reg interface for DEXCR register
In reply to Shivaprasad G BhatThe patch adds a one-reg register identifier which can be used to read and set the DEXCR for the guest during enter/exit with KVM_REG_PPC_DEXCR. The specific SPR KVM API documentation too updated.
--- Documentation/virt/kvm/api.rst | 1 + arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/include/uapi/asm/kvm.h | 1 + arch/powerpc/kvm/book3s_hv.c | 6 ++++++ arch/powerpc/kvm/book3s_hv.h | 1 + 5 files changed, 10 insertions(+)
Documentation/virt/kvm/api.rst +1 -0
@@ -2441,6 +2441,7 @@ registers, find a list below: PPC KVM_REG_PPC_PTCR 64 PPC KVM_REG_PPC_DAWR1 64 PPC KVM_REG_PPC_DAWRX1 64 + PPC KVM_REG_PPC_DEXCR 64 PPC KVM_REG_PPC_TM_GPR0 64 ... PPC KVM_REG_PPC_TM_GPR31 64
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -599,6 +599,7 @@ struct kvm_vcpu_arch {ulong dawrx0;ulong dawr1;ulong dawrx1; +ulong dexcr;ulong ciabr;ulong cfar;ulong ppr;
arch/powerpc/include/uapi/asm/kvm.h +1 -0
@@ -645,6 +645,7 @@ struct kvm_ppc_cpu_char {#define KVM_REG_PPC_SIER3 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc3)#define KVM_REG_PPC_DAWR1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc4)#define KVM_REG_PPC_DAWRX1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc5) +#define KVM_REG_PPC_DEXCR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc6)/* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs
arch/powerpc/kvm/book3s_hv.c +6 -0
@@ -2349,6 +2349,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,case KVM_REG_PPC_DAWRX1 : *val =get_reg_val (id,kvmppc_get_dawrx1_hv (vcpu));break ; +case KVM_REG_PPC_DEXCR : + *val =get_reg_val (id,kvmppc_get_dexcr_hv (vcpu)); +break ;case KVM_REG_PPC_CIABR : *val =get_reg_val (id,kvmppc_get_ciabr_hv (vcpu));break ;
@@ -2592,6 +2595,9 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,case KVM_REG_PPC_DAWRX1 :kvmppc_set_dawrx1_hv (vcpu,set_reg_val (id, *val) & ~DAWRX_HYP );break ; +case KVM_REG_PPC_DEXCR : +kvmppc_set_dexcr_hv (vcpu,set_reg_val (id, *val)); +break ;case KVM_REG_PPC_CIABR :kvmppc_set_ciabr_hv (vcpu,set_reg_val (id, *val));/* Don't allow setting breakpoints in hypervisor code */
arch/powerpc/kvm/book3s_hv.h +1 -0
@@ -116,6 +116,7 @@ KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawr0, 64, KVMPPC_GSID_DAWR0) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawr1, 64, KVMPPC_GSID_DAWR1) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawrx0, 64, KVMPPC_GSID_DAWRX0) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawrx1, 64, KVMPPC_GSID_DAWRX1) +KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dexcr, 64, KVMPPC_GSID_DEXCR) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(ciabr, 64, KVMPPC_GSID_CIABR) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(wort, 64, KVMPPC_GSID_WORT)KVMPPC_BOOK3S_HV_VCPU_ACCESSOR (ppr,64 ,KVMPPC_GSID_PPR )
PATCH v2 4/8 KVM: PPC: Book3S HV nestedv2: Keep nested guest DEXCR in sync
In reply to Shivaprasad G BhatThe nestedv2 APIs has the guest state element defined for DEXCR for the save-restore with L0. However, its ignored in the code.
The patch takes care of this for the DEXCR GSID.
--- arch/powerpc/kvm/book3s_hv_nestedv2.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/powerpc/kvm/book3s_hv_nestedv2.c +6 -0
@@ -193,6 +193,9 @@ static int gs_msg_ops_vcpu_fill_info(struct kvmppc_gs_buff *gsb,case KVMPPC_GSID_DAWRX1 : rc =kvmppc_gse_put_u32 (gsb, iden, vcpu->arch.dawrx1);break ; +case KVMPPC_GSID_DEXCR : + rc =kvmppc_gse_put_u64 (gsb, iden, vcpu->arch.dexcr); +break ;case KVMPPC_GSID_CIABR : rc =kvmppc_gse_put_u64 (gsb, iden, vcpu->arch.ciabr);break ;
@@ -441,6 +444,9 @@ static int gs_msg_ops_vcpu_refresh_info(struct kvmppc_gs_msg *gsm,case KVMPPC_GSID_DAWRX1 : vcpu->arch.dawrx1 =kvmppc_gse_get_u32 (gse);break ; +case KVMPPC_GSID_DEXCR : + vcpu->arch.dexcr =kvmppc_gse_get_u64 (gse); +break ;case KVMPPC_GSID_CIABR : vcpu->arch.ciabr =kvmppc_gse_get_u64 (gse);break ;
PATCH v2 5/8 KVM: PPC: Book3S HV: Add one-reg interface for HASHKEYR register
In reply to Shivaprasad G BhatThe patch adds a one-reg register identifier which can be used to read and set the virtual HASHKEYR for the guest during enter/exit with KVM_REG_PPC_HASHKEYR. The specific SPR KVM API documentation too updated.
--- Documentation/virt/kvm/api.rst | 1 + arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/include/uapi/asm/kvm.h | 1 + arch/powerpc/kvm/book3s_hv.c | 6 ++++++ arch/powerpc/kvm/book3s_hv.h | 1 + 5 files changed, 10 insertions(+)
Documentation/virt/kvm/api.rst +1 -0
@@ -2439,6 +2439,7 @@ registers, find a list below: PPC KVM_REG_PPC_PSSCR 64 PPC KVM_REG_PPC_DEC_EXPIRY 64 PPC KVM_REG_PPC_PTCR 64 + PPC KVM_REG_PPC_HASHKEYR 64 PPC KVM_REG_PPC_DAWR1 64 PPC KVM_REG_PPC_DAWRX1 64 PPC KVM_REG_PPC_DEXCR 64
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -600,6 +600,7 @@ struct kvm_vcpu_arch {ulong dawr1;ulong dawrx1;ulong dexcr; +ulong hashkeyr;ulong ciabr;ulong cfar;ulong ppr;
arch/powerpc/include/uapi/asm/kvm.h +1 -0
@@ -646,6 +646,7 @@ struct kvm_ppc_cpu_char {#define KVM_REG_PPC_DAWR1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc4)#define KVM_REG_PPC_DAWRX1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc5)#define KVM_REG_PPC_DEXCR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc6) +#define KVM_REG_PPC_HASHKEYR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc7)/* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs
arch/powerpc/kvm/book3s_hv.c +6 -0
@@ -2352,6 +2352,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,case KVM_REG_PPC_DEXCR : *val =get_reg_val (id,kvmppc_get_dexcr_hv (vcpu));break ; +case KVM_REG_PPC_HASHKEYR : + *val =get_reg_val (id,kvmppc_get_hashkeyr_hv (vcpu)); +break ;case KVM_REG_PPC_CIABR : *val =get_reg_val (id,kvmppc_get_ciabr_hv (vcpu));break ;
@@ -2598,6 +2601,9 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,case KVM_REG_PPC_DEXCR :kvmppc_set_dexcr_hv (vcpu,set_reg_val (id, *val));break ; +case KVM_REG_PPC_HASHKEYR : +kvmppc_set_hashkeyr_hv (vcpu,set_reg_val (id, *val)); +break ;case KVM_REG_PPC_CIABR :kvmppc_set_ciabr_hv (vcpu,set_reg_val (id, *val));/* Don't allow setting breakpoints in hypervisor code */
arch/powerpc/kvm/book3s_hv.h +1 -0
@@ -117,6 +117,7 @@ KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawr1, 64, KVMPPC_GSID_DAWR1) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawrx0, 64, KVMPPC_GSID_DAWRX0) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawrx1, 64, KVMPPC_GSID_DAWRX1) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dexcr, 64, KVMPPC_GSID_DEXCR) +KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(hashkeyr, 64, KVMPPC_GSID_HASHKEYR) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(ciabr, 64, KVMPPC_GSID_CIABR) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(wort, 64, KVMPPC_GSID_WORT)KVMPPC_BOOK3S_HV_VCPU_ACCESSOR (ppr,64 ,KVMPPC_GSID_PPR )
PATCH v2 6/8 KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHKEYR in sync
In reply to Shivaprasad G BhatThe nestedv2 APIs has the guest state element defined for HASHKEYR for the save-restore with L0. However, its ignored in the code.
The patch takes care of this for the HASHKEYR GSID.
--- arch/powerpc/kvm/book3s_hv_nestedv2.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/powerpc/kvm/book3s_hv_nestedv2.c +6 -0
@@ -196,6 +196,9 @@ static int gs_msg_ops_vcpu_fill_info(struct kvmppc_gs_buff *gsb,case KVMPPC_GSID_DEXCR : rc =kvmppc_gse_put_u64 (gsb, iden, vcpu->arch.dexcr);break ; +case KVMPPC_GSID_HASHKEYR : + rc =kvmppc_gse_put_u64 (gsb, iden, vcpu->arch.hashkeyr); +break ;case KVMPPC_GSID_CIABR : rc =kvmppc_gse_put_u64 (gsb, iden, vcpu->arch.ciabr);break ;
@@ -447,6 +450,9 @@ static int gs_msg_ops_vcpu_refresh_info(struct kvmppc_gs_msg *gsm,case KVMPPC_GSID_DEXCR : vcpu->arch.dexcr =kvmppc_gse_get_u64 (gse);break ; +case KVMPPC_GSID_HASHKEYR : + vcpu->arch.hashkeyr =kvmppc_gse_get_u64 (gse); +break ;case KVMPPC_GSID_CIABR : vcpu->arch.ciabr =kvmppc_gse_get_u64 (gse);break ;
PATCH v2 7/8 KVM: PPC: Book3S HV: Add one-reg interface for HASHPKEYR register
In reply to Shivaprasad G BhatThe patch adds a one-reg register identifier which can be used to read and set the virtual HASHPKEYR for the guest during enter/exit with KVM_REG_PPC_HASHPKEYR. The specific SPR KVM API documentation too updated.
--- Documentation/virt/kvm/api.rst | 1 + arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/include/uapi/asm/kvm.h | 1 + arch/powerpc/kvm/book3s_hv.c | 6 ++++++ arch/powerpc/kvm/book3s_hv.h | 1 + 5 files changed, 10 insertions(+)
Documentation/virt/kvm/api.rst +1 -0
@@ -2440,6 +2440,7 @@ registers, find a list below: PPC KVM_REG_PPC_DEC_EXPIRY 64 PPC KVM_REG_PPC_PTCR 64 PPC KVM_REG_PPC_HASHKEYR 64 + PPC KVM_REG_PPC_HASHPKEYR 64 PPC KVM_REG_PPC_DAWR1 64 PPC KVM_REG_PPC_DAWRX1 64 PPC KVM_REG_PPC_DEXCR 64
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -601,6 +601,7 @@ struct kvm_vcpu_arch {ulong dawrx1;ulong dexcr;ulong hashkeyr; +ulong hashpkeyr;ulong ciabr;ulong cfar;ulong ppr;
arch/powerpc/include/uapi/asm/kvm.h +1 -0
@@ -647,6 +647,7 @@ struct kvm_ppc_cpu_char {#define KVM_REG_PPC_DAWRX1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc5)#define KVM_REG_PPC_DEXCR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc6)#define KVM_REG_PPC_HASHKEYR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc7) +#define KVM_REG_PPC_HASHPKEYR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc8)/* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs
arch/powerpc/kvm/book3s_hv.c +6 -0
@@ -2355,6 +2355,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,case KVM_REG_PPC_HASHKEYR : *val =get_reg_val (id,kvmppc_get_hashkeyr_hv (vcpu));break ; +case KVM_REG_PPC_HASHPKEYR : + *val =get_reg_val (id,kvmppc_get_hashpkeyr_hv (vcpu)); +break ;case KVM_REG_PPC_CIABR : *val =get_reg_val (id,kvmppc_get_ciabr_hv (vcpu));break ;
@@ -2604,6 +2607,9 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,case KVM_REG_PPC_HASHKEYR :kvmppc_set_hashkeyr_hv (vcpu,set_reg_val (id, *val));break ; +case KVM_REG_PPC_HASHPKEYR : +kvmppc_set_hashpkeyr_hv (vcpu,set_reg_val (id, *val)); +break ;case KVM_REG_PPC_CIABR :kvmppc_set_ciabr_hv (vcpu,set_reg_val (id, *val));/* Don't allow setting breakpoints in hypervisor code */
arch/powerpc/kvm/book3s_hv.h +1 -0
@@ -118,6 +118,7 @@ KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawrx0, 64, KVMPPC_GSID_DAWRX0) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dawrx1, 64, KVMPPC_GSID_DAWRX1) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dexcr, 64, KVMPPC_GSID_DEXCR) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(hashkeyr, 64, KVMPPC_GSID_HASHKEYR) +KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(hashpkeyr, 64, KVMPPC_GSID_HASHPKEYR) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(ciabr, 64, KVMPPC_GSID_CIABR) KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(wort, 64, KVMPPC_GSID_WORT)KVMPPC_BOOK3S_HV_VCPU_ACCESSOR (ppr,64 ,KVMPPC_GSID_PPR )
PATCH v2 8/8 KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHPKEYR in sync
In reply to Shivaprasad G BhatThe nestedv2 APIs has the guest state element defined for HASHPKEYR for the save-restore with L0. However, its ignored in the code.
The patch takes care of this for the HASHPKEYR GSID.
--- arch/powerpc/kvm/book3s_hv_nestedv2.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/powerpc/kvm/book3s_hv_nestedv2.c +6 -0
@@ -199,6 +199,9 @@ static int gs_msg_ops_vcpu_fill_info(struct kvmppc_gs_buff *gsb,case KVMPPC_GSID_HASHKEYR : rc =kvmppc_gse_put_u64 (gsb, iden, vcpu->arch.hashkeyr);break ; +case KVMPPC_GSID_HASHPKEYR : + rc =kvmppc_gse_put_u64 (gsb, iden, vcpu->arch.hashpkeyr); +break ;case KVMPPC_GSID_CIABR : rc =kvmppc_gse_put_u64 (gsb, iden, vcpu->arch.ciabr);break ;
@@ -453,6 +456,9 @@ static int gs_msg_ops_vcpu_refresh_info(struct kvmppc_gs_msg *gsm,case KVMPPC_GSID_HASHKEYR : vcpu->arch.hashkeyr =kvmppc_gse_get_u64 (gse);break ; +case KVMPPC_GSID_HASHPKEYR : + vcpu->arch.hashpkeyr =kvmppc_gse_get_u64 (gse); +break ;case KVMPPC_GSID_CIABR : vcpu->arch.ciabr =kvmppc_gse_get_u64 (gse);break ;
Nicholas Piggin
reviewerQuoted 10 lines · Shivaprasad G Bhat
The series fixes the issues exposed by the kvm-unit-tests[1] sprs-migration test.
The SDAR, MMCR3 were seen to have some typo/refactoring bugs. The first two patches fix them.
The remaining patches take care of save-restoring the guest state elements for DEXCR, HASHKEYR and HASHPKEYR SPRs with PHYP during entry-exit. The
KVM_PPC_REGtoo for them are missing which are added for use by the QEMU.
These and the qemu patches all look good now. I'll give them some testing and send R-B in the next day or two. I'm trying to write a k-u-t for the hashpkey migration case...
Thanks,
Nick
Quoted 34 lines
References:
[1]: https://github.com/kvm-unit-tests/kvm-unit-tests---
Changelog:
v1: https://lore.kernel.org/kvm/171741555734.11675.17428208097186191736.stgit@c0c876608f2d/
- Reordered the patches in a way to introduce the SPRs first as
suggested.
- Added Reviewed-bys to the reviewed ones.
- Added 2 more patches to handle the hashpkeyr stateShivaprasad G Bhat (8):
KVM: PPC: Book3S HV: Fix theset_one_regfor MMCR3
KVM: PPC: Book3S HV: Fix theget_one_regof SDAR
KVM: PPC: Book3S HV: Add one-reg interface for DEXCR register
KVM: PPC: Book3S HV nestedv2: Keep nested guest DEXCR in sync
KVM: PPC: Book3S HV: Add one-reg interface for HASHKEYR register
KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHKEYR in sync
KVM: PPC: Book3S HV: Add one-reg interface for HASHPKEYR register
KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHPKEYR in syncDocumentation/virt/kvm/api.rst | 3 +++ arch/powerpc/include/asm/kvm_host.h | 3 +++ arch/powerpc/include/uapi/asm/kvm.h | 3 +++ arch/powerpc/kvm/book3s_hv.c | 22 ++++++++++++++++++++-- arch/powerpc/kvm/book3s_hv.h | 3 +++ arch/powerpc/kvm/book3s_hv_nestedv2.c | 18 ++++++++++++++++++ 6 files changed, 50 insertions(+), 2 deletions(-)--
Signature
Michael Ellerman
AppliedQuoted 6 lines · Shivaprasad G Bhat
The series fixes the issues exposed by the kvm-unit-tests[1] sprs-migration test.
The SDAR, MMCR3 were seen to have some typo/refactoring bugs. The first two patches fix them.
Quoted 6 lines
The remaining patches take care of save-restoring the guest state elements for DEXCR, HASHKEYR and HASHPKEYR SPRs with PHYP during entry-exit. The
KVM_PPC_REGtoo for them are missing which are added for use by the QEMU.[...]
Applied to powerpc/topic/ppc-kvm.
[1/8] KVM: PPC: Book3S HV: Fix the set_one_reg for MMCR3
https://git.kernel.org/powerpc/c/f9ca6a10be20479d526f27316cc32cfd1785ed39 [2/8] KVM: PPC: Book3S HV: Fix the get_one_reg of SDAR https://git.kernel.org/powerpc/c/009f6f42c67e9de737d6d3d199f92b21a8cb9622 [3/8] KVM: PPC: Book3S HV: Add one-reg interface for DEXCR register https://git.kernel.org/powerpc/c/1a1e6865f516696adcf6e94f286c7a0f84d78df3 [4/8] KVM: PPC: Book3S HV nestedv2: Keep nested guest DEXCR in sync https://git.kernel.org/powerpc/c/2d6be3ca3276ab30fb14f285d400461a718d45e7 [5/8] KVM: PPC: Book3S HV: Add one-reg interface for HASHKEYR register https://git.kernel.org/powerpc/c/e9eb790b25577a15d3f450ed585c59048e4e6c44 [6/8] KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHKEYR in sync https://git.kernel.org/powerpc/c/1e97c1eb785fe2dc863c2bd570030d6fcf4b5e5b [7/8] KVM: PPC: Book3S HV: Add one-reg interface for HASHPKEYR register https://git.kernel.org/powerpc/c/9a0d2f4995ddde3022c54e43f9ece4f71f76f6e8 [8/8] KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHPKEYR in sync https://git.kernel.org/powerpc/c/0b65365f3fa95c2c5e2094739151a05cabb3c48a
cheers