mips/kvm: Fix ABI for compatibility with 64-bit guests.
v6 cover mips/kvm: Fix ABI for compatibility with 64-bit guests.
From: David Daney <[email protected]>
The initial patch set implementing MIPS KVM does not handle 64-bit guests or use of the FPU. This patch set corrects these ABI issues, and does some very minor clean up.
Changes from v5: Adjust for kvm.h moving to uapi/asm. Code formatting
to achieve line lengths <= 80.
Changes from v4: No code change, just keep more of the code in
kvm_mips.c rather than kvm_trap_emul.c
Changes from v3: Use KVM_SET_ONE_REG instead of KVM_SET_MSRS. Added
ENOIOCTLCMD patch.
Changes from v2: Split into five parts, no code change.
David Daney (6):
mips/kvm: Fix ABI for use of FPU.
mips/kvm: Fix ABI for use of 64-bit registers. mips/kvm: Fix name of gpr field in struct kvm_regs. mips/kvm: Use ARRAY_SIZE() instead of hardcoded constants in
kvm_arch_vcpu_ioctl_{s,g}et_regs
mips/kvm: Fix ABI by moving manipulation of CP0 registers to
KVM_{G,S}ET_ONE_REGmips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls.
arch/mips/include/asm/kvm_host.h | 4 - arch/mips/include/uapi/asm/kvm.h | 137 +++++++++++++++---- arch/mips/kvm/kvm_mips.c | 280 ++++++++++++++++++++++++++++++++++++--- arch/mips/kvm/kvm_trap_emul.c | 50 ------- 4 files changed, 369 insertions(+), 102 deletions(-)
Signature · 1 line
1.7.11.7
PATCH v6 1/6 mips/kvm: Fix ABI for use of FPU.
From: David Daney <[email protected]>
Define a non-empty struct kvm_fpu.
--- arch/mips/include/uapi/asm/kvm.h | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
arch/mips/include/uapi/asm/kvm.h +21 -8
@@ -1,11 +1,12 @@/* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -* -* Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. -* Authors: Sanjay Lal <[email protected]> -*/ +* This file is subject to the terms and conditions of the GNU General Public +* License. See the file "COPYING" in the main directory of this archive +* for more details. +* +* Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. +* Copyright (C) 2013 Cavium, Inc. +* Authors: Sanjay Lal <[email protected]> +*/ #ifndef __LINUX_KVM_MIPS_H#define __LINUX_KVM_MIPS_H
@@ -31,8 +32,20 @@ struct kvm_regs {struct kvm_sregs { }; -/* for KVM_GET_FPU and KVM_SET_FPU */ +/* +* for KVM_GET_FPU and KVM_SET_FPU +* +* If Status[FR] is zero (32-bit FPU), the upper 32-bits of the FPRs +* are zero filled. +*/ struct kvm_fpu { +__u64 fpr[32 ]; +__u32 fir; +__u32 fccr; +__u32 fexr; +__u32 fenr; +__u32 fcsr; +__u32 pad; };struct kvm_debug_exit_arch {
Signature · 1 line
1.7.11.7
PATCH v6 2/6 mips/kvm: Fix ABI for use of 64-bit registers.
In reply to David DaneyFrom: David Daney <[email protected]>
All registers are 64-bits wide, 32-bit guests use the least significant portion of the register storage fields.
--- arch/mips/include/uapi/asm/kvm.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
arch/mips/include/uapi/asm/kvm.h +11 -5
@@ -18,12 +18,18 @@#define N_MIPS_COPROC_REGS 32#define N_MIPS_COPROC_SEL 8 -/* for KVM_GET_REGS and KVM_SET_REGS */ +/* +* for KVM_GET_REGS and KVM_SET_REGS +* +* If Config[AT] is zero (32-bit CPU), the register contents are +* stored in the lower 32-bits of the struct kvm_regs fields and sign +* extended to 64-bits. +*/ struct kvm_regs { -__u32 gprs[32 ]; -__u32 hi; -__u32 lo; -__u32 pc; +__u64 gprs[32 ]; +__u64 hi; +__u64 lo; +__u64 pc;__u32 cp0reg[N_MIPS_COPROC_REGS ][N_MIPS_COPROC_SEL ]; };
Signature · 1 line
1.7.11.7
PATCH v6 3/6 mips/kvm: Fix name of gpr field in struct kvm_regs.
In reply to David DaneyFrom: David Daney <[email protected]>
--- arch/mips/include/uapi/asm/kvm.h | 3 ++- arch/mips/kvm/kvm_mips.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/mips/include/uapi/asm/kvm.h +2 -1
@@ -26,7 +26,8 @@* extended to 64-bits. */ struct kvm_regs { -__u64 gprs[32 ]; +/* out (KVM_GET_REGS) / in (KVM_SET_REGS) */ +__u64 gpr[32 ];__u64 hi;__u64 lo;__u64 pc;
arch/mips/kvm/kvm_mips.c +2 -2
@@ -678,7 +678,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)int i;for (i =0 ; i <32 ; i++) - vcpu->arch.gprs[i] = regs->gprs[i]; + vcpu->arch.gprs[i] = regs->gpr[i]; vcpu->arch.hi = regs->hi; vcpu->arch.lo = regs->lo;
@@ -692,7 +692,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)int i;for (i =0 ; i <32 ; i++) - regs->gprs[i] = vcpu->arch.gprs[i]; + regs->gpr[i] = vcpu->arch.gprs[i]; regs->hi = vcpu->arch.hi; regs->lo = vcpu->arch.lo;
Signature · 1 line
1.7.11.7
PATCH v6 4/6 mips/kvm: Use ARRAY_SIZE() instead of hardcoded constants in kvm_arch_vcpu_ioctl_{s,g}et_regs
In reply to David DaneyFrom: David Daney <[email protected]>
Also we cannot set special zero register, so force it to zero.
--- arch/mips/kvm/kvm_mips.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/mips/kvm/kvm_mips.c +3 -3
@@ -677,9 +677,9 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) {int i; -for (i =0 ; i <32 ; i++) +for (i =1 ; i <ARRAY_SIZE (vcpu->arch.gprs); i++) vcpu->arch.gprs[i] = regs->gpr[i]; - + vcpu->arch.gprs[0 ] =0 ;/* zero is special, and cannot be set. */ vcpu->arch.hi = regs->hi; vcpu->arch.lo = regs->lo; vcpu->arch.pc = regs->pc;
@@ -691,7 +691,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) {int i; -for (i =0 ; i <32 ; i++) +for (i =0 ; i <ARRAY_SIZE (vcpu->arch.gprs); i++) regs->gpr[i] = vcpu->arch.gprs[i]; regs->hi = vcpu->arch.hi;
Signature · 1 line
1.7.11.7
PATCH v6 5/6 mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG
In reply to David DaneyFrom: David Daney <[email protected]>
Because not all 256 CP0 registers are ever implemented, we need a different method of manipulating them. Use the KVM_SET_ONE_REG/KVM_GET_ONE_REG mechanism.
Now unused code and definitions are removed.
--- arch/mips/include/asm/kvm_host.h | 4 - arch/mips/include/uapi/asm/kvm.h | 91 +++++++++++--- arch/mips/kvm/kvm_mips.c | 252 +++++++++++++++++++++++++++++++++++++-- arch/mips/kvm/kvm_trap_emul.c | 50 -------- 4 files changed, 322 insertions(+), 75 deletions(-)
arch/mips/include/asm/kvm_host.h +0 -4
@@ -496,10 +496,6 @@ struct kvm_mips_callbacks { uint32_t cause);int (*irq_clear) (struct kvm_vcpu *vcpu,unsigned int priority,uint32_t cause); -int (*vcpu_ioctl_get_regs) (struct kvm_vcpu *vcpu, -struct kvm_regs *regs); -int (*vcpu_ioctl_set_regs) (struct kvm_vcpu *vcpu, -struct kvm_regs *regs); };extern struct kvm_mips_callbacks *kvm_mips_callbacks;int kvm_mips_emulation_init (struct kvm_mips_callbacks **install_callbacks);
arch/mips/include/uapi/asm/kvm.h +77 -14
120 lines not on this page · raw message
arch/mips/kvm/kvm_mips.c +245 -7
302 lines not on this page · raw message
arch/mips/kvm/kvm_trap_emul.c +0 -50
62 lines not on this page · raw message
Signature · 1 line
1.7.11.7
PATCH v6 6/6 mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls.
In reply to David DaneyFrom: David Daney <[email protected]>
The Linux Way is to return -ENOIOCTLCMD to the vfs when an unimplemented ioctl is requested. Do this in kvm_mips instead of a random mixture of -ENOTSUPP and -EINVAL.
--- arch/mips/kvm/kvm_mips.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
arch/mips/kvm/kvm_mips.c +9 -9
@@ -195,7 +195,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)long kvm_arch_dev_ioctl (struct file *filp,unsigned int ioctl,unsigned long arg) { -return -EINVAL ; +return -ENOIOCTLCMD ; } void kvm_arch_free_memslot(struct kvm_memory_slot *free,
@@ -401,7 +401,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg) { - return -EINVAL; + return -ENOIOCTLCMD; }int kvm_arch_vcpu_ioctl_run (struct kvm_vcpu *vcpu,struct kvm_run *run)
@@ -475,14 +475,14 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, struct kvm_mp_state *mp_state) { - return -EINVAL; + return -ENOIOCTLCMD; }int kvm_arch_vcpu_ioctl_set_mpstate (struct kvm_vcpu *vcpu,struct kvm_mp_state *mp_state) { -return -EINVAL ; +return -ENOIOCTLCMD ; }#define KVM_REG_MIPS_CP0_INDEX (0x10000 + 8 * 0 + 0)
@@ -801,7 +801,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)switch (ioctl) {default : - r = -EINVAL ; + r = -ENOIOCTLCMD ; }return r;
@@ -829,13 +829,13 @@ void kvm_arch_exit(void)int kvm_arch_vcpu_ioctl_get_sregs (struct kvm_vcpu *vcpu,struct kvm_sregs *sregs) { -return -ENOTSUPP ; +return -ENOIOCTLCMD ; }int kvm_arch_vcpu_ioctl_set_sregs (struct kvm_vcpu *vcpu,struct kvm_sregs *sregs) { -return -ENOTSUPP ; +return -ENOIOCTLCMD ; }int kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu)
@@ -845,12 +845,12 @@ int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)int kvm_arch_vcpu_ioctl_get_fpu (struct kvm_vcpu *vcpu,struct kvm_fpu *fpu) { -return -ENOTSUPP ; +return -ENOIOCTLCMD ; }int kvm_arch_vcpu_ioctl_set_fpu (struct kvm_vcpu *vcpu,struct kvm_fpu *fpu) { -return -ENOTSUPP ; +return -ENOIOCTLCMD ; }int kvm_arch_vcpu_fault (struct kvm_vcpu *vcpu,struct vm_fault *vmf)
Signature · 1 line
1.7.11.7
Il 23/05/2013 18:49, David Daney ha scritto:
Quoted 24 lines
From: David Daney <[email protected]>
The initial patch set implementing MIPS KVM does not handle 64-bit guests or use of the FPU. This patch set corrects these ABI issues, and does some very minor clean up.
Changes from v5: Adjust for
kvm.hmoving to uapi/asm. Code formatting
to achieve line lengths <= 80.Changes from v4: No code change, just keep more of the code in
kvm_mips.crather thankvm_trap_emul.cChanges from v3: Use
KVM_SET_ONE_REGinstead ofKVM_SET_MSRS. Added
ENOIOCTLCMD patch.Changes from v2: Split into five parts, no code change.
David Daney (6):
mips/kvm: Fix ABI for use of FPU.
mips/kvm: Fix ABI for use of 64-bit registers. mips/kvm: Fix name of gpr field in structkvm_regs. mips/kvm: UseARRAY_SIZE()instead of hardcoded constants in
kvm_arch_vcpu_ioctl_{s,g}et_regs
mips/kvm: Fix ABI by moving manipulation of CP0 registers to
Quoted 9 lines
KVM_{G,S}ET_ONE_REGmips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls.
arch/mips/include/asm/kvm_host.h | 4 - arch/mips/include/uapi/asm/kvm.h | 137 +++++++++++++++---- arch/mips/kvm/kvm_mips.c | 280 ++++++++++++++++++++++++++++++++++++--- arch/mips/kvm/kvm_trap_emul.c | 50 ------- 4 files changed, 369 insertions(+), 102 deletions(-)
Applied, thanks.
Paolo