Skip to content

x86/topology: The final installment

Thomas Gleixner lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest53 patches 44 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/53x86/cpu/topology: Cure off by one in fake_topology()arch/x86/kernel/cpu/topology_common.c+1 -10 replies
2/53x86/cpu/topology: Make the APIC mismatch warnings completearch/x86/kernel/cpu/common.c arch/x86/kernel/cpu/topology_common.c+12 -132 replies
3/53x86/platform/ce4100: Dont override x86_init.mpparse.setup_ioapic_idsarch/x86/include/asm/io_apic.h arch/x86/kernel/apic/io_apic.c arch/x86/platform/ce4100/ce4100.c+1 -31 reply
4/53x86/ioapic: Replace some more set bit nonsensearch/x86/include/asm/mpspec.h arch/x86/kernel/apic/io_apic.c+2 -70 replies
5/53x86/apic: Get rid of get_physical_broadcast()arch/x86/kernel/apic/apic.c arch/x86/kernel/apic/io_apic.c+19 -331 reply
6/53x86/ioapic: Make io_apic_get_unique_id() simplerarch/x86/kernel/apic/io_apic.c+5 -170 replies
7/53x86/ioapic: Simplify setup_ioapic_ids_from_mpc_nocheck()arch/x86/kernel/apic/io_apic.c+2 -30 replies
8/53x86/apic: Remove check_apicid_used() and ioapic_phys_id_map()arch/x86/include/asm/apic.h arch/x86/include/asm/mpspec.h arch/x86/kernel/apic/apic_noop.c +3 more+0 -280 replies
9/53x86/mpparse: Rename default_find_smp_config()arch/x86/include/asm/mpspec.h arch/x86/include/asm/x86_init.h arch/x86/kernel/mpparse.c +5 more+13 -202 replies
10/53x86/mpparse: Provide separate early/late callbacksarch/x86/include/asm/x86_init.h+4 -00 replies
11/53x86/mpparse: Prepare for callback separationarch/x86/include/asm/mpspec.h arch/x86/kernel/mpparse.c arch/x86/kernel/x86_init.c+20 -60 replies
12/53x86/dtb: Rename x86_dtb_init()arch/x86/include/asm/prom.h arch/x86/kernel/devicetree.c arch/x86/kernel/setup.c+4 -40 replies
13/53x86/platform/ce4100: Prepare for separate mpparse callbacksarch/x86/platform/ce4100/ce4100.c+8 -60 replies
14/53x86/platform/intel-mid: Prepare for separate mpparse callbacksarch/x86/platform/intel-mid/intel-mid.c+4 -21 reply
15/53x86/jailhouse: Prepare for separate mpparse callbacksarch/x86/kernel/jailhouse.c+21 -130 replies
16/53x86/xen/smp_pv: Prepare for separate mpparse callbacksarch/x86/xen/smp_pv.c+9 -20 replies
17/53x86/mpparse: Switch to new init callbacksarch/x86/include/asm/mpspec.h arch/x86/include/asm/x86_init.h arch/x86/kernel/jailhouse.c +6 more+9 -380 replies
18/53x86/mm/numa: Move early mptable evaluation into common codearch/x86/include/asm/mpspec.h arch/x86/kernel/setup.c arch/x86/mm/amdtopology.c+2 -120 replies
19/53x86/mpparse: Remove the physid_t bitmap wrapperarch/x86/include/asm/mpspec.h arch/x86/kernel/apic/apic.c arch/x86/kernel/apic/apic_common.c +3 more+30 -581 reply
20/53x86/apic: Remove the pointless writeback of boot_cpu_physical_apicidarch/x86/include/asm/apic.h arch/x86/kernel/apic/apic.c arch/x86/kernel/apic/apic_flat_64.c +7 more+0 -450 replies
21/53x86/apic: Remove yet another dubious callbackarch/x86/include/asm/apic.h arch/x86/kernel/apic/apic.c arch/x86/kernel/apic/apic_common.c +3 more+0 -140 replies
22/53x86/apic: Use a proper define for invalid ACPI CPU IDarch/x86/include/asm/apic.h arch/x86/kernel/apic/apic.c arch/x86/xen/enlighten_hvm.c+4 -20 replies
23/53x86/cpu/topology: Move registration out of APIC codearch/x86/include/asm/apic.h arch/x86/kernel/apic/apic.c arch/x86/kernel/cpu/Makefile +1 more+195 -1880 replies
24/53x86/cpu/topology: Provide separate APIC registration functionsarch/x86/include/asm/apic.h arch/x86/kernel/cpu/topology.c+98 -181 reply
25/53x86/acpi: Use new APIC registration functionsarch/x86/kernel/acpi/boot.c+7 -373 replies
26/53x86/jailhouse: Use new APIC registration functionarch/x86/kernel/jailhouse.c+1 -10 replies
27/53x86/of: Use new APIC registration functionsarch/x86/kernel/devicetree.c+1 -10 replies
28/53x86/mpparse: Use new APIC registration functionarch/x86/include/asm/mpspec.h arch/x86/kernel/cpu/topology.c arch/x86/kernel/mpparse.c+11 -140 replies
29/53x86/acpi: Dont invoke topology_register_apic() for XEN PVarch/x86/kernel/acpi/boot.c+6 -20 replies
30/53x86/xen/smp_pv: Register fake APICsarch/x86/xen/smp_pv.c+9 -260 replies
31/53x86/cpu/topology: Confine topology informationarch/x86/include/asm/smp.h arch/x86/kernel/apic/apic.c arch/x86/kernel/cpu/topology.c +1 more+74 -780 replies
32/53x86/cpu/topology: Simplify APIC registrationarch/x86/kernel/cpu/topology.c+3 -200 replies
33/53x86/cpu/topology: Use a data structure for topology infoarch/x86/kernel/cpu/topology.c+29 -300 replies
34/53x86/smpboot: Make error message actually usefularch/x86/kernel/smpboot.c+7 -30 replies
35/53x86/cpu/topology: Sanitize the APIC admission logicarch/x86/kernel/cpu/topology.c+78 -820 replies
36/53x86/cpu/topology: Rework possible CPU managementarch/x86/include/asm/apic.h arch/x86/include/asm/topology.h arch/x86/kernel/cpu/topology.c +2 more+120 -801 reply
37/53x86/cpu: Detect real BSP on crash kernelsDocumentation/admin-guide/kdump/kdump.rst Documentation/admin-guide/kernel-parameters.txt arch/x86/kernel/cpu/topology.c+39 -3611 replies
38/53x86/topology: Add a mechanism to track topology via APIC IDsarch/x86/kernel/cpu/debugfs.c arch/x86/kernel/cpu/topology.c arch/x86/kernel/cpu/topology.h+67 -110 replies
39/53x86/cpu/topology: Reject unknown APIC IDs on ACPI hotplugarch/x86/kernel/cpu/topology.c+4 -00 replies
40/53x86/cpu/topology: Assign hotpluggable CPUIDs during initarch/x86/kernel/cpu/topology.c+17 -110 replies
41/53x86/xen/smp_pv: Count number of vCPUs earlyarch/x86/xen/enlighten_pv.c arch/x86/xen/smp.h arch/x86/xen/smp_pv.c+19 -00 replies
42/53x86/cpu/topology: Let XEN/PV use topology from CPUID/MADTarch/x86/kernel/acpi/boot.c arch/x86/kernel/cpu/topology_common.c arch/x86/xen/apic.c +1 more+24 -300 replies
43/53x86/cpu/topology: Use topology bitmaps for sizingarch/x86/include/asm/smp.h arch/x86/include/asm/topology.h arch/x86/kernel/cpu/common.c +5 more+35 -600 replies
44/53x86/cpu/topology: Mop up primary thread mask handlingarch/x86/kernel/cpu/topology.c+2 -270 replies
45/53x86/cpu/topology: Simplify cpu_mark_primary_thread()arch/x86/kernel/cpu/topology.c+1 -40 replies
46/53x86/cpu/topology: Provide logical pkg/die mappingarch/x86/include/asm/topology.h arch/x86/kernel/cpu/topology.c+30 -00 replies
47/53x86/cpu/topology: Use topology logical mapping mechanismarch/x86/include/asm/topology.h arch/x86/kernel/cpu/common.c arch/x86/kernel/cpu/topology_common.c +1 more+11 -1300 replies
48/53x86/cpu/topology: Retrieve cores per package from topology bitmapsarch/x86/kernel/cpu/topology.c arch/x86/kernel/cpu/topology.h arch/x86/kernel/cpu/topology_common.c+49 -150 replies
49/53x86: Use topology functions instead of smp_num_siblings where applicablearch/x86/include/asm/perf_event_p4.h arch/x86/kernel/process.c arch/x86/kernel/smpboot.c+4 -110 replies
50/53x86/cpu/topology: Rename smp_num_siblingsarch/x86/include/asm/smp.h arch/x86/include/asm/topology.h arch/x86/kernel/cpu/common.c +4 more+12 -180 replies
51/53x86/cpu/topology: Rename topology_max_die_per_package()arch/x86/events/intel/cstate.c arch/x86/events/intel/uncore.c arch/x86/events/intel/uncore_snbep.c +8 more+11 -110 replies
52/53x86/cpu/topology: Provide __num_[cores|threads]_per_packagearch/x86/include/asm/topology.h arch/x86/kernel/cpu/common.c arch/x86/kernel/cpu/topology.c+25 -10 replies
53/53x86/cpu/topology: Get rid of cpuinfo::x86_max_coresDocumentation/arch/x86/topology.rst arch/x86/events/intel/uncore_nhmex.c arch/x86/events/intel/uncore_snb.c +11 more+32 -442 replies

Reviews trailers per patch

1 of 53 patches has a Reviewed-by or Acked-by.

PatchAndy ShevchenkoJuergen GrossPeter Zijlstra (Intel)Qiuxu ZhuoSohil MehtaMichael Kelley
SeriesT-b T-b T-b T-b T-b
1/53
2/53
3/53
4/53
5/53
6/53
7/53
8/53
9/53
10/53
11/53
12/53
13/53
14/53A-b
15/53
16/53
17/53
18/53
19/53
20/53
21/53
22/53
23/53
24/53
25/53
26/53
27/53
28/53
29/53
30/53
31/53
32/53
33/53
34/53
35/53
36/53
37/53
38/53
39/53
40/53
41/53
42/53
43/53
44/53
45/53
46/53
47/53
48/53
49/53
50/53
51/53
52/53
53/53

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v1 thread

Cover letter [patch 00/53] x86/topology: The final installment

Hi!

This is the (for now) last part of reworking topology enumeration and management. It's based on the APIC and CPUID rework series which can be found here:

      https://lore.kernel.org/lkml/[email protected]

With these preparatory changes in place, it's now possible to address the real issues of the current topology code:

- Wrong core count on hybrid systems

- Heuristics based size information for packages and dies which are failing to work correctly with certain command line parameters.

