From nobody Fri Dec 19 18:52:49 2025 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89F0A1F2BB5 for ; Sat, 19 Apr 2025 22:36:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745102180; cv=none; b=p43EoWHbhVhLhknMJHPYSNg4QRfa6XDkpcm/XE+2wjOrbT/lSei8XLUySf0OfT52kJRsF8BG0BjWYB9ECKIX5sJhx1EkHxwM2XdLdwj8aNXBYD/M3eZkPFCjvXbKeq7fi30kST5oJDMyceLQgRjwuGBaWKy2qoh1d36j4fOBBQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745102180; c=relaxed/simple; bh=FyZXezqL6vkR8+BWgQalAs22Lv7NiD2jVZxUqBmL5t4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a9eFetGH5/JU5QJqr28woQYilqubD9Rz/YWimECZjUEqD5L6g0OmxM7lJ+iyWd4zI61Gao3EzgcL7WmxskXCZjer/cCM/4bgh+OuS0H5fsrsR7OysKwroiZcVUgq0REsbuJuODSbugQdOyhBFZO9B818QS7MaQId4VzpDlobEMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=XHHamdI9; arc=none smtp.client-ip=209.85.208.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XHHamdI9" Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-30bee278c2aso41053861fa.0 for ; Sat, 19 Apr 2025 15:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745102176; x=1745706976; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=axbUMXtD4QAuEbBzGSN5WvaY4ne+9NQW3YHW/FPa3uk=; b=XHHamdI9rIDEHJv1YfOrElbLIngwmHm+DVcQAGGdUI9/kENOLutuoYHodaqdu3c908 YxgZLoGT0jnKkEMIK5vU453gZlZX7mCfrTVf/gyLzU2SU/bp7VPtzR7OJK9QF8cCxYQa 2gaMlGI5V8IYNGG3eouAr+E1F1qq2hxTTeaziJpRHDpPLC48uQdtuOvhF7zoY6dDKkv/ m1eLSgg7laacgwhKx6Rkr2xZVSsl7cXtIRSvCvavII46yhIi5TI4hWApPjYfoCvaZieu dQTxTy2FwheYcPNHrq+4WsTP+NC+nU+aWI4X7zf9W5ip6D2y7Nl4l06SEplxsC1chfyV RJ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745102176; x=1745706976; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=axbUMXtD4QAuEbBzGSN5WvaY4ne+9NQW3YHW/FPa3uk=; b=Gqe2RNmNH7BnIpBhRK2ZlPONOd7y7edwdKbNQraYnYBn1cbX95YnbeXLidPBuTolsz m295ql8TUn4c5X7lM3dB4q1YO5MLzvl3SyXpHdas2+arJbSEE7AZqRxVswmzJry5Wq+q wORkM2M9++F9Xy2lLabxHKOboTvh/gzCMdk8/A5nbO6H0oGtmPYU1eEY+R3zJ7xl4MWQ UXrGngteSjiNmId9Bg4CpuEDpslxP+PZK3PFh2bAL8mybBWCdgOOq4gR3lU5leJfTHLJ ao+TWs+jDDgQAAAGPreAVJruVi75aZx8S1zQzZHhHh5e79yh9BSnuRAZid55+CfWnwHn UmEg== X-Forwarded-Encrypted: i=1; AJvYcCXq2cCUAYYvM1cvsstTCDuso9glXrpzylV3MYzqVDt/+OQO5j/CHtpHrW85QQi7IzAwqb3/YsytM6EvwIk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy43ef9YalNw6RLd7uikDVRK2bNlewM78oWSTRJNkU3MEwzla9r +yFxssHY33dYbxBVjNg7f0bxZyfc/V5wFn8TPfcfOVFGj2GctYL4Kp/R237nvJU= X-Gm-Gg: ASbGncsKfq4HuxCaTm/zTmxcWrdqJCKteoe8d329iE7SnruxTzshPzYFIiI81rwB6J2 aDxvvqv6QksCIbAl+VKnlqqnfhDV4k50yCPaK/rks8QlRDWdUDpLsB25y923L01WGqxrXSo4xqd lBHcNfkuX7m+sPz6n0sdrlwR2EnE+TL3dQ1pyxP2/O+nJRxfke3AAzkVu5q+H0E4nBp6vxTf5rH AvUMVmDNc61g8HKt0HMr7SJrzlpP4SQMoouh2crsmluFrxTFSLe9C0Q7VhYNR6q6ZylKfKg2jD0 OJZQjw8eC0V4Wc4U2mzE8xKNoSsAnKgm0wnoxAJDeIBSIS75Bpc= X-Google-Smtp-Source: AGHT+IG/IKcgsDHej1eYc5hp+IWsKO7tK5TWYYLushLhkgbkqkm1Az+iUjNzyiAjE2ntG62MjJUEuA== X-Received: by 2002:ac2:5683:0:b0:549:981a:1eeb with SMTP id 2adb3069b0e04-54d6dbbdbd0mr2520131e87.5.1745102176568; Sat, 19 Apr 2025 15:36:16 -0700 (PDT) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d6e540daesm535322e87.79.2025.04.19.15.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Apr 2025 15:36:15 -0700 (PDT) From: Linus Walleij Date: Sun, 20 Apr 2025 00:36:02 +0200 Subject: [PATCH v6 15/31] ARM: entry: Separate call path for syscall SWI entry Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-arm-generic-entry-v6-15-95f1fcdfeeb2@linaro.org> References: <20250420-arm-generic-entry-v6-0-95f1fcdfeeb2@linaro.org> In-Reply-To: <20250420-arm-generic-entry-v6-0-95f1fcdfeeb2@linaro.org> To: Dmitry Vyukov , Oleg Nesterov , Russell King , Kees Cook , Andy Lutomirski , Will Drewry , Frederic Weisbecker , "Paul E. McKenney" , Jinjie Ruan , Arnd Bergmann , Ard Biesheuvel , Al Viro Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij , Thomas Gleixner X-Mailer: b4 0.14.2 The syscalls (SWIs, software interrupts) are deviating from how any other interrupts are handled as they enable the IRQs again while processing the syscall, while "hard" IRQs disable all interrupts until they are handled. Break out syscall_enter_from_user_mode() into its own function and call it instead of irqentry_enter_from_user_mode(). As we are moving toward generic entry, we use the signature from the generic function. As the generic function requires the syscall number to be determined, we move the call down below the code that figures out the syscall number, the only practical effect should be that interrupts are re-enabled a few instructions later. As we move the trace_hardirqs_on/off() calls into C, we can just get rid of the helper macro usr_entry_enter again and call asm_irqentry_enter_from_user_mode directly. Acked-by: Thomas Gleixner Acked-by: Paul E. McKenney Signed-off-by: Linus Walleij --- arch/arm/include/asm/entry.h | 1 + arch/arm/kernel/entry-armv.S | 16 ++++------------ arch/arm/kernel/entry-common.S | 18 +++++++++++++----- arch/arm/kernel/entry.c | 14 ++++++++++++++ 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/arch/arm/include/asm/entry.h b/arch/arm/include/asm/entry.h index e26f369375ca3cf762f92fb499657a666b223ca2..e259b074caef75c7f777b181996= 23f07bebee5b4 100644 --- a/arch/arm/include/asm/entry.h +++ b/arch/arm/include/asm/entry.h @@ -8,6 +8,7 @@ struct pt_regs; * These are copies of generic entry headers so we can transition * to generic entry once they are semantically equivalent. */ +long syscall_enter_from_user_mode(struct pt_regs *regs, long); void irqentry_enter_from_user_mode(struct pt_regs *regs); void irqentry_exit_to_user_mode(struct pt_regs *regs); =20 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index c71110126fc105fc6ac2d6cb0f5f399b4c8b1548..6edf362ab1e1035dafebf6fb7c5= 5db71462c1eae 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -403,14 +403,6 @@ ENDPROC(__fiq_abt) zero_fp .endm =20 - /* Called after usr_entry for everything except FIQ */ - .macro usr_entry_enter -#ifdef CONFIG_TRACE_IRQFLAGS - bl trace_hardirqs_off -#endif - asm_irqentry_enter_from_user_mode save =3D 0 - .endm - .macro kuser_cmpxchg_check #if !defined(CONFIG_CPU_32v6K) && defined(CONFIG_KUSER_HELPERS) #ifndef CONFIG_MMU @@ -430,7 +422,7 @@ ENDPROC(__fiq_abt) .align 5 __dabt_usr: usr_entry uaccess=3D0 - usr_entry_enter + asm_irqentry_enter_from_user_mode save =3D 0 kuser_cmpxchg_check mov r2, sp dabt_helper @@ -441,7 +433,7 @@ ENDPROC(__dabt_usr) .align 5 __irq_usr: usr_entry - usr_entry_enter + asm_irqentry_enter_from_user_mode save =3D 0 kuser_cmpxchg_check irq_handler from_user=3D1 get_thread_info tsk @@ -455,7 +447,7 @@ ENDPROC(__irq_usr) .align 5 __und_usr: usr_entry uaccess=3D0 - usr_entry_enter + asm_irqentry_enter_from_user_mode save =3D 0 =20 @ IRQs must be enabled before attempting to read the instruction from @ user space since that could cause a page/translation fault if the @@ -480,7 +472,7 @@ ENDPROC(__und_usr) .align 5 __pabt_usr: usr_entry - usr_entry_enter + asm_irqentry_enter_from_user_mode save =3D 0 mov r2, sp @ regs pabt_helper UNWIND(.fnend ) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index ff1dd3169346f3770cad6b7e218f5d74ffc646fe..14b2495cae3c2f95b0dfecd849b= 4e16ec143dbe9 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -109,8 +109,6 @@ ENTRY(ret_to_user_from_irq) movs r1, r1, lsl #16 bne slow_work_pending no_work_pending: - asm_trace_hardirqs_on save =3D 0 - asm_irqentry_exit_to_user_mode save =3D 0 =20 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK @@ -189,9 +187,6 @@ ENTRY(vector_swi) reload_current r10, ip zero_fp alignment_trap r10, ip, cr_alignment - asm_trace_hardirqs_on save=3D0 - enable_irq_notrace - asm_irqentry_enter_from_user_mode save =3D 0 =20 /* * Get the system call number. @@ -256,6 +251,19 @@ ENTRY(vector_swi) #else str scno, [tsk, #TI_ABI_SYSCALL] #endif + + /* + * Calling out to C to be careful to save and restore registers. + * This call could modify the syscall number. scno is r7 so we + * do not save and restore r7. + */ + mov r0, sp @ regs + mov r1, scno + push {r4 - r6, r8 - r10, lr} + bl syscall_enter_from_user_mode + pop {r4 - r6, r8 - r10, lr} + mov scno, r0 + mov r1, sp @ put regs into r1 stmdb sp!, {r4, r5} @ push fifth and sixth args mov r0, tbl diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 8b2e8ea66c1376759d6c0c14aad8728895b3ff1e..1973947c7ad753fccd694b3ef33= 4fba1326f58b6 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -1,15 +1,29 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include + +long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall) +{ + trace_hardirqs_on(); + local_irq_enable(); + /* This context tracking call has inverse naming */ + user_exit_callable(); + + /* This will optionally be modified later */ + return syscall; +} =20 noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) { + trace_hardirqs_off(); /* This context tracking call has inverse naming */ user_exit_callable(); } =20 noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs) { + trace_hardirqs_on(); /* This context tracking call has inverse naming */ user_enter_callable(); } --=20 2.49.0