Skip to contentSkip to conversation

syscallh-introduce-syscall_set_nr.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 12, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: syscall.h: introduce syscall_set_nr()
has been removed from the -mm tree. Its filename was
syscallh-introduce-syscall_set_nr.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Dmitry V. Levin" <[email protected]>
Subject: syscall.h: introduce syscall_set_nr()
Date: Mon, 3 Mar 2025 13:20:20 +0200

Similar to syscall_set_arguments() that complements syscall_get_arguments(), introduce syscall_set_nr() that complements syscall_get_nr().

syscall_set_nr() is going to be needed along with syscall_set_arguments() on all HAVE_ARCH_TRACEHOOK architectures to implement PTRACE_SET_SYSCALL_INFO API.

Cc Alexander Gordeev <[email protected]>
Cc Alexey Gladkov (Intel) <[email protected]>
Cc Andreas Larsson <[email protected]>
Cc anton ivanov <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Borislav Betkov <[email protected]>
Cc Brian Cain <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Christian Zankel <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Davide Berardi <[email protected]>
Cc David S. Miller <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Eugene Syromiatnikov <[email protected]>
Cc Eugene Syromyatnikov <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Guo Ren <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Huacai Chen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Johannes Berg <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>
Cc Jonas Bonn <[email protected]>
Cc Madhavan Srinivasan <[email protected]>
Cc Max Filippov <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Michal Simek <[email protected]>
Cc Mike Frysinger <[email protected]>
Cc Naveen N Rao <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Renzo Davoi <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Rich Felker <[email protected]>
Cc Russel King <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Stafford Horne <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Sven Schnelle <[email protected]>
Cc Thomas Gleinxer <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Vineet Gupta <[email protected]>
Cc WANG Xuerui <[email protected]>
Cc Will Deacon <[email protected]>
Cc Yoshinori Sato <[email protected]>

---

 arch/arc/include/asm/syscall.h        |   11 +++++++++++
 arch/arm/include/asm/syscall.h        |   24 ++++++++++++++++++++++++
 arch/arm64/include/asm/syscall.h      |   16 ++++++++++++++++
 arch/hexagon/include/asm/syscall.h    |    7 +++++++
 arch/loongarch/include/asm/syscall.h  |    7 +++++++
 arch/m68k/include/asm/syscall.h       |    7 +++++++
 arch/microblaze/include/asm/syscall.h |    7 +++++++
 arch/mips/include/asm/syscall.h       |   15 +++++++++++++++
 arch/nios2/include/asm/syscall.h      |    5 +++++
 arch/openrisc/include/asm/syscall.h   |    6 ++++++
 arch/parisc/include/asm/syscall.h     |    7 +++++++
 arch/powerpc/include/asm/syscall.h    |   10 ++++++++++
 arch/riscv/include/asm/syscall.h      |    7 +++++++
 arch/s390/include/asm/syscall.h       |   12 ++++++++++++
 arch/sh/include/asm/syscall_32.h      |   12 ++++++++++++
 arch/sparc/include/asm/syscall.h      |   12 ++++++++++++
 arch/um/include/asm/syscall-generic.h |    5 +++++
 arch/x86/include/asm/syscall.h        |    7 +++++++
 arch/xtensa/include/asm/syscall.h     |    7 +++++++
 include/asm-generic/syscall.h         |   14 ++++++++++++++
 20 files changed, 198 insertions(+)
arch/arc/include/asm/syscall.h renamed from arch/arc/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +11 -0
@@ -24,6 +24,17 @@ syscall_get_nr(struct task_struct *task,
 }
 
 static inline void
+syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr)
+{
+	/*
+	 * Unlike syscall_get_nr(), syscall_set_nr() can be called only when
+	 * the target task is stopped for tracing on entering syscall, so
+	 * there is no need to have the same check syscall_get_nr() has.
+	 */
+	regs->r8 = nr;
+}
+
+static inline void
 syscall_rollback(struct task_struct *task, struct pt_regs *regs)
 {
 	regs->r0 = regs->orig_r0;
arch/arm64/include/asm/syscall.h renamed from arch/arm64/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +16 -0
@@ -61,6 +61,22 @@ static inline void syscall_set_return_va
 	regs->regs[0] = val;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->syscallno = nr;
+	if (nr == -1) {
+		/*
+		 * When the syscall number is set to -1, the syscall will be
+		 * skipped.  In this case the syscall return value has to be
+		 * set explicitly, otherwise the first syscall argument is
+		 * returned as the syscall return value.
+		 */
+		syscall_set_return_value(task, regs, -ENOSYS, 0);
+	}
+}
+
 #define SYSCALL_MAX_ARGS 6
 
 static inline void syscall_get_arguments(struct task_struct *task,
arch/arm/include/asm/syscall.h renamed from arch/arm/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +24 -0
@@ -68,6 +68,30 @@ static inline void syscall_set_return_va
 	regs->ARM_r0 = (long) error ? error : val;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	if (nr == -1) {
+		task_thread_info(task)->abi_syscall = -1;
+		/*
+		 * When the syscall number is set to -1, the syscall will be
+		 * skipped.  In this case the syscall return value has to be
+		 * set explicitly, otherwise the first syscall argument is
+		 * returned as the syscall return value.
+		 */
+		syscall_set_return_value(task, regs, -ENOSYS, 0);
+		return;
+	}
+	if ((IS_ENABLED(CONFIG_AEABI) && !IS_ENABLED(CONFIG_OABI_COMPAT))) {
+		task_thread_info(task)->abi_syscall = nr;
+		return;
+	}
+	task_thread_info(task)->abi_syscall =
+		(task_thread_info(task)->abi_syscall & ~__NR_SYSCALL_MASK) |
+		(nr & __NR_SYSCALL_MASK);
+}
+
 #define SYSCALL_MAX_ARGS 7
 
 static inline void syscall_get_arguments(struct task_struct *task,
arch/hexagon/include/asm/syscall.h renamed from arch/hexagon/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +7 -0
@@ -26,6 +26,13 @@ static inline long syscall_get_nr(struct
 	return regs->r06;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->r06 = nr;
+}
+
 static inline void syscall_get_arguments(struct task_struct *task,
 					 struct pt_regs *regs,
 					 unsigned long *args)
arch/loongarch/include/asm/syscall.h renamed from arch/loongarch/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +7 -0
@@ -26,6 +26,13 @@ static inline long syscall_get_nr(struct
 	return regs->regs[11];
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->regs[11] = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/m68k/include/asm/syscall.h renamed from arch/m68k/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +7 -0
@@ -14,6 +14,13 @@ static inline int syscall_get_nr(struct
 	return regs->orig_d0;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->orig_d0 = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/microblaze/include/asm/syscall.h renamed from arch/microblaze/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +7 -0
@@ -14,6 +14,13 @@ static inline long syscall_get_nr(struct
 	return regs->r12;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->r12 = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/mips/include/asm/syscall.h renamed from arch/mips/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +15 -0
@@ -41,6 +41,21 @@ static inline long syscall_get_nr(struct
 	return task_thread_info(task)->syscall;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	/*
+	 * New syscall number has to be assigned to regs[2] because
+	 * it is loaded from there unconditionally after return from
+	 * syscall_trace_enter() invocation.
+	 *
+	 * Consequently, if the syscall was indirect and nr != __NR_syscall,
+	 * then after this assignment the syscall will cease to be indirect.
+	 */
+	task_thread_info(task)->syscall = regs->regs[2] = nr;
+}
+
 static inline void mips_syscall_update_nr(struct task_struct *task,
 					  struct pt_regs *regs)
 {
arch/nios2/include/asm/syscall.h renamed from arch/nios2/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +5 -0
@@ -15,6 +15,11 @@ static inline int syscall_get_nr(struct
 	return regs->r2;
 }
 
+static inline void syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr)
+{
+	regs->r2 = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				struct pt_regs *regs)
 {
arch/openrisc/include/asm/syscall.h renamed from arch/openrisc/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +6 -0
@@ -26,6 +26,12 @@ syscall_get_nr(struct task_struct *task,
 }
 
 static inline void
+syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr)
+{
+	regs->orig_gpr11 = nr;
+}
+
+static inline void
 syscall_rollback(struct task_struct *task, struct pt_regs *regs)
 {
 	regs->gpr[11] = regs->orig_gpr11;
arch/parisc/include/asm/syscall.h renamed from arch/parisc/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +7 -0
@@ -17,6 +17,13 @@ static inline long syscall_get_nr(struct
 	return regs->gr[20];
 }
 
+static inline void syscall_set_nr(struct task_struct *tsk,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->gr[20] = nr;
+}
+
 static inline void syscall_get_arguments(struct task_struct *tsk,
 					 struct pt_regs *regs,
 					 unsigned long *args)
arch/powerpc/include/asm/syscall.h renamed from arch/powerpc/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +10 -0
@@ -39,6 +39,16 @@ static inline int syscall_get_nr(struct
 		return -1;
 }
 
+static inline void syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr)
+{
+	/*
+	 * Unlike syscall_get_nr(), syscall_set_nr() can be called only when
+	 * the target task is stopped for tracing on entering syscall, so
+	 * there is no need to have the same check syscall_get_nr() has.
+	 */
+	regs->gpr[0] = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/riscv/include/asm/syscall.h renamed from arch/riscv/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +7 -0
@@ -30,6 +30,13 @@ static inline int syscall_get_nr(struct
 	return regs->a7;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->a7 = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/s390/include/asm/syscall.h renamed from arch/s390/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +12 -0
@@ -24,6 +24,18 @@ static inline long syscall_get_nr(struct
 		(regs->int_code & 0xffff) : -1;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	/*
+	 * Unlike syscall_get_nr(), syscall_set_nr() can be called only when
+	 * the target task is stopped for tracing on entering syscall, so
+	 * there is no need to have the same check syscall_get_nr() has.
+	 */
+	regs->int_code = (regs->int_code & ~0xffff) | (nr & 0xffff);
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/sh/include/asm/syscall_32.h renamed from arch/sh/include/asm/syscall_32.h~syscallh-introduce-syscall_set_nr +12 -0
@@ -15,6 +15,18 @@ static inline long syscall_get_nr(struct
 	return (regs->tra >= 0) ? regs->regs[3] : -1L;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	/*
+	 * Unlike syscall_get_nr(), syscall_set_nr() can be called only when
+	 * the target task is stopped for tracing on entering syscall, so
+	 * there is no need to have the same check syscall_get_nr() has.
+	 */
+	regs->regs[3] = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/sparc/include/asm/syscall.h renamed from arch/sparc/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +12 -0
@@ -25,6 +25,18 @@ static inline long syscall_get_nr(struct
 	return (syscall_p ? regs->u_regs[UREG_G1] : -1L);
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	/*
+	 * Unlike syscall_get_nr(), syscall_set_nr() can be called only when
+	 * the target task is stopped for tracing on entering syscall, so
+	 * there is no need to have the same check syscall_get_nr() has.
+	 */
+	regs->u_regs[UREG_G1] = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/um/include/asm/syscall-generic.h renamed from arch/um/include/asm/syscall-generic.h~syscallh-introduce-syscall_set_nr +5 -0
@@ -21,6 +21,11 @@ static inline int syscall_get_nr(struct
 	return PT_REGS_SYSCALL_NR(regs);
 }
 
+static inline void syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr)
+{
+	PT_REGS_SYSCALL_NR(regs) = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/x86/include/asm/syscall.h renamed from arch/x86/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +7 -0
@@ -38,6 +38,13 @@ static inline int syscall_get_nr(struct
 	return regs->orig_ax;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->orig_ax = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
arch/xtensa/include/asm/syscall.h renamed from arch/xtensa/include/asm/syscall.h~syscallh-introduce-syscall_set_nr +7 -0
@@ -28,6 +28,13 @@ static inline long syscall_get_nr(struct
 	return regs->syscall;
 }
 
+static inline void syscall_set_nr(struct task_struct *task,
+				  struct pt_regs *regs,
+				  int nr)
+{
+	regs->syscall = nr;
+}
+
 static inline void syscall_rollback(struct task_struct *task,
 				    struct pt_regs *regs)
 {
include/asm-generic/syscall.h renamed from include/asm-generic/syscall.h~syscallh-introduce-syscall_set_nr +14 -0
@@ -38,6 +38,20 @@ struct pt_regs;
 int syscall_get_nr(struct task_struct *task, struct pt_regs *regs);
 
 /**
+ * syscall_set_nr - change the system call a task is executing
+ * @task:	task of interest, must be blocked
+ * @regs:	task_pt_regs() of @task
+ * @nr:		system call number
+ *
+ * Changes the system call number @task is about to execute.
+ *
+ * It's only valid to call this when @task is stopped for tracing on
+ * entry to a system call, due to %SYSCALL_WORK_SYSCALL_TRACE or
+ * %SYSCALL_WORK_SYSCALL_AUDIT.
+ */
+void syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr);
+
+/**
  * syscall_rollback - roll back registers after an aborted system call
  * @task:	task of interest, must be in system call exit tracing
  * @regs:	task_pt_regs() of @task

_

Patches currently in -mm which might be from [email protected] are