- Full evaluation fail for a theoretical hybrid system which boots from an E-core

- The complete insanity of manipulating global data from firmware parsers or the XEN/PV fake SMP enumeration. The latter is really a piece of art.

This series addresses this by

- Mopping up some more historical technical debt

- Consolidating all topology relevant functionality into one place

- Providing separate interfaces for boot time and ACPI hotplug operations

- A sane ordering of command line options and restrictions

- A sensible way to handle the BSP problem in kdump kernels instead of the unreliable command line option.

- Confinement of topology relevant variables by replacing the XEN/PV SMP enumeration fake with something halfways sensible.

- Evaluation of sizes by analysing the topology via the CPUID provided APIC ID segmentation and the actual APIC IDs which are registered at boot time.

- Removal of heuristics and broken size calculations

The idea behind this is the following:

The APIC IDs describe the system topology in multiple domain levels. The CPUID topology parser provides the information which part of the APIC ID is associated to the individual levels (Intel terminology):

[ROOT][PACKAGE][DIE][TILE][MODULE][CORE][THREAD]

The root space contains the package (socket) IDs. Not enumerated levels consume 0 bits space, but conceptually they are always represented. If e.g. only CORE and THREAD levels are enumerated then the DIE, MODULE and TILE have the same physical ID as the PACKAGE.

If SMT is not supported, then the THREAD domain is still used. It then has the same physical ID as the CORE domain and is the only child of the core domain.

This allows an unified view on the system independent of the enumerated domain levels without requiring any conditionals in the code.

AMD does only expose 4 domain levels with obviously different terminology, but that can be easily mapped into the Intel variant with a trivial lookup table added to the CPUID parser.

The resulting topology information of an ADL hybrid system with 8 P-Cores and 8 E-Cores looks like this:

 CPU topo: Max. logical packages:   1
 CPU topo: Max. logical dies:       1
 CPU topo: Max. dies per package:   1
 CPU topo: Max. threads per core:   2
 CPU topo: Num. cores per package:    16
 CPU topo: Num. threads per package:  24
 CPU topo: Allowing 24 present CPUs plus 0 hotplug CPUs
 CPU topo: Thread    :    24
 CPU topo: Core      :    16
 CPU topo: Module    :     1
 CPU topo: Tile      :     1
 CPU topo: Die       :     1
 CPU topo: Package   :     1

This is happening on the boot CPU before any of the APs is started and provides correct size information right from the start.

Even the XEN/PV trainwreck makes use of this now. On Dom0 it utilizes the MADT and on DomU it provides fake APIC IDs, which combined with the provided CPUID information make it at least look halfways realistic instead of claiming to have one CPU per package as the current upstream code does.

This is solely addressing the core topology issues, but there is a plan for further consolidation of other topology related information into one single source of information instead of having a gazillion of localized special parsers and representations all over the place. There are quite some other things which can be simplified on top of this, like updating the various cpumasks during CPU bringup, but that's all left for later.

