Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+52
-104
-2
arch/x86/include/asm/processor.h
-2
arch/x86/include/asm/processor.h
···
749
749
extern void enable_sep_cpu(void);
750
750
extern int sysenter_setup(void);
751
751
752
-
extern void early_trap_init(void);
753
752
void early_trap_pf_init(void);
754
753
755
754
/* Defined in head.S */
756
755
extern struct desc_ptr early_gdt_descr;
757
756
758
-
extern void cpu_set_gdt(int);
759
757
extern void switch_to_new_gdt(int);
760
758
extern void load_direct_gdt(int);
761
759
extern void load_fixmap_gdt(int);
+4
arch/x86/kernel/acpi/boot.c
+4
arch/x86/kernel/acpi/boot.c
···
215
215
apic_id = processor->local_apic_id;
216
216
enabled = processor->lapic_flags & ACPI_MADT_ENABLED;
217
217
218
+
/* Ignore invalid ID */
219
+
if (apic_id == 0xffffffff)
220
+
return 0;
221
+
218
222
/*
219
223
* We need to register disabled CPU as well to permit
220
224
* counting disabled CPUs. This allows us to size
-90
arch/x86/kernel/pci-nommu.c
-90
arch/x86/kernel/pci-nommu.c
···
1
-
// SPDX-License-Identifier: GPL-2.0
2
-
/* Fallback functions when the main IOMMU code is not compiled in. This
3
-
code is roughly equivalent to i386. */
4
-
#include <linux/dma-direct.h>
5
-
#include <linux/scatterlist.h>
6
-
#include <linux/string.h>
7
-
#include <linux/gfp.h>
8
-
#include <linux/pci.h>
9
-
#include <linux/mm.h>
10
-
11
-
#include <asm/processor.h>
12
-
#include <asm/iommu.h>
13
-
#include <asm/dma.h>
14
-
15
-
#define NOMMU_MAPPING_ERROR 0
16
-
17
-
static int
18
-
check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)
19
-
{
20
-
if (hwdev && !dma_capable(hwdev, bus, size)) {
21
-
if (*hwdev->dma_mask >= DMA_BIT_MASK(32))
22
-
printk(KERN_ERR
23
-
"nommu_%s: overflow %Lx+%zu of device mask %Lx\n",
24
-
name, (long long)bus, size,
25
-
(long long)*hwdev->dma_mask);
26
-
return 0;
27
-
}
28
-
return 1;
29
-
}
30
-
31
-
static dma_addr_t nommu_map_page(struct device *dev, struct page *page,
32
-
unsigned long offset, size_t size,
33
-
enum dma_data_direction dir,
34
-
unsigned long attrs)
35
-
{
36
-
dma_addr_t bus = phys_to_dma(dev, page_to_phys(page)) + offset;
37
-
WARN_ON(size == 0);
38
-
if (!check_addr("map_single", dev, bus, size))
39
-
return NOMMU_MAPPING_ERROR;
40
-
return bus;
41
-
}
42
-
43
-
/* Map a set of buffers described by scatterlist in streaming
44
-
* mode for DMA. This is the scatter-gather version of the
45
-
* above pci_map_single interface. Here the scatter gather list
46
-
* elements are each tagged with the appropriate dma address
47
-
* and length. They are obtained via sg_dma_{address,length}(SG).
48
-
*
49
-
* NOTE: An implementation may be able to use a smaller number of
50
-
* DMA address/length pairs than there are SG table elements.
51
-
* (for example via virtual mapping capabilities)
52
-
* The routine returns the number of addr/length pairs actually
53
-
* used, at most nents.
54
-
*
55
-
* Device ownership issues as mentioned above for pci_map_single are
56
-
* the same here.
57
-
*/
58
-
static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,
59
-
int nents, enum dma_data_direction dir,
60
-
unsigned long attrs)
61
-
{
62
-
struct scatterlist *s;
63
-
int i;
64
-
65
-
WARN_ON(nents == 0 || sg[0].length == 0);
66
-
67
-
for_each_sg(sg, s, nents, i) {
68
-
BUG_ON(!sg_page(s));
69
-
s->dma_address = sg_phys(s);
70
-
if (!check_addr("map_sg", hwdev, s->dma_address, s->length))
71
-
return 0;
72
-
s->dma_length = s->length;
73
-
}
74
-
return nents;
75
-
}
76
-
77
-
static int nommu_mapping_error(struct device *dev, dma_addr_t dma_addr)
78
-
{
79
-
return dma_addr == NOMMU_MAPPING_ERROR;
80
-
}
81
-
82
-
const struct dma_map_ops nommu_dma_ops = {
83
-
.alloc = dma_generic_alloc_coherent,
84
-
.free = dma_generic_free_coherent,
85
-
.map_sg = nommu_map_sg,
86
-
.map_page = nommu_map_page,
87
-
.is_phys = 1,
88
-
.mapping_error = nommu_mapping_error,
89
-
.dma_supported = x86_dma_supported,
90
-
};
+40
-5
arch/x86/kernel/smpboot.c
+40
-5
arch/x86/kernel/smpboot.c
···
77
77
#include <asm/i8259.h>
78
78
#include <asm/misc.h>
79
79
#include <asm/qspinlock.h>
80
+
#include <asm/intel-family.h>
81
+
#include <asm/cpu_device_id.h>
80
82
81
83
/* Number of siblings per CPU package */
82
84
int smp_num_siblings = 1;
···
392
390
return false;
393
391
}
394
392
393
+
/*
394
+
* Define snc_cpu[] for SNC (Sub-NUMA Cluster) CPUs.
395
+
*
396
+
* These are Intel CPUs that enumerate an LLC that is shared by
397
+
* multiple NUMA nodes. The LLC on these systems is shared for
398
+
* off-package data access but private to the NUMA node (half
399
+
* of the package) for on-package access.
400
+
*
401
+
* CPUID (the source of the information about the LLC) can only
402
+
* enumerate the cache as being shared *or* unshared, but not
403
+
* this particular configuration. The CPU in this case enumerates
404
+
* the cache to be shared across the entire package (spanning both
405
+
* NUMA nodes).
406
+
*/
407
+
408
+
static const struct x86_cpu_id snc_cpu[] = {
409
+
{ X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_X },
410
+
{}
411
+
};
412
+
395
413
static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
396
414
{
397
415
int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
398
416
399
-
if (per_cpu(cpu_llc_id, cpu1) != BAD_APICID &&
400
-
per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2))
401
-
return topology_sane(c, o, "llc");
417
+
/* Do not match if we do not have a valid APICID for cpu: */
418
+
if (per_cpu(cpu_llc_id, cpu1) == BAD_APICID)
419
+
return false;
402
420
403
-
return false;
421
+
/* Do not match if LLC id does not match: */
422
+
if (per_cpu(cpu_llc_id, cpu1) != per_cpu(cpu_llc_id, cpu2))
423
+
return false;
424
+
425
+
/*
426
+
* Allow the SNC topology without warning. Return of false
427
+
* means 'c' does not share the LLC of 'o'. This will be
428
+
* reflected to userspace.
429
+
*/
430
+
if (!topology_same_node(c, o) && x86_match_cpu(snc_cpu))
431
+
return false;
432
+
433
+
return topology_sane(c, o, "llc");
404
434
}
405
435
406
436
/*
···
490
456
491
457
/*
492
458
* Set if a package/die has multiple NUMA nodes inside.
493
-
* AMD Magny-Cours and Intel Cluster-on-Die have this.
459
+
* AMD Magny-Cours, Intel Cluster-on-Die, and Intel
460
+
* Sub-NUMA Clustering have this.
494
461
*/
495
462
static bool x86_has_numa_in_package;
496
463
+1
-1
arch/x86/kernel/tsc.c
+1
-1
arch/x86/kernel/tsc.c
+6
-5
arch/x86/mm/dump_pagetables.c
+6
-5
arch/x86/mm/dump_pagetables.c
···
18
18
#include <linux/init.h>
19
19
#include <linux/sched.h>
20
20
#include <linux/seq_file.h>
21
+
#include <linux/highmem.h>
21
22
22
23
#include <asm/pgtable.h>
23
24
···
335
334
pgprotval_t eff_in, unsigned long P)
336
335
{
337
336
int i;
338
-
pte_t *start;
337
+
pte_t *pte;
339
338
pgprotval_t prot, eff;
340
339
341
-
start = (pte_t *)pmd_page_vaddr(addr);
342
340
for (i = 0; i < PTRS_PER_PTE; i++) {
343
-
prot = pte_flags(*start);
344
-
eff = effective_prot(eff_in, prot);
345
341
st->current_address = normalize_addr(P + i * PTE_LEVEL_MULT);
342
+
pte = pte_offset_map(&addr, st->current_address);
343
+
prot = pte_flags(*pte);
344
+
eff = effective_prot(eff_in, prot);
346
345
note_page(m, st, __pgprot(prot), eff, 5);
347
-
start++;
346
+
pte_unmap(pte);
348
347
}
349
348
}
350
349
#ifdef CONFIG_KASAN
+1
-1
arch/x86/power/hibernate_64.c
+1
-1
arch/x86/power/hibernate_64.c
···
98
98
set_pgd(pgd + pgd_index(restore_jump_address), new_pgd);
99
99
} else {
100
100
/* No p4d for 4-level paging: point the pgd to the pud page table */
101
-
pgd_t new_pgd = __pgd(__pa(p4d) | pgprot_val(pgtable_prot));
101
+
pgd_t new_pgd = __pgd(__pa(pud) | pgprot_val(pgtable_prot));
102
102
set_pgd(pgd + pgd_index(restore_jump_address), new_pgd);
103
103
}
104
104