* [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests.
@ 2013-05-21 20:54 David Daney
2013-05-21 20:54 ` [PATCH v4 1/6] mips/kvm: Fix ABI for use of FPU David Daney
` (6 more replies)
0 siblings, 7 replies; 11+ messages in thread
From: David Daney @ 2013-05-21 20:54 UTC (permalink / raw)
To: linux-mips, ralf, kvm, Sanjay Lal, Gleb Natapov; +Cc: linux-kernel, David Daney
From: David Daney <david.daney@cavium.com>
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.
Chandes 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_REG
mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls.
arch/mips/include/asm/kvm.h | 137 ++++++++++++----
arch/mips/include/asm/kvm_host.h | 4 -
arch/mips/kvm/kvm_mips.c | 118 +++-----------
arch/mips/kvm/kvm_trap_emul.c | 338 ++++++++++++++++++++++++++++++++++-----
4 files changed, 430 insertions(+), 167 deletions(-)
--
1.7.11.7
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v4 1/6] mips/kvm: Fix ABI for use of FPU. 2013-05-21 20:54 [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests David Daney @ 2013-05-21 20:54 ` David Daney 2013-05-21 20:54 ` [PATCH v4 2/6] mips/kvm: Fix ABI for use of 64-bit registers David Daney ` (5 subsequent siblings) 6 siblings, 0 replies; 11+ messages in thread From: David Daney @ 2013-05-21 20:54 UTC (permalink / raw) To: linux-mips, ralf, kvm, Sanjay Lal, Gleb Natapov; +Cc: linux-kernel, David Daney From: David Daney <david.daney@cavium.com> Define a non-empty struct kvm_fpu. Signed-off-by: David Daney <david.daney@cavium.com> --- arch/mips/include/asm/kvm.h | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/arch/mips/include/asm/kvm.h b/arch/mips/include/asm/kvm.h index 85789ea..0e8f565 100644 --- a/arch/mips/include/asm/kvm.h +++ b/arch/mips/include/asm/kvm.h @@ -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 <sanjayl@kymasys.com> -*/ + * 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 <sanjayl@kymasys.com> + */ #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 { -- 1.7.11.7 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 2/6] mips/kvm: Fix ABI for use of 64-bit registers. 2013-05-21 20:54 [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests David Daney 2013-05-21 20:54 ` [PATCH v4 1/6] mips/kvm: Fix ABI for use of FPU David Daney @ 2013-05-21 20:54 ` David Daney 2013-05-21 20:54 ` [PATCH v4 3/6] mips/kvm: Fix name of gpr field in struct kvm_regs David Daney ` (4 subsequent siblings) 6 siblings, 0 replies; 11+ messages in thread From: David Daney @ 2013-05-21 20:54 UTC (permalink / raw) To: linux-mips, ralf, kvm, Sanjay Lal, Gleb Natapov; +Cc: linux-kernel, David Daney From: David Daney <david.daney@cavium.com> All registers are 64-bits wide, 32-bit guests use the least significant portion of the register storage fields. Signed-off-by: David Daney <david.daney@cavium.com> --- arch/mips/include/asm/kvm.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/mips/include/asm/kvm.h b/arch/mips/include/asm/kvm.h index 0e8f565..86812fb 100644 --- a/arch/mips/include/asm/kvm.h +++ b/arch/mips/include/asm/kvm.h @@ -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]; }; -- 1.7.11.7 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 3/6] mips/kvm: Fix name of gpr field in struct kvm_regs. 2013-05-21 20:54 [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests David Daney 2013-05-21 20:54 ` [PATCH v4 1/6] mips/kvm: Fix ABI for use of FPU David Daney 2013-05-21 20:54 ` [PATCH v4 2/6] mips/kvm: Fix ABI for use of 64-bit registers David Daney @ 2013-05-21 20:54 ` David Daney 2013-05-21 20:54 ` [PATCH v4 4/6] mips/kvm: Use ARRAY_SIZE() instead of hardcoded constants in kvm_arch_vcpu_ioctl_{s,g}et_regs David Daney ` (3 subsequent siblings) 6 siblings, 0 replies; 11+ messages in thread From: David Daney @ 2013-05-21 20:54 UTC (permalink / raw) To: linux-mips, ralf, kvm, Sanjay Lal, Gleb Natapov; +Cc: linux-kernel, David Daney From: David Daney <david.daney@cavium.com> Signed-off-by: David Daney <david.daney@cavium.com> --- arch/mips/include/asm/kvm.h | 3 ++- arch/mips/kvm/kvm_mips.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/mips/include/asm/kvm.h b/arch/mips/include/asm/kvm.h index 86812fb..d145ead 100644 --- a/arch/mips/include/asm/kvm.h +++ b/arch/mips/include/asm/kvm.h @@ -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; diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c index e0dad02..93da750 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/kvm_mips.c @@ -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; -- 1.7.11.7 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 4/6] mips/kvm: Use ARRAY_SIZE() instead of hardcoded constants in kvm_arch_vcpu_ioctl_{s,g}et_regs 2013-05-21 20:54 [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests David Daney ` (2 preceding siblings ...) 2013-05-21 20:54 ` [PATCH v4 3/6] mips/kvm: Fix name of gpr field in struct kvm_regs David Daney @ 2013-05-21 20:54 ` David Daney 2013-05-21 20:54 ` [PATCH v4 5/6] mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG David Daney ` (2 subsequent siblings) 6 siblings, 0 replies; 11+ messages in thread From: David Daney @ 2013-05-21 20:54 UTC (permalink / raw) To: linux-mips, ralf, kvm, Sanjay Lal, Gleb Natapov; +Cc: linux-kernel, David Daney From: David Daney <david.daney@cavium.com> Also we cannot set special zero register, so force it to zero. Signed-off-by: David Daney <david.daney@cavium.com> --- arch/mips/kvm/kvm_mips.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c index 93da750..71a1fc1 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/kvm_mips.c @@ -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; -- 1.7.11.7 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 5/6] mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG 2013-05-21 20:54 [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests David Daney ` (3 preceding siblings ...) 2013-05-21 20:54 ` [PATCH v4 4/6] mips/kvm: Use ARRAY_SIZE() instead of hardcoded constants in kvm_arch_vcpu_ioctl_{s,g}et_regs David Daney @ 2013-05-21 20:54 ` David Daney 2013-05-22 17:44 ` Sanjay Lal 2013-05-21 20:54 ` [PATCH v4 6/6] mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls David Daney 2013-05-22 12:54 ` [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests Gleb Natapov 6 siblings, 1 reply; 11+ messages in thread From: David Daney @ 2013-05-21 20:54 UTC (permalink / raw) To: linux-mips, ralf, kvm, Sanjay Lal, Gleb Natapov; +Cc: linux-kernel, David Daney From: David Daney <david.daney@cavium.com> 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. Code related to implementing KVM_SET_ONE_REG/KVM_GET_ONE_REG is consolidated in to kvm_trap_emul.c, now unused code and definitions are removed. Signed-off-by: David Daney <david.daney@cavium.com> --- arch/mips/include/asm/kvm.h | 91 +++++++++-- arch/mips/include/asm/kvm_host.h | 4 - arch/mips/kvm/kvm_mips.c | 90 +---------- arch/mips/kvm/kvm_trap_emul.c | 338 ++++++++++++++++++++++++++++++++++----- 4 files changed, 383 insertions(+), 140 deletions(-) diff --git a/arch/mips/include/asm/kvm.h b/arch/mips/include/asm/kvm.h index d145ead..3f424f5 100644 --- a/arch/mips/include/asm/kvm.h +++ b/arch/mips/include/asm/kvm.h @@ -13,10 +13,11 @@ #include <linux/types.h> -#define __KVM_MIPS - -#define N_MIPS_COPROC_REGS 32 -#define N_MIPS_COPROC_SEL 8 +/* + * KVM MIPS specific structures and definitions. + * + * Some parts derived from the x86 version of this file. + */ /* * for KVM_GET_REGS and KVM_SET_REGS @@ -31,12 +32,6 @@ struct kvm_regs { __u64 hi; __u64 lo; __u64 pc; - - __u32 cp0reg[N_MIPS_COPROC_REGS][N_MIPS_COPROC_SEL]; -}; - -/* for KVM_GET_SREGS and KVM_SET_SREGS */ -struct kvm_sregs { }; /* @@ -55,21 +50,89 @@ struct kvm_fpu { __u32 pad; }; + +/* + * For MIPS, we use KVM_SET_ONE_REG and KVM_GET_ONE_REG to access CP0 + * registers. The id field is broken down as follows: + * + * bits[2..0] - Register 'sel' index. + * bits[7..3] - Register 'rd' index. + * bits[15..8] - Must be zero. + * bits[63..16] - 1 -> CP0 registers. + * + * Other sets registers may be added in the future. Each set would + * have its own identifier in bits[63..16]. + * + * The addr field of struct kvm_one_reg must point to an aligned + * 64-bit wide location. For registers that are narrower than + * 64-bits, the value is stored in the low order bits of the location, + * and sign extended to 64-bits. + * + * The registers defined in struct kvm_regs are also accessible, the + * id values for these are below. + */ + +#define KVM_REG_MIPS_R0 0 +#define KVM_REG_MIPS_R1 1 +#define KVM_REG_MIPS_R2 2 +#define KVM_REG_MIPS_R3 3 +#define KVM_REG_MIPS_R4 4 +#define KVM_REG_MIPS_R5 5 +#define KVM_REG_MIPS_R6 6 +#define KVM_REG_MIPS_R7 7 +#define KVM_REG_MIPS_R8 8 +#define KVM_REG_MIPS_R9 9 +#define KVM_REG_MIPS_R10 10 +#define KVM_REG_MIPS_R11 11 +#define KVM_REG_MIPS_R12 12 +#define KVM_REG_MIPS_R13 13 +#define KVM_REG_MIPS_R14 14 +#define KVM_REG_MIPS_R15 15 +#define KVM_REG_MIPS_R16 16 +#define KVM_REG_MIPS_R17 17 +#define KVM_REG_MIPS_R18 18 +#define KVM_REG_MIPS_R19 19 +#define KVM_REG_MIPS_R20 20 +#define KVM_REG_MIPS_R21 21 +#define KVM_REG_MIPS_R22 22 +#define KVM_REG_MIPS_R23 23 +#define KVM_REG_MIPS_R24 24 +#define KVM_REG_MIPS_R25 25 +#define KVM_REG_MIPS_R26 26 +#define KVM_REG_MIPS_R27 27 +#define KVM_REG_MIPS_R28 28 +#define KVM_REG_MIPS_R29 29 +#define KVM_REG_MIPS_R30 30 +#define KVM_REG_MIPS_R31 31 + +#define KVM_REG_MIPS_HI 32 +#define KVM_REG_MIPS_LO 33 +#define KVM_REG_MIPS_PC 34 + +/* + * KVM MIPS specific structures and definitions + * + */ struct kvm_debug_exit_arch { + __u64 epc; }; /* for KVM_SET_GUEST_DEBUG */ struct kvm_guest_debug_arch { }; +/* definition of registers in kvm_run */ +struct kvm_sync_regs { +}; + +/* dummy definition */ +struct kvm_sregs { +}; + struct kvm_mips_interrupt { /* in */ __u32 cpu; __u32 irq; }; -/* definition of registers in kvm_run */ -struct kvm_sync_regs { -}; - #endif /* __LINUX_KVM_MIPS_H */ diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h index 143875c..4d6fa0b 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h @@ -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); diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c index 71a1fc1..bc879bd 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/kvm_mips.c @@ -51,16 +51,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { {NULL} }; -static int kvm_mips_reset_vcpu(struct kvm_vcpu *vcpu) -{ - int i; - for_each_possible_cpu(i) { - vcpu->arch.guest_kernel_asid[i] = 0; - vcpu->arch.guest_user_asid[i] = 0; - } - return 0; -} - gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) { return gfn; @@ -435,42 +425,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) return r; } - -int -kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_mips_interrupt *irq) -{ - int intr = (int)irq->irq; - struct kvm_vcpu *dvcpu = NULL; - - if (intr == 3 || intr == -3 || intr == 4 || intr == -4) - kvm_debug("%s: CPU: %d, INTR: %d\n", __func__, irq->cpu, - (int)intr); - - if (irq->cpu == -1) - dvcpu = vcpu; - else - dvcpu = vcpu->kvm->vcpus[irq->cpu]; - - if (intr == 2 || intr == 3 || intr == 4) { - kvm_mips_callbacks->queue_io_int(dvcpu, irq); - - } else if (intr == -2 || intr == -3 || intr == -4) { - kvm_mips_callbacks->dequeue_io_int(dvcpu, irq); - } else { - kvm_err("%s: invalid interrupt ioctl (%d:%d)\n", __func__, - irq->cpu, irq->irq); - return -EINVAL; - } - - dvcpu->arch.wait = 0; - - if (waitqueue_active(&dvcpu->wq)) { - wake_up_interruptible(&dvcpu->wq); - } - - return 0; -} - int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, struct kvm_mp_state *mp_state) @@ -485,42 +439,6 @@ kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, return -EINVAL; } -long -kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) -{ - struct kvm_vcpu *vcpu = filp->private_data; - void __user *argp = (void __user *)arg; - long r; - int intr; - - switch (ioctl) { - case KVM_NMI: - /* Treat the NMI as a CPU reset */ - r = kvm_mips_reset_vcpu(vcpu); - break; - case KVM_INTERRUPT: - { - struct kvm_mips_interrupt irq; - r = -EFAULT; - if (copy_from_user(&irq, argp, sizeof(irq))) - goto out; - - intr = (int)irq.irq; - - kvm_debug("[%d] %s: irq: %d\n", vcpu->vcpu_id, __func__, - irq.irq); - - r = kvm_vcpu_ioctl_interrupt(vcpu, &irq); - break; - } - default: - r = -EINVAL; - } - -out: - return r; -} - /* * Get (and clear) the dirty memory log for a memory slot. */ @@ -627,6 +545,9 @@ int kvm_dev_ioctl_check_extension(long ext) int r; switch (ext) { + case KVM_CAP_ONE_REG: + r = 1; + break; case KVM_CAP_COALESCED_MMIO: r = KVM_COALESCED_MMIO_PAGE_OFFSET; break; @@ -635,7 +556,6 @@ int kvm_dev_ioctl_check_extension(long ext) break; } return r; - } int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) @@ -684,7 +604,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) vcpu->arch.lo = regs->lo; vcpu->arch.pc = regs->pc; - return kvm_mips_callbacks->vcpu_ioctl_set_regs(vcpu, regs); + return 0; } int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) @@ -698,7 +618,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) regs->lo = vcpu->arch.lo; regs->pc = vcpu->arch.pc; - return kvm_mips_callbacks->vcpu_ioctl_get_regs(vcpu, regs); + return 0; } void kvm_mips_comparecount_func(unsigned long data) diff --git a/arch/mips/kvm/kvm_trap_emul.c b/arch/mips/kvm/kvm_trap_emul.c index 466aeef..46561f4 100644 --- a/arch/mips/kvm/kvm_trap_emul.c +++ b/arch/mips/kvm/kvm_trap_emul.c @@ -13,7 +13,7 @@ #include <linux/err.h> #include <linux/module.h> #include <linux/vmalloc.h> - +#include <linux/fs.h> #include <linux/kvm_host.h> #include "kvm_mips_opcode.h" @@ -345,54 +345,320 @@ static int kvm_trap_emul_handle_break(struct kvm_vcpu *vcpu) return ret; } -static int -kvm_trap_emul_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) +#define KVM_REG_MIPS_CP0_INDEX (0x10000 + 8 * 0 + 0) +#define KVM_REG_MIPS_CP0_ENTRYLO0 (0x10000 + 8 * 2 + 0) +#define KVM_REG_MIPS_CP0_ENTRYLO1 (0x10000 + 8 * 3 + 0) +#define KVM_REG_MIPS_CP0_CONTEXT (0x10000 + 8 * 4 + 0) +#define KVM_REG_MIPS_CP0_USERLOCAL (0x10000 + 8 * 4 + 2) +#define KVM_REG_MIPS_CP0_PAGEMASK (0x10000 + 8 * 5 + 0) +#define KVM_REG_MIPS_CP0_PAGEGRAIN (0x10000 + 8 * 5 + 1) +#define KVM_REG_MIPS_CP0_WIRED (0x10000 + 8 * 6 + 0) +#define KVM_REG_MIPS_CP0_HWRENA (0x10000 + 8 * 7 + 0) +#define KVM_REG_MIPS_CP0_BADVADDR (0x10000 + 8 * 8 + 0) +#define KVM_REG_MIPS_CP0_COUNT (0x10000 + 8 * 9 + 0) +#define KVM_REG_MIPS_CP0_ENTRYHI (0x10000 + 8 * 10 + 0) +#define KVM_REG_MIPS_CP0_COMPARE (0x10000 + 8 * 11 + 0) +#define KVM_REG_MIPS_CP0_STATUS (0x10000 + 8 * 12 + 0) +#define KVM_REG_MIPS_CP0_CAUSE (0x10000 + 8 * 13 + 0) +#define KVM_REG_MIPS_CP0_EBASE (0x10000 + 8 * 15 + 1) +#define KVM_REG_MIPS_CP0_CONFIG (0x10000 + 8 * 16 + 0) +#define KVM_REG_MIPS_CP0_CONFIG1 (0x10000 + 8 * 16 + 1) +#define KVM_REG_MIPS_CP0_CONFIG2 (0x10000 + 8 * 16 + 2) +#define KVM_REG_MIPS_CP0_CONFIG3 (0x10000 + 8 * 16 + 3) +#define KVM_REG_MIPS_CP0_CONFIG7 (0x10000 + 8 * 16 + 7) +#define KVM_REG_MIPS_CP0_XCONTEXT (0x10000 + 8 * 20 + 0) +#define KVM_REG_MIPS_CP0_ERROREPC (0x10000 + 8 * 30 + 0) + +static u64 kvm_mips_get_one_regs[] = { + KVM_REG_MIPS_R0, + KVM_REG_MIPS_R1, + KVM_REG_MIPS_R2, + KVM_REG_MIPS_R3, + KVM_REG_MIPS_R4, + KVM_REG_MIPS_R5, + KVM_REG_MIPS_R6, + KVM_REG_MIPS_R7, + KVM_REG_MIPS_R8, + KVM_REG_MIPS_R9, + KVM_REG_MIPS_R10, + KVM_REG_MIPS_R11, + KVM_REG_MIPS_R12, + KVM_REG_MIPS_R13, + KVM_REG_MIPS_R14, + KVM_REG_MIPS_R15, + KVM_REG_MIPS_R16, + KVM_REG_MIPS_R17, + KVM_REG_MIPS_R18, + KVM_REG_MIPS_R19, + KVM_REG_MIPS_R20, + KVM_REG_MIPS_R21, + KVM_REG_MIPS_R22, + KVM_REG_MIPS_R23, + KVM_REG_MIPS_R24, + KVM_REG_MIPS_R25, + KVM_REG_MIPS_R26, + KVM_REG_MIPS_R27, + KVM_REG_MIPS_R28, + KVM_REG_MIPS_R29, + KVM_REG_MIPS_R30, + KVM_REG_MIPS_R31, + + KVM_REG_MIPS_HI, + KVM_REG_MIPS_LO, + KVM_REG_MIPS_PC, + + KVM_REG_MIPS_CP0_INDEX, + KVM_REG_MIPS_CP0_CONTEXT, + KVM_REG_MIPS_CP0_PAGEMASK, + KVM_REG_MIPS_CP0_WIRED, + KVM_REG_MIPS_CP0_BADVADDR, + KVM_REG_MIPS_CP0_ENTRYHI, + KVM_REG_MIPS_CP0_STATUS, + KVM_REG_MIPS_CP0_CAUSE, + /* EPC set via kvm_regs, et al. */ + KVM_REG_MIPS_CP0_CONFIG, + KVM_REG_MIPS_CP0_CONFIG1, + KVM_REG_MIPS_CP0_CONFIG2, + KVM_REG_MIPS_CP0_CONFIG3, + KVM_REG_MIPS_CP0_CONFIG7, + KVM_REG_MIPS_CP0_ERROREPC +}; + +static int kvm_mips_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) { + u64 __user *uaddr = (u64 __user *)(long)reg->addr; + struct mips_coproc *cop0 = vcpu->arch.cop0; + s64 v; - kvm_write_c0_guest_index(cop0, regs->cp0reg[MIPS_CP0_TLB_INDEX][0]); - kvm_write_c0_guest_context(cop0, regs->cp0reg[MIPS_CP0_TLB_CONTEXT][0]); - kvm_write_c0_guest_badvaddr(cop0, regs->cp0reg[MIPS_CP0_BAD_VADDR][0]); - kvm_write_c0_guest_entryhi(cop0, regs->cp0reg[MIPS_CP0_TLB_HI][0]); - kvm_write_c0_guest_epc(cop0, regs->cp0reg[MIPS_CP0_EXC_PC][0]); + switch (reg->id) { + case KVM_REG_MIPS_R0 ... KVM_REG_MIPS_R31: + v = (long)vcpu->arch.gprs[reg->id - KVM_REG_MIPS_R0]; + break; + case KVM_REG_MIPS_HI: + v = (long)vcpu->arch.hi; + break; + case KVM_REG_MIPS_LO: + v = (long)vcpu->arch.lo; + break; + case KVM_REG_MIPS_PC: + v = (long)vcpu->arch.pc; + break; - kvm_write_c0_guest_status(cop0, regs->cp0reg[MIPS_CP0_STATUS][0]); - kvm_write_c0_guest_cause(cop0, regs->cp0reg[MIPS_CP0_CAUSE][0]); - kvm_write_c0_guest_pagemask(cop0, - regs->cp0reg[MIPS_CP0_TLB_PG_MASK][0]); - kvm_write_c0_guest_wired(cop0, regs->cp0reg[MIPS_CP0_TLB_WIRED][0]); - kvm_write_c0_guest_errorepc(cop0, regs->cp0reg[MIPS_CP0_ERROR_PC][0]); + case KVM_REG_MIPS_CP0_INDEX: + v = (long)kvm_read_c0_guest_index(cop0); + break; + case KVM_REG_MIPS_CP0_CONTEXT: + v = (long)kvm_read_c0_guest_context(cop0); + break; + case KVM_REG_MIPS_CP0_PAGEMASK: + v = (long)kvm_read_c0_guest_pagemask(cop0); + break; + case KVM_REG_MIPS_CP0_WIRED: + v = (long)kvm_read_c0_guest_wired(cop0); + break; + case KVM_REG_MIPS_CP0_BADVADDR: + v = (long)kvm_read_c0_guest_badvaddr(cop0); + break; + case KVM_REG_MIPS_CP0_ENTRYHI: + v = (long)kvm_read_c0_guest_entryhi(cop0); + break; + case KVM_REG_MIPS_CP0_STATUS: + v = (long)kvm_read_c0_guest_status(cop0); + break; + case KVM_REG_MIPS_CP0_CAUSE: + v = (long)kvm_read_c0_guest_cause(cop0); + break; + case KVM_REG_MIPS_CP0_ERROREPC: + v = (long)kvm_read_c0_guest_errorepc(cop0); + break; + case KVM_REG_MIPS_CP0_CONFIG: + v = (long)kvm_read_c0_guest_config(cop0); + break; + case KVM_REG_MIPS_CP0_CONFIG1: + v = (long)kvm_read_c0_guest_config1(cop0); + break; + case KVM_REG_MIPS_CP0_CONFIG2: + v = (long)kvm_read_c0_guest_config2(cop0); + break; + case KVM_REG_MIPS_CP0_CONFIG3: + v = (long)kvm_read_c0_guest_config3(cop0); + break; + case KVM_REG_MIPS_CP0_CONFIG7: + v = (long)kvm_read_c0_guest_config7(cop0); + break; + default: + return -EINVAL; + } + return put_user(v, uaddr); +} + +static int kvm_mips_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) +{ + u64 __user *uaddr = (u64 __user *)(long)reg->addr; + struct mips_coproc *cop0 = vcpu->arch.cop0; + u64 v; + + if (get_user(v, uaddr) != 0) + return -EFAULT; + + switch (reg->id) { + case KVM_REG_MIPS_R0: + /* Silently ignore requests to set $0 */ + break; + case KVM_REG_MIPS_R1 ... KVM_REG_MIPS_R31: + vcpu->arch.gprs[reg->id - KVM_REG_MIPS_R0] = v; + break; + case KVM_REG_MIPS_HI: + vcpu->arch.hi = v; + break; + case KVM_REG_MIPS_LO: + vcpu->arch.lo = v; + break; + case KVM_REG_MIPS_PC: + vcpu->arch.pc = v; + break; + case KVM_REG_MIPS_CP0_INDEX: + kvm_write_c0_guest_index(cop0, v); + break; + case KVM_REG_MIPS_CP0_CONTEXT: + kvm_write_c0_guest_context(cop0, v); + break; + case KVM_REG_MIPS_CP0_PAGEMASK: + kvm_write_c0_guest_pagemask(cop0, v); + break; + case KVM_REG_MIPS_CP0_WIRED: + kvm_write_c0_guest_wired(cop0, v); + break; + case KVM_REG_MIPS_CP0_BADVADDR: + kvm_write_c0_guest_badvaddr(cop0, v); + break; + case KVM_REG_MIPS_CP0_ENTRYHI: + kvm_write_c0_guest_entryhi(cop0, v); + break; + case KVM_REG_MIPS_CP0_STATUS: + kvm_write_c0_guest_status(cop0, v); + break; + case KVM_REG_MIPS_CP0_CAUSE: + kvm_write_c0_guest_cause(cop0, v); + break; + case KVM_REG_MIPS_CP0_ERROREPC: + kvm_write_c0_guest_errorepc(cop0, v); + break; + default: + return -EINVAL; + } return 0; } -static int -kvm_trap_emul_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) +static int kvm_mips_reset_vcpu(struct kvm_vcpu *vcpu) { - struct mips_coproc *cop0 = vcpu->arch.cop0; + int i; + for_each_possible_cpu(i) { + vcpu->arch.guest_kernel_asid[i] = 0; + vcpu->arch.guest_user_asid[i] = 0; + } + return 0; +} + +int +kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_mips_interrupt *irq) +{ + int intr = (int)irq->irq; + struct kvm_vcpu *dvcpu = NULL; - regs->cp0reg[MIPS_CP0_TLB_INDEX][0] = kvm_read_c0_guest_index(cop0); - regs->cp0reg[MIPS_CP0_TLB_CONTEXT][0] = kvm_read_c0_guest_context(cop0); - regs->cp0reg[MIPS_CP0_BAD_VADDR][0] = kvm_read_c0_guest_badvaddr(cop0); - regs->cp0reg[MIPS_CP0_TLB_HI][0] = kvm_read_c0_guest_entryhi(cop0); - regs->cp0reg[MIPS_CP0_EXC_PC][0] = kvm_read_c0_guest_epc(cop0); - - regs->cp0reg[MIPS_CP0_STATUS][0] = kvm_read_c0_guest_status(cop0); - regs->cp0reg[MIPS_CP0_CAUSE][0] = kvm_read_c0_guest_cause(cop0); - regs->cp0reg[MIPS_CP0_TLB_PG_MASK][0] = - kvm_read_c0_guest_pagemask(cop0); - regs->cp0reg[MIPS_CP0_TLB_WIRED][0] = kvm_read_c0_guest_wired(cop0); - regs->cp0reg[MIPS_CP0_ERROR_PC][0] = kvm_read_c0_guest_errorepc(cop0); - - regs->cp0reg[MIPS_CP0_CONFIG][0] = kvm_read_c0_guest_config(cop0); - regs->cp0reg[MIPS_CP0_CONFIG][1] = kvm_read_c0_guest_config1(cop0); - regs->cp0reg[MIPS_CP0_CONFIG][2] = kvm_read_c0_guest_config2(cop0); - regs->cp0reg[MIPS_CP0_CONFIG][3] = kvm_read_c0_guest_config3(cop0); - regs->cp0reg[MIPS_CP0_CONFIG][7] = kvm_read_c0_guest_config7(cop0); + if (intr == 3 || intr == -3 || intr == 4 || intr == -4) + kvm_debug("%s: CPU: %d, INTR: %d\n", __func__, irq->cpu, + (int)intr); + + if (irq->cpu == -1) + dvcpu = vcpu; + else + dvcpu = vcpu->kvm->vcpus[irq->cpu]; + + if (intr == 2 || intr == 3 || intr == 4) { + kvm_mips_callbacks->queue_io_int(dvcpu, irq); + + } else if (intr == -2 || intr == -3 || intr == -4) { + kvm_mips_callbacks->dequeue_io_int(dvcpu, irq); + } else { + kvm_err("%s: invalid interrupt ioctl (%d:%d)\n", __func__, + irq->cpu, irq->irq); + return -EINVAL; + } + + dvcpu->arch.wait = 0; + + if (waitqueue_active(&dvcpu->wq)) + wake_up_interruptible(&dvcpu->wq); return 0; } +long +kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) +{ + struct kvm_vcpu *vcpu = filp->private_data; + void __user *argp = (void __user *)arg; + long r; + + switch (ioctl) { + case KVM_SET_ONE_REG: + case KVM_GET_ONE_REG: { + struct kvm_one_reg reg; + if (copy_from_user(®, argp, sizeof(reg))) + return -EFAULT; + if (ioctl == KVM_SET_ONE_REG) + return kvm_mips_set_reg(vcpu, ®); + else + return kvm_mips_get_reg(vcpu, ®); + } + case KVM_GET_REG_LIST: { + struct kvm_reg_list __user *user_list = argp; + u64 __user *reg_dest; + struct kvm_reg_list reg_list; + unsigned n; + + if (copy_from_user(®_list, user_list, sizeof(reg_list))) + return -EFAULT; + n = reg_list.n; + reg_list.n = ARRAY_SIZE(kvm_mips_get_one_regs); + if (copy_to_user(user_list, ®_list, sizeof(reg_list))) + return -EFAULT; + if (n < reg_list.n) + return -E2BIG; + reg_dest = user_list->reg; + if (copy_to_user(reg_dest, kvm_mips_get_one_regs, + sizeof(kvm_mips_get_one_regs))) + return -EFAULT; + return 0; + } + case KVM_NMI: + /* Treat the NMI as a CPU reset */ + r = kvm_mips_reset_vcpu(vcpu); + break; + case KVM_INTERRUPT: + { + struct kvm_mips_interrupt irq; + r = -EFAULT; + if (copy_from_user(&irq, argp, sizeof(irq))) + goto out; + + kvm_debug("[%d] %s: irq: %d\n", vcpu->vcpu_id, __func__, + irq.irq); + + r = kvm_vcpu_ioctl_interrupt(vcpu, &irq); + break; + } + default: + r = -ENOIOCTLCMD; + } + +out: + return r; +} + static int kvm_trap_emul_vm_init(struct kvm *kvm) { return 0; @@ -471,8 +737,6 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = { .dequeue_io_int = kvm_mips_dequeue_io_int_cb, .irq_deliver = kvm_mips_irq_deliver_cb, .irq_clear = kvm_mips_irq_clear_cb, - .vcpu_ioctl_get_regs = kvm_trap_emul_ioctl_get_regs, - .vcpu_ioctl_set_regs = kvm_trap_emul_ioctl_set_regs, }; int kvm_mips_emulation_init(struct kvm_mips_callbacks **install_callbacks) -- 1.7.11.7 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v4 5/6] mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG 2013-05-21 20:54 ` [PATCH v4 5/6] mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG David Daney @ 2013-05-22 17:44 ` Sanjay Lal 2013-05-22 17:55 ` David Daney 0 siblings, 1 reply; 11+ messages in thread From: Sanjay Lal @ 2013-05-22 17:44 UTC (permalink / raw) To: David Daney Cc: linux-mips, ralf, kvm, Gleb Natapov, linux-kernel, David Daney On May 21, 2013, at 1:54 PM, David Daney wrote: > From: David Daney <david.daney@cavium.com> > > 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. > > Code related to implementing KVM_SET_ONE_REG/KVM_GET_ONE_REG is > consolidated in to kvm_trap_emul.c, now unused code and definitions > are removed. > > Signed-off-by: David Daney <david.daney@cavium.com> > --- > arch/mips/include/asm/kvm.h | 91 +++++++++-- > arch/mips/include/asm/kvm_host.h | 4 - > arch/mips/kvm/kvm_mips.c | 90 +---------- > arch/mips/kvm/kvm_trap_emul.c | 338 ++++++++++++++++++++++++++++++++++----- > 4 files changed, 383 insertions(+), 140 deletions(-) > > diff --git a/arch/mips/include/asm/kvm.h b/arch/mips/include/asm/kvm.h > index d145ead..3f424f5 100644 > --- a/arch/mips/include/asm/kvm.h > +++ b/arch/mips/include/asm/kvm.h > @@ -13,10 +13,11 @@ > > #include <linux/types.h> > > -#define __KVM_MIPS > - > -#define N_MIPS_COPROC_REGS 32 > -#define N_MIPS_COPROC_SEL 8 > +/* > + * KVM MIPS specific structures and definitions. > + * > + * Some parts derived from the x86 version of this file. > + */ > > /* > * for KVM_GET_REGS and KVM_SET_REGS > @@ -31,12 +32,6 @@ struct kvm_regs { > __u64 hi; > __u64 lo; > __u64 pc; > - > - __u32 cp0reg[N_MIPS_COPROC_REGS][N_MIPS_COPROC_SEL]; > -}; > - > -/* for KVM_GET_SREGS and KVM_SET_SREGS */ > -struct kvm_sregs { > }; > > /* > @@ -55,21 +50,89 @@ struct kvm_fpu { > __u32 pad; > }; > > + > +/* > + * For MIPS, we use KVM_SET_ONE_REG and KVM_GET_ONE_REG to access CP0 > + * registers. The id field is broken down as follows: > + * > + * bits[2..0] - Register 'sel' index. > + * bits[7..3] - Register 'rd' index. > + * bits[15..8] - Must be zero. > + * bits[63..16] - 1 -> CP0 registers. > + * > + * Other sets registers may be added in the future. Each set would > + * have its own identifier in bits[63..16]. > + * > + * The addr field of struct kvm_one_reg must point to an aligned > + * 64-bit wide location. For registers that are narrower than > + * 64-bits, the value is stored in the low order bits of the location, > + * and sign extended to 64-bits. > + * > + * The registers defined in struct kvm_regs are also accessible, the > + * id values for these are below. > + */ > + > +#define KVM_REG_MIPS_R0 0 > +#define KVM_REG_MIPS_R1 1 > +#define KVM_REG_MIPS_R2 2 > +#define KVM_REG_MIPS_R3 3 > +#define KVM_REG_MIPS_R4 4 > +#define KVM_REG_MIPS_R5 5 > +#define KVM_REG_MIPS_R6 6 > +#define KVM_REG_MIPS_R7 7 > +#define KVM_REG_MIPS_R8 8 > +#define KVM_REG_MIPS_R9 9 > +#define KVM_REG_MIPS_R10 10 > +#define KVM_REG_MIPS_R11 11 > +#define KVM_REG_MIPS_R12 12 > +#define KVM_REG_MIPS_R13 13 > +#define KVM_REG_MIPS_R14 14 > +#define KVM_REG_MIPS_R15 15 > +#define KVM_REG_MIPS_R16 16 > +#define KVM_REG_MIPS_R17 17 > +#define KVM_REG_MIPS_R18 18 > +#define KVM_REG_MIPS_R19 19 > +#define KVM_REG_MIPS_R20 20 > +#define KVM_REG_MIPS_R21 21 > +#define KVM_REG_MIPS_R22 22 > +#define KVM_REG_MIPS_R23 23 > +#define KVM_REG_MIPS_R24 24 > +#define KVM_REG_MIPS_R25 25 > +#define KVM_REG_MIPS_R26 26 > +#define KVM_REG_MIPS_R27 27 > +#define KVM_REG_MIPS_R28 28 > +#define KVM_REG_MIPS_R29 29 > +#define KVM_REG_MIPS_R30 30 > +#define KVM_REG_MIPS_R31 31 > + > +#define KVM_REG_MIPS_HI 32 > +#define KVM_REG_MIPS_LO 33 > +#define KVM_REG_MIPS_PC 34 > + > +/* > + * KVM MIPS specific structures and definitions > + * > + */ > struct kvm_debug_exit_arch { > + __u64 epc; > }; > > /* for KVM_SET_GUEST_DEBUG */ > struct kvm_guest_debug_arch { > }; > > +/* definition of registers in kvm_run */ > +struct kvm_sync_regs { > +}; > + > +/* dummy definition */ > +struct kvm_sregs { > +}; > + > struct kvm_mips_interrupt { > /* in */ > __u32 cpu; > __u32 irq; > }; > > -/* definition of registers in kvm_run */ > -struct kvm_sync_regs { > -}; > - > #endif /* __LINUX_KVM_MIPS_H */ > diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h > index 143875c..4d6fa0b 100644 > --- a/arch/mips/include/asm/kvm_host.h > +++ b/arch/mips/include/asm/kvm_host.h > @@ -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); > diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c > index 71a1fc1..bc879bd 100644 > --- a/arch/mips/kvm/kvm_mips.c > +++ b/arch/mips/kvm/kvm_mips.c > @@ -51,16 +51,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { > {NULL} > }; > > -static int kvm_mips_reset_vcpu(struct kvm_vcpu *vcpu) > -{ > - int i; > - for_each_possible_cpu(i) { > - vcpu->arch.guest_kernel_asid[i] = 0; > - vcpu->arch.guest_user_asid[i] = 0; > - } > - return 0; > -} > - > gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) > { > return gfn; > @@ -435,42 +425,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) > > return r; > } > - > -int > -kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_mips_interrupt *irq) > -{ > - int intr = (int)irq->irq; > - struct kvm_vcpu *dvcpu = NULL; > - > - if (intr == 3 || intr == -3 || intr == 4 || intr == -4) > - kvm_debug("%s: CPU: %d, INTR: %d\n", __func__, irq->cpu, > - (int)intr); > - > - if (irq->cpu == -1) > - dvcpu = vcpu; > - else > - dvcpu = vcpu->kvm->vcpus[irq->cpu]; > - > - if (intr == 2 || intr == 3 || intr == 4) { > - kvm_mips_callbacks->queue_io_int(dvcpu, irq); > - > - } else if (intr == -2 || intr == -3 || intr == -4) { > - kvm_mips_callbacks->dequeue_io_int(dvcpu, irq); > - } else { > - kvm_err("%s: invalid interrupt ioctl (%d:%d)\n", __func__, > - irq->cpu, irq->irq); > - return -EINVAL; > - } > - > - dvcpu->arch.wait = 0; > - > - if (waitqueue_active(&dvcpu->wq)) { > - wake_up_interruptible(&dvcpu->wq); > - } > - > - return 0; > -} > - > int > kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, > struct kvm_mp_state *mp_state) > @@ -485,42 +439,6 @@ kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, > return -EINVAL; > } > > -long > -kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) > -{ > - struct kvm_vcpu *vcpu = filp->private_data; > - void __user *argp = (void __user *)arg; > - long r; > - int intr; > - > - switch (ioctl) { > - case KVM_NMI: > - /* Treat the NMI as a CPU reset */ > - r = kvm_mips_reset_vcpu(vcpu); > - break; > - case KVM_INTERRUPT: > - { > - struct kvm_mips_interrupt irq; > - r = -EFAULT; > - if (copy_from_user(&irq, argp, sizeof(irq))) > - goto out; > - > - intr = (int)irq.irq; > - > - kvm_debug("[%d] %s: irq: %d\n", vcpu->vcpu_id, __func__, > - irq.irq); > - > - r = kvm_vcpu_ioctl_interrupt(vcpu, &irq); > - break; > - } > - default: > - r = -EINVAL; > - } > - > -out: > - return r; > -} > - > /* > * Get (and clear) the dirty memory log for a memory slot. > */ > @@ -627,6 +545,9 @@ int kvm_dev_ioctl_check_extension(long ext) > int r; > > switch (ext) { > + case KVM_CAP_ONE_REG: > + r = 1; > + break; > case KVM_CAP_COALESCED_MMIO: > r = KVM_COALESCED_MMIO_PAGE_OFFSET; > break; > @@ -635,7 +556,6 @@ int kvm_dev_ioctl_check_extension(long ext) > break; > } > return r; > - > } > > int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) > @@ -684,7 +604,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) > vcpu->arch.lo = regs->lo; > vcpu->arch.pc = regs->pc; > > - return kvm_mips_callbacks->vcpu_ioctl_set_regs(vcpu, regs); > + return 0; > } > > int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) > @@ -698,7 +618,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) > regs->lo = vcpu->arch.lo; > regs->pc = vcpu->arch.pc; > > - return kvm_mips_callbacks->vcpu_ioctl_get_regs(vcpu, regs); > + return 0; > } > > void kvm_mips_comparecount_func(unsigned long data) > diff --git a/arch/mips/kvm/kvm_trap_emul.c b/arch/mips/kvm/kvm_trap_emul.c > index 466aeef..46561f4 100644 > --- a/arch/mips/kvm/kvm_trap_emul.c > +++ b/arch/mips/kvm/kvm_trap_emul.c > @@ -13,7 +13,7 @@ > #include <linux/err.h> > #include <linux/module.h> > #include <linux/vmalloc.h> > - > +#include <linux/fs.h> > #include <linux/kvm_host.h> > > #include "kvm_mips_opcode.h" > @@ -345,54 +345,320 @@ static int kvm_trap_emul_handle_break(struct kvm_vcpu *vcpu) > return ret; > } > > -static int > -kvm_trap_emul_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) > +#define KVM_REG_MIPS_CP0_INDEX (0x10000 + 8 * 0 + 0) > +#define KVM_REG_MIPS_CP0_ENTRYLO0 (0x10000 + 8 * 2 + 0) > +#define KVM_REG_MIPS_CP0_ENTRYLO1 (0x10000 + 8 * 3 + 0) > +#define KVM_REG_MIPS_CP0_CONTEXT (0x10000 + 8 * 4 + 0) > +#define KVM_REG_MIPS_CP0_USERLOCAL (0x10000 + 8 * 4 + 2) > +#define KVM_REG_MIPS_CP0_PAGEMASK (0x10000 + 8 * 5 + 0) > +#define KVM_REG_MIPS_CP0_PAGEGRAIN (0x10000 + 8 * 5 + 1) > +#define KVM_REG_MIPS_CP0_WIRED (0x10000 + 8 * 6 + 0) > +#define KVM_REG_MIPS_CP0_HWRENA (0x10000 + 8 * 7 + 0) > +#define KVM_REG_MIPS_CP0_BADVADDR (0x10000 + 8 * 8 + 0) > +#define KVM_REG_MIPS_CP0_COUNT (0x10000 + 8 * 9 + 0) > +#define KVM_REG_MIPS_CP0_ENTRYHI (0x10000 + 8 * 10 + 0) > +#define KVM_REG_MIPS_CP0_COMPARE (0x10000 + 8 * 11 + 0) > +#define KVM_REG_MIPS_CP0_STATUS (0x10000 + 8 * 12 + 0) > +#define KVM_REG_MIPS_CP0_CAUSE (0x10000 + 8 * 13 + 0) > +#define KVM_REG_MIPS_CP0_EBASE (0x10000 + 8 * 15 + 1) > +#define KVM_REG_MIPS_CP0_CONFIG (0x10000 + 8 * 16 + 0) > +#define KVM_REG_MIPS_CP0_CONFIG1 (0x10000 + 8 * 16 + 1) > +#define KVM_REG_MIPS_CP0_CONFIG2 (0x10000 + 8 * 16 + 2) > +#define KVM_REG_MIPS_CP0_CONFIG3 (0x10000 + 8 * 16 + 3) > +#define KVM_REG_MIPS_CP0_CONFIG7 (0x10000 + 8 * 16 + 7) > +#define KVM_REG_MIPS_CP0_XCONTEXT (0x10000 + 8 * 20 + 0) > +#define KVM_REG_MIPS_CP0_ERROREPC (0x10000 + 8 * 30 + 0) > + > +static u64 kvm_mips_get_one_regs[] = { > + KVM_REG_MIPS_R0, > + KVM_REG_MIPS_R1, > + KVM_REG_MIPS_R2, > + KVM_REG_MIPS_R3, > + KVM_REG_MIPS_R4, > + KVM_REG_MIPS_R5, > + KVM_REG_MIPS_R6, > + KVM_REG_MIPS_R7, > + KVM_REG_MIPS_R8, > + KVM_REG_MIPS_R9, > + KVM_REG_MIPS_R10, > + KVM_REG_MIPS_R11, > + KVM_REG_MIPS_R12, > + KVM_REG_MIPS_R13, > + KVM_REG_MIPS_R14, > + KVM_REG_MIPS_R15, > + KVM_REG_MIPS_R16, > + KVM_REG_MIPS_R17, > + KVM_REG_MIPS_R18, > + KVM_REG_MIPS_R19, > + KVM_REG_MIPS_R20, > + KVM_REG_MIPS_R21, > + KVM_REG_MIPS_R22, > + KVM_REG_MIPS_R23, > + KVM_REG_MIPS_R24, > + KVM_REG_MIPS_R25, > + KVM_REG_MIPS_R26, > + KVM_REG_MIPS_R27, > + KVM_REG_MIPS_R28, > + KVM_REG_MIPS_R29, > + KVM_REG_MIPS_R30, > + KVM_REG_MIPS_R31, > + > + KVM_REG_MIPS_HI, > + KVM_REG_MIPS_LO, > + KVM_REG_MIPS_PC, > + > + KVM_REG_MIPS_CP0_INDEX, > + KVM_REG_MIPS_CP0_CONTEXT, > + KVM_REG_MIPS_CP0_PAGEMASK, > + KVM_REG_MIPS_CP0_WIRED, > + KVM_REG_MIPS_CP0_BADVADDR, > + KVM_REG_MIPS_CP0_ENTRYHI, > + KVM_REG_MIPS_CP0_STATUS, > + KVM_REG_MIPS_CP0_CAUSE, > + /* EPC set via kvm_regs, et al. */ > + KVM_REG_MIPS_CP0_CONFIG, > + KVM_REG_MIPS_CP0_CONFIG1, > + KVM_REG_MIPS_CP0_CONFIG2, > + KVM_REG_MIPS_CP0_CONFIG3, > + KVM_REG_MIPS_CP0_CONFIG7, > + KVM_REG_MIPS_CP0_ERROREPC > +}; > + > +static int kvm_mips_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > { > + u64 __user *uaddr = (u64 __user *)(long)reg->addr; > + > struct mips_coproc *cop0 = vcpu->arch.cop0; > + s64 v; > > - kvm_write_c0_guest_index(cop0, regs->cp0reg[MIPS_CP0_TLB_INDEX][0]); > - kvm_write_c0_guest_context(cop0, regs->cp0reg[MIPS_CP0_TLB_CONTEXT][0]); > - kvm_write_c0_guest_badvaddr(cop0, regs->cp0reg[MIPS_CP0_BAD_VADDR][0]); > - kvm_write_c0_guest_entryhi(cop0, regs->cp0reg[MIPS_CP0_TLB_HI][0]); > - kvm_write_c0_guest_epc(cop0, regs->cp0reg[MIPS_CP0_EXC_PC][0]); > + switch (reg->id) { > + case KVM_REG_MIPS_R0 ... KVM_REG_MIPS_R31: > + v = (long)vcpu->arch.gprs[reg->id - KVM_REG_MIPS_R0]; > + break; > + case KVM_REG_MIPS_HI: > + v = (long)vcpu->arch.hi; > + break; > + case KVM_REG_MIPS_LO: > + v = (long)vcpu->arch.lo; > + break; > + case KVM_REG_MIPS_PC: > + v = (long)vcpu->arch.pc; > + break; > > - kvm_write_c0_guest_status(cop0, regs->cp0reg[MIPS_CP0_STATUS][0]); > - kvm_write_c0_guest_cause(cop0, regs->cp0reg[MIPS_CP0_CAUSE][0]); > - kvm_write_c0_guest_pagemask(cop0, > - regs->cp0reg[MIPS_CP0_TLB_PG_MASK][0]); > - kvm_write_c0_guest_wired(cop0, regs->cp0reg[MIPS_CP0_TLB_WIRED][0]); > - kvm_write_c0_guest_errorepc(cop0, regs->cp0reg[MIPS_CP0_ERROR_PC][0]); > + case KVM_REG_MIPS_CP0_INDEX: > + v = (long)kvm_read_c0_guest_index(cop0); > + break; > + case KVM_REG_MIPS_CP0_CONTEXT: > + v = (long)kvm_read_c0_guest_context(cop0); > + break; > + case KVM_REG_MIPS_CP0_PAGEMASK: > + v = (long)kvm_read_c0_guest_pagemask(cop0); > + break; > + case KVM_REG_MIPS_CP0_WIRED: > + v = (long)kvm_read_c0_guest_wired(cop0); > + break; > + case KVM_REG_MIPS_CP0_BADVADDR: > + v = (long)kvm_read_c0_guest_badvaddr(cop0); > + break; > + case KVM_REG_MIPS_CP0_ENTRYHI: > + v = (long)kvm_read_c0_guest_entryhi(cop0); > + break; > + case KVM_REG_MIPS_CP0_STATUS: > + v = (long)kvm_read_c0_guest_status(cop0); > + break; > + case KVM_REG_MIPS_CP0_CAUSE: > + v = (long)kvm_read_c0_guest_cause(cop0); > + break; > + case KVM_REG_MIPS_CP0_ERROREPC: > + v = (long)kvm_read_c0_guest_errorepc(cop0); > + break; > + case KVM_REG_MIPS_CP0_CONFIG: > + v = (long)kvm_read_c0_guest_config(cop0); > + break; > + case KVM_REG_MIPS_CP0_CONFIG1: > + v = (long)kvm_read_c0_guest_config1(cop0); > + break; > + case KVM_REG_MIPS_CP0_CONFIG2: > + v = (long)kvm_read_c0_guest_config2(cop0); > + break; > + case KVM_REG_MIPS_CP0_CONFIG3: > + v = (long)kvm_read_c0_guest_config3(cop0); > + break; > + case KVM_REG_MIPS_CP0_CONFIG7: > + v = (long)kvm_read_c0_guest_config7(cop0); > + break; > + default: > + return -EINVAL; > + } > + return put_user(v, uaddr); > +} > + > +static int kvm_mips_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > +{ > + u64 __user *uaddr = (u64 __user *)(long)reg->addr; > + struct mips_coproc *cop0 = vcpu->arch.cop0; > + u64 v; > + > + if (get_user(v, uaddr) != 0) > + return -EFAULT; > + > + switch (reg->id) { > + case KVM_REG_MIPS_R0: > + /* Silently ignore requests to set $0 */ > + break; > + case KVM_REG_MIPS_R1 ... KVM_REG_MIPS_R31: > + vcpu->arch.gprs[reg->id - KVM_REG_MIPS_R0] = v; > + break; > + case KVM_REG_MIPS_HI: > + vcpu->arch.hi = v; > + break; > + case KVM_REG_MIPS_LO: > + vcpu->arch.lo = v; > + break; > + case KVM_REG_MIPS_PC: > + vcpu->arch.pc = v; > + break; > > + case KVM_REG_MIPS_CP0_INDEX: > + kvm_write_c0_guest_index(cop0, v); > + break; > + case KVM_REG_MIPS_CP0_CONTEXT: > + kvm_write_c0_guest_context(cop0, v); > + break; > + case KVM_REG_MIPS_CP0_PAGEMASK: > + kvm_write_c0_guest_pagemask(cop0, v); > + break; > + case KVM_REG_MIPS_CP0_WIRED: > + kvm_write_c0_guest_wired(cop0, v); > + break; > + case KVM_REG_MIPS_CP0_BADVADDR: > + kvm_write_c0_guest_badvaddr(cop0, v); > + break; > + case KVM_REG_MIPS_CP0_ENTRYHI: > + kvm_write_c0_guest_entryhi(cop0, v); > + break; > + case KVM_REG_MIPS_CP0_STATUS: > + kvm_write_c0_guest_status(cop0, v); > + break; > + case KVM_REG_MIPS_CP0_CAUSE: > + kvm_write_c0_guest_cause(cop0, v); > + break; > + case KVM_REG_MIPS_CP0_ERROREPC: > + kvm_write_c0_guest_errorepc(cop0, v); > + break; > + default: > + return -EINVAL; > + } > return 0; > } > > -static int > -kvm_trap_emul_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) > +static int kvm_mips_reset_vcpu(struct kvm_vcpu *vcpu) > { > - struct mips_coproc *cop0 = vcpu->arch.cop0; > + int i; > + for_each_possible_cpu(i) { > + vcpu->arch.guest_kernel_asid[i] = 0; > + vcpu->arch.guest_user_asid[i] = 0; > + } > + return 0; > +} > + > +int > +kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_mips_interrupt *irq) > +{ > + int intr = (int)irq->irq; > + struct kvm_vcpu *dvcpu = NULL; > > - regs->cp0reg[MIPS_CP0_TLB_INDEX][0] = kvm_read_c0_guest_index(cop0); > - regs->cp0reg[MIPS_CP0_TLB_CONTEXT][0] = kvm_read_c0_guest_context(cop0); > - regs->cp0reg[MIPS_CP0_BAD_VADDR][0] = kvm_read_c0_guest_badvaddr(cop0); > - regs->cp0reg[MIPS_CP0_TLB_HI][0] = kvm_read_c0_guest_entryhi(cop0); > - regs->cp0reg[MIPS_CP0_EXC_PC][0] = kvm_read_c0_guest_epc(cop0); > - > - regs->cp0reg[MIPS_CP0_STATUS][0] = kvm_read_c0_guest_status(cop0); > - regs->cp0reg[MIPS_CP0_CAUSE][0] = kvm_read_c0_guest_cause(cop0); > - regs->cp0reg[MIPS_CP0_TLB_PG_MASK][0] = > - kvm_read_c0_guest_pagemask(cop0); > - regs->cp0reg[MIPS_CP0_TLB_WIRED][0] = kvm_read_c0_guest_wired(cop0); > - regs->cp0reg[MIPS_CP0_ERROR_PC][0] = kvm_read_c0_guest_errorepc(cop0); > - > - regs->cp0reg[MIPS_CP0_CONFIG][0] = kvm_read_c0_guest_config(cop0); > - regs->cp0reg[MIPS_CP0_CONFIG][1] = kvm_read_c0_guest_config1(cop0); > - regs->cp0reg[MIPS_CP0_CONFIG][2] = kvm_read_c0_guest_config2(cop0); > - regs->cp0reg[MIPS_CP0_CONFIG][3] = kvm_read_c0_guest_config3(cop0); > - regs->cp0reg[MIPS_CP0_CONFIG][7] = kvm_read_c0_guest_config7(cop0); > + if (intr == 3 || intr == -3 || intr == 4 || intr == -4) > + kvm_debug("%s: CPU: %d, INTR: %d\n", __func__, irq->cpu, > + (int)intr); > + > + if (irq->cpu == -1) > + dvcpu = vcpu; > + else > + dvcpu = vcpu->kvm->vcpus[irq->cpu]; > + > + if (intr == 2 || intr == 3 || intr == 4) { > + kvm_mips_callbacks->queue_io_int(dvcpu, irq); > + > + } else if (intr == -2 || intr == -3 || intr == -4) { > + kvm_mips_callbacks->dequeue_io_int(dvcpu, irq); > + } else { > + kvm_err("%s: invalid interrupt ioctl (%d:%d)\n", __func__, > + irq->cpu, irq->irq); > + return -EINVAL; > + } > + > + dvcpu->arch.wait = 0; > + > + if (waitqueue_active(&dvcpu->wq)) > + wake_up_interruptible(&dvcpu->wq); > > return 0; > } > > +long > +kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) > +{ > + struct kvm_vcpu *vcpu = filp->private_data; > + void __user *argp = (void __user *)arg; > + long r; > + > + switch (ioctl) { > + case KVM_SET_ONE_REG: > + case KVM_GET_ONE_REG: { > + struct kvm_one_reg reg; > + if (copy_from_user(®, argp, sizeof(reg))) > + return -EFAULT; > + if (ioctl == KVM_SET_ONE_REG) > + return kvm_mips_set_reg(vcpu, ®); > + else > + return kvm_mips_get_reg(vcpu, ®); > + } > + case KVM_GET_REG_LIST: { > + struct kvm_reg_list __user *user_list = argp; > + u64 __user *reg_dest; > + struct kvm_reg_list reg_list; > + unsigned n; > + > + if (copy_from_user(®_list, user_list, sizeof(reg_list))) > + return -EFAULT; > + n = reg_list.n; > + reg_list.n = ARRAY_SIZE(kvm_mips_get_one_regs); > + if (copy_to_user(user_list, ®_list, sizeof(reg_list))) > + return -EFAULT; > + if (n < reg_list.n) > + return -E2BIG; > + reg_dest = user_list->reg; > + if (copy_to_user(reg_dest, kvm_mips_get_one_regs, > + sizeof(kvm_mips_get_one_regs))) > + return -EFAULT; > + return 0; > + } > + case KVM_NMI: > + /* Treat the NMI as a CPU reset */ > + r = kvm_mips_reset_vcpu(vcpu); > + break; > + case KVM_INTERRUPT: > + { > + struct kvm_mips_interrupt irq; > + r = -EFAULT; > + if (copy_from_user(&irq, argp, sizeof(irq))) > + goto out; > + > + kvm_debug("[%d] %s: irq: %d\n", vcpu->vcpu_id, __func__, > + irq.irq); > + > + r = kvm_vcpu_ioctl_interrupt(vcpu, &irq); > + break; > + } > + default: > + r = -ENOIOCTLCMD; > + } > + > +out: > + return r; > +} > + > static int kvm_trap_emul_vm_init(struct kvm *kvm) > { > return 0; > @@ -471,8 +737,6 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = { > .dequeue_io_int = kvm_mips_dequeue_io_int_cb, > .irq_deliver = kvm_mips_irq_deliver_cb, > .irq_clear = kvm_mips_irq_clear_cb, > - .vcpu_ioctl_get_regs = kvm_trap_emul_ioctl_get_regs, > - .vcpu_ioctl_set_regs = kvm_trap_emul_ioctl_set_regs, > }; > > int kvm_mips_emulation_init(struct kvm_mips_callbacks **install_callbacks) > -- > 1.7.11.7 > > Most of the functions that have been relocated to kvm_trap_emul.c should stay in kvm_mips.c. They are/will shared between the trap and emulate and VZ modes. They include kvm_mips_reset_vcpu(), kvm_vcpu_ioctl_interrupt(), kvm_arch_vcpu_ioctl(). kvm_mips_get_reg() and kvm_mips_set_reg() should be in kvm_mips.c as they will be shared by the trap and emulate and VZ code. If you plan on defining specific versions of these functions for Cavium's implementation of KVM, please make them callbacks. Regards Sanjay ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 5/6] mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG 2013-05-22 17:44 ` Sanjay Lal @ 2013-05-22 17:55 ` David Daney 0 siblings, 0 replies; 11+ messages in thread From: David Daney @ 2013-05-22 17:55 UTC (permalink / raw) To: Sanjay Lal Cc: David Daney, linux-mips, ralf, kvm, Gleb Natapov, linux-kernel, David Daney On 05/22/2013 10:44 AM, Sanjay Lal wrote: > > On May 21, 2013, at 1:54 PM, David Daney wrote: > >> From: David Daney <david.daney@cavium.com> >> >> 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. >> >> Code related to implementing KVM_SET_ONE_REG/KVM_GET_ONE_REG is >> consolidated in to kvm_trap_emul.c, now unused code and definitions >> are removed. >> >> Signed-off-by: David Daney <david.daney@cavium.com> >> --- >> arch/mips/include/asm/kvm.h | 91 +++++++++-- >> arch/mips/include/asm/kvm_host.h | 4 - >> arch/mips/kvm/kvm_mips.c | 90 +---------- >> arch/mips/kvm/kvm_trap_emul.c | 338 ++++++++++++++++++++++++++++++++++----- >> 4 files changed, 383 insertions(+), 140 deletions(-) [...] >> > > Most of the functions that have been relocated to kvm_trap_emul.c should stay in kvm_mips.c. They are/will shared between the trap and emulate and VZ modes. They include kvm_mips_reset_vcpu(), kvm_vcpu_ioctl_interrupt(), kvm_arch_vcpu_ioctl(). > > kvm_mips_get_reg() and kvm_mips_set_reg() should be in kvm_mips.c as they will be shared by the trap and emulate and VZ code. > OK, I will revise the patch set to rearrange things in a manner that leaves these in kvm_mips.c. However, this is of secondary importance to the question of the suitability of the ABI. > If you plan on defining specific versions of these functions for Cavium's implementation of KVM, please make them callbacks. > There will soon be follow on patches that do exactly that. ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v4 6/6] mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls. 2013-05-21 20:54 [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests David Daney ` (4 preceding siblings ...) 2013-05-21 20:54 ` [PATCH v4 5/6] mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG David Daney @ 2013-05-21 20:54 ` David Daney 2013-05-22 12:54 ` [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests Gleb Natapov 6 siblings, 0 replies; 11+ messages in thread From: David Daney @ 2013-05-21 20:54 UTC (permalink / raw) To: linux-mips, ralf, kvm, Sanjay Lal, Gleb Natapov; +Cc: linux-kernel, David Daney From: David Daney <david.daney@cavium.com> 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. Signed-off-by: David Daney <david.daney@cavium.com> --- arch/mips/kvm/kvm_mips.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c index bc879bd..8ea4bc5 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/kvm_mips.c @@ -185,7 +185,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, @@ -391,7 +391,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) @@ -429,14 +429,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; } /* @@ -483,7 +483,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) switch (ioctl) { default: - r = -EINVAL; + r = -ENOIOCTLCMD; } return r; @@ -511,13 +511,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) @@ -527,12 +527,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) -- 1.7.11.7 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests. 2013-05-21 20:54 [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests David Daney ` (5 preceding siblings ...) 2013-05-21 20:54 ` [PATCH v4 6/6] mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls David Daney @ 2013-05-22 12:54 ` Gleb Natapov 2013-05-22 16:33 ` Sanjay Lal 6 siblings, 1 reply; 11+ messages in thread From: Gleb Natapov @ 2013-05-22 12:54 UTC (permalink / raw) To: David Daney; +Cc: linux-mips, ralf, kvm, Sanjay Lal, linux-kernel, David Daney On Tue, May 21, 2013 at 01:54:49PM -0700, David Daney wrote: > From: David Daney <david.daney@cavium.com> > > 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. > Sanjay, is this looks good to you. What userspace MIPS is using for machine emulation? Is there corresponding patches to the userspace? > Chandes 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_REG > mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls. > > arch/mips/include/asm/kvm.h | 137 ++++++++++++---- > arch/mips/include/asm/kvm_host.h | 4 - > arch/mips/kvm/kvm_mips.c | 118 +++----------- > arch/mips/kvm/kvm_trap_emul.c | 338 ++++++++++++++++++++++++++++++++++----- > 4 files changed, 430 insertions(+), 167 deletions(-) > > -- > 1.7.11.7 -- Gleb. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests. 2013-05-22 12:54 ` [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests Gleb Natapov @ 2013-05-22 16:33 ` Sanjay Lal 0 siblings, 0 replies; 11+ messages in thread From: Sanjay Lal @ 2013-05-22 16:33 UTC (permalink / raw) To: Gleb Natapov Cc: David Daney, linux-mips, ralf, kvm, linux-kernel, David Daney On May 22, 2013, at 5:54 AM, Gleb Natapov wrote: > On Tue, May 21, 2013 at 01:54:49PM -0700, David Daney wrote: >> From: David Daney <david.daney@cavium.com> >> >> 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. >> > Sanjay, is this looks good to you. > > What userspace MIPS is using for machine emulation? Is there corresponding > patches to the userspace? Gleb, I'll post some comments on the patches later in the day. We use QEMu for the machine emulation. I am in the process of integrating with the new ABI, and will post the QEMU patches shortly. Regards Sanjay ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-05-22 17:55 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-21 20:54 [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests David Daney
2013-05-21 20:54 ` [PATCH v4 1/6] mips/kvm: Fix ABI for use of FPU David Daney
2013-05-21 20:54 ` [PATCH v4 2/6] mips/kvm: Fix ABI for use of 64-bit registers David Daney
2013-05-21 20:54 ` [PATCH v4 3/6] mips/kvm: Fix name of gpr field in struct kvm_regs David Daney
2013-05-21 20:54 ` [PATCH v4 4/6] mips/kvm: Use ARRAY_SIZE() instead of hardcoded constants in kvm_arch_vcpu_ioctl_{s,g}et_regs David Daney
2013-05-21 20:54 ` [PATCH v4 5/6] mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REG David Daney
2013-05-22 17:44 ` Sanjay Lal
2013-05-22 17:55 ` David Daney
2013-05-21 20:54 ` [PATCH v4 6/6] mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls David Daney
2013-05-22 12:54 ` [PATCH v4 0/6] mips/kvm: Fix ABI for compatibility with 64-bit guests Gleb Natapov
2013-05-22 16:33 ` Sanjay Lal
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox