From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 4BD881EE7BB for ; Tue, 7 Jan 2025 09:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736242913; cv=none; b=vCMkTLl25yibuzvGejuMBiOn6vOSGlqNMSlZm79NbMdLs24ZO/WiO8BgZb463yUnGRkmmvo1m/Inr8clZmPAx05kP+RWoxke957h7+/iA89xJmx0TcUiYDvutX46yR4ZP0Kh5YMpT2o3qMXfuWxXoRz6nbiuyYYZxuyjR6OWZ8g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736242913; c=relaxed/simple; bh=h29ywHzX2HS9p2lCQuSMnQALp1JUyIUzD3Ins/cc81M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=clx4YN6eYLzg9EKpt7ClwqtiJZyRYab+bbt25o12MtjmKQNo55z4KxC+Bi5cjtkwxqdTqOqVprU6st+FIWuogLaIL5Pz5eMJTWR9qKDf1j4SPubvGLOgMRiFJW6TNYE43GEvI60Fynj32g8CT5ElL7xokcYvP871Z3YFRT+igyE= 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=DBx3EGPZ; arc=none smtp.client-ip=209.85.218.49 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="DBx3EGPZ" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-aaee0b309adso1866416766b.3 for ; Tue, 07 Jan 2025 01:41:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736242909; x=1736847709; 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=MgjerbaRhix+kd50qFGRKR55bWj7bTqB01M6nHY9FI4=; b=DBx3EGPZ1fMaMaJLrlj3wbR6PLRbFy0kPwGdDEVtp31UQqB0lE1OlNPT2M8ncdVTTs ekGuDgo1e2YINw74Bl0MLaMRXUVqi7xHplTu7waqX0wpUHNQmvRc3EXNFHLZOkFQGeIW +FsZKEF5e/7385b9TMrSRAZyJgHbyeC9TLEcoB7YmbXJBLT4i2JnEkgy1vaTlacydAEX P4YfdhHRVrX99yXjp08L+BVyUVSZf2T/PYdw2zZztmyw8/qM8q3RmaWi9dpJ2lryMadp kpiBK+CiFCX8gAEZQC5WRcicXnKgfWmFnA6yANaJCZvEOhCMJua6L8B515GyRM9mLK7G 0+iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736242909; x=1736847709; 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=MgjerbaRhix+kd50qFGRKR55bWj7bTqB01M6nHY9FI4=; b=EfiFeeBNtCDIrnEFh4OUiNfWlvz+bHOWjlc3+M7y34wY1B70hJ34Xmb3FZSShET9pY g4G14NmEYNgRrCPYV762/h5WMLw+3uQwNLSALWrs/14vXbxdRpgSzXBKXFNETVkRa8Lr VQAfGWWVR4yDxHDrS3ql/jw37mxxBoSPC1zgeh3urghzag7NVUXJaP1L1qg3Zbt8b7Be cyDkHruK1bFylKWuPQkTS1v64SvvnFbmpVGKGy306d8sy3O2l9XJX32UQRjzuruoHivr vZVfFTsWIDFu0Cxo5R92YAVVJ8eYkJ6WuFluZr+UbBePr8j2l/aW72CaHzKS38w02fED m32Q== X-Forwarded-Encrypted: i=1; AJvYcCUg5eLxvBpSlbXXEtn6K0P3OjieZBDFYaNml3Fzq2ab6NrJ4pTtee1njG7YXIbSohm7YA0XLeFBDyyYNKs=@vger.kernel.org X-Gm-Message-State: AOJu0YzU3/fRN4QDkY1xghJUivc4D7Ax3dWxcMGZH1eBVu3zNyCT1y/2 nxpc4Z1o8fzZltAbkwWaI+JE3FjElgUr3yI3sHjjV64Gcm0h/NtZB6Viwtygz3o= X-Gm-Gg: ASbGncuguC3n230TTJpWdV4meNXQEVPnUfRbScqKGQzkWM/KC7Y5cZkl1iqWoorit27 K+pRGj7So7M/nTohp/DgV6mj73ctD2MvvU5sHRN8gLYywLvR7I17Ao5EyDTEpR+St1es04Impvh nruSJoLtSFy5HXnO7OjWoUkg558fodbuVIRvfST7TxVBkejzXZOmRHvVfqEs+IxyI2/49l+gRbp PmaTMX/G9RyCBJ53IftcOgFYBTDqAPz3XCsFPMW63fQOET9Roo4a7py6KFz5iVW07w= X-Google-Smtp-Source: AGHT+IHeBpDVZuVWnjTw8CL4OhJcL4lUdEaCemS7Kwan56Mqu4ixU2+PMFWEVUVxrqr/Ynh4ykgBdA== X-Received: by 2002:a17:907:3f10:b0:aab:c6d6:62ac with SMTP id a640c23a62f3a-aac26966057mr4407081966b.0.1736242909536; Tue, 07 Jan 2025 01:41:49 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f012229sm2356901166b.133.2025.01.07.01.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2025 01:41:48 -0800 (PST) From: Linus Walleij Date: Tue, 07 Jan 2025 10:41:33 +0100 Subject: [PATCH RFC v3 17/30] 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: 7bit Message-Id: <20250107-arm-generic-entry-v3-17-4e5f3c15db2d@linaro.org> References: <20250107-arm-generic-entry-v3-0-4e5f3c15db2d@linaro.org> In-Reply-To: <20250107-arm-generic-entry-v3-0-4e5f3c15db2d@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..8b8cc9a1eefbd00dd75d4e344576fc184a413768 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); diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h index 7acccc96840c8a17744cc3f2894f19d142aba4fd..bb753cd3e29fc54186543c48b2aee7b221301a37 100644 --- a/arch/arm/include/asm/signal.h +++ b/arch/arm/include/asm/signal.h @@ -23,7 +23,6 @@ typedef struct { #include -void do_rseq_syscall(struct pt_regs *regs); void do_work_pending(struct pt_regs *regs, unsigned int thread_flags); #endif diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index df564388905ee019cd5553f8b37e678da59e3222..3559e0a9f5e079f1af91392bf000d39f9b45906c 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..47233804733752aef0f2fec6f54badeab18e98d0 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 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; } +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..03b20637a2e1ca6f327223c9132915a97a9c4697 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; } -#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. -- 2.47.1