Skip to content

Commit

Permalink
Merge tag 'asm-generic-5.16' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history 
…rnel/git/arnd/asm-generic

Pull asm-generic cleanup from Arnd Bergmann:
 "This is a single cleanup from Peter Collingbourne, removing some dead
  code"

* tag 'asm-generic-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  arch: remove unused function syscall_set_arguments()
  • Loading branch information
@torvalds
torvalds committed Nov 10, 2021
2 parents bf98ecb + 7962c2e commit e8f023c
Show file tree
Hide file tree
Showing 18 changed files with 14 additions and 263 deletions.
10 changes: 0 additions & 10 deletions arch/arm/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
memcpy(args, &regs->ARM_r0 + 1, 5 * sizeof(args[0]));
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
regs->ARM_ORIG_r0 = args[0];
args++;

memcpy(&regs->ARM_r0 + 1, args, 5 * sizeof(args[0]));
}

static inline int syscall_get_arch(struct task_struct *task)
{
/* ARM tasks don't change audit architectures on the fly. */
Expand Down
10 changes: 0 additions & 10 deletions arch/arm64/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
memcpy(args, &regs->regs[1], 5 * sizeof(args[0]));
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
regs->orig_x0 = args[0];
args++;

memcpy(&regs->regs[1], args, 5 * sizeof(args[0]));
}

/*
* We don't care about endianness (__AUDIT_ARCH_LE bit) here because
* AArch64 has the same system calls both on little- and big- endian.
Expand Down
9 changes: 0 additions & 9 deletions arch/csky/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,6 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,
memcpy(args, &regs->a1, 5 * sizeof(args[0]));
}

static inline void
syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
const unsigned long *args)
{
regs->orig_a0 = args[0];
args++;
memcpy(&regs->a1, args, 5 * sizeof(regs->a1));
}

static inline int
syscall_get_arch(struct task_struct *task)
{
Expand Down
17 changes: 2 additions & 15 deletions arch/ia64/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,8 @@ static inline void syscall_set_return_value(struct task_struct *task,
}
}

extern void ia64_syscall_get_set_arguments(struct task_struct *task,
struct pt_regs *regs, unsigned long *args, int rw);
static inline void syscall_get_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned long *args)
{
ia64_syscall_get_set_arguments(task, regs, args, 0);
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned long *args)
{
ia64_syscall_get_set_arguments(task, regs, args, 1);
}
extern void syscall_get_arguments(struct task_struct *task,
struct pt_regs *regs, unsigned long *args);

static inline int syscall_get_arch(struct task_struct *task)
{
Expand Down
31 changes: 12 additions & 19 deletions arch/ia64/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2001,17 +2001,16 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *tsk)
return &user_ia64_view;
}

struct syscall_get_set_args {
struct syscall_get_args {
unsigned int i;
unsigned int n;
unsigned long *args;
struct pt_regs *regs;
int rw;
};

static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data)
static void syscall_get_args_cb(struct unw_frame_info *info, void *data)
{
struct syscall_get_set_args *args = data;
struct syscall_get_args *args = data;
struct pt_regs *pt = args->regs;
unsigned long *krbs, cfm, ndirty, nlocals, nouts;
int i, count;
Expand Down Expand Up @@ -2042,37 +2041,31 @@ static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data)
/* Iterate over outs. */
for (i = 0; i < count; i++) {
int j = ndirty + nlocals + i + args->i;
if (args->rw)
*ia64_rse_skip_regs(krbs, j) = args->args[i];
else
args->args[i] = *ia64_rse_skip_regs(krbs, j);
args->args[i] = *ia64_rse_skip_regs(krbs, j);
}

if (!args->rw) {
while (i < args->n) {
args->args[i] = 0;
i++;
}
while (i < args->n) {
args->args[i] = 0;
i++;
}
}

void ia64_syscall_get_set_arguments(struct task_struct *task,
struct pt_regs *regs, unsigned long *args, int rw)
void syscall_get_arguments(struct task_struct *task,
struct pt_regs *regs, unsigned long *args)
{
struct syscall_get_set_args data = {
struct syscall_get_args data = {
.i = 0,
.n = 6,
.args = args,
.regs = regs,
.rw = rw,
};

if (task == current)
unw_init_running(syscall_get_set_args_cb, &data);
unw_init_running(syscall_get_args_cb, &data);
else {
struct unw_frame_info ufi;
memset(&ufi, 0, sizeof(ufi));
unw_init_from_blocked_task(&ufi, task);
syscall_get_set_args_cb(&ufi, &data);
syscall_get_args_cb(&ufi, &data);
}
}
33 changes: 0 additions & 33 deletions arch/microblaze/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,6 @@ static inline microblaze_reg_t microblaze_get_syscall_arg(struct pt_regs *regs,
return ~0;
}

static inline void microblaze_set_syscall_arg(struct pt_regs *regs,
unsigned int n,
unsigned long val)
{
switch (n) {
case 5:
regs->r10 = val;
case 4:
regs->r9 = val;
case 3:
regs->r8 = val;
case 2:
regs->r7 = val;
case 1:
regs->r6 = val;
case 0:
regs->r5 = val;
default:
BUG();
}
}

static inline void syscall_get_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned long *args)
Expand All @@ -91,17 +69,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
*args++ = microblaze_get_syscall_arg(regs, i++);
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
unsigned int i = 0;
unsigned int n = 6;

