Commit 37a535ed 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 Thomas Gleixner:
 "A small set of fixes for x86:

   - Prevent X2APIC ID 0xFFFFFFFF from being treated as valid, which
     causes the possible CPU count to be wrong.

   - Prevent 32bit truncation in calc_hpet_ref() which causes the TSC
     calibration to fail

   - Fix the page table setup for temporary text mappings in the resume
     code which causes resume failures

   - Make the page table dump code handle HIGHPTE correctly instead of
     oopsing

   - Support for topologies where NUMA nodes share an LLC to prevent a
     invalid topology warning and further malfunction on such systems.

   - Remove the now unused pci-nommu code

   - Remove stale function declarations"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/power/64: Fix page-table setup for temporary text mapping
  x86/mm: Prevent kernel Oops in PTDUMP code with HIGHPTE=y
  x86,sched: Allow topologies where NUMA nodes share an LLC
  x86/processor: Remove two unused function declarations
  x86/acpi: Prevent X2APIC id 0xffffffff from being accounted
  x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
  x86: Remove pci-nommu.c
parents c1e9dae0 05189820

arch/x86/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -749,13 +749,11 @@ enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT, 
extern void enable_sep_cpu(void);

extern int sysenter_setup(void);



extern void early_trap_init(void);

void early_trap_pf_init(void);



/* Defined in head.S */

extern struct desc_ptr		early_gdt_descr;



extern void cpu_set_gdt(int);

extern void switch_to_new_gdt(int);

extern void load_direct_gdt(int);

extern void load_fixmap_gdt(int);

arch/x86/kernel/acpi/boot.c

+4 −0
Original line number Diff line number Diff line
@@ -215,6 +215,10 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) 
	apic_id = processor->local_apic_id;

	enabled = processor->lapic_flags & ACPI_MADT_ENABLED;



	/* Ignore invalid ID */

	if (apic_id == 0xffffffff)

		return 0;



	/*

	 * We need to register disabled CPU as well to permit

	 * counting disabled CPUs. This allows us to size

arch/x86/kernel/pci-nommu.c

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

/* Fallback functions when the main IOMMU code is not compiled in. This

   code is roughly equivalent to i386. */

#include <linux/dma-direct.h>

#include <linux/scatterlist.h>

#include <linux/string.h>

#include <linux/gfp.h>

#include <linux/pci.h>

#include <linux/mm.h>



#include <asm/processor.h>

#include <asm/iommu.h>

#include <asm/dma.h>



#define NOMMU_MAPPING_ERROR		0



static int

check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)

{

	if (hwdev && !dma_capable(hwdev, bus, size)) {

		if (*hwdev->dma_mask >= DMA_BIT_MASK(32))

			printk(KERN_ERR

			    "nommu_%s: overflow %Lx+%zu of device mask %Lx\n",

				name, (long long)bus, size,

				(long long)*hwdev->dma_mask);

		return 0;

	}

	return 1;

}



static dma_addr_t nommu_map_page(struct device *dev, struct page *page,

				 unsigned long offset, size_t size,

				 enum dma_data_direction dir,

				 unsigned long attrs)

{

	dma_addr_t bus = phys_to_dma(dev, page_to_phys(page)) + offset;

	WARN_ON(size == 0);

	if (!check_addr("map_single", dev, bus, size))

		return NOMMU_MAPPING_ERROR;

	return bus;

}



/* Map a set of buffers described by scatterlist in streaming

 * mode for DMA.  This is the scatter-gather version of the

 * above pci_map_single interface.  Here the scatter gather list

 * elements are each tagged with the appropriate dma address

 * and length.  They are obtained via sg_dma_{address,length}(SG).

 *

 * NOTE: An implementation may be able to use a smaller number of

 *       DMA address/length pairs than there are SG table elements.

 *       (for example via virtual mapping capabilities)

 *       The routine returns the number of addr/length pairs actually

 *       used, at most nents.

 *

 * Device ownership issues as mentioned above for pci_map_single are

 * the same here.

 */