So another 53 patches later, the resulting diffstat is:

   64 files changed, 830 insertions(+), 955 deletions(-)

and the combo diffstat of all three series combined:

  115 files changed, 2414 insertions(+), 3035 deletions(-)

The current series applies on top of

git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git topo-cpuid-v3

and is available from git here:

git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git topo-full-v1

Thanks,

tglx

---
 Documentation/admin-guide/kdump/kdump.rst                      |    7 
 Documentation/admin-guide/kernel-parameters.txt                |    9 
 Documentation/arch/x86/topology.rst                            |   24 
 arch/x86/events/intel/cstate.c                                 |    2 
 arch/x86/events/intel/uncore.c                                 |    2 
 arch/x86/events/intel/uncore_nhmex.c                           |    4 
 arch/x86/events/intel/uncore_snb.c                             |    8 
 arch/x86/events/intel/uncore_snbep.c                           |   18 
 arch/x86/events/rapl.c                                         |    2 
 arch/x86/include/asm/apic.h                                    |   17 
 arch/x86/include/asm/io_apic.h                                 |    1 
 arch/x86/include/asm/mpspec.h                                  |   66 -
 arch/x86/include/asm/perf_event_p4.h                           |   11 
 arch/x86/include/asm/processor.h                               |    2 
 arch/x86/include/asm/prom.h                                    |    4 
 arch/x86/include/asm/smp.h                                     |    6 
 arch/x86/include/asm/topology.h                                |   60 -
 arch/x86/include/asm/x86_init.h                                |   10 
 arch/x86/kernel/acpi/boot.c                                    |   59 -
 arch/x86/kernel/apic/apic.c                                    |  207 ----
 arch/x86/kernel/apic/apic_common.c                             |   15 
 arch/x86/kernel/apic/apic_flat_64.c                            |    9 
 arch/x86/kernel/apic/apic_noop.c                               |    2 
 arch/x86/kernel/apic/apic_numachip.c                           |   12 
 arch/x86/kernel/apic/bigsmp_32.c                               |   14 
 arch/x86/kernel/apic/io_apic.c                                 |   85 -
 arch/x86/kernel/apic/local.h                                   |    4 
 arch/x86/kernel/apic/probe_32.c                                |    3 
 arch/x86/kernel/apic/x2apic_cluster.c                          |    3 
 arch/x86/kernel/apic/x2apic_phys.c                             |    6 
 arch/x86/kernel/apic/x2apic_uv_x.c                             |    6 
 arch/x86/kernel/cpu/Makefile                                   |   12 
 arch/x86/kernel/cpu/cacheinfo.c                                |    2 
 arch/x86/kernel/cpu/common.c                                   |   42 
 arch/x86/kernel/cpu/debugfs.c                                  |   15 
 arch/x86/kernel/cpu/mce/inject.c                               |    3 
 arch/x86/kernel/cpu/microcode/intel.c                          |    4 
 arch/x86/kernel/cpu/topology.c                                 |  497 ++++++++++
 arch/x86/kernel/cpu/topology.h                                 |    5 
 arch/x86/kernel/cpu/topology_common.c                          |   57 -
 arch/x86/kernel/devicetree.c                                   |    4 
 arch/x86/kernel/jailhouse.c                                    |   30 
 arch/x86/kernel/mpparse.c                                      |   35 
 arch/x86/kernel/process.c                                      |    2 
 arch/x86/kernel/setup.c                                        |   27 
 arch/x86/kernel/smpboot.c                                      |  229 ----
 arch/x86/kernel/x86_init.c                                     |    5 
 arch/x86/mm/amdtopology.c                                      |    7 
 arch/x86/platform/ce4100/ce4100.c                              |   14 
 arch/x86/platform/intel-mid/intel-mid.c                        |    5 
 arch/x86/xen/apic.c                                            |   21 
 arch/x86/xen/enlighten_hvm.c                                   |    2 
 arch/x86/xen/enlighten_pv.c                                    |    3 
 arch/x86/xen/smp.c                                             |    2 
 arch/x86/xen/smp.h                                             |    2 
 arch/x86/xen/smp_pv.c                                          |   66 -
 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c               |    2 
 drivers/hwmon/coretemp.c                                       |    2 
 drivers/hwmon/fam15h_power.c                                   |    2 
 drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c |    2 
 drivers/powercap/intel_rapl_common.c                           |    2 
 drivers/thermal/intel/intel_hfi.c                              |    2 
 drivers/thermal/intel/intel_powerclamp.c                       |    2 
 drivers/thermal/intel/x86_pkg_temp_thermal.c                   |    2 
 64 files changed, 830 insertions(+), 955 deletions(-)