Page MenuHomeFreeBSD

D61804.1795271941.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61804.1795271941.diff

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1247,6 +1247,13 @@
PCPU_SET(gs32p, &gdt[GUGS32_SEL]);
PCPU_SET(ucr3_load_mask, PMAP_UCR3_NOMASK);
PCPU_SET(smp_tlb_gen, 1);
+
+ /*
+ * The BSP gets a pcpu area twice: the temporary one of
+ * hammer_time(), and its final one in pmap_bootstrap(), which
+ * starts out zeroed. Both have to know about a small core.
+ */
+ cpu_init_small_core();
}
void
@@ -1400,12 +1407,13 @@
invpcid_works = (cpu_stdext_feature & CPUID_STDEXT_INVPCID) != 0;
/*
- * Now we can do small core initialization, after the PCID
- * CPU features and user knobs are evaluated.
+ * The small core initialization depends on the PCID CPU
+ * features and user knobs evaluated here. It records its
+ * result in the pcpu area, so it is done once the BSP has
+ * one, in amd64_bsp_pcpu_init1().
*/
TUNABLE_INT_FETCH("vm.pmap.pcid_invlpg_workaround",
&pmap_pcid_invlpg_workaround_uena);
- cpu_init_small_core();
if ((cpu_feature2 & CPUID2_XSAVE) != 0) {
use_xsave = 1;

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 21, 2:39 PM (12 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41889911
Default Alt Text
D61804.1795271941.diff (1 KB)

Event Timeline