From patchwork Wed May 9 02:20:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 910607 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="OM1QC+2C"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40gg7k1k9Dz9s7F for ; Wed, 9 May 2018 12:20:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933466AbeEICUt (ORCPT ); Tue, 8 May 2018 22:20:49 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:42766 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932484AbeEICUt (ORCPT ); Tue, 8 May 2018 22:20:49 -0400 Received: by mail-pf0-f194.google.com with SMTP id p14so13471987pfh.9 for ; Tue, 08 May 2018 19:20:48 -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=NqeyJiBoHZ8CahQsKW9q9obm9RvPH4tGurLduqAzyGg=; b=OM1QC+2Cg/UGwEEDLTYphmJJvIpDM51ZaNV8tmbFCikw0FJY5SErQ1oQy8sHMI6umt pn4WhVhyzsmM4PnoT2i+rT46lCHsLRP8mCOj5jx1zTbPl4Psgaxo8Q1IjkveTKs1OyMQ qS/hSpArNycnZYFc/ahV2W8F1xmgb/tWUfqMWhy0pStHx5wXpxh0jYvIove6p+2A2mh0 Aqk5pHYe+Y8lEzGb7bVmN1cBdCQImgJK3lLrxK5FTvSPbSi4Sf4LGlBc7I9YyMe6n+60 6NNdLIemkyOTpjimygazUGwBy0WwcFZfaGGgLc3YtSoa6lB0Q+/XqHh11gVzZwdaso98 bjpQ== 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=NqeyJiBoHZ8CahQsKW9q9obm9RvPH4tGurLduqAzyGg=; b=gdADJv6zfj47+dXBCPXb6Pb+ghzi0BE2XrdMz/28i2nvufobboGpR1yotAfJFeybHq xT6EDCU0pE15lBIcT6ayZovFRtXSWN1eZXEGzqFU5FZNwdISswQ7zJfpa4H/Ng4FNN1c ANe1IpW55QZfKnhAYn4B2z0VJO3sEj15Gjtz8E4OwI+mYqds5iGMHXsuMpNYeFBdxW3t zLL9wy2EMLbsVv51zr4l15daxK1r56Xxv3sYlAdE8Cjd3bvz7g2VMICQfzT9hQ7CDCAO YY15ioGK0yYjFCUPbfe5LHYkLDj4YnY/eYtYknkG12LQ3rAt0bTuHpUB6vX63yVlSZJU ZYow== X-Gm-Message-State: ALQs6tCkaVpQBmk/dzczSv0G4KJvYKYtoSZs3fruEzDaa4nYa1u9Zfj4 wgRuWZcqs50DMUU2Gy7cBYRkbA== X-Google-Smtp-Source: AB8JxZreGvy2/APIpSmIc0Zn8ISXGidqLoDkjat+4QHDnEXcxdeLCu+O5YhU5Wk/XwLgA5w8WdkNnA== X-Received: by 10.98.60.209 with SMTP id b78mr41370930pfk.44.1525832448321; Tue, 08 May 2018 19:20:48 -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 23sm90258616pfs.147.2018.05.08.19.20.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 19:20:47 -0700 (PDT) From: Nicholas Piggin To: kvm-ppc@vger.kernel.org Cc: Nicholas Piggin Subject: [PATCH v2 6/9] KVM: PPC: Book3S HV: radix use the Linux translation flush functions for partition scope Date: Wed, 9 May 2018 12:20:19 +1000 Message-Id: <20180509022022.21226-7-npiggin@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509022022.21226-1-npiggin@gmail.com> References: <20180509022022.21226-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. Signed-off-by: Nicholas Piggin --- arch/powerpc/kvm/book3s_64_mmu_radix.c | 36 ++++++-------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c index 126bacef03d4..aff82fd3a4d3 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_radix.c +++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c @@ -139,41 +139,21 @@ 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 >= PUD_SHIFT) - psize = MMU_PAGE_1G; - else 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); } static void kvmppc_radix_flush_pwc(struct kvm *kvm) { - unsigned long rb = 0x2 << PPC_BITLSHIFT(53); /* IS = 2 */ - - asm volatile("ptesync": : :"memory"); - /* RIC=1 PRS=0 R=1 IS=2 */ - asm volatile(PPC_TLBIE_5(%0, %1, 1, 0, 1) - : : "r" (rb), "r" (kvm->arch.lpid) : "memory"); - asm volatile("eieio ; tlbsync ; ptesync": : :"memory"); + radix__flush_pwc_lpid(kvm->arch.lpid); } unsigned long kvmppc_radix_update_pte(struct kvm *kvm, pte_t *ptep,