From patchwork Tue Apr 10 12:48:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 896645 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="L7njjOew"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40L6Rw56r1z9s52 for ; Tue, 10 Apr 2018 22:49:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752999AbeDJMtA (ORCPT ); Tue, 10 Apr 2018 08:49:00 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:40823 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752997AbeDJMs7 (ORCPT ); Tue, 10 Apr 2018 08:48:59 -0400 Received: by mail-pl0-f67.google.com with SMTP id x4-v6so7450366pln.7 for ; Tue, 10 Apr 2018 05:48:59 -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=L7njjOewtPijvan7Tt7sxRhstxj4UosyFlZfsMoEnsdmxSR5Vy0gu3Pak1yFqIkqu/ ucrItnVBm3lmdRzrqtAaM2uy8F5rHL5P5nqDr4E9GmC0Zg3KEDTb3IBum/0NFxeaX5n8 V8QETtmsMeHtqOPetp0um/BhyyLAvnUBZTnOho0/1Togh3XH8GKuYVp34sBZ581cwd0A ah2hDwpoF75POumG2T/fDGcHlO94zsPB0wzcAZZrRcnOBn92s3jdgKopfrLFU1yoZqMR B3CPn0J7KJRH6eILUTdaxcih28DGGwOsvSOXJ0BpMzh2xlX4AEmw0gdFGJ+QpiIInZCw NsdQ== 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=lJYPWR+BZOz1z24FJFJ+0Qv5Vf48jL1MbwpOEUQUtSZLJx8s5MwtfW0/7cCNdLf9JR E05SjDEePH9XBHzT09bXk76yJ+s4DNapx9X4n4PS3YiZ/9SDDUIDBfM0VWbQzZ42GPk2 s5hfD/uK0rU3NbnYMI3Ji8p3+A2ar0PPyOp4Glw264Cl7dr5m1EkrheJtrd/xd75JB8S 00t04/sJAMjoPcH7nUi2tf+4DTF4SapuN6/Xp9NUcYdKrHWs3Aj3E6pWhaOky3bGGZNf KJvWpT3UR2/s2+mB8WDmQv2vQ5xIj8P4QzpEMu8qtQRqur3DVJYlUCF1XO5SXT1xX8iO DiGg== X-Gm-Message-State: ALQs6tAlXWm8jf+ElqDuob2IJDzlJvuYXXsviM/j9tTMNtS1LUywbW5i FOpBtIdcFcwZBgoi/5MEYwDQow== X-Google-Smtp-Source: AIpwx4+n0aFypBEPOulsuFc9CjJrzwii7VwauFWmuyVvNOm766GFANbVfTfaokUSmYW1IHrZypBxuA== X-Received: by 2002:a17:902:5a0b:: with SMTP id q11-v6mr282241pli.199.1523364538918; Tue, 10 Apr 2018 05:48:58 -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 j20sm6037529pfa.149.2018.04.10.05.48.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 05:48:58 -0700 (PDT) From: Nicholas Piggin To: kvm-ppc@vger.kernel.org Cc: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 2/5] KVM: PPC: Book3S HV: kvmppc_radix_tlbie_page use Linux flush function Date: Tue, 10 Apr 2018 22:48:39 +1000 Message-Id: <20180410124842.30184-3-npiggin@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180410124842.30184-1-npiggin@gmail.com> References: <20180410124842.30184-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,