d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PCID+PTI pmap operations on Xen/HVM.

Browse Source 
Install appropriate pti-aware shootdown IPI handlers, otherwise user
page tables do not get enough invalidations.  The non-pti handlers
were used so far.

Reported and tested by:	cperciva
Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
This commit is contained in:
Konstantin Belousov 2018-05-19 20:28:59 +00:00
parent 7c25320c69
commit 45c228cc29
1 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sys/x86/xen/xen_apic.c
View File

@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
#include <machine/cpufunc.h> #include <machine/cpufunc.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/intr_machdep.h> #include <machine/intr_machdep.h>
#include <machine/md_var.h>
#include <machine/smp.h> #include <machine/smp.h>
#include <x86/apicreg.h> #include <x86/apicreg.h>
@ -439,6 +440,46 @@ xen_invltlb_pcid(void *arg)
invltlb_pcid_handler(); invltlb_pcid_handler();
return (FILTER_HANDLED); return (FILTER_HANDLED);
} }
static int
xen_invltlb_invpcid_pti(void *arg)
{
invltlb_invpcid_pti_handler();
return (FILTER_HANDLED);
}
static int
xen_invlpg_invpcid_handler(void *arg)
{
invlpg_invpcid_handler();
return (FILTER_HANDLED);
}
static int
xen_invlpg_pcid_handler(void *arg)
{
invlpg_pcid_handler();
return (FILTER_HANDLED);
}
static int
xen_invlrng_invpcid_handler(void *arg)
{
invlrng_invpcid_handler();
return (FILTER_HANDLED);
}
static int
xen_invlrng_pcid_handler(void *arg)
{
invlrng_pcid_handler();
return (FILTER_HANDLED);
}
#endif #endif
static int static int
@ -529,8 +570,18 @@ xen_setup_cpus(void)
#ifdef __amd64__ #ifdef __amd64__
if (pmap_pcid_enabled) { if (pmap_pcid_enabled) {
xen_ipis[IPI_TO_IDX(IPI_INVLTLB)].filter = invpcid_works ? if (pti)
xen_invltlb_invpcid : xen_invltlb_pcid; xen_ipis[IPI_TO_IDX(IPI_INVLTLB)].filter =
invpcid_works ? xen_invltlb_invpcid_pti :
xen_invltlb_pcid;
else
xen_ipis[IPI_TO_IDX(IPI_INVLTLB)].filter =
invpcid_works ? xen_invltlb_invpcid :
xen_invltlb_pcid;
xen_ipis[IPI_TO_IDX(IPI_INVLPG)].filter = invpcid_works ?
xen_invlpg_invpcid_handler : xen_invlpg_pcid_handler;
xen_ipis[IPI_TO_IDX(IPI_INVLRNG)].filter = invpcid_works ?
xen_invlrng_invpcid_handler : xen_invlrng_pcid_handler;
} }
#endif #endif
CPU_FOREACH(i) CPU_FOREACH(i)