x86/topology: The final installment
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest53 patches 44 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/53 | x86/cpu/topology: Cure off by one in fake_topology()arch/ | +1 | 0 replies | |
| 2/53 | x86/cpu/topology: Make the APIC mismatch warnings completearch/ arch/ | +12 | 2 replies | |
| 3/53 | x86/platform/ce4100: Dont override x86_init.mpparse.setup_ioapic_idsarch/ arch/ arch/ | +1 | 1 reply | |
| 4/53 | x86/ioapic: Replace some more set bit nonsensearch/ arch/ | +2 | 0 replies | |
| 5/53 | x86/apic: Get rid of get_physical_broadcast()arch/ arch/ | +19 | 1 reply | |
| 6/53 | x86/ioapic: Make io_apic_get_unique_id() simplerarch/ | +5 | 0 replies | |
| 7/53 | x86/ioapic: Simplify setup_ioapic_ids_from_mpc_nocheck()arch/ | +2 | 0 replies | |
| 8/53 | x86/apic: Remove check_apicid_used() and ioapic_phys_id_map()arch/ arch/ arch/ +3 more | +0 | 0 replies | |
| 9/53 | x86/mpparse: Rename default_find_smp_config()arch/ arch/ arch/ +5 more | +13 | 2 replies | |
| 10/53 | x86/mpparse: Provide separate early/late callbacksarch/ | +4 | 0 replies | |
| 11/53 | x86/mpparse: Prepare for callback separationarch/ arch/ arch/ | +20 | 0 replies | |
| 12/53 | x86/dtb: Rename x86_dtb_init()arch/ arch/ arch/ | +4 | 0 replies | |
| 13/53 | x86/platform/ce4100: Prepare for separate mpparse callbacksarch/ | +8 | 0 replies | |
| 14/53 | x86/platform/intel-mid: Prepare for separate mpparse callbacksarch/ | +4 | 1 reply | |
| 15/53 | x86/jailhouse: Prepare for separate mpparse callbacksarch/ | +21 | 0 replies | |
| 16/53 | x86/xen/smp_pv: Prepare for separate mpparse callbacksarch/ | +9 | 0 replies | |
| 17/53 | x86/mpparse: Switch to new init callbacksarch/ arch/ arch/ +6 more | +9 | 0 replies | |
| 18/53 | x86/mm/numa: Move early mptable evaluation into common codearch/ arch/ arch/ | +2 | 0 replies | |
| 19/53 | x86/mpparse: Remove the physid_t bitmap wrapperarch/ arch/ arch/ +3 more | +30 | 1 reply | |
| 20/53 | x86/apic: Remove the pointless writeback of boot_cpu_physical_apicidarch/ arch/ arch/ +7 more | +0 | 0 replies | |
| 21/53 | x86/apic: Remove yet another dubious callbackarch/ arch/ arch/ +3 more | +0 | 0 replies | |
| 22/53 | x86/apic: Use a proper define for invalid ACPI CPU IDarch/ arch/ arch/ | +4 | 0 replies | |
| 23/53 | x86/cpu/topology: Move registration out of APIC codearch/ arch/ arch/ +1 more | +195 | 0 replies | |
| 24/53 | x86/cpu/topology: Provide separate APIC registration functionsarch/ arch/ | +98 | 1 reply | |
| 25/53 | x86/acpi: Use new APIC registration functionsarch/ | +7 | 3 replies | |
| 26/53 | x86/jailhouse: Use new APIC registration functionarch/ | +1 | 0 replies | |
| 27/53 | x86/of: Use new APIC registration functionsarch/ | +1 | 0 replies | |
| 28/53 | x86/mpparse: Use new APIC registration functionarch/ arch/ arch/ | +11 | 0 replies | |
| 29/53 | x86/acpi: Dont invoke topology_register_apic() for XEN PVarch/ | +6 | 0 replies | |
| 30/53 | x86/xen/smp_pv: Register fake APICsarch/ | +9 | 0 replies | |
| 31/53 | x86/cpu/topology: Confine topology informationarch/ arch/ arch/ +1 more | +74 | 0 replies | |
| 32/53 | x86/cpu/topology: Simplify APIC registrationarch/ | +3 | 0 replies | |
| 33/53 | x86/cpu/topology: Use a data structure for topology infoarch/ | +29 | 0 replies | |
| 34/53 | x86/smpboot: Make error message actually usefularch/ | +7 | 0 replies | |
| 35/53 | x86/cpu/topology: Sanitize the APIC admission logicarch/ | +78 | 0 replies | |
| 36/53 | x86/cpu/topology: Rework possible CPU managementarch/ arch/ arch/ +2 more | +120 | 1 reply | |
| 37/53 | x86/cpu: Detect real BSP on crash kernelsDocumentation/ Documentation/ arch/ | +39 | 11 replies | |
| 38/53 | x86/topology: Add a mechanism to track topology via APIC IDsarch/ arch/ arch/ | +67 | 0 replies | |
| 39/53 | x86/cpu/topology: Reject unknown APIC IDs on ACPI hotplugarch/ | +4 | 0 replies | |
| 40/53 | x86/cpu/topology: Assign hotpluggable CPUIDs during initarch/ | +17 | 0 replies | |
| 41/53 | x86/xen/smp_pv: Count number of vCPUs earlyarch/ arch/ arch/ | +19 | 0 replies | |
| 42/53 | x86/cpu/topology: Let XEN/PV use topology from CPUID/MADTarch/ arch/ arch/ +1 more | +24 | 0 replies | |
| 43/53 | x86/cpu/topology: Use topology bitmaps for sizingarch/ arch/ arch/ +5 more | +35 | 0 replies | |
| 44/53 | x86/cpu/topology: Mop up primary thread mask handlingarch/ | +2 | 0 replies | |
| 45/53 | x86/cpu/topology: Simplify cpu_mark_primary_thread()arch/ | +1 | 0 replies | |
| 46/53 | x86/cpu/topology: Provide logical pkg/die mappingarch/ arch/ | +30 | 0 replies | |
| 47/53 | x86/cpu/topology: Use topology logical mapping mechanismarch/ arch/ arch/ +1 more | +11 | 0 replies | |
| 48/53 | x86/cpu/topology: Retrieve cores per package from topology bitmapsarch/ arch/ arch/ | +49 | 0 replies | |
| 49/53 | x86: Use topology functions instead of smp_num_siblings where applicablearch/ arch/ arch/ | +4 | 0 replies | |
| 50/53 | x86/cpu/topology: Rename smp_num_siblingsarch/ arch/ arch/ +4 more | +12 | 0 replies | |
| 51/53 | x86/cpu/topology: Rename topology_max_die_per_package()arch/ arch/ arch/ +8 more | +11 | 0 replies | |
| 52/53 | x86/cpu/topology: Provide __num_[cores|threads]_per_packagearch/ arch/ arch/ | +25 | 0 replies | |
| 53/53 | x86/cpu/topology: Get rid of cpuinfo::x86_max_coresDocumentation/ arch/ arch/ +11 more | +32 | 2 replies |
Reviews trailers per patch
1 of 53 patches has a Reviewed-by or Acked-by.
| Patch | Andy Shevchenko | Juergen Gross | Peter Zijlstra (Intel) | Qiuxu Zhuo | Sohil Mehta | Michael Kelley |
|---|---|---|---|---|---|---|
| Series | T-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/53 | A-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.
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(-)