From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7CF43EF0DD for ; Mon, 11 May 2026 13:54:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778507649; cv=none; b=GAzbRbZuKWySc1iRtapZB5m6pJ1CD3FN250zedwNUepBmNTZ/jgdZUQSzseoyegkH6aR5E3DyRj3SWNKPhVl6m1F3dsLOLGjEwPZmmdA+pBSfWHSAz6Wszu8T3rHWIRr3xBHxEZQ3qbAhzlRIqSvrpAPvW5R+qJRF5BPnKCWorM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778507649; c=relaxed/simple; bh=wZxCnZujb1QobhrHPpgvMNsjE5HjlA4E67eT9VueD3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vGNcVhQCC6MN9PHIG30VM5QLAHlyjQrVLXPvjEdsIURyzmGuUPFaEN+P4MrA4FJ85dVA2rz5zuJZws1TY4eeofXdes/nGMdV3ahCo76StpDFaKoR0Y9uN96JOMxjgfQ9C/vsMHwA08ySlPE7ERv4+u9IiHgRg+q3PNSvdLxlgM8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=0njHzECi; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=9KB3Reu2; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="0njHzECi"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="9KB3Reu2" From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1778507646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nxi/omoNKx/f8xZACdBlQuKWpQOa02gjt0ViDI9JDrM=; b=0njHzECiaeqtDPqrVgsdUWbvdsRhgEj6cX1Ile3UxW6vZSneRLWp9c/mXnXbOT+RJlE5qt iHA9f7fTtZOQCG+ysoAL3Usekm3gYifLrGDLNHyjlTXjW+eFVxBshPORPnA/WGocRVAeiM 2vEkSBdeeQFNANpW7biSlwKxAH4g12kRqhdpZXYU+u7SeUxsQHs7h+ahXBmCuv1WPpKLyY 5zdRTT2pAfoUAHuyWZcKJghF1iqaP64tbraIQ3EmUJyFpXOPbS1Ubjl9p9OIowtyiWz52P 7hnO3/gfSYEMA/1qD/RnJIDXj2kfkeTudB0kYq7Pw9WrDc8m9J6hzCBmgMqCXg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1778507646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nxi/omoNKx/f8xZACdBlQuKWpQOa02gjt0ViDI9JDrM=; b=9KB3Reu2x1/J7p9weSqHja3sh8ZnXY71D26q+t9yO9aN2+YnFb2V7jE8CWhsAGWp9abkk7 MXN74zXleQ2Bz0Dg== To: stable@vger.kernel.org Cc: Bryan Brattlof , Daniel Wagner , Jan Kiszka , cip-dev@lists.cip-project.org, nobuhiro.iwamatsu.x90@mail.toshiba, pavel@nabladev.com, Russell King , Sebastian Andrzej Siewior Subject: [PATCH 1/4] ARM: group is_permission_fault() with is_translation_fault() Date: Mon, 11 May 2026 15:53:54 +0200 Message-ID: <20260511135357.2786242-2-bigeasy@linutronix.de> In-Reply-To: <20260511135357.2786242-1-bigeasy@linutronix.de> References: <20260511135357.2786242-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: "Russell King (Oracle)" commit dea20281ac88226615761c570c8ff7adc18e6ac2 upstream. Group is_permission_fault() with is_translation_fault(), which is needed to use is_permission_fault() in __do_kernel_fault(). As this is static inline, there is no need for this to be under CONFIG_MMU. Signed-off-by: Russell King (Oracle) Signed-off-by: Sebastian Andrzej Siewior --- arch/arm/mm/fault.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 2bc828a1940c0..f87f353e5a8b0 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -128,6 +128,19 @@ static inline bool is_translation_fault(unsigned int f= sr) return false; } =20 +static inline bool is_permission_fault(unsigned int fsr) +{ + int fs =3D fsr_fs(fsr); +#ifdef CONFIG_ARM_LPAE + if ((fs & FS_MMU_NOLL_MASK) =3D=3D FS_PERM_NOLL) + return true; +#else + if (fs =3D=3D FS_L1_PERM || fs =3D=3D FS_L2_PERM) + return true; +#endif + return false; +} + static void die_kernel_fault(const char *msg, struct mm_struct *mm, unsigned long addr, unsigned int fsr, struct pt_regs *regs) @@ -225,19 +238,6 @@ void do_bad_area(unsigned long addr, unsigned int fsr,= struct pt_regs *regs) } =20 #ifdef CONFIG_MMU -static inline bool is_permission_fault(unsigned int fsr) -{ - int fs =3D fsr_fs(fsr); -#ifdef CONFIG_ARM_LPAE - if ((fs & FS_MMU_NOLL_MASK) =3D=3D FS_PERM_NOLL) - return true; -#else - if (fs =3D=3D FS_L1_PERM || fs =3D=3D FS_L2_PERM) - return true; -#endif - return false; -} - #ifdef CONFIG_CPU_TTBR0_PAN static inline bool ttbr0_usermode_access_allowed(struct pt_regs *regs) { --=20 2.53.0