Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>
CC:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: [PATCH] powerpc/32s: Make pte_update() non atomic on 603 core
Thread-Topic: [PATCH] powerpc/32s: Make pte_update() non atomic on 603 core
Thread-Index: AQHYFcRGBttrVlXBwkaPm4X9nqdB0g==
Date:   Sun, 30 Jan 2022 10:29:34 +0000
Message-ID: <cc89d3c11fc9c742d0df3454a657a3a00be24046.1643538554.git.christophe.leroy@csgroup.eu>
Accept-Language: fr-FR, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?NAk4yLwoXtxgrat35h5RZ2IVQbIXBRU6KAyCeGFneMHCBEYMf7zQS9ygdJ?=
 =?iso-8859-1?Q?2b41XDrTU1jcxy/S5ZdZRxY45Bvnj6d/cc6MYGKbN4rCpqovOXLtHP0MEf?=
 =?iso-8859-1?Q?MtExj1MGZdBGTW8QCfFbBMYF64WRNr/6LXetW/p/7hpUB+Yr+kBygFLUsE?=
 =?iso-8859-1?Q?jQAnTw/+CZYC/15ryX4nSYK+Ojp1YEfuqKTmUoO5gUtxFS8AWKFOkDhjvf?=
 =?iso-8859-1?Q?BW+lIT/ik81bv6NhpqZ4B64QfHyA4Ep+hJ+K9kCNKPk1+2o2d9AKOva5w4?=
 =?iso-8859-1?Q?9R/g83fwUvhPdrkQVQAxAdvJeRXdV/4cGAd9dNZVfdtfGQcicEO8buWiml?=
 =?iso-8859-1?Q?j4t9YRc+Otl9LKekdkDqWr7h0ixRO+tgdj87e8xJITP6eV+NhGl8PZfOCa?=
 =?iso-8859-1?Q?wqjFS0RJuozP0oWLJQXePjhmLMksJ+Epj4wLG3U/Gml14TmlYffne5N3yi?=
 =?iso-8859-1?Q?0ks1MsZ7Aw2DV03i/Ry++bjJ3drefoAu8nMaYMD8WQNdFiW2o7G9rFTrAT?=
 =?iso-8859-1?Q?mPgrdqryscTF5yNIdEJqr065PM+2QmuFN9qmG30K2GCmvIqyn/SIOPsByr?=
 =?iso-8859-1?Q?mWig5qUSfV5yd1kuRsNzOHD1OCo2PfmBvFr/jqPfpRQINJtExTIkUJ39Yo?=
 =?iso-8859-1?Q?l1Y2u94JPbJ4q6k/yur1z14c6nJ/Bpsbt78mf415SuAYy1ndgDFJ+qLN1b?=
 =?iso-8859-1?Q?Mqj6FUga0kKtbEvFsYplXtTlJOq0o9txOPtCp0Z/NocZBEX83SdcQ7c2hS?=
 =?iso-8859-1?Q?vOfxrOKldjWlEEhk/DS1qYXrVvrKq7qqbtqpIm96kwiUj8WLZej9pHHOqD?=
 =?iso-8859-1?Q?FImljh9TyWIX1/OHXzrMpEO7sHo48Hd9xjclJ7zBhETpvIWa5w4QP7cTN6?=
 =?iso-8859-1?Q?EalvBbp49Oz36V37c2ukWoXe1/TIZaIOOVEgnxfQOrzvlHMDMyNVWnHS73?=
 =?iso-8859-1?Q?2f8DJBZTr9IGuhw9kl3RH5b/Pjx3d/NdRqonX2jcfBTpBVjFQ+N+eKHHdA?=
 =?iso-8859-1?Q?WZH50pCazFHZOGydSa/01a4WeMbdS7TB56sP5Pa4MHDY8rvQdcKcYejieH?=
 =?iso-8859-1?Q?IWXWadHutocuP1SnHOPvqxMOzK7ajzKblE9vr3KHz3aykUbn6PKavtZtpR?=
 =?iso-8859-1?Q?iwE5y7XkPZvARiCqiXhRdxJ2FwQ7lAi8wNm7ft3exZ0rR3F4TyHXxcF/tz?=
 =?iso-8859-1?Q?ggGwqMuwBvJD1wy/hnOISfsBAPtevpgQpiagd088qONofiZ/PAoKL50i2c?=
 =?iso-8859-1?Q?XbJ094Wgr7P9ag6EtQpeyhjowwRsXq4avgf6w09fkssZElztoSgNl8GNcv?=
 =?iso-8859-1?Q?n6xKszbuNKekCdgNQqxDmbNyyffQ+cixvMhn33BASKCd+I+PMCqSk6SNjV?=
 =?iso-8859-1?Q?kJyll35TTk0XdT/NJzYsXIR+AN9Ns+TtlNQrPqR+aIgW7DoAPBxO8QxATJ?=
 =?iso-8859-1?Q?XsQytK4m+lKTC0LC0SeFLAh3ALdyt7pqQ87VFy9Fmu4BLGP5GAbPDtjYcl?=
 =?iso-8859-1?Q?yXXIN8stcn5XW/+2OnCZVi6c7wlGz43WkK2kHwloOtKasuhHKm8H0HfEqJ?=
 =?iso-8859-1?Q?0KhT8WcGqvcRkaH76pGmeA2uKykIRpf8Y1MGdmqCNRTic7lO9IV/o4KTxq?=
 =?iso-8859-1?Q?CfdnAQJvliBvgw6lEUVGmgZM6LLUUYg/3swWcMjbzNQ49WWKoiUGI1BH/D?=
 =?iso-8859-1?Q?Oc1qz6FQFr2hpKngtBwpjyIMhms16n6uFPmIR4PW3Ve24NptOFtO8xGzQC?=
 =?iso-8859-1?Q?slvqHlYp/eIUSki3u14txWgCY=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: csgroup.eu
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: 978734e3-67f8-4610-bb79-08d9e3db68cc
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2022 10:29:34.4432
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: SxE5IiNeHwtiCbMdJ5on3q9MyEyHKz7ZYUi4UB1hCl7T2wRNKfI5jZ2tEbek6LuF14sILBj2f103eFL8OjXnS0ELcOMiLk1HFb9jWnY8iVs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR0P264MB2886
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 603 core, TLB miss handler don't do any change to the
page tables so pte_update() doesn't need to be atomic.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/include/asm/book3s/32/pgtable.h | 37 ++++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h
index f8b94f78403f..772e00dc4ef1 100644
--- a/arch/powerpc/include/asm/book3s/32/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/32/pgtable.h
@@ -298,28 +298,35 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p
 				     unsigned long clr, unsigned long set, int huge)
 {
 	pte_basic_t old;
-	unsigned long tmp;
 
-	__asm__ __volatile__(
+	if (mmu_has_feature(MMU_FTR_HPTE_TABLE)) {
+		unsigned long tmp;
+
+		asm volatile(
 #ifndef CONFIG_PTE_64BIT
-"1:	lwarx	%0, 0, %3\n"
-"	andc	%1, %0, %4\n"
+	"1:	lwarx	%0, 0, %3\n"
+	"	andc	%1, %0, %4\n"
 #else
-"1:	lwarx	%L0, 0, %3\n"
-"	lwz	%0, -4(%3)\n"
-"	andc	%1, %L0, %4\n"
+	"1:	lwarx	%L0, 0, %3\n"
+	"	lwz	%0, -4(%3)\n"
+	"	andc	%1, %L0, %4\n"
 #endif
-"	or	%1, %1, %5\n"
-"	stwcx.	%1, 0, %3\n"
-"	bne-	1b"
-	: "=&r" (old), "=&r" (tmp), "=m" (*p)
+	"	or	%1, %1, %5\n"
+	"	stwcx.	%1, 0, %3\n"
+	"	bne-	1b"
+		: "=&r" (old), "=&r" (tmp), "=m" (*p)
 #ifndef CONFIG_PTE_64BIT
-	: "r" (p),
+		: "r" (p),
 #else
-	: "b" ((unsigned long)(p) + 4),
+		: "b" ((unsigned long)(p) + 4),
 #endif
-	  "r" (clr), "r" (set), "m" (*p)
-	: "cc" );
+		  "r" (clr), "r" (set), "m" (*p)
+		: "cc" );
+	} else {
+		old = pte_val(*p);
+
+		*p = __pte((old & ~(pte_basic_t)clr) | set);
+	}
 
 	return old;
 }
-- 
2.33.1