From patchwork Tue Feb 25 09:54:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13989753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C3DEC021B2 for ; Tue, 25 Feb 2025 10:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=QZ+1V9qTPsDzOzqvLQMw/vPgzhrwZ5TSLeEMjw/aHNM=; b=tiI5parfeBdLU1dO4FWt+rgOeB 1diSE7CzZG7mTV8elDMmPzpycmrLjBDpDV+tz0rBO/McnN/DctQizqN90Gcm3FJbisEebSUwzp2R7 m4Cw29NBce6NrrilD8wPna0pMrWHsHM42dSPXJFq1n2qa6Pgd3w1OBDUZhFjrA2lpG20BBnjsBXXg IgOkERWnX0P62F82xtRqnyh1Hoq5R782BNS96PhNFAxxsXyoPOAWbTl4VSpYa5lu6dBd7JS16mpdT Rlnv8TAvAjQYbwVtLNI8aYoL0MewXQwWJxOXsDun4YMw9SgYA3L28dJY16Vioq6Rt1gtEKRIVrdrx AVMy9+Pw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tms6d-0000000GoQG-1eX1; Tue, 25 Feb 2025 10:24:03 +0000 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmrei-0000000GheR-2eIR for linux-arm-kernel@lists.infradead.org; Tue, 25 Feb 2025 09:55:14 +0000 Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-5461f2ca386so4626911e87.1 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=lists.infradead.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=En34w7+jh5gfhgC/tnIfutzXWAh3jHf+aA3YHb0Ck8Q65mVygbvGs2PT3rTbrcjw21 04U72dsAr1rACS/K+s7f+EXUk9Ll9gV0MNm24LCRX6fne9XrVDxEK1IaaqgE7ltnovAX +Pch4md6W+y3ovt59Gu56oW6qmKYyMvs1tUrYoh8yI61+uP/HkSFi4FyWeDfbtlR1FHn Fkf9Cqus6G3hjnyDDxJxf5Mx8X1p+BG3jsGQCiTrhhelNXxDfwbUpHEY7830DtUP75ik JN4FzzrdaKWan/8fc1U2Z/q79d/8cm4jc2alNlFQ21EbeCy3nYSTV8IFqA3J/z1qTGdu evWg== 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=fXpWfnKlq2vaE70Cq/+knuH0a+dj0iatnPfOM4fNue5JlrXLl0heZbGPqMk04bSX8b 12D6B2yvJoEb9Uz0G4KAKCmP4/aYyanc4SzEj0AvOaBSECekebJ82ztJtu/r/LSJ/RYA 8GNGwryTrSUSHiYoQZHS48ZAmTWwnzps/HM6WIqV6atN2KAtjZT4H6qBlsPl+c0ilLFL NmGATjLnSwq+Obwz2fQaNDfjmh6+j6LmygdGezGFykbI82wStujEg/q3EijZTJCQp0hA 5mh4IDDE3tpgZ6tqI/+QfM+9TQdC4Zbui6ZwJz7SpI3MIjnDcYWAlXJD1Wn7btJ2gbi7 4TyA== X-Gm-Message-State: AOJu0Yw16z0hPkaPc859uHML+EZpPkUnudooiZxtskjiJnDV9+B8QnYw HFqf+mVxKMYblEPkxnod1f2Y8EFVvOSGBQRUnXJ3qp+uFvRhvwzbUUPrwXDn4qg= X-Gm-Gg: ASbGnctTVRzLdTA0jHUsQOYxSUIvWjbIw1fUASS+U45VoqVZ4yNlj/jJ9wr7fkb32Qo VEIR73SLouoAYrtM4Gw4odqHf9MW3YAQ3/C4qaPilZhParsrYXxgJn268YWMsxCW9wmc0FH1l5z bf+UAKjESal0O4iLA29RbhwKSBA+i47o0+frxCJmjR1T8YByEo3regnP+meAZ1t5qSve7+Mwovu mdb/uOfyr+k+EQEjMjyi0bz39D7o0C0yQ6/5lH+4oKRsYklP+m7xD6cZAQNBlvQzbVe6dlXqNR+ NFfJWlOP/7J2Wbwd4s93IHFYcUVFN39PF3WJ 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 MIME-Version: 1.0 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250225_015512_693563_E4E8E3CC X-CRM114-Status: GOOD ( 21.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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..cb0073c4151bf70a82d15e17a95b6b6f48b245d6 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[]; 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); 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..dbc947d301ec11bb13007cb4bb161c035ede5c10 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 -__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 .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) #ifdef CONFIG_OABI_COMPAT diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 07b0daf47441f1f76a8af416acc74fa5ed770403..ac7b98ae47249b4a00fc1cb871bb2d309bfd8c88 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; } -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..e90f04f35b3485968a1e9046cf0889f56cca92e5 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_regs *regs, int scno, void * return sys_ni_syscall(); } -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); -__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; scno = syscall_trace_enter(regs); if (scno == -1) - return -1; + goto trace_exit_nosave; - 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 = invoke_syscall_trace_asm(table, regs, scno); + goto trace_exit_save; + } - if (scno >= __ARM_NR_BASE) - return arm_syscall(scno, regs); + if (scno >= __ARM_NR_BASE) { + ret = arm_syscall(scno, regs); + goto trace_exit_save; + } - return sys_ni_syscall(); + ret = sys_ni_syscall(); + +trace_exit_save: + /* Save return value from syscall */ + regs->ARM_r0 = ret; + +trace_exit_nosave: + local_irq_enable(); + syscall_trace_exit(regs); }