From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 A982824EF9D for ; Tue, 25 Feb 2025 09:55:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477304; cv=none; b=It0OQ85NaglK5TmqeQPhetRDSov9/wTPjm2EnFGCBrGyzhiI7NUKWqtYse4+kk9V9xcHrkbgLtxA9RoGM+FClqJ6EHcF+ERN7bzwxJng8NuWaBpMDFv1TtkCwUsKiuM8Qvk+OOgo/iMsGsBgdP/7dDF3Yylipx3U4iAr1tZs5BE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477304; c=relaxed/simple; bh=14U0ZFqNhjjw9E+TCTCsgolcWhF3eoCcGTNYVrgmoTI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m8rcZaG9kDrnKxdMjo1+d/IIAp/sfg+/5+MR5RHuBFNF9TqkXwqxgUJR9QWnolqQ6v6iXDVR4JKYvgCuaTWWPOz6A2f0dfCBr0LT53/sFjmuMahuIfZiA8VhD7LhzBZ1+yI4zCbe1IBePGuwjzgke3g6TyfeiiMUG/EoPn1u+vs= 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=tzC1qgKO; arc=none smtp.client-ip=209.85.167.48 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="tzC1qgKO" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-548430564d9so3039757e87.2 for ; Tue, 25 Feb 2025 01:55:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477301; x=1741082101; 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=2IJUdaO+5dTLVXPMwfcKz8isZKL74F9HfpoDdIYxpPA=; b=tzC1qgKOGohHuvhmjBewcDJA0HG5Q4SZpieQgzQROV3x+bIuRxG8AYj6kZys/hR11l YAT2uhKITDJUsLC58LhA94kPwJ3hXTMwC8il6OPOy5XUhyJbeP6MXeGUheH72jRyUZIe iyPR/pEbw6nox1J4SQRK6uNt8WXTD5JGQmYNCKZq7O2/JnfBH4tb1ecYAjQrmdd/qYZI DTBRRVXKw+O6jifYG/1u2G1Ny1tMVPvk61cN3mhU6xEFLD0VtWXKCGgl2E78WrAavjxX HeHVAYk1Iid7GZfBkHNbz3oF9eUuRAJORGpGAiKAn9IQzhCoCIy+ZUAD1alCcVzcsdQO zRMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477301; x=1741082101; 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=2IJUdaO+5dTLVXPMwfcKz8isZKL74F9HfpoDdIYxpPA=; b=hS3nkJc8ebnnBT2qi9K1NQNaqbh93IGb4wRqgzDJ8tROQJrYkFWEPmm/IC4WlAsSka BhiLa86QSlEhXAjkCIOCGw2cupQJSAlsfMZsNYD/D6vsR71peU0EATzuaH2ixdBnKhKp 8oQhvuPdaxe3gpNTefGlN32IpjjrmRwKQJk0ue7lE2A5YrAkAZlxjn/tPkUzwlh72wqv Oyq8okfGRRRMscx+7ZSgP/MlgfpRH76oQkE/vj9aqF7AhYPtgsyXeIfnM+VT9wBeZXcB afpMUxNO3Lau2wcvR7y2vMiAoshs90waECCJR/JwZ0Jgo596t2NNKkjagDrG7kU7lgMT Y2IQ== X-Forwarded-Encrypted: i=1; AJvYcCV6QoHGmHLbJi2Pnxwl91AlzcfGcJ74i2CxkOD2I9EgRH208wLsDXK3otYD3EVdCdqmmolGqNzIUkjr49g=@vger.kernel.org X-Gm-Message-State: AOJu0YzEcaLWYA57aDhQu3aHErDXN01LBw5Y7JBuknLyfeweZnuEPNTY Q9dneNZ3BaXuD/1MAIAaP3dg6QUN2GWlGxTtXdxLDwelG621dYJn5vpfNHSk/Jg= X-Gm-Gg: ASbGncvwIj01Om1HGeYG7xy64V8rFx0aoyPZwJyzGYovffm/URLj0SzgVDZZC59NWSN NtYFxLUmeduHg4xU9QxrZ0fEMpjwsosMPAWOegEn7+YUiTUepDNXsz17zbuv7hwdZGeMH907ep3 oM9aP2XAx31tfZ5ngpLlfpV4de45Ng8AcMXpnMoPArLU961pMbNX+GYEPuyIRv+qFi0pFRkhICf Ds8JOoP/1gUsqnOF+7HZav22Y3+Vj7tMaMMbhFz7Ris2nWlyoHHOWPB2z/dzNMk/14aWeV1Ksh3 N+ThpKfTylr/I9AAQtvLsx7BvHBfxlURWC36 X-Google-Smtp-Source: AGHT+IHd+JITPLxMXULU7ZpD1f9xac7PGEst2Tk9nAmNTghxAif9Rd8qWrav88C8IW+IaffyeOes+A== X-Received: by 2002:a05:6512:2310:b0:545:16a5:10f5 with SMTP id 2adb3069b0e04-548391452b5mr5483522e87.30.1740477300601; Tue, 25 Feb 2025 01:55:00 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:00 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:48 +0100 Subject: [PATCH v5 01/31] ARM: Prepare includes for generic 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: <20250225-arm-generic-entry-v5-1-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The generic entry code needs a static inline function for regs_irq_disabled() so add this, in further requires the signature of on_thread_stack() to be __always_inline so add this as well. Signed-off-by: Linus Walleij --- arch/arm/include/asm/ptrace.h | 5 +++++ arch/arm/include/asm/stacktrace.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h index 6eb311fb2da06fa393f8be7caec8d997637a88b2..a01c66f0ad907882af2a383e53d= e8aca68c551e5 100644 --- a/arch/arm/include/asm/ptrace.h +++ b/arch/arm/include/asm/ptrace.h @@ -52,6 +52,11 @@ struct svc_pt_regs { #define fast_interrupts_enabled(regs) \ (!((regs)->ARM_cpsr & PSR_F_BIT)) =20 +static inline int regs_irqs_disabled(struct pt_regs *regs) +{ + return !interrupts_enabled(regs); +} + /* Are the current registers suitable for user mode? * (used to maintain security in signal handlers) */ diff --git a/arch/arm/include/asm/stacktrace.h b/arch/arm/include/asm/stack= trace.h index f80a85b091d6c4ff365e15ae7100af1c3aed597f..815b5f256af164daa053f3bfd6c= b2f54042a8d2b 100644 --- a/arch/arm/include/asm/stacktrace.h +++ b/arch/arm/include/asm/stacktrace.h @@ -26,7 +26,7 @@ struct stackframe { #endif }; =20 -static inline bool on_thread_stack(void) +static __always_inline bool on_thread_stack(void) { unsigned long delta =3D current_stack_pointer ^ (unsigned long)current->s= tack; =20 --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (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 AB80D2054FD for ; Tue, 25 Feb 2025 09:55:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477305; cv=none; b=EZRoU31WvYz09bXTnipZ9CXO463jIEy1+T9SsBzCYmDOeqD8iosodwjEJjLi2UtHmMfvOqvXKieoQMoYwYu0fvRvU7JLJUEGqDtbX4fHQDX2KMYWhkwWadzPivCaS4ivYs6hBYtv7Iyjv4UT9ds4C0FVquFUySi55m6yi7XFrag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477305; c=relaxed/simple; bh=9bf1s4H2SqLZ79zTukwsYu+F5BulFXGKPVAOZYJS8XA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iHJS2Se/KNNmccUgqIZ8nMTlJ4bZjTrGI4Q8qukXG3gVzWvI3+1aZm1BHmtGFxMKmPoQeZFMTWnwpgas9UclzGpmp3ZXDqXIf56zLhcki+9s8hOiEAeL2Ip6vpu6dblFMKGBskDCzb2/7OAV7WicM3q6aEyFgTEUToSAo2qJHhU= 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=zXpGzSwk; arc=none smtp.client-ip=209.85.208.176 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="zXpGzSwk" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-30795988ebeso56037181fa.3 for ; Tue, 25 Feb 2025 01:55:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477302; x=1741082102; 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=LeNYI4Yc1OrceUVt/GJDCyO7YwVHZ9lpFFe5ekDh0x0=; b=zXpGzSwk4iypnzXV4ocwsaVte4oY8MB3x1s9coaKradt97+V1Oz1VyzHezXRd4KU6l BYi4IHmIpVIJb+3Csf+6OK8+19nGjEf1Op4nUsO4p9UzVjKHaRz2z/ycnhJrojv4/3n2 9JbOOzE8sG1qf8iA8Me7SOMT2+QQqBAFJ3AIqIqjvztPcwQgmwy+Hs8NhROH81k38BD3 ckCO4WnXXDgrUvTjj9Gnkq36xrNOMbqlqHc6uQThxehTTdRkRXckpyMJa3h88iwOISAi qeHtZP+MDT/oQ8RO/cn5+T/2uE71mMMpk4zyRFCI2le41EfC0Z9DQ99toaQeEiUgBrYj yPBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477302; x=1741082102; 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=LeNYI4Yc1OrceUVt/GJDCyO7YwVHZ9lpFFe5ekDh0x0=; b=dzOdyKdrWZF3stkDwegrJnOkrSOykzJCmfo7HJFpvAjMZFr5T0NQm+hDjHjO6q9mfg I6hgPSKB1Iz7UMu5mie3tRan/frHXqJXGtLWmfBAHFGY2fk7TELWvogIxSLDABOIL/N8 pZdwlxvYhFwOeR2GIUhrAxZDNFvpdzdKan8QMrGKIG4gCLEYTGsE/v54YeQN/27eeI5N H1ZGn+Wk2svdkLWSv4u9PK4xMo1zd++gcbm2UB+PbgUyEQEYG9EY40saEI5efgad0hGw PzbQiuejcDCaQBQuSVfyeGaVQA4R++S30NxG0nwk4LTYMYyAG6wuPOY2oFnD78U0RvRe 5Bmg== X-Forwarded-Encrypted: i=1; AJvYcCXlkN/PH2V19Y6kkmFQnMM/cXpVqsLO0iqjys4hE12CXpRo87eGRiMXIyZ1kX+DsVwQFdq7haz8v6JyawM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+/wPR+ESIBvBfO9Y6p4bW1LQQiLoRovzg2M+U0rtwpsRl+8ze RkkZ6eVSKyh4FwgaHwGaEvnF3BxEL1fFANiYy2/0bRlFXuzojvv7dFMZMo98INI= X-Gm-Gg: ASbGncvdh6xefV1eiPyYY+28wGtPp6ZLy+ayFmtU1Q4fU7qEO+Z0HLstv1e5N6WJWUk gRW4lQu28YfvWzWqqN2ofOehrBmoZe7oZ7JxKTsxGy4ZQTHTW/U9Y5dTPSjrD6zJgz9Gcl5QIr8 cRFSx3owNecat4MhGC+CiGZ5cdGxfY3l++UmiE/ZlGOMTkiqb0ISv9gDznL9cg5M5ZBfp14afAK w3fATqR56to2UzW5j31KGJ3DcNw8q5yf/iGWdF7un6Gqqzic7Bes3jp4nfzqOtJt7ocNCsFdhU1 W8g8LgjATrCRtzGG/6vYAu8zDShNbvUtyEPU X-Google-Smtp-Source: AGHT+IGq0OxvT7/cZlFfZbbX0H/MkEPa6FnOUXsHEgn9uErHuYCGdCabGyfw1Gq2rovjVGQpSBjALQ== X-Received: by 2002:a05:6512:130b:b0:545:3032:91fd with SMTP id 2adb3069b0e04-548510cf943mr985679e87.16.1740477301678; Tue, 25 Feb 2025 01:55:01 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:01 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:49 +0100 Subject: [PATCH v5 02/31] ARM: ptrace: Split report_syscall() 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: <20250225-arm-generic-entry-v5-2-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The generic entry code requires that report_syscall() be provided in two parts: report_syscall_enter() and report_syscall_exit() so split the combined function in two. Signed-off-by: Linus Walleij --- arch/arm/kernel/ptrace.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index c421a899fc84c476a672cbfe1c8ece8355d8512d..07b0daf47441f1f76a8af416acc= 74fa5ed770403 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -827,31 +827,45 @@ enum ptrace_syscall_dir { PTRACE_SYSCALL_EXIT, }; =20 -static void report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir d= ir) +static void report_syscall_enter(struct pt_regs *regs) { unsigned long ip; =20 /* * IP is used to denote syscall entry/exit: - * IP =3D 0 -> entry, =3D1 -> exit + * IP =3D 0 -> entry */ ip =3D regs->ARM_ip; - regs->ARM_ip =3D dir; + regs->ARM_ip =3D PTRACE_SYSCALL_ENTER; =20 - if (dir =3D=3D PTRACE_SYSCALL_EXIT) - ptrace_report_syscall_exit(regs, 0); - else if (ptrace_report_syscall_entry(regs)) + if (ptrace_report_syscall_entry(regs)) current_thread_info()->abi_syscall =3D -1; =20 regs->ARM_ip =3D ip; } =20 +static void report_syscall_exit(struct pt_regs *regs) +{ + unsigned long ip; + + /* + * IP is used to denote syscall entry/exit: + * IP =3D 1 -> exit + */ + ip =3D regs->ARM_ip; + regs->ARM_ip =3D PTRACE_SYSCALL_EXIT; + + ptrace_report_syscall_exit(regs, 0); + + regs->ARM_ip =3D ip; +} + asmlinkage int syscall_trace_enter(struct pt_regs *regs) { int scno; =20 if (test_thread_flag(TIF_SYSCALL_TRACE)) - report_syscall(regs, PTRACE_SYSCALL_ENTER); + report_syscall_enter(regs); =20 /* Do seccomp after ptrace; syscall may have changed. */ #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER @@ -892,5 +906,5 @@ asmlinkage void syscall_trace_exit(struct pt_regs *regs) trace_sys_exit(regs, regs_return_value(regs)); =20 if (test_thread_flag(TIF_SYSCALL_TRACE)) - report_syscall(regs, PTRACE_SYSCALL_EXIT); + report_syscall_exit(regs); } --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 B1F3026281C for ; Tue, 25 Feb 2025 09:55:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477306; cv=none; b=tbti9Wo2TcRi1KZWLW9UpwI+Iq/IcIVsXUyCyqgMAMNaSuwRYyXs8tr3wgY5T0SxLROd03aWGClLQmfnlTzGz7Ea1pDCiNU12Y4mDIgmf+iHfUSCyvg68jGtzSbFSq0CQwE05MbxkNIBysd4PNWHIai7FibfHOI2AQcwEOTwx+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477306; c=relaxed/simple; bh=/aaEg0GUs77SXJXwiTAWCor9c6mN7KhETo0EatnyqEY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NYWqtCE2f9mvLn91+o6hY9nOnvvXpALtq5CPm3uiE9Zu5DWN94kZ4cYz66sKz428NkKfppOSegrkouQjLsvIy9u7IRq0S5SuQUUQFYHaY8ai0ClDWWavP8XROoLl3s/Kfeu2LzvuZnKeyXy56f3CGswsDkVwrsrlkucLkG3IBKg= 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=XYkDK4EY; arc=none smtp.client-ip=209.85.167.50 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="XYkDK4EY" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-54605bfcc72so7215576e87.0 for ; Tue, 25 Feb 2025 01:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477303; x=1741082103; 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=e5mhd6DszF79mgTOhWslIzEoODnT/4x94Ab5tm+ZGKw=; b=XYkDK4EYXT81YIYAZAONNE3opGyUVtKJoJVb2BnEHalik+0GvYvKHjsX/gWpnf34w0 yyFkWfrVWfbBIWrtztiRQ1kq82tSf/3N9mpK2V7xGMLMoiEJnR/OgrL9cGeHEmfZ64QG DuCVMmz+L2KV8HYe7EuYwkdzHS1DZ0iFY553ElSOZoxL2OG1xir1op6PEljHd6GjaAxl tN5kUdW1R8ZPwySrfoLzBBXvzqDxWZ3s73C+HEjnZje3tS9Ic68+v/ovjw89codPR3Iv xXVgB3RKLcI2S5r/BUtK7lINhJhjpOVRj0gLYYCMbHRMUqm1RK4FceMDjvIIDBcLqKL8 jp9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477303; x=1741082103; 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=e5mhd6DszF79mgTOhWslIzEoODnT/4x94Ab5tm+ZGKw=; b=kcbnI3Uz0nS/sUG9fRvuM7AXub48CWfH8DcnAgCi4VMmtoC7hlhfS2TODEbE+dVgK7 GW0owLS0U0HBGJ7mpemkJxy58n/qZRA/oQQNLtUi7sam6r5ERG9ILz9joyjAcD0eoUSH GHtXp3jzf3lNrasliUR2GoxUXQ90zt2KweEo2Kvo8Nh5Knxh9eHp46rx83LL/D2Mn8ep lSy2cXlP/BLoltuuK8plIi0QB7gThBx+FDY9497mMRfD3PCDvpSMhPxjq6hFkVl+CsEn ax2dsYP9m5P6w84RyBelYYJKcTqCGDqWH4WrT6vTaI01CJm22nSZr08yAK542m2OhHXK jCIw== X-Forwarded-Encrypted: i=1; AJvYcCVnVMPE1dfTFhoHtifQdoh8lFNeSoz2WkAc9xBjRShjj9+1OBGfSL4sf4Yo6YvUny3VwwtL5ByfSlIc8kg=@vger.kernel.org X-Gm-Message-State: AOJu0YwL7v5M9V5G/O+R8tGPjt7lIS+iK9xoMUGhkbbHlU3li8CxmAY/ g7qxCl0PLQg/grre3O1AhwVEHXo/vRHWS5h8XpVhcUS4u45uNwDJXDwoUS3SiIo= X-Gm-Gg: ASbGncvRzQewxiUQS1PIRcI5CPV7ifswGNWZzhP3LZn5lsN/VslpYGYY6biM5Q7fIIT e0E2khlYjI8f5XeACCkzyXTyJHGLzxWdfNqyzG01LkcJFLlTDiOoMjB0coIyg+H+WbcjJtX/+Zk 8iEDup1Pklm88nsCPKDE4i4rmtjgx1e4r5SaVs955bQD2HM8N/RkflCbR1Nu8QUXyKdmL9Z3MfW rlLqgJt4368NKL48xi6K6hucFdATmhmYB4bMe8IiAu7yC74L9/D7lDG8YazBlbiIK0vx6zyrg+p xUih38fuL0SzAv0VM/dIhzRw55oNPypEC0i3 X-Google-Smtp-Source: AGHT+IHxMI3/M9aEsI7YosRrRsIEAAGbkbNTPpvA+15Mry08Go3W+i3rmuxeIPJbQpwMTvgT3L7elQ== X-Received: by 2002:a05:6512:308f:b0:546:1d8c:60f1 with SMTP id 2adb3069b0e04-546e4662ce7mr8313980e87.15.1740477302668; Tue, 25 Feb 2025 01:55:02 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:02 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:50 +0100 Subject: [PATCH v5 03/31] ARM: entry: Skip ret_slow_syscall label 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: <20250225-arm-generic-entry-v5-3-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 Don't introduce this extra label anymore now that we have a clearly defined entry point for ret_to_user. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-common.S | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index f379c852dcb72fa5e960bba5621cc2152f0df0d3..2f93c2f6d5b8fdf6aaf3dda0192= bde144fcf238d 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -102,7 +102,6 @@ ENDPROC(ret_fast_syscall) * do_work_pending() will update this state if necessary. */ ENTRY(ret_to_user) -ret_slow_syscall: #if IS_ENABLED(CONFIG_DEBUG_RSEQ) /* do_rseq_syscall needs interrupts enabled. */ enable_irq_notrace @ enable interrupts @@ -136,7 +135,7 @@ ENTRY(ret_from_fork) badrne lr, 1f retne r5 1: get_thread_info tsk - b ret_slow_syscall + b ret_to_user ENDPROC(ret_from_fork) =20 /*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D @@ -310,13 +309,13 @@ __sys_trace_return_nosave: enable_irq_notrace mov r0, sp bl syscall_trace_exit - b ret_slow_syscall + b ret_to_user =20 __sys_trace_return: str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 mov r0, sp bl syscall_trace_exit - b ret_slow_syscall + b ret_to_user =20 .macro syscall_table_start, sym .equ __sys_nr, 0 --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 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 5B09326463E for ; Tue, 25 Feb 2025 09:55:06 +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=1740477308; cv=none; b=IUxsAWg3F+57s0jFPoKErWk4Sf6RyJEFiCZQSE7f3ttscapZHT0/DfOCtbCenDgrtAkhrRhuSLrUmdE4CYaHp6Uh5Rst2wOy55JEW/t99jFCoRASK1SqIuf7hLWdHSOt+QiBOPG0qehJFqdXNOLIoGyYCiCYFQHW5Kezsp/KrSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477308; c=relaxed/simple; bh=e2Y7p8dyN9eqj7U5017bQRwN6g3lLgcIgAe2Fqj3P7s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jPmrR6TQCK7iF+htJtmVnBuMNRnvOfDAYUvrV8JFDl5Ww99RFisWgU4b/xj1v0cNfmHrZ5F79gJ5VV11A6ThjT4g5DbsnD0T8IRNWdC4OIRP2Upx142F4+jvLMdwI85EUpnEV/Eh6EWSK+7lP0GsTgldXhxRtHV//yKIKYlc4Ug= 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=bqRSA5fN; 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="bqRSA5fN" Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-30761be8fa8so58400491fa.2 for ; Tue, 25 Feb 2025 01:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477304; x=1741082104; 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=7LU1Mx0M1JJLQ6X7nOndn1GNJ7UBsOKiHS90jS7YqHQ=; b=bqRSA5fN6E8krWpqOd8VGZEpqTQ7cM4dVr8AJab1pVot4biW3btcFoBErbF0QqlGp7 XfAnnuvmy7zQIhl/YDRk44CxQfMtPTj7Hz8iB9kYxZzuS+uF6Fpr04RxFugfBkGuxZaF qAveVEQQ5W85JDJ2lSIPo53GwVl8JwT3Bv30FDAc3LMuAVBO9hEwy5O1o0E5+f+oTLm9 GhVcm45eNSXtna+4rgkW6twBPTvgpDs1rrVmCNWYyFp7Zi/DDjR8YjHeMzLSQeidQHG6 R4MQ6c1h+LSeEcJBVFzAkVjmFZXvM9dFkbZXLxXnBYKfGN9Zp6eazSD63Dupxoq59FQ1 gEEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477304; x=1741082104; 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=7LU1Mx0M1JJLQ6X7nOndn1GNJ7UBsOKiHS90jS7YqHQ=; b=xErKmuYt51JlNbksxVTecm+rsx1ej60dKfUu3g8Wjg76LYGtei2D4gAxYes2e2+2H2 dzgqH1k6uTNydzpfY4Jc/iUWduiUM7251yvwC/hOtZusg3grsuLr/zIIyN3XBKw4mMG4 GVTmkiqGCkseVIWYJiuV26sg5oq5n+1HPqtov3zEM0uyLod83dXgvr+KPdAhaoP21YYO jhJ4+VF8HiK94/MxwPY62LwPfvEkRbYzDvfUZQ4CRIquDHPAGRFylex7TG1ZPLEcXjWX IXFgWps9OzDriTsKKxKtZk61wFWjX+CeCGutAlQOOg52KuVxQqWhSouBxb6aErxHUbOX ywjg== X-Forwarded-Encrypted: i=1; AJvYcCUBqKV+f6d0x/5tr5BiueikmeU+iuHxuPFsvDIVTlvj5XI6/ee1VkGcQwW/3ImSCtGhjPzh/j7hiGClVT4=@vger.kernel.org X-Gm-Message-State: AOJu0YymmlKzLX+NKe/NuLCD7MglQxHOXZ9+Nbi1O9HPiIuA+MEgiQ1C a1q9Awo2CtmniNmC71mmf88jZJFp5HZk1W2CCTKAyN2AIQSNdzWhoddSYBgrCUw= X-Gm-Gg: ASbGncsFB2KGJ9KH0OjZ0fYZh25CCj7XzPgbyg8m5XtNS0VQQdssE6pQFri9UnJ8ipO wIuZTj/PDxiLbHz7u+l2oPKN9UMDI9PrCNr5IucwDUioXViQ/FTwwsplSZPJ4OEyJIUfShkO7dV ds11bfwVxyzu/1Q8F83EifLRoVE3kgW3PDwkUb0zSMKftXp1pzZHuUnQWEzBdGRK1f9NbVZTkje u9ZDbZmqPmsgLtjuo5ElpNMizJMIdqpmzo0G7iFOMVU14VucY1qInQ3DNNK40virQ8bN8kP7QlU vB0fcHuKG3IzAU30UWLX5ATmxlEO51QII/qO X-Google-Smtp-Source: AGHT+IFtzOWDVP2t0fNNEuMAk2DHjCVRvoPLmi06C6RBehYosOgRfNKzND5MSNgjwgco26/R488VhA== X-Received: by 2002:a05:6512:104e:b0:546:2ff9:1542 with SMTP id 2adb3069b0e04-548510ef882mr775478e87.53.1740477304323; Tue, 25 Feb 2025 01:55:04 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:03 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:51 +0100 Subject: [PATCH v5 04/31] ARM: process: Rewrite ret_from_fork i C 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: <20250225-arm-generic-entry-v5-4-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 Move the direct assembly call to schedule_tail() and the call starting a kernel thread into a C version of ret_from_fork() in process.c and rename the old ret_from_fork to ret_from_fork_asm following the pattern in x86. Leave a comment on what we will do when we get to switching to generic entry with this as a base. Signed-off-by: Linus Walleij --- arch/arm/include/asm/switch_to.h | 4 ++++ arch/arm/kernel/entry-common.S | 22 +++++++++++++++------- arch/arm/kernel/process.c | 24 ++++++++++++++++++++++-- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch= _to.h index 9372348516ce9b80fa713966943d0bc622e86066..18d084aff5a4faa7cc5e40d48fb= c4aa97a89b0c6 100644 --- a/arch/arm/include/asm/switch_to.h +++ b/arch/arm/include/asm/switch_to.h @@ -17,6 +17,10 @@ #define __complete_pending_tlbi() #endif =20 +asmlinkage void ret_from_fork_asm(void); +__visible void ret_from_fork(struct task_struct *prev, struct pt_regs *reg= s, + int (*fn)(void *), void *fn_arg); + /* * switch_to(prev, next) should switch from task `prev' to `next' * `prev' will never be the same as `next'. schedule() itself diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 2f93c2f6d5b8fdf6aaf3dda0192bde144fcf238d..df6961a1006b7a0f3522728812b= f52ccb849e511 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -5,6 +5,7 @@ * Copyright (C) 2000 Russell King */ =20 +#include #include #include #include @@ -128,15 +129,22 @@ ENDPROC(ret_to_user) /* * This is how we return from a fork. */ -ENTRY(ret_from_fork) - bl schedule_tail - cmp r5, #0 - movne r0, r4 - badrne lr, 1f - retne r5 +SYM_TYPED_FUNC_START(ret_from_fork_asm) + /* + * ret_from_fork() expects: + * r0: prev + * r1: regs + * r2: fn() for kernel process or NULL + * r3: fn_arg for kernel process or N/A + */ + mov r1, sp + mov r2, r5 + mov r3, r4 + bl ret_from_fork + mov r0, #0 1: get_thread_info tsk b ret_to_user -ENDPROC(ret_from_fork) +SYM_FUNC_END(ret_from_fork_asm) =20 /*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D * SWI handler diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index e16ed102960cb01d625e2ccc484f238b824b03b3..81c1c3f988344185917cf4e53d0= d8ee47ae912f4 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -230,7 +231,26 @@ void flush_thread(void) thread_notify(THREAD_NOTIFY_FLUSH, thread); } =20 -asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); +/* The assembly stub sets up the parameters and calls ret_from_fork() */ +asmlinkage void ret_from_fork_asm(void) __asm__("ret_from_fork_asm"); + +__visible void ret_from_fork(struct task_struct *prev, struct pt_regs *reg= s, + int (*fn)(void *), void *fn_arg) +{ + schedule_tail(prev); + + /* Is this a kernel thread? */ + if (unlikely(fn)) { + fn(fn_arg); + /* + * A kernel thread is allowed to return here after successfully + * calling kernel_execve(). Exit to userspace to complete the + * execve() syscall. + */ + } + + /* syscall_exit_to_user_mode(regs); here once we switch to generic entry = */ +} =20 int copy_thread(struct task_struct *p, const struct kernel_clone_args *arg= s) { @@ -263,7 +283,7 @@ int copy_thread(struct task_struct *p, const struct ker= nel_clone_args *args) thread->cpu_context.r5 =3D (unsigned long)args->fn; childregs->ARM_cpsr =3D SVC_MODE; } - thread->cpu_context.pc =3D (unsigned long)ret_from_fork; + thread->cpu_context.pc =3D (unsigned long)ret_from_fork_asm; thread->cpu_context.sp =3D (unsigned long)childregs; =20 clear_ptrace_hw_breakpoint(p); --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 42894265CBD for ; Tue, 25 Feb 2025 09:55:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477309; cv=none; b=iORy4EeLidxJib9ksMlZu5Q55iGPzKLj5x26LyCzEIYkiTTkPO6yhesNZPPMlFvA+XY1XRDZ9gJ08TKDSCyxDxs6QhJezU12l/SSrmIQl5KpS46wrwGJnvK+Ao43BHc/JO9pFX9UfRXZ8WwBA+JfS89QmK105JvGnKn4++Egh6w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477309; c=relaxed/simple; bh=Ucfgbv6/pmNWaRtl2GyhPSA/IXKZfYpySVqt290mNxw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YsJaJFnMATkQqUoh/umo0dk00ktYTSyykFV02tlvviY10HFSi4AgtT1FK0jQHOprC9yWgpihqmiStOIHL5qTBmIkkg81OFt551oq36sxyNNekrn93Nm34XGHPcMYht007GplrosDw6rPmnl+Sy9TG1omfuwOE3/aJlWfi1rHT4A= 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=xpSGkWkT; arc=none smtp.client-ip=209.85.167.53 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="xpSGkWkT" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-546237cd3cbso5411837e87.0 for ; Tue, 25 Feb 2025 01:55:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477305; x=1741082105; 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=tokJWXMpPS52pGnN85+C7ykU4Uc3aikcglEb93YpSqg=; b=xpSGkWkTT/qrFXDM3cqAWiq8Zt48Pgwdcj2t+7/ZKj8XUPPvoruXDkSAQrIvv7idYI 4FV+hVI7vifLC1RfJTz6DEZzk6Ghb46YyocMsQVPJ/74fRF7CkUsA6XEnNW1Gm3L+k4/ 1u3pY+KeBPXlUzZ4kWW+P6uXkTJvAvcljJv9ogr7OzcvWdRoEKMPAgea5LyzZ9Z4LX5n kF8kJ8LqWXuPGyDac5Srvq544eZbqVgI3wdP+xZadDPVEPDesKCLLTqKMa4zF0IaYzxV RDWu8vmW5MzyiQOXMbw6gHlScpUAtndIUf/KlSkAMvRqZPzmo7wuhFFPzqw3h2qRdLqJ 1ysw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477305; x=1741082105; 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=tokJWXMpPS52pGnN85+C7ykU4Uc3aikcglEb93YpSqg=; b=PXiO0KP7hf2qeEBAQttgzc1BZCrP8R49jBP7lViiemdIrx0VEjZYardl9IjrrsV3bR qdMn/zMI6e4gX/VTUhDkdo0GJUyYLXj6926prQyKW9fsG/eP/ACHkKHhKwDRDpLRtSxq 31oq4990QuRFf5JgcX+Xp2w5gpz+OtXQY7qW4SvoSFw1mB/EVS2pGcsTHrMoudYKky53 ok1xsBU1nQb/O0uDP+pxhlrp+gSsvkwL8d3MKCezODRA5TPS1qhTE6IKTEQC6fmYEsE9 KMFvCyMe0N8PTqBcz9065lRtILU2TbgtPu+vmiTkx9l8JFZcGLjSOzUKGM9L86Q8LYan B2Sw== X-Forwarded-Encrypted: i=1; AJvYcCVgP4nIkjceSrvl2PKEDa0vNGrwp/5Z9W56J5KcBdlwVL/DDhUfKZDEo3DYO9io9QKClCFFKAohulFTZYU=@vger.kernel.org X-Gm-Message-State: AOJu0YzjYP7N8fHlIwucR3uI4XZrq1mw5g7EF0/rl/v4JN99txuiZbWv WTBFlbvITZBKuURZ+Pm5vhLV+6Hk77VTq0hhrQvS/q/A52skN1Y94UMds5yo03o= X-Gm-Gg: ASbGnct1oEE4rUKtULhrj1N72P0ZUQtpdyAZ3a8s9yjfo5Cgk5iDl0u3xb9Gjakp75+ BXgvscLLeE8aAvlK2LAQa1McoGaO0XqoCR7dtCF50KTTlZFlAjSdIw366UaVzg5YR7mxST7d7hq 4EUYuF0qC3oh27k9HPgXAaq2vM7ihtZ4uJ4G5v05vpg/3DFlhwPO5mEKUckEt6uBy8/Js7A7P+M FTL91lsFf6zAHB0hxFsu7Fcm6T/OMkHpYK5+43GZLx4J3LQ9CtuYRD0l4IYzF3vsTuO/uxLR4+8 aE3R1OHRybUxoqQ0zOcNAsH0c0M1hH0QGrhJ X-Google-Smtp-Source: AGHT+IGAmJN5oP6/0azJ8UrklFwsjFNaH/XCFoS/k5MzdQEera2+lJew2uD4+v03oYKKl/xsUE50dA== X-Received: by 2002:a05:6512:1305:b0:545:2b20:5b21 with SMTP id 2adb3069b0e04-54851109ba6mr924438e87.50.1740477305355; Tue, 25 Feb 2025 01:55:05 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:04 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:52 +0100 Subject: [PATCH v5 05/31] ARM: process: Remove local restart 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: <20250225-arm-generic-entry-v5-5-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The ARM kernel contains a quirk to handle syscall restarts inside the kernel without exiting to userspace. The generic entry cannot handle this. Rename do_signal() to arch_do_signal_or_restart() to fit with the upcoming generic entry conversion. This is essentially a revert of commit 81783786d5cf "ARM: 7473/1: deal with handlerless restarts without leaving the kernel" from 2012. After the conversion to generic entry later in this series, the local restart will be reimplemented again, but in C. Link: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-June/10473= 3.html Link: https://lore.kernel.org/all/1340377626-17075-1-git-send-email-will.de= acon@arm.com/ Signed-off-by: Linus Walleij --- arch/arm/include/asm/signal.h | 3 +-- arch/arm/kernel/entry-common.S | 9 +-------- arch/arm/kernel/signal.c | 28 +++++++++------------------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h index 8b84092d151800cb4076672d1c31f0a83777d0d8..7acccc96840c8a17744cc3f2894= f19d142aba4fd 100644 --- a/arch/arm/include/asm/signal.h +++ b/arch/arm/include/asm/signal.h @@ -24,7 +24,6 @@ typedef struct { #include =20 void do_rseq_syscall(struct pt_regs *regs); -int do_work_pending(struct pt_regs *regs, unsigned int thread_flags, - int syscall); +void do_work_pending(struct pt_regs *regs, unsigned int thread_flags); =20 #endif diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index df6961a1006b7a0f3522728812bf52ccb849e511..da5c2d4b62e56cce644b15e329a= b4149d69c5b79 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -86,14 +86,8 @@ ENDPROC(ret_fast_syscall) bne __sys_trace_return_nosave slow_work_pending: mov r0, sp @ 'regs' - mov r2, why @ 'syscall' bl do_work_pending - cmp r0, #0 - beq no_work_pending - movlt scno, #(__NR_restart_syscall - __NR_SYSCALL_BASE) - str scno, [tsk, #TI_ABI_SYSCALL] @ make sure tracers see update - ldmia sp, {r0 - r6} @ have to reload r0 - r6 - b local_restart @ ... and off we go + b no_work_pending ENDPROC(ret_fast_syscall) =20 /* @@ -266,7 +260,6 @@ ENTRY(vector_swi) */ TRACE( ldmia sp, {r0 - r3} ) =20 -local_restart: ldr r10, [tsk, #TI_FLAGS] @ check for syscall tracing stmdb sp!, {r4, r5} @ push fifth and sixth args =20 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 79a6730fa0eb7d6581343bdbbeb6834dcaabb9f8..7b1a16e86b236575efdc29cda9b= 751e8e2a3f64e 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -18,6 +18,7 @@ #include #include #include +#include #include =20 #include "signal.h" @@ -534,9 +535,10 @@ static void handle_signal(struct ksignal *ksig, struct= pt_regs *regs) * the kernel can handle, and then we build all the user-level signal hand= ling * stack-frames in one go after that. */ -static int do_signal(struct pt_regs *regs, int syscall) +static void arch_do_signal_or_restart(struct pt_regs *regs) { unsigned int retval =3D 0, continue_addr =3D 0, restart_addr =3D 0; + bool syscall =3D (syscall_get_nr(current, regs) !=3D -1); struct ksignal ksig; int restart =3D 0; =20 @@ -590,16 +592,14 @@ static int do_signal(struct pt_regs *regs, int syscal= l) } else { /* no handler */ restore_saved_sigmask(); - if (unlikely(restart) && regs->ARM_pc =3D=3D restart_addr) { + if (unlikely(restart) && regs->ARM_pc =3D=3D restart_addr) regs->ARM_pc =3D continue_addr; - return restart; - } } - return 0; + return; } =20 -asmlinkage int -do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int sysca= ll) +asmlinkage void +do_work_pending(struct pt_regs *regs, unsigned int thread_flags) { /* * The assembly code enters us with IRQs off, but it hasn't @@ -612,19 +612,10 @@ do_work_pending(struct pt_regs *regs, unsigned int th= read_flags, int syscall) schedule(); } else { if (unlikely(!user_mode(regs))) - return 0; + return; local_irq_enable(); if (thread_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) { - int restart =3D do_signal(regs, syscall); - if (unlikely(restart)) { - /* - * Restart without handlers. - * Deal with it without leaving - * the kernel space. - */ - return restart; - } - syscall =3D 0; + arch_do_signal_or_restart(regs); } else if (thread_flags & _TIF_UPROBE) { uprobe_notify_resume(regs); } else { @@ -634,7 +625,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thre= ad_flags, int syscall) local_irq_disable(); thread_flags =3D read_thread_flags(); } while (thread_flags & _TIF_WORK_MASK); - return 0; } =20 struct page *get_signal_page(void) --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 6081426657F for ; Tue, 25 Feb 2025 09:55:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477310; cv=none; b=RYakv0nSKLtSPiqnLOTsKPJ+TP5Y+HTLy7SNGg04IzuwjS+rTqpZfwLGjtAsMt6BDZT6odkkmVAaxEUjwcKvYbOoBdNu+L7Yg/zje76SabudgdNeK58BDrkX5s91Pf241w95hnjcHkSaLhW2bEup5aZVNv8rEe+GowdEWr3UQkU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477310; c=relaxed/simple; bh=uIrNsvfXiEIKEM8U0o8JGW9TxOtHpV7VJq4MGLDIiKA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jurmvJKKY8UbRYQ9Ejjlp58PAJU0IZCs4iQPVXo0rFkJ5wl3pZF8I9WxhaB0f5/dZqd+7vposT2iSh0kx9vHuM2cMyYVqrsQbXuvTciRcQ3xKLjz+6KIGIj53ya0JZH0OLI4LuJS44nGoKvQzz3bdBJ4J2h7tYtkNxWPS6jPmuc= 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=dv+5PV0F; arc=none smtp.client-ip=209.85.167.41 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="dv+5PV0F" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-546210287c1so5523276e87.2 for ; Tue, 25 Feb 2025 01:55:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477306; x=1741082106; 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=H2oUY/WKIEq8Evp3ZyFIu+cgZC04yoqr/o6eiYlPpGs=; b=dv+5PV0FnFyf1VtDkEHMtITjjgtUIHUPyA9KOc7j+x9YH1876OM6h6LHyC7IS6xPVx 2wZ10FEn9AxrdHsKeUEyFfx3+PDfJs9JOqo02mukNNDK1ELiWAgPld30hRtflBGFh4SR j4Sq9A+LlvixAxhHky6PrLq5Jksn+05Ofqeut7VfoDcxBs+bxtJS8tyamnDUmPRZNC9U Q9WkxwRNnfUiiC+VPBcgtbMOe+qyU8GX27qemMXAqxNN8m12u9Slwka732+VZ4doqGur xgZc/ShyYEVSy6LCkLQtmXl3CES4ogvduQT/EFDEe2tzWTeZp3qKI+Qlkq6oRPKv1jQW QkgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477306; x=1741082106; 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=H2oUY/WKIEq8Evp3ZyFIu+cgZC04yoqr/o6eiYlPpGs=; b=mixoOwDu4SJ7RRCFJsbIQ0A1KpIZLPsjDnbiAKNZDe9yd5PqC3sWPk6XtzgS23gwKi umPw0lAxf8Zi/cJgyurMDJpUIOuKa9WODixGWSTYoqyzgxs/INSWmzCsNhP+TFbj2E4X CDOVOKaFyLSC3+xfYpjZuqgO1pbq0LXnGeQB74KY9pR+9JyXSDxLoNa37A0EtQT4ZyUx 3m/KWHzDqu21nyO79HlGctKiaMZG9grlPUDN0lXBoDU43Xb5dcT7uqU9SW20GH8z7lU1 RjIHEKns2wVVh2qU+pCyAtzjh7TPBJRtt0TH/XECqBOJvqKtW6BkHfLxIjVrVioYyXG9 ZylA== X-Forwarded-Encrypted: i=1; AJvYcCXeu9pL2Ey/2DS8agNUrikKFl+aZ4KndFihTXD1PWPRot/zTOZsURzn3HKROz4OmSRv+qQKQ6V2b4g6L78=@vger.kernel.org X-Gm-Message-State: AOJu0Yzkq+5ImDYlIjj+IwFeUnMuqJgoc8kq9rrViddJDbqOmTwJ6pfx O+uFuP3jw8iPRPa8PlunSM/Byhq+QFgeuT1TPHUCb781jPEJtXjg7qLujpEleNg= X-Gm-Gg: ASbGncuT3ccYyxNtlIaLnAq7xSl1N7XA9gpMNA1aXk3wzXcY5G010Y+iWVNW9aV9FZV Pf7quQPCBkWs6Bexya450ILtobkkWffgZ8bTNB7M6L9nyKwiKWO7tfu/QfgcPeA1eFI3BDFfCG5 SDmkyIopzPelzQOt/XyDJap49zqv9uMhVNPsWjpQgWmNSVaDb1ZZ2sbLl3KjlgFA5bfWlngbqvs MmD3oLdm9skFedo/Vbkc3ryDL5dq3P7QlBVrdVyo02LSWp2dLl+Wcfsm6iNxL/H4kdfWAp23PA/ /c5YW8QJtbEGnPk2yslZ2fB3rZ/XLAnbR6A0 X-Google-Smtp-Source: AGHT+IHAFWSNeFOCqj7itWqejwjbFtkz5zB14hTY/lexRvyjjC7gm0PhxyvvhicInIiEhLg5asuYew== X-Received: by 2002:a05:6512:b05:b0:545:2efc:7458 with SMTP id 2adb3069b0e04-54839259c52mr6699501e87.39.1740477306361; Tue, 25 Feb 2025 01:55:06 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:05 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:53 +0100 Subject: [PATCH v5 06/31] ARM: entry: Invoke syscalls using C 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: <20250225-arm-generic-entry-v5-6-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 This makes the assembly invoking syscalls switch over to doing this from C with a small assembly stub to actually jump into the syscall. Split the syscall invocation into two paths: one for plain invocation and one for tracing (also known as "reload" as it was reloading the registers from regs). We rename this path with the infix "trace" as that code will be trace-specific as we move code over to C. Some registers such as r1 and lr get cobbled during the C calls and need to be restored when we return. Right now the part in C doesn't do much more than check the syscall number to be valid (a test previously done with a cmp r #NR_syscalls inside the invoke_syscall macro) but we will gradually factor over more assembly to C that can then be switched to the generic entry code so the exercise gets a point. Since both functions are called from a C file that is in turn only called from assembly, the functions have to be tagged with __ADDRESSABLE() in order not to upset CFI. Tested with a full system boot and by issuing some command line tools with strace to make sure the tracing path still works. Signed-off-by: Linus Walleij --- arch/arm/include/asm/syscall.h | 3 ++ arch/arm/kernel/Makefile | 3 +- arch/arm/kernel/entry-common.S | 65 ++++++++++++++++++++++++++++++++++++--= ---- arch/arm/kernel/entry-header.S | 25 ---------------- arch/arm/kernel/syscall.c | 28 ++++++++++++++++++ 5 files changed, 90 insertions(+), 34 deletions(-) diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index fe4326d938c18efb54c96930e6b52ab7da9b2942..1d21f26ecf510ac00a878b4d51a= 5753ee49475f5 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h @@ -19,6 +19,9 @@ =20 extern const unsigned long sys_call_table[]; =20 +int invoke_syscall(void *table, struct pt_regs *regs, int scno, void *retp= ); +int invoke_syscall_trace(void *table, struct pt_regs *regs, int scno, void= *retp); + static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index b3333d070390a8ff366a306931614b1b260647bd..69ddf51081f4791982518d37df6= 0c11211b8955a 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -20,7 +20,8 @@ CFLAGS_REMOVE_return_address.o =3D -pg obj-y :=3D elf.o entry-common.o irq.o opcodes.o \ process.o ptrace.o reboot.o io.o \ setup.o signal.o sigreturn_codes.o \ - stacktrace.o sys_arm.o time.o traps.o + stacktrace.o sys_arm.o time.o traps.o \ + syscall.o =20 KASAN_SANITIZE_stacktrace.o :=3D n KASAN_SANITIZE_traps.o :=3D n diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index da5c2d4b62e56cce644b15e329ab4149d69c5b79..57aa1084a0476e9c218cd100ce4= fdf4aaa748234 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -254,21 +254,23 @@ ENTRY(vector_swi) #else str scno, [tsk, #TI_ABI_SYSCALL] #endif - /* - * Reload the registers that may have been corrupted on entry to - * the syscall assembly (by tracing or context tracking.) - */ - TRACE( ldmia sp, {r0 - r3} ) - + mov r1, sp @ put regs into r1 ldr r10, [tsk, #TI_FLAGS] @ check for syscall tracing stmdb sp!, {r4, r5} @ push fifth and sixth args =20 tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls? bne __sys_trace =20 - invoke_syscall tbl, scno, r10, __ret_fast_syscall + mov r0, tbl + /* r1 already contains regs */ + mov r2, scno @ syscall number from r7 + badr r3, __ret_fast_syscall + bl invoke_syscall =20 + /* Restore regs into r1 and lr after C call */ + badr lr, __ret_fast_syscall add r1, sp, #S_OFF + 2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE) eor r0, scno, #__NR_SYSCALL_BASE @ put OS number back bcs arm_syscall @@ -301,7 +303,16 @@ __sys_trace: add r0, sp, #S_OFF bl syscall_trace_enter mov scno, r0 - invoke_syscall tbl, scno, r10, __sys_trace_return, reload=3D1 + mov r2, r0 @ scno into r2 + add r1, sp, #S_R0 + S_OFF @ pointer to regs + mov r0, tbl + badr r3, __sys_trace_return + bl invoke_syscall_trace + + /* Restore regs into r1 and lr after C call */ + add r1, sp, #S_R0 + S_OFF @ pointer to regs + badr lr, __sys_trace_return + cmp scno, #-1 @ skip the syscall? bne 2b add sp, sp, #S_OFF @ restore stack @@ -415,6 +426,44 @@ sys_mmap2: b sys_mmap_pgoff ENDPROC(sys_mmap2) =20 +/* + * This call wants: + * r0: syscall table + * r1: regs + * r2: syscall number + * r3: pointer to return function + */ +SYM_TYPED_FUNC_START(invoke_syscall_asm) +#ifdef CONFIG_CPU_SPECTRE + csdb +#endif + mov tbl, r0 + mov scno, r2 + mov lr, r3 @ return address + ldmia r1, {r0 - r3} @ reload r0-r3 + /* Arguments 5 and 6 are (hopefully) on the stack */ + ldr pc, [tbl, scno, lsl #2] @ call sys_* routine +SYM_FUNC_END(invoke_syscall_asm) + +/* + * This call wants: + * r0: syscall table + * r1: regs + * r2: syscall number + * r3: pointer to return function + */ +SYM_TYPED_FUNC_START(invoke_syscall_trace_asm) +#ifdef CONFIG_CPU_SPECTRE + csdb +#endif + mov tbl, r0 + mov scno, r2 + mov lr, r3 @ return address + ldmia r1, {r0 - r6} @ reload r0-r6 + stmia sp, {r4, r5} @ update stack arguments + ldr pc, [tbl, scno, lsl #2] @ call sys_* routine +SYM_FUNC_END(invoke_syscall_trace_asm) + #ifdef CONFIG_OABI_COMPAT =20 /* diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 99411fa913501cad8b55ef04a2b8ab3d44f3e39e..52b4fa97226dbfa4b55aca8eaf7= 4ae24e1e220f8 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -389,31 +389,6 @@ ALT_UP_B(.L1_\@) #endif .endm =20 - .macro invoke_syscall, table, nr, tmp, ret, reload=3D0 -#ifdef CONFIG_CPU_SPECTRE - mov \tmp, \nr - cmp \tmp, #NR_syscalls @ check upper syscall limit - movcs \tmp, #0 - csdb - badr lr, \ret @ return address - .if \reload - add r1, sp, #S_R0 + S_OFF @ pointer to regs - ldmiacc r1, {r0 - r6} @ reload r0-r6 - stmiacc sp, {r4, r5} @ update stack arguments - .endif - ldrcc pc, [\table, \tmp, lsl #2] @ call sys_* routine -#else - cmp \nr, #NR_syscalls @ check upper syscall limit - badr lr, \ret @ return address - .if \reload - add r1, sp, #S_R0 + S_OFF @ pointer to regs - ldmiacc r1, {r0 - r6} @ reload r0-r6 - stmiacc sp, {r4, r5} @ update stack arguments - .endif - ldrcc pc, [\table, \nr, lsl #2] @ call sys_* routine -#endif - .endm - /* * These are the registers used in the syscall handler, and allow us to * have in theory up to 7 arguments to a function - r0 to r6. diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c new file mode 100644 index 0000000000000000000000000000000000000000..edc0ac88ec60ce3f23149a526de= 7dc1205906552 --- /dev/null +++ b/arch/arm/kernel/syscall.c @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +int invoke_syscall_asm(void *table, struct pt_regs *regs, int scno, void *= retp); +__ADDRESSABLE(invoke_syscall_asm); + +__visible int invoke_syscall(void *table, struct pt_regs *regs, int scno, = void *retp) +{ + if (scno < NR_syscalls) + /* Doing this with return makes sure the stack gets pop:ed */ + return invoke_syscall_asm(table, regs, scno, retp); + + return 0; +} + +int invoke_syscall_trace_asm(void *table, struct pt_regs *regs, int scno, = void *retp); +__ADDRESSABLE(invoke_syscall_trace_asm); + +__visible int invoke_syscall_trace(void *table, struct pt_regs *regs, int = scno, void *retp) +{ + if (scno < NR_syscalls) + /* Doing this with return makes sure the stack gets pop:ed */ + return invoke_syscall_trace_asm(table, regs, scno, retp); + + return 0; +} --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 59861266B5F for ; Tue, 25 Feb 2025 09:55:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477311; cv=none; b=PvpGmSXPXSKTfMTUtykKQ3bDjfdrbk5RC8eT2iulidZTkibJpwWpaMgH7R3IiwYwN8hqO/2FUeeIHp5inlxD5MoqBmdjyhs0Q1A9kDw8p7Y1C+WMuWx3zR0o0un2tIIMoXvgnOlnr6H/ZRwm/+1jAMth9f2VVBPFUEZYSfPRGxQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477311; c=relaxed/simple; bh=hXVFyo95Fd8AEwhm82LpDlV5OS0uorB3k4MP3pL+pwA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SOSCYiVWwlTFV/Wa7n88vyG9ETfj9oWZmW/BIHIDtR0koQ6yYLwQCErS+W7RItZygp6fOqAjMIl6yvbg/ihFVusJFR+EQ0hQee6FuELKOkbowt9Tm6Vrui8AWTNUgcX7ykLTW+AWlED5a94XGKuflZAetuCnhO2bWysZemuFb8g= 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=yTCczMrW; arc=none smtp.client-ip=209.85.167.41 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="yTCczMrW" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-545316f80beso4810352e87.1 for ; Tue, 25 Feb 2025 01:55:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477307; x=1741082107; 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=yplTGeg8q5Jb1IHX+lZzUxdHnSw+Ki6MseFOXEsgMb4=; b=yTCczMrW41gPMUqWM2H1YVWu3DVfmmMn4m0eEasFQBk8QHwv/0rjwdFgXeAyFxr8Lp b6ZK3/6upYWpFkN7l4tR69MOrTKtMRj5f0yJxrdAx3o/hpMAIABoJzR8lMntaSNJMuc2 drNk4PaVRHis/ZrVms5PJfZa7NTHS7lN06fRRu1C7v1jlS6sPYB2cw26PeWK9l5caAG1 5yufmOdlZuMD7zfyETwpjloF/vxJFIujyAnad+orJM9WyAEystTGr+xT4JtqPQ8eQzUY 1w6unzQXzyoN/AiTtj9Kjh1dTJ9qIW2vgNIMjbAJtD3LqxNFpnheCREw1tCoGbokElTk inZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477307; x=1741082107; 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=yplTGeg8q5Jb1IHX+lZzUxdHnSw+Ki6MseFOXEsgMb4=; b=embp5tCr9UBNrjquP7E+kaKmz6XgNYf70LIjvumf8/59zFmJomvXBK6yZbIJDLVz2H MAip+i4nOZI8WXbYzblpsq1fh40douSRAj9JuRdnXSniEEB71w6D2pj04uAY2+tl6twP xEFcNViLb2DCm/WDMBLXjrzMw70CwaPYcTzKlAip5+cppCaLAqqQWkSRIDP/MEpT9+xq 3MS0Rl6thp7iLVKy23uxU3F16Dk2vAHXVaBDTGyhtlixIYkQXWjP/mxIxxjwvq+rKxC2 Quz5tDIZbleF46AYcoCeahO9GO1oIoY8vjEE31G2OXQ206/Lj/tsJZYAcEZR8G5X8aky fI1g== X-Forwarded-Encrypted: i=1; AJvYcCWIvMUl42Hy4Lf4UbtML31w8ytpNq3CBoU8bzo2Ijxjv9HkAsYgnBNDswptT+Iah0LS1cdqYAEDkgpCJ7A=@vger.kernel.org X-Gm-Message-State: AOJu0YyKbsBI6tKD80slnanCYOw3WuvVvzvBMc1okuymM5sqQnneD4ZK sd2SEKLq7+XFSlBVhODQbvwiq/gr1spboZzhqBzvoDGx7BhUiUkBzGsx8A/UXGU= X-Gm-Gg: ASbGncvNoCNAqwBAAjlFk+zsIe6PmCekBRZmcUJMwSUOReVTONGoUkAbiGCs/8+OIQ9 fJtnTK5KLC6TPgq7MpZo6WOLYSqmg3lCobDdfKzdDuACL42gEy2s+Gq0fKmSiUwUtEgLaO106NX I+wJCpWewXQ4jATj4lGG9mGfJs68M1gqR8XMDfprA12Xa9YQcZwrTvG26EmmCeyQWCLd35UKMqR lL6ypmbuRpcc2JaersDpABpCtYcDmeDj5SEMJ4FLwSqpfHPtheAY+DqvDwDVOyDZSxlNu5x/7F/ tNIe5NVi0GY1sAyJDdRGEnUc+9ywdf+ZTld1 X-Google-Smtp-Source: AGHT+IGoTxLJRfhLsWrHbxJYsDg42lv8XbjjipYTWunjh9XthEIABhj8ikVXP3Y+TyRAMRgkg54cow== X-Received: by 2002:a05:6512:3f10:b0:545:27ee:79f3 with SMTP id 2adb3069b0e04-54850e8790bmr925786e87.0.1740477307404; Tue, 25 Feb 2025 01:55:07 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:06 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:54 +0100 Subject: [PATCH v5 07/31] ARM: entry: Rewrite two asm calls in C 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: <20250225-arm-generic-entry-v5-7-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The normal and trace entry code calls out to arm_syscall() and sys_ni_syscall() from assembly, but these calls can be moved over to the new C implementation. Signed-off-by: Linus Walleij --- arch/arm/include/asm/traps.h | 2 +- arch/arm/kernel/entry-common.S | 23 +++++------------------ arch/arm/kernel/syscall.c | 13 +++++++++++-- arch/arm/kernel/traps.c | 2 +- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index 2621b9fb9b19b064aa40a8ab4a3a89067b98a010..b888912c2450e0e8eec8139166c= 7292f283545c7 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h @@ -40,7 +40,7 @@ asmlinkage void dump_backtrace_stm(u32 *stack, u32 instru= ction, const char *logl asmlinkage void do_undefinstr(struct pt_regs *regs); asmlinkage void handle_fiq_as_nmi(struct pt_regs *regs); asmlinkage void bad_mode(struct pt_regs *regs, int reason); -asmlinkage int arm_syscall(int no, struct pt_regs *regs); +int arm_syscall(int no, struct pt_regs *regs); asmlinkage void baddataabort(int code, unsigned long instr, struct pt_regs= *regs); asmlinkage void __div0(void); asmlinkage void handle_bad_stack(struct pt_regs *regs); diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 57aa1084a0476e9c218cd100ce4fdf4aaa748234..77801d039b5f6562b231a6fd497= 9e318c7e736a6 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -264,18 +264,10 @@ ENTRY(vector_swi) mov r0, tbl /* r1 already contains regs */ mov r2, scno @ syscall number from r7 - badr r3, __ret_fast_syscall - bl invoke_syscall - - /* Restore regs into r1 and lr after C call */ + /* We return here no matter what, also pass this as an argument */ badr lr, __ret_fast_syscall - add r1, sp, #S_OFF - -2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE) - eor r0, scno, #__NR_SYSCALL_BASE @ put OS number back - bcs arm_syscall - mov why, #0 @ no longer a real syscall - b sys_ni_syscall @ not private func + mov r3, lr + b invoke_syscall =20 #if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI) /* @@ -308,13 +300,8 @@ __sys_trace: mov r0, tbl badr r3, __sys_trace_return bl invoke_syscall_trace - - /* Restore regs into r1 and lr after C call */ - add r1, sp, #S_R0 + S_OFF @ pointer to regs - badr lr, __sys_trace_return - - cmp scno, #-1 @ skip the syscall? - bne 2b + cmp r0, #-1 + bne __sys_trace_return add sp, sp, #S_OFF @ restore stack =20 __sys_trace_return_nosave: diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c index edc0ac88ec60ce3f23149a526de7dc1205906552..d637dc74b1c70415933898fbcad= bedc71df5f654 100644 --- a/arch/arm/kernel/syscall.c +++ b/arch/arm/kernel/syscall.c @@ -12,7 +12,10 @@ __visible int invoke_syscall(void *table, struct pt_regs= *regs, int scno, void * /* Doing this with return makes sure the stack gets pop:ed */ return invoke_syscall_asm(table, regs, scno, retp); =20 - return 0; + if (scno >=3D __ARM_NR_BASE) + return arm_syscall(scno, regs); + + return sys_ni_syscall(); } =20 int invoke_syscall_trace_asm(void *table, struct pt_regs *regs, int scno, = void *retp); @@ -20,9 +23,15 @@ __ADDRESSABLE(invoke_syscall_trace_asm); =20 __visible int invoke_syscall_trace(void *table, struct pt_regs *regs, int = scno, void *retp) { + if (scno =3D=3D -1) + return -1; + if (scno < NR_syscalls) /* Doing this with return makes sure the stack gets pop:ed */ return invoke_syscall_trace_asm(table, regs, scno, retp); =20 - return 0; + if (scno >=3D __ARM_NR_BASE) + return arm_syscall(scno, regs); + + return sys_ni_syscall(); } diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 6ea645939573fb65ed36f5435a9c94e98828f45b..942c77767919466d5b89d83d8eb= 77032b119473e 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -609,7 +609,7 @@ do_cache_op(unsigned long start, unsigned long end, int= flags) * 0x9f0000 - 0x9fffff are some more esoteric system calls */ #define NR(x) ((__ARM_NR_##x) - __ARM_NR_BASE) -asmlinkage int arm_syscall(int no, struct pt_regs *regs) +int arm_syscall(int no, struct pt_regs *regs) { if ((no >> 16) !=3D (__ARM_NR_BASE>> 16)) return bad_syscall(no, regs); --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 4EE41266F17 for ; Tue, 25 Feb 2025 09:55:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477312; cv=none; b=b2MFwg/YrQev0yPxewlSEKIi1S6+JSwbpJyW8WAyeF8Gqi0IcXLPAdddae/i9N4y1fC1mBLix3kOXvOjjuF0fTGCYQUwPD3FN7me8CTDgOPXerDINXUonHT1sZamFqQGEX3pMSeGoaJSsifM9e2bbMkYtMfHNcEdacN8cZqT42E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477312; c=relaxed/simple; bh=KmFYy+Sl51pEEMIL+kYoz/kzGL3OpkwJKZPPkPqW0zo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BI2U08yG2jdl1LI9ZbnWa+DUtruKLQ3LXyEcLFpCSf9X9Lq5cp6xR0EsfLr2le0nJAzROGFaz3neqAwNJyCrlI58xu+WJkyjkJmEwFBcCK8ymfko498Tf8CnpV99azfaq2svRr+gt1pOaJHDKwFlqdKKEG7jgNqXgDrAJ/FKoyc= 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=EVlGLEay; arc=none smtp.client-ip=209.85.167.48 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="EVlGLEay" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5461dab4bfdso6457137e87.3 for ; Tue, 25 Feb 2025 01:55:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477308; x=1741082108; 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=gCv9qyhC7Wn0x41/PmaNXNh/X9H9ffqS+9z2MGX0UwA=; b=EVlGLEayvMgKWsWFKu399emywj/RVV7D8qPrSBtyEvk6o1P8jxeUnapO43/MgYzv/3 E4yk+6Eqswb+v4sp94CKCTEdNFkSgTwchqXYFck+uAoxJ9vgOtbz3/+NdyFpPCp1GVDK QQzwiflWVMrKOzcbG6Dl1oisCM646lRwtfqm8cDFrjziSXRzrbC8JH+fkdOB707Zz25m 9/J9l8LpdtraRlDE2LAsvRaYjees/jxg3aAozSY8anOMQ2SYDMgPivq0yCRCKnfekvTt JU6/3GRMID8JZB5gPYaVfTyfTH4NiYic6OxGrlBMnPs9usU6f1wdP7Fr2MpSmIIZ8d4Y YYcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477308; x=1741082108; 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=gCv9qyhC7Wn0x41/PmaNXNh/X9H9ffqS+9z2MGX0UwA=; b=Utlof5EYvgyp/tw8JfjQ2xdpFO1jqLdgnVFtfPoVDA40/JIh/xWx2FTRVlviWDIZOj AOBsKThMBdy9SP42341qe5YAbuA93UdEoR36s6leVok52Mhh/TTaCD98NJLDkBUPXtPX wIHiKM2zX7mWTuyswuJMb0I0hvYH+CSelkJA2Z/xMg7u0Wv/DLKGqVLbmN+Xfvgwj2m3 1buChY40QrOvTVK3BitSRr5PTVWQTNTey9gbsxXfcty0hIoIsWxHmt+lcUxIlP+k2PYR 8k+eBI7a2wjHRJje8i/r9uVlCQEuV4oBxlzK3nFy7Vn7W80a/AvT8SO+llwGW+5E3hpW 2uVA== X-Forwarded-Encrypted: i=1; AJvYcCV5ndYr8TnOlQQBM+TvyI628hw1hEqOEMWM4Bdx7MaJOkG+Tu/WAyoFPviApFJfZ2gvYNsv/QgykF+D470=@vger.kernel.org X-Gm-Message-State: AOJu0YyOmHFgoQzWExySBAA9GT6UM7JIC1/8sY4LkOEczc4kY0AnY7JI urvYrtKB6NRn0+0SavjTM/VIfS9SgPgfY7iCDH1jcXh0AIdC0Ld62hlPel7uvD0= X-Gm-Gg: ASbGnctR+LX2PJoFiQef2r+ywi283B5DzRRhcuLhnsk6XtYkzcnMx32c/2lPIRAYt9v DcsNxfZ7uBgodNBVAp8drvGEYMtSpHYA3HrxzIKeVRWrLaNu8bDpCPVxWzqRHLfuod71iNU4wpx u3ho1oWwisxdkStOfk94BZCP3cuBPSztt63I73A3JWJJe/2aA7ABPlsh4anyRe11pjBWZ9x3Ybk QWlNQCpZ0/G5PsHdRJaHTGbVXjPd0x8T62bXz56mY9IV4c165zCWBqhIlCil8Avjn0ay5w02e0j u5px/r5fS/xcotUjC/6VH2zjoZkfMkjKb3eP X-Google-Smtp-Source: AGHT+IH/i15/+svDVlzRmeCj49N+7fLYS0nSEMx6zNrdg8fMuOZRZIVmoIl+m7ZLFVdJmllqsHEC6Q== X-Received: by 2002:a05:6512:3049:b0:545:3031:b4d7 with SMTP id 2adb3069b0e04-54838edda6fmr5696766e87.6.1740477308397; Tue, 25 Feb 2025 01:55:08 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:07 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:55 +0100 Subject: [PATCH v5 08/31] ARM: entry: Move trace entry to C function 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: <20250225-arm-generic-entry-v5-8-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 This moves over the code entering into tracing into the C syscall invocation code. As syscall_trace_enter() will provide the current syscall number from the regs we need not provide the syscall number to the invocation function any more. Signed-off-by: Linus Walleij --- arch/arm/include/asm/syscall.h | 2 +- arch/arm/kernel/entry-common.S | 6 +----- arch/arm/kernel/syscall.c | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index 1d21f26ecf510ac00a878b4d51a5753ee49475f5..66067d165ba3fbbe0f840a89ae3= 96eb1a311bacc 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h @@ -20,7 +20,7 @@ extern const unsigned long sys_call_table[]; =20 int invoke_syscall(void *table, struct pt_regs *regs, int scno, void *retp= ); -int invoke_syscall_trace(void *table, struct pt_regs *regs, int scno, void= *retp); +int invoke_syscall_trace(void *table, struct pt_regs *regs, void *retp); =20 static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 77801d039b5f6562b231a6fd4979e318c7e736a6..3cfc6d952ff99be9c4c1be4481a= c3039260e3e57 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -292,13 +292,9 @@ ENDPROC(vector_swi) * context switches, and waiting for our parent to respond. */ __sys_trace: - add r0, sp, #S_OFF - bl syscall_trace_enter - mov scno, r0 - mov r2, r0 @ scno into r2 add r1, sp, #S_R0 + S_OFF @ pointer to regs mov r0, tbl - badr r3, __sys_trace_return + badr r2, __sys_trace_return bl invoke_syscall_trace cmp r0, #-1 bne __sys_trace_return diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c index d637dc74b1c70415933898fbcadbedc71df5f654..377e16c8c53c8e809e3f8b157a8= 89ef115d5c043 100644 --- a/arch/arm/kernel/syscall.c +++ b/arch/arm/kernel/syscall.c @@ -21,8 +21,11 @@ __visible int invoke_syscall(void *table, struct pt_regs= *regs, int scno, void * int invoke_syscall_trace_asm(void *table, struct pt_regs *regs, int scno, = void *retp); __ADDRESSABLE(invoke_syscall_trace_asm); =20 -__visible int invoke_syscall_trace(void *table, struct pt_regs *regs, int = scno, void *retp) +__visible int invoke_syscall_trace(void *table, struct pt_regs *regs, void= *retp) { + int scno; + + scno =3D syscall_trace_enter(regs); if (scno =3D=3D -1) return -1; =20 --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 D8F932673AD for ; Tue, 25 Feb 2025 09:55:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477313; cv=none; b=umXvWH4t3QfyRQum5Yxo6mxhV/BtTnuCKKXTCCLmVupySQdFz0uSD8FHKS8FP5TbJXxLnZ6L10t2/huTMSN6xa+dZ0FjI2zYQSefyx2yXOWx7mRLvw4Vji7JUuI/3ffs7M4xlj+El/d4IugnU8PqDiTXO2fOftN59uWIoulIQww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477313; c=relaxed/simple; bh=1//OcGv7gI8Rf5rDiwusdTiN/AV8oS31pnzMa0CmGQ8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pNF6Lme2/t/YoBnXa4A/VpEZCRkxDLJKLCzhKL6/wMYbtKIu7d0o0sxa0bqgj8Y9b/xnV4k0pEXg2PFcL+SkKQIdYC93ft2+gCV4upYh9U+XvJBYk1sfbsGG0ZBa8s1aXtvL8wg5cE2BRhemHe3jtpbgJsqcgvA8R6312aV5Gs0= 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=YkLTdvn3; arc=none smtp.client-ip=209.85.167.51 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="YkLTdvn3" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5484fa1401cso1187198e87.1 for ; Tue, 25 Feb 2025 01:55:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477310; x=1741082110; 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=aUy2L+59XSB2dO0W6jnqgQpUaRtZ0LvR6wu2Q9qABCw=; b=YkLTdvn39mAIvAXySe93CfiJukZxVsLhKOSvBj29d8f2sfxTK0w/tP1HbSjydH83kG Sv09j/rYODYu7Trgj8kpogjmpCO8a2W4I5dPIrw5+PsM4t69lA+reXgQwlyN7R2gS542 egqxFZOivmr/JFpAle+yx+/gzLyINZOIPqwja6AUZ8cLzvMEmlCjAhWZb/enw2Z67s01 HQOhiNeFLiRvkPskOypar0+okwmIF0KjkVVvsPm0fI4hCB3CuF4IQASuiwxIlgCKKG2v Tk2pdVGPv3jpBixZi5r1HQAUcJ++NMxYJoKVEe6OtQEVjoEImKO7rogcGP528j7iGUKo uwfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477310; x=1741082110; 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=aUy2L+59XSB2dO0W6jnqgQpUaRtZ0LvR6wu2Q9qABCw=; b=hWnF1/r+Em5i9JvAdqIMAsUO6r8POR+hfEN95qGNDuN9B8K6QUHyh7KHLZuKa2N/fa ZEHywIuZ2tqnbypW1Led6Bpd92NRwOnoI+1HBEh3lSvaY001tQMM0OWSZgC5lU8L2zUi 7vdfPZnxnEgDwN0OYF2RXZrg8S5oYemGdYmWp7Y5t3JsSxDFHHbAQUUTEJWIM6QiGoaP yCDziwiYMiBP5racE0Xss8flxgPsGe2eVIUL/Xr7l+lysQSZHiRPTt8enDLWR20xL0ts TTvwhF0+GXDafqCZBJb0MXxaecknuxoIAzTo/odULVQNwNmsPsWpY1xfgEAZSkHDEuHq 0uVg== X-Forwarded-Encrypted: i=1; AJvYcCVdKVIkYqOmNNME+9KSVqmXYemz+uUnN2hA6sUcNbhPCzJcpXNBpZlqcV6XTn5B86sbgGseIfJsYYu7oGM=@vger.kernel.org X-Gm-Message-State: AOJu0YzBcP55WCzDtYnLFRLx+Ta+tdLeAujZPLCztK/ihnsNzEF0CebD WBpuYJfFf7QRuFf9jbrT3Izjd33qO5umcXaoO/DEbQCb1r5PnSN1BUEGUWvqm9s= X-Gm-Gg: ASbGncu5ISMXmdTSPX7JYl4x0PvQvugdDYw6L4YDCaypAoOxdgQRTnTrXJmnh414UpX a1EwKrMB3eCZ0VryIraifql8tOmaPDVKJntWpVr9J53hLU+y8zLk9cUcMPRhIFfUgFsGtNcVJKD CH3U/WewrvIiXVR3qjHEQLc11xru0Ei/ylkoYgQ/piHUzsGxvrGu58i+F3INzMxrs+wsT2Bjcts oF+UVMytolw3UgUkH8zSa01tvKHnuXmOhMXRVsP4IE4myjhJ9OF+TX77e4rGTL/Ndcnc/YkzFJS WMjjNkjinU2QIaDFqccKAZ1V2tmD+wRlef6Y X-Google-Smtp-Source: AGHT+IF8cIBO3SlK9WGiwosYyqGfJqHooI+lszN8vN5QA7gNtCgUPpe2l1NosqypYf0ggr1xuNTUZw== X-Received: by 2002:a05:6512:110d:b0:53e:383a:639a with SMTP id 2adb3069b0e04-54838f4e402mr7330345e87.37.1740477309978; Tue, 25 Feb 2025 01:55:09 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:08 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:56 +0100 Subject: [PATCH v5 09/31] ARM: entry: save the syscall sp in thread_info 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: <20250225-arm-generic-entry-v5-9-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 We are going to rewrite the syscall handling in C, which means that the stack used by the call code is no longer predicatably 8 bytes (for syscall arguments r4 and r5) but a varying number of bytes depending on how nested the C code is. However the current code is just assuming it can rewind the stack by adding 8 to sp if a syscall is interrupted by a sigreturn call. Solve this by storing the entry sp in the per-task struct thread_info and use that in the sigreturn wrapper instead. We already have the thread info available in the SWI entry and sigreturn is probably not so common that retrieveing a pointer to thread_info should affect anything very much. Storing this per-task in thread_info makes the solution SMP robust. Signed-off-by: Linus Walleij --- arch/arm/include/asm/thread_info.h | 1 + arch/arm/kernel/asm-offsets.c | 1 + arch/arm/kernel/entry-common.S | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thre= ad_info.h index 943ffcf069d29cf4a035964d20d56f7ebdd6d602..d8a45c5a10496aaf806bfeaa035= 3d5e8985bd6f5 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -67,6 +67,7 @@ struct thread_info { __u32 cpu_domain; /* cpu domain */ struct cpu_context_save cpu_context; /* cpu context */ __u32 abi_syscall; /* ABI type and syscall nr */ + __u32 sp_syscall; /* SP when entering syscall */ unsigned long tp_value[2]; /* TLS registers */ union fp_state fpstate __attribute__((aligned(8))); union vfp_state vfpstate; diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c index 4853875740d0fe61c6bbc32ddd9a16fa8d1fb530..c9525cbb26b73827821aa746030= e56b037f49556 100644 --- a/arch/arm/kernel/asm-offsets.c +++ b/arch/arm/kernel/asm-offsets.c @@ -49,6 +49,7 @@ int main(void) DEFINE(TI_CPU_DOMAIN, offsetof(struct thread_info, cpu_domain)); DEFINE(TI_CPU_SAVE, offsetof(struct thread_info, cpu_context)); DEFINE(TI_ABI_SYSCALL, offsetof(struct thread_info, abi_syscall)); + DEFINE(TI_SP_SYSCALL, offsetof(struct thread_info, sp_syscall)); DEFINE(TI_TP_VALUE, offsetof(struct thread_info, tp_value)); DEFINE(TI_FPSTATE, offsetof(struct thread_info, fpstate)); #ifdef CONFIG_VFP diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 3cfc6d952ff99be9c4c1be4481ac3039260e3e57..8baab7f97f59c434396f30b08dd= d3029c5f9c0e5 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -232,6 +232,8 @@ ENTRY(vector_swi) =20 uaccess_disable tbl get_thread_info tsk + /* Save a per-task copy of SP for sigreturn */ + str sp, [tsk, #TI_SP_SYSCALL] =20 adr tbl, sys_call_table @ load syscall table pointer =20 @@ -377,13 +379,15 @@ sys_syscall: ENDPROC(sys_syscall) =20 sys_sigreturn_wrapper: - add r0, sp, #S_OFF + get_thread_info tsk + ldr r0, [tsk, #TI_SP_SYSCALL] @ read back SP mov why, #0 @ prevent syscall restart handling b sys_sigreturn ENDPROC(sys_sigreturn_wrapper) =20 sys_rt_sigreturn_wrapper: - add r0, sp, #S_OFF + get_thread_info tsk + ldr r0, [tsk, #TI_SP_SYSCALL] @ read back SP mov why, #0 @ prevent syscall restart handling b sys_rt_sigreturn ENDPROC(sys_rt_sigreturn_wrapper) --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 1BCCC2676E9 for ; Tue, 25 Feb 2025 09:55:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477315; cv=none; b=IfBSrjHj3T+VgefPYtl1xymRZQnocJ/6zmj0e2WrZBvzuZ1nPaFrEcBCzAlZIPBiM1zztYCRwkg6j6cMFtw4QCsWwIOCEWnAhxbFfUy2TjQa8Zf04RVADzAEIJIkB6PGAW3gdcsc8zf2jkEsPsGazKgFcJ6IzJyRyuoSJQH/s9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477315; c=relaxed/simple; bh=NlFGyDqKyhRPmpPMwIP/jihNWikR562MB5e5yJWNB0s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LpW5wmvYCOApm5/rYs5g9hM1GKBuJdRuuPNyXBEazEo/mz4yberPNHrU0g8nf9vJ5pVf2k5q2O+qwgeXHD8aKixi6RAwcE3t63Ag4Hvu3YD0lH9DPw6coKEG8usPmHnPKbZcxkCD5MXGSk4WycbmEPutTxQ4fiNJTV/zs5wkK5Q= 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=OLI9+2f/; arc=none smtp.client-ip=209.85.167.51 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="OLI9+2f/" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-54527a7270eso5408099e87.0 for ; Tue, 25 Feb 2025 01:55:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477311; x=1741082111; 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=QZ+1V9qTPsDzOzqvLQMw/vPgzhrwZ5TSLeEMjw/aHNM=; b=OLI9+2f/O5Xe4OioU0905Fh/wuXGb1X/cIeRXaePLB7i3z3MVa4mbYy0YZm4nDEVFP TkG55M1HXYgUZynMVGHGqRlywGI9m7lrZv15+GgMK6hmBDg0yYMXJHgO7wQkkQjrsGCP +Vn5g6Hwk3o+7uPmN+rnvThoMkNqBqDm0JEK19kvZ6757/cTbg7hW2VKu1cs2DRdIoPy M+EBwbs/8Uf638uc0+adHgZhUS69/J3T45941Gz742bmMYrRmYoScHK9tRaavPMkd/a/ J1RcRfUKOinzRK9qlu5M8pZni0RW7FeCXlTqi+E+UMlkVAGuhlYeTVeElM7q3ka9YG3p 6lAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477311; x=1741082111; 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=QZ+1V9qTPsDzOzqvLQMw/vPgzhrwZ5TSLeEMjw/aHNM=; b=jjpkEODgzDOltC/2unbuzYMWuOHsDGC4eQ+KK2Ni/RQDRAoSnuN2K8+sXuF8DBgwm9 bM9FysDOCi7yq0bwPTOZzI2SwtNrYyNZuM7MJRgfDeFQGXs9OS3SPARDCeA1ryeRSVj3 G6Rufd5WJ/98BSQOi+WjNAY1NnHnFtQl+Ymdk1OlSwjI9uipejosKh54DWAFNa5X9OM2 jgO5fPaof6h3tsGjf3vFkVIyFgCdex+x4HLQw66y+S/YNlanngz/7s0jhwy+WB/bTG5P uFch7XK4owHl5cc7NDgxtmeOyJck2GfXVmxPDpgXtAoEpcB6M5wtOJBG/sFMEDYuqj3a xbDQ== X-Forwarded-Encrypted: i=1; AJvYcCWCtxmC6b25L2dDJ1jcjk0ko9/VvcXOkH7/d8/TWy1J99wwacGziYT2efwAbX3gtYPd9x5259Tp/8X6j+w=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7cmmSWS3an6D0bUk5JezWA97rr+gTAl8wJdmduo5Q/xeQq62l 1Xj14xobQUSTSBoxRjtBgr4Q6IbSnEpH/wHZBYuTmQw7dE7/EXDUMvZyOAImc5k= X-Gm-Gg: ASbGncs8pnifJcWobiU/cmDNLoyg9ePN3aDgfj01bsYMG6WKQNX6I/qLpxbnHeWCr57 +MpcwEefLQC4vYnkt74tanuu556q+BNk7n8L9R+8UHN+plRToiYm3QdAe967BjBzzPTfabvJGBR NQnGB2UlMLfZ5weJnBJnsXFRe02tgApH7wzT0EBgfChHZl5jcG620TN7lal4Jfbb60aICY79/zp LP9vIFkN02JIrIBXwMnLHj4Lr777xqp9Ts6rAiFxpVxDhcgfUl0veSfKgpcqZHgl9vJZ1wvszUT iVEJ38ar1R9ZR4X3IMn9yoPgugVdnd7/ywMq X-Google-Smtp-Source: AGHT+IFDeQ/M9ZOCtIWpnUI5fVFHuPS9quPNejIMQ+9GozsbWKhR8saTISbNhtUaShSnwrshkm2CXg== X-Received: by 2002:a19:ca14:0:b0:549:39b1:65c5 with SMTP id 2adb3069b0e04-54939b16f10mr3456e87.47.1740477311051; Tue, 25 Feb 2025 01:55:11 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:10 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:57 +0100 Subject: [PATCH v5 10/31] ARM: entry: move all tracing invocation to C 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: <20250225-arm-generic-entry-v5-10-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The traced invocation of syscall is rewritten in C, moving over also the call to syscall_trace_exit() to C. To do this we cannot have invoke_syscall_trace_asm() be a leaf call, which is the mechanism we hithereto relied on to make sure the stack is pulled back to the state we were at before we called out to the code written in C. Push the registers potentially used by C on the stack, and make a copy of the two stack-pushed syscall arguments on the top of the stack before invoking the syscall and then drop these copied arguments and pop back the registers before returning from invoke_syscall_trace_asm(). As we are now calling from and returning to C, we no longer need to pass the regs pointer around so drop it. Signed-off-by: Linus Walleij --- arch/arm/include/asm/syscall.h | 2 +- arch/arm/kernel/entry-common.S | 32 +++++++++++++++----------------- arch/arm/kernel/ptrace.c | 2 +- arch/arm/kernel/syscall.c | 30 +++++++++++++++++++++--------- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index 66067d165ba3fbbe0f840a89ae396eb1a311bacc..cb0073c4151bf70a82d15e17a95= b6b6f48b245d6 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h @@ -20,7 +20,7 @@ extern const unsigned long sys_call_table[]; =20 int invoke_syscall(void *table, struct pt_regs *regs, int scno, void *retp= ); -int invoke_syscall_trace(void *table, struct pt_regs *regs, void *retp); +void invoke_syscall_trace(void *table, struct pt_regs *regs); =20 static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 8baab7f97f59c434396f30b08ddd3029c5f9c0e5..dbc947d301ec11bb13007cb4bb1= 61c035ede5c10 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -296,22 +296,11 @@ ENDPROC(vector_swi) __sys_trace: add r1, sp, #S_R0 + S_OFF @ pointer to regs mov r0, tbl - badr r2, __sys_trace_return bl invoke_syscall_trace - cmp r0, #-1 - bne __sys_trace_return - add sp, sp, #S_OFF @ restore stack - -__sys_trace_return_nosave: - enable_irq_notrace - mov r0, sp - bl syscall_trace_exit + add sp, sp, #S_OFF @ restore stack pointer b ret_to_user =20 -__sys_trace_return: - str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 - mov r0, sp - bl syscall_trace_exit +__sys_trace_return_nosave: b ret_to_user =20 .macro syscall_table_start, sym @@ -437,18 +426,27 @@ SYM_FUNC_END(invoke_syscall_asm) * r0: syscall table * r1: regs * r2: syscall number - * r3: pointer to return function */ SYM_TYPED_FUNC_START(invoke_syscall_trace_asm) #ifdef CONFIG_CPU_SPECTRE csdb #endif + /* Save registers because we are being called from C */ + push {r4 - r10, lr} mov tbl, r0 + /* Make space to copy the two syscall stack arguments */ + sub sp, sp, #S_OFF mov scno, r2 - mov lr, r3 @ return address - ldmia r1, {r0 - r6} @ reload r0-r6 - stmia sp, {r4, r5} @ update stack arguments + badr lr, __invoke_syscall_trace_ret @ return right here + ldmia r1, {r0 - r6} @ reload r0-r6 from regs + stmia sp, {r4, r5} @ copy stack arguments ldr pc, [tbl, scno, lsl #2] @ call sys_* routine +__invoke_syscall_trace_ret: + /* Drop the copied stack arguments */ + add sp, sp, #S_OFF + pop {r4 - r10, lr} + ARM( mov pc, lr ) + THUMB( bx lr ) SYM_FUNC_END(invoke_syscall_trace_asm) =20 #ifdef CONFIG_OABI_COMPAT diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 07b0daf47441f1f76a8af416acc74fa5ed770403..ac7b98ae47249b4a00fc1cb871b= b2d309bfd8c88 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -888,7 +888,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) return scno; } =20 -asmlinkage void syscall_trace_exit(struct pt_regs *regs) +void syscall_trace_exit(struct pt_regs *regs) { /* * Audit the syscall before anything else, as a debugger may diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c index 377e16c8c53c8e809e3f8b157a889ef115d5c043..e90f04f35b3485968a1e9046cf0= 889f56cca92e5 100644 --- a/arch/arm/kernel/syscall.c +++ b/arch/arm/kernel/syscall.c @@ -18,23 +18,35 @@ __visible int invoke_syscall(void *table, struct pt_reg= s *regs, int scno, void * return sys_ni_syscall(); } =20 -int invoke_syscall_trace_asm(void *table, struct pt_regs *regs, int scno, = void *retp); +int invoke_syscall_trace_asm(void *table, struct pt_regs *regs, int scno); __ADDRESSABLE(invoke_syscall_trace_asm); =20 -__visible int invoke_syscall_trace(void *table, struct pt_regs *regs, void= *retp) +__visible void invoke_syscall_trace(void *table, struct pt_regs *regs) { int scno; + int ret; =20 scno =3D syscall_trace_enter(regs); if (scno =3D=3D -1) - return -1; + goto trace_exit_nosave; =20 - if (scno < NR_syscalls) - /* Doing this with return makes sure the stack gets pop:ed */ - return invoke_syscall_trace_asm(table, regs, scno, retp); + if (scno < NR_syscalls) { + ret =3D invoke_syscall_trace_asm(table, regs, scno); + goto trace_exit_save; + } =20 - if (scno >=3D __ARM_NR_BASE) - return arm_syscall(scno, regs); + if (scno >=3D __ARM_NR_BASE) { + ret =3D arm_syscall(scno, regs); + goto trace_exit_save; + } =20 - return sys_ni_syscall(); + ret =3D sys_ni_syscall(); + +trace_exit_save: + /* Save return value from syscall */ + regs->ARM_r0 =3D ret; + +trace_exit_nosave: + local_irq_enable(); + syscall_trace_exit(regs); } --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 2550A26773C for ; Tue, 25 Feb 2025 09:55:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477317; cv=none; b=hdk23B7BrPEJ/79GZwN9VW711s+qQaoOffaa5LNgV2yeXEo+qD+cyP8SLB4S81S6kssR2xykF6iJByJKQ+d5Gg8MctfV5atto1CiBzj1kPJ5ZrAjxh/LjGUaGJIWk7ba5UaRVDhVQkzIXmVLgd5SOXAy8ccRpiVanxcnvT2z3Fo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477317; c=relaxed/simple; bh=N+6JdwMNGquesH7qb0RP8fIf28m6SmqW3xolOuov51o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Fm+XWW6eG+zVI2o8TcJ5V0xjZt7EX+d3U4IAixwE2mskNSeWsmgmT6TUbseNlUlbfzhEtjGZALo9bm1mIHUc1FXtDxfYzirFJc4eVuUP0N+7xXWhXjZ24WJPb2tELRjpv7LDOd5MLaaoExpi+0QMryG3BXT9GnwFLmZPIOKxCUw= 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=kZnljJpA; arc=none smtp.client-ip=209.85.167.42 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="kZnljJpA" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-54527a7270eso5408122e87.0 for ; Tue, 25 Feb 2025 01:55:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477312; x=1741082112; 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=fjCfgKpzfePVa0TyVy/JvnFpB7AUCXqKC35hzfV3hLA=; b=kZnljJpA/t0VwA+7eVJEklzGu0gDmPfFUi66FgAVRhlIdDS4Dijf4z6nC1OjtkLhDd 0kiT++4sz6V0mk2S2xi7W9jYBlj8c5S6Se6f1PX/kJZHotg70xUUFrsDfT1igbmbmy5/ HtqTU0x+OCCJBMJhzmBPbiBSkiaHPikjUlEU/CgoqR0IWhR6gxB6e46Us2vFS7tFSjDq zHjqGYji3/RoTDBgInshylqabrDR5Ty9gSPCLIjsjcX0c9O2U8OgFkb1H7g27QaEO77S uDXGzRBZjTd/FSm453b6MNq9CukFujTtiyG9GqGKpWBS1PmiAWyaikOSoIsK/PuR8twd q6Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477312; x=1741082112; 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=fjCfgKpzfePVa0TyVy/JvnFpB7AUCXqKC35hzfV3hLA=; b=p1ucZqPmjhpFNzU/1QRJaOci8ZltLM5K2F1nkzATDPQN0cXG4hMveT3YJ5Hy2uPaGk KUfnB6cA63azmJKMhqXGSIrzjDLmNdwR5/O9TzARef+g3QHTpj2p31hZ/hLDhyysmcxl LPnd8wlqNR69SN7XGTaIle0bBAIEXD0mJkFsl4DNxOW6NjexDTKFtzfCHFfrl+wkTWrw AYGt2GwbbyS6uhB0CG2AdIaKLQcFuZSRQUO6D8EZZgBRJIQtZO16X9zf26p22BekeEt+ 2u9wCdSjaCx+F6XB/AFcHw7OmH1UP6GadcHDFDCiW4DbyJcm+lNybmHEjPuwHQ5NCLgl 61kg== X-Forwarded-Encrypted: i=1; AJvYcCXfHoDpt+iZRNXETzyr9PDEACHsZuu/lPi9FHjNH/sqaGVXGLoD2vAVr1ptKrRs/NAWtd0s5hnA9UfpgXc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1guSkXRW+gh7plHoLOlLOMj1wkHrGA8nZi9SpBrFu9CsFt2Eo csFw+pK1CFicE4fEMMAQknHZALhoK+2pKSUHN9+PjXaKYeGZIiipnCA/SlloVIs= X-Gm-Gg: ASbGnctfRyhmKnzK5abSpo+6d4SyjvMSysel8gydUGZwdVS8dJ3KeZR4Lb4XVQaSzz2 vL3McA/6cXubjMHi2Rx2ejAt9G5Gt3rlV65pAFsAWDp3qcAwWSInXFGEt3cQdKJrEShuA/xaVYm SUg+7JmAeLisgx1T4rLvi98q3QSwj4P9pChbM0RK2qc4E8XqYsP814m8PbCI9FswBiK4UfJtlaT j2eUwCAHSZJIiHGFwDUTQRHzxp8yUsx9yIcVFPxT6gYiNZMf+Lob/jfVcj+Nc3cqgms75tXlV9i L9wpGQqE7uyiIM9as5UPxnZBSrTrsYybSZS2 X-Google-Smtp-Source: AGHT+IGwYLcZB4R2TB4QO0BnMrSnOzNlEWNGxZkIDWtOs5zUcIXQhO/Jl40QyYsPgythtdK2Cm9SRw== X-Received: by 2002:a05:6512:3d88:b0:545:1dea:7b2f with SMTP id 2adb3069b0e04-548392633bcmr7441543e87.45.1740477312152; Tue, 25 Feb 2025 01:55:12 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:11 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:58 +0100 Subject: [PATCH v5 11/31] ARM: entry: Merge the common and trace entry code 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: <20250225-arm-generic-entry-v5-11-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The trace entry code now can handle recursive and complex calls in C using stack. Move the common code over to using that approach. We now use the ret_fast_syscall return path also when tracing, which appears to work just fine. Signed-off-by: Linus Walleij --- arch/arm/include/asm/syscall.h | 3 +-- arch/arm/kernel/entry-common.S | 61 +++++++++-----------------------------= ---- arch/arm/kernel/syscall.c | 35 +++++++++++------------- 3 files changed, 28 insertions(+), 71 deletions(-) diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index cb0073c4151bf70a82d15e17a95b6b6f48b245d6..9c664d8c5718f58034f442c20a0= 30b59faf65dd9 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h @@ -19,8 +19,7 @@ =20 extern const unsigned long sys_call_table[]; =20 -int invoke_syscall(void *table, struct pt_regs *regs, int scno, void *retp= ); -void invoke_syscall_trace(void *table, struct pt_regs *regs); +int invoke_syscall_trace(void *table, struct pt_regs *regs, int scno); =20 static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index dbc947d301ec11bb13007cb4bb161c035ede5c10..f0f1f8723965313b287158fb2a2= 38908db72fcd2 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -39,7 +39,6 @@ saved_pc .req lr * from those features make this path too inefficient. */ ret_fast_syscall: -__ret_fast_syscall: UNWIND(.fnstart ) UNWIND(.cantunwind ) disable_irq_notrace @ disable interrupts @@ -47,13 +46,13 @@ __ret_fast_syscall: movs r1, r1, lsl #16 bne fast_work_pending =20 - restore_user_regs fast =3D 1, offset =3D S_OFF + restore_user_regs fast =3D 0, offset =3D S_OFF UNWIND(.fnend ) ENDPROC(ret_fast_syscall) =20 /* Ok, we need to do extra processing, enter the slow path. */ fast_work_pending: - str r0, [sp, #S_R0+S_OFF]! @ returned r0 + add sp, sp, #(S_R0 + S_OFF) /* fall through to work_pending */ #else /* @@ -63,10 +62,9 @@ fast_work_pending: * call. */ ret_fast_syscall: -__ret_fast_syscall: UNWIND(.fnstart ) UNWIND(.cantunwind ) - str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 + add sp, sp, #(S_R0 + S_OFF) #if IS_ENABLED(CONFIG_DEBUG_RSEQ) /* do_rseq_syscall needs interrupts enabled. */ mov r0, sp @ 'regs' @@ -83,7 +81,9 @@ ENDPROC(ret_fast_syscall) #endif =20 tst r1, #_TIF_SYSCALL_WORK - bne __sys_trace_return_nosave + beq slow_work_pending + b ret_to_user + slow_work_pending: mov r0, sp @ 'regs' bl do_work_pending @@ -257,19 +257,15 @@ ENTRY(vector_swi) str scno, [tsk, #TI_ABI_SYSCALL] #endif mov r1, sp @ put regs into r1 - ldr r10, [tsk, #TI_FLAGS] @ check for syscall tracing stmdb sp!, {r4, r5} @ push fifth and sixth args - - tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls? - bne __sys_trace - mov r0, tbl - /* r1 already contains regs */ mov r2, scno @ syscall number from r7 - /* We return here no matter what, also pass this as an argument */ - badr lr, __ret_fast_syscall - mov r3, lr - b invoke_syscall + bl invoke_syscall_trace + cmp r0, #0 + beq ret_fast_syscall + /* This path taken when tracing */ + add sp, sp, #(S_R0 + S_OFF) + b ret_to_user =20 #if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI) /* @@ -289,20 +285,6 @@ ENTRY(vector_swi) ENDPROC(vector_swi) .ltorg =20 - /* - * This is the really slow path. We're going to be doing - * context switches, and waiting for our parent to respond. - */ -__sys_trace: - add r1, sp, #S_R0 + S_OFF @ pointer to regs - mov r0, tbl - bl invoke_syscall_trace - add sp, sp, #S_OFF @ restore stack pointer - b ret_to_user - -__sys_trace_return_nosave: - b ret_to_user - .macro syscall_table_start, sym .equ __sys_nr, 0 .type \sym, #object @@ -402,25 +384,6 @@ sys_mmap2: b sys_mmap_pgoff ENDPROC(sys_mmap2) =20 -/* - * This call wants: - * r0: syscall table - * r1: regs - * r2: syscall number - * r3: pointer to return function - */ -SYM_TYPED_FUNC_START(invoke_syscall_asm) -#ifdef CONFIG_CPU_SPECTRE - csdb -#endif - mov tbl, r0 - mov scno, r2 - mov lr, r3 @ return address - ldmia r1, {r0 - r3} @ reload r0-r3 - /* Arguments 5 and 6 are (hopefully) on the stack */ - ldr pc, [tbl, scno, lsl #2] @ call sys_* routine -SYM_FUNC_END(invoke_syscall_asm) - /* * This call wants: * r0: syscall table diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c index e90f04f35b3485968a1e9046cf0889f56cca92e5..36330023b5484399a4ca2fdb572= 7b410e2c74b6f 100644 --- a/arch/arm/kernel/syscall.c +++ b/arch/arm/kernel/syscall.c @@ -3,50 +3,45 @@ #include #include =20 -int invoke_syscall_asm(void *table, struct pt_regs *regs, int scno, void *= retp); -__ADDRESSABLE(invoke_syscall_asm); - -__visible int invoke_syscall(void *table, struct pt_regs *regs, int scno, = void *retp) +static inline bool has_syscall_work(unsigned long flags) { - if (scno < NR_syscalls) - /* Doing this with return makes sure the stack gets pop:ed */ - return invoke_syscall_asm(table, regs, scno, retp); - - if (scno >=3D __ARM_NR_BASE) - return arm_syscall(scno, regs); - - return sys_ni_syscall(); + return unlikely(flags & _TIF_SYSCALL_WORK); } =20 int invoke_syscall_trace_asm(void *table, struct pt_regs *regs, int scno); __ADDRESSABLE(invoke_syscall_trace_asm); =20 -__visible void invoke_syscall_trace(void *table, struct pt_regs *regs) +__visible int invoke_syscall_trace(void *table, struct pt_regs *regs, int = scno) { - int scno; + unsigned long flags =3D read_thread_flags(); int ret; =20 - scno =3D syscall_trace_enter(regs); - if (scno =3D=3D -1) - goto trace_exit_nosave; + if (has_syscall_work(flags)) { + scno =3D syscall_trace_enter(regs); + if (scno =3D=3D -1) + goto trace_exit_nosave; + } =20 if (scno < NR_syscalls) { ret =3D invoke_syscall_trace_asm(table, regs, scno); - goto trace_exit_save; + goto exit_save; } =20 if (scno >=3D __ARM_NR_BASE) { ret =3D arm_syscall(scno, regs); - goto trace_exit_save; + goto exit_save; } =20 ret =3D sys_ni_syscall(); =20 -trace_exit_save: +exit_save: /* Save return value from syscall */ regs->ARM_r0 =3D ret; + if (!has_syscall_work(flags)) + return 0; =20 trace_exit_nosave: local_irq_enable(); syscall_trace_exit(regs); + return 1; } --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (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 C63C7266F17 for ; Tue, 25 Feb 2025 09:55:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477317; cv=none; b=NfqoqFHZypv6oivEHnSsv1h8wcRiteIh2jKq49psReMifTHkkaz2Li1HMs3aWujOYDUhgmtJcswMaZkR+pHJkobL7UnbgcrpjMIXdSfoNDqw5MlbAl92zHMGXpTijipThZuqqW2nb2KaJVzwp2RwJqg0AMzgMpTcSk/llnihT48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477317; c=relaxed/simple; bh=uLdRblJEcBgqrdlNhpGIwJYjD/vcY62yplB7gd+NKqw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WEAM2CHQc5IbK7HZdiN/P9pR7of30qFPD2qkWli5oQR/XifDqv3jyWCFnm5Ci032hlUa2wsGYrzgS1mQGBU/NkG8yoRxE0deGgjg/dwqrfy51FdzY4xF/PF4PxgvcIht8LlB9lUDOQqkuGqS8N983lgss5gzt/seG5m8/zyp4UE= 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=KsBR87sn; arc=none smtp.client-ip=209.85.208.169 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="KsBR87sn" Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-30a69c1a8d3so25628401fa.3 for ; Tue, 25 Feb 2025 01:55:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477314; x=1741082114; 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=pr2oSZFQs/khvnnGeJohJHSvChXi9NfDOygi+WZQm/M=; b=KsBR87sn1h1cQnlN7/yhRasb8Xa/TpVanY4PqIiqnVmsK6ZidVP7nwiCc2nl5/Uwd2 46+/9vI+q1SXHJEuh/6SbbIVT7Psl1S1BBN1W4iicRIiMcg3RDrpZ42m++0M8zsmCr7+ slbdaxAm4xAb09gKvu/cF6i9jcKALX/x8pKDJBHnKQ5oqBqs533U6+AwBah4QRhauM+l xnDRWuzw/izkFC81bGwp0HrF8/4iT6MPJuNAFYBjZPLLS0eW17ASAAyxCbW9ikU7zrjw /sSJ24JNQy6kWKt2WmaUQxYrJxwr+HXbMKlclqa8h6HDWAnaS9po0Wh6o/AMja0rKSyv GdBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477314; x=1741082114; 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=pr2oSZFQs/khvnnGeJohJHSvChXi9NfDOygi+WZQm/M=; b=fHkVPixgUBCVFdaWmn5t3a/AWsTmvvelprQct8jyJ40Bvl7B7L7myzBLCfJoYnzne/ WG6lGr4EEeSNX+SkCa8JBA2sg/cfoXN29EuAiKFJ79w2rXuBKM4om/oaNjWoS6+Ejo3n fHZhLRLbt23KX0sqU1dNPqMlFFUSWBHCa14GNt62ELEELd0Y9K3+E0kvGbIyu7QEtXdv wBAW9nm5gg0u0/Q1/5AuIOTVEsXoarEHF7mi5U6E5OPWXXlqM2E6ELsCIWWhd4Fzf2Lb lBPn19eaWalbPCBjJi5euR5eahhFA1gfjSruaVRVFa7M5WFj8AI/kPC6LuA/+PFcxsHg 8eEw== X-Forwarded-Encrypted: i=1; AJvYcCVGeWfLvj+lOtU/lUbJg7VfVQWcRIiosy9M5AL+VJ1thM3TtAorZWUua93m3w4a1Qv8jiUfADCyZLgOXzo=@vger.kernel.org X-Gm-Message-State: AOJu0YwV9ATqvyljTfzNGICcQCXuIs+YE/yUNUoVT65xggGS6wDW+yJY ouNSRGXzHO0Rqw0bBF8ZzbyG34QUDrNcpwSRRlVQ2Zk57Yi/FJnpGc9sTG4xoJY= X-Gm-Gg: ASbGncvfKiLI/avUKDdNOEwmP82FXUVE8c7Fi+rhedxZIVx5d4kbqryR7PiGpadpy3u WtHRN/wOaUcGzTN7lNOGJK7QogNlxS+1OW7tH67j4RK4Cf0A5Kbv0WdObDoAuJkRSVDBxNHdNp1 4pNYy2cYtH6B43Oe81sv8NTSPEOhDdCU2QkLM6Lika7p7FfUWMMhkXahrGTts7h6dYBQsi9dHcu zlKJx3vpZhvjjNcAIQeh9svFwYs23ANBM4qekNId7coWyAt96YqQhU2p0bV4cESlgCgurXrwKrH 01njAjTQVRV7284VMeY6UnLUj36IBp0sJedK X-Google-Smtp-Source: AGHT+IFeLR30oGpW5vklNxUSsMhMgUVaKjzRtV+OjULqK8ylumNd1C7a3hr2K2xQCsmZr/q/cwPOIA== X-Received: by 2002:a05:6512:3297:b0:549:2ae5:99d8 with SMTP id 2adb3069b0e04-5492ae59d04mr117932e87.3.1740477313811; Tue, 25 Feb 2025 01:55:13 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:12 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:54:59 +0100 Subject: [PATCH v5 12/31] ARM: entry: Rename syscall invocation 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: <20250225-arm-generic-entry-v5-12-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 Now that we do not have a separate trace syscall invocation path, rename the invocation functions to be generic. This can be squashed into the previous patch, it is just done here for the previous patch to be easier to get a cleaner diff and be easier to read. Signed-off-by: Linus Walleij --- arch/arm/include/asm/syscall.h | 2 +- arch/arm/kernel/entry-common.S | 10 +++++----- arch/arm/kernel/syscall.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index 9c664d8c5718f58034f442c20a030b59faf65dd9..b94fd7ce17f82f0baf06b748002= 45112e1f13002 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h @@ -19,7 +19,7 @@ =20 extern const unsigned long sys_call_table[]; =20 -int invoke_syscall_trace(void *table, struct pt_regs *regs, int scno); +int invoke_syscall(void *table, struct pt_regs *regs, int scno); =20 static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index f0f1f8723965313b287158fb2a238908db72fcd2..f1e48002bd3075ea67b58831785= 83127fa0055c6 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -260,7 +260,7 @@ ENTRY(vector_swi) stmdb sp!, {r4, r5} @ push fifth and sixth args mov r0, tbl mov r2, scno @ syscall number from r7 - bl invoke_syscall_trace + bl invoke_syscall cmp r0, #0 beq ret_fast_syscall /* This path taken when tracing */ @@ -390,7 +390,7 @@ ENDPROC(sys_mmap2) * r1: regs * r2: syscall number */ -SYM_TYPED_FUNC_START(invoke_syscall_trace_asm) +SYM_TYPED_FUNC_START(invoke_syscall_asm) #ifdef CONFIG_CPU_SPECTRE csdb #endif @@ -400,17 +400,17 @@ SYM_TYPED_FUNC_START(invoke_syscall_trace_asm) /* Make space to copy the two syscall stack arguments */ sub sp, sp, #S_OFF mov scno, r2 - badr lr, __invoke_syscall_trace_ret @ return right here + badr lr, __invoke_syscall_ret @ return right here ldmia r1, {r0 - r6} @ reload r0-r6 from regs stmia sp, {r4, r5} @ copy stack arguments ldr pc, [tbl, scno, lsl #2] @ call sys_* routine -__invoke_syscall_trace_ret: +__invoke_syscall_ret: /* Drop the copied stack arguments */ add sp, sp, #S_OFF pop {r4 - r10, lr} ARM( mov pc, lr ) THUMB( bx lr ) -SYM_FUNC_END(invoke_syscall_trace_asm) +SYM_FUNC_END(invoke_syscall_asm) =20 #ifdef CONFIG_OABI_COMPAT =20 diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c index 36330023b5484399a4ca2fdb5727b410e2c74b6f..6f518ec3870fb36a64d1b671b20= f96d63a52bf78 100644 --- a/arch/arm/kernel/syscall.c +++ b/arch/arm/kernel/syscall.c @@ -8,10 +8,10 @@ static inline bool has_syscall_work(unsigned long flags) return unlikely(flags & _TIF_SYSCALL_WORK); } =20 -int invoke_syscall_trace_asm(void *table, struct pt_regs *regs, int scno); -__ADDRESSABLE(invoke_syscall_trace_asm); +int invoke_syscall_asm(void *table, struct pt_regs *regs, int scno); +__ADDRESSABLE(invoke_syscall_asm); =20 -__visible int invoke_syscall_trace(void *table, struct pt_regs *regs, int = scno) +__visible int invoke_syscall(void *table, struct pt_regs *regs, int scno) { unsigned long flags =3D read_thread_flags(); int ret; @@ -23,7 +23,7 @@ __visible int invoke_syscall_trace(void *table, struct pt= _regs *regs, int scno) } =20 if (scno < NR_syscalls) { - ret =3D invoke_syscall_trace_asm(table, regs, scno); + ret =3D invoke_syscall_asm(table, regs, scno); goto exit_save; } =20 --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (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 BBADF263C75 for ; Tue, 25 Feb 2025 09:55:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477318; cv=none; b=Khhatvwk5RvdO8pSDInM0K+sX9UsIwo7tAlSTuGcBqOZILr5GLCWxKHXoNbkNjBGGwMiIForu7+8og6dyTbnIlcusRkIqapatP/MOu+ZWZvEdpyprV2FplilUwznMvd1fdYyI5MoFb7LkfP+b2D1LpvNDUh6hyTYRRFwLKJED0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477318; c=relaxed/simple; bh=Cm2W2dOXUniD0nDz2glOKlgTOVn7IEYQC1SwcPmOZAc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GDNKuLv1+LyfbQcsC2FFH08tcxeezaediXOxoB/O0j29oxfng7OAXhXEMi5OuRXBUJWTqJiHU8cDpMhYbI1k97tTXzk4N8BQWdGs2LMix2niMAr0JTBr84GRiU35Wi3v7ewpbvyVidd1JLxoIvGxLRvFIo0sJijcWNZihnGMCyY= 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=pZabU4A7; arc=none smtp.client-ip=209.85.208.169 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="pZabU4A7" Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-30795988ebeso56038971fa.3 for ; Tue, 25 Feb 2025 01:55:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477315; x=1741082115; 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=Ugjh5wDawxRKPKlBJt/tVpltkHg0eR7Bu8LyZ1i/cWo=; b=pZabU4A7/oOqnzT4XOwDOUQwvwsu67OBQBIfH3pXJEgnC9rW4YzlBn3DXkIJibKDmr 9A8cbs1opN3r6eC+/2ia5ukJoE0YD0QGx3QBt30LzqrxG3bwlcMoGBeyXmNEZ8pk6E/G xJY2YUjyA1Sgy6c7raEDw8yAPosQuSb9GrdpGXPofovCkE9QJFW6vQo6HyUxNcgLj3PU dW3kYA+DuUv/NbgJnBGbYmJHqKvK6CdXr0n4LVRgWxz8MmkLsNvV9/jYPxMPOo+oKhGC 9bHLgRc0wieflFQOoctT2bcHJp1U38wEXOmhnKy1zzA1P4Fa2MPDTocnCpfmXtsdVYcp zxUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477315; x=1741082115; 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=Ugjh5wDawxRKPKlBJt/tVpltkHg0eR7Bu8LyZ1i/cWo=; b=nt5cW2Z0mSuK1cc/ArySp71vaHoOqHQpzUvzhFn8JkEE/SCiTVoWyZMQ1jPBdjbWwo As+N57toc3rY8Z9SGhEQzwaDLS6xbqOuQG1Kjqes9Xi9rvqp7Dz+KhwfsDE0jyieMC/1 fxZCKL01MOk1Ih/QoZfIKOMbpdDzAnCDz7LQWYqcg5ditysY22PmrsmOctChUrFBTrSw PjTvFPF+Q661PwOh8TW7Sfiz95wG+xcYUaD0SZOEY7eioz2pu+SwnfOAgUL8JN9VNxYQ qPrysXgkQxQCP4/Rp7JIlLxURFE3sSkWndZkmn8BM40O5wgiqSUNRZzWVfvutvvC+Cxs 7CYQ== X-Forwarded-Encrypted: i=1; AJvYcCWGzK44n+pKjYurxjVRA6XW7UvIebRLTMX5WSy1EUoDHL1ZUY6z+bUH1LHEQJzWzW5TuGfmZQ3s6pGe4j4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5AJX/hBbdwJgzF5RrNKYx7oMqFnyjrK2NHym4DehfOVwjJRIY Z+QduRIFYcs8PIxNpgMFmEe1wA4ETQoeTSbqaDeXjS3rN4mEFvembt3mKN2tFV0= X-Gm-Gg: ASbGncum9hXmAkF99B5P8s6lsyOWVuK/y8NugygWNVWsHAFoIYaZhxIVuAVm7MMEgbM EtC2MfTUbEK/xx35+x5prS9OT1/XYXbKReFqIc2cFdOywZCQr7Yr/JJ5d1tfRk3sxtl0bKUK3B1 AEI9N2p2yh03EUBeKc5AWo0Xm34JqJcdrkMwL8IsEpIQmP+0RL6k0DsVSHHnARqpKLNy5C8EdWk puQiITjM30/MsePkniIu2snUN/rSAUFewqEsxZsncN4RAQcOQZzPTtq6+6yHfq2cud+guiX5Nvk 4FdD+lfmSK6lHr+UQW21JgZJtQabhKCEVSOu X-Google-Smtp-Source: AGHT+IGqkcF8DuM2/ZHDNxMpAtKrMC3XCNpt2RI/Sl+BYKODnNKv6ouUbi026+ezhu+8diXjeteQjw== X-Received: by 2002:a05:6512:10c8:b0:545:17b:3cf9 with SMTP id 2adb3069b0e04-548510ed5f5mr1084027e87.48.1740477314909; Tue, 25 Feb 2025 01:55:14 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:14 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:00 +0100 Subject: [PATCH v5 13/31] ARM: entry: Create user_mode_enter/exit 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: <20250225-arm-generic-entry-v5-13-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The callbacks to the context tracking will be repurposed for several uses that are needed on the IRQ transition to/from userspace. Rename the macro, establish call sites in C calling into the context tracking following the corresponding generic entry function prototypes, despite the assembly macro names become a bit long this makes it clear to readers exactly what is going on and where this call will go. Drop the ifdefs pertaining to context tracking from the macro. The C calls we will use have stubs that will compile these out anyway. The inversion of the signature of the context tracking calls are especially confusing since the generic entry uses the reverse semantics: *enter from* user mode (to kernel mode) and *exit to* user mode (from kernel mode) instead of the other way around as the old context tracker code user_exit_callable() and user_enter_callable() which have inverted semantics. Signed-off-by: Linus Walleij --- arch/arm/include/asm/entry.h | 14 ++++++++++++++ arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/entry-armv.S | 2 +- arch/arm/kernel/entry-common.S | 4 ++-- arch/arm/kernel/entry-header.S | 24 ++++++++++++------------ arch/arm/kernel/entry.c | 15 +++++++++++++++ 6 files changed, 45 insertions(+), 16 deletions(-) diff --git a/arch/arm/include/asm/entry.h b/arch/arm/include/asm/entry.h new file mode 100644 index 0000000000000000000000000000000000000000..e26f369375ca3cf762f92fb4996= 57a666b223ca2 --- /dev/null +++ b/arch/arm/include/asm/entry.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_ENTRY_H__ +#define __ASM_ENTRY_H__ + +struct pt_regs; + +/* + * These are copies of generic entry headers so we can transition + * to generic entry once they are semantically equivalent. + */ +void irqentry_enter_from_user_mode(struct pt_regs *regs); +void irqentry_exit_to_user_mode(struct pt_regs *regs); + +#endif /* __ASM_ENTRY_H__ */ diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 69ddf51081f4791982518d37df60c11211b8955a..dd45c6eb8cbdd2595edc4f26026= c12b25dd49717 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -17,7 +17,7 @@ CFLAGS_REMOVE_return_address.o =3D -pg =20 # Object file lists. =20 -obj-y :=3D elf.o entry-common.o irq.o opcodes.o \ +obj-y :=3D elf.o entry.o entry-common.o irq.o opcodes.o \ process.o ptrace.o reboot.o io.o \ setup.o signal.o sigreturn_codes.o \ stacktrace.o sys_arm.o time.o traps.o \ diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index ef6a657c8d130663e68acd07226815ce8a3fff7d..93a37437a9520118eff411f009e= 8f6bd729412fc 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -406,7 +406,7 @@ ENDPROC(__fiq_abt) #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off #endif - ct_user_exit save =3D 0 + asm_irqentry_enter_from_user_mode save =3D 0 .endif .endm =20 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index f1e48002bd3075ea67b5883178583127fa0055c6..ff1dd3169346f3770cad6b7e218= f5d74ffc646fe 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -111,7 +111,7 @@ ENTRY(ret_to_user_from_irq) no_work_pending: asm_trace_hardirqs_on save =3D 0 =20 - ct_user_enter save =3D 0 + asm_irqentry_exit_to_user_mode save =3D 0 =20 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack @@ -191,7 +191,7 @@ ENTRY(vector_swi) alignment_trap r10, ip, cr_alignment asm_trace_hardirqs_on save=3D0 enable_irq_notrace - ct_user_exit save=3D0 + asm_irqentry_enter_from_user_mode save =3D 0 =20 /* * Get the system call number. diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 52b4fa97226dbfa4b55aca8eaf74ae24e1e220f8..fb5bb019199b2871e29e306a29b= ea8fdf47dd7f3 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -362,31 +362,31 @@ ALT_UP_B(.L1_\@) .endm =20 /* - * Context tracking subsystem. Used to instrument transitions + * Context tracking and other mode transitions. Used to instrument transit= ions * between user and kernel mode. - */ - .macro ct_user_exit, save =3D 1 -#ifdef CONFIG_CONTEXT_TRACKING_USER +*/ + .macro asm_irqentry_enter_from_user_mode, save =3D 1 .if \save stmdb sp!, {r0-r3, ip, lr} - bl user_exit_callable + mov r0, sp @ regs + bl irqentry_enter_from_user_mode ldmia sp!, {r0-r3, ip, lr} .else - bl user_exit_callable + mov r0, sp @ regs + bl irqentry_enter_from_user_mode .endif -#endif .endm =20 - .macro ct_user_enter, save =3D 1 -#ifdef CONFIG_CONTEXT_TRACKING_USER + .macro asm_irqentry_exit_to_user_mode, save =3D 1 .if \save stmdb sp!, {r0-r3, ip, lr} - bl user_enter_callable + mov r0, sp @ regs + bl irqentry_exit_to_user_mode ldmia sp!, {r0-r3, ip, lr} .else - bl user_enter_callable + mov r0, sp @ regs + bl irqentry_exit_to_user_mode .endif -#endif .endm =20 /* diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c new file mode 100644 index 0000000000000000000000000000000000000000..8b2e8ea66c1376759d6c0c14aad= 8728895b3ff1e --- /dev/null +++ b/arch/arm/kernel/entry.c @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include + +noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) +{ + /* This context tracking call has inverse naming */ + user_exit_callable(); +} + +noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs) +{ + /* This context tracking call has inverse naming */ + user_enter_callable(); +} --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (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 DB618267B0E for ; Tue, 25 Feb 2025 09:55:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477319; cv=none; b=JAqDv5N/i2ZxLM3wPx3zCKIW/5OQm0d9mKN8G1joLEY6QYVevKyD/uRrRmjXOESMU53I7+ElpHEQAGd1OCzeZevu6y0GnAdkGTARSXXkBpmt3V9AWib/Rufsd8K+NtXlyzgTaspt3SIexC/zLyra1KN69N2890rG2r4YbamAHEs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477319; c=relaxed/simple; bh=0QHPLkprIrLa7FY7skG/G0BimBto0am5TbhUU9Y2D1k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mljyKEFi1TLUNw7hVLGmEfaCv9SfX3TBa1Gl4FYQvqbNZ28mG2Ry8VV9RtQEWr9PhgmDSvet0kulwPhh/skAXBQrymAkOqeQp4lDmGHHONoMs1yyomy6AVumBmndmOxapT9AieOzR1OFPmh9u51Bwvi0ZU0tQRUqbXmubI+tBek= 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=JZMucDWD; arc=none smtp.client-ip=209.85.208.170 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="JZMucDWD" Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-3072f8dc069so55888941fa.3 for ; Tue, 25 Feb 2025 01:55:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477316; x=1741082116; 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=MgvrpQqwFQ0R0umdPRsAplUpCRMZEe+n8Q2dyj0aMbc=; b=JZMucDWDimYwa8VLL9O1h0Y4C9hoy3s8AIDRyIeBY50ICopgrjAUO9RO1S3y+qU8Cg +/aphgPR8PqUcb3d2TsRyhl71n+GtumhdGGgWvutYXLAfXPzdLHqLemo5zAyB5J3cipE EjTzvq4ejWeCPi7D/nEjILlWvfBxLwD9vIWXC6a/MI3t14sblMS/n/W2/KuHwpwFyVFG VjJ3kH65ormzbJvO/8H3OUlQpNkF6VODdVb/rnlfeKq/mZcys39d9BNaTPKxifsSixpo hLMeapXHwrCar/mMH5AaD5SFHCKuKLFPn72bON6akxyFyv++IVMNUd+oyG1tUXoinARL 7ljA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477316; x=1741082116; 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=MgvrpQqwFQ0R0umdPRsAplUpCRMZEe+n8Q2dyj0aMbc=; b=qitUUcPcLiL8ebb2u3zgUpJ6zrAE1NbZvQgDDNjTX91OTwlpy1UuElLhOY3QOXl4VH o6cgtBfruURUIql2eJGX0v/ESaRXuCE2VQW1Bo9WX0m/glFsABoDVgq7+k3TOHQIp7bV 59xZYheLQTpmDdZd290vWrRxjySVI3uMIJHfBowTsHfPhbNCg+6ZZWSGMHIo/AbyBvUk 529AC+tuehUL741dVdvM0u4S6kMJAaC+sitXi3eM946vxOEK0CyfgnEqVpSsftVbRkDu 6S6XE+SiW757qmErVsW7CDb7W5gnNamHi9C8w7bMPtOQBRLLKubQ3+FnesDpWj7jI0Xc BKoA== X-Forwarded-Encrypted: i=1; AJvYcCU/aEj1krrgLDuJdu/QRfyPrfqF0lCaZ+spb5Kmowu/bAA+fRBPU78vsYDZxo/QADP87rhzf0aNckNbHaw=@vger.kernel.org X-Gm-Message-State: AOJu0YzO1h20JV7WOrtoH8XayuwcYxMu0jJHToIFa8lcGolkRJ4ItqyF iZcaJOHh4PQ/jCozDAcvNZA8OitmxHdaia5bdm8aKRLvUiw7Ce56dWj0i7aJHgc= X-Gm-Gg: ASbGnct4lcvOfjrZIsnlLD1xPhydhape+b6qfiJZ/il3+tvEyowsuGWIsHw1mI2FAAt 9wNu9fEiJ2dZAPDhrdSMVQx2tepsDJeOMNmneyChbnYe3dKSxIbrgCBKHCy9HgLjFftBMB7e7tU vJdYyaPsJp0o+NydKVpk6LjYEjWqtpKESBz3wK4+f6v5W5sTlURddnYJtjg6dhvuLl0B+y8uG6N oDOfBaoCtG5f5X+jAHL1huf7a4vumv/291clhJoxe90amgw7RNYL5bFhYHUbhaTzmw0/oKUzK9N ALCQThbbeMtcLLsCHslbrQaaPIXKzJMtbUIK X-Google-Smtp-Source: AGHT+IFzWjwa7+x+DsN9qo/60H31u5WVx0JVKoFSYgag5yjlwdX8Fst2CGM/hjw802aY7bipwjamsg== X-Received: by 2002:a05:6512:ba6:b0:545:2f5d:813d with SMTP id 2adb3069b0e04-54838f5a9bcmr6922156e87.37.1740477315950; Tue, 25 Feb 2025 01:55:15 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:15 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:01 +0100 Subject: [PATCH v5 14/31] ARM: entry: Drop trace argument from usr_entry macro 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: <20250225-arm-generic-entry-v5-14-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The trace argument select whether to look into tracing of the hardirqs for the exceptions from userspace, but also selects whether to call further down to establish context for RCU. Split off a second macro that is called on everything except the FIQ since this is the only outlier. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-armv.S | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 93a37437a9520118eff411f009e8f6bd729412fc..c71110126fc105fc6ac2d6cb0f5= f399b4c8b1548 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -357,7 +357,7 @@ ENDPROC(__fiq_abt) #error "sizeof(struct pt_regs) must be a multiple of 8" #endif =20 - .macro usr_entry, trace=3D1, uaccess=3D1 + .macro usr_entry, uaccess=3D1 UNWIND(.fnstart ) UNWIND(.cantunwind ) @ don't unwind the user space sub sp, sp, #PT_REGS_SIZE @@ -401,13 +401,14 @@ ENDPROC(__fiq_abt) @ Clear FP to mark the first stack frame @ zero_fp + .endm =20 - .if \trace + /* 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 - .endif .endm =20 .macro kuser_cmpxchg_check @@ -429,6 +430,7 @@ ENDPROC(__fiq_abt) .align 5 __dabt_usr: usr_entry uaccess=3D0 + usr_entry_enter kuser_cmpxchg_check mov r2, sp dabt_helper @@ -439,6 +441,7 @@ ENDPROC(__dabt_usr) .align 5 __irq_usr: usr_entry + usr_entry_enter kuser_cmpxchg_check irq_handler from_user=3D1 get_thread_info tsk @@ -452,6 +455,7 @@ ENDPROC(__irq_usr) .align 5 __und_usr: usr_entry uaccess=3D0 + usr_entry_enter =20 @ IRQs must be enabled before attempting to read the instruction from @ user space since that could cause a page/translation fault if the @@ -476,6 +480,7 @@ ENDPROC(__und_usr) .align 5 __pabt_usr: usr_entry + usr_entry_enter mov r2, sp @ regs pabt_helper UNWIND(.fnend ) @@ -495,7 +500,7 @@ ENDPROC(ret_from_exception) =20 .align 5 __fiq_usr: - usr_entry trace=3D0 + usr_entry kuser_cmpxchg_check mov r0, sp @ struct pt_regs *regs bl handle_fiq_as_nmi --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 0C73F267B6B for ; Tue, 25 Feb 2025 09:55:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477321; cv=none; b=VMtKx9wh/oi2MTqyP7RkfrUKTUrWzE2td1u2fZedr2xkX53McoKG4G4RsjneKRSQBRDFdI++CXK/lGpCk6rJYaZp7b6w2eSbC9+PYkH4OeVBqAIjOr0feGJFeBMuc4l+G5CozUhfUP4UeuGCHk/AgfWv/TURh+FKkb4T2lQHvHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477321; c=relaxed/simple; bh=QsEh4Kq3Nh4Enz/jpo47A8dhwzkGmSSaMao58QTOPb4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=olQDtaWWtdVej5htw5LPI6z5wWnJR1oE8iJCNKdnyWk3b3eI0KoJNghIlkIXtWRKVswj+GcGtFBlG5PHeR77x9+yOw5vI7MCecvWMQPDkp9U0plWmjYO9OilgT3LUp/mkH9DDjCwhCdsK32Sbl/Ue+IQqeBVMoShSRqIVv4+ivM= 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=wU7HQsdX; arc=none smtp.client-ip=209.85.167.48 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="wU7HQsdX" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-548430564d9so3040032e87.2 for ; Tue, 25 Feb 2025 01:55:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477317; x=1741082117; 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=0l4jcdIT0+K6QMNd0VK8RPhMVALn2TkHG1rRCOsPTks=; b=wU7HQsdXKZVzXLIBM7EQT81caKS1wr+ZkB+R1cg+B60v6vS4nGXtZy/JUYrQVKU87t Dt7NOz67GTfMJ8YEmmPbsyUwMS2tXOmtqj2+8r5qDA11YNT+74s2Jo96EIvZm5ZBJzjl /o4cogQX6GzeZqqR9QvXe+ddIEuQAyqOG/2aYNfDrJr/txcThnvWX9sYc6B8WbQCCsOv PyXT0WD53afEFnGA6ATXxU/ru54CR5r1vCbyaMcr1Nl8GNuhNIagANDA4TNAU82bnu4I 1UZpFEZQuI4WzwvwpZZtdWSZ1gJbL0qISO9T1PF0ezr91pzI7WuU3VCN8n7ZWLs5tvNl D4Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477317; x=1741082117; 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=0l4jcdIT0+K6QMNd0VK8RPhMVALn2TkHG1rRCOsPTks=; b=tuTsw6ImRnXQeUptwYU5EF+NdkC7cAc6xqq/JbK22iSJWuE7dvXjZW6adkKSaykK/7 wt9I6/38UYdqeTu3fpClEtcBAj8Qhpmbnoky75+C1YQGP0Z8maWcks/v5IFvcO/G37a1 CaGnJ7oQVCw1+uQxNJoUF9sgRY1H8x+kCwqFBBwmj20kbv18I1v8YER5Vf/YlNNN7+lG LOPQ5Wp2sm1bRI271RJXdKU375MF0xzFaam8E+o0qhN01YXOhxDwknFAbpKNbYEfOhNX METOxwrTL7ctMa1CowCzGw+mI0RapCgM+aHWDY504PMfXzRQwDjX7bVXZdJrchyY9raZ EsVw== X-Forwarded-Encrypted: i=1; AJvYcCUpzMy9IHwWADk4QAO4kxE0fOea2q28DOYu9IBA+EgsIdBVf25yZeq+c+ZWLN3xddGBcNnJPILEy6ngX98=@vger.kernel.org X-Gm-Message-State: AOJu0YzwdO5xdSQgIzA3YxPbx3mBuQanhX8qxd/oOh1h0UFz2xuDPUxA Rx0NHTfmmWlyLoAN9DT9DpfXHitsZHy87EfC2FNa8PFE1mbNLEDqFaQDVo2bnzM= X-Gm-Gg: ASbGnct3U3d8mF1DY/NO2Vwl7rfvu0iDy7IWpQrVf/odHfDz5P4cYb91LWPmbAqNsKP O70NcN4w1JbDRG8koGB1faPhHllN282eRP2P3ALosb/wnYMSU129CUZBaE9TENClPWd82dkKM7G gnQTnYWeeu3XesE3TCuh2rn8OjqRTOsyHB/pVbf7npBQ8SNEwWOih3XRvMPmr24Pp9kEHFU51x9 8D+g/uGWsydqHObvNKoErANZywzn+u/ggE4STF6OsIT+2RsbUZihMRYqJ17J11kVXxFH729mGNA woDMwjPYPjdYbLwoEpa65ZXJVmuaZOMSa6Bq X-Google-Smtp-Source: AGHT+IHtmonsQI8mjfkxDPF9rkkwlOMD+FnaR5UIKDlAt4SXZ1OQl3Nrl9JuRZs/P07o5ZESbealNQ== X-Received: by 2002:a05:6512:b98:b0:545:16fe:536a with SMTP id 2adb3069b0e04-548391452a9mr7078517e87.31.1740477317024; Tue, 25 Feb 2025 01:55:17 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:16 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:02 +0100 Subject: [PATCH v5 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: <20250225-arm-generic-entry-v5-15-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 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. 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.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 988D5263F42 for ; Tue, 25 Feb 2025 09:55:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477322; cv=none; b=XYfd0XygV+LeIboFGKZoMAVCruc4wBRjnFXmSq2Mu+4MhK/qfzwzg7jiQOvT6JlGy12PpDFsQkMDnE1NWGEnOxp8r0Uz2Xx9864lb+YugBePVWn6okbnNM0MSFARqAL9k7kAxmpYq46TrapWXbRy503GC8CqSLZOAFv9jR0gYIs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477322; c=relaxed/simple; bh=yLAVHOLvwqsi9en7ghFTQoRLGB+8xrjaFpRIXfNOxb0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eSOP8UoLehBwRVES7bLrYUUz72KBhaBUPUCn9pjSXznYqxIU1hNQn/23hkxasOaIZw/TYVvmW1q+QreBHITT2UHFVYBGVdhO2DpVkNSP+s4QAMLvUjn/YlbnX2Nzw6yMVBOsGrkKJFXDHMozK/h2iIN2qUk/eakWCTSi0+jbKV8= 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=dQk309tl; arc=none smtp.client-ip=209.85.167.46 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="dQk309tl" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5461a485a72so5229550e87.0 for ; Tue, 25 Feb 2025 01:55:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477319; x=1741082119; 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=ggLp2N6nIh1N25l9qqVFGy2pp6+E0t6/i4rH9zHeAXo=; b=dQk309tl0DpukVaFXBLY+XM6NLuVI8F6gs16Uhaq3PGGdJwXWJa8G/jvy533+mTE47 81nDvhyhk4lQF6quF5poFc7tZUmZJlS2ZKkc6Og2C9Js0xHiJfNWhEbZOatnMXTC1S+t m0Fwa77WCcDGOgkXa4OFhcxLtvR50pObR+YrPSYChvb/zgh0eaSwW1EGaaKi27jjhWzd OA/ZH2DcN85xh048yPWJW6+XiJvi2+TfcSQF8kWO5oTbn+MsxvFF/r+w+6RUPEeH8Kyd 6vg1bkb/TPIRsYpxp6zgMDGDj3+0WbzIUS4Mr3Rn8JH+UbCat+Wju1NU7SQS2/gnRX6M VF2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477319; x=1741082119; 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=ggLp2N6nIh1N25l9qqVFGy2pp6+E0t6/i4rH9zHeAXo=; b=MmXwa1s97csx/0FTo8mI+0Ao+VJPAaO1sVrhsN2pQav8qekRqGP+14XyDF+Ig+EYU8 toIhcNVBlqIwpTP2iNNiezLbISBKtKr6GPxUt4REa4GbK1ZDnw42yE3m4sIjYCj2n76I QFN5Vh269J/tg+Zqbw0umxsqn2c7KaogopJICUXTP+73WYGUxfemlKUmvBXPHX8yoN7t 85iD++UloT3EPVsiMnA3n2azlmJfrRSMJK6WJXXYUPewjQNLUiPb9Ixi5w8JuFUQ/qDq V0Hrzi7fZmsgSMxiithmrAfjNWlHCQkIkn26FjExLBD78g+7b/5QLOm6aHiNx9oM5WK1 V4Zw== X-Forwarded-Encrypted: i=1; AJvYcCVSNB3nx2lwy/sdgrFnqsfuelg+iSY4TcMzgp6FFwgIZOHlLQbBHUbYZ2iENxNch+snemKilM9h8HhSbd0=@vger.kernel.org X-Gm-Message-State: AOJu0YxbiymHw/2a/B0MXFUibXsa7TY/asye5e26B/kIeBXXK1lajB2n ycCvqgt1e/TwbzLNAdtiEf99xoiE4rA4xzITLLcwMI7Ky6CQmnaaNt4HMEBIKO8= X-Gm-Gg: ASbGncsckkPRq9KudT5ioHtNMo4FMe2qVYQtr2R5PIF0q4H0/uVAsKHmPC5FLL4s4lN 7iSZrzQh2rDdF3jCxqp24Jn+T7igIa9LS27O4gIrt+2wecY8hcfz8I711IH70Cbo6wTF2QMs4xF U5QXZMmoLZlWFZjgD6mo1ErsTzNkg4P/Hh6j6dwMALbVc7Gc/q+u6xinR+zpJu7s4UEozxSxDi1 BvmgoGjzJ8uS+4/E0i3OPnSsjtdo1jCS2Op6H0rzEEUKlYyHW2TxTtlzOoE2ibrPEbW90EzN+9k USyykwQQImOd6F782whKOTxitn0vUwb8BZtN X-Google-Smtp-Source: AGHT+IHX3+a18efpxx2qbHXAhs4U0wbk1ul7gmrkFn8LxyQ+grE1C90J+pJbcS1vktIQA6he1PGJqw== X-Received: by 2002:a05:6512:3f19:b0:545:646:7519 with SMTP id 2adb3069b0e04-54838d3d9d5mr6616063e87.0.1740477318630; Tue, 25 Feb 2025 01:55:18 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:17 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:03 +0100 Subject: [PATCH v5 16/31] ARM: entry: Drop argument to asm_irqentry macros 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: <20250225-arm-generic-entry-v5-16-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 asm_irqentry_enter_from_user_mode and asm_irqentry_exit_to_user_mode have a "save" argument that will save and restore registers before the call to the C function. Now all invocations set this argument to 0 so drop the surplus code. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-armv.S | 8 ++++---- arch/arm/kernel/entry-common.S | 2 +- arch/arm/kernel/entry-header.S | 18 ++---------------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 6edf362ab1e1035dafebf6fb7c55db71462c1eae..460aa92c3c1f50de905550acf36= 3c58f509bfe0a 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -422,7 +422,7 @@ ENDPROC(__fiq_abt) .align 5 __dabt_usr: usr_entry uaccess=3D0 - asm_irqentry_enter_from_user_mode save =3D 0 + asm_irqentry_enter_from_user_mode kuser_cmpxchg_check mov r2, sp dabt_helper @@ -433,7 +433,7 @@ ENDPROC(__dabt_usr) .align 5 __irq_usr: usr_entry - asm_irqentry_enter_from_user_mode save =3D 0 + asm_irqentry_enter_from_user_mode kuser_cmpxchg_check irq_handler from_user=3D1 get_thread_info tsk @@ -447,7 +447,7 @@ ENDPROC(__irq_usr) .align 5 __und_usr: usr_entry uaccess=3D0 - asm_irqentry_enter_from_user_mode save =3D 0 + asm_irqentry_enter_from_user_mode =20 @ IRQs must be enabled before attempting to read the instruction from @ user space since that could cause a page/translation fault if the @@ -472,7 +472,7 @@ ENDPROC(__und_usr) .align 5 __pabt_usr: usr_entry - asm_irqentry_enter_from_user_mode save =3D 0 + asm_irqentry_enter_from_user_mode 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 14b2495cae3c2f95b0dfecd849b4e16ec143dbe9..df564388905ee019cd5553f8b37= e678da59e3222 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -109,7 +109,7 @@ ENTRY(ret_to_user_from_irq) movs r1, r1, lsl #16 bne slow_work_pending no_work_pending: - asm_irqentry_exit_to_user_mode save =3D 0 + asm_irqentry_exit_to_user_mode =20 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index fb5bb019199b2871e29e306a29bea8fdf47dd7f3..50c0b55adc7421e7be123c9d00f= 94b1ebb93ff9e 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -365,28 +365,14 @@ ALT_UP_B(.L1_\@) * Context tracking and other mode transitions. Used to instrument transit= ions * between user and kernel mode. */ - .macro asm_irqentry_enter_from_user_mode, save =3D 1 - .if \save - stmdb sp!, {r0-r3, ip, lr} + .macro asm_irqentry_enter_from_user_mode mov r0, sp @ regs bl irqentry_enter_from_user_mode - ldmia sp!, {r0-r3, ip, lr} - .else - mov r0, sp @ regs - bl irqentry_enter_from_user_mode - .endif .endm =20 - .macro asm_irqentry_exit_to_user_mode, save =3D 1 - .if \save - stmdb sp!, {r0-r3, ip, lr} + .macro asm_irqentry_exit_to_user_mode mov r0, sp @ regs bl irqentry_exit_to_user_mode - ldmia sp!, {r0-r3, ip, lr} - .else - mov r0, sp @ regs - bl irqentry_exit_to_user_mode - .endif .endm =20 /* --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 AC8F82627F5 for ; Tue, 25 Feb 2025 09:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477323; cv=none; b=unhKDDP2MwI/iIcHdIGbsreH3ml64beA/1PU/4qyPKU426vHkogPBBhsefhcn9UDyAkJ4mp6ppD2HeurOvxfQmyCn/6g+O8+N8GUKzrsWJ4AV399Q/WkWAYTxosknS0jiVL8RtvHDk7wdPwnguWNYKFbHJEC+esA8ChmVSZzDYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477323; c=relaxed/simple; bh=UUr52Es2hedBYSKenm4TK98x7/B8OkpHksvY28zdaBk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bnYgj9KUu9iYoHV0O2EmUcj6Bpe/7yRc9h/YyVKISDplF2Ko1YAmFitubi4q4SNmqsEk+/GbSkjFJn0c717u9TWteZ8Q8K1VTyPYjdHVyK4OL9QIFWiGY/YI8CbRpXI1B0nhho9enYh1/RPccAuOe3Gi3zPeVOWKjawwLpl3xMk= 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=LIb8C4q0; arc=none smtp.client-ip=209.85.167.53 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="LIb8C4q0" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5452e6f2999so5747385e87.3 for ; Tue, 25 Feb 2025 01:55:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477320; x=1741082120; 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=0KMIzffvEsBK43v+gCyDeKdrTwv9xJqaffLfxp2Y9ec=; b=LIb8C4q0Gajz3qHF6ghedX+eOT6ZNIAJBDBBj1qa+MRxrW9eWZV0TE1VNPVBYJPpAt T6Dvc77iQ/uoSw0pNrFrwPG8i66EvADsvVhn33MOpJ3cXrDSGWcmiVhaRvokaNBvc2eA OxCLF2tPZ/z8qxKzYmCUtFn7410ZNPOJJjPLQ47UCeITFvCEefeTnJ9Gmi3N7PJl2dQN qhAnqNyxq3A3RoDuCQmGEbSmgMpJElE4ee4dGtAin+Gt/f2mADrGMurrvXuUElj8p7+q s0qjWggB/Bgv0hsWThg6EVWVWiaAe6LnGxsFwHpUX6A+SLQM1NymGRyJO6VUt3/cnW6N 8baA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477320; x=1741082120; 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=0KMIzffvEsBK43v+gCyDeKdrTwv9xJqaffLfxp2Y9ec=; b=qvLuJ1cpKWTm3zTxsCCasea+TeWk9ugalnYKqe4MIxt77sEvmVZg72ry0/WOMu966j v1qinNrjP6Plh7Mk/QBd5mki0lFfgwfvuNXq/4gxgArr0odoynUFEf7xULypaBNIcS1p EflOmV8WVVAKaK0DfsFRvZI3q5Q+JVMtKb1Fnz7hC9l7Wq2kl2KCx7qZmRsMLPLyU27e 1DRSVa1g3lBQPgS6q1wLLXX6EEQPbIhsNSJ+wKwjQ0VZVKInqcXyoCKCELpS1R+0K0Cg JUw/WFI1IJdnej95ltJ0Fo+MIXE5nzQVi6gfFMsJj5cpkpt7MHvowe7n0wddSKSXtziz 5yAA== X-Forwarded-Encrypted: i=1; AJvYcCVqR9FErJxKYFiuElb8o2UMLuBc9fN6O56Y8vTVok0Pqs8gT9pMJYCwImBH2Q0E1Uqs8umUavahxc36o/w=@vger.kernel.org X-Gm-Message-State: AOJu0YzBPK+x485QFmmUKOPYl9d6/jF6OmWslrEPrPFbcF51byYXH1Rq x7bUyocLk47FhoFUAgZDk8HcZt/gfd/OgQBjgw6AkjnUSW0/4QzxPh4mqTL2yvM= X-Gm-Gg: ASbGncsqz8oV37VJ8CoBsuSoz003cHfeBTOAHl6u+DBTWW6kob0Wp+KEGRW0g7AdGxg ttvQn8rVGa7JbNQWRkJTcR7+UAQK+nHhYjr/n3xAbkEmvGrqn/Om3ItzVTkhpF4zGUqyhGjXtVj T53PtMZCBJQeEqjBTMLEUW+mQSI5pUh8JK7fJqgiMZm1BCGZKR2Ljgo6mNf8/7N+ATku/hLSmvo +kXa2sKuMdzcqICJwdEy6RekaPenT2lmYLgntTV5q1qdd7TeEhypA+lz4feKioSnviZXc8xIWdS SIWpOTjMCtYXI6yy/kxY3aCc1GU6Qo8nWQU8 X-Google-Smtp-Source: AGHT+IFQbbLnCCyj6FgNCwGxulDwvPP6jZb6g7kcFOt1Jz/gH3uLa0VdebmCRshYEfTm6zK7LqNLZQ== X-Received: by 2002:a05:6512:6d0:b0:545:93b:30c3 with SMTP id 2adb3069b0e04-548510cf94emr1053860e87.18.1740477319703; Tue, 25 Feb 2025 01:55:19 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:19 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:04 +0100 Subject: [PATCH v5 17/31] ARM: entry: Implement syscall_exit_to_user_mode() 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: <20250225-arm-generic-entry-v5-17-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 Mirroring syscall_enter_from_user_mode() we create the sibling call syscall_exit_to_user_mode() and start to move some stuff over from assembly, first the rseq call and the interrupt disablement. Signed-off-by: Linus Walleij --- arch/arm/include/asm/entry.h | 1 + arch/arm/include/asm/signal.h | 1 - arch/arm/kernel/entry-common.S | 10 ++-------- arch/arm/kernel/entry.c | 8 ++++++++ arch/arm/kernel/signal.c | 7 ------- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/arch/arm/include/asm/entry.h b/arch/arm/include/asm/entry.h index e259b074caef75c7f777b18199623f07bebee5b4..8b8cc9a1eefbd00dd75d4e34457= 6fc184a413768 100644 --- a/arch/arm/include/asm/entry.h +++ b/arch/arm/include/asm/entry.h @@ -9,6 +9,7 @@ struct pt_regs; * to generic entry once they are semantically equivalent. */ long syscall_enter_from_user_mode(struct pt_regs *regs, long); +void syscall_exit_to_user_mode(struct pt_regs *regs); 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/include/asm/signal.h b/arch/arm/include/asm/signal.h index 7acccc96840c8a17744cc3f2894f19d142aba4fd..bb753cd3e29fc54186543c48b2a= ee7b221301a37 100644 --- a/arch/arm/include/asm/signal.h +++ b/arch/arm/include/asm/signal.h @@ -23,7 +23,6 @@ typedef struct { =20 #include =20 -void do_rseq_syscall(struct pt_regs *regs); void do_work_pending(struct pt_regs *regs, unsigned int thread_flags); =20 #endif diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index df564388905ee019cd5553f8b37e678da59e3222..3559e0a9f5e079f1af91392bf00= 0d39f9b45906c 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -65,12 +65,9 @@ ret_fast_syscall: UNWIND(.fnstart ) UNWIND(.cantunwind ) add sp, sp, #(S_R0 + S_OFF) -#if IS_ENABLED(CONFIG_DEBUG_RSEQ) /* do_rseq_syscall needs interrupts enabled. */ mov r0, sp @ 'regs' - bl do_rseq_syscall -#endif - disable_irq_notrace @ disable interrupts + bl syscall_exit_to_user_mode ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing movs r1, r1, lsl #16 beq no_work_pending @@ -97,13 +94,10 @@ ENDPROC(ret_fast_syscall) * do_work_pending() will update this state if necessary. */ ENTRY(ret_to_user) -#if IS_ENABLED(CONFIG_DEBUG_RSEQ) /* do_rseq_syscall needs interrupts enabled. */ enable_irq_notrace @ enable interrupts mov r0, sp @ 'regs' - bl do_rseq_syscall -#endif - disable_irq_notrace @ disable interrupts + bl syscall_exit_to_user_mode ENTRY(ret_to_user_from_irq) ldr r1, [tsk, #TI_FLAGS] movs r1, r1, lsl #16 diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 1973947c7ad753fccd694b3ef334fba1326f58b6..47233804733752aef0f2fec6f54= badeab18e98d0 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include #include +#include =20 long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall) { @@ -14,6 +16,12 @@ long syscall_enter_from_user_mode(struct pt_regs *regs, = long syscall) return syscall; } =20 +void syscall_exit_to_user_mode(struct pt_regs *regs) +{ + rseq_syscall(regs); + local_irq_disable(); +} + noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) { trace_hardirqs_off(); diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 7b1a16e86b236575efdc29cda9b751e8e2a3f64e..03b20637a2e1ca6f327223c9132= 915a97a9c4697 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -659,13 +659,6 @@ struct page *get_signal_page(void) return page; } =20 -#ifdef CONFIG_DEBUG_RSEQ -asmlinkage void do_rseq_syscall(struct pt_regs *regs) -{ - rseq_syscall(regs); -} -#endif - /* * Compile-time assertions for siginfo_t offsets. Check NSIG* as well, as * changes likely come with new fields that should be added below. --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 A5C5F267F6A for ; Tue, 25 Feb 2025 09:55:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477324; cv=none; b=IbbNhx5+2R1lfiGRxuYbRR6GC50qI0HumI6ghT6l8J22WlkZpA7XhH1raXKOZc/xRx1kIRZJnQ63ObbhaDHQCeS0hrY3KD9DDO8IrrRVz34HQNFMdBC7YUo7dh9Vl/jHNfiwmvH1FUlfqz09QlDGDNbpAgA6Jo0X/A1Im0Ch79w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477324; c=relaxed/simple; bh=6f7zBuKhRiAQ/x1F76wPwIaqznd7DT1I5iskhJXpWuk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oJv0TkBJfU4rauwptYqUpUYTF1vbie/cE4y0lTm0yicHd88XNPfsjL/ImZbfALWJjOTTAar4X1dMVhZ5KLoB9XrIicNDgqbJ3P+4VMJhXK5J23GuS2n2pgYNhJRjvMJ2m5TOn5GiDSm0YFLyNerY8zbVXx3BRgzhkivYP+ksew8= 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=eAPyeLs0; arc=none smtp.client-ip=209.85.167.50 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="eAPyeLs0" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-54622940ef7so6100333e87.3 for ; Tue, 25 Feb 2025 01:55:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477321; x=1741082121; 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=kElQgdyrfkPgzICs9KEd5Is5KMXf1IbQ9ph46r/iv/o=; b=eAPyeLs0RUOppCyXtBsRpr1VSqCXn3DUhduxmFgwmEX92VwfoSS8aKDVVpP2XGfu9m lDyK4vBWBomTtRT77Hg7ATmFkvG0RDW2HLC2u3L0F1+UDiX8BHzPECz/syORzLoUYhgH q0AaKcoFZau4rNyCuC8s+NJI2CMcKEuvq3gaG9Ertd3Gsxeka+FmTXe/Z7P8Cao+IYBE jcX8iDLGxHJg7S4u7tp2DTwULAcXjF/qvAPCAmvloOjmK2yj3WghX5CPfbFiHq3IbBI5 vtavNbpSCy4Qw3o4IQwRZunqo5G6njhB0InpkFIocd56Rw+HZy8701z67UMfXoemwhDb YOtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477321; x=1741082121; 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=kElQgdyrfkPgzICs9KEd5Is5KMXf1IbQ9ph46r/iv/o=; b=N5XIKHrPl2qWjLfyQlZldrLcnGnurP32Set4Il31RbgXkCEOadKt849YugiljP58/O ID6u/YuF1qg3evVWORGeveyiel2gZiB43heUXY5Pk38sCOdAMqZmMbodFz7RdmCxFwym SdjiQNWeRero2kd+bIdnpAaw8Z7wkJxGYdt6PU60esWizvmJKoSOsxtWsJsu/Q19ftHf FZg7t0weFajMU/biv17Ews8HeB1lmoic/kiV1Y9gA+UuD/kck9T9Itcf2HtM8y/WuAzd 4iN8O3kqEXePtMsZ2p2fyZUDXA+c1rjAVGAh9eMdd8L3w7iQ8oeoBaUIM2SjNCSd0Guo j9tQ== X-Forwarded-Encrypted: i=1; AJvYcCWppCSeAVWPy+LNzuAA1yNMnvz1xkR9he7w4FBOwI7sD/Yx/6weJBGtTF/iHuQasDhqfOyvrBu3wsCczS4=@vger.kernel.org X-Gm-Message-State: AOJu0YxU4QmTCYH4wO9YpZxZH9RWF1x+RMg4OEljkIUmDQc7cuy1wdIT AHasKxei3IpLV3DN7m/68MtKK7Cwc6pBN8bjCNr0XAHidsRXZjLTQ+gwN8XcfBE= X-Gm-Gg: ASbGncs2HnMYWmE3IfWy12ox26RFVvh2EaYLCkmmx0qc+fODmzaCFsEEvkM2NjHMRmY yAb+yJoUAriI3gLmH/ad4v7k+hpe7Pf8wc1zyATVtnkZ1AnQ1P8zo8Hcd6esSws7ObuhQuYgj6w Lf5RSeUUbudcTvoMWM8HwFrEY8wg49YaNiei+cISjywwfnTDI+a8DARbIL9HzZVdSZFMpk59FIX M7wGMal4b9vV00CQa1Vu2MnK14IG57Vtg1GSaWeDhDmd3WFE0vs4heT+EV8fooLuqzWVVmVEMEE zR2ypRSj9OGbRQD47DcBm0bLW0c+K+Dsxk41 X-Google-Smtp-Source: AGHT+IE7t84m4BCM4TmWOCmFQFqdsr7GUqDmKXu9j93tWoANi+DXx582k3Ij4BI18U0vfQc//0bwWQ== X-Received: by 2002:a05:6512:3186:b0:545:f9c:a80f with SMTP id 2adb3069b0e04-54838edd978mr5618553e87.1.1740477320805; Tue, 25 Feb 2025 01:55:20 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:20 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:05 +0100 Subject: [PATCH v5 18/31] ARM: entry: Drop the superfast ret_fast_syscall 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: <20250225-arm-generic-entry-v5-18-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 When not using any irqflags tracing, context tracking or rseq debugging, the ARM kernel uses a "superfast" ret_fast_syscall with a very few assembly instructions. With generic entry, such local optimizations are not really possible, we need to call C unconditionally and take the (hopefully small) overhead. With generic entry in C, most of the tracing (etc) calls are replaced by stubs and optimized out by the compiler. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-common.S | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 3559e0a9f5e079f1af91392bf000d39f9b45906c..dddbd6ba1eb9fcbc2c0d81f24e1= a9b3231558d7f 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -30,34 +30,8 @@ saved_pc .req lr =20 .section .entry.text,"ax",%progbits .align 5 -#if !(IS_ENABLED(CONFIG_TRACE_IRQFLAGS) || IS_ENABLED(CONFIG_CONTEXT_TRACK= ING_USER) || \ - IS_ENABLED(CONFIG_DEBUG_RSEQ)) /* - * This is the fast syscall return path. We do as little as possible here, - * such as avoiding writing r0 to the stack. We only use this path if we - * have tracing, context tracking and rseq debug disabled - the overheads - * from those features make this path too inefficient. - */ -ret_fast_syscall: - UNWIND(.fnstart ) - UNWIND(.cantunwind ) - disable_irq_notrace @ disable interrupts - ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing - movs r1, r1, lsl #16 - bne fast_work_pending - - restore_user_regs fast =3D 0, offset =3D S_OFF - UNWIND(.fnend ) -ENDPROC(ret_fast_syscall) - - /* Ok, we need to do extra processing, enter the slow path. */ -fast_work_pending: - add sp, sp, #(S_R0 + S_OFF) - /* fall through to work_pending */ -#else -/* - * The "replacement" ret_fast_syscall for when tracing, context tracking, - * or rseq debug is enabled. As we will need to call out to some C functi= ons, + * As we will need to call out to some C functions, * we save r0 first to avoid needing to save registers around each C funct= ion * call. */ @@ -75,7 +49,6 @@ ret_fast_syscall: ENDPROC(ret_fast_syscall) =20 /* Slower path - fall through to work_pending */ -#endif =20 tst r1, #_TIF_SYSCALL_WORK beq slow_work_pending --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 D2D4026868A for ; Tue, 25 Feb 2025 09:55:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477325; cv=none; b=uWJIKKLtsk1FXC22tWW5c8RZXXEWXBHdmDGJXZmteO1MdMssIknKUBw4JzIbl93jzqrp/M9gVLRjKwjFfCLTBXTugzsy/Q7174W62ATwhAq5SajHqrP46BI/P0uyaO6Qb5ktfMGd7DCVtr6vJfxD5VywiqH6pAoP5k3l00vS5/0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477325; c=relaxed/simple; bh=UHzcNNHxwFWGv8vEtBqZ0RLUWXweMBley6ciSj/Iipg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HtHS+LlZss4na3HvXO+gcx7RpjYVsKrQ1gu4HSxXu64N1ueHZnK/j2sEKq2a0SzLuJLmou5drUSWsOA2JtH6LTNj9HxpK1s5wogEfQGN8g5RBNk7U1dCDTn1rRiA6nC18pF4atg7duXAzot34oH/co+YyRkOpIhXtoMAjzpybPE= 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=NNkSXsUF; arc=none smtp.client-ip=209.85.167.41 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="NNkSXsUF" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5461f2ca386so4627040e87.1 for ; Tue, 25 Feb 2025 01:55:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477322; x=1741082122; 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=SK4XvykyJ6Zn+vIxSK9vSx/zpAi4l4ILYAtxYCxqygE=; b=NNkSXsUFO5+/tdwkkoJBjzR4lhnyOZZ2gXGIRWukdc8FESNZgmo1vZXAb29OwDlHFF rtCUrzJRsUyQLZ0WWD/hFV0qN+uL+uuAIyBW7T6dTafyGtwAEcwttc7nMRK7xpKyx+h9 IBn9JZFbFBLZRcaH5y3fNeDJ6nVnqkpqz0oCWS6uQmuQOoknDuQTI62EY9mzgnUPOt1r MXuxVwm70PkRttRExNeff/yLTkug7ZOLf6qlo15iuGrFMM+F7cO9QN3iU9ipsB8rxPqX nc6EncnyuLCdJEdpybsY/tVB2ODCYsN/aX5v9AiTfYjnCRtFpxIaMssKAXkCW+iH0OlY w7/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477322; x=1741082122; 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=SK4XvykyJ6Zn+vIxSK9vSx/zpAi4l4ILYAtxYCxqygE=; b=dkKz0BJuAttZP3TF0weB59mjT2HQL31vortyBR96Fw5XJ0FyVG2zprh5fK6ddXBoBP 4lY8hubjZIUayEuWwMPRug9QF4xV2c3mmEpsBybiMUkJd0ig/hgCSjKjoNup3cQyc9kN Gdxz23f3Q9JRLMxZaVcLM+aKsOFtQ3rMzjmYzaSuy/K0U0JkqeHrYLdiOHwZbUzKkScY dfg8K65KyPhUChm9yCMooNWLqLBbhsVIbjpU5k3l/NJEA/zM8fy/WXjrIOE+8hZF6MRJ BiWhEipTBrlqDkpVB8alLxNIkMqNjZOrLEx3BbUtCW24yWQZFeC8CGMaRyAK+MS7VJKk eBtQ== X-Forwarded-Encrypted: i=1; AJvYcCVhFERG7UY0dPq3pDzuR4sD/kZjCO9lXVoOlkXsSkwicVN2EdWpg78oVIuyde3wsutdPap1blk4hy+7vl8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8FjvyTZ+ZBCbCFFAk+v3IG7zGlpz2my5wvH02KmgBKO6PwDjR 4IokYJtQtKjLEkLtkUuEVMpa398v+xy/9JtN33FNy2nu2PNHg1s5ivmL7Y9xXz8= X-Gm-Gg: ASbGncvS0jVBqHrFg7oepJsJ3ptMTWK2MJAj+//beCw2ZllFlY0wY2S1/BjOn6ymfN3 YgPjbxOVXacbwlUHJFpPidqm50u/yI3nxeMVrv0Uc6DV8XjeYabAHIVTT33UYMurBG0kGJheBeZ 8YeBxTBWolRUePmYWlWPR1wKlc2Jhg0ca8UDH0XCFYaGrLum7ZorhipaSjrEPSdaJjoH6VO5JR1 dhjztWJmEH9Wcww7RIHr0r7cI2euiEPlhGt8PiYeA8Aqm5HfSdnGrT7ZFfkaKrL1WZ9ty0QGVc6 EXGvJN02F9TrOCcIhuYhDnozlwBQp5lqzzut X-Google-Smtp-Source: AGHT+IHCtJvTxVRz26fQjj6kCjgqj3b1/2GhW8qtHYMwDMQCiPhoAVv8hPhhcX8Zp/SFXBZFx0kpow== X-Received: by 2002:a05:6512:3f17:b0:545:2ddf:1189 with SMTP id 2adb3069b0e04-5483912fc63mr6223975e87.6.1740477321934; Tue, 25 Feb 2025 01:55:21 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:21 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:06 +0100 Subject: [PATCH v5 19/31] ARM: entry: Remove fast and offset register restore 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: <20250225-arm-generic-entry-v5-19-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 Now all remaining invocations of restore_user_regs has fast =3D 0 and offset =3D 0 set, so drop these parameters to the macro. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-armv.S | 2 +- arch/arm/kernel/entry-common.S | 2 +- arch/arm/kernel/entry-header.S | 29 +++++++++-------------------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 460aa92c3c1f50de905550acf363c58f509bfe0a..3cd5a80b47758867d1db6c39710= 30370bca1551a 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -497,7 +497,7 @@ __fiq_usr: mov r0, sp @ struct pt_regs *regs bl handle_fiq_as_nmi get_thread_info tsk - restore_user_regs fast =3D 0, offset =3D 0 + restore_user_regs UNWIND(.fnend ) ENDPROC(__fiq_usr) =20 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index dddbd6ba1eb9fcbc2c0d81f24e1a9b3231558d7f..d27e34d7e97a079d62e7b778cf7= cf97c302e4763 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -81,7 +81,7 @@ no_work_pending: #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack #endif - restore_user_regs fast =3D 0, offset =3D 0 + restore_user_regs ENDPROC(ret_to_user_from_irq) ENDPROC(ret_to_user) =20 diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 50c0b55adc7421e7be123c9d00f94b1ebb93ff9e..51c7f93c1ded1db56f173c7aaed= 8094ef011ff5a 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -290,7 +290,7 @@ .endm =20 =20 - .macro restore_user_regs, fast =3D 0, offset =3D 0 + .macro restore_user_regs #if defined(CONFIG_CPU_32v6K) && \ (!defined(CONFIG_CPU_V6) || defined(CONFIG_SMP)) #ifdef CONFIG_CPU_V6 @@ -309,8 +309,8 @@ ALT_UP_B(.L1_\@) #ifndef CONFIG_THUMB2_KERNEL @ ARM mode restore mov r2, sp - ldr r1, [r2, #\offset + S_PSR] @ get calling cpsr - ldr lr, [r2, #\offset + S_PC]! @ get pc + ldr r1, [r2, S_PSR] @ get calling cpsr + ldr lr, [r2, S_PC]! @ get pc tst r1, #PSR_I_BIT | 0x0f bne 1f msr spsr_cxsf, r1 @ save in spsr_svc @@ -318,31 +318,24 @@ ALT_UP_B(.L1_\@) @ We must avoid clrex due to Cortex-A15 erratum #830321 strex r1, r2, [r2] @ clear the exclusive monitor #endif - .if \fast - ldmdb r2, {r1 - lr}^ @ get calling r1 - lr - .else ldmdb r2, {r0 - lr}^ @ get calling r0 - lr - .endif mov r0, r0 @ ARMv5T and earlier require a nop @ after ldm {}^ - add sp, sp, #\offset + PT_REGS_SIZE + add sp, sp, #PT_REGS_SIZE movs pc, lr @ return & move spsr_svc into cpsr 1: bug "Returning to usermode but unexpected PSR bits set?", \@ #elif defined(CONFIG_CPU_V7M) @ V7M restore. @ Note that we don't need to do clrex here as clearing the local @ monitor is part of the exception entry and exit sequence. - .if \offset - add sp, #\offset - .endif - v7m_exception_slow_exit ret_r0 =3D \fast + v7m_exception_slow_exit ret_r0 =3D 0 #else @ Thumb mode restore mov r2, sp - load_user_sp_lr r2, r3, \offset + S_SP @ calling sp, lr - ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr - ldr lr, [sp, #\offset + S_PC] @ get pc - add sp, sp, #\offset + S_SP + load_user_sp_lr r2, r3, S_SP @ calling sp, lr + ldr r1, [sp, S_PSR] @ get calling cpsr + ldr lr, [sp, S_PC] @ get pc + add sp, sp, S_SP tst r1, #PSR_I_BIT | 0x0f bne 1f msr spsr_cxsf, r1 @ save in spsr_svc @@ -350,11 +343,7 @@ ALT_UP_B(.L1_\@) @ We must avoid clrex due to Cortex-A15 erratum #830321 strex r1, r2, [sp] @ clear the exclusive monitor =20 - .if \fast - ldmdb sp, {r1 - r12} @ get calling r1 - r12 - .else ldmdb sp, {r0 - r12} @ get calling r0 - r12 - .endif add sp, sp, #PT_REGS_SIZE - S_SP movs pc, lr @ return & move spsr_svc into cpsr 1: bug "Returning to usermode but unexpected PSR bits set?", \@ --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 1044D2686AC for ; Tue, 25 Feb 2025 09:55:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477326; cv=none; b=jOUAp+l1ELTWtiqn5H6VoUsbXF4LDEjSlqv0cnqjAGUhuE13ke6XRTH4N3hip5ZIyxiRw03HJTeolT+0Fmxq+Fq+tt9z4NY3dkvHE6HDpmNZDOBUxNFe7yMpgVrNm2y+9TY9ZjK3eNF501rgb/7DZUMYYzcO8WWJUa5rLzeeVz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477326; c=relaxed/simple; bh=KX7L2dj8FdPfM34FoyLp2Zt4Q5Ia48cTxoohJeqgi1s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U6qyyoYyX9z5Qh7E6BOVpqFWayP+2DWTjQ3I0d0fkTLDC0SseuGKluQ0pz700+CLbvPKY3Aos7C5nSvXT4kmojYzhC/LNY7zOqdlXZg5OTvfm+S2HtzIh0DvwHxaJTiKHmP1U3+2i7LpxWdbEzzQQIJLXPJyFcpB9zRgxZvVG5E= 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=EJ6Z4LY7; arc=none smtp.client-ip=209.85.167.46 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="EJ6Z4LY7" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-543e4bbcd86so6218975e87.1 for ; Tue, 25 Feb 2025 01:55:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477323; x=1741082123; 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=hLPL0cxSmhQjzTuSazqL5ULZpLc4BXlPwpKFYiv7qfk=; b=EJ6Z4LY74YQamwvpPR4RZ6v/UE0Qfqk75Trml7Ni8f5UCWvFvlaoQZI2UDoXB0LYsO G8O9N7Vdqplch6GEtl4eQddIQ8hR1WUESnUvqvVG4tkr6ypNnK/eWjZ1XLGul6xTP1AJ ORF0784XzACgN/C6NE+oNQc8f60Fn2/XvgfQlRwmD938RfEGQ3hJjPhCti362TWemiyQ 3uab5VWuwiVWMh1c5iJceorb9H3FwR2XAdIsCA9ach+U1VORQzCb6FXkMs1gwKTn04hT 1lN7GIMkYveA3T4FR3KdRTwhw331ajw2sGvsGXOt8YuQFXEJd8zl9rjAPFxQmDa0k3ZC VVLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477323; x=1741082123; 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=hLPL0cxSmhQjzTuSazqL5ULZpLc4BXlPwpKFYiv7qfk=; b=JQUZ6rKrIVOKE1Z/mgmKlCUsOR3L6hzOTiAjeu+5yjPdvZESw1IHX+fbkIo2nj5zLq g4/31QCPOpV7Rd/tYbqFgGBx+uXDl6MLtua2Pw6Wjpd8y8TUAikxe6ycIXYeIrMECqwa 4u1twIR2my1GSOl+IeiteXgJdn2V6JvMdNKbaQtTy+FMD+FGXyQ2Y8fOOziSHmCOYQPg d46FZRXzKIeq6uau0p4VwxzseXM+gF4L6zFU1HGV3hefivb4UD6fv/0UpCUA8Kmco9BS KUm3vX7CPdf05NG3uYW1IHTHNQ1YKWFF8qr1GMcC+5A7mRTmXNbZ3yJ62rTMOJFqgshG VPpw== X-Forwarded-Encrypted: i=1; AJvYcCWPYh6YZF83m5mwPKRBXM17yA7MjmRPaOSQDzgTkHjg827DzERBzkQxOn0PRViAdpH4qUa/frBRikkjc0U=@vger.kernel.org X-Gm-Message-State: AOJu0YwGIMRTeM5/rP71SBUIqr8GEMBtbIpns4Icu9aM6lnuxHWLAVF4 HI8b3GXqPWfrdGboYr8MJP0bMOciM+DEiin3QzY24tvCx4N/JETiUdbfE05UM80= X-Gm-Gg: ASbGncs9/pa9r45P2MREkVOGTBUOte3+in/DQB0s1s7yZjuxd8B/2xbCGKPAf375zgk EUR5R/MF8FcUAH4PZMrJASn/icKiRbULnlE4eJO0W+TlwtpIKU3y5d9JZFc3v5b2SUtPSqo68tW vhVG/VBzAQtLKWaeX8qdpPkfP/3rA15IsQcd6mjvnVjanQ/V2n+ZvMyeN31YIqptjgeqRalBiwk sUAWgYbARw76FtoBBEvf3vIqnwY60+iKeZd8cpZfTssg7w4xO1dMw5hPVcU1DUCyrda3np+1Zgw IHiRluc/I+ivjYPQrw/VLtrR4rA7Xp58HYx3 X-Google-Smtp-Source: AGHT+IG4gnndhO6d56pPyJzHQkvZAwyB0xsXUyc/MHVXGstc6/S0wQ2MFyd0xpUKVgQgFI8a8Tye1Q== X-Received: by 2002:a05:6512:2809:b0:545:a2f:22b4 with SMTP id 2adb3069b0e04-54838f5a9d3mr5459397e87.40.1740477323227; Tue, 25 Feb 2025 01:55:23 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:22 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:07 +0100 Subject: [PATCH v5 20/31] ARM: entry: Untangle ret_fast_syscall/to_user 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: <20250225-arm-generic-entry-v5-20-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The return to userspace is a bit hard to follow. To prepare the ground for further refactorings we rewrite the functions to ret_fast_syscall and ret_to_user are mostly stand-alone symbols. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-common.S | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index d27e34d7e97a079d62e7b778cf7cf97c302e4763..ece9215717143427de7572a18a6= dbe620a9193e9 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -44,20 +44,23 @@ ret_fast_syscall: bl syscall_exit_to_user_mode ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing movs r1, r1, lsl #16 - beq no_work_pending - UNWIND(.fnend ) -ENDPROC(ret_fast_syscall) - - /* Slower path - fall through to work_pending */ + beq 2f =20 tst r1, #_TIF_SYSCALL_WORK - beq slow_work_pending + beq 1f + b ret_to_user =20 -slow_work_pending: - mov r0, sp @ 'regs' +1: mov r0, sp @ 'regs' bl do_work_pending - b no_work_pending + +2: asm_irqentry_exit_to_user_mode + +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + bl stackleak_erase_on_task_stack +#endif + restore_user_regs + UNWIND(.fnend ) ENDPROC(ret_fast_syscall) =20 /* @@ -74,7 +77,9 @@ ENTRY(ret_to_user) ENTRY(ret_to_user_from_irq) ldr r1, [tsk, #TI_FLAGS] movs r1, r1, lsl #16 - bne slow_work_pending + beq no_work_pending + mov r0, sp @ 'regs' + bl do_work_pending no_work_pending: asm_irqentry_exit_to_user_mode =20 --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 1348D268C4F for ; Tue, 25 Feb 2025 09:55:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477327; cv=none; b=ef/Gchkdu4lJQaBIiQUZnhUqyZ8OiPyirmlcBE1PU7ed3s1AWW2/TzfiC0So4t0IC7wZV9T5ieAzL60KHV3UmWKOuTmGwHIF2LalmDbSTVdHWKFuEvXB1Us8fLHYez/Co2ViyaOGVT3O2wfqlKtHHzch4tXDVbBaNywP8JJCA9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477327; c=relaxed/simple; bh=gRRY9I7VEgpc2SzFQFjwtQNQS+H92UlWAbhYCFd9jxw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=onAiARcAzYyLsE9jGzRQTOkoY3YkmFKZ21qUvIN+gJuaNv3i+k3/rDmqHT0xgb/lXCBVNaXEUlyiqsrdHv4dEo2shdAScp9Zw7cBruCsTePuXLhXpyyXxGJalA4fqYmL3YTonBFEeoeP+oWtZfYSnsZFPCmI7v5N02vZhtNzGLU= 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=zY6W0Mxe; arc=none smtp.client-ip=209.85.167.46 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="zY6W0Mxe" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5462ea9691cso6001075e87.2 for ; Tue, 25 Feb 2025 01:55:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477324; x=1741082124; 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=GFYj8M8sWUilipZ79moNvoJmNP0x1CtymAnRzXm2Cm0=; b=zY6W0MxenAcFrYaGFoQt4AXL/ILr9xosO6H4N3ZHRNX/spgHugcDCqM5ItyFf5iyzl /OfWwgGk6MFZkDdc726Vy988S9oTMh0Gg19NELCd2GXnt5EpkZewilog1hfwEi1vv8vE btCcCXWnhM6258rPb6RlduFZ1WCyZ29bO25OhPAYR+hwtomM1tCKb7Vw/0nsKGCry34D XaYXIMvuzj1QhDm6w2t6KzxUOrZzPAD0Ill6KyeDxIB3MULtubcuiE6CpzntEFUSzA0K bIW0sQ2jxY0G+gudF6i8ulLojZvQPJij1cbwRmIKCjHKM9XoF0tay0hWtmXYe7lwBXc0 IuWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477324; x=1741082124; 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=GFYj8M8sWUilipZ79moNvoJmNP0x1CtymAnRzXm2Cm0=; b=uGxxQjMCb5KgPBELtBqAyNHHFDcLWgN55VEFSsOKX4dOssQMJOQwm5dUmkCl/duZkK Q9kYj/pmCzk5Bdh8JrPFTsAqeyqLgd+k8FsEThUeQO9YdQ/HxKK5itQHxkyAgJB1PopY ORaIXt0nsYp+ZpDrOtocdAzyAz8ntFH6n0UT69apr7EwyqiKHr6F5X7btWVO4mv34HBd riI7O7NvInTWjIrLju3wAacjOmDm+6A0VNarbDcJLSJos0iBFTFMmfHV3LzmynLbl50h LWdSzTsHCLDMirjxxkOHBwanV1YdQPIuIcGwLU8yGusFiewSDWN4Ozn0+UGYNdW/UQ+i 6BWw== X-Forwarded-Encrypted: i=1; AJvYcCXtN08NsFpIptg4iiJw1FsWLj+Gi1CSXJG0vv+hkDdxUNSfdRB2SjuC8Lk7/zeiopsZh2FXPHQd5+hLE5c=@vger.kernel.org X-Gm-Message-State: AOJu0YwMgC+zHnZMXmCMmSxmD8mSSk4jdtpRnqxQU7fpSz7XRPgUvjPB UKznlFseZ9/vGnbH3l+k6pCE6A/OX+A8vGSH6OD55WKRPhtKYYSNLEhYUjKsK7E= X-Gm-Gg: ASbGncs2neImGJQ9ukMU9r5YGIU3tao/JoQ4ovvh/u2hBF78r7pmOWMCQghSqXiZ6zz 4E8NgfXJbD67gGIi6ts4DiDzfmuFtPbMdxtqFX9OEzb02EbQ/aKp+oJmzX8Hh/IDGmPrCTRAn/Z ODFJi/JXKh6orc+sXIIbkiLjf9nA5+EWubZ2dXj7ew2XYYMOjDVo88cqra+DF+xTc2VIUIq2es4 3LgvjzAOLbN/D4sascauZQay4S2jpG/KuZ7aDlQbCTc76vp4P6eUPzTMT2meGA9bJeoWmr7fgcH Hop7E3y3/sAzkJIsL1AbczXTPYwf0wJK9xzR X-Google-Smtp-Source: AGHT+IEXZnOHohV1r4Mfp6ZZX3DbBx2GvFu2h5njrZLMFHCmGZ4MEwYftDaVvCGo6wOkCls5ru72YA== X-Received: by 2002:a05:6512:3e0d:b0:545:a89:4dc7 with SMTP id 2adb3069b0e04-54838f5ecf5mr6710865e87.52.1740477324315; Tue, 25 Feb 2025 01:55:24 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:23 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:08 +0100 Subject: [PATCH v5 21/31] ARM: entry: Do not double-call exit functions 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: <20250225-arm-generic-entry-v5-21-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 This is a semantic change to ret_fast_syscall: if there is no work pending the function used to jump to ret_to_user, instead we proceed to return from the syscall. If we jump to ret_to_user, IRQs are enabled and we call syscall_exit_to_user_mode a second time; at this point a this just means a second call to rseq_syscall(), but it seems wrong and we want syscall_exit_to_user_mode to be called exactly once. Apparently the ARM kernel has under some circumstances called rseq_syscall() twice on the exit to userspace without side effects. ret_to_user also checks for pending work a second time under ret_to_user_from_irq, but this isn't even needed any more on the fast return path: this was needed because the syscall invocation enabled interrupts when doing syscall tracing, and all tracing invocation has been moved over to C in earlier patches. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-common.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index ece9215717143427de7572a18a6dbe620a9193e9..33bc9e7c5b32f62474724f1d47f= 97af24dba53bf 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -49,7 +49,7 @@ ret_fast_syscall: tst r1, #_TIF_SYSCALL_WORK beq 1f =20 - b ret_to_user + b 2f =20 1: mov r0, sp @ 'regs' bl do_work_pending --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 63D2F267B6B for ; Tue, 25 Feb 2025 09:55:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477329; cv=none; b=qZ73MoaeGBSishvP2FvGwRvRlfHD6+zc/t4u/ayLr/ACRDPd1RPcinqma3EnCPXIrZ4JdRFu3j9g0pPEQvGYNVJp6aQGg5aKwkOlDvFsNoU1CxyQ8K+upMduAMkLxZR3tw0l0ITrpLmwWLBLvkJDXctRm39PMrI+S2+uk1sLWmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477329; c=relaxed/simple; bh=CbbJpPkrV6dNgQPp6Cy/N2J2rfd+TtKERU6VuN6qhwk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ns3x8ioEzNmjSiO3ncBHhWFdggv/9EM37L/myATsl7fAzEs1q76KDip92QycFBq2J/tZwdkeIVxxCAo0e6ntuwgqMg6MXigY24f0WCeB5gSRbFKxI82ivHaDY572wb4qvpQAsUBIP6s6nwkAjs/IZtKsmA1qKjdHY7cmYbLfr9Q= 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=DPPMdwqV; arc=none smtp.client-ip=209.85.167.41 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="DPPMdwqV" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5452ca02bdbso5043881e87.1 for ; Tue, 25 Feb 2025 01:55:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477325; x=1741082125; 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=0l05ZDEo5bKH98lcf/z2wVpVbfg6jDUAnt9TMH5HSeU=; b=DPPMdwqVHmwPpIfC+udgeeIdbGkVRGg3URrMdg05UB02cq8ma79kCkKe9leg61WkdC o1I1HUYOSAnEeyCeyXmQMUAY6udskQnoFowKHPI4TsYM4ZVC2ErSIBNN4llK717D+2lk Sr1F1zc4oVgDYn3IPKVaDevc7i7hvx2E3eY/W07WtAXIbqOM+brYouwai3SfJ1PkPLK6 HhEynViJF0kyhFLzwxEkxMF85NGshuzBaLlAe/RIqpyIIvVrQO75zFSedyR84agdljG1 qkGhH+nhOcSh0FuWiyAS/hSO4QbITwGKCPTUdq2brdNM4pTH7A/3biVoFIJCY3T9zs7S EP9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477325; x=1741082125; 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=0l05ZDEo5bKH98lcf/z2wVpVbfg6jDUAnt9TMH5HSeU=; b=B/jyBkj5pG7fv9djFRx27ml+N85pw9qDUqEp8pFQgWgyO52cicAAQ9J+AoHyuz2nJZ Dfc8nM4SMYkFifriUhSpr8zYuUQY8//NZoC0VWNyyQAFQFtTs3jw0YyBvELCwJ0TG2iy nzjxfN4y5A3fi/EXtzWkr7C6rl8Qz8e9aaeTjORNhVV+j07r5Yth6mSB7cuHj3EPY+dA eVWBqeJKbEI7/ibe5zDFmBYGCouuL05MexGc1Ik7gbnFuladZ5oS72/5V0xL19qLKGV+ sF2Fxres+BBzZsbzaLNCYy7PAlojg0Q7nzm+wyIVE69bFja7GDSqyZTjG8V9feYOjHZi 65XA== X-Forwarded-Encrypted: i=1; AJvYcCXifqhaB/sqglEpaxFrDolT9K8PJmLkm/ZW+zqCVekzzYlE1NLEAqgJ22Cg7ExDdxZRsu0UYsqSpApot14=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1HzWJBaojwXt/prejMZ483Rg5EZdiBDyIc47FZF4S7LX8rwif ukFyWIrh4WHfVz3FCafL1lxTcB5hhKe+I6vKQQOQvB3cIB7BUMAw7vcvH5/BfVU= X-Gm-Gg: ASbGnct3wfZl6qx5y0F0fB4hewud29o4BtPvTiZRrfrnGR4S3NszX/LiT4I33Sxc6ph ydMym/dKlUtSplsB3RRd50fq5ohPqUKlF93oP+wifzNfAsJnc8ynTn39tK/PbyNEork6n8Z6Oxl bNiJE6mk5WPihM8+WLs7FATKGZTJEjZsdmsPP97Cjwd02gQ3z8IP/k60iHm0snlYvhg4svgjQe7 DhtCATT9z9sC0afjIGAulifTmquCK1qVXbdjLc8gGOLN4gMaA6z9G1A2gDcpNBBiIoV7zPF8Nnt UC5UWGyzDtS/EhlOx0iBTirUFvnZ3dl9ER60 X-Google-Smtp-Source: AGHT+IGv9PupW5hC43RAbr/CGZZGm/FFBN/oPYbjQj0aMhZodLXr8EOafbq0GSLZY9dixj7FM743WQ== X-Received: by 2002:a05:6512:15a7:b0:545:a2f:22ba with SMTP id 2adb3069b0e04-548510eb0b2mr957604e87.37.1740477325442; Tue, 25 Feb 2025 01:55:25 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:24 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:09 +0100 Subject: [PATCH v5 22/31] ARM: entry: Move work processing to C 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: <20250225-arm-generic-entry-v5-22-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 At the end of a syscall software interrupt and every time we exit an interrupt handler we check if there is work to do, i.e. if the current thread (userspace or kernel daemon) has set the _TIF_SYSCALL_WORK flag. Move this processing over to the C entry code. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-common.S | 14 +------------- arch/arm/kernel/entry.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 33bc9e7c5b32f62474724f1d47f97af24dba53bf..5385574c4339714f3d8b5ab6894= f27466b89f932 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -42,19 +42,7 @@ ret_fast_syscall: /* do_rseq_syscall needs interrupts enabled. */ mov r0, sp @ 'regs' bl syscall_exit_to_user_mode - ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing - movs r1, r1, lsl #16 - beq 2f - - tst r1, #_TIF_SYSCALL_WORK - beq 1f - - b 2f - -1: mov r0, sp @ 'regs' - bl do_work_pending - -2: asm_irqentry_exit_to_user_mode + asm_irqentry_exit_to_user_mode =20 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 47233804733752aef0f2fec6f54badeab18e98d0..0e3960844b94b14325eb00ce7dd= 791b36c43ac3c 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -1,10 +1,16 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include #include #include #include =20 +static inline bool has_syscall_work(unsigned long flags) +{ + return unlikely(flags & _TIF_SYSCALL_WORK); +} + long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall) { trace_hardirqs_on(); @@ -18,8 +24,12 @@ long syscall_enter_from_user_mode(struct pt_regs *regs, = long syscall) =20 void syscall_exit_to_user_mode(struct pt_regs *regs) { + unsigned long flags =3D read_thread_flags(); + rseq_syscall(regs); local_irq_disable(); + if (has_syscall_work(flags)) + do_work_pending(regs, flags); } =20 noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 485B8268FD6 for ; Tue, 25 Feb 2025 09:55:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477329; cv=none; b=iOho0we52ryTmEhHJ+Vutn6mSZzXkw8saNhe6FVvo6lxj+TqVxrLOO5k7r7Tjp1Bzab0x28Qpcqpx8UhCaE9QqJFXq8bVP6Zw3HoFlAjSUHChNtkD/AA1ydehnhI0rkW0QdSXyWIo6iO4KKkDXObKKmJVrRvCS9T6DxOKR3gDOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477329; c=relaxed/simple; bh=mJo/s1lXwqzSj2v+NNK3w6LLVHD5ckMvXtVwbrlja0Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mkcpzMz+GALf7GcYLpm+DuV2XbHUbQJmYWw4Wd1uAuVDZ9PwD/lzn+4ujivBMtb7JOMsH10DPJKWbg3Fh2AODhJuAgUPOCn3G32VKggvVWBeYnz1MnwiO/BXJCEDNNd2XS2o8+pLs4d/DhDD6ytqmlc/FoWr4EDoPs+vKGE7j6w= 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=wAF6d2MJ; arc=none smtp.client-ip=209.85.167.51 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="wAF6d2MJ" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-548430564d9so3040173e87.2 for ; Tue, 25 Feb 2025 01:55:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477326; x=1741082126; 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=XZE98juq0oGv0Xstj1U7TzgmKhYjLwozMlzxeXVPHlA=; b=wAF6d2MJ/b2GpKYv/lgbm1yiCD4f+6F0L6tTelnoOrL7inXT4tv2k/5vpdsFBcFH+P WtJ+xoLlWhdRao4on+rWPnCOQ64aV8L1fPRgCCAEgYZ8HJPJm/3mRFNZrlfeVwamu4wQ lFQR05FRjvNFiflYAnUKx7r29aiQfEWJBA5Gy+LayMguEnFVQOUGFnn2Iphrt1NGcTlt Q4M0x++KwNn4Xrstbm+EAKisyDgMQUEnKY6V2zR7mlUOFIA/CyQ7aCz1Al1taLzNoYJw gyKYcPoNQ6mEmTY8MXSQqquXINI3hT5hxLGGxR7tDKE6g/M3AtQEZ3Xv0Y38sEOQoCHX t0xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477326; x=1741082126; 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=XZE98juq0oGv0Xstj1U7TzgmKhYjLwozMlzxeXVPHlA=; b=lusGceZeJj8f1QZiTkca9wZ45v8LcSJZdze8ceDe2PSy0jSLiFnul+db/VrW8W8HwJ EUgO/M3paRhfBGUMCy2tWuwDDqBQROq/63mAf+eTPgPYAADhDs3d9syMJQWkeF1CWGVh v47AZohs0lcBk91O5nqDyiFeY09B3rvQ4neOlnlmqqTBrsWkQxL/0qnf7FzETdfyR31G w9foFz2vTfxdxIy8CIVtMnMJ5GlfCaaOLiJBRJOOpWcFLPjCJa3Fel/gtb1QCZddEeNk tG7dYJL3cPVCbdDWtIZAb33l5BK2L4xrirARwnbdK/sH4lKRoztbzxfC5JMZbUKpIi9T QljA== X-Forwarded-Encrypted: i=1; AJvYcCULjocvrn9Gjq9A1QgjEma2AQUAjR/kTuUBjNl09lYkzCbxW9ITQFhfwf317cjpDkXrGoS3V+kYKLFVDvk=@vger.kernel.org X-Gm-Message-State: AOJu0YwWGQEhY9d2BS43ShP018xoH1DmSwzEE/e7gNttmCxHqcgzch/F jttY3aDGgMrmPN2gRbMSytQW+ODJl2B0k0W//gL0F4GVE2C+xMsmZhyEahSQovE= X-Gm-Gg: ASbGnctZ/GV+UbHbY0wUfuEPLg01j5Lzw/hElR52gYZEyTQnLMdVfq2I0sod5ygTuV6 vSATNwe344FpE91SiD3LQY3uYLeFF3KftxuA7D1a2d/6VBSINev4lYcOd+bTMcQBF9xuMLJ48cD +CUUOWp0fvFIW0ERBCS2dFKSk3RyRjaOsxUN5JXs+O6ilHfa4DAWvDaJj/xzUFaj+4QDNp+azqL tEKqpHhbJFrc1EyyaPTW7atWStZW7jsJ4cmjEgaeZhHXFtbyqtpuqHsydT4xiLv/zCYrKaH/0jg tA2MBpaBPUaWZR/TFoUDPbB54TwbX3tqNOY9 X-Google-Smtp-Source: AGHT+IHv2LyiSeosodUrcS8c6R5xpQiyNyga8e1Qfb63OSq/UTKN+o0/2yMM03TOk0Z2Siw/VpkP2Q== X-Received: by 2002:a05:6512:3b4:b0:548:d4e0:82bd with SMTP id 2adb3069b0e04-548d4e08399mr321337e87.17.1740477326469; Tue, 25 Feb 2025 01:55:26 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:25 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:10 +0100 Subject: [PATCH v5 23/31] ARM: entry: Stop exiting syscalls like IRQs 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: <20250225-arm-generic-entry-v5-23-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The syscalls are issued as software interrupts, and to this point they were sharing code with the other exception handlers, but this does not work with generic entry. Make syscall_exit_to_user_mode do what irqentry_exit_to_user_mode does at it's tail, and drop the invocations of irqentry_exit_to_user_mode from the syscall path so that these are now exception-exclusive. Split ret_to_user and ret_to_user_from_irq into two distinct execution paths. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-common.S | 14 ++++++++++++-- arch/arm/kernel/entry.c | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 5385574c4339714f3d8b5ab6894f27466b89f932..e2ac6d3216b6828d948d60c424f= f95ccdad12331 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -42,7 +42,6 @@ ret_fast_syscall: /* do_rseq_syscall needs interrupts enabled. */ mov r0, sp @ 'regs' bl syscall_exit_to_user_mode - asm_irqentry_exit_to_user_mode =20 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack @@ -62,6 +61,18 @@ ENTRY(ret_to_user) enable_irq_notrace @ enable interrupts mov r0, sp @ 'regs' bl syscall_exit_to_user_mode + ldr r1, [tsk, #TI_FLAGS] + movs r1, r1, lsl #16 + beq 1f + mov r0, sp @ 'regs' + bl do_work_pending +1: +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + bl stackleak_erase_on_task_stack +#endif + restore_user_regs +ENDPROC(ret_to_user) + ENTRY(ret_to_user_from_irq) ldr r1, [tsk, #TI_FLAGS] movs r1, r1, lsl #16 @@ -76,7 +87,6 @@ no_work_pending: #endif restore_user_regs ENDPROC(ret_to_user_from_irq) -ENDPROC(ret_to_user) =20 /* * This is how we return from a fork. diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 0e3960844b94b14325eb00ce7dd791b36c43ac3c..88a7a699306ab61153d57333c26= 266b9161f5466 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -30,6 +30,10 @@ void syscall_exit_to_user_mode(struct pt_regs *regs) local_irq_disable(); if (has_syscall_work(flags)) do_work_pending(regs, flags); + + trace_hardirqs_on(); + /* This context tracking call has inverse naming */ + user_enter_callable(); } =20 noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 5A120268FF0 for ; Tue, 25 Feb 2025 09:55:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477331; cv=none; b=jp8rYtQBGf/PExIFFqXUN8fPZRdlplkuHAuBldUNbfUJIjwo2Jd08hmUcGh96aQ12IAMc9kQKJ7YQpN1MjTpRINSAA1z4+9CqHlPo7/FKg5hAmg4LeH4f6LPAenwG1MyQEW1Xf3hRR9MEVPmXM9KjDCuobVI7CvO+0Npc6py0ro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477331; c=relaxed/simple; bh=Z+Wrfq7Yv7rlYd2Kd88tzeM0tTIuCh/X1bFizJhotL0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qeh9qrG1/fooChuyfJwPjEGzeqm0CEP/2api4PIyIC9LhLrrlpI7kAsAXrznTCEwvBb7igw/MznpQbbqzBY2r27TNwSjk8IMqPxN4ok2LnqpioQ3wiz42tjm8T9+R1h4TMKAvS15F0jUlkyRaxFwLYt9mk5IzMFY6Jy+ZPocPtQ= 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=Q3ixEoFq; arc=none smtp.client-ip=209.85.167.48 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="Q3ixEoFq" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5452efeb87aso5417804e87.3 for ; Tue, 25 Feb 2025 01:55:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477327; x=1741082127; 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=B1th+DnYZSKT2go08vz+Ftvr7FlZ7mKXRvbFUdOlbPI=; b=Q3ixEoFq1PBTv5iSfg9VfGOnFo1CcL4jEDZZE+OdQrazS22SsJ4sgZCKTa7UtZZC40 Vq4HXx6nuM9G+e1DkBi4kN/LijtOrnd9hw6ZWLvNq86tvI+ahc9HDFKORxjF/TQWnI16 YJxlmOncxi9ij4j+RS1I8k5ttNEjgDf15cCUpWjjq6efw00eWpSC5AqgKOS8ap4M8093 pUy2xYH9yzDLtMNBEjaWao5P7kNV88Fibfy+J2ATQmwjuW2956soQ7GWEMgJKOifH7lB ruXL1sQwL6s4zRoWRsnRLvjfJpKaqSHv2R96FG1dik3LPbQKVgRZOxAohgxQe6/k5HQN Yu3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477327; x=1741082127; 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=B1th+DnYZSKT2go08vz+Ftvr7FlZ7mKXRvbFUdOlbPI=; b=MePax/yhmhGd9sPyfInw87x4Vri+IWwrYIAsPrzpAAWqJnjBX1YwWAio7H+Ny+pJSJ 5Fmhv9NnKjlbfUnbXzIhzq9KLtMU/gQAOS0qw7O96BEY7p0MIf2Gl+9TfFDaz3U/Bbyt aT9511VK6iVq19bTNBrwopHtUP73prICZxXUTud29ycA045bRbQC11S5+6K8t7fV5HMs IIy61MNkw2oH6TRdaTPymX/UAUsUDGNwU3vs5jSGj3r7ghwOeyZ9kDOmIAwc38LcuLtW lkQ89CvwgUa4R58OBBRfaj34/uzGi9h6WIEIhS4WGQVOSzDkRi9oFEl5VSKCo7798l/5 eNZg== X-Forwarded-Encrypted: i=1; AJvYcCXYEgjYWTAhEsNXfAc+YpDOtYUqUaRPuB6AbfqNuR7h/b7USFfeAAMPZf4kOgkqkXL0+JjZXnyHXoCD1g0=@vger.kernel.org X-Gm-Message-State: AOJu0YyY8GINiYvKmak1lgwBSbnc5O/8c+5O0Jd1xx6nWLn9J6e7uboP 5nhOewhnC7nMzRx1Y3XHVn/7pzejPHF/3PNLZnFs3AYOEBUkzrf4iWrOinO9BNU= X-Gm-Gg: ASbGnctVPW1Au2Ipghzg9I5h8mgR+DKide8vP9OySadgh0yAFlf790G/2//J7abghvR wo48FRrn/I23YPFNjdv6YnwKcl/gmFdBhRHyL91IMhgpHPtHv+ff8Elb62SaOdRiiQ474Qz5ewL GyUlspFlO3vIF9lSPf6FsHX+mY/NPovq1/1avxijE/8sGVAmt0eb55uYDL4vtc9wINUQSdSVM7w j9GSHqn4PIuPklXpNUJCe2UTcazVq9ZlkFwgtmY0ngZgvRvsb5t2wCE594TqEL2TFzHo46BvAnB uTXo+KeDDFZE3THCTRQFISi5oUHU6wISsHMR X-Google-Smtp-Source: AGHT+IFJojS9YcdzZoZZ2a4fWY6El/OS+wlvMSzdOOSRtg7jEpLZV7xetDwt8bSZ007hZm6HmPnT8g== X-Received: by 2002:a05:6512:3b86:b0:545:fad:a747 with SMTP id 2adb3069b0e04-54838ee28e2mr6423382e87.5.1740477327533; Tue, 25 Feb 2025 01:55:27 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:26 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:11 +0100 Subject: [PATCH v5 24/31] ARM: entry: Complete syscall and IRQ transition to C 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: <20250225-arm-generic-entry-v5-24-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 This moves over the last few lines of assembly to C. The subtle change is that in return to userspace from syscall (SWI) or interrupt, we need to call do_work_pending() as soon as the thread flags are !=3D 0, just checking for work with _TIF_SYSCALL_WORK is not enough (the machine will freeze if we do that). This is because do_work_pending() does not just handle work: it handles _TIF_NEED_RESCHED, _TIF_SIGPENDING, _TIF_NOTIFY_SIGNAL and _TIF_UPROBE as well. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-common.S | 13 +------------ arch/arm/kernel/entry.c | 19 +++++++++++++------ arch/arm/kernel/signal.c | 3 +-- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index e2ac6d3216b6828d948d60c424ff95ccdad12331..6b0f86786a7d9e656ecbe8c741f= 2edbcbafd2915 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -61,12 +61,7 @@ ENTRY(ret_to_user) enable_irq_notrace @ enable interrupts mov r0, sp @ 'regs' bl syscall_exit_to_user_mode - ldr r1, [tsk, #TI_FLAGS] - movs r1, r1, lsl #16 - beq 1f - mov r0, sp @ 'regs' - bl do_work_pending -1: + #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack #endif @@ -74,12 +69,6 @@ ENTRY(ret_to_user) ENDPROC(ret_to_user) =20 ENTRY(ret_to_user_from_irq) - ldr r1, [tsk, #TI_FLAGS] - movs r1, r1, lsl #16 - beq no_work_pending - mov r0, sp @ 'regs' - bl do_work_pending -no_work_pending: asm_irqentry_exit_to_user_mode =20 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 88a7a699306ab61153d57333c26266b9161f5466..d7fdb9df33312dd2a914b59512b= 701748f33b597 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -6,11 +6,6 @@ #include #include =20 -static inline bool has_syscall_work(unsigned long flags) -{ - return unlikely(flags & _TIF_SYSCALL_WORK); -} - long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall) { trace_hardirqs_on(); @@ -28,7 +23,11 @@ void syscall_exit_to_user_mode(struct pt_regs *regs) =20 rseq_syscall(regs); local_irq_disable(); - if (has_syscall_work(flags)) + /* + * It really matters that we check for flags !=3D 0 and not + * just for pending work here! + */ + if (flags) do_work_pending(regs, flags); =20 trace_hardirqs_on(); @@ -45,6 +44,14 @@ noinstr void irqentry_enter_from_user_mode(struct pt_reg= s *regs) =20 noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs) { + unsigned long flags =3D read_thread_flags(); + + /* + * It really matters that we check for flags !=3D 0 and not + * just for pending work here! + */ + if (flags) + do_work_pending(regs, flags); trace_hardirqs_on(); /* This context tracking call has inverse naming */ user_enter_callable(); diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 03b20637a2e1ca6f327223c9132915a97a9c4697..a39ee14ec5b70b3738ecef53770= 9326ef1e8217c 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -598,8 +598,7 @@ static void arch_do_signal_or_restart(struct pt_regs *r= egs) return; } =20 -asmlinkage void -do_work_pending(struct pt_regs *regs, unsigned int thread_flags) +void do_work_pending(struct pt_regs *regs, unsigned int thread_flags) { /* * The assembly code enters us with IRQs off, but it hasn't --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 8654B2690E3 for ; Tue, 25 Feb 2025 09:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477332; cv=none; b=G0Fgu/EwdLVuUZeTgtXyBvR/hy+6b2DChexTZ0qvtgf39Fa96K9PX0wwfuucOzQzl1qEKyPYdgh+axix/7dLBDjgTJ6efLQETPTJbR6vOEGVQqKXhtHfhYKN5g+zn2tXzGDrNPlLu0qNUezv6hxekv1hIjqfIhQgRiifk56zA7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477332; c=relaxed/simple; bh=kbyT7iCijaIdZIkI/izvFYQDY/XRcdi53hyF8Dt7x5M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kxkw2yLJsYshtdEoRoluGefnl6pTUE27/7SW6use4Z1OPI5RwgT/PryCAeBOysJVC1Ui0qnZPv2wGoSLQ0scaVKlJmiyhfsQ/9Er7cv2iER5nYkRfPwS1AhBE//i8jJilGHVUOLDa08U74j4XFIT5Suvx7HiSA9dTywSO3f2HMw= 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=hysZryTy; arc=none smtp.client-ip=209.85.167.50 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="hysZryTy" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-54622e97753so4948806e87.0 for ; Tue, 25 Feb 2025 01:55:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477329; x=1741082129; 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=NA+LzTmhZnGJ5F/6+si6C2L1JDWL6V8/wsE3A9CcZck=; b=hysZryTy6wY3YUkps7Iqn5G+VKRI5sIVNim4b8XuYuV3An0VLR/NF9rCbjpHCwLaCM oqYaCo4NoxvO4vuNMJMbfhlhpiaNvsme/uNfjViHQnF4v0K18Fc5FwyiyvtQEKYiYaDZ +rSZn7QTtpHsFKy5J8yaIduwq7w5NG6XWAiIaSTZ2sDPVlVCSfTE2Fe31e3ENGpMFSYK qKxtzZxnvEx1EpPEExMG86V19tm/uE555byCPe0IoRFeHQr1GOZdE7v9/IMVHvMdPal4 abVn3C0uBt9U42rOopC4qJKPtHUwywqoxg3s/1n/BbDS64KVGN0DMPZkOd/k/NcPZMB1 mBow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477329; x=1741082129; 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=NA+LzTmhZnGJ5F/6+si6C2L1JDWL6V8/wsE3A9CcZck=; b=PpEQrn1r6Dq+z0GyEm+1uiLPS5vaJBRlAUA8GAEkjZZKhmVJ3sUELIgyUBIkpOqQmC aoy8XBKgRs05yENBrjL+QS4GLDrtANFmzQmOHiCvm1/l//KHu/vWjRsT9vbV/uIUmpVQ kATfK5/EL9VeTk6HLdi+meAsRun3+9OQUSep9Mi6CLLyZ+li66WfaNXbRbANcyzDMemk kR7KRsQNsnq1+HDfXtPhlhgvAKxn21mFcFyusOxwFjp4p7ypCrZcFLe7UdoTJz3XZKqb eBTuGZpi0Mqk1tgoURnzJRnj87LkyT2L16esoUyAneSbS9RD8FgKh0HDAohx5Qhf1nEO IcCg== X-Forwarded-Encrypted: i=1; AJvYcCXWJ//72KOWPLVtlp4FvQHNfpRAGr0zTWUy0CUtFT6EarAfTBn2Uh/NvlEbghJb8LbYu6IX2PsOLZwOkWM=@vger.kernel.org X-Gm-Message-State: AOJu0YzdnmzkDJVpvmtU/Bqx1qMaZCq6aVSgebeCu56dhe1eIRKwcFkx ue3d49MdBbdU0EeSy/MISxNKWC2vNBG25mKtgoQAHTTNZRL38LX7dXywqEjzCfI= X-Gm-Gg: ASbGncsfA29l7SzAsTevd1QbA5yj/hnjE5VuWDg7IwolohoBCScFzyw0ueNB5YrAl3j SKpxswAeQlXJEu38y85aRvjxBqlsGtLjkQHOybFZSzQkPEidLHZX9tyJOENXXp9Gl2iFHCRJLlH dC+Qg0T1UT67J0MHL3OxJGZiAAvpLiQsG5XYv8NnbNH5PwRfMNMWQi6/Co02Jg1wksLEZFxetB+ rD9NhjvLZhrqO3XRAxN8jhKhH2sKvcPiDQZVcTPWPKXIh4/Qd1XueCTabD7s9w/xRp0Ty/XVxnU lJy3h2YWqd+Au93m9whsvn2WwAF3/if+jmby X-Google-Smtp-Source: AGHT+IHoExRUiD3Ptt8xtogX36HpctNeFu9+M3wDkC7ot0V3ilLsDYUXt+l8IOflXZFx+RQVrnavqw== X-Received: by 2002:a05:6512:6c5:b0:546:2ff7:530d with SMTP id 2adb3069b0e04-546e5f76a64mr6495854e87.25.1740477328590; Tue, 25 Feb 2025 01:55:28 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:28 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:12 +0100 Subject: [PATCH v5 25/31] ARM: entry: Create irqentry calls from kernel mode 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: <20250225-arm-generic-entry-v5-25-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 This adds a few calls to C when exceptions enter/exit from the kernel itself, so these can be used for generic entry. Signed-off-by: Linus Walleij --- arch/arm/include/asm/entry.h | 2 ++ arch/arm/kernel/entry-armv.S | 3 +++ arch/arm/kernel/entry-header.S | 5 +++++ arch/arm/kernel/entry.c | 8 ++++++++ 4 files changed, 18 insertions(+) diff --git a/arch/arm/include/asm/entry.h b/arch/arm/include/asm/entry.h index 8b8cc9a1eefbd00dd75d4e344576fc184a413768..a78bc5054b093120e903f08369f= b8b1a9feb7f81 100644 --- a/arch/arm/include/asm/entry.h +++ b/arch/arm/include/asm/entry.h @@ -12,5 +12,7 @@ long syscall_enter_from_user_mode(struct pt_regs *regs, l= ong); void syscall_exit_to_user_mode(struct pt_regs *regs); void irqentry_enter_from_user_mode(struct pt_regs *regs); void irqentry_exit_to_user_mode(struct pt_regs *regs); +void irqentry_enter_from_kernel_mode(struct pt_regs *regs); +void irqentry_exit_to_kernel_mode(struct pt_regs *regs); =20 #endif /* __ASM_ENTRY_H__ */ diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 3cd5a80b47758867d1db6c3971030370bca1551a..f64c4cc8beda6bcd469e6ff1a1f= 337d52dbbaf9c 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -205,6 +205,9 @@ ENDPROC(__und_invalid) get_thread_info tsk uaccess_entry tsk, r0, r1, r2, \uaccess =20 + mov r0, sp @ 'regs' + bl irqentry_enter_from_kernel_mode + .if \trace #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 51c7f93c1ded1db56f173c7aaed8094ef011ff5a..49a9c5cf6fd5fbb917f2ada6c0d= 6cc400b7d3fb3 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -210,6 +210,7 @@ .else @ IRQs off again before pulling preserved data off the stack disable_irq_notrace + #ifdef CONFIG_TRACE_IRQFLAGS tst \rpsr, #PSR_I_BIT bleq trace_hardirqs_on @@ -217,6 +218,10 @@ blne trace_hardirqs_off #endif .endif + + mov r0, sp @ 'regs' + bl irqentry_exit_to_kernel_mode + uaccess_exit tsk, r0, r1 =20 #ifndef CONFIG_THUMB2_KERNEL diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index d7fdb9df33312dd2a914b59512b701748f33b597..674b5adcec0001b7d075d6936bf= b4e318cb7ce74 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -56,3 +56,11 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *= regs) /* This context tracking call has inverse naming */ user_enter_callable(); } + +noinstr void irqentry_enter_from_kernel_mode(struct pt_regs *regs) +{ +} + +noinstr void irqentry_exit_to_kernel_mode(struct pt_regs *regs) +{ +} --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 7FE0B269808 for ; Tue, 25 Feb 2025 09:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477333; cv=none; b=Iblwnylc8bnOuJRQ6ufo96atpEIzunrpCuAR1AQ6b4vjktt7nbd43Rw0WzPik2EkMXdVevB87LmzpTicvaBHCQ7Y5lnfltskl81LkhC4MpduhQhcjORWoy7K5Po9XbwdnKW59iKA62gaDbumK062oOFCVDdwSiQUuWnER0Hx/l0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477333; c=relaxed/simple; bh=VRNz3ZLBzn0Qq8dlDRAbgJ3JgliMtfalkGTG4vw4Tfk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oSwPkar4Xf+MyzFIDAf4qYUZxyJHfwvscvRngXmNFTKWDwNnIrSS4fy2KTFja1WleoOoILaPIxgcF6Hh6e64nJQwGfy0SPKcPfUK65gBj69Hpc/HO/hBD7+GvLvzAfEDibQi3kwJiWzT2KWk7bn6/ssuOwwYspRI9K/m1ReI93U= 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=vuJkRB2f; arc=none smtp.client-ip=209.85.167.41 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="vuJkRB2f" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-548430564d9so3040222e87.2 for ; Tue, 25 Feb 2025 01:55:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477330; x=1741082130; 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=8L1+xbNej+7+BbJW1uipXHwDEUpYT2HP3XoeW+FBwgo=; b=vuJkRB2fBiIFeN13s5faljfnOS7b36quHIri8MltPjXtTMCi3H3nxXU2s0rXdmPHNM 9sTNuDfzzlqtEauwqhynqgp5/Rrg1lWqJYho6mVJRZRyAhDLrCKHVq0ldDKNsKY/rJtD 75lG0Gto8wfGkYKuN/8d+AO0vOn1w8vaVOW75+VZ17TY7T5LefXb63esw9Z4bgMvXhZe rVM1R66NDEldBEni3I2Djy11IV/RXiSbH8BjfDLyuV9S95OiT9eFbXzyRCxZJ68QHZAx fTWO5eiaJ+LKvGCBtTyyvvhELpAJTJjt1SwIxLa0ch5EWpb4+CGgoPIK/3e76BPi39gL wtBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477330; x=1741082130; 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=8L1+xbNej+7+BbJW1uipXHwDEUpYT2HP3XoeW+FBwgo=; b=L4a1XO8mturtLqZUffhF9CHLjXpHiV3XlwJA17Zsvs+wBjIPMqWXp0uxP3X0hPugdj Vfq6nuWmfzbb0MZQMs82F0hh+XbsjjaU+eqj4fsXwCxYVXyqPWec1E+uNaJ8v2S3gzTS nBns+T930o+5prLUJ2000a10mLQOljd5IyL9CWWvUvt9xaOeW/SpDLnHdYcwU5zHuOQE a/MfuF9XnL7nRW59cPDL6ZJndmCg3DSyvfMT8n5yLgqHfi5rV+OjRP61jD2azVrto2zh fjWhExWUiqJQC2rr41Xt930rnFctLLeYRxuyZ4PrLu1xOj6dRM07v0ZOYfOio9atEHBF gDNQ== X-Forwarded-Encrypted: i=1; AJvYcCX4z4kNC3OR8SPOzm4QTpQ17hCAHvwAq0hPOPNrU4bBKBGFxvkNFWlN3QbQQ1qbnDYSLykQBKWD6Ff+0LM=@vger.kernel.org X-Gm-Message-State: AOJu0YxaYd9PVEa9C4LJIv9e7+Q8I4w7u8BDCNVLetaHPM2sxxSLXLn1 ol4YNAP4IFOqD2GcCEgSvNK8n/JHSM2Na7zPVIK74gwztSdHN3iJKkfG5Tal+5k= X-Gm-Gg: ASbGncv65cUnkUCKt5fPc6zmY63BcCILPVP1tmzbr6/Ay+ZhSFj6c/j8aHXQxlChNIj BqZ9vCQ/JeUMOeuLk7FpIWVIeLk9pbkj1SwgQbLCGkclBptjicNO+paDJ+xLbj0Gd4W8gmW9OAW gfG64NPyDq/Bn5rXsdWnBNiRWH0sThkZsQ0nEo/b4qWaFwl4gpgbXcFLaIAfhHBhMri+2j6qoza ++AHhhgmLuQuBWRs/zwgGCio7KoG4C5qzMQ6oYquV/hy9z6CveMV6rT8JlEHWkTvrHgyz045Kuh lqMgnw55DNPP+Z8bbUwP4euYPh0iQxHVe+QQ X-Google-Smtp-Source: AGHT+IF7xfl9B7/xJ8k+iPG9dONRxwPTx8ewhI6YDPJcZwPMf++LnRv+shbC0/r1nL1MG22ob6N9GA== X-Received: by 2002:a05:6512:3d8a:b0:545:ea9:1a11 with SMTP id 2adb3069b0e04-54839129bc3mr6152301e87.5.1740477329613; Tue, 25 Feb 2025 01:55:29 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:29 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:13 +0100 Subject: [PATCH v5 26/31] ARM: entry: Move in-kernel hardirq tracing to C 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: <20250225-arm-generic-entry-v5-26-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 Move the code tracing hardirqs on/off into the C callbacks for irqentry_enter_from_kernel_mode() and irqentry_exit_to_kernel_mode(). The semantic difference occurred is that we alsways check the PSR_I_BIT to determine if (hard) interrupts were enabled or not. The assembly has a tweak to avoid this if we are exiting an IRQ since it is obvious that IRQs must have been enabled to get there, but for simplicity we just check it for all exceptions. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-armv.S | 13 ++++--------- arch/arm/kernel/entry-header.S | 19 ++----------------- arch/arm/kernel/entry.c | 5 +++++ 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index f64c4cc8beda6bcd469e6ff1a1f337d52dbbaf9c..2a789c8834b93475c32dcb6ba58= 54e24ddd8d6e9 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -158,7 +158,7 @@ ENDPROC(__und_invalid) #define SPFIX(code...) #endif =20 - .macro svc_entry, stack_hole=3D0, trace=3D1, uaccess=3D1, overflow_check= =3D1 + .macro svc_entry, stack_hole=3D0 uaccess=3D1, overflow_check=3D1 UNWIND(.fnstart ) sub sp, sp, #(SVC_REGS_SIZE + \stack_hole) THUMB( add sp, r1 ) @ get SP in a GPR without @@ -208,11 +208,6 @@ ENDPROC(__und_invalid) mov r0, sp @ 'regs' bl irqentry_enter_from_kernel_mode =20 - .if \trace -#ifdef CONFIG_TRACE_IRQFLAGS - bl trace_hardirqs_off -#endif - .endif .endm =20 .align 5 @@ -239,7 +234,7 @@ __irq_svc: blne svc_preempt #endif =20 - svc_exit r5, irq =3D 1 @ return from exception + svc_exit r5 @ return from exception UNWIND(.fnend ) ENDPROC(__irq_svc) =20 @@ -303,7 +298,7 @@ ENDPROC(__pabt_svc) =20 .align 5 __fiq_svc: - svc_entry trace=3D0 + svc_entry mov r0, sp @ struct pt_regs *regs bl handle_fiq_as_nmi svc_exit_via_fiq @@ -321,7 +316,7 @@ ENDPROC(__fiq_svc) @ .align 5 __fiq_abt: - svc_entry trace=3D0 + svc_entry =20 ARM( msr cpsr_c, #ABT_MODE | PSR_I_BIT | PSR_F_BIT ) THUMB( mov r0, #ABT_MODE | PSR_I_BIT | PSR_F_BIT ) diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 49a9c5cf6fd5fbb917f2ada6c0d6cc400b7d3fb3..cfaf14d71378ba14bbb2a42cd36= d48a23838eee1 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -199,26 +199,11 @@ .endm =20 =20 - .macro svc_exit, rpsr, irq =3D 0 - .if \irq !=3D 0 - @ IRQs already off -#ifdef CONFIG_TRACE_IRQFLAGS - @ The parent context IRQs must have been enabled to get here in - @ the first place, so there's no point checking the PSR I bit. - bl trace_hardirqs_on -#endif - .else + .macro svc_exit, rpsr + @ IRQs off again before pulling preserved data off the stack disable_irq_notrace =20 -#ifdef CONFIG_TRACE_IRQFLAGS - tst \rpsr, #PSR_I_BIT - bleq trace_hardirqs_on - tst \rpsr, #PSR_I_BIT - blne trace_hardirqs_off -#endif - .endif - mov r0, sp @ 'regs' bl irqentry_exit_to_kernel_mode =20 diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 674b5adcec0001b7d075d6936bfb4e318cb7ce74..1e1284cc4caed6e602ce36e812d= 535e6fe324f34 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -59,8 +59,13 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *= regs) =20 noinstr void irqentry_enter_from_kernel_mode(struct pt_regs *regs) { + trace_hardirqs_off(); } =20 noinstr void irqentry_exit_to_kernel_mode(struct pt_regs *regs) { + if (interrupts_enabled(regs)) + trace_hardirqs_on(); + else + trace_hardirqs_off(); } --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 8906F269826 for ; Tue, 25 Feb 2025 09:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477334; cv=none; b=Dxbx9LUmpsY4Ne//rnJHKpqymsEh+1zdyTqmgyUDm9/5T2FehqY+qg7uW9awVfHbToiTdh7yWi5k8cWG7LYXioqON2UB8t/nm+LSItIFWW/tLIaisqJKrzjOBf2xDtm2tFG1bVgOKAqGFx7bOW1GqNYtwxzrBTmFwqLr1nrFv+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477334; c=relaxed/simple; bh=RRy9IfHS8ViSPW/Yi1kyEfOO/viJ3F6e0+y9lZRUOlM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bp7NCQqb7r5FeN4NEVV+E69uP4LrIUZIPvtizwSkdG5FGItiffqczlAd9LIgOgrULLRDfiekFhfaVMAlqVL8c9boGPLZjBfCC5hEc8DchX8omVu1hTxFIxvhRjXzwMUykWbzYL2jieTIceZrPrnaHlZ3lD3ydHC9N31i0s4SbhY= 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=Ak+6+jnv; arc=none smtp.client-ip=209.85.167.48 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="Ak+6+jnv" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-543e4bbcd86so6219072e87.1 for ; Tue, 25 Feb 2025 01:55:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477331; x=1741082131; 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=PgPYwUz2C3jq2K678fDOOKopXFthUCF1z0KBZvQ8kgo=; b=Ak+6+jnvdzsJhnwXWAaomXqlxhXNUk6TMeRS9g7uaGyjQxDS2KmUQvh7EvltTH4BfM 20ziCLTtEI8HP3Flh7mu8qJ58zRgQnH0K4AWZ5d3eO5OOIIxqUjdjjDjdSGrT0wDk4KT vpl2V42SrBQuav07ZKB1LTOh7npTHk7RfClU5GGo32m2bFHAgho9GXQIVhsRRcTywe5r eHjJByFOrxnkC9JoGzQtOOM898o1Q7OjLsHWyh/2rpVVu8n15/6ELFzXEhz+GdNC6W8B UsRynY0qEoTN15hF11ibeiuxEM8mvSdaiWoetS+OYJv9d3+MqVKpSdgm2DLaBSnqCVpi ju+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477331; x=1741082131; 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=PgPYwUz2C3jq2K678fDOOKopXFthUCF1z0KBZvQ8kgo=; b=wu4MYCqghqg8ItZf2sUupx3iat4Bp9ma9tB4l8Q5gHIMUS4FyvS/R1ZmY4SVqYGIGh hiEhl+JgMxtrDB2nxm+ZOic0i0jWGFQbtK90NoP6y8sTNwG1Ily86uxS/BSLYUqWwAez c/OEoivtJNmA3TutfSOhOXkpErDVe5y8KCMbXd0Y2+rfhLILj6J+m8s4TUrbmPyFPUYQ ygb1miiSisZYIubetNyYhp3uMorFWYnzLbk0vNukWmWaSaNzlHXEaRh98RjpbPmDIc8m AWKDrBRCOx8h767hupcEWlABJdiKaK5nURmO3IWPG+k83hNZn6hFvv+xB9zShH8FZHME 5tLw== X-Forwarded-Encrypted: i=1; AJvYcCVWLIwalAZ68kQvjbD0NUqYm0gY3513lLIQCb3/y4TMqHVeaTUDVCy81zw3Bhj/ssBOfPXAaB3VnMPfo8M=@vger.kernel.org X-Gm-Message-State: AOJu0Ywcd3JpDoVW36IG+74DKWJBJ9rcPSRrSfhKsDbxaVYk6tda9bST SGHlj7/gXm91FCU6uyUGwUBCMFUqF69W65tKpvuhEXdwxPXRPVlTzUonxYvqPOs= X-Gm-Gg: ASbGncuEkplIb0g46GbKWvHE5qSAM1XKwDBctQ3SxTIUJOSbbPbbzDdvFP81DVTnRzC 8kJtS95faz7EGULoxoYiurYg0iMe++v+9SViXwbIYSxz5FLFd1nV8sCEFJw/IbGhR5nkFJPXvlb skZa2aGzBIoUhy2D1zK6xJ2KZgbUfgMb4WcsVVGWZhjvsBLc10A9qh7VeH4OTi+qkTcXtz0W1F2 sFYwv+YcADgPG+VbnVCNdVZkHhlhF57i9+d2SnlCYBAPimPaByLzv0ykfM7oY2u0x3WseL52jJn 8uBPnzHIkSQfSK4GrGsnGlr4NaHBZefQsMUQ X-Google-Smtp-Source: AGHT+IHrYBKEgwrOsqtabCf77riVA6wTLLPZltwvy4MPKuhYyJsmmbuvXTyEaXfB9oGzNDCBGFjJZw== X-Received: by 2002:a05:6512:3093:b0:545:2f9b:7589 with SMTP id 2adb3069b0e04-54838f79d15mr5814906e87.50.1740477330711; Tue, 25 Feb 2025 01:55:30 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:30 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:14 +0100 Subject: [PATCH v5 27/31] ARM: irq: Add irqstack helper 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: <20250225-arm-generic-entry-v5-27-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 Add a helper to dispatch IRQ execution to the IRQ stack: call_on_irq_stack() so we can explicitly issue handle_irq() on the IRQ stack from a C program. Cc: Ard Biesheuvel Signed-off-by: Linus Walleij --- arch/arm/kernel/irq.c | 6 ++++++ arch/arm/kernel/irq.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index e1993e28a9ecfd80b55b2677253ac582467e6c14..f99d6b24d8ff56f901e4a817c61= a1e57b7e532cc 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -43,6 +43,7 @@ #include #include =20 +#include "irq.h" #include "reboot.h" =20 unsigned long irq_err_count; @@ -71,6 +72,11 @@ static void __init init_irq_stacks(void) } } =20 +void call_on_irq_stack(void (*fn)(void *), void *arg) +{ + call_with_stack(fn, arg, __this_cpu_read(irq_stack_ptr)); +} + #ifdef CONFIG_SOFTIRQ_ON_OWN_STACK static void ____do_softirq(void *arg) { diff --git a/arch/arm/kernel/irq.h b/arch/arm/kernel/irq.h new file mode 100644 index 0000000000000000000000000000000000000000..80dd5bfe6403d68fc62fab30666= d5645748d329f --- /dev/null +++ b/arch/arm/kernel/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +void call_on_irq_stack(void (*fn)(void *), void *arg); --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (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 D469B2698A2 for ; Tue, 25 Feb 2025 09:55:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477336; cv=none; b=G08ccdpx7H5wEC1PmHl4r6k6H4sLnHfri+dseG0opIw014AmMpste6Vj4y/ddpGptAh+tmVy/CFF3uRtpmcVUQSszpxHsau7aR7U7gnJPkEzTWbql6nnV0NmBEOrqo1JH8n4UX7oqpnZ4Hu+53GSZ0PRtKC9cu+2P3/U+v7wJLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477336; c=relaxed/simple; bh=6INxnIe+xrzxI+Vwg3aF3lDkhPHGsChWklsSxcPftSk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H+X8vYbr5gJwrcJyQSdLiL1UV8svWJfyABVHPSGuF7S26ggv89UvNN7Z/rlxRvssKjJsmYaWcRmt77UVsqUJZ8dPTWz2SoES7WvcLM8DIms/EpssNbVE7ry2fo4zj8erG8sRcEGgBq63z6FnQPntwAmWKPbmnmNcuxo+b0ez+h8= 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=QYMA07ox; arc=none smtp.client-ip=209.85.167.52 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="QYMA07ox" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-54838cd334cso4363980e87.1 for ; Tue, 25 Feb 2025 01:55:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477332; x=1741082132; 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=f3uDcPAUn17u5guwAmKffFv3WeYri61KKtnRD7KLFFU=; b=QYMA07ox9HD2WsqVn1/fAuShNj91xxKYAKFs0r58o5raxwkHvfNBrD5sYdqUrGlgor d/TBexmH0RYhEYyNGMe0ftPu9bK3IlHGURAA0YHOVwrweMI7UzKSDbTTegIeaZ1pih4i 7F1RfsBKKdUXvTzyxWVySB0N+SgSqgitGUVFmYXqEyOjVhCX+OCPPM7pV7AoOS4ZFcIq Ph1XiS/BSrCMiHu8G35QuR0pm6gJYs13AVcEqr9TKQYr/PHXq0ifECfd0HBlvF/oIjrf 9xN/09BcR0tYLu6GRLlfrtmW1Ubvn67m5hHOlSZoTFDnBetTgaFlJWMMHLI/4brlpsvL hxbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477332; x=1741082132; 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=f3uDcPAUn17u5guwAmKffFv3WeYri61KKtnRD7KLFFU=; b=gZBdGee2fmP69Z4aPJKQkXJzU1QL/Yy1f9Ckmh53dy/5Jng2PgAdQ8a/4zx9DV6AXt vHEKrE35+sYxqS/a0AQkXpWdA/wl22K6AuIawNhEcMVfoLVVwJ5fFjvDHbdERHuPxje8 8+BPqFHxx7RBCfxwO7sOu/Z34R9wMmad+qvygFYSy+HR/eAV5eSuehoLNmpMjKUo1A53 GOd0AhrXCuo0G6ItIw6BuIXk786JbpBWt5xkboCKzU8v52iEfK78X8rpwSTtnCLyclqT NFPFQnEAL+KTqW30M6hwhIgvypDZYOZEDCEMTkRwztN6h2cubgUr7k+Paf0qBLZaCWl8 zgZQ== X-Forwarded-Encrypted: i=1; AJvYcCXJuIlMY6If5X0vbs0MTSHWcxv8XH6CPiKFLTavXPcTFP99A44sWf2x9dXn6GaazEsQNLkJrTWd49mnXls=@vger.kernel.org X-Gm-Message-State: AOJu0YwjZB5ucS04dzY18biI6+T1gTGfP4BAzH21ZAeurlCxMeOY0eyo R9OHj47rWy8288apXzYEz5g4/xW0dUrcgjwY22ia/zmcTM0L1qNXaJ7/bW/LyA4= X-Gm-Gg: ASbGncuRXIbxv5510fZgI6vUTFI8AW0GJX0JTRJT3L0X56VjXBcJAH129mM3p7djj3M uT9flILya1Jjx4zzRT2QWAjzo1eBrH3E8/gRF28XQ26xVVFMXPNNzvZ6PTNLYQGuS5LYEny/fAm m9Go5FfvSKfoz7pk2+cGXeFjOpm/eA3xMt7xGs20TXzZTkeFI7fSJsZgnbvl1vVhWWX5xmErZoO Q2nm/EURkCD9sD0e4JEgTihFUy84SPQFWavh8xVnUU53R8ilFcwWu+jq+MliIpaNvN2NAfJGx4R MhIbB6OqWVzRQ7I7o5jTiTsCZZY81D44OFXW X-Google-Smtp-Source: AGHT+IGZSyqBfVWqqe5J4Zp72BCqTmEE8EDYl5esUBqbgbQwzfkt9iMaTDDcYx6uNEGX+3vdzFMHVg== X-Received: by 2002:a05:6512:1152:b0:545:271d:f85 with SMTP id 2adb3069b0e04-54838ef8816mr5740468e87.29.1740477331850; Tue, 25 Feb 2025 01:55:31 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:31 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:15 +0100 Subject: [PATCH v5 28/31] ARM: entry: Convert to generic 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: <20250225-arm-generic-entry-v5-28-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 This rewrites ARM to use the generic entry. All of the irqentry_* callbacks are collapsed and made to call into the generic entry code that handle the interrupts storing regs context before entry and restoring it after. The syscall_enter_from_user_mode(), syscall_exit_to_user_mode(), do_work_pending() constructs are replaced with generic code. The syscall invocation now enables syscall tracing "work" using the generic callbacks and no extra actions are needed to enable/disable syscall tracing. The old context tracking with user_exit_callable() user_enter_callable() is no longer used. Only CSKY and Xtensa use this deprecated mechanism now. handle_fiq_as_nmi() is retired as the generic entry provides the same functionality in irqentry_nmi_enter() and irqentry_nmi_exit(). Like with the ARM64 proposed patch for generic entry, it is necessary to create a small call "arm_exit_to_user_mode()" that is used for things such as ret_from_fork, i.e. when we create a completely new execution context with a botched return from interrupt. The elaborate checking and switching to IRQ stack in the irq_handler macro was reimplemented in C for this exercise: this was easiest and there was already code making use of the IRQ stack from C for soft interrupts. I have dropped the context tracking (i.e. calling irqentry_enter() and looking for trace conditions) on dabt/pabt i.e. do_DataAbort and do_PrefetchAbort code paths. These are addressed in a separate patch for development/review reasons. I added stubs for PTRACE_SYSEMU and PTRACE_SYSEMU_SINGLESTEP returning -EIO like the UM arch does, since those syscalls are required by generic entry. If someone wants to implement them, the placeholders are there. Signed-off-by: Linus Walleij --- arch/arm/Kconfig | 1 + arch/arm/include/asm/entry-common.h | 66 ++++++++++++++++++++++++++ arch/arm/include/asm/entry.h | 13 ++--- arch/arm/include/asm/ptrace.h | 3 -- arch/arm/include/asm/signal.h | 2 - arch/arm/include/asm/syscall.h | 7 ++- arch/arm/include/asm/thread_info.h | 17 +------ arch/arm/include/asm/traps.h | 1 - arch/arm/include/uapi/asm/ptrace.h | 2 + arch/arm/kernel/entry-armv.S | 50 ++++--------------- arch/arm/kernel/entry-common.S | 34 +++---------- arch/arm/kernel/entry-header.S | 18 ------- arch/arm/kernel/entry.c | 94 ++++++++++++++++++---------------= --- arch/arm/kernel/process.c | 5 +- arch/arm/kernel/ptrace.c | 95 ++-------------------------------= ---- arch/arm/kernel/signal.c | 31 +----------- arch/arm/kernel/syscall.c | 30 ++++-------- arch/arm/kernel/traps.c | 25 ---------- 18 files changed, 161 insertions(+), 333 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 835b5f100e926e54bab4be7802aeada4af37a145..564575f52cf7ec8296938944fa5= 296a4acc2a598 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -69,6 +69,7 @@ config ARM select GENERIC_CPU_AUTOPROBE select GENERIC_CPU_DEVICES select GENERIC_EARLY_IOREMAP + select GENERIC_ENTRY select GENERIC_IDLE_POLL_SETUP select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_PROBE diff --git a/arch/arm/include/asm/entry-common.h b/arch/arm/include/asm/ent= ry-common.h new file mode 100644 index 0000000000000000000000000000000000000000..7b1f108512db0001a65911af0df= 4f48197d99e75 --- /dev/null +++ b/arch/arm/include/asm/entry-common.h @@ -0,0 +1,66 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _ASM_ARM_ENTRY_COMMON_H +#define _ASM_ARM_ENTRY_COMMON_H + +#include + +#include + +enum ptrace_syscall_dir { + PTRACE_SYSCALL_ENTER =3D 0, + PTRACE_SYSCALL_EXIT, +}; + +static inline unsigned long +arch_prepare_report_syscall_entry(struct pt_regs *regs) +{ + unsigned long ip; + + /* + * IP is used to denote syscall entry/exit: + * IP =3D 0 -> entry + */ + ip =3D regs->ARM_ip; + regs->ARM_ip =3D PTRACE_SYSCALL_ENTER; + + return ip; +} +#define arch_prepare_report_syscall_entry arch_prepare_report_syscall_entry + +static inline void +arch_post_report_syscall_entry(struct pt_regs *regs, + unsigned long saved_reg, long ret) +{ + regs->ARM_ip =3D saved_reg; +} +#define arch_post_report_syscall_entry arch_post_report_syscall_entry + + +static inline unsigned long +arch_prepare_report_syscall_exit(struct pt_regs *regs, + unsigned long work) +{ + unsigned long ip; + + /* + * IP is used to denote syscall entry/exit: + * IP =3D 1 -> exit + */ + ip =3D regs->ARM_ip; + regs->ARM_ip =3D PTRACE_SYSCALL_EXIT; + + return ip; +} +#define arch_prepare_report_syscall_exit arch_prepare_report_syscall_exit + +static inline void +arch_post_report_syscall_exit(struct pt_regs *regs, + unsigned long saved_reg, + unsigned long work) +{ + regs->ARM_ip =3D saved_reg; +} +#define arch_post_report_syscall_exit arch_post_report_syscall_exit + +#endif /* _ASM_ARM_ENTRY_COMMON_H */ diff --git a/arch/arm/include/asm/entry.h b/arch/arm/include/asm/entry.h index a78bc5054b093120e903f08369fb8b1a9feb7f81..df2dd14ab51a586b83b6da6bbf9= bd99858c1ddf4 100644 --- a/arch/arm/include/asm/entry.h +++ b/arch/arm/include/asm/entry.h @@ -4,15 +4,8 @@ =20 struct pt_regs; =20 -/* - * 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 syscall_exit_to_user_mode(struct pt_regs *regs); -void irqentry_enter_from_user_mode(struct pt_regs *regs); -void irqentry_exit_to_user_mode(struct pt_regs *regs); -void irqentry_enter_from_kernel_mode(struct pt_regs *regs); -void irqentry_exit_to_kernel_mode(struct pt_regs *regs); +void arm_irq_handler(struct pt_regs *regs, int mode); +void arm_fiq_handler(struct pt_regs *regs); +void arm_exit_to_user_mode(struct pt_regs *regs); =20 #endif /* __ASM_ENTRY_H__ */ diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h index a01c66f0ad907882af2a383e53de8aca68c551e5..8a7de4020cbc016f743dcf515b9= fa83b9bd3e3f0 100644 --- a/arch/arm/include/asm/ptrace.h +++ b/arch/arm/include/asm/ptrace.h @@ -200,8 +200,5 @@ static inline unsigned long it_advance(unsigned long cp= sr) return cpsr; } =20 -int syscall_trace_enter(struct pt_regs *regs); -void syscall_trace_exit(struct pt_regs *regs); - #endif /* __ASSEMBLY__ */ #endif diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h index bb753cd3e29fc54186543c48b2aee7b221301a37..45885383646c9f166b0d7ee8008= 0b78776b515e7 100644 --- a/arch/arm/include/asm/signal.h +++ b/arch/arm/include/asm/signal.h @@ -23,6 +23,4 @@ typedef struct { =20 #include =20 -void do_work_pending(struct pt_regs *regs, unsigned int thread_flags); - #endif diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index b94fd7ce17f82f0baf06b74800245112e1f13002..a6c8f0e799bb8bf3833161dec70= fc7a1aaa513f6 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h @@ -19,7 +19,12 @@ =20 extern const unsigned long sys_call_table[]; =20 -int invoke_syscall(void *table, struct pt_regs *regs, int scno); +void invoke_syscall(void *table, struct pt_regs *regs, int scno); + +static inline bool arch_syscall_is_vdso_sigreturn(struct pt_regs *regs) +{ + return false; +} =20 static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thre= ad_info.h index d8a45c5a10496aaf806bfeaa0353d5e8985bd6f5..84e58a9cdab63ad264c2cd2bad6= 4239d1912cbe7 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -74,6 +74,7 @@ struct thread_info { #ifdef CONFIG_ARM_THUMBEE unsigned long thumbee_state; /* ThumbEE Handler Base register */ #endif + unsigned long syscall_work; /* SYSCALL_WORK_ flags */ }; =20 #define INIT_THREAD_INFO(tsk) \ @@ -149,30 +150,14 @@ extern int vfp_restore_user_hwstate(struct user_vfp *, #define TIF_USING_IWMMXT 17 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ #define TIF_RESTORE_SIGMASK 19 -#define TIF_SYSCALL_TRACE 20 /* syscall trace active */ -#define TIF_SYSCALL_AUDIT 21 /* syscall auditing active */ -#define TIF_SYSCALL_TRACEPOINT 22 /* syscall tracepoint instrumentation */ -#define TIF_SECCOMP 23 /* seccomp syscall filtering active */ - =20 #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) #define _TIF_UPROBE (1 << TIF_UPROBE) -#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) -#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) -#define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_NOTIFY_SIGNAL (1 << TIF_NOTIFY_SIGNAL) #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT) =20 -/* Checks for any syscall work in entry-common.S */ -#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP) - -/* - * Change these and you break ASM code in entry-common.S - */ #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ _TIF_NOTIFY_RESUME | _TIF_UPROBE | \ _TIF_NOTIFY_SIGNAL) diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index b888912c2450e0e8eec8139166c7292f283545c7..f8695104c72f2f450092839c7c5= 0920e540e594b 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h @@ -38,7 +38,6 @@ extern void *vectors_page; =20 asmlinkage void dump_backtrace_stm(u32 *stack, u32 instruction, const char= *loglvl); asmlinkage void do_undefinstr(struct pt_regs *regs); -asmlinkage void handle_fiq_as_nmi(struct pt_regs *regs); asmlinkage void bad_mode(struct pt_regs *regs, int reason); int arm_syscall(int no, struct pt_regs *regs); asmlinkage void baddataabort(int code, unsigned long instr, struct pt_regs= *regs); diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm= /ptrace.h index 8896c23ccba78ed7e10c7d1b9955124314496dc6..336a5beb282f360e875703045ee= 833974bbd68b2 100644 --- a/arch/arm/include/uapi/asm/ptrace.h +++ b/arch/arm/include/uapi/asm/ptrace.h @@ -33,6 +33,8 @@ #define PTRACE_GETHBPREGS 29 #define PTRACE_SETHBPREGS 30 #define PTRACE_GETFDPIC 31 +#define PTRACE_SYSEMU 32 +#define PTRACE_SYSEMU_SINGLESTEP 33 =20 #define PTRACE_GETFDPIC_EXEC 0 #define PTRACE_GETFDPIC_INTERP 1 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 2a789c8834b93475c32dcb6ba5854e24ddd8d6e9..498a22f5fa8a6516d1eab584f05= 23c3d6c6e4926 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -36,35 +36,6 @@ #define RELOC_TEXT_NONE #endif =20 -/* - * Interrupt handling. - */ - .macro irq_handler, from_user:req - mov r1, sp - ldr_this_cpu r2, irq_stack_ptr, r2, r3 - .if \from_user =3D=3D 0 - @ - @ If we took the interrupt while running in the kernel, we may already - @ be using the IRQ stack, so revert to the original value in that case. - @ - subs r3, r2, r1 @ SP above bottom of IRQ stack? - rsbscs r3, r3, #THREAD_SIZE @ ... and below the top? -#ifdef CONFIG_VMAP_STACK - ldr_va r3, high_memory, cc @ End of the linear region - cmpcc r3, r1 @ Stack pointer was below it? -#endif - bcc 0f @ If not, switch to the IRQ stack - mov r0, r1 - bl generic_handle_arch_irq - b 1f -0: - .endif - - mov_l r0, generic_handle_arch_irq - bl call_with_stack -1: - .endm - .macro pabt_helper @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5 #ifdef MULTI_PABORT @@ -205,9 +176,6 @@ ENDPROC(__und_invalid) get_thread_info tsk uaccess_entry tsk, r0, r1, r2, \uaccess =20 - mov r0, sp @ 'regs' - bl irqentry_enter_from_kernel_mode - .endm =20 .align 5 @@ -223,7 +191,9 @@ ENDPROC(__dabt_svc) .align 5 __irq_svc: svc_entry - irq_handler from_user=3D0 + mov r0, sp @ regs + mov r1, #0 @ from kernel mode + bl arm_irq_handler =20 #ifdef CONFIG_PREEMPTION ldr r8, [tsk, #TI_PREEMPT] @ get preempt count @@ -300,7 +270,7 @@ ENDPROC(__pabt_svc) __fiq_svc: svc_entry mov r0, sp @ struct pt_regs *regs - bl handle_fiq_as_nmi + bl arm_fiq_handler svc_exit_via_fiq UNWIND(.fnend ) ENDPROC(__fiq_svc) @@ -329,7 +299,7 @@ __fiq_abt: stmfd sp!, {r1 - r2} =20 add r0, sp, #8 @ struct pt_regs *regs - bl handle_fiq_as_nmi + bl arm_fiq_handler =20 ldmfd sp!, {r1 - r2} ARM( msr cpsr_c, #ABT_MODE | PSR_I_BIT | PSR_F_BIT ) @@ -420,7 +390,6 @@ ENDPROC(__fiq_abt) .align 5 __dabt_usr: usr_entry uaccess=3D0 - asm_irqentry_enter_from_user_mode kuser_cmpxchg_check mov r2, sp dabt_helper @@ -431,9 +400,10 @@ ENDPROC(__dabt_usr) .align 5 __irq_usr: usr_entry - asm_irqentry_enter_from_user_mode kuser_cmpxchg_check - irq_handler from_user=3D1 + mov r0, sp @ regs + mov r1, #1 @ from user mode + bl arm_irq_handler get_thread_info tsk mov why, #0 b ret_to_user_from_irq @@ -445,7 +415,6 @@ ENDPROC(__irq_usr) .align 5 __und_usr: usr_entry uaccess=3D0 - asm_irqentry_enter_from_user_mode =20 @ IRQs must be enabled before attempting to read the instruction from @ user space since that could cause a page/translation fault if the @@ -470,7 +439,6 @@ ENDPROC(__und_usr) .align 5 __pabt_usr: usr_entry - asm_irqentry_enter_from_user_mode mov r2, sp @ regs pabt_helper UNWIND(.fnend ) @@ -493,7 +461,7 @@ __fiq_usr: usr_entry kuser_cmpxchg_check mov r0, sp @ struct pt_regs *regs - bl handle_fiq_as_nmi + bl arm_fiq_handler get_thread_info tsk restore_user_regs UNWIND(.fnend ) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 6b0f86786a7d9e656ecbe8c741f2edbcbafd2915..a5a0e757ab23d151485092a078a= f98966e039869 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -39,10 +39,6 @@ ret_fast_syscall: UNWIND(.fnstart ) UNWIND(.cantunwind ) add sp, sp, #(S_R0 + S_OFF) - /* do_rseq_syscall needs interrupts enabled. */ - mov r0, sp @ 'regs' - bl syscall_exit_to_user_mode - #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack #endif @@ -60,7 +56,7 @@ ENTRY(ret_to_user) /* do_rseq_syscall needs interrupts enabled. */ enable_irq_notrace @ enable interrupts mov r0, sp @ 'regs' - bl syscall_exit_to_user_mode + bl arm_exit_to_user_mode =20 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack @@ -69,8 +65,6 @@ ENTRY(ret_to_user) ENDPROC(ret_to_user) =20 ENTRY(ret_to_user_from_irq) - asm_irqentry_exit_to_user_mode - #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack #endif @@ -92,9 +86,10 @@ SYM_TYPED_FUNC_START(ret_from_fork_asm) mov r2, r5 mov r3, r4 bl ret_from_fork - mov r0, #0 -1: get_thread_info tsk - b ret_to_user +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + bl stackleak_erase_on_task_stack +#endif + restore_user_regs SYM_FUNC_END(ret_from_fork_asm) =20 /*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D @@ -210,29 +205,12 @@ 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 mov r2, scno @ syscall number from r7 bl invoke_syscall - cmp r0, #0 - beq ret_fast_syscall - /* This path taken when tracing */ - add sp, sp, #(S_R0 + S_OFF) - b ret_to_user + b ret_fast_syscall =20 #if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI) /* diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index cfaf14d71378ba14bbb2a42cd36d48a23838eee1..abd927f1cc3a4d813cc48bc0461= 91f49f3c0e533 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -203,10 +203,6 @@ =20 @ IRQs off again before pulling preserved data off the stack disable_irq_notrace - - mov r0, sp @ 'regs' - bl irqentry_exit_to_kernel_mode - uaccess_exit tsk, r0, r1 =20 #ifndef CONFIG_THUMB2_KERNEL @@ -340,20 +336,6 @@ ALT_UP_B(.L1_\@) #endif /* !CONFIG_THUMB2_KERNEL */ .endm =20 -/* - * Context tracking and other mode transitions. Used to instrument transit= ions - * between user and kernel mode. -*/ - .macro asm_irqentry_enter_from_user_mode - mov r0, sp @ regs - bl irqentry_enter_from_user_mode - .endm - - .macro asm_irqentry_exit_to_user_mode - mov r0, sp @ regs - bl irqentry_exit_to_user_mode - .endm - /* * These are the registers used in the syscall handler, and allow us to * have in theory up to 7 arguments to a function - r0 to r6. diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 1e1284cc4caed6e602ce36e812d535e6fe324f34..08b8680233e5aae6e477f9bf15d= 7f06d7fd3e5af 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -1,71 +1,71 @@ // SPDX-License-Identifier: GPL-2.0 #include -#include -#include #include +#include +#include +#include #include +#include #include +#include =20 -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; -} +#include "irq.h" =20 -void syscall_exit_to_user_mode(struct pt_regs *regs) +static void noinstr handle_arm_irq(void *data) { - unsigned long flags =3D read_thread_flags(); + struct pt_regs *regs =3D data; + struct pt_regs *old_regs; =20 - rseq_syscall(regs); - local_irq_disable(); - /* - * It really matters that we check for flags !=3D 0 and not - * just for pending work here! - */ - if (flags) - do_work_pending(regs, flags); + irq_enter_rcu(); + old_regs =3D set_irq_regs(regs); =20 - trace_hardirqs_on(); - /* This context tracking call has inverse naming */ - user_enter_callable(); -} + handle_arch_irq(regs); =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(); + set_irq_regs(old_regs); + irq_exit_rcu(); } =20 -noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs) +noinstr void arm_irq_handler(struct pt_regs *regs, int mode) { - unsigned long flags =3D read_thread_flags(); + irqentry_state_t state =3D irqentry_enter(regs); =20 /* - * It really matters that we check for flags !=3D 0 and not - * just for pending work here! + * If we are executing in usermode, or kernel process context + * (on the thread stack) then switch to the IRQ stack. Else we + * are already on the IRQ stack (or the overflow stack) and we + * can just proceed to handle the IRQ. */ - if (flags) - do_work_pending(regs, flags); - trace_hardirqs_on(); - /* This context tracking call has inverse naming */ - user_enter_callable(); + if (mode =3D=3D 1) + call_on_irq_stack(handle_arm_irq, regs); + else if (on_thread_stack()) + call_on_irq_stack(handle_arm_irq, regs); + else + handle_arm_irq(regs); + + irqentry_exit(regs, state); } =20 -noinstr void irqentry_enter_from_kernel_mode(struct pt_regs *regs) +/* + * Handle FIQ similarly to NMI on x86 systems. + * + * The runtime environment for NMIs is extremely restrictive + * (NMIs can pre-empt critical sections meaning almost all locking is + * forbidden) meaning this default FIQ handling must only be used in + * circumstances where non-maskability improves robustness, such as + * watchdog or debug logic. + * + * This handler is not appropriate for general purpose use in drivers + * platform code and can be overrideen using set_fiq_handler. + */ +noinstr void arm_fiq_handler(struct pt_regs *regs) { - trace_hardirqs_off(); + irqentry_state_t state =3D irqentry_nmi_enter(regs); + + irqentry_nmi_exit(regs, state); } =20 -noinstr void irqentry_exit_to_kernel_mode(struct pt_regs *regs) +asmlinkage void arm_exit_to_user_mode(struct pt_regs *regs) { - if (interrupts_enabled(regs)) - trace_hardirqs_on(); - else - trace_hardirqs_off(); + local_irq_disable(); + irqentry_exit_to_user_mode(regs); } diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 81c1c3f988344185917cf4e53d0d8ee47ae912f4..a59ad5fdaaf51f653c352884bbd= d10d1211b2669 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 #include #include @@ -248,8 +249,8 @@ __visible void ret_from_fork(struct task_struct *prev, = struct pt_regs *regs, * execve() syscall. */ } - - /* syscall_exit_to_user_mode(regs); here once we switch to generic entry = */ + local_irq_enable(); + syscall_exit_to_user_mode(regs); } =20 int copy_thread(struct task_struct *p, const struct kernel_clone_args *arg= s) diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index ac7b98ae47249b4a00fc1cb871bb2d309bfd8c88..d1e5a78c616b0e71f9466c201b7= 4e06ce0d7a08f 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -27,9 +27,6 @@ #include #include =20 -#define CREATE_TRACE_POINTS -#include - #define REG_PC 15 #define REG_PSR 16 /* @@ -737,6 +734,11 @@ long arch_ptrace(struct task_struct *child, long reque= st, ret =3D ptrace_write_user(child, addr, data); break; =20 + case PTRACE_SYSEMU: + case PTRACE_SYSEMU_SINGLESTEP: + ret =3D -EIO; + break; + case PTRACE_GETREGS: ret =3D copy_regset_to_user(child, &user_arm_view, REGSET_GPR, @@ -821,90 +823,3 @@ long arch_ptrace(struct task_struct *child, long reque= st, =20 return ret; } - -enum ptrace_syscall_dir { - PTRACE_SYSCALL_ENTER =3D 0, - PTRACE_SYSCALL_EXIT, -}; - -static void report_syscall_enter(struct pt_regs *regs) -{ - unsigned long ip; - - /* - * IP is used to denote syscall entry/exit: - * IP =3D 0 -> entry - */ - ip =3D regs->ARM_ip; - regs->ARM_ip =3D PTRACE_SYSCALL_ENTER; - - if (ptrace_report_syscall_entry(regs)) - current_thread_info()->abi_syscall =3D -1; - - regs->ARM_ip =3D ip; -} - -static void report_syscall_exit(struct pt_regs *regs) -{ - unsigned long ip; - - /* - * IP is used to denote syscall entry/exit: - * IP =3D 1 -> exit - */ - ip =3D regs->ARM_ip; - regs->ARM_ip =3D PTRACE_SYSCALL_EXIT; - - ptrace_report_syscall_exit(regs, 0); - - regs->ARM_ip =3D ip; -} - -asmlinkage int syscall_trace_enter(struct pt_regs *regs) -{ - int scno; - - if (test_thread_flag(TIF_SYSCALL_TRACE)) - report_syscall_enter(regs); - - /* Do seccomp after ptrace; syscall may have changed. */ -#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER - if (secure_computing() =3D=3D -1) - return -1; -#else - /* XXX: remove this once OABI gets fixed */ - secure_computing_strict(syscall_get_nr(current, regs)); -#endif - - /* Tracer or seccomp may have changed syscall. */ - scno =3D syscall_get_nr(current, regs); - - if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) - trace_sys_enter(regs, scno); - - audit_syscall_entry(scno, regs->ARM_r0, regs->ARM_r1, regs->ARM_r2, - regs->ARM_r3); - - return scno; -} - -void syscall_trace_exit(struct pt_regs *regs) -{ - /* - * Audit the syscall before anything else, as a debugger may - * come in and change the current registers. - */ - audit_syscall_exit(regs); - - /* - * Note that we haven't updated the ->syscall field for the - * current thread. This isn't a problem because it will have - * been set on syscall entry and there hasn't been an opportunity - * for a PTRACE_SET_SYSCALL since then. - */ - if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) - trace_sys_exit(regs, regs_return_value(regs)); - - if (test_thread_flag(TIF_SYSCALL_TRACE)) - report_syscall_exit(regs); -} diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index a39ee14ec5b70b3738ecef537709326ef1e8217c..35d2bb3cd2b442dac1645480372= 62e065fbfe12a 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -4,6 +4,7 @@ * * Copyright (C) 1995-2009 Russell King */ +#include #include #include #include @@ -535,7 +536,7 @@ static void handle_signal(struct ksignal *ksig, struct = pt_regs *regs) * the kernel can handle, and then we build all the user-level signal hand= ling * stack-frames in one go after that. */ -static void arch_do_signal_or_restart(struct pt_regs *regs) +void arch_do_signal_or_restart(struct pt_regs *regs) { unsigned int retval =3D 0, continue_addr =3D 0, restart_addr =3D 0; bool syscall =3D (syscall_get_nr(current, regs) !=3D -1); @@ -598,34 +599,6 @@ static void arch_do_signal_or_restart(struct pt_regs *= regs) return; } =20 -void do_work_pending(struct pt_regs *regs, unsigned int thread_flags) -{ - /* - * The assembly code enters us with IRQs off, but it hasn't - * informed the tracing code of that for efficiency reasons. - * Update the trace code with the current status. - */ - trace_hardirqs_off(); - do { - if (likely(thread_flags & _TIF_NEED_RESCHED)) { - schedule(); - } else { - if (unlikely(!user_mode(regs))) - return; - local_irq_enable(); - if (thread_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) { - arch_do_signal_or_restart(regs); - } else if (thread_flags & _TIF_UPROBE) { - uprobe_notify_resume(regs); - } else { - resume_user_mode_work(regs); - } - } - local_irq_disable(); - thread_flags =3D read_thread_flags(); - } while (thread_flags & _TIF_WORK_MASK); -} - struct page *get_signal_page(void) { unsigned long ptr; diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c index 6f518ec3870fb36a64d1b671b20f96d63a52bf78..ed3ab51283c06c1398ece2ad3ee= 1fae16cd03ee8 100644 --- a/arch/arm/kernel/syscall.c +++ b/arch/arm/kernel/syscall.c @@ -1,25 +1,21 @@ // SPDX-License-Identifier: GPL-2.0 =20 +#include #include #include =20 -static inline bool has_syscall_work(unsigned long flags) -{ - return unlikely(flags & _TIF_SYSCALL_WORK); -} - int invoke_syscall_asm(void *table, struct pt_regs *regs, int scno); __ADDRESSABLE(invoke_syscall_asm); =20 -__visible int invoke_syscall(void *table, struct pt_regs *regs, int scno) +__visible void invoke_syscall(void *table, struct pt_regs *regs, int scno) { - unsigned long flags =3D read_thread_flags(); int ret; =20 - if (has_syscall_work(flags)) { - scno =3D syscall_trace_enter(regs); - if (scno =3D=3D -1) - goto trace_exit_nosave; + scno =3D syscall_enter_from_user_mode(regs, scno); + /* When tracing syscall -1 means "skip syscall" */ + if (scno < 0) { + ret =3D 0; + goto exit_save; } =20 if (scno < NR_syscalls) { @@ -35,13 +31,7 @@ __visible int invoke_syscall(void *table, struct pt_regs= *regs, int scno) ret =3D sys_ni_syscall(); =20 exit_save: - /* Save return value from syscall */ - regs->ARM_r0 =3D ret; - if (!has_syscall_work(flags)) - return 0; - -trace_exit_nosave: - local_irq_enable(); - syscall_trace_exit(regs); - return 1; + syscall_set_return_value(current, regs, 0, ret); + + syscall_exit_to_user_mode(regs); } diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 942c77767919466d5b89d83d8eb77032b119473e..57e74b49c52533babe177a8a2e0= 160a83c9bde05 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -502,31 +502,6 @@ asmlinkage void do_undefinstr(struct pt_regs *regs) } NOKPROBE_SYMBOL(do_undefinstr) =20 -/* - * Handle FIQ similarly to NMI on x86 systems. - * - * The runtime environment for NMIs is extremely restrictive - * (NMIs can pre-empt critical sections meaning almost all locking is - * forbidden) meaning this default FIQ handling must only be used in - * circumstances where non-maskability improves robustness, such as - * watchdog or debug logic. - * - * This handler is not appropriate for general purpose use in drivers - * platform code and can be overrideen using set_fiq_handler. - */ -asmlinkage void __exception_irq_entry handle_fiq_as_nmi(struct pt_regs *re= gs) -{ - struct pt_regs *old_regs =3D set_irq_regs(regs); - - nmi_enter(); - - /* nop. FIQ handlers for special arch/arm features can be added here. */ - - nmi_exit(); - - set_irq_regs(old_regs); -} - /* * bad_mode handles the impossible case in the vectors. If you see one of * these, then it's extremely serious, and could mean you have buggy hardw= are. --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 316E826A0A9 for ; Tue, 25 Feb 2025 09:55:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477338; cv=none; b=lrJHLg/eg65PPb0Ft7AEpbnx+ZDb0pY9olI3hSs+KzRd1gzPURA6DurWVk8WhWZWymbRnSnXLUvjORJwTHKq0jX/wBzvYE1dkg7MvsKPw2wE61xWm0KyOMvneYa3iMG8bEIeYDNT+2WhKqNAeJEXce8pHbdu8TPZ2bC0Gn97jrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477338; c=relaxed/simple; bh=lX4qxRLBXNpOAjk4fd3zFuvKNpAg99aRB3Y6YiAkTsA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HFGTkpRJePhSqzzBeQMBnyUH3QddtGEpl0z6KtTsvAn659XrPffou+v2X6jCUvnnv+8ZVOheIV9ePhBiJQUWbM/lDnP0sKK9fj1NqL29KyzihgFY6r4WayGfw09mwprL5BRpP+eniBV6G9zrqlpzBENJzKG956d3e4bwbsCwpB4= 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=dsQkA3ug; arc=none smtp.client-ip=209.85.167.44 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="dsQkA3ug" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5484fa1401cso1187451e87.1 for ; Tue, 25 Feb 2025 01:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477333; x=1741082133; 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=hG0/vjAYb5Ulc6jjnKhm2XeOXEYOwE4Q8HmW4VgPla8=; b=dsQkA3ugKwMDalkaUM1OS3V8eH1xq7pdaB/eCzIX/afYSseTBNg+ij+NczfzWCa5hy FIAR7IcYVXiq6lUpQguiy8B/AlTjmL37wB7wzKHlzE43mRxzToNYES/pL4jHUeXwa29h kxp7HKgSWIKVWGXq49EsC3aDd5guwTHTQ8w2Wq/+t+nuw6qRmTvnppVw1jM7Nb/pWqux 2R+Vadsvvwa54yLgQLa0zIB2ZnsFOlGGVZlHsbwKpygzZGhdxOP9ChK2/D04wQmlLJhE HFwPiWvhTMY2WrPcCSXY6weqnukLUJxEuuuv/i+jVU+Rl528F4uKGEiWdVYZKsEvdABZ mouw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477333; x=1741082133; 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=hG0/vjAYb5Ulc6jjnKhm2XeOXEYOwE4Q8HmW4VgPla8=; b=VnBU9R5vAAyoLhGmIi7pv+0ekbRokvmNh1Fm1PYQsfL+zAHTNEXJjf8irSaxXmRIRU 0CmdKNyj+tFLAAKUVKNbK0PgQJhG+hgSF65ymyHPlBgxRYnZD2SgGsbHzhgqOplFoDfK XdgeWHgzpMqS3I/5Zvi14wHAJ2+H7TMkqy7P6laTLXCkEioSaXvoqxnabON1d1tGskJF NdsFRKsPNHvfayhqVhH6OUAVeddOqysiVpssjsl7Oh25VirUMXJGz83AiSygWNrkehHk vHcFAy8Q7afwv4mJYby8cucONHOrZumNCnSqMUUsVxUGWVlTiqTmy5u48HdrtaCghKo4 SecQ== X-Forwarded-Encrypted: i=1; AJvYcCXdq3xbmN5+ZyYwdAC+bH/WHu0T+3mO7yKDsB4tNrbhO15xXc0uP59sS9/56pBXX8Xwa3SEHnxg3CS+pBw=@vger.kernel.org X-Gm-Message-State: AOJu0YyNfwVFzzh7MeUMqtgR5hciL5UI+TSEL6mYukLByOT6lCwY2fOs XZ9bsgqhugVBXh6yiMnr9yAH/m5IPGsTBK/cVLuSu6UKhDKlzOGt1Uyf8sYMU7Q= X-Gm-Gg: ASbGncssRefgKkQUvFfeH52ztIubSKZdfwZmsNqTov04/F6H1Qza4I2OGNtbj+qGeYh vKwxkeXZpif8nY5aChz5KQkMLkwH0UQCs5zvow+H0LN4qhRNPI00zQlaWBA+JZ7GfJFQWMMmeis quC3mpqh3+k/yXWnOfNgU9XZzbkQO34YekiWLugQ0lbzJ/tN8/LRdQ5f6ukx1mb+GRJg1tujhMb BYx8UXWaDgQ5XB0dVzbHBS4gi2Iv3NP/tMOjR915oiZND9ELJlxTZucKt+MzsmToknmm/VBvFpb 7eQtoh0TK+H4uScNX9yZLqmyuQ7XrybdZcgA X-Google-Smtp-Source: AGHT+IH5uBgAMA9dHOegGGT93vBd6r8QwClPslh2DXLtCCBanyA3O0/Gp1EuUpD/mB0oY2I3FDeTFQ== X-Received: by 2002:a05:6512:104e:b0:546:2ea9:6666 with SMTP id 2adb3069b0e04-54838f4e48emr8380278e87.34.1740477333117; Tue, 25 Feb 2025 01:55:33 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:32 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:16 +0100 Subject: [PATCH v5 29/31] ARM: entry: Handle dabt, pabt, and und as interrupts 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: <20250225-arm-generic-entry-v5-29-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 While it isn't entirely intuitive, it appears that any kind of exception such as data or prefetch abort ("page faults") need to be handled as some kind of "interrupts" when using generic entry. At least this is what other platforms are doing. The same goes for undefined instruction handling, i.e. floating point emulation in the kernel (und-exceptions). This is necessary for the context checking to pass: without this patch, a whole slew of warnings start to trigger from syscall_exit_to_user_mode_prepare() CT_WARN_ON(ct_state() !=3D CT_STATE_KERNEL), i.e. syscalls seems to exit from user mode to user mode (not good), because the page faults screws up the context tracker. This patch restores the order. If this seems like the previous patch introduces a regression that is then fixed in this patch, it can simply be squashed into the former: having this rewrite separately surely makes development and review easier. Signed-off-by: Linus Walleij --- arch/arm/include/asm/entry.h | 3 +++ arch/arm/include/asm/traps.h | 2 +- arch/arm/kernel/entry-armv.S | 7 +++---- arch/arm/kernel/entry.c | 31 +++++++++++++++++++++++++++++++ arch/arm/kernel/traps.c | 2 +- arch/arm/mm/abort-ev4.S | 2 +- arch/arm/mm/abort-ev4t.S | 2 +- arch/arm/mm/abort-ev5t.S | 4 ++-- arch/arm/mm/abort-ev5tj.S | 6 +++--- arch/arm/mm/abort-ev6.S | 2 +- arch/arm/mm/abort-ev7.S | 2 +- arch/arm/mm/abort-lv4t.S | 36 ++++++++++++++++++------------------ arch/arm/mm/abort-macro.S | 2 +- arch/arm/mm/abort-nommu.S | 2 +- arch/arm/mm/fault.c | 4 ++-- arch/arm/mm/fault.h | 8 ++++---- arch/arm/mm/pabort-legacy.S | 2 +- arch/arm/mm/pabort-v6.S | 2 +- arch/arm/mm/pabort-v7.S | 2 +- 19 files changed, 77 insertions(+), 44 deletions(-) diff --git a/arch/arm/include/asm/entry.h b/arch/arm/include/asm/entry.h index df2dd14ab51a586b83b6da6bbf9bd99858c1ddf4..de722084d5309194e02cb87db64= ec32b9e6cd627 100644 --- a/arch/arm/include/asm/entry.h +++ b/arch/arm/include/asm/entry.h @@ -4,6 +4,9 @@ =20 struct pt_regs; =20 +void arm_und_handler(struct pt_regs *regs); +void arm_dabt_handler(unsigned long addr, unsigned int fsr, struct pt_regs= *regs); +void arm_pabt_handler(unsigned long addr, unsigned int ifsr, struct pt_reg= s *regs); void arm_irq_handler(struct pt_regs *regs, int mode); void arm_fiq_handler(struct pt_regs *regs); void arm_exit_to_user_mode(struct pt_regs *regs); diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index f8695104c72f2f450092839c7c50920e540e594b..0ca98271e10a210225c1714f5b2= 4668cebab2def 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h @@ -37,7 +37,7 @@ extern void ptrace_break(struct pt_regs *regs); extern void *vectors_page; =20 asmlinkage void dump_backtrace_stm(u32 *stack, u32 instruction, const char= *loglvl); -asmlinkage void do_undefinstr(struct pt_regs *regs); +void do_undefinstr(struct pt_regs *regs); asmlinkage void bad_mode(struct pt_regs *regs, int reason); int arm_syscall(int no, struct pt_regs *regs); asmlinkage void baddataabort(int code, unsigned long instr, struct pt_regs= *regs); diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 498a22f5fa8a6516d1eab584f0523c3d6c6e4926..ae2f952beea7611f0abc7bd299f= c944335a21219 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -230,7 +230,7 @@ __und_fault: ldr r2, [r0, #S_PC] sub r2, r2, r1 str r2, [r0, #S_PC] - b do_undefinstr + b arm_und_handler ENDPROC(__und_fault) =20 .align 5 @@ -449,9 +449,8 @@ __pabt_usr: ENTRY(ret_from_exception) UNWIND(.fnstart ) UNWIND(.cantunwind ) - get_thread_info tsk - mov why, #0 - b ret_to_user + disable_irq_notrace + b ret_to_user_from_irq UNWIND(.fnend ) ENDPROC(__pabt_usr) ENDPROC(ret_from_exception) diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 08b8680233e5aae6e477f9bf15d7f06d7fd3e5af..01e4339ccdb4951e04a89fb91ad= 7c6e1991e09af 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -8,8 +8,39 @@ #include #include #include +#include =20 #include "irq.h" +#include "../mm/fault.h" + +noinstr asmlinkage void arm_und_handler(struct pt_regs *regs) +{ + irqentry_state_t state =3D irqentry_enter(regs); + + do_undefinstr(regs); + + irqentry_exit(regs, state); +} + +noinstr asmlinkage void arm_dabt_handler(unsigned long addr, unsigned int = fsr, + struct pt_regs *regs) +{ + irqentry_state_t state =3D irqentry_enter(regs); + + do_DataAbort(addr, fsr, regs); + + irqentry_exit(regs, state); +} + +noinstr asmlinkage void arm_pabt_handler(unsigned long addr, unsigned int = ifsr, + struct pt_regs *regs) +{ + irqentry_state_t state =3D irqentry_enter(regs); + + do_PrefetchAbort(addr, ifsr, regs); + + irqentry_exit(regs, state); +} =20 static void noinstr handle_arm_irq(void *data) { diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 57e74b49c52533babe177a8a2e0160a83c9bde05..d3a689bd05955f1ae46a6341e45= 6bb097e831311 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -449,7 +449,7 @@ int call_undef_hook(struct pt_regs *regs, unsigned int = instr) return fn ? fn(regs, instr) : 1; } =20 -asmlinkage void do_undefinstr(struct pt_regs *regs) +noinstr void do_undefinstr(struct pt_regs *regs) { unsigned int instr; void __user *pc; diff --git a/arch/arm/mm/abort-ev4.S b/arch/arm/mm/abort-ev4.S index a10bcb89594dd38ce31ca30bf97d68cf421afc42..68d8ae2f4e9c0955c9f08112b4f= f1887867d550a 100644 --- a/arch/arm/mm/abort-ev4.S +++ b/arch/arm/mm/abort-ev4.S @@ -24,4 +24,4 @@ ENTRY(v4_early_abort) bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR tst r3, #1 << 20 @ L =3D 1 -> write? orreq r1, r1, #1 << 11 @ yes. - b do_DataAbort + b arm_dabt_handler diff --git a/arch/arm/mm/abort-ev4t.S b/arch/arm/mm/abort-ev4t.S index 14743a2f6997fcae0eeb55f53dec07b7b2ec227c..76c6cfa79e2a32e34b6f35a15c7= 1c1af407956f3 100644 --- a/arch/arm/mm/abort-ev4t.S +++ b/arch/arm/mm/abort-ev4t.S @@ -25,4 +25,4 @@ ENTRY(v4t_early_abort) bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR tst r3, #1 << 20 @ check write orreq r1, r1, #1 << 11 - b do_DataAbort + b arm_dabt_handler diff --git a/arch/arm/mm/abort-ev5t.S b/arch/arm/mm/abort-ev5t.S index 98c523118820798668bf04d065ad86ea05fb6d2c..fda1e54debc44b380fb3f3af95c= 1f198a9cc008a 100644 --- a/arch/arm/mm/abort-ev5t.S +++ b/arch/arm/mm/abort-ev5t.S @@ -25,7 +25,7 @@ ENTRY(v5t_early_abort) uaccess_disable ip @ disable user access bic r1, r1, #1 << 11 @ clear bits 11 of FSR teq_ldrd tmp=3Dip, insn=3Dr3 @ insn was LDRD? - beq do_DataAbort @ yes + beq arm_dabt_handler @ yes tst r3, #1 << 20 @ check write orreq r1, r1, #1 << 11 - b do_DataAbort + b arm_dabt_handler diff --git a/arch/arm/mm/abort-ev5tj.S b/arch/arm/mm/abort-ev5tj.S index fec72f4fbaf508597d826e58d0dc084ee6e58dd0..a786a7d69e6ae23aa1125ccd41d= eaaaa743601e1 100644 --- a/arch/arm/mm/abort-ev5tj.S +++ b/arch/arm/mm/abort-ev5tj.S @@ -22,12 +22,12 @@ ENTRY(v5tj_early_abort) mrc p15, 0, r0, c6, c0, 0 @ get FAR bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR tst r5, #PSR_J_BIT @ Java? - bne do_DataAbort + bne arm_dabt_handler do_thumb_abort fsr=3Dr1, pc=3Dr4, psr=3Dr5, tmp=3Dr3 ldreq r3, [r4] @ read aborted ARM instruction uaccess_disable ip @ disable userspace access teq_ldrd tmp=3Dip, insn=3Dr3 @ insn was LDRD? - beq do_DataAbort @ yes + beq arm_dabt_handler @ yes tst r3, #1 << 20 @ L =3D 0 -> write orreq r1, r1, #1 << 11 @ yes. - b do_DataAbort + b arm_dabt_handler diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S index 836dc1299243415faaac1a93dce35ac46ae1a7da..2366236053eb86484cb179ff572= f06db6559426b 100644 --- a/arch/arm/mm/abort-ev6.S +++ b/arch/arm/mm/abort-ev6.S @@ -42,4 +42,4 @@ ENTRY(v6_early_abort) orreq r1, r1, #1 << 11 @ yes. #endif 1: uaccess_disable ip @ disable userspace access - b do_DataAbort + b arm_dabt_handler diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S index 53fb41c24774db985eddc370904aa7666527f538..72b6eba101555651d7afd749fd5= d7715a2964372 100644 --- a/arch/arm/mm/abort-ev7.S +++ b/arch/arm/mm/abort-ev7.S @@ -18,5 +18,5 @@ ENTRY(v7_early_abort) mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR uaccess_disable ip @ disable userspace access - b do_DataAbort + b arm_dabt_handler ENDPROC(v7_early_abort) diff --git a/arch/arm/mm/abort-lv4t.S b/arch/arm/mm/abort-lv4t.S index fbd60a120f6684c56c63cea10b00200765473f1d..3fef9c1479c17bb07652e43e0b8= b0683e00c4b2f 100644 --- a/arch/arm/mm/abort-lv4t.S +++ b/arch/arm/mm/abort-lv4t.S @@ -46,8 +46,8 @@ ENTRY(v4t_late_abort) /* 9 */ b .data_arm_ldmstm @ ldm*b rn, /* a */ b .data_unknown /* b */ b .data_unknown -/* c */ b do_DataAbort @ ldc rd, [rn], #m @ Same as ldr rd, [rn], #m -/* d */ b do_DataAbort @ ldc rd, [rn, #m] +/* c */ b arm_dabt_handler @ ldc rd, [rn], #m @ Same as ldr rd, [rn], #m +/* d */ b arm_dabt_handler @ ldc rd, [rn, #m] /* e */ b .data_unknown /* f */ b .data_unknown =20 @@ -60,7 +60,7 @@ ENTRY(v4t_late_abort) =20 .data_arm_ldmstm: tst r8, #1 << 21 @ check writeback bit - beq do_DataAbort @ no writeback -> no fixup + beq arm_dabt_handler @ no writeback -> no fixup str r9, [sp, #-4]! mov r7, #0x11 orr r7, r7, #0x1100 @@ -81,11 +81,11 @@ ENTRY(v4t_late_abort) addeq r7, r7, r6, lsl #2 @ Undo decrement str r7, [r2, r9, lsr #14] @ Put register 'Rn' ldr r9, [sp], #4 - b do_DataAbort + b arm_dabt_handler =20 .data_arm_lateldrhpre: tst r8, #1 << 21 @ Check writeback bit - beq do_DataAbort @ No writeback -> no fixup + beq arm_dabt_handler @ No writeback -> no fixup .data_arm_lateldrhpost: str r9, [sp, #-4]! and r9, r8, #0x00f @ get Rm / low nibble of immediate value @@ -101,14 +101,14 @@ ENTRY(v4t_late_abort) addeq r7, r7, r6 @ Undo decrement str r7, [r2, r9, lsr #14] @ Put register 'Rn' ldr r9, [sp], #4 - b do_DataAbort + b arm_dabt_handler =20 .data_arm_lateldrpreconst: tst r8, #1 << 21 @ check writeback bit - beq do_DataAbort @ no writeback -> no fixup + beq arm_dabt_handler @ no writeback -> no fixup .data_arm_lateldrpostconst: movs r6, r8, lsl #20 @ Get offset - beq do_DataAbort @ zero -> no fixup + beq arm_dabt_handler @ zero -> no fixup str r9, [sp, #-4]! and r9, r8, #15 << 16 @ Extract 'n' from instruction ldr r7, [r2, r9, lsr #14] @ Get register 'Rn' @@ -117,11 +117,11 @@ ENTRY(v4t_late_abort) addeq r7, r7, r6, lsr #20 @ Undo decrement str r7, [r2, r9, lsr #14] @ Put register 'Rn' ldr r9, [sp], #4 - b do_DataAbort + b arm_dabt_handler =20 .data_arm_lateldrprereg: tst r8, #1 << 21 @ check writeback bit - beq do_DataAbort @ no writeback -> no fixup + beq arm_dabt_handler @ no writeback -> no fixup .data_arm_lateldrpostreg: and r7, r8, #15 @ Extract 'm' from instruction ldr r6, [r2, r7, lsl #2] @ Get register 'Rm' @@ -180,10 +180,10 @@ ENTRY(v4t_late_abort) /* 3 */ b .data_unknown /* 4 */ b .data_unknown /* 5 */ b .data_thumb_reg -/* 6 */ b do_DataAbort -/* 7 */ b do_DataAbort -/* 8 */ b do_DataAbort -/* 9 */ b do_DataAbort +/* 6 */ b arm_dabt_handler +/* 7 */ b arm_dabt_handler +/* 8 */ b arm_dabt_handler +/* 9 */ b arm_dabt_handler /* A */ b .data_unknown /* B */ b .data_thumb_pushpop /* C */ b .data_thumb_ldmstm @@ -193,10 +193,10 @@ ENTRY(v4t_late_abort) =20 .data_thumb_reg: tst r8, #1 << 9 - beq do_DataAbort + beq arm_dabt_handler tst r8, #1 << 10 @ If 'S' (signed) bit is set movne r1, #0 @ it must be a load instr - b do_DataAbort + b arm_dabt_handler =20 .data_thumb_pushpop: tst r8, #1 << 10 @@ -217,7 +217,7 @@ ENTRY(v4t_late_abort) subne r7, r7, r6, lsl #2 @ decrement SP if POP str r7, [r2, #13 << 2] ldr r9, [sp], #4 - b do_DataAbort + b arm_dabt_handler =20 .data_thumb_ldmstm: str r9, [sp, #-4]! @@ -234,4 +234,4 @@ ENTRY(v4t_late_abort) sub r7, r7, r6, lsl #2 @ always decrement str r7, [r2, r9, lsr #6] ldr r9, [sp], #4 - b do_DataAbort + b arm_dabt_handler diff --git a/arch/arm/mm/abort-macro.S b/arch/arm/mm/abort-macro.S index bacf53fd0b70c6307e74ef8601d8dcc7db292700..30bb5e2135862902951b5077b0b= 860fd12ed8c28 100644 --- a/arch/arm/mm/abort-macro.S +++ b/arch/arm/mm/abort-macro.S @@ -20,7 +20,7 @@ orreq \tmp, \tmp, #1 << 11 @ Set L-bit if yes tst \tmp, #1 << 11 @ L =3D 0 -> write orreq \fsr, \fsr, #1 << 11 @ yes. - b do_DataAbort + b arm_dabt_handler not_thumb: .endm =20 diff --git a/arch/arm/mm/abort-nommu.S b/arch/arm/mm/abort-nommu.S index 6e2366a263219b379f4fdb43cc8e5413fb36e52a..573a09529ac7794f8004680ab35= 0750de7c8e15d 100644 --- a/arch/arm/mm/abort-nommu.S +++ b/arch/arm/mm/abort-nommu.S @@ -17,5 +17,5 @@ ENTRY(nommu_early_abort) mov r0, #0 @ clear r0, r1 (no FSR/FAR) mov r1, #0 - b do_DataAbort + b arm_dabt_handler ENDPROC(nommu_early_abort) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index ab01b51de5590bff6c2acaf446d01c589a5f7987..78afb701b34a17d8d841762944e= b5f8af6843dc4 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -588,7 +588,7 @@ hook_fault_code(int nr, int (*fn)(unsigned long, unsign= ed int, struct pt_regs *) /* * Dispatch a data abort to the relevant handler. */ -asmlinkage void +void do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) { const struct fsr_info *inf =3D fsr_info + fsr_fs(fsr); @@ -618,7 +618,7 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsig= ned int, struct pt_regs * ifsr_info[nr].name =3D name; } =20 -asmlinkage void +void do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *re= gs) { const struct fsr_info *inf =3D ifsr_info + fsr_fs(ifsr); diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h index e8f8c190254442a015a6cbc179602589cfddb0ea..36a7e7138c310a8311458207d2b= 694cb44c63b93 100644 --- a/arch/arm/mm/fault.h +++ b/arch/arm/mm/fault.h @@ -37,9 +37,9 @@ static inline int fsr_fs(unsigned int fsr) =20 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *reg= s); void early_abt_enable(void); -asmlinkage void do_DataAbort(unsigned long addr, unsigned int fsr, - struct pt_regs *regs); -asmlinkage void do_PrefetchAbort(unsigned long addr, unsigned int ifsr, - struct pt_regs *regs); +void do_DataAbort(unsigned long addr, unsigned int fsr, + struct pt_regs *regs); +void do_PrefetchAbort(unsigned long addr, unsigned int ifsr, + struct pt_regs *regs); =20 #endif /* __ARCH_ARM_FAULT_H */ diff --git a/arch/arm/mm/pabort-legacy.S b/arch/arm/mm/pabort-legacy.S index b2ffce4201062e3ec2045364ddc454cf706bab8d..26c62e568638d37133661f4f5b8= dec430593f8eb 100644 --- a/arch/arm/mm/pabort-legacy.S +++ b/arch/arm/mm/pabort-legacy.S @@ -18,5 +18,5 @@ ENTRY(legacy_pabort) mov r0, r4 mov r1, #5 - b do_PrefetchAbort + b arm_pabt_handler ENDPROC(legacy_pabort) diff --git a/arch/arm/mm/pabort-v6.S b/arch/arm/mm/pabort-v6.S index 8686265dc9418b29381942bfd87a937a3234d46e..25abd11a35253bf464fe9fd7fc1= 4fd11bc564dcd 100644 --- a/arch/arm/mm/pabort-v6.S +++ b/arch/arm/mm/pabort-v6.S @@ -18,5 +18,5 @@ ENTRY(v6_pabort) mov r0, r4 mrc p15, 0, r1, c5, c0, 1 @ get IFSR - b do_PrefetchAbort + b arm_pabt_handler ENDPROC(v6_pabort) diff --git a/arch/arm/mm/pabort-v7.S b/arch/arm/mm/pabort-v7.S index 9c70b1a21dc9204f24524df9905fbc077a82f2dc..e05c7d44d307adeba6759213374= b2aa328c693da 100644 --- a/arch/arm/mm/pabort-v7.S +++ b/arch/arm/mm/pabort-v7.S @@ -18,5 +18,5 @@ ENTRY(v7_pabort) mrc p15, 0, r0, c6, c0, 2 @ get IFAR mrc p15, 0, r1, c5, c0, 1 @ get IFSR - b do_PrefetchAbort + b arm_pabt_handler ENDPROC(v7_pabort) --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 5B9AA266196 for ; Tue, 25 Feb 2025 09:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477338; cv=none; b=HbWJamW32Fw5lexs/tGjKmH8q0NAWGfgWHl/GS7pOsMejAP1Eiy7PZyyxmwYD1XNEVQLuoT7/pQEHQyNzeo/9bFbSzrDLiwztE8pebp4b9035NJaKliePbT/T8XKny+pgnog2ME1lYEmhW1Jt3cfd4jsE8jexx1P7MG08+M9xeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477338; c=relaxed/simple; bh=mZJOXWfu791srRnVf30GNB51gYy1b2GWyvvBBPfxfVU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SD0TxaT5uP5Bzj4wYTY8CjkqMLzhUA58XCNzrkUVBmFMzDaW62vRyJfO2MRhzORH8FPwlNF5WcDjxNFQ2es/OsJQrtTTnjfYT6Hpy2kIVcS6pDU4AobtIhh6CebdlsnFZ5D8+/WF4Z0Llg/qBYs82+RxwGdzo4QIEqscBY01XdM= 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=nIAxIyUM; arc=none smtp.client-ip=209.85.167.45 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="nIAxIyUM" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5461dab4bfdso6457536e87.3 for ; Tue, 25 Feb 2025 01:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477334; x=1741082134; 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=BLyynCt450Utx2Z4sB12bYa6WPePLKZjdTj9AHDawWQ=; b=nIAxIyUMyGVjHLsCbhA8YFmwEdw9zWowKgCAoczShpEIyTsY9VgAm2k5ZBI4JLvFy6 nZQXXSToBfh9geAoLJP5tAwrLYFx8LAVzyfQKUgLcco7zRaHg1fLCOZ7z2F5pA1ftTCG RlhFdqj8UF1laJm4szkFI9klsr+y7OauxPbwbR4CmuThb5axAQRCQxRuGmSxTEkhDMwa XlXeFNpl3L9khSYonJosh9mC19iLQzwLduZ/N82G7lpYtv1GPBdCJJAWMPuonWzef6D8 lv3yL+s7O6LM90MYMZMWlxPgiTFfLtf7MZSy/pX3mZO1MJSj06wuQjMDZ3KSotBqhkbQ JqOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477334; x=1741082134; 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=BLyynCt450Utx2Z4sB12bYa6WPePLKZjdTj9AHDawWQ=; b=dSHNcuckkdpNnuGgFOaXCTdD5CD7Lk94m2D4I3Zy5Q17tnKpIoPFiqTu2CmK+rZsRn 1Ks0wyXq7tDtSpfz+k7bfgffdSdDetXBCbPeHd8OMksGz+C+/xHUWo5Gfk18vQfpeWvO YcjDGn47Gn12S8fHtYl1hhaCp7qRgGVH6bTvNCc1+eULyYqwIcQFw+ho1S2TPtZ+uMVh IuNohOSyl5Rd6TqbXxycc2f/iUboBv6r4Frz8JF7lBE7BXqs1auyUDUOHl+D1LNI3Ysr +vTkSuGAP5HvyL13eYqw78Pnnt5oX6gYZ4LKeOEmhzton/Fku9igNFzNxCaMGTkCq76n T65w== X-Forwarded-Encrypted: i=1; AJvYcCX8MvQdbBLjnQ8fnUrbRXeiM1nnSZC990QWtKiZ9KylYU1S/ijFsrpaWankbpCoHYhetsbxyjctp0Ha7Oc=@vger.kernel.org X-Gm-Message-State: AOJu0YzTPYvhXZAwaVuCFa7JhsFCmG4eqkIvNKnQ4PTN234kIooRtrVk ZJbWGIj3sOR4F0RnGDCRVTby3ezB0T6+TXr/Yt0O7bOTmU2lGDTCnwz2F9fY2LQ= X-Gm-Gg: ASbGncvbtRYz/j2bcoIpLNFlEmaZE8039c51KXxOxe6M6CsogZH6oYK+LBdqa/8OFB2 dhW1wFWwl3l4i5E7CrF7wo2kZpsvdyFATj7NKm/P0AqwALInKsju1eYECdEWkOCSFaJhb4V4tvV TuTckpQHsQDYRq1azguZztUm4mqvJwstSFMFUQu8iGcFBudXH/pUnZKwwI7uARdSedRLuPO+yHY 9bwtmjqGBGmHUw4lwcLwHuNHvW8MswTtCLAYAiox4EZzDubcXtdTl0uD995vy92i2zsQEfeK0NX 5ODMHUx4vNyOEuzg82xageBitdOqcq+nt1ug X-Google-Smtp-Source: AGHT+IHp3UDsNY1OdXjOXmJRnD8oRCpL6CgaUimOK/pVgJHgRaGWijdZG0cBnNzC1r8eEV5WV+PGEA== X-Received: by 2002:a05:6512:68b:b0:545:cd5:84d9 with SMTP id 2adb3069b0e04-54838ee7b55mr6011950e87.12.1740477334328; Tue, 25 Feb 2025 01:55:34 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:33 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:17 +0100 Subject: [PATCH v5 30/31] ARM: entry: Block IRQs in early IRQ context 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: <20250225-arm-generic-entry-v5-30-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 When dabt, pabt or und exceptions occur on ARM, ordinary interrupts (IRQs) can still happen. This isn't nice for the kernels context tracker, which expect (when using generic entry at least) that any nested IRQs happens between irqentry_enter() and irqentry_exit(), else it thinks something is fishy. This change blocks interrupts in the pabt, dabt, und and abt exception paths (all of them really) by unconditionally setting PSR_I_BIT in the early exception handler, until after context has been established with irqentry_enter() and before it is exited with irqentry_exit(). Inside the context-tracked exception handler we enable IRQs again, and once we leave it we disable them while exiting the exception. The local_irq_disable() in bad_mode() can be dropped since we are now disabling IRQs in the early assembly exception handler for all exceptions. This seems like not perfect: it seems an interrupt could still occur right before CPSR is set, or right after the userspace registers are restored in ret_from_exception. I would like to know if there is some way to set up these exceptions to inherently block IRQs when handled, until we explicitly allow them between irqentry_enter() and irqentry_exit() or if this is simply the best we can do on ARM for these exceptions to make the context tracker happy. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-armv.S | 6 +----- arch/arm/kernel/entry.c | 18 ++++++++++++++++++ arch/arm/kernel/traps.c | 1 - 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index ae2f952beea7611f0abc7bd299fc944335a21219..3dae35b0bb3f440ecaf157a4568= 7bf4690fb8f88 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -416,11 +416,6 @@ ENDPROC(__irq_usr) __und_usr: usr_entry uaccess=3D0 =20 - @ IRQs must be enabled before attempting to read the instruction from - @ user space since that could cause a page/translation fault if the - @ page table was modified by another CPU. - enable_irq - tst r5, #PSR_T_BIT @ Thumb mode? mov r1, #2 @ set insn size to 2 for Thumb bne 0f @ handle as Thumb undef exception @@ -847,6 +842,7 @@ vector_\name: @ mrs r0, cpsr eor r0, r0, #(\mode ^ SVC_MODE | PSR_ISETSTATE) + orr r0, r0, #PSR_I_BIT msr spsr_cxsf, r0 =20 @ diff --git a/arch/arm/kernel/entry.c b/arch/arm/kernel/entry.c index 01e4339ccdb4951e04a89fb91ad7c6e1991e09af..3881670e0987ee40be6fff32f41= 2edcf4f3ec80a 100644 --- a/arch/arm/kernel/entry.c +++ b/arch/arm/kernel/entry.c @@ -17,8 +17,18 @@ noinstr asmlinkage void arm_und_handler(struct pt_regs *= regs) { irqentry_state_t state =3D irqentry_enter(regs); =20 + /* + * IRQs must be enabled before attempting to read the instruction from + * user space since that could cause a page/translation fault if the + * page table was modified by another CPU. + */ + + local_irq_enable(); + do_undefinstr(regs); =20 + local_irq_disable(); + irqentry_exit(regs, state); } =20 @@ -27,8 +37,12 @@ noinstr asmlinkage void arm_dabt_handler(unsigned long a= ddr, unsigned int fsr, { irqentry_state_t state =3D irqentry_enter(regs); =20 + local_irq_enable(); + do_DataAbort(addr, fsr, regs); =20 + local_irq_disable(); + irqentry_exit(regs, state); } =20 @@ -37,8 +51,12 @@ noinstr asmlinkage void arm_pabt_handler(unsigned long a= ddr, unsigned int ifsr, { irqentry_state_t state =3D irqentry_enter(regs); =20 + local_irq_enable(); + do_PrefetchAbort(addr, ifsr, regs); =20 + local_irq_disable(); + irqentry_exit(regs, state); } =20 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index d3a689bd05955f1ae46a6341e456bb097e831311..b2eaab9cc4977c448f77faa4e6b= c22a0749d1f9c 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -515,7 +515,6 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reas= on) pr_crit("Bad mode in %s handler detected\n", handler[reason]); =20 die("Oops - bad mode", regs, 0); - local_irq_disable(); panic("bad mode"); } =20 --=20 2.48.1 From nobody Sun Feb 8 17:04:26 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 9930826A1A0 for ; Tue, 25 Feb 2025 09:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477339; cv=none; b=agb1e0RHzvuY7MrDPgpoaxh6ECWyrckugIERUhwO9TPTwcGABdhsVW6InNSbnTKZA9nV9DW4ifDSxO9+V4rRFWxY2STkVpU6yD+j9bQUwlkIoKRL6NsFEurdCqVW/YxQNuNxQPO04Tam1pypt0/7NKM8ZVExjFXWO2LlwrEi+l8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740477339; c=relaxed/simple; bh=E22mkU7jEFL4ZHmD3IpEdAIvC0obWKhhIqtvRZZoLw8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E5vroAPYqkk9qiZl9zdEp3ai08pE8PhOVd2G+7yFjv9VAuvejhmuKlQdjjV/iTvfWhgd5upNNG33gzNw3LPK93wpXSqJ8xXXhdjD56AZV0MtO0Mwe3djqpL8CR6W59R+qav7A0D9tkpIUStYKMsha41v034r+t+U0ej8yy7IBXs= 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=Og5sPRYN; arc=none smtp.client-ip=209.85.167.50 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="Og5sPRYN" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-543d8badc30so6249370e87.0 for ; Tue, 25 Feb 2025 01:55:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740477336; x=1741082136; 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=oIYvJaonUYyfEumf+Z+WmSCNyMMQcgPh7imvn/7wUEM=; b=Og5sPRYNmm4f01RVojE4Cc49++ftLZx80CCa5DHjryIjJQSGP6GwnLtTf8uxkcGKx2 vbinvMtwiapnWt/7iMLiDcPyi7GxgXMgfzinfwtxVBzXFNk8sO0uKucqWI9t8d1PMUqw 6q+VErHtZm8AbAF4GWvq9IkdAhPCi9o7V4RnYS2OPTBbtx3bkz0Y6/8FOQUQmVzvRnag eougkTZXhnj/iLUQxMXigGjh1meC79smAN1oxJC256BzecLEvw6Xf/swKf+n6A6nhuCw h7Xvy4zyjwdSkcQYR1Onig2ibPEF8yy5GPTI30QYCPL12Cx+Vxyj+69tDev13jG9K9Yd u55w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740477336; x=1741082136; 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=oIYvJaonUYyfEumf+Z+WmSCNyMMQcgPh7imvn/7wUEM=; b=PyECK7lCrmRVcM47j5o6wUnWp+MlunzEuJXbDm4RtyLtdYh5M3VDKBgY+h9JEBjigi 1utvNx1F21Nv0LTYgj/3Vw7u8fGqQtgOIiHJSrRE65Iq9kueINFuQGbkUByIQxh21Dqh YRriTnbtmCNpffd5+gG6HQMS/9INwtH87shoTHn9HIa5Mc0uZxVxX/HdRSUjtlSuVOym YHNItJ89AXyUWzgxJG5JOoCgFp4bM6wcrZRyY4MTYBxLHx9EELduDfigBulyNgB/H7RO 3oEYdi5K6Tas/zrE5qYsfO1uZ4SfHrjZqYyhy76+eRfx1TyuoZUlLCTvvsBvFewW619S c0lg== X-Forwarded-Encrypted: i=1; AJvYcCURj0GOUoIeoX9OQPe9HAN96kTVb4BDLGDj+V0V49N8x32lC71M5auiswzhJ45G5BwQOoHydlXwwGorf74=@vger.kernel.org X-Gm-Message-State: AOJu0YxSLTbi+2LJZKw3DSa+eLqC6jJDBLLQYkjzqLLWd/ERlqemKOb3 AyxH6uS1lLS6MJIchHVcEGgtwPuyE6vMC/1gzfPzi7WgamJUnNj52G6uiM7H0dE= X-Gm-Gg: ASbGnctfqfWxOE693sEN/xzivr+q7aq9dqrv6GjZ03gFdhLxR13/QmnXZE/gFlvLtD9 l2jQweSq+X8lUYK6MJAxlq+jLxy03Ov7uYRFuonWfNGeMYuz65R74s8+ZTg0dYUyhL20d4d58Vg NLhOSbAs+kA0vWgYqgbxUqPNXReoVHkVvrJjwgc5vJnppI6T5HMiwfRVPUnGVGqr284jkLDb2yP sKYkCZ5I2UyoeMWycRjMd14QCQjWsE2z0iUJkjnYTFONfDQSf8uXybqex2RLqNCrj79VMmBp1IM FIrz8niRWINQlR8tGSnxstfeA6qVBfpHGW1t X-Google-Smtp-Source: AGHT+IEadLgBcodjV4MeijK1RxbLNXPOedOFvhDLMaZ6EVsgBHRAKm5NLB+ewxhEdUYnEE+8TXegEw== X-Received: by 2002:a05:6512:224b:b0:545:54b:6a05 with SMTP id 2adb3069b0e04-548510eebcdmr998842e87.45.1740477335666; Tue, 25 Feb 2025 01:55:35 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b261esm132867e87.24.2025.02.25.01.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:55:34 -0800 (PST) From: Linus Walleij Date: Tue, 25 Feb 2025 10:55:18 +0100 Subject: [PATCH v5 31/31] ARM: entry: Reimplement local restart in C 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: <20250225-arm-generic-entry-v5-31-2f02313653e5@linaro.org> References: <20250225-arm-generic-entry-v5-0-2f02313653e5@linaro.org> In-Reply-To: <20250225-arm-generic-entry-v5-0-2f02313653e5@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 X-Mailer: b4 0.14.2 The former local restart hack to restart syscalls inside the kernel if we get restart signals while processing a system call was deleted when converting the architecture to generic entry. This makes strace tests fail so the hack is necessary. Now, after the conversion to generic entry, restore the order by reimplementing this with two TIF flags that help us to issue system call restarts immediately in the kernel. This is essentially a reimplementation of commit 81783786d5cf "ARM: 7473/1: deal with handlerless restarts without leaving the kernel" from 2012, but in C, on top of generic entry. Link: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-June/10473= 3.html Link: https://lore.kernel.org/all/1340377626-17075-1-git-send-email-will.de= acon@arm.com/ Signed-off-by: Linus Walleij --- arch/arm/include/asm/thread_info.h | 4 ++++ arch/arm/kernel/signal.c | 17 +++++++++++++---- arch/arm/kernel/syscall.c | 22 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thre= ad_info.h index 84e58a9cdab63ad264c2cd2bad64239d1912cbe7..09dcaeef645a4ab45f40a14f8d7= b46f408225f81 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -150,6 +150,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp *, #define TIF_USING_IWMMXT 17 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ #define TIF_RESTORE_SIGMASK 19 +#define TIF_LOCAL_RESTART 20 +#define TIF_LOCAL_RESTART_BLOCK 21 =20 #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) @@ -157,6 +159,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp *, #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_NOTIFY_SIGNAL (1 << TIF_NOTIFY_SIGNAL) #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT) +#define _TIF_LOCAL_RESTART (1 << TIF_LOCAL_RESTART) +#define _TIF_LOCAL_RESTART_BLOCK (1 << TIF_LOCAL_RESTART_BLOCK) =20 #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ _TIF_NOTIFY_RESUME | _TIF_UPROBE | \ diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 35d2bb3cd2b442dac164548037262e065fbfe12a..a4fc6522124fd3ac3df7149ba38= cf4b097196e06 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -541,7 +541,8 @@ void arch_do_signal_or_restart(struct pt_regs *regs) unsigned int retval =3D 0, continue_addr =3D 0, restart_addr =3D 0; bool syscall =3D (syscall_get_nr(current, regs) !=3D -1); struct ksignal ksig; - int restart =3D 0; + bool restart =3D false; + bool restart_block =3D false; =20 /* * If we were from a system call, check for system call restarting... @@ -557,12 +558,12 @@ void arch_do_signal_or_restart(struct pt_regs *regs) */ switch (retval) { case -ERESTART_RESTARTBLOCK: - restart -=3D 2; + restart_block =3D true; fallthrough; case -ERESTARTNOHAND: case -ERESTARTSYS: case -ERESTARTNOINTR: - restart++; + restart =3D true; regs->ARM_r0 =3D regs->ARM_ORIG_r0; regs->ARM_pc =3D restart_addr; break; @@ -593,8 +594,16 @@ void arch_do_signal_or_restart(struct pt_regs *regs) } else { /* no handler */ restore_saved_sigmask(); - if (unlikely(restart) && regs->ARM_pc =3D=3D restart_addr) + if (unlikely(restart) && regs->ARM_pc =3D=3D restart_addr) { + /* + * These flags will be picked up in the syscall invocation code, + * and a local restart will be issued without exiting the kernel. + */ + set_thread_flag(TIF_LOCAL_RESTART); + if (restart_block) + set_thread_flag(TIF_LOCAL_RESTART_BLOCK); regs->ARM_pc =3D continue_addr; + } } return; } diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c index ed3ab51283c06c1398ece2ad3ee1fae16cd03ee8..20b59f5dfdc8d2e8c168ac04c22= 44cb6371e5672 100644 --- a/arch/arm/kernel/syscall.c +++ b/arch/arm/kernel/syscall.c @@ -11,6 +11,7 @@ __visible void invoke_syscall(void *table, struct pt_regs= *regs, int scno) { int ret; =20 +local_restart: scno =3D syscall_enter_from_user_mode(regs, scno); /* When tracing syscall -1 means "skip syscall" */ if (scno < 0) { @@ -34,4 +35,25 @@ __visible void invoke_syscall(void *table, struct pt_reg= s *regs, int scno) syscall_set_return_value(current, regs, 0, ret); =20 syscall_exit_to_user_mode(regs); + + /* + * Handle local restart: this means that when generic entry + * calls arch_do_signal_or_restart() because a signal to + * restart the syscall arrived while processing a system call, + * we set these flags for the thread so that we don't even + * exit the kernel, we just restart right here and clear + * the restart condition. + * + * This is done because of signal race issues on ARM. + */ + if (test_thread_flag(TIF_LOCAL_RESTART)) { + if (test_thread_flag(TIF_LOCAL_RESTART_BLOCK)) { + scno =3D __NR_restart_syscall - __NR_SYSCALL_BASE; + /* Make this change visible to tracers */ + task_thread_info(current)->abi_syscall =3D scno; + clear_thread_flag(TIF_LOCAL_RESTART_BLOCK); + } + clear_thread_flag(TIF_LOCAL_RESTART); + goto local_restart; + } } --=20 2.48.1