From patchwork Sun Jun 23 10:41:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1120780 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pwsT0089"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45WpsR3vQXz9s3l for ; Sun, 23 Jun 2019 20:42:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726467AbfFWKme (ORCPT ); Sun, 23 Jun 2019 06:42:34 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:34431 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726429AbfFWKme (ORCPT ); Sun, 23 Jun 2019 06:42:34 -0400 Received: by mail-pg1-f195.google.com with SMTP id p10so5551019pgn.1 for ; Sun, 23 Jun 2019 03:42:33 -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:mime-version :content-transfer-encoding; bh=unNl4TIULNSGXZXwmsz7laOJjV5XAQkpofGuTVj9KnI=; b=pwsT008927poPGhNOwLrTYxg6Mm2+0f1g9gdupfrSlp0F4Dc4KFDwADcu19Mp7a7Qr Ik0K1l8N3HZuGsDvwxsUIcsBhi2bYbNu29n8ZHxtn4kwrMiohffjx8ZHjujCEFdc5c/S fJau2DhSyiohHm7Z/ZEKljJO/GtMz0aXY8pS0bvljdJ5DZBxaFuKpDTWCK3gg+y6FtQa otc5mHKZn+f7tckZ9N/h5Yynm/VKQjrhyfS6iY5a4qzOG5UCoytWd8G4fcDOGs1KMLUc 28hoFyfYAHQYkX6QGD3CnDtBEet1Tw05SdMr04LMZ99MCvVgGnoevXo6QMnVnmNQdxKk 91hA== 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:mime-version :content-transfer-encoding; bh=unNl4TIULNSGXZXwmsz7laOJjV5XAQkpofGuTVj9KnI=; b=B25M9fJh29DTaqf1BgPIMXTd6Dkb7YWo6Se26M2pmyzAht3XkH5PxixGQIFqqjPmYT L2hVTI5TO6CRQS4yR3Ef3DGQyoh73eGi4eym5+Z+10SWijSv8aEIopAepprmhSMtKQYt J99qX3cqfHM6WpfwYLfIDR99rgl+Edu9c1Am8PQtN1gkSchbpufrF4Vg1jBfo8J1UPnu qreS6xyW3/k1P7TtuX5Td8sORDDyFx6yf/PbHufPXdp1oEjNmgsqR/wtb84sSWnRsP7v keA6NqR/RgjaxIVCSrV8d46UEqbsqBcKCYdRy/OMoey8PfsokMlLh8f4m7yCEN8m2Myt oAeg== X-Gm-Message-State: APjAAAWBM4oQVT7h+ciAW5iUeQhJMXYMdpA0G2xvvzx/iXGknJjGMdil kGZicEusGrTIgvReijTLPxQ= X-Google-Smtp-Source: APXvYqxIAzEtHdWzE4+9l+W+rtoJ5ki/VCu1i2Ip7JQP7mu9qkGb62wiIwv1EZW/9RstTG4bTkayhg== X-Received: by 2002:a17:90a:7148:: with SMTP id g8mr18234825pjs.51.1561286553264; Sun, 23 Jun 2019 03:42:33 -0700 (PDT) Received: from bobo.ozlabs.ibm.com ([1.129.156.40]) by smtp.gmail.com with ESMTPSA id w7sm5034824pfb.117.2019.06.23.03.42.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 23 Jun 2019 03:42:32 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin , kvm-ppc@vger.kernel.org Subject: [PATCH 1/2] powerpc/64s: Rename PPC_INVALIDATE_ERAT to PPC_ARCH_300_INVALIDATE_ERAT Date: Sun, 23 Jun 2019 20:41:51 +1000 Message-Id: <20190623104152.13173-1-npiggin@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org This makes it clear to the caller that it can only be used on POWER9 and later CPUs. Signed-off-by: Nicholas Piggin --- I think I added a bug in machine checks at one point that I might have been able to avoid with this name :) arch/powerpc/include/asm/ppc-opcode.h | 2 +- arch/powerpc/kernel/mce_power.c | 3 +-- arch/powerpc/kvm/book3s_hv_builtin.c | 2 +- arch/powerpc/mm/book3s64/hash_native.c | 2 +- arch/powerpc/mm/book3s64/radix_tlb.c | 8 ++++---- arch/powerpc/platforms/powernv/idle.c | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h index 2291daf39cd1..156102828a3b 100644 --- a/arch/powerpc/include/asm/ppc-opcode.h +++ b/arch/powerpc/include/asm/ppc-opcode.h @@ -588,7 +588,7 @@ #define PPC_SLBIA(IH) stringify_in_c(.long PPC_INST_SLBIA | \ ((IH & 0x7) << 21)) -#define PPC_INVALIDATE_ERAT PPC_SLBIA(7) +#define PPC_ARCH_300_INVALIDATE_ERAT PPC_SLBIA(7) #define VCMPEQUD_RC(vrt, vra, vrb) stringify_in_c(.long PPC_INST_VCMPEQUD | \ ___PPC_RT(vrt) | ___PPC_RA(vra) | \ diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c index e39536aad30d..91e20773d8c3 100644 --- a/arch/powerpc/kernel/mce_power.c +++ b/arch/powerpc/kernel/mce_power.c @@ -82,8 +82,7 @@ static void flush_erat(void) return; } #endif - /* PPC_INVALIDATE_ERAT can only be used on ISA v3 and newer */ - asm volatile(PPC_INVALIDATE_ERAT : : :"memory"); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT : : :"memory"); } #define MCE_FLUSH_SLB 1 diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c index cb05ccc8bc6a..960154262665 100644 --- a/arch/powerpc/kvm/book3s_hv_builtin.c +++ b/arch/powerpc/kvm/book3s_hv_builtin.c @@ -830,7 +830,7 @@ static void flush_guest_tlb(struct kvm *kvm) } } asm volatile("ptesync": : :"memory"); - asm volatile(PPC_INVALIDATE_ERAT : : :"memory"); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT : : :"memory"); } void kvmppc_check_need_tlb_flush(struct kvm *kvm, int pcpu, diff --git a/arch/powerpc/mm/book3s64/hash_native.c b/arch/powerpc/mm/book3s64/hash_native.c index 30d62ffe3310..55a1716926b1 100644 --- a/arch/powerpc/mm/book3s64/hash_native.c +++ b/arch/powerpc/mm/book3s64/hash_native.c @@ -112,7 +112,7 @@ static void tlbiel_all_isa300(unsigned int num_sets, unsigned int is) asm volatile("ptesync": : :"memory"); - asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory"); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT "; isync" : : :"memory"); } void hash__tlbiel_all(unsigned int action) diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c index bb9835681315..17f33b6645f9 100644 --- a/arch/powerpc/mm/book3s64/radix_tlb.c +++ b/arch/powerpc/mm/book3s64/radix_tlb.c @@ -83,7 +83,7 @@ void radix__tlbiel_all(unsigned int action) else WARN(1, "%s called on pre-POWER9 CPU\n", __func__); - asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory"); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT "; isync" : : :"memory"); } static __always_inline void __tlbiel_pid(unsigned long pid, int set, @@ -258,7 +258,7 @@ static inline void _tlbiel_pid(unsigned long pid, unsigned long ric) __tlbiel_pid(pid, set, RIC_FLUSH_TLB); asm volatile("ptesync": : :"memory"); - asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory"); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT "; isync" : : :"memory"); } static inline void _tlbie_pid(unsigned long pid, unsigned long ric) @@ -310,7 +310,7 @@ static inline void _tlbiel_lpid(unsigned long lpid, unsigned long ric) __tlbiel_lpid(lpid, set, RIC_FLUSH_TLB); asm volatile("ptesync": : :"memory"); - asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory"); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT "; isync" : : :"memory"); } static inline void _tlbie_lpid(unsigned long lpid, unsigned long ric) @@ -362,7 +362,7 @@ static inline void _tlbiel_lpid_guest(unsigned long lpid, unsigned long ric) __tlbiel_lpid_guest(lpid, set, RIC_FLUSH_TLB); asm volatile("ptesync": : :"memory"); - asm volatile(PPC_INVALIDATE_ERAT : : :"memory"); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT : : :"memory"); } diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index 2f4479b94ac3..fea2fab6d915 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -716,7 +716,7 @@ static unsigned long power9_idle_stop(unsigned long psscr, bool mmu_on) * to reload MMCR0 (see mmcr0 comment above). */ if (!cpu_has_feature(CPU_FTR_POWER9_DD2_1)) { - asm volatile(PPC_INVALIDATE_ERAT); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT); mtspr(SPRN_MMCR0, mmcr0); } From patchwork Sun Jun 23 10:41:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1120781 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EYjrzBOR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45WpsT4zD4z9sNm for ; Sun, 23 Jun 2019 20:42:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726470AbfFWKmh (ORCPT ); Sun, 23 Jun 2019 06:42:37 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40758 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726429AbfFWKmh (ORCPT ); Sun, 23 Jun 2019 06:42:37 -0400 Received: by mail-pg1-f194.google.com with SMTP id w10so5522703pgj.7 for ; Sun, 23 Jun 2019 03:42:36 -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 :mime-version:content-transfer-encoding; bh=0YXSXOgSOm3DzevuZy9Ip1Vi9FfqACZ45B2Wv5c/MAA=; b=EYjrzBORjZ1lNRmKwsDmSNka8SSXunz7W40w13hIVFXJIPzvyNGYiwRiV8dMQuFobO UMscQeSadIsMBvmnahQhouLSeZMn4TEoApAXY3xNjV9w24GkvXuf4fp8cYdDQXN0bg40 6PR1Bxy7/FZ8g2t0itA61QAxurFFsWQEcpZKQswoAFYM4VVN7aAlFJ75KTq/NMP8mn/1 R3QyaAShKQ3c2J/4lVYYWOTQTTbJ1zqha6E2904ubj+dRJfVh5q8POsr41qFNVDOuYqR qHWYujk27gBSrjbO/cFXuuFFXR0JYEMoNlU3t7+4YpQw0UDDgPWkFbW6PBzimN6e9Sx0 bxYw== 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:mime-version:content-transfer-encoding; bh=0YXSXOgSOm3DzevuZy9Ip1Vi9FfqACZ45B2Wv5c/MAA=; b=XmixcA/ZJSQ4jRc6G+Tw3zSL8yh8RlDSqydeysir/jjs5mWQAZtRpeVq82m5KS18s7 a1xDXViPPCqf1fR/Gd8FIGmuTMMH7ypwhULNFrPwW3pPbjHElZdqTwBPX0cfgDJtjCLu rLdX7Y9rV78GocMeo4L3h0mjFbkiROAQF8FPqqHqQ256mXEIEYOntPd9qFiqminuVy70 39gHJArJD10nvKvWg9k4+c0mS90Wz0WZkPJyl5ct6oqMmtrFqM/DGgGa8Wj1wfW3iOSc jZdVPkBz1CUGs7NhUFF3NCW3mo71H+SiK1DufXwjxNI1N++ovFm5vKAMBIxxw8s7rZ+H 890A== X-Gm-Message-State: APjAAAXAsxiAwb1n/W19v9cPOHHrgejNANdelOTWg2WjZ1LRWWigeTUw HULMQq9sPrJadtaiM7IBIeEL4BROL4U= X-Google-Smtp-Source: APXvYqySDsED2DGES82pmasfRXrAMrmxPlJL+8XRDgDCDLsCOn/w2CYMGMp3PGr+AQzyKqYojuPpnw== X-Received: by 2002:a63:6156:: with SMTP id v83mr21452955pgb.358.1561286556592; Sun, 23 Jun 2019 03:42:36 -0700 (PDT) Received: from bobo.ozlabs.ibm.com ([1.129.156.40]) by smtp.gmail.com with ESMTPSA id w7sm5034824pfb.117.2019.06.23.03.42.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 23 Jun 2019 03:42:36 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin , kvm-ppc@vger.kernel.org Subject: [PATCH 2/2] powerpc/64s/radix: keep kernel ERAT over local process/guest invalidates Date: Sun, 23 Jun 2019 20:41:52 +1000 Message-Id: <20190623104152.13173-2-npiggin@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190623104152.13173-1-npiggin@gmail.com> References: <20190623104152.13173-1-npiggin@gmail.com> MIME-Version: 1.0 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org ISAv3 radix modes provide SLBIA variants which can invalidate ERAT for effPID!=0 or for effLPID!=0, which allows user and guest invalidations to retain kernel/host ERAT entries. Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/ppc-opcode.h | 8 ++++++++ arch/powerpc/kvm/book3s_hv_builtin.c | 6 ++++-- arch/powerpc/mm/book3s64/radix_tlb.c | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h index 156102828a3b..0f67d672f719 100644 --- a/arch/powerpc/include/asm/ppc-opcode.h +++ b/arch/powerpc/include/asm/ppc-opcode.h @@ -588,7 +588,15 @@ #define PPC_SLBIA(IH) stringify_in_c(.long PPC_INST_SLBIA | \ ((IH & 0x7) << 21)) + +/* + * These may only be used by ARCH_300 (radix implies ARCH_300). + * USER/GUEST invalidates may only be used by radix mode (on HPT these + * would also invalidate various SLBEs which may not be desired). + */ #define PPC_ARCH_300_INVALIDATE_ERAT PPC_SLBIA(7) +#define PPC_RADIX_INVALIDATE_ERAT_USER PPC_SLBIA(3) +#define PPC_RADIX_INVALIDATE_ERAT_GUEST PPC_SLBIA(6) #define VCMPEQUD_RC(vrt, vra, vrb) stringify_in_c(.long PPC_INST_VCMPEQUD | \ ___PPC_RT(vrt) | ___PPC_RA(vra) | \ diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c index 960154262665..08a32c3e6153 100644 --- a/arch/powerpc/kvm/book3s_hv_builtin.c +++ b/arch/powerpc/kvm/book3s_hv_builtin.c @@ -820,6 +820,8 @@ static void flush_guest_tlb(struct kvm *kvm) : : "r" (rb), "i" (1), "i" (1), "i" (0), "r" (0) : "memory"); } + asm volatile("ptesync": : :"memory"); + asm volatile(PPC_RADIX_INVALIDATE_ERAT_GUEST : : :"memory"); } else { for (set = 0; set < kvm->arch.tlb_sets; ++set) { /* R=0 PRS=0 RIC=0 */ @@ -828,9 +830,9 @@ static void flush_guest_tlb(struct kvm *kvm) "r" (0) : "memory"); rb += PPC_BIT(51); /* increment set number */ } + asm volatile("ptesync": : :"memory"); + asm volatile(PPC_ARCH_300_INVALIDATE_ERAT : : :"memory"); } - asm volatile("ptesync": : :"memory"); - asm volatile(PPC_ARCH_300_INVALIDATE_ERAT : : :"memory"); } void kvmppc_check_need_tlb_flush(struct kvm *kvm, int pcpu, diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c index 17f33b6645f9..fb880a043898 100644 --- a/arch/powerpc/mm/book3s64/radix_tlb.c +++ b/arch/powerpc/mm/book3s64/radix_tlb.c @@ -258,7 +258,7 @@ static inline void _tlbiel_pid(unsigned long pid, unsigned long ric) __tlbiel_pid(pid, set, RIC_FLUSH_TLB); asm volatile("ptesync": : :"memory"); - asm volatile(PPC_ARCH_300_INVALIDATE_ERAT "; isync" : : :"memory"); + asm volatile(PPC_RADIX_INVALIDATE_ERAT_USER "; isync" : : :"memory"); } static inline void _tlbie_pid(unsigned long pid, unsigned long ric) @@ -310,7 +310,7 @@ static inline void _tlbiel_lpid(unsigned long lpid, unsigned long ric) __tlbiel_lpid(lpid, set, RIC_FLUSH_TLB); asm volatile("ptesync": : :"memory"); - asm volatile(PPC_ARCH_300_INVALIDATE_ERAT "; isync" : : :"memory"); + asm volatile(PPC_RADIX_INVALIDATE_ERAT_GUEST "; isync" : : :"memory"); } static inline void _tlbie_lpid(unsigned long lpid, unsigned long ric) @@ -362,7 +362,7 @@ static inline void _tlbiel_lpid_guest(unsigned long lpid, unsigned long ric) __tlbiel_lpid_guest(lpid, set, RIC_FLUSH_TLB); asm volatile("ptesync": : :"memory"); - asm volatile(PPC_ARCH_300_INVALIDATE_ERAT : : :"memory"); + asm volatile(PPC_RADIX_INVALIDATE_ERAT_GUEST : : :"memory"); }