From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.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 106D41E570B for ; Tue, 7 Jan 2025 09:41:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736242901; cv=none; b=QQVZNwH26VBELjmpQAqqieAjqKkelBsOOW+mlKTbkOY5pSzjdwDlAmpc8LG251eiJSnPmSJ4/FwbA4ugHdgyQwnKcSiDuNmt/mMTMQheiUivJ/KrfVpemkZQhwVtWtya7qL551NVifCsq5IZ3RMp8rL39Wxnq5VBvJsIqUco9ps= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736242901; c=relaxed/simple; bh=V4xHwREnW+I+cq6bdIKuhAQF2oq/KKfMcs39/zfo/p0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NS9AbFtvD/SyU5XYuPvGN3dNInLAcNSSebdxVGu2L5QU7rP12Jdg4as18Ewq2sbedUzW80UtDC7TaU5r3oL2NWWQwI2BWw4C9x1IKCajV+4I1eM4t/Rd4/uIEC59I6jQw7txOcBeVjWhPjxznmBCptolS3GdoN7wQKb2If/zgJ4= 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=d3zLnRKv; arc=none smtp.client-ip=209.85.218.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="d3zLnRKv" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-aa68b513abcso2839216666b.0 for ; Tue, 07 Jan 2025 01:41:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736242896; x=1736847696; 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=eMg93yBwVVTokRKyzFlWLmvMqpyEbrII8V8DSY/WZf4=; b=d3zLnRKvGalpnKESOCQ6hD++0/X1od8IeXf6HpyLS1YTnChN3EDIQFkK76X11TVYMO WGzEbJZ88mBHjy7Hg+yAxtj2S8PGQdwdPvu3UKJ6ggc7OOcFLU4PsZgiCl3tr0kXXwYi qSnRl6Xqz7M1of7eHAZgKXCFV0VETo2FYV0O/OAbY7hpfYZnsNth5rdjkXsH39zYop6Y Cq3XpfThi3ZL0h+JYteSHZudQIKgrYZqfLRp7hLqk8rwlmlCiazQCCk9LvNubgSNhK4S Uqy4hISDMU0e6RGtZmQiw3mpvLXCcepejjcI/WQCKPP240G5eo3E186n3D3jt0jn09jR USiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736242896; x=1736847696; 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=eMg93yBwVVTokRKyzFlWLmvMqpyEbrII8V8DSY/WZf4=; b=MXmJ3lYDT79lz0vwUJXhHtL/zjV5Aji1aB8Zt8YjZNo3egLyjQjX84HA+k65VDUTnf m7x6l4LbK+Ss8fxaf1UfWcw/LM1/STQdvNG2wBZx4LZ387HlGbwpBrYKHcsGIqoL0w6b 9gaIh4DG8RVAjAKb1I7qEn7UN8KusBZNuWFIwlCPHG9NSI0UrKmfVvhAwqa8tX3q0Nip e83WLe+HdNPoHEKeBKhvqgocQoxzTXqwQx2KNLP9S+l0riTIkVwEH4Z4gccUxTHr36s4 Tf5O3BWZ3nJw+Xt5RbgrUwRLrpDDyaiyPw03CwHbgeOc3CSHpvPypHkEemk/VvSC8+z8 vIeA== X-Forwarded-Encrypted: i=1; AJvYcCXsbJ9Jq7RRiCcyerr5n0KRakAA1Z1dN1P+qLWWYrqWrUDPhBKu0sTMQ78dfgGN6uI0vh2B9xa7hoXJjns=@vger.kernel.org X-Gm-Message-State: AOJu0Yxv2v+jt7tmqVO9nNR8EMgXkb9rjF3Kk++OktgD4o3/lhQ+PH8Q GRz0uitvaota8JBlpxNEegXBDIaG2US/uO0USC+1YbCrYAELCvgdplChJBql8z8= X-Gm-Gg: ASbGncuRCfDRlqpcbiuWVMcIw7tyqcEolTtGmOGHAv5yYD12E1LTw6B8MJHNsw3X5Uc NpPrwMIcxWn2CJu7djGbCeP0ifXhbXNoYFmGDZc3XZrQ/PC/setWFlu4vptOo19lr9pg30tDeom AVhlypOvMeGHeOfNRAF3NmdGACmGMmFVwpghRrWsJS8FzjctIN59lLhrCbUfMwhz2xgSaMInnFA +FGW7+S+jRZfX0Ll0saKScJN28FQsGDtedAyx9tIdsf8BqqoSt+AKtLPHrqOLlzFJY= X-Google-Smtp-Source: AGHT+IGWBlZrGMzIZx/5MGyqW+jdyguusLjBOk7dr/oDrWgqG28clwNqww9qx9LhDjGwhVlgBeZiHg== X-Received: by 2002:a17:907:7208:b0:aa5:43c4:da78 with SMTP id a640c23a62f3a-aac33685dfemr5301778966b.51.1736242896331; Tue, 07 Jan 2025 01:41:36 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2025 01:41:35 -0800 (PST) From: Linus Walleij Date: Tue, 07 Jan 2025 10:41:24 +0100 Subject: [PATCH RFC v3 08/30] 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: 7bit Message-Id: <20250107-arm-generic-entry-v3-8-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 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..66067d165ba3fbbe0f840a89ae396eb1a311bacc 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, int scno, void *retp); +int invoke_syscall_trace(void *table, struct pt_regs *regs, void *retp); 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..3cfc6d952ff99be9c4c1be4481ac3039260e3e57 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..377e16c8c53c8e809e3f8b157a889ef115d5c043 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); -__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 = syscall_trace_enter(regs); if (scno == -1) return -1; -- 2.47.1