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

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

Pull x86 fixes from Ingo Molnar:
 "Misc fixes:

   - revert a /dev/mem restriction change that crashes with certain boot
     parameters

   - an AMD erratum fix for cases where the BIOS doesn't apply it

   - fix unwinder debuginfo

   - improve ORC unwinder warning printouts"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "x86/mm: Limit mmap() of /dev/mem to valid physical addresses"
  x86/unwind: Show function name+offset in ORC error messages
  x86/entry: Fix idtentry unwind hint
  x86/cpu/AMD: Apply the Erratum 688 fix when the BIOS doesn't
parents 11dc76f0 90edaac6

arch/x86/entry/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt 


.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1

ENTRY(\sym)

	UNWIND_HINT_IRET_REGS offset=8

	UNWIND_HINT_IRET_REGS offset=\has_error_code*8



	/* Sanity check */

	.if \shift_ist != -1 && \paranoid == 0

arch/x86/include/asm/io.h

+0 −4
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ build_mmio_write(__writeq, "q", unsigned long, "r", ) 


#endif



#define ARCH_HAS_VALID_PHYS_ADDR_RANGE

extern int valid_phys_addr_range(phys_addr_t addr, size_t size);

extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);



/**

 *	virt_to_phys	-	map virtual addresses to physical

 *	@address: address to remap

arch/x86/kernel/amd_nb.c

+41 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ static const struct pci_device_id amd_root_ids[] = { 
	{}

};



#define PCI_DEVICE_ID_AMD_CNB17H_F4     0x1704



const struct pci_device_id amd_nb_misc_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
@@ -37,6 +39,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },

	{}

};

EXPORT_SYMBOL_GPL(amd_nb_misc_ids);
@@ -48,6 +51,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },

	{}

};
@@ -402,11 +406,48 @@ void amd_flush_garts(void) 
}

EXPORT_SYMBOL_GPL(amd_flush_garts);



static void __fix_erratum_688(void *info)

{

#define MSR_AMD64_IC_CFG 0xC0011021



	msr_set_bit(MSR_AMD64_IC_CFG, 3);

	msr_set_bit(MSR_AMD64_IC_CFG, 14);

}



/* Apply erratum 688 fix so machines without a BIOS fix work. */

static __init void fix_erratum_688(void)

{

	struct pci_dev *F4;

	u32 val;



	if (boot_cpu_data.x86 != 0x14)

		return;



	if (!amd_northbridges.num)

		return;



	F4 = node_to_amd_nb(0)->link;

	if (!F4)

		return;



	if (pci_read_config_dword(F4, 0x164, &val))

		return;



	if (val & BIT(2))

		return;



	on_each_cpu(__fix_erratum_688, NULL, 0);



	pr_info("x86/cpu/AMD: CPU erratum 688 worked around\n");

}



static __init int init_amd_nbs(void)

{

	amd_cache_northbridges();

	amd_cache_gart();



	fix_erratum_688();



	return 0;

}

arch/x86/kernel/unwind_orc.c

+15 −14
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static struct orc_entry *orc_find(unsigned long ip) 
		idx = (ip - LOOKUP_START_IP) / LOOKUP_BLOCK_SIZE;



		if (unlikely((idx >= lookup_num_blocks-1))) {

			orc_warn("WARNING: bad lookup idx: idx=%u num=%u ip=%lx\n",

				 idx, lookup_num_blocks, ip);

			orc_warn("WARNING: bad lookup idx: idx=%u num=%u ip=%pB\n",

				 idx, lookup_num_blocks, (void *)ip);

			return NULL;

		}
@@ -96,8 +96,8 @@ static struct orc_entry *orc_find(unsigned long ip) 


		if (unlikely((__start_orc_unwind + start >= __stop_orc_unwind) ||

			     (__start_orc_unwind + stop > __stop_orc_unwind))) {

			orc_warn("WARNING: bad lookup value: idx=%u num=%u start=%u stop=%u ip=%lx\n",

				 idx, lookup_num_blocks, start, stop, ip);

			orc_warn("WARNING: bad lookup value: idx=%u num=%u start=%u stop=%u ip=%pB\n",

				 idx, lookup_num_blocks, start, stop, (void *)ip);

			return NULL;

		}
