Skip to content

x86/apic: Rework APIC registration

Thomas Gleixner lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v2 Latest30 patches 13 repliesIn review

Changes in v2 from the cover letter

- Breakout of the actual topology management changes

- Adopt DIEGRP

- Different approach to identify the BSP on enumeration (Rui)

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/30x86/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
2/30x86/cpu/topology: Provide separate APIC registration functionsarch/x86/include/asm/apic.h arch/x86/kernel/cpu/topology.c+98 -180 replies
3/30x86/acpi: Use new APIC registration functionsarch/x86/kernel/acpi/boot.c+7 -370 replies
4/30x86/jailhouse: Use new APIC registration functionarch/x86/kernel/jailhouse.c+1 -10 replies
5/30x86/of: Use new APIC registration functionsarch/x86/kernel/devicetree.c+1 -10 replies
6/30x86/mpparse: Use new APIC registration functionarch/x86/include/asm/mpspec.h arch/x86/kernel/cpu/topology.c arch/x86/kernel/mpparse.c+10 -110 replies
7/30x86/acpi: Dont invoke topology_register_apic() for XEN PVarch/x86/kernel/acpi/boot.c+6 -20 replies
8/30x86/xen/smp_pv: Register fake APICsarch/x86/xen/smp_pv.c+9 -260 replies
9/30x86/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
10/30x86/cpu/topology: Simplify APIC registrationarch/x86/kernel/cpu/topology.c+3 -200 replies
11/30x86/cpu/topology: Use a data structure for topology infoarch/x86/kernel/cpu/topology.c+29 -300 replies
12/30x86/smpboot: Make error message actually usefularch/x86/kernel/smpboot.c+7 -30 replies
13/30x86/cpu/topology: Sanitize the APIC admission logicarch/x86/kernel/cpu/topology.c+78 -820 replies
14/30x86/cpu/topology: Rework possible CPU managementarch/x86/include/asm/apic.h arch/x86/include/asm/cpu.h arch/x86/include/asm/topology.h +3 more+118 -891 reply
15/30x86/cpu: Detect real BSP on crash kernelsDocumentation/admin-guide/kdump/kdump.rst Documentation/admin-guide/kernel-parameters.txt arch/x86/kernel/cpu/topology.c+61 -541 reply
16/30x86/topology: Add a mechanism to track topology via APIC IDsarch/x86/kernel/cpu/topology.c+46 -20 replies
17/30x86/cpu/topology: Reject unknown APIC IDs on ACPI hotplugarch/x86/kernel/cpu/topology.c+4 -00 replies
18/30x86/cpu/topology: Assign hotpluggable CPUIDs during initarch/x86/kernel/cpu/topology.c+18 -110 replies
19/30x86/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
20/30x86/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
21/30x86/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 -606 replies
22/30x86/cpu/topology: Mop up primary thread mask handlingarch/x86/kernel/cpu/topology.c+2 -270 replies
23/30x86/cpu/topology: Simplify cpu_mark_primary_thread()arch/x86/kernel/cpu/topology.c+1 -40 replies
24/30x86/cpu/topology: Provide logical pkg/die mappingarch/x86/include/asm/topology.h arch/x86/kernel/cpu/topology.c+37 -00 replies
25/30x86/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+12 -1313 replies
26/30x86/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+57 -150 replies
27/30x86/cpu/topology: Rename smp_num_siblingsarch/x86/include/asm/perf_event_p4.h arch/x86/include/asm/smp.h arch/x86/include/asm/topology.h +6 more+13 -140 replies
28/30x86/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
29/30x86/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
30/30x86/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+31 -430 replies

Reviews trailers per patch

None of the 30 patches has a Reviewed-by or Acked-by.

PatchMichael KelleySohil Mehta
1/30
2/30
3/30
4/30
5/30
6/30
7/30
8/30
9/30
10/30
11/30
12/30
13/30
14/30
15/30
16/30
17/30
18/30
19/30
20/30
21/30T-b T-b
22/30
23/30
24/30
25/30
26/30
27/30
28/30
29/30
30/30

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [patch v2 00/30] x86/apic: Rework APIC registration

This is a breakout from:

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

addressing the 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

- 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][DIEGRP][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 DIEGRP, 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.

Changes vs. V1:

- Breakout of the actual topology management changes

- Adopt DIEGRP

- Different approach to identify the BSP on enumeration (Rui)

The current series applies on top of

git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git topo-cleanup-v2

and is available from git here:

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

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                                    |   10 
 arch/x86/include/asm/cpu.h                                     |   10 
 arch/x86/include/asm/mpspec.h                                  |    2 
 arch/x86/include/asm/perf_event_p4.h                           |    4 
 arch/x86/include/asm/processor.h                               |    2 
 arch/x86/include/asm/smp.h                                     |    6 
 arch/x86/include/asm/topology.h                                |   53 -
 arch/x86/kernel/acpi/boot.c                                    |   59 -
 arch/x86/kernel/apic/apic.c                                    |  186 ---
 arch/x86/kernel/cpu/Makefile                                   |   12 
 arch/x86/kernel/cpu/cacheinfo.c                                |    2 
 arch/x86/kernel/cpu/common.c                                   |   33 
 arch/x86/kernel/cpu/debugfs.c                                  |    7 
 arch/x86/kernel/cpu/mce/inject.c                               |    3 
 arch/x86/kernel/cpu/microcode/intel.c                          |    2 
 arch/x86/kernel/cpu/topology.c                                 |  484 ++++++++++
 arch/x86/kernel/cpu/topology.h                                 |   11 
 arch/x86/kernel/cpu/topology_common.c                          |   45 
 arch/x86/kernel/devicetree.c                                   |    2 
 arch/x86/kernel/jailhouse.c                                    |    2 
 arch/x86/kernel/mpparse.c                                      |   17 
 arch/x86/kernel/process.c                                      |    2 
 arch/x86/kernel/setup.c                                        |    9 
 arch/x86/kernel/smpboot.c                                      |  219 ----
 arch/x86/xen/apic.c                                            |   14 
 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                                          |   58 -
 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 
 46 files changed, 698 insertions(+), 655 deletions(-)