Page MenuHomeFreeBSD
Files F143303994

D41618.id126613.diff
No OneTemporary
Actions

D41618.id126613.diff
View Options

Index: sys/x86/x86/mp_x86.c
===================================================================
--- sys/x86/x86/mp_x86.c
+++ sys/x86/x86/mp_x86.c
@@ -153,6 +153,11 @@
&hyperthreading_intr_allowed, 0,
"Allow interrupts on HTT logical CPUs");
+static int intr_apic_id_limit = -1;
+SYSCTL_INT(_machdep, OID_AUTO, intr_apic_id_limit, CTLFLAG_RDTUN,
+ &intr_apic_id_limit, 0,
+ "Maximum permitted APIC ID for interrupt delivery (-1 is unlimited)");
+
static struct topo_node topo_root;
static int pkg_id_shift;
@@ -258,6 +263,22 @@
if ((amd_feature2 & AMDID2_CMP) == 0)
return;
+ /*
+ * XXX Lack of an AMD IOMMU driver prevents use of APIC IDs above
+ * IOAPIC_MAX_ID. This is a workaround so we boot and function on AMD
+ * systems with high thread counts, albeit with reduced interrupt
+ * performance.
+ *
+ * We should really set the limit to IOAPIC_MAX_ID by default, and have
+ * the IOMMU driver increase it. That way if a driver is present but
+ * disabled, or is otherwise not able to route the interrupts, the
+ * system can fall back to a functional state. That will require a
+ * more substantial change though, including having the IOMMU
+ * initialize earlier.
+ */
+ if (intr_apic_id_limit == -1)
+ intr_apic_id_limit = IOAPIC_MAX_ID;
+
/* For families 10h and newer. */
pkg_id_shift = (cpu_procinfo2 & AMDID_COREID_SIZE) >>
AMDID_COREID_SIZE_SHIFT;
@@ -1165,6 +1186,8 @@
continue;
if (cpu_info[apic_id].cpu_disabled)
continue;
+ if (intr_apic_id_limit >= 0 && apic_id > intr_apic_id_limit)
+ continue;
/* Don't let hyperthreads service interrupts. */
if (cpu_info[apic_id].cpu_hyperthread &&

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 29, 4:16 PM (18 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28086323
Default Alt Text
D41618.id126613.diff (1 KB)

Event Timeline