Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8324608 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:
 "I didn't want the release to go out without the statx system call
  properly hooked up"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Update syscall tables.
  sparc64: Fill in rest of HAVE_REGS_AND_STACK_ACCESS_API
parents 1e2f82d1 f6ebf0bb

arch/sparc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ config SPARC64 
	select HAVE_ARCH_AUDITSYSCALL

	select ARCH_SUPPORTS_ATOMIC_RMW

	select HAVE_NMI

	select HAVE_REGS_AND_STACK_ACCESS_API



config ARCH_DEFCONFIG

	string

arch/sparc/include/asm/ptrace.h

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ unsigned long profile_pc(struct pt_regs *); 


#define MAX_REG_OFFSET (offsetof(struct pt_regs, magic))



extern int regs_query_register_offset(const char *name);

int regs_query_register_offset(const char *name);

unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n);



/**

 * regs_get_register() - get register value from its offset

arch/sparc/include/uapi/asm/unistd.h

+7 −1
Original line number Diff line number Diff line
@@ -425,8 +425,9 @@ 
#define __NR_copy_file_range	357

#define __NR_preadv2		358

#define __NR_pwritev2		359

#define __NR_statx		360



#define NR_syscalls		360

#define NR_syscalls		361



/* Bitmask values returned from kern_features system call.  */

#define KERN_FEATURE_MIXED_MODE_STACK	0x00000001
@@ -442,4 +443,9 @@ 
#define __IGNORE_getresgid

#endif



/* Sparc doesn't have protection keys. */

#define __IGNORE_pkey_mprotect

#define __IGNORE_pkey_alloc

#define __IGNORE_pkey_free



#endif /* _UAPI_SPARC_UNISTD_H */

arch/sparc/kernel/ptrace_64.c

+36 −0
Original line number Diff line number Diff line
@@ -1162,3 +1162,39 @@ int regs_query_register_offset(const char *name) 
			return roff->offset;

	return -EINVAL;

}



/**

 * regs_within_kernel_stack() - check the address in the stack

 * @regs:	pt_regs which contains kernel stack pointer.

 * @addr:	address which is checked.

 *

 * regs_within_kernel_stack() checks @addr is within the kernel stack page(s).

 * If @addr is within the kernel stack, it returns true. If not, returns false.

 */

static inline int regs_within_kernel_stack(struct pt_regs *regs,

					   unsigned long addr)

{

	unsigned long ksp = kernel_stack_pointer(regs) + STACK_BIAS;

	return ((addr & ~(THREAD_SIZE - 1))  ==

		(ksp & ~(THREAD_SIZE - 1)));

}



/**

 * regs_get_kernel_stack_nth() - get Nth entry of the stack

 * @regs:	pt_regs which contains kernel stack pointer.

 * @n:		stack entry number.

 *

 * regs_get_kernel_stack_nth() returns @n th entry of the kernel stack which

 * is specified by @regs. If the @n th entry is NOT in the kernel stack,

 * this returns 0.

 */

unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n)

{

	unsigned long ksp = kernel_stack_pointer(regs) + STACK_BIAS;

	unsigned long *addr = (unsigned long *)ksp;

	addr += n;

	if (regs_within_kernel_stack(regs, (unsigned long)addr))

		return *addr;

	else

		return 0;

}

arch/sparc/kernel/systbls_32.S

+1 −0
Original line number Diff line number Diff line
@@ -89,3 +89,4 @@ sys_call_table: 
/*345*/	.long sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf

/*350*/	.long sys_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen

/*355*/	.long sys_setsockopt, sys_mlock2, sys_copy_file_range, sys_preadv2, sys_pwritev2

/*360*/	.long sys_statx