* [PATCH 1/3] riscv: ptrace: Remove duplicate operation
2022-08-30 6:53 [PATCH 0/3] arch: ptrace: Cleanup ptrace_disable guoren
@ 2022-08-30 6:53 ` guoren
2022-08-30 6:53 ` [PATCH 2/3] openrisc: " guoren
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: guoren @ 2022-08-30 6:53 UTC (permalink / raw)
To: oleg, vgupta, linux, monstr, dinguyen, palmer, davem, arnd,
shorne, guoren
Cc: linux-arch, Guo Ren, linux-kernel, openrisc, sparclinux,
linux-riscv, linux-snps-arc, linux-arm-kernel
From: Guo Ren <guoren@linux.alibaba.com>
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 <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
---
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)
void ptrace_disable(struct task_struct *child)
{
- clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
}
long arch_ptrace(struct task_struct *child, long request,
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] openrisc: ptrace: Remove duplicate operation
2022-08-30 6:53 [PATCH 0/3] arch: ptrace: Cleanup ptrace_disable guoren
2022-08-30 6:53 ` [PATCH 1/3] riscv: ptrace: Remove duplicate operation guoren
@ 2022-08-30 6:53 ` guoren
2022-08-30 7:33 ` Stafford Horne
2022-08-30 6:53 ` [PATCH 3/3] arch: ptrace: Cleanup ptrace_disable guoren
2022-08-30 14:20 ` [PATCH 0/3] " Oleg Nesterov
3 siblings, 1 reply; 6+ messages in thread
From: guoren @ 2022-08-30 6:53 UTC (permalink / raw)
To: oleg, vgupta, linux, monstr, dinguyen, palmer, davem, arnd,
shorne, guoren
Cc: linux-arch, Guo Ren, linux-kernel, openrisc, sparclinux,
linux-riscv, linux-snps-arc, linux-arm-kernel
From: Guo Ren <guoren@linux.alibaba.com>
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 <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
---
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");
user_disable_single_step(child);
- clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
}
long arch_ptrace(struct task_struct *child, long request, unsigned long addr,
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/3] openrisc: ptrace: Remove duplicate operation
2022-08-30 6:53 ` [PATCH 2/3] openrisc: " guoren
@ 2022-08-30 7:33 ` Stafford Horne
0 siblings, 0 replies; 6+ messages in thread
From: Stafford Horne @ 2022-08-30 7:33 UTC (permalink / raw)
To: guoren
Cc: linux-arch, monstr, Guo Ren, arnd, linux-kernel, linux, oleg,
dinguyen, openrisc, palmer, vgupta, sparclinux, linux-riscv,
linux-snps-arc, davem, linux-arm-kernel
On Tue, Aug 30, 2022 at 02:53:15AM -0400, guoren@kernel.org wrote:
> From: Guo Ren <guoren@linux.alibaba.com>
>
> 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 <guoren@linux.alibaba.com>
> Signed-off-by: Guo Ren <guoren@kernel.org>
Acked-by: Stafford Horne <shorne@gmail.com>
> ---
> 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");
>
> user_disable_single_step(child);
> - clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
> }
>
> long arch_ptrace(struct task_struct *child, long request, unsigned long addr,
> --
> 2.36.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] arch: ptrace: Cleanup ptrace_disable
2022-08-30 6:53 [PATCH 0/3] arch: ptrace: Cleanup ptrace_disable guoren
2022-08-30 6:53 ` [PATCH 1/3] riscv: ptrace: Remove duplicate operation guoren
2022-08-30 6:53 ` [PATCH 2/3] openrisc: " guoren
@ 2022-08-30 6:53 ` guoren
2022-08-30 14:20 ` [PATCH 0/3] " Oleg Nesterov
3 siblings, 0 replies; 6+ messages in thread
From: guoren @ 2022-08-30 6:53 UTC (permalink / raw)
To: oleg, vgupta, linux, monstr, dinguyen, palmer, davem, arnd,
shorne, guoren
Cc: linux-arch, Guo Ren, linux-kernel, openrisc, sparclinux,
linux-riscv, linux-snps-arc, linux-arm-kernel
From: Guo Ren <guoren@linux.alibaba.com>
Add a weak empty function in common and remove architectures' duplicated
ones.
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
---
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(struct task_struct *task)
return &user_arc_view;
}
-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, long data)
return ret;
}
-/*
- * 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/ptrace.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(struct task_struct *task)
return &nios2_user_view;
}
-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/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;
}
-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 @@
/* #define ALLOW_INIT_TRACING */
-/*
- * 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[] = {
REG_OFFSET_END,
};
-/*
- * 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;
}
+__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))
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] arch: ptrace: Cleanup ptrace_disable
2022-08-30 6:53 [PATCH 0/3] arch: ptrace: Cleanup ptrace_disable guoren
` (2 preceding siblings ...)
2022-08-30 6:53 ` [PATCH 3/3] arch: ptrace: Cleanup ptrace_disable guoren
@ 2022-08-30 14:20 ` Oleg Nesterov
3 siblings, 0 replies; 6+ messages in thread
From: Oleg Nesterov @ 2022-08-30 14:20 UTC (permalink / raw)
To: guoren, Andrew Morton
Cc: linux-arch, monstr, Guo Ren, arnd, linux, linux-riscv,
linux-kernel, dinguyen, openrisc, palmer, vgupta, sparclinux,
linux-snps-arc, davem, linux-arm-kernel
On 08/30, guoren@kernel.org wrote:
>
> From: Guo Ren <guoren@linux.alibaba.com>
>
> This series cleanup ptrace_disable() in arch/*. Some architectures
> are duplicate clearing SYSCALL TRACE.
>
> Guo Ren (3):
> riscv: ptrace: Remove duplicate operation
> openrisc: ptrace: Remove duplicate operation
> arch: ptrace: Cleanup ptrace_disable
>
> 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/openrisc/kernel/ptrace.c | 1 -
> arch/riscv/kernel/ptrace.c | 5 -----
> arch/sparc/kernel/ptrace_32.c | 10 ----------
> arch/sparc/kernel/ptrace_64.c | 10 ----------
> kernel/ptrace.c | 8 ++++++++
> 9 files changed, 8 insertions(+), 48 deletions(-)
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread