From patchwork Mon Apr 16 04:32:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 898452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dV8nFTTH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Pb8s5sWQz9s1p for ; Mon, 16 Apr 2018 14:33:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752641AbeDPEdB (ORCPT ); Mon, 16 Apr 2018 00:33:01 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:39676 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113AbeDPEdA (ORCPT ); Mon, 16 Apr 2018 00:33:00 -0400 Received: by mail-pf0-f194.google.com with SMTP id z9so3110585pfe.6 for ; Sun, 15 Apr 2018 21:33:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yTMv2pR3P1xIK+dgMkT8NxITMpA6Wa0KHRqxbJBRLbs=; b=dV8nFTTH5y6I8XO9leN/2uIrHNXvaTNKG0Cg+oUo2lYIeakRdm8GC7dApBoHe/aO+2 3pSPQTZRrBxud1docaseBW5U2+Q8BJZ6mNocgwFPBpC9BqzlkqmsAfKdCZIpoSVAlgzW LJQHt8bx6P2qUj9KrrCxRNTJ9nQq2yNn7WrMVOveFmeLwYyoX8Sk2R0BTQzYz2nsghSI 37GP/ncTTO8lCZD0HMVjd18umlJwO9mkYyi0GEMBt8ky1Url0gtaj9AdkXcaGi7WFo4I WSdPazLM+j8+qi4g+VAD2vcJU6XLpDOwt2FHXRYUscmtc0jWW8rAwWlp7cNt1gRHZcUz KsRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yTMv2pR3P1xIK+dgMkT8NxITMpA6Wa0KHRqxbJBRLbs=; b=NU8e0DZp8QmMGwdpEZHkTeh4e2/GMjTgutr19uXFJRXamakRhQ/TbGPJMBwPhoW+F9 9j9Fpe4UsmEYgGGnkT4qhoeofDGuQsQxL+rd0gmyJQOGKnZqrj04fE0Jz1FI/43r/k3l hsV3VPjcV+RBlXUkYgpGAX0Dwv84FGLW+NUU0Nj3rTXCm5tlCDGkTOa88jk9W+3dV9t6 FOyx1jEzq3+WF/7BRW5SqJ8BqIt603IBw1l66m9B3yp18R6pnCK9PgG9RJhjp3ZABOIN Unzw178FJUc5n7y5WZ1vVA4YUSfqBFfnwWERO/fX2K54h+VbB2TSVGO3NQswIh9k05yH pesQ== X-Gm-Message-State: ALQs6tB1j/d9kkxnMij6XTkiuBJRZ0ecW4OOAe5DRRDwSVVJgY1A7sEe fSzkh0auhM23zmxuUju0q+RFFA== X-Google-Smtp-Source: AIpwx4/2GXnhXsrow2Yu0+CTWng0TkHtSYijvHwBn/ZOLFc2OS6MMxR8+o/G2IPlnwsQjeS//vXZUw== X-Received: by 10.99.183.77 with SMTP id w13mr5068182pgt.231.1523853179951; Sun, 15 Apr 2018 21:32:59 -0700 (PDT) Received: from roar.au.ibm.com (59-102-70-78.tpgi.com.au. [59.102.70.78]) by smtp.gmail.com with ESMTPSA id e87sm23029614pfd.136.2018.04.15.21.32.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 21:32:59 -0700 (PDT) From: Nicholas Piggin To: kvm-ppc@vger.kernel.org Cc: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 3/5] KVM: PPC: Book3S HV: radix use the Linux TLB flush function in kvmppc_radix_tlbie_page Date: Mon, 16 Apr 2018 14:32:38 +1000 Message-Id: <20180416043240.8796-4-npiggin@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180416043240.8796-1-npiggin@gmail.com> References: <20180416043240.8796-1-npiggin@gmail.com> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org This has the advantage of consolidating TLB flush code in fewer places, and it also implements powerpc:tlbie trace events. 1GB pages should be handled without further modification. Signed-off-by: Nicholas Piggin --- arch/powerpc/kvm/book3s_64_mmu_radix.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c index 81d5ad26f9a1..dab6b622011c 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_radix.c +++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c @@ -139,28 +139,16 @@ int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, return 0; } -#ifdef CONFIG_PPC_64K_PAGES -#define MMU_BASE_PSIZE MMU_PAGE_64K -#else -#define MMU_BASE_PSIZE MMU_PAGE_4K -#endif - static void kvmppc_radix_tlbie_page(struct kvm *kvm, unsigned long addr, unsigned int pshift) { - int psize = MMU_BASE_PSIZE; - - if (pshift >= PMD_SHIFT) - psize = MMU_PAGE_2M; - addr &= ~0xfffUL; - addr |= mmu_psize_defs[psize].ap << 5; - asm volatile("ptesync": : :"memory"); - asm volatile(PPC_TLBIE_5(%0, %1, 0, 0, 1) - : : "r" (addr), "r" (kvm->arch.lpid) : "memory"); - if (cpu_has_feature(CPU_FTR_P9_TLBIE_BUG)) - asm volatile(PPC_TLBIE_5(%0, %1, 0, 0, 1) - : : "r" (addr), "r" (kvm->arch.lpid) : "memory"); - asm volatile("eieio ; tlbsync ; ptesync": : :"memory"); + unsigned long psize = PAGE_SIZE; + + if (pshift) + psize = 1UL << pshift; + + addr &= ~(psize - 1); + radix__flush_tlb_lpid_page(kvm->arch.lpid, addr, psize); } unsigned long kvmppc_radix_update_pte(struct kvm *kvm, pte_t *ptep,