Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (51d2e09b) · Commits · 戴 / test

arch/x86/boot/compressed/eboot.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1193,6 +1193,10 @@ static efi_status_t setup_e820(struct boot_params *params,
		unsigned int e820_type = 0;
		unsigned long m = efi->efi_memmap;

		#ifdef CONFIG_X86_64
		m \|= (u64)efi->efi_memmap_hi << 32;
		#endif

		d = (efi_memory_desc_t )(m + (i efi->efi_memdesc_size));
		switch (d->type) {
		case EFI_RESERVED_TYPE:

arch/x86/include/asm/desc.h

+0 −15

Original line number	Diff line number	Diff line
		@@ -280,21 +280,6 @@ static inline void clear_LDT(void)
		set_ldt(NULL, 0);
		}

		/*
		* load one particular LDT into the current CPU
		*/
		static inline void load_LDT_nolock(mm_context_t *pc)
		{
		set_ldt(pc->ldt, pc->size);
		}

		static inline void load_LDT(mm_context_t *pc)
		{
		preempt_disable();
		load_LDT_nolock(pc);
		preempt_enable();
		}

		static inline unsigned long get_desc_base(const struct desc_struct *desc)
		{
		return (unsigned)(desc->base0 \| ((desc->base1) << 16) \| ((desc->base2) << 24));

arch/x86/include/asm/mmu.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -9,8 +9,7 @@
		* we put the segment information here.
		*/
		typedef struct {
		void *ldt;
		int size;
		struct ldt_struct *ldt;

		#ifdef CONFIG_X86_64
		/* True if mm supports a task running in 32 bit compatibility mode. */

arch/x86/include/asm/mmu_context.h

+49 −5

Original line number	Diff line number	Diff line
		@@ -33,6 +33,50 @@ static inline void load_mm_cr4(struct mm_struct *mm)
		static inline void load_mm_cr4(struct mm_struct *mm) {}
		#endif

		/*
		* ldt_structs can be allocated, used, and freed, but they are never
		* modified while live.
		*/
		struct ldt_struct {
		/*
		* Xen requires page-aligned LDTs with special permissions. This is
		* needed to prevent us from installing evil descriptors such as
		* call gates. On native, we could merge the ldt_struct and LDT
		* allocations, but it's not worth trying to optimize.
		*/
		struct desc_struct *entries;
		int size;
		};

		static inline void load_mm_ldt(struct mm_struct *mm)
		{
		struct ldt_struct *ldt;

		/* lockless_dereference synchronizes with smp_store_release */
		ldt = lockless_dereference(mm->context.ldt);

		/*
		* Any change to mm->context.ldt is followed by an IPI to all
		* CPUs with the mm active. The LDT will not be freed until
		* after the IPI is handled by all such CPUs. This means that,
		* if the ldt_struct changes before we return, the values we see
		* will be safe, and the new values will be loaded before we run
		* any user code.
		*
		* NB: don't try to convert this to use RCU without extreme care.
		* We would still need IRQs off, because we don't want to change
		* the local LDT after an IPI loaded a newer value than the one
		* that we can see.
		*/

		if (unlikely(ldt))
		set_ldt(ldt->entries, ldt->size);
		else
		clear_LDT();

		DEBUG_LOCKS_WARN_ON(preemptible());
		}

		/*
		* Used for LDT copy/destruction.
		*/
		@@ -78,12 +122,12 @@ static inline void switch_mm(struct mm_struct prev, struct mm_struct next,
		* was called and then modify_ldt changed
		* prev->context.ldt but suppressed an IPI to this CPU.
		* In this case, prev->context.ldt != NULL, because we
		* never free an LDT while the mm still exists. That
		* means that next->context.ldt != prev->context.ldt,
		* because mms never share an LDT.
		* never set context.ldt to NULL while the mm still
		* exists. That means that next->context.ldt !=
		* prev->context.ldt, because mms never share an LDT.
		*/
		if (unlikely(prev->context.ldt != next->context.ldt))
		load_LDT_nolock(&next->context);
		load_mm_ldt(next);
		}
		#ifdef CONFIG_SMP
		else {
		@@ -106,7 +150,7 @@ static inline void switch_mm(struct mm_struct prev, struct mm_struct next,
		load_cr3(next->pgd);
		trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
		load_mm_cr4(next);
		load_LDT_nolock(&next->context);
		load_mm_ldt(next);
		}
		}
		#endif

arch/x86/kernel/apic/io_apic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -943,7 +943,7 @@ static bool mp_check_pin_attr(int irq, struct irq_alloc_info *info)
		*/
		if (irq < nr_legacy_irqs() && data->count == 1) {
		if (info->ioapic_trigger != data->trigger)
		mp_register_handler(irq, data->trigger);
		mp_register_handler(irq, info->ioapic_trigger);
		data->entry.trigger = data->trigger = info->ioapic_trigger;
		data->entry.polarity = data->polarity = info->ioapic_polarity;
		}

Admin message