From patchwork Fri Nov 8 07:29:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 289709 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 1295C2C04EA for ; Fri, 8 Nov 2013 18:29:54 +1100 (EST) Received: from mail-qc0-x22a.google.com (mail-qc0-x22a.google.com [IPv6:2607:f8b0:400d:c01::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 6EA912C00A7 for ; Fri, 8 Nov 2013 18:29:28 +1100 (EST) Received: by mail-qc0-f170.google.com with SMTP id n9so1419095qcw.15 for ; Thu, 07 Nov 2013 23:29:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZP24OUC4zXGuXb6cQ/nVr2tY88PLV20f4hZE73tIUkU=; b=encttDkoDsuN7SlJTMCEVyfBy9yBmrE+J+HqER1uTL3jsJsmYRZl27ngD+eJKMyl/O b7hYoSAd9Ew5z2loegQwvAsd8TGggrfrE6Y7TLTei/46jV6Fv6bursNg/Ssz2svzgJyx wJrJHVO+99ZCueJgShfs1/p0lZyvABjWC2GGZjMXuXwt803MB87DDpAUW0vZ5+TKLlP7 8Xw3eAqjG625NiEOc0lhImT3nk4drtzxDlzDzK9jckAtDwhd3adLAT9y6XeImaxeXQcS l+3VhXmO9ndZ54XM1gn5yzDIwq8LTPO+RwvBWieVOvyzYHvXtFAUGDpEC61KXLb6NASl f+lQ== X-Received: by 10.236.163.228 with SMTP id a64mr4238407yhl.35.1383895763402; Thu, 07 Nov 2013 23:29:23 -0800 (PST) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPSA id s46sm13119198yha.27.2013.11.07.23.29.21 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 07 Nov 2013 23:29:23 -0800 (PST) From: Liu Ping Fan To: linuxppc-dev@lists.ozlabs.org, kvm-ppc@vger.kernel.org Subject: [PATCH v3 1/2] powerpc: kvm: pair kvmppc_hv_find_lock_hpte with _unlock_hpte Date: Fri, 8 Nov 2013 15:29:53 +0800 Message-Id: <1383895794-16164-2-git-send-email-pingfank@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1383895794-16164-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1383895794-16164-1-git-send-email-pingfank@linux.vnet.ibm.com> Cc: Paul Mackerras , Alexander Graf X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Highlight the lock pair for the reader. (and later it will the place to hide the detail about preemption disable) Signed-off-by: Liu Ping Fan --- arch/powerpc/include/asm/kvm_book3s.h | 1 + arch/powerpc/kvm/book3s_64_mmu_hv.c | 7 ++----- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 13 ++++++++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index fa19e2f..a818932 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -129,6 +129,7 @@ extern void kvmppc_mmu_flush_segments(struct kvm_vcpu *vcpu); extern int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, unsigned long addr, unsigned long status); +extern void kvmppc_hv_unlock_hpte(ulong *hptep, ulong *hpte_val); extern long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v, unsigned long valid); diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index 842f081..97685e7 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -479,12 +479,9 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, if (index < 0) return -ENOENT; hptep = (unsigned long *)(kvm->arch.hpt_virt + (index << 4)); - v = hptep[0] & ~HPTE_V_HVLOCK; + v = hptep[0]; gr = kvm->arch.revmap[index].guest_rpte; - - /* Unlock the HPTE */ - asm volatile("lwsync" : : : "memory"); - hptep[0] = v; + kvmppc_hv_unlock_hpte(hptep, &v); gpte->eaddr = eaddr; gpte->vpage = ((v & HPTE_V_AVPN) << 4) | ((eaddr >> 12) & 0xfff); diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c index 9c51544..0ff9e91 100644 --- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c +++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c @@ -749,6 +749,14 @@ static int slb_base_page_shift[4] = { 20, /* 1M, unsupported */ }; +void kvmppc_hv_unlock_hpte(unsigned long *hptep, unsigned long *hpte_val) +{ + *hpte_val = *hpte_val & ~HPTE_V_HVLOCK; + asm volatile("lwsync" : : : "memory"); + *hptep = *hpte_val; +} +EXPORT_SYMBOL(kvmppc_hv_unlock_hpte); + long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v, unsigned long valid) { @@ -863,12 +871,11 @@ long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr, return 0; /* for prot fault, HPTE disappeared */ } hpte = (unsigned long *)(kvm->arch.hpt_virt + (index << 4)); - v = hpte[0] & ~HPTE_V_HVLOCK; + v = hpte[0]; r = hpte[1]; rev = real_vmalloc_addr(&kvm->arch.revmap[index]); gr = rev->guest_rpte; - - unlock_hpte(hpte, v); + kvmppc_hv_unlock_hpte(hpte, &v); /* For not found, if the HPTE is valid by now, retry the instruction */ if ((status & DSISR_NOHPTE) && (v & HPTE_V_VALID))