KVM: PPC: Book3S HV: Add one-reg interface for HASHPKEYR register
The 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. Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/171759285547.1480.12374595786792346073.stgit@linux.ibm.com
This commit is contained in:
parent
1e97c1eb78
commit
9a0d2f4995
5 changed files with 10 additions and 0 deletions
|
@ -2440,6 +2440,7 @@ registers, find a list below:
|
||||||
PPC KVM_REG_PPC_DEC_EXPIRY 64
|
PPC KVM_REG_PPC_DEC_EXPIRY 64
|
||||||
PPC KVM_REG_PPC_PTCR 64
|
PPC KVM_REG_PPC_PTCR 64
|
||||||
PPC KVM_REG_PPC_HASHKEYR 64
|
PPC KVM_REG_PPC_HASHKEYR 64
|
||||||
|
PPC KVM_REG_PPC_HASHPKEYR 64
|
||||||
PPC KVM_REG_PPC_DAWR1 64
|
PPC KVM_REG_PPC_DAWR1 64
|
||||||
PPC KVM_REG_PPC_DAWRX1 64
|
PPC KVM_REG_PPC_DAWRX1 64
|
||||||
PPC KVM_REG_PPC_DEXCR 64
|
PPC KVM_REG_PPC_DEXCR 64
|
||||||
|
|
|
@ -601,6 +601,7 @@ struct kvm_vcpu_arch {
|
||||||
ulong dawrx1;
|
ulong dawrx1;
|
||||||
ulong dexcr;
|
ulong dexcr;
|
||||||
ulong hashkeyr;
|
ulong hashkeyr;
|
||||||
|
ulong hashpkeyr;
|
||||||
ulong ciabr;
|
ulong ciabr;
|
||||||
ulong cfar;
|
ulong cfar;
|
||||||
ulong ppr;
|
ulong ppr;
|
||||||
|
|
|
@ -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_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_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_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:
|
/* Transactional Memory checkpointed state:
|
||||||
* This is all GPRs, all VSX regs and a subset of SPRs
|
* This is all GPRs, all VSX regs and a subset of SPRs
|
||||||
|
|
|
@ -2355,6 +2355,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
|
||||||
case KVM_REG_PPC_HASHKEYR:
|
case KVM_REG_PPC_HASHKEYR:
|
||||||
*val = get_reg_val(id, kvmppc_get_hashkeyr_hv(vcpu));
|
*val = get_reg_val(id, kvmppc_get_hashkeyr_hv(vcpu));
|
||||||
break;
|
break;
|
||||||
|
case KVM_REG_PPC_HASHPKEYR:
|
||||||
|
*val = get_reg_val(id, kvmppc_get_hashpkeyr_hv(vcpu));
|
||||||
|
break;
|
||||||
case KVM_REG_PPC_CIABR:
|
case KVM_REG_PPC_CIABR:
|
||||||
*val = get_reg_val(id, kvmppc_get_ciabr_hv(vcpu));
|
*val = get_reg_val(id, kvmppc_get_ciabr_hv(vcpu));
|
||||||
break;
|
break;
|
||||||
|
@ -2604,6 +2607,9 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
|
||||||
case KVM_REG_PPC_HASHKEYR:
|
case KVM_REG_PPC_HASHKEYR:
|
||||||
kvmppc_set_hashkeyr_hv(vcpu, set_reg_val(id, *val));
|
kvmppc_set_hashkeyr_hv(vcpu, set_reg_val(id, *val));
|
||||||
break;
|
break;
|
||||||
|
case KVM_REG_PPC_HASHPKEYR:
|
||||||
|
kvmppc_set_hashpkeyr_hv(vcpu, set_reg_val(id, *val));
|
||||||
|
break;
|
||||||
case KVM_REG_PPC_CIABR:
|
case KVM_REG_PPC_CIABR:
|
||||||
kvmppc_set_ciabr_hv(vcpu, set_reg_val(id, *val));
|
kvmppc_set_ciabr_hv(vcpu, set_reg_val(id, *val));
|
||||||
/* Don't allow setting breakpoints in hypervisor code */
|
/* Don't allow setting breakpoints in hypervisor code */
|
||||||
|
|
|
@ -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(dawrx1, 64, KVMPPC_GSID_DAWRX1)
|
||||||
KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(dexcr, 64, KVMPPC_GSID_DEXCR)
|
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(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(ciabr, 64, KVMPPC_GSID_CIABR)
|
||||||
KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(wort, 64, KVMPPC_GSID_WORT)
|
KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(wort, 64, KVMPPC_GSID_WORT)
|
||||||
KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(ppr, 64, KVMPPC_GSID_PPR)
|
KVMPPC_BOOK3S_HV_VCPU_ACCESSOR(ppr, 64, KVMPPC_GSID_PPR)
|
||||||
|
|
Loading…
Add table
Reference in a new issue