while (n--)
microblaze_set_syscall_arg(regs, i++, *args++);
}

asmlinkage unsigned long do_syscall_trace_enter(struct pt_regs *regs);
asmlinkage void do_syscall_trace_leave(struct pt_regs *regs);

Expand Down
22 changes: 0 additions & 22 deletions arch/nds32/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,28 +132,6 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,
memcpy(args, &regs->uregs[0] + 1, 5 * sizeof(args[0]));
}

/**
* syscall_set_arguments - change system call parameter value
* @task: task of interest, must be in system call entry tracing
* @regs: task_pt_regs() of @task
* @args: array of argument values to store
*
* Changes 6 arguments to the system call. The first argument gets value
* @args[0], and so on.
*
* It's only valid to call this when @task is stopped for tracing on
* entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT.
*/
static inline void
syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
const unsigned long *args)
{
regs->orig_r0 = args[0];
args++;

memcpy(&regs->uregs[0] + 1, args, 5 * sizeof(args[0]));
}

static inline int
syscall_get_arch(struct task_struct *task)
{
Expand Down
11 changes: 0 additions & 11 deletions arch/nios2/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
*args = regs->r9;
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs, const unsigned long *args)
{
regs->r4 = *args++;
regs->r5 = *args++;
regs->r6 = *args++;
regs->r7 = *args++;
regs->r8 = *args++;
regs->r9 = *args;
}

static inline int syscall_get_arch(struct task_struct *task)
{
return AUDIT_ARCH_NIOS2;
Expand Down
7 changes: 0 additions & 7 deletions arch/openrisc/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,
memcpy(args, &regs->gpr[3], 6 * sizeof(args[0]));
}

static inline void
syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
const unsigned long *args)
{
memcpy(&regs->gpr[3], args, 6 * sizeof(args[0]));
}

static inline int syscall_get_arch(struct task_struct *task)
{
return AUDIT_ARCH_OPENRISC;
Expand Down
10 changes: 0 additions & 10 deletions arch/powerpc/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
}
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
memcpy(&regs->gpr[3], args, 6 * sizeof(args[0]));

/* Also copy the first argument into orig_gpr3 */
regs->orig_gpr3 = args[0];
}

static inline int syscall_get_arch(struct task_struct *task)
{
if (is_32bit_task())
Expand Down
9 changes: 0 additions & 9 deletions arch/riscv/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
memcpy(args, &regs->a1, 5 * sizeof(args[0]));
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
regs->orig_a0 = args[0];
args++;
memcpy(&regs->a1, args, 5 * sizeof(regs->a1));
}

static inline int syscall_get_arch(struct task_struct *task)
{
#ifdef CONFIG_64BIT
Expand Down
12 changes: 0 additions & 12 deletions arch/s390/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
args[0] = regs->orig_gpr2 & mask;
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
unsigned int n = 6;

while (n-- > 0)
if (n > 0)
regs->gprs[2 + n] = args[n];
regs->orig_gpr2 = args[0];
}

static inline int syscall_get_arch(struct task_struct *task)
{
#ifdef CONFIG_COMPAT
Expand Down
12 changes: 0 additions & 12 deletions arch/sh/include/asm/syscall_32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
args[0] = regs->regs[4];
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
regs->regs[1] = args[5];
regs->regs[0] = args[4];
regs->regs[7] = args[3];
regs->regs[6] = args[2];
regs->regs[5] = args[1];
regs->regs[4] = args[0];
}

static inline int syscall_get_arch(struct task_struct *task)
{
int arch = AUDIT_ARCH_SH;
Expand Down
10 changes: 0 additions & 10 deletions arch/sparc/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
}
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
unsigned int i;

for (i = 0; i < 6; i++)
regs->u_regs[UREG_I0 + i] = args[i];
}

static inline int syscall_get_arch(struct task_struct *task)
{
#if defined(CONFIG_SPARC64) && defined(CONFIG_COMPAT)
Expand Down
14 changes: 0 additions & 14 deletions arch/um/include/asm/syscall-generic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
*args = UPT_SYSCALL_ARG6(r);
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
const unsigned long *args)
{
struct uml_pt_regs *r = &regs->regs;

UPT_SYSCALL_ARG1(r) = *args++;
UPT_SYSCALL_ARG2(r) = *args++;
UPT_SYSCALL_ARG3(r) = *args++;
UPT_SYSCALL_ARG4(r) = *args++;
UPT_SYSCALL_ARG5(r) = *args++;
UPT_SYSCALL_ARG6(r) = *args;
}

/* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */

#endif /* __UM_SYSCALL_GENERIC_H */
Loading

0 comments on commit e8f023c

Please sign in to comment.