Print this page
OS-7125 Need mitigation of L1TF (CVE-2018-3646)
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

@@ -80,10 +80,11 @@
 #include <sys/x_call.h>
 #include <sys/reboot.h>
 #include <sys/hpet.h>
 #include <sys/apic_common.h>
 #include <sys/apic_timer.h>
+#include <sys/ht.h>
 
 /*
  *      Local Function Prototypes
  */
 static void apic_init_intr(void);

@@ -298,10 +299,15 @@
         for (; j < MAXIPL + 1; j++)
                 /* fill up any empty ipltopri slots */
                 apic_ipltopri[j] = (i << APIC_IPL_SHIFT) + APIC_BASE_VECT;
         apic_init_common();
 
+        /*
+         * For pcplusmp, we'll keep things simple and always disable this.
+         */
+        ht_intr_alloc_pil(XC_CPUPOKE_PIL);
+
         apic_pir_vect = apic_get_ipivect(XC_CPUPOKE_PIL, -1);
 
 #if !defined(__amd64)
         if (cpuid_have_cr8access(CPU))
                 apic_have_32bit_cr8 = 1;