static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,

			int nents, enum dma_data_direction dir,

			unsigned long attrs)

{

	struct scatterlist *s;

	int i;



	WARN_ON(nents == 0 || sg[0].length == 0);



	for_each_sg(sg, s, nents, i) {

		BUG_ON(!sg_page(s));

		s->dma_address = sg_phys(s);

		if (!check_addr("map_sg", hwdev, s->dma_address, s->length))

			return 0;

		s->dma_length = s->length;

	}

	return nents;

}



static int nommu_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return dma_addr == NOMMU_MAPPING_ERROR;

}



const struct dma_map_ops nommu_dma_ops = {

	.alloc			= dma_generic_alloc_coherent,

	.free			= dma_generic_free_coherent,

	.map_sg			= nommu_map_sg,

	.map_page		= nommu_map_page,

	.is_phys		= 1,

	.mapping_error		= nommu_mapping_error,

	.dma_supported		= x86_dma_supported,

};

arch/x86/kernel/smpboot.c

+40 −5
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 
#include <asm/i8259.h>

#include <asm/misc.h>

#include <asm/qspinlock.h>

#include <asm/intel-family.h>

#include <asm/cpu_device_id.h>



/* Number of siblings per CPU package */

int smp_num_siblings = 1;
@@ -390,15 +392,47 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) 
	return false;

}



/*

 * Define snc_cpu[] for SNC (Sub-NUMA Cluster) CPUs.

 *

 * These are Intel CPUs that enumerate an LLC that is shared by

 * multiple NUMA nodes. The LLC on these systems is shared for

 * off-package data access but private to the NUMA node (half

 * of the package) for on-package access.

 *

 * CPUID (the source of the information about the LLC) can only

 * enumerate the cache as being shared *or* unshared, but not

 * this particular configuration. The CPU in this case enumerates

 * the cache to be shared across the entire package (spanning both

 * NUMA nodes).

 */



static const struct x86_cpu_id snc_cpu[] = {

	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_X },

	{}

};



static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)

{

	int cpu1 = c->cpu_index, cpu2 = o->cpu_index;



	if (per_cpu(cpu_llc_id, cpu1) != BAD_APICID &&

	    per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2))

		return topology_sane(c, o, "llc");

	/* Do not match if we do not have a valid APICID for cpu: */

	if (per_cpu(cpu_llc_id, cpu1) == BAD_APICID)

		return false;



	/* Do not match if LLC id does not match: */

	if (per_cpu(cpu_llc_id, cpu1) != per_cpu(cpu_llc_id, cpu2))

		return false;



	/*

	 * Allow the SNC topology without warning. Return of false

	 * means 'c' does not share the LLC of 'o'. This will be

	 * reflected to userspace.

	 */

	if (!topology_same_node(c, o) && x86_match_cpu(snc_cpu))

		return false;



	return topology_sane(c, o, "llc");

}



/*
@@ -456,7 +490,8 @@ static struct sched_domain_topology_level x86_topology[] = { 


/*

 * Set if a package/die has multiple NUMA nodes inside.

 * AMD Magny-Cours and Intel Cluster-on-Die have this.

 * AMD Magny-Cours, Intel Cluster-on-Die, and Intel

 * Sub-NUMA Clustering have this.

 */

static bool x86_has_numa_in_package;

arch/x86/kernel/tsc.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static unsigned long calc_hpet_ref(u64 deltatsc, u64 hpet1, u64 hpet2) 
	hpet2 -= hpet1;

	tmp = ((u64)hpet2 * hpet_readl(HPET_PERIOD));

	do_div(tmp, 1000000);

	do_div(deltatsc, tmp);

	deltatsc = div64_u64(deltatsc, tmp);



	return (unsigned long) deltatsc;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE