From: Paul Mackerras <paulus@samba.org> To: Alexander Graf <agraf@suse.de>, Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: kvm-ppc@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH 09/23] KVM: PPC: Book3S PR: Correct errors in H_ENTER implementation Date: Tue, 6 Aug 2013 14:20:37 +1000 [thread overview] Message-ID: <20130806042037.GO19254@iris.ozlabs.ibm.com> (raw) In-Reply-To: <20130806041259.GF19254@iris.ozlabs.ibm.com> The implementation of H_ENTER in PR KVM has some errors: * With H_EXACT not set, if the HPTEG is full, we return H_PTEG_FULL as the return value of kvmppc_h_pr_enter, but the caller is expecting one of the EMULATE_* values. The H_PTEG_FULL needs to go in the guest's R3 instead. * With H_EXACT set, if the selected HPTE is already valid, the H_ENTER call should return a H_PTEG_FULL error. This fixes these errors and also makes it write only the selected HPTE, not the whole group, since only the selected HPTE has been modified. This also micro-optimizes the calculations involving pte_index and i. Signed-off-by: Paul Mackerras <paulus@samba.org> --- arch/powerpc/kvm/book3s_pr_papr.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c index da0e0bc..38f1899 100644 --- a/arch/powerpc/kvm/book3s_pr_papr.c +++ b/arch/powerpc/kvm/book3s_pr_papr.c @@ -21,6 +21,8 @@ #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h> +#define HPTE_SIZE 16 /* bytes per HPT entry */ + static unsigned long get_pteg_addr(struct kvm_vcpu *vcpu, long pte_index) { struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu); @@ -40,32 +42,39 @@ static int kvmppc_h_pr_enter(struct kvm_vcpu *vcpu) long pte_index = kvmppc_get_gpr(vcpu, 5); unsigned long pteg[2 * 8]; unsigned long pteg_addr, i, *hpte; + long int ret; + i = pte_index & 7; pte_index &= ~7UL; pteg_addr = get_pteg_addr(vcpu, pte_index); copy_from_user(pteg, (void __user *)pteg_addr, sizeof(pteg)); hpte = pteg; + ret = H_PTEG_FULL; if (likely((flags & H_EXACT) == 0)) { - pte_index &= ~7UL; for (i = 0; ; ++i) { if (i == 8) - return H_PTEG_FULL; + goto done; if ((*hpte & HPTE_V_VALID) == 0) break; hpte += 2; } } else { - i = kvmppc_get_gpr(vcpu, 5) & 7UL; hpte += i * 2; + if (*hpte & HPTE_V_VALID) + goto done; } hpte[0] = kvmppc_get_gpr(vcpu, 6); hpte[1] = kvmppc_get_gpr(vcpu, 7); - copy_to_user((void __user *)pteg_addr, pteg, sizeof(pteg)); - kvmppc_set_gpr(vcpu, 3, H_SUCCESS); + pteg_addr += i * HPTE_SIZE; + copy_to_user((void __user *)pteg_addr, hpte, HPTE_SIZE); kvmppc_set_gpr(vcpu, 4, pte_index | i); + ret = H_SUCCESS; + + done: + kvmppc_set_gpr(vcpu, 3, ret); return EMULATE_DONE; } -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Paul Mackerras <paulus@samba.org> To: Alexander Graf <agraf@suse.de>, Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: kvm-ppc@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH 09/23] KVM: PPC: Book3S PR: Correct errors in H_ENTER implementation Date: Tue, 06 Aug 2013 04:20:37 +0000 [thread overview] Message-ID: <20130806042037.GO19254@iris.ozlabs.ibm.com> (raw) In-Reply-To: <20130806041259.GF19254@iris.ozlabs.ibm.com> The implementation of H_ENTER in PR KVM has some errors: * With H_EXACT not set, if the HPTEG is full, we return H_PTEG_FULL as the return value of kvmppc_h_pr_enter, but the caller is expecting one of the EMULATE_* values. The H_PTEG_FULL needs to go in the guest's R3 instead. * With H_EXACT set, if the selected HPTE is already valid, the H_ENTER call should return a H_PTEG_FULL error. This fixes these errors and also makes it write only the selected HPTE, not the whole group, since only the selected HPTE has been modified. This also micro-optimizes the calculations involving pte_index and i. Signed-off-by: Paul Mackerras <paulus@samba.org> --- arch/powerpc/kvm/book3s_pr_papr.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c index da0e0bc..38f1899 100644 --- a/arch/powerpc/kvm/book3s_pr_papr.c +++ b/arch/powerpc/kvm/book3s_pr_papr.c @@ -21,6 +21,8 @@ #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h> +#define HPTE_SIZE 16 /* bytes per HPT entry */ + static unsigned long get_pteg_addr(struct kvm_vcpu *vcpu, long pte_index) { struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu); @@ -40,32 +42,39 @@ static int kvmppc_h_pr_enter(struct kvm_vcpu *vcpu) long pte_index = kvmppc_get_gpr(vcpu, 5); unsigned long pteg[2 * 8]; unsigned long pteg_addr, i, *hpte; + long int ret; + i = pte_index & 7; pte_index &= ~7UL; pteg_addr = get_pteg_addr(vcpu, pte_index); copy_from_user(pteg, (void __user *)pteg_addr, sizeof(pteg)); hpte = pteg; + ret = H_PTEG_FULL; if (likely((flags & H_EXACT) = 0)) { - pte_index &= ~7UL; for (i = 0; ; ++i) { if (i = 8) - return H_PTEG_FULL; + goto done; if ((*hpte & HPTE_V_VALID) = 0) break; hpte += 2; } } else { - i = kvmppc_get_gpr(vcpu, 5) & 7UL; hpte += i * 2; + if (*hpte & HPTE_V_VALID) + goto done; } hpte[0] = kvmppc_get_gpr(vcpu, 6); hpte[1] = kvmppc_get_gpr(vcpu, 7); - copy_to_user((void __user *)pteg_addr, pteg, sizeof(pteg)); - kvmppc_set_gpr(vcpu, 3, H_SUCCESS); + pteg_addr += i * HPTE_SIZE; + copy_to_user((void __user *)pteg_addr, hpte, HPTE_SIZE); kvmppc_set_gpr(vcpu, 4, pte_index | i); + ret = H_SUCCESS; + + done: + kvmppc_set_gpr(vcpu, 3, ret); return EMULATE_DONE; } -- 1.8.3.1
next prev parent reply other threads:[~2013-08-06 4:20 UTC|newest] Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-08-06 4:12 [PATCH 00/23] Allow PR and HV KVM to coexist in one kernel Paul Mackerras 2013-08-06 4:12 ` Paul Mackerras 2013-08-06 4:13 ` [PATCH 01/23] KVM: PPC: Book3S: Fix compile error in XICS emulation Paul Mackerras 2013-08-06 4:13 ` Paul Mackerras 2013-08-28 22:51 ` Alexander Graf 2013-08-28 22:51 ` Alexander Graf 2013-08-06 4:14 ` [PATCH 02/23] KVM: PPC: Book3S PR: Don't corrupt guest state when kernel uses VMX Paul Mackerras 2013-08-06 4:14 ` Paul Mackerras 2013-08-08 15:49 ` Aneesh Kumar K.V 2013-08-08 15:49 ` Aneesh Kumar K.V 2013-08-28 22:51 ` Alexander Graf 2013-08-28 22:51 ` Alexander Graf 2013-08-06 4:15 ` [PATCH 03/23] KVM: PPC: Book3S PR: Make instruction fetch fallback work for system calls Paul Mackerras 2013-08-06 4:15 ` Paul Mackerras 2013-08-28 22:51 ` Alexander Graf 2013-08-28 22:51 ` Alexander Graf 2013-08-06 4:16 ` [PATCH 04/23] KVM: PPC: Book3S PR: Keep volatile reg values in vcpu rather than shadow_vcpu Paul Mackerras 2013-08-06 4:16 ` Paul Mackerras 2013-08-11 11:06 ` Aneesh Kumar K.V 2013-08-11 11:18 ` Aneesh Kumar K.V 2013-08-28 22:00 ` Alexander Graf 2013-08-28 22:00 ` Alexander Graf 2013-08-29 5:04 ` Paul Mackerras 2013-08-29 5:04 ` Paul Mackerras 2013-08-29 12:46 ` Alexander Graf 2013-08-29 12:46 ` Alexander Graf 2013-08-06 4:18 ` [PATCH 05/23] KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate() Paul Mackerras 2013-08-06 4:18 ` Paul Mackerras 2013-08-28 22:51 ` Alexander Graf 2013-08-28 22:51 ` Alexander Graf 2013-08-06 4:18 ` [PATCH 06/23] KVM: PPC: Book3S PR: Allow guest to use 64k pages Paul Mackerras 2013-08-06 4:18 ` Paul Mackerras 2013-08-28 22:56 ` Alexander Graf 2013-08-28 22:56 ` Alexander Graf 2013-08-29 5:17 ` Paul Mackerras 2013-08-29 5:17 ` Paul Mackerras 2013-08-29 12:48 ` Alexander Graf 2013-08-29 12:48 ` Alexander Graf 2013-08-06 4:19 ` [PATCH 07/23] KVM: PPC: Book3S PR: Use 64k host pages where possible Paul Mackerras 2013-08-06 4:19 ` Paul Mackerras 2013-08-28 23:24 ` Alexander Graf 2013-08-28 23:24 ` Alexander Graf 2013-08-29 5:23 ` Paul Mackerras 2013-08-29 5:23 ` Paul Mackerras 2013-08-29 12:43 ` Alexander Graf 2013-08-29 12:43 ` Alexander Graf 2013-08-06 4:20 ` [PATCH 08/23] KVM: PPC: Book3S PR: Handle PP0 page-protection bit in guest HPTEs Paul Mackerras 2013-08-06 4:20 ` Paul Mackerras 2013-08-06 4:20 ` Paul Mackerras [this message] 2013-08-06 4:20 ` [PATCH 09/23] KVM: PPC: Book3S PR: Correct errors in H_ENTER implementation Paul Mackerras 2013-08-06 4:21 ` [PATCH 10/23] KVM: PPC: Book3S PR: Make HPT accesses and updates SMP-safe Paul Mackerras 2013-08-06 4:21 ` Paul Mackerras 2013-08-06 4:21 ` [PATCH 11/23] KVM: PPC: Book3S PR: Allocate kvm_vcpu structs from kvm_vcpu_cache Paul Mackerras 2013-08-06 4:21 ` Paul Mackerras 2013-08-12 10:03 ` Aneesh Kumar K.V 2013-08-12 10:15 ` Aneesh Kumar K.V 2013-08-06 4:22 ` [PATCH 12/23] KVM: PPC: Book3S HV: Better handling of exceptions that happen in real mode Paul Mackerras 2013-08-06 4:22 ` Paul Mackerras 2013-08-06 4:22 ` [PATCH 13/23] KVM: PPC: Book3S: Move skip-interrupt handlers to common code Paul Mackerras 2013-08-06 4:22 ` Paul Mackerras 2013-08-06 4:23 ` [PATCH 14/23] KVM: PPC: Book3S PR: Delay disabling relocation-on interrupts Paul Mackerras 2013-08-06 4:23 ` Paul Mackerras 2013-08-30 16:30 ` Alexander Graf 2013-08-30 16:30 ` Alexander Graf 2013-08-30 22:55 ` Paul Mackerras 2013-08-30 22:55 ` Paul Mackerras 2013-08-30 23:13 ` Alexander Graf 2013-08-30 23:13 ` Alexander Graf 2013-08-31 5:42 ` Paul Mackerras 2013-08-31 5:42 ` Paul Mackerras 2013-08-06 4:24 ` [PATCH 15/23] KVM: PPC: Book3S: Rename symbols that exist in both PR and HV KVM Paul Mackerras 2013-08-06 4:24 ` Paul Mackerras 2013-08-06 4:24 ` [PATCH 16/23] KVM: PPC: Book3S: Merge implementations of KVM_PPC_GET_SMMU_INFO ioctl Paul Mackerras 2013-08-06 4:24 ` Paul Mackerras 2013-08-06 4:25 ` [PATCH 17/23] KVM: PPC: Book3S HV: Factorize kvmppc_core_vcpu_create_hv() Paul Mackerras 2013-08-06 4:25 ` Paul Mackerras 2013-08-06 4:25 ` [PATCH 18/23] KVM: PPC: Book3S: Allow both PR and HV KVM to be selected Paul Mackerras 2013-08-06 4:25 ` Paul Mackerras 2013-08-06 4:26 ` [PATCH 19/23] KVM: PPC: Book3S: Select PR vs HV separately for each guest Paul Mackerras 2013-08-06 4:26 ` Paul Mackerras 2013-09-12 22:56 ` Alexander Graf 2013-09-12 22:56 ` Alexander Graf 2013-09-13 0:17 ` Paul Mackerras 2013-09-13 0:17 ` Paul Mackerras 2013-09-13 1:31 ` Benjamin Herrenschmidt 2013-09-13 1:31 ` Benjamin Herrenschmidt 2013-09-13 4:18 ` Alexander Graf 2013-09-13 4:18 ` Alexander Graf 2013-09-14 18:33 ` Aneesh Kumar K.V 2013-09-14 18:45 ` Aneesh Kumar K.V 2013-09-14 20:22 ` Alexander Graf 2013-09-14 20:22 ` Alexander Graf 2013-09-15 9:16 ` Aneesh Kumar K.V 2013-09-15 9:28 ` Aneesh Kumar K.V 2013-09-15 11:55 ` Alexander Graf 2013-09-15 11:55 ` Alexander Graf 2013-09-13 4:17 ` Alexander Graf 2013-09-13 4:17 ` Alexander Graf 2013-09-18 12:05 ` Paul Mackerras 2013-09-18 12:05 ` Paul Mackerras 2013-09-19 7:31 ` Alexander Graf 2013-09-19 7:31 ` Alexander Graf 2013-08-06 4:27 ` [PATCH 20/23] KVM: PPC: Book3S PR: Better handling of host-side read-only pages Paul Mackerras 2013-08-06 4:27 ` Paul Mackerras 2013-09-12 23:01 ` Alexander Graf 2013-09-12 23:01 ` Alexander Graf 2013-09-13 0:23 ` Paul Mackerras 2013-09-13 0:23 ` Paul Mackerras 2013-09-14 5:24 ` Paul Mackerras 2013-09-14 5:24 ` Paul Mackerras 2013-09-14 20:23 ` Alexander Graf 2013-09-14 20:23 ` Alexander Graf 2013-09-16 4:12 ` Paul Mackerras 2013-09-16 4:12 ` Paul Mackerras 2013-09-16 12:47 ` Alexander Graf 2013-09-16 12:47 ` Alexander Graf 2013-08-06 4:27 ` [PATCH 21/23] KVM: PPC: Book3S PR: Use mmu_notifier_retry() in kvmppc_mmu_map_page() Paul Mackerras 2013-08-06 4:27 ` Paul Mackerras 2013-08-07 4:13 ` Bhushan Bharat-R65777 2013-08-07 4:13 ` Bhushan Bharat-R65777 2013-08-07 4:28 ` Paul Mackerras 2013-08-07 4:28 ` Paul Mackerras 2013-08-07 5:18 ` Bhushan Bharat-R65777 2013-08-07 5:18 ` Bhushan Bharat-R65777 2013-08-07 5:17 ` Bhushan Bharat-R65777 2013-08-07 5:17 ` Bhushan Bharat-R65777 2013-08-07 8:27 ` Paul Mackerras 2013-08-07 8:27 ` Paul Mackerras 2013-08-07 8:31 ` Bhushan Bharat-R65777 2013-08-07 8:31 ` Bhushan Bharat-R65777 2013-08-08 12:06 ` Paul Mackerras 2013-08-08 12:06 ` Paul Mackerras 2013-08-06 4:27 ` [PATCH 22/23] KVM: PPC: Book3S PR: Mark pages accessed, and dirty if being written Paul Mackerras 2013-08-06 4:27 ` Paul Mackerras 2013-08-06 4:28 ` [PATCH 23/23] KVM: PPC: Book3S PR: Reduce number of shadow PTEs invalidated by MMU notifiers Paul Mackerras 2013-08-06 4:28 ` Paul Mackerras
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20130806042037.GO19254@iris.ozlabs.ibm.com \ --to=paulus@samba.org \ --cc=agraf@suse.de \ --cc=benh@kernel.crashing.org \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.