Page MenuHomeFreeBSD
Files F157553323

D11801.id32013.diff
No OneTemporary
Actions

D11801.id32013.diff
View Options

Index: sys/x86/x86/mp_x86.c
===================================================================
--- sys/x86/x86/mp_x86.c
+++ sys/x86/x86/mp_x86.c
@@ -149,6 +149,7 @@
static struct topo_node topo_root;
static int pkg_id_shift;
+static int node_id_shift;
static int core_id_shift;
static int disabled_cpus;
@@ -268,6 +269,15 @@
cpuid_count(0x8000001e, 0, p);
share_count = ((p[1] >> 8) & 0xff) + 1;
core_id_shift = mask_width(share_count);
+
+ /*
+ * For Zen (17h), gather Nodes per Processor. Each node is a
+ * Zeppelin die; TR and EPYC CPUs will have multiple dies per
+ * package. Communication latency between dies is higher than
+ * within them.
+ */
+ nodes_per_socket = ((p[2] >> 8) & 0x7) + 1;
+ node_id_shift = pkg_id_shift - mask_width(nodes_per_socket);
}
if ((amd_feature2 & AMDID2_TOPOLOGY) != 0) {
@@ -477,7 +487,7 @@
int type;
int subtype;
int id_shift;
- } topo_layers[MAX_CACHE_LEVELS + 3];
+ } topo_layers[MAX_CACHE_LEVELS + 4];
struct topo_node *parent;
struct topo_node *node;
int layer;
@@ -509,6 +519,15 @@
printf("Package ID shift: %u\n", topo_layers[nlayers].id_shift);
nlayers++;
+ if (pkg_id_shift > node_id_shift) {
+ topo_layers[nlayers].type = TOPO_TYPE_GROUP;
+ topo_layers[nlayers].id_shift = node_id_shift;
+ if (bootverbose)
+ printf("Node ID shift: %u\n",
+ topo_layers[nlayers].id_shift);
+ nlayers++;
+ }
+
/*
* Consider all caches to be within a package/chip
* and "in front" of all sub-components like
@@ -516,6 +535,9 @@
*/
for (i = MAX_CACHE_LEVELS - 1; i >= 0; --i) {
if (caches[i].present) {
+ if (node_id_shift != 0)
+ KASSERT(caches[i].id_shift <= node_id_shift,
+ ("bug in APIC topology discovery"));
KASSERT(caches[i].id_shift <= pkg_id_shift,
("bug in APIC topology discovery"));
KASSERT(caches[i].id_shift >= core_id_shift,
@@ -714,7 +736,8 @@
int ncores;
int i;
- KASSERT(root->type == TOPO_TYPE_SYSTEM || root->type == TOPO_TYPE_CACHE,
+ KASSERT(root->type == TOPO_TYPE_SYSTEM || root->type == TOPO_TYPE_CACHE ||
+ root->type == TOPO_TYPE_GROUP,
("x86topo_add_sched_group: bad type: %u", root->type));
CPU_COPY(&root->cpuset, &cg_root->cg_mask);
cg_root->cg_count = root->cpu_count;
@@ -754,7 +777,8 @@
nchildren = 0;
node = root;
while (node != NULL) {
- if (node->type != TOPO_TYPE_CACHE ||
+ if ((node->type != TOPO_TYPE_GROUP &&
+ node->type != TOPO_TYPE_CACHE) ||
(root->type != TOPO_TYPE_SYSTEM &&
CPU_CMP(&node->cpuset, &root->cpuset) == 0)) {
node = topo_next_node(root, node);
@@ -774,7 +798,8 @@
node = root;
i = 0;
while (node != NULL) {
- if (node->type != TOPO_TYPE_CACHE ||
+ if ((node->type != TOPO_TYPE_GROUP &&
+ node->type != TOPO_TYPE_CACHE) ||
(root->type != TOPO_TYPE_SYSTEM &&
CPU_CMP(&node->cpuset, &root->cpuset) == 0)) {
node = topo_next_node(root, node);

File Metadata

Mime Type
text/plain
Expires
Sat, May 23, 6:27 PM (9 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33451674
Default Alt Text
D11801.id32013.diff (2 KB)

Event Timeline