Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (eaf2a47f) · Commits · 戴 / test

MAINTAINERS

+18 −0

Original line number	Diff line number	Diff line
		@@ -16689,6 +16689,24 @@ T: git git://linuxtv.org/media_tree.git
		S: Maintained
		F: drivers/media/tuners/tuner-xc2028.*

		XDP (eXpress Data Path)
		M: Alexei Starovoitov <ast@kernel.org>
		M: Daniel Borkmann <daniel@iogearbox.net>
		M: David S. Miller <davem@davemloft.net>
		M: Jakub Kicinski <jakub.kicinski@netronome.com>
		M: Jesper Dangaard Brouer <hawk@kernel.org>
		M: John Fastabend <john.fastabend@gmail.com>
		L: netdev@vger.kernel.org
		L: xdp-newbies@vger.kernel.org
		S: Supported
		F: net/core/xdp.c
		F: include/net/xdp.h
		F: kernel/bpf/devmap.c
		F: kernel/bpf/cpumap.c
		F: include/trace/events/xdp.h
		K: xdp
		N: xdp

		XDP SOCKETS (AF_XDP)
		M: Björn Töpel <bjorn.topel@intel.com>
		M: Magnus Karlsson <magnus.karlsson@intel.com>

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -198,7 +198,7 @@ config X86
		select IRQ_FORCED_THREADING
		select NEED_SG_DMA_LENGTH
		select PCI_DOMAINS if PCI
		select PCI_LOCKLESS_CONFIG
		select PCI_LOCKLESS_CONFIG if PCI
		select PERF_EVENTS
		select RTC_LIB
		select RTC_MC146818_LIB

+4 −2

Original line number	Diff line number	Diff line
		@@ -361,7 +361,8 @@ ENTRY(entry_INT80_compat)

		/* Need to switch before accessing the thread stack. */
		SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi
		movq %rsp, %rdi
		/* In the Xen PV case we already run on the thread stack. */
		ALTERNATIVE "movq %rsp, %rdi", "jmp .Lint80_keep_stack", X86_FEATURE_XENPV
		movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp

		pushq 68(%rdi) / regs->ss */
		@@ -370,8 +371,9 @@ ENTRY(entry_INT80_compat)
		pushq 38(%rdi) / regs->cs */
		pushq 28(%rdi) / regs->ip */
		pushq 18(%rdi) / regs->orig_ax */

		pushq (%rdi) /* pt_regs->di */
		.Lint80_keep_stack:

		pushq %rsi /* pt_regs->si */
		xorl %esi, %esi /* nospec si */
		pushq %rdx /* pt_regs->dx */

+18 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,10 @@ static inline void switch_ldt(struct mm_struct prev, struct mm_struct next)

		void enter_lazy_tlb(struct mm_struct mm, struct task_struct tsk);

		/*
		* Init a new mm. Used on mm copies, like at fork()
		* and on mm's that are brand-new, like at execve().
		*/
		static inline int init_new_context(struct task_struct *tsk,
		struct mm_struct *mm)
		{
		@@ -228,8 +232,22 @@ do { \
		} while (0)
		#endif

		static inline void arch_dup_pkeys(struct mm_struct *oldmm,
		struct mm_struct *mm)
		{
		#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
		if (!cpu_feature_enabled(X86_FEATURE_OSPKE))
		return;

		/* Duplicate the oldmm pkey state in mm: */
		mm->context.pkey_allocation_map = oldmm->context.pkey_allocation_map;
		mm->context.execute_only_pkey = oldmm->context.execute_only_pkey;
		#endif
		}

		static inline int arch_dup_mmap(struct mm_struct oldmm, struct mm_struct mm)
		{
		arch_dup_pkeys(oldmm, mm);
		paravirt_arch_dup_mmap(oldmm, mm);
		return ldt_dup_context(oldmm, mm);
		}