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

Merge branches 'akpm' and 'akpm-hotfixes' (patches from Andrew) 

Merge yet more updates and hotfixes from Andrew Morton:
 "Post-linux-next material, based upon latest upstream to catch the
  now-merged dependencies:

   - 10 patches.

     Subsystems affected by this patch series: mm (vmstat and migration)
     and compat.

  And bunch of hotfixes, mostly cc:stable:

   - 8 patches.

     Subsystems affected by this patch series: mm (hmm, hugetlb, vmscan,
     pagealloc, pagemap, kmemleak, mempolicy, and memblock)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  arch: remove compat_alloc_user_space
  compat: remove some compat entry points
  mm: simplify compat numa syscalls
  mm: simplify compat_sys_move_pages
  kexec: avoid compat_alloc_user_space
  kexec: move locking into do_kexec_load
  mm: migrate: change to use bool type for 'page_was_mapped'
  mm: migrate: fix the incorrect function name in comments
  mm: migrate: introduce a local variable to get the number of pages
  mm/vmstat: protect per cpu variables with preempt disable on RT

* emailed hotfixes from Andrew Morton <akpm@linux-foundation.org>:
  nds32/setup: remove unused memblock_region variable in setup_memory()
  mm/mempolicy: fix a race between offset_il_node and mpol_rebind_task
  mm/kmemleak: allow __GFP_NOLOCKDEP passed to kmemleak's gfp
  mmap_lock: change trace and locking order
  mm/page_alloc.c: avoid accessing uninitialized pcp page migratetype
  mm,vmscan: fix divide by zero in get_scan_count
  mm/hugetlb: initialize hugetlb_usage in mm_init
  mm/hmm: bypass devmap pte when all pfn requested flags are fulfilled
parents 730bf31b a7a08b27 ddb13122

arch/arm64/include/asm/compat.h

+0 −5
Original line number Diff line number Diff line
@@ -107,11 +107,6 @@ struct compat_statfs { 
#define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))

#define COMPAT_MINSIGSTKSZ	2048



static inline void __user *arch_compat_alloc_user_space(long len)

{

	return (void __user *)compat_user_stack_pointer() - len;

}



struct compat_ipc64_perm {

	compat_key_t key;

	__compat_uid32_t uid;

arch/arm64/include/asm/uaccess.h

+0 −11
Original line number Diff line number Diff line
@@ -430,17 +430,6 @@ extern unsigned long __must_check __arch_copy_to_user(void __user *to, const voi 
	__actu_ret;							\

})



extern unsigned long __must_check __arch_copy_in_user(void __user *to, const void __user *from, unsigned long n);

#define raw_copy_in_user(to, from, n)					\

({									\

	unsigned long __aciu_ret;					\

	uaccess_ttbr0_enable();						\

	__aciu_ret = __arch_copy_in_user(__uaccess_mask_ptr(to),	\

				    __uaccess_mask_ptr(from), (n));	\

	uaccess_ttbr0_disable();					\

	__aciu_ret;							\

})



#define INLINE_COPY_TO_USER

#define INLINE_COPY_FROM_USER

arch/arm64/include/asm/unistd32.h

+5 −5
Original line number Diff line number Diff line
@@ -649,11 +649,11 @@ __SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch) 
#define __NR_inotify_rm_watch 318

__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)

#define __NR_mbind 319

__SYSCALL(__NR_mbind, compat_sys_mbind)

__SYSCALL(__NR_mbind, sys_mbind)

#define __NR_get_mempolicy 320

__SYSCALL(__NR_get_mempolicy, compat_sys_get_mempolicy)

__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)

#define __NR_set_mempolicy 321

__SYSCALL(__NR_set_mempolicy, compat_sys_set_mempolicy)

__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)

#define __NR_openat 322

__SYSCALL(__NR_openat, compat_sys_openat)

#define __NR_mkdirat 323
@@ -699,7 +699,7 @@ __SYSCALL(__NR_tee, sys_tee) 
#define __NR_vmsplice 343

__SYSCALL(__NR_vmsplice, sys_vmsplice)

#define __NR_move_pages 344

__SYSCALL(__NR_move_pages, compat_sys_move_pages)

__SYSCALL(__NR_move_pages, sys_move_pages)

#define __NR_getcpu 345

__SYSCALL(__NR_getcpu, sys_getcpu)

#define __NR_epoll_pwait 346
@@ -811,7 +811,7 @@ __SYSCALL(__NR_rseq, sys_rseq) 
#define __NR_io_pgetevents 399

__SYSCALL(__NR_io_pgetevents, compat_sys_io_pgetevents)

#define __NR_migrate_pages 400

__SYSCALL(__NR_migrate_pages, compat_sys_migrate_pages)

__SYSCALL(__NR_migrate_pages, sys_migrate_pages)

#define __NR_kexec_file_load 401

__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load)

/* 402 is unused */

arch/arm64/lib/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

lib-y		:= clear_user.o delay.o copy_from_user.o		\

		   copy_to_user.o copy_in_user.o copy_page.o		\

		   copy_to_user.o copy_page.o				\

		   clear_page.o csum.o insn.o memchr.o memcpy.o		\

		   memset.o memcmp.o strcmp.o strncmp.o strlen.o	\

		   strnlen.o strchr.o strrchr.o tishift.o

arch/arm64/lib/copy_in_user.S

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copy from user space to user space

 *

 * Copyright (C) 2012 ARM Ltd.

 */



#include <linux/linkage.h>



#include <asm/asm-uaccess.h>

#include <asm/assembler.h>

#include <asm/cache.h>



/*

 * Copy from user space to user space (alignment handled by the hardware)

 *

 * Parameters:

 *	x0 - to

 *	x1 - from

 *	x2 - n

 * Returns:

 *	x0 - bytes not copied

 */

	.macro ldrb1 reg, ptr, val

	user_ldst 9998f, ldtrb, \reg, \ptr, \val

	.endm



	.macro strb1 reg, ptr, val

	user_ldst 9998f, sttrb, \reg, \ptr, \val

	.endm



	.macro ldrh1 reg, ptr, val

	user_ldst 9997f, ldtrh, \reg, \ptr, \val

	.endm



	.macro strh1 reg, ptr, val

	user_ldst 9997f, sttrh, \reg, \ptr, \val

	.endm



	.macro ldr1 reg, ptr, val

	user_ldst 9997f, ldtr, \reg, \ptr, \val

	.endm



	.macro str1 reg, ptr, val

	user_ldst 9997f, sttr, \reg, \ptr, \val

	.endm



	.macro ldp1 reg1, reg2, ptr, val

	user_ldp 9997f, \reg1, \reg2, \ptr, \val

	.endm



	.macro stp1 reg1, reg2, ptr, val

	user_stp 9997f, \reg1, \reg2, \ptr, \val

	.endm



end	.req	x5

srcin	.req	x15

SYM_FUNC_START(__arch_copy_in_user)

	add	end, x0, x2

	mov	srcin, x1

#include "copy_template.S"

	mov	x0, #0

	ret

SYM_FUNC_END(__arch_copy_in_user)

EXPORT_SYMBOL(__arch_copy_in_user)



	.section .fixup,"ax"

	.align	2

9997:	cmp	dst, dstin

	b.ne	9998f

	// Before being absolutely sure we couldn't copy anything, try harder

USER(9998f, ldtrb tmp1w, [srcin])

USER(9998f, sttrb tmp1w, [dst])

	add	dst, dst, #1

9998:	sub	x0, end, dst			// bytes not copied

	ret

	.previous