From mboxrd@z Thu Jan 1 00:00:00 1970 From: ehrhardt@linux.vnet.ibm.com Date: Wed, 30 Jan 2008 12:31:57 +0000 Subject: [kvm-ppc-devel] [PATCH] [3/4] Add userpace tlb access Message-Id: <12016963202210-git-send-email-ehrhardt@linux.vnet.ibm.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-ppc@vger.kernel.org This version of the userspace tlb access has some changes out of discussions with Zhang Wei responsible for the e500 work and Hollis for ppc440. It now transports only a single tlb entry per get/set and uses an index specifier that every architecture can interpret as needed e.g. e500 could map tlb0/tlb1 in the high bits and the array index in them in the low bits while ppc440 only needs a linear index. The right vcpu is already selected since this is a vcpu ioctl. Internally the selction of the right tlb layout in kernel e.g. for set/get_tlb or in userspace for kvm_dump_tlb is now based on the pvr that selects the defines the guest type. Subject: [PATCH] [3/4] Add userpace tlb access From: Christian Ehrhardt This adds userspace tlb access transporting a single tlb entry to/from userspace. It has an index variable passed with the call to specify the tlb entry to get/set. For the guest tlb get&set is supported while the shadow tlb can only be read from userspace. Signed-off-by: Christian Ehrhardt --- arch/powerpc/kvm/powerpc.c | 101 ++++++++++++++++++++++++++++++++++------- include/asm-powerpc/kvm.h | 17 ++++++ include/asm-powerpc/kvm_host.h | 7 -- include/linux/kvm.h | 4 + 4 files changed, 106 insertions(+), 23 deletions(-) diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -512,24 +512,9 @@ int kvm_arch_vcpu_init(struct kvm_vcpu * /* Initial guest state: 16MB mapping 0 -> 0, PC = 0, MSR = 0, R1 = 16MB */ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) { - struct tlbe *tlbe = &vcpu->arch.guest_tlb[0]; - - tlbe->tid = 0; - tlbe->word0 = PPC44x_TLB_16M | PPC44x_TLB_VALID; - tlbe->word1 = 0; - tlbe->word2 = PPC44x_TLB_SX | PPC44x_TLB_SW | PPC44x_TLB_SR; - - tlbe++; - tlbe->tid = 0; - tlbe->word0 = 0xef600000 | PPC44x_TLB_4K | PPC44x_TLB_VALID; - tlbe->word1 = 0xef600000; - tlbe->word2 = PPC44x_TLB_SX | PPC44x_TLB_SW | PPC44x_TLB_SR - | PPC44x_TLB_I | PPC44x_TLB_G; - vcpu->arch.pc = 0; vcpu->arch.guest_msr = 0; vcpu->arch.shadow_msr = MSR_PR|MSR_EE|MSR_IS|MSR_DS; - vcpu->arch.gpr[1] = (16<<20) - 8; /* -8 for the callee-save LR slot */ /* Eye-catching number so we know if the guest takes an interrupt * before it's programmed its own IVPR. */ @@ -764,7 +749,7 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_ } long kvm_arch_vcpu_ioctl(struct file *filp, - unsigned int ioctl, unsigned long arg) + unsigned int ioctl, unsigned long arg) { struct kvm_vcpu *vcpu = filp->private_data; void __user *argp = (void __user *)arg; @@ -777,6 +762,90 @@ long kvm_arch_vcpu_ioctl(struct file *fi if (copy_from_user(&irq, argp, sizeof(irq))) goto out; r = kvm_vcpu_ioctl_interrupt(vcpu, &irq); + break; + } + case KVM_GET_GUEST_TLB: { + struct kvm_vcpu *vcpu = filp->private_data; + struct kvm_tlbe __user *utlbe = (struct kvm_tlbe __user *)arg; + __u32 index; + + r = copy_from_user(&index, &(utlbe->index), sizeof(__u32)); + if (r) + return r; + + switch (vcpu->kvm->arch.pvr) { + case KVM_PPC_PVR_PPC44X: { + if (unlikely(index > (PPC44x_TLB_SIZE-1))) { + r = -EINVAL; + break; + } + r = copy_to_user(&(utlbe->tlbe_ppc440), + &(vcpu->arch.guest_tlb[index]), + sizeof(struct tlbe)); + if (r) + return r; + break; + } + default: { + r = -ENOTSUPP; + } + } + break; + } + case KVM_SET_GUEST_TLB: { + struct kvm_vcpu *vcpu = filp->private_data; + struct kvm_tlbe __user *utlbe = (struct kvm_tlbe __user *)arg; + __u32 index; + + r = copy_from_user(&index, &(utlbe->index), sizeof(__u32)); + if (r) + return r; + + switch (vcpu->kvm->arch.pvr) { + case KVM_PPC_PVR_PPC44X: { + if (unlikely(index > (PPC44x_TLB_SIZE-1))) { + r = -EINVAL; + break; + } + r = copy_from_user(&(vcpu->arch.guest_tlb[index]), + &(utlbe->tlbe_ppc440), + sizeof(struct tlbe)); + if (r) + return r; + break; + } + default: { + r = -ENOTSUPP; + } + } + break; + } + case KVM_GET_SHADOW_TLB: { + struct kvm_vcpu *vcpu = filp->private_data; + struct kvm_tlbe __user *utlbe = (struct kvm_tlbe __user *)arg; + __u32 index; + + r = copy_from_user(&index, &(utlbe->index), sizeof(__u32)); + if (r) + return r; + + switch (vcpu->kvm->arch.pvr) { + case KVM_PPC_PVR_PPC44X: { + if (unlikely(index > (PPC44x_TLB_SIZE-1))) { + r = -EINVAL; + break; + } + r = copy_to_user(&(utlbe->tlbe_ppc440), + &(vcpu->arch.shadow_tlb[index]), + sizeof(struct tlbe)); + if (r) + return r; + break; + } + default: { + r = -ENOTSUPP; + } + } break; } default: diff --git a/include/asm-powerpc/kvm.h b/include/asm-powerpc/kvm.h --- a/include/asm-powerpc/kvm.h +++ b/include/asm-powerpc/kvm.h @@ -21,6 +21,7 @@ #define __POWERPC_KVM_H__ #include +#include struct kvm_regs { __u32 pc; @@ -53,6 +54,22 @@ struct kvm_fpu { struct kvm_fpu { }; +struct tlbe { + __u32 tid; /* Only the low 8 bits are used. */ + __u32 word0; + __u32 word1; + __u32 word2; +}; + +struct kvm_tlbe { + __u32 index; + union { + struct tlbe tlbe_ppc440; + /* Fix the size of the union (hopefully) */ + char padding[32]; + }; +}; + /* * guest ident based on virtual pvr's to differ between cpu types * this may later on be extended to appear and behave as real pvr's diff --git a/include/asm-powerpc/kvm_host.h b/include/asm-powerpc/kvm_host.h --- a/include/asm-powerpc/kvm_host.h +++ b/include/asm-powerpc/kvm_host.h @@ -39,13 +39,6 @@ struct kvm_vcpu_stat { u32 mmio_exits; u32 signal_exits; u32 light_exits; -}; - -struct tlbe { - u32 tid; /* Only the low 8 bits are used. */ - u32 word0; - u32 word1; - u32 word2; }; struct kvm_arch { diff --git a/include/linux/kvm.h b/include/linux/kvm.h --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -292,4 +292,8 @@ struct kvm_vapic_addr { /* Available with KVM_CAP_VAPIC */ #define KVM_SET_VAPIC_ADDR _IOW(KVMIO, 0x93, struct kvm_vapic_addr) +#define KVM_GET_GUEST_TLB _IOR(KVMIO, 0x94, struct kvm_tlbe) +#define KVM_SET_GUEST_TLB _IOW(KVMIO, 0x95, struct kvm_tlbe) +#define KVM_GET_SHADOW_TLB _IOR(KVMIO, 0x96, struct kvm_tlbe) + #endif ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ kvm-ppc-devel mailing list kvm-ppc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel