From nobody Mon Apr 6 18:43:05 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B437DECAAD4 for ; Sat, 3 Sep 2022 16:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231573AbiICQX6 (ORCPT ); Sat, 3 Sep 2022 12:23:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229657AbiICQXv (ORCPT ); Sat, 3 Sep 2022 12:23:51 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 727203DF26; Sat, 3 Sep 2022 09:23:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id B56DBCE0613; Sat, 3 Sep 2022 16:23:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DD98C4347C; Sat, 3 Sep 2022 16:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662222227; bh=thj4lp5B0J2/kj7Zi1BMTTtT9fAnJMteMKwuLQ0ArOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L1+aqePh3YUl08I/8fm3yNxtjuAlMmF22bx5ehpr9WT67qVfD+H89UCSkcQb/aLVB 2NgCQIILKBmcne0lsXQ4IjY3kiwJxrtWEcVDUccBIwJj+xp2BBbv39/+Grkh4ufLkt K91rg+/bdppmXjHBKL8/+fsOwTwEh6RA27omRUzQiTPDRz8Ke7YGMSqk5VWbmO8V0g cuN032j9tv98WDWH8CRTakVr3d5ZHL/aAuIuVJy9h6CrYmFwF6TJSlC05IZMYI+l9p sn7aIfOyaWt05CVB+QByWImFn4GjzoARn6PGsB37TcCAMXurxtZTf+xyhaxTSjNZpx M7BmVLEk5oE7g== From: guoren@kernel.org To: oleg@redhat.com, vgupta@kernel.org, linux@armlinux.org.uk, monstr@monstr.eu, dinguyen@kernel.org, palmer@dabbelt.com, davem@davemloft.net, arnd@arndb.de, shorne@gmail.com, guoren@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-snps-arc@lists.infradead.org, sparclinux@vger.kernel.org, openrisc@lists.librecores.org, Guo Ren Subject: [PATCH V2 1/3] riscv: ptrace: Remove duplicate operation Date: Sat, 3 Sep 2022 12:23:25 -0400 Message-Id: <20220903162328.1952477-2-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220903162328.1952477-1-guoren@kernel.org> References: <20220903162328.1952477-1-guoren@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Guo Ren The TIF_SYSCALL_TRACE is controlled by a common code, see kernel/ptrace.c and include/linux/thread.h. clear_task_syscall_work(child, SYSCALL_TRACE); Signed-off-by: Guo Ren Signed-off-by: Guo Ren Reviewed-by: Oleg Nesterov --- arch/riscv/kernel/ptrace.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index 2ae8280ae475..44f4b1ca315d 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -212,7 +212,6 @@ unsigned long regs_get_kernel_stack_nth(struct pt_regs = *regs, unsigned int n) =20 void ptrace_disable(struct task_struct *child) { - clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); } =20 long arch_ptrace(struct task_struct *child, long request, --=20 2.36.1 From nobody Mon Apr 6 18:43:05 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A00B6C38145 for ; Sat, 3 Sep 2022 16:24:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231423AbiICQYF (ORCPT ); Sat, 3 Sep 2022 12:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231517AbiICQX4 (ORCPT ); Sat, 3 Sep 2022 12:23:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89B803DBE8; Sat, 3 Sep 2022 09:23:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0A6D9B80113; Sat, 3 Sep 2022 16:23:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 973D6C433D7; Sat, 3 Sep 2022 16:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662222232; bh=KP0swQ0+kClqdN6HeWUaPcd4siKNWtxg+hX1oInsUFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MW5Ml0XVb8n9WtUPo4R8Hz1XeXEfIRU7wXu1TqWJx+L+2V65xknIh78V4JcHnRzzN G+WuNhhGSYt5fjNP5j28KCOfJJG2WJ25OixJIuJqB7p1ZHffDastM6SftSYAecdcnS 0J3Vyk7KdRHeNiZTHd7PeNAESrRRoyJlj3UF5rZ5mMPQnXrpcxgU8sxoX7fViklSe+ gmv5TRHOHGHJYni6v+DCI0ZCTQCn5UrnQUa0q6dTzjfaIvRRMmdbsMEeAiOcPvo0Vw fxi+uBeeC1vvy2fRaE+/1EbxRexGTtBMRSNX9K4rYgDoVtH0OE3Duyw0T1OWbZZZvK x5E5UZhz8GA7A== From: guoren@kernel.org To: oleg@redhat.com, vgupta@kernel.org, linux@armlinux.org.uk, monstr@monstr.eu, dinguyen@kernel.org, palmer@dabbelt.com, davem@davemloft.net, arnd@arndb.de, shorne@gmail.com, guoren@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-snps-arc@lists.infradead.org, sparclinux@vger.kernel.org, openrisc@lists.librecores.org, Guo Ren Subject: [PATCH V2 2/3] openrisc: ptrace: Remove duplicate operation Date: Sat, 3 Sep 2022 12:23:26 -0400 Message-Id: <20220903162328.1952477-3-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220903162328.1952477-1-guoren@kernel.org> References: <20220903162328.1952477-1-guoren@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Guo Ren The TIF_SYSCALL_TRACE is controlled by a common code, see kernel/ptrace.c and include/linux/thread.h. clear_task_syscall_work(child, SYSCALL_TRACE); Signed-off-by: Guo Ren Signed-off-by: Guo Ren Reviewed-by: Oleg Nesterov Acked-by: Stafford Horne --- arch/openrisc/kernel/ptrace.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/openrisc/kernel/ptrace.c b/arch/openrisc/kernel/ptrace.c index b971740fc2aa..cc53fa676706 100644 --- a/arch/openrisc/kernel/ptrace.c +++ b/arch/openrisc/kernel/ptrace.c @@ -132,7 +132,6 @@ void ptrace_disable(struct task_struct *child) pr_debug("ptrace_disable(): TODO\n"); =20 user_disable_single_step(child); - clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); } =20 long arch_ptrace(struct task_struct *child, long request, unsigned long ad= dr, --=20 2.36.1 From nobody Mon Apr 6 18:43:05 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9080BC38145 for ; Sat, 3 Sep 2022 16:24:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231517AbiICQYQ (ORCPT ); Sat, 3 Sep 2022 12:24:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbiICQYF (ORCPT ); Sat, 3 Sep 2022 12:24:05 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 881D33DBE8; Sat, 3 Sep 2022 09:24:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id A5B39CE0494; Sat, 3 Sep 2022 16:24:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4F72C433B5; Sat, 3 Sep 2022 16:23:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662222240; bh=cGpgA7bsAcBu9cM5k7EvryK/rECLcgu+ArqhQVWAdzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WNT4uPAZzNgEikgI4Tv1F4v0oQtzH4tIjUhl/cJA/YVa6QRSRGDxTafbzszqINzUO tqsJihurGXByqEToL7OKYmvozHPC85pvH3OQ1ING+FLiyj8b29mWczHjOq3aok7IkK DnRiBGkzL1WjZ89jCx75dHqWGZatw84FR+Lh/kUIHPU58dRmpHYk0TJz5CIC3Mk5sD WY2rx5GYBukKbAeCm3PA2k+xx+p2jUXmRBBV/ilo2d0myUtNurY7VwSvd8kYBq1QVD bx9p/H6H1CFsRm+JgTcXArsNNteVqQKa5G28zWPlO5IMZLUskgFw+9hPGGv3Ar+mnv Jfp80Mx78OLKw== From: guoren@kernel.org To: oleg@redhat.com, vgupta@kernel.org, linux@armlinux.org.uk, monstr@monstr.eu, dinguyen@kernel.org, palmer@dabbelt.com, davem@davemloft.net, arnd@arndb.de, shorne@gmail.com, guoren@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-snps-arc@lists.infradead.org, sparclinux@vger.kernel.org, openrisc@lists.librecores.org, Guo Ren Subject: [PATCH V2 3/3] arch: ptrace: Cleanup ptrace_disable Date: Sat, 3 Sep 2022 12:23:27 -0400 Message-Id: <20220903162328.1952477-4-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220903162328.1952477-1-guoren@kernel.org> References: <20220903162328.1952477-1-guoren@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Guo Ren Add a weak empty function in common and remove architectures' duplicated ones. Signed-off-by: Guo Ren Signed-off-by: Guo Ren Reviewed-by: Oleg Nesterov --- arch/arc/kernel/ptrace.c | 4 ---- arch/arm/kernel/ptrace.c | 8 -------- arch/microblaze/kernel/ptrace.c | 5 ----- arch/nios2/kernel/ptrace.c | 5 ----- arch/riscv/kernel/ptrace.c | 4 ---- arch/sparc/kernel/ptrace_32.c | 10 ---------- arch/sparc/kernel/ptrace_64.c | 10 ---------- kernel/ptrace.c | 8 ++++++++ 8 files changed, 8 insertions(+), 46 deletions(-) diff --git a/arch/arc/kernel/ptrace.c b/arch/arc/kernel/ptrace.c index da7542cea0d8..c227e145fede 100644 --- a/arch/arc/kernel/ptrace.c +++ b/arch/arc/kernel/ptrace.c @@ -317,10 +317,6 @@ const struct user_regset_view *task_user_regset_view(s= truct task_struct *task) return &user_arc_view; } =20 -void ptrace_disable(struct task_struct *child) -{ -} - long arch_ptrace(struct task_struct *child, long request, unsigned long addr, unsigned long data) { diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index bfe88c6e60d5..b85f5bdc56ef 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -186,14 +186,6 @@ put_user_reg(struct task_struct *task, int offset, lon= g data) return ret; } =20 -/* - * Called by kernel/ptrace.c when detaching.. - */ -void ptrace_disable(struct task_struct *child) -{ - /* Nothing to do. */ -} - /* * Handle hitting a breakpoint. */ diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrac= e.c index 5234d0c1dcaa..72e3eece72aa 100644 --- a/arch/microblaze/kernel/ptrace.c +++ b/arch/microblaze/kernel/ptrace.c @@ -162,8 +162,3 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *= regs) if (step || test_thread_flag(TIF_SYSCALL_TRACE)) ptrace_report_syscall_exit(regs, step); } - -void ptrace_disable(struct task_struct *child) -{ - /* nothing to do */ -} diff --git a/arch/nios2/kernel/ptrace.c b/arch/nios2/kernel/ptrace.c index cd62f310778b..de5f4199c45f 100644 --- a/arch/nios2/kernel/ptrace.c +++ b/arch/nios2/kernel/ptrace.c @@ -117,11 +117,6 @@ const struct user_regset_view *task_user_regset_view(s= truct task_struct *task) return &nios2_user_view; } =20 -void ptrace_disable(struct task_struct *child) -{ - -} - long arch_ptrace(struct task_struct *child, long request, unsigned long ad= dr, unsigned long data) { diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index 44f4b1ca315d..19e4d8057e24 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -210,10 +210,6 @@ unsigned long regs_get_kernel_stack_nth(struct pt_regs= *regs, unsigned int n) return 0; } =20 -void ptrace_disable(struct task_struct *child) -{ -} - long arch_ptrace(struct task_struct *child, long request, unsigned long addr, unsigned long data) { diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c index e7db48acb838..f6df84e12739 100644 --- a/arch/sparc/kernel/ptrace_32.c +++ b/arch/sparc/kernel/ptrace_32.c @@ -29,16 +29,6 @@ =20 /* #define ALLOW_INIT_TRACING */ =20 -/* - * Called by kernel/ptrace.c when detaching.. - * - * Make sure single step bits etc are not set. - */ -void ptrace_disable(struct task_struct *child) -{ - /* nothing to do */ -} - enum sparc_regset { REGSET_GENERAL, REGSET_FP, diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c index 86a7eb5c27ba..b20a16ebe533 100644 --- a/arch/sparc/kernel/ptrace_64.c +++ b/arch/sparc/kernel/ptrace_64.c @@ -83,16 +83,6 @@ static const struct pt_regs_offset regoffset_table[] =3D= { REG_OFFSET_END, }; =20 -/* - * Called by kernel/ptrace.c when detaching.. - * - * Make sure single step bits etc are not set. - */ -void ptrace_disable(struct task_struct *child) -{ - /* nothing to do */ -} - /* To get the necessary page struct, access_process_vm() first calls * get_user_pages(). This has done a flush_dcache_page() on the * accessed page. Then our caller (copy_{to,from}_user_page()) did diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 1893d909e45c..77299bb65d97 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -579,6 +579,14 @@ static bool __ptrace_detach(struct task_struct *tracer= , struct task_struct *p) return dead; } =20 +__weak void ptrace_disable(struct task_struct *child) +{ + /* + * Nothing to do.., some architectures would replace it with + * their own function. + */ +} + static int ptrace_detach(struct task_struct *child, unsigned int data) { if (!valid_signal(data)) --=20 2.36.1