@@ -373,7 +373,7 @@ bool unwind_next_frame(struct unwind_state *state) 


	case ORC_REG_R10:

		if (!state->regs || !state->full_regs) {

			orc_warn("missing regs for base reg R10 at ip %p\n",

			orc_warn("missing regs for base reg R10 at ip %pB\n",

				 (void *)state->ip);

			goto done;

		}
@@ -382,7 +382,7 @@ bool unwind_next_frame(struct unwind_state *state) 


	case ORC_REG_R13:

		if (!state->regs || !state->full_regs) {

			orc_warn("missing regs for base reg R13 at ip %p\n",

			orc_warn("missing regs for base reg R13 at ip %pB\n",

				 (void *)state->ip);

			goto done;

		}
@@ -391,7 +391,7 @@ bool unwind_next_frame(struct unwind_state *state) 


	case ORC_REG_DI:

		if (!state->regs || !state->full_regs) {

			orc_warn("missing regs for base reg DI at ip %p\n",

			orc_warn("missing regs for base reg DI at ip %pB\n",

				 (void *)state->ip);

			goto done;

		}
@@ -400,7 +400,7 @@ bool unwind_next_frame(struct unwind_state *state) 


	case ORC_REG_DX:

		if (!state->regs || !state->full_regs) {

			orc_warn("missing regs for base reg DX at ip %p\n",

			orc_warn("missing regs for base reg DX at ip %pB\n",

				 (void *)state->ip);

			goto done;

		}
@@ -408,7 +408,7 @@ bool unwind_next_frame(struct unwind_state *state) 
		break;



	default:

		orc_warn("unknown SP base reg %d for ip %p\n",

		orc_warn("unknown SP base reg %d for ip %pB\n",

			 orc->sp_reg, (void *)state->ip);

		goto done;

	}
@@ -436,7 +436,7 @@ bool unwind_next_frame(struct unwind_state *state) 


	case ORC_TYPE_REGS:

		if (!deref_stack_regs(state, sp, &state->ip, &state->sp, true)) {

			orc_warn("can't dereference registers at %p for ip %p\n",

			orc_warn("can't dereference registers at %p for ip %pB\n",

				 (void *)sp, (void *)orig_ip);

			goto done;

		}
@@ -448,7 +448,7 @@ bool unwind_next_frame(struct unwind_state *state) 


	case ORC_TYPE_REGS_IRET:

		if (!deref_stack_regs(state, sp, &state->ip, &state->sp, false)) {

			orc_warn("can't dereference iret registers at %p for ip %p\n",

			orc_warn("can't dereference iret registers at %p for ip %pB\n",

				 (void *)sp, (void *)orig_ip);

			goto done;

		}
@@ -465,7 +465,8 @@ bool unwind_next_frame(struct unwind_state *state) 
		break;



	default:

		orc_warn("unknown .orc_unwind entry type %d\n", orc->type);

		orc_warn("unknown .orc_unwind entry type %d for ip %pB\n",

			 orc->type, (void *)orig_ip);

		break;

	}
@@ -487,7 +488,7 @@ bool unwind_next_frame(struct unwind_state *state) 
		break;



	default:

		orc_warn("unknown BP base reg %d for ip %p\n",

		orc_warn("unknown BP base reg %d for ip %pB\n",

			 orc->bp_reg, (void *)orig_ip);

		goto done;

	}
@@ -496,7 +497,7 @@ bool unwind_next_frame(struct unwind_state *state) 
	if (state->stack_info.type == prev_type &&

	    on_stack(&state->stack_info, (void *)state->sp, sizeof(long)) &&

	    state->sp <= prev_sp) {

		orc_warn("stack going in the wrong direction? ip=%p\n",

		orc_warn("stack going in the wrong direction? ip=%pB\n",

			 (void *)orig_ip);

		goto done;

	}

arch/x86/mm/mmap.c

+0 −12
Original line number Diff line number Diff line
@@ -174,15 +174,3 @@ const char *arch_vma_name(struct vm_area_struct *vma) 
		return "[mpx]";

	return NULL;

}
 


int valid_phys_addr_range(phys_addr_t addr, size_t count)

{

	return addr + count <= __pa(high_memory);

}



int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)

{

	phys_addr_t addr = (phys_addr_t)pfn << PAGE_SHIFT;



	return valid_phys_addr_range(addr, count);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE