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

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "This topic tree contains more commits than usual:

   - most of it are uaccess cleanups/reorganization by Al

   - there's a bunch of prototype declaration (--Wmissing-prototypes)
     cleanups

   - misc other cleanups all around the map"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
  x86/mm/set_memory: Fix -Wmissing-prototypes warnings
  x86/efi: Add a prototype for efi_arch_mem_reserve()
  x86/mm: Mark setup_emu2phys_nid() static
  x86/jump_label: Move 'inline' keyword placement
  x86/platform/uv: Add a missing prototype for uv_bau_message_interrupt()
  kill uaccess_try()
  x86: unsafe_put-style macro for sigmask
  x86: x32_setup_rt_frame(): consolidate uaccess areas
  x86: __setup_rt_frame(): consolidate uaccess areas
  x86: __setup_frame(): consolidate uaccess areas
  x86: setup_sigcontext(): list user_access_{begin,end}() into callers
  x86: get rid of put_user_try in __setup_rt_frame() (both 32bit and 64bit)
  x86: ia32_setup_rt_frame(): consolidate uaccess areas
  x86: ia32_setup_frame(): consolidate uaccess areas
  x86: ia32_setup_sigcontext(): lift user_access_{begin,end}() into the callers
  x86/alternatives: Mark text_poke_loc_init() static
  x86/cpu: Fix a -Wmissing-prototypes warning for init_ia32_feat_ctl()
  x86/mm: Drop pud_mknotpresent()
  x86: Replace setup_irq() by request_irq()
  x86/configs: Slightly reduce defconfigs
  ...
parents 97cddfc3 a2150327

Documentation/x86/exception-tables.rst

+0 −6
Original line number Diff line number Diff line
@@ -340,12 +340,6 @@ pointer which points to one of: 
     entry->insn. It is used to distinguish page faults from machine

     check.



3) ``int ex_handler_ext(const struct exception_table_entry *fixup)``

     This case is used for uaccess_err ... we need to set a flag

     in the task structure. Before the handler functions existed this

     case was handled by adding a large offset to the fixup to tag

     it as special.



More functions can easily be added.



CONFIG_BUILDTIME_TABLE_SORT allows the __ex_table section to be sorted post

arch/x86/configs/i386_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_NET_SCHED=y

CONFIG_NET_EMATCH=y

CONFIG_NET_CLS_ACT=y

CONFIG_HAMRADIO=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_MAC80211_LEDS=y
@@ -171,7 +170,6 @@ CONFIG_FORCEDETH=y 
CONFIG_8139TOO=y

# CONFIG_8139TOO_PIO is not set

CONFIG_R8169=y

CONFIG_FDDI=y

CONFIG_INPUT_POLLDEV=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

arch/x86/configs/x86_64_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_NET_SCHED=y

CONFIG_NET_EMATCH=y

CONFIG_NET_CLS_ACT=y

CONFIG_HAMRADIO=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_MAC80211_LEDS=y
@@ -164,7 +163,6 @@ CONFIG_SKY2=y 
CONFIG_FORCEDETH=y

CONFIG_8139TOO=y

CONFIG_R8169=y

CONFIG_FDDI=y

CONFIG_INPUT_POLLDEV=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

arch/x86/entry/common.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/fpu/api.h>

#include <asm/nospec-branch.h>

#include <asm/io_bitmap.h>

#include <asm/syscall.h>



#define CREATE_TRACE_POINTS

#include <trace/events/syscalls.h>

arch/x86/events/core.c

+7 −20
Original line number Diff line number Diff line
@@ -2490,7 +2490,7 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent 
	/* 32-bit process in 64-bit kernel. */

	unsigned long ss_base, cs_base;

	struct stack_frame_ia32 frame;

	const void __user *fp;

	const struct stack_frame_ia32 __user *fp;



	if (!test_thread_flag(TIF_IA32))

		return 0;
@@ -2501,18 +2501,12 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent 
	fp = compat_ptr(ss_base + regs->bp);

	pagefault_disable();

	while (entry->nr < entry->max_stack) {

		unsigned long bytes;

		frame.next_frame     = 0;

		frame.return_address = 0;



		if (!valid_user_frame(fp, sizeof(frame)))

			break;



		bytes = __copy_from_user_nmi(&frame.next_frame, fp, 4);

		if (bytes != 0)

		if (__get_user(frame.next_frame, &fp->next_frame))

			break;

		bytes = __copy_from_user_nmi(&frame.return_address, fp+4, 4);

		if (bytes != 0)

		if (__get_user(frame.return_address, &fp->return_address))

			break;



		perf_callchain_store(entry, cs_base + frame.return_address);
@@ -2533,7 +2527,7 @@ void 
perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	struct stack_frame frame;

	const unsigned long __user *fp;

	const struct stack_frame __user *fp;



	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {

		/* TODO: We don't support guest os callchain now */
@@ -2546,7 +2540,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs 
	if (regs->flags & (X86_VM_MASK | PERF_EFLAGS_VM))

		return;



	fp = (unsigned long __user *)regs->bp;

	fp = (void __user *)regs->bp;



	perf_callchain_store(entry, regs->ip);
@@ -2558,19 +2552,12 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs 


	pagefault_disable();

	while (entry->nr < entry->max_stack) {

		unsigned long bytes;



		frame.next_frame	     = NULL;

		frame.return_address = 0;



		if (!valid_user_frame(fp, sizeof(frame)))

			break;



		bytes = __copy_from_user_nmi(&frame.next_frame, fp, sizeof(*fp));

		if (bytes != 0)

		if (__get_user(frame.next_frame, &fp->next_frame))

			break;

		bytes = __copy_from_user_nmi(&frame.return_address, fp + 1, sizeof(*fp));

		if (bytes != 0)

		if (__get_user(frame.return_address, &fp->return_address))

			break;



		perf_callchain_store(entry, frame.return_address);

CRA Git | Maintained and supported by SUSTech CRA and CCSE