Date: Thu, 21 Jun 2018 05:18:08 +0000 (UTC) From: Gordon Tetlow <gordon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r335466 - releng/11.1/sys/x86/xen Message-ID: <201806210518.w5L5I87s059895@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gordon Date: Thu Jun 21 05:18:08 2018 New Revision: 335466 URL: https://svnweb.freebsd.org/changeset/base/335466 Log: Fix TLB shootdown for Xen based guests. [EN-18:07.pmap] Approved by: so Security: FreeBSD-EN-18:07.pmap Modified: releng/11.1/sys/x86/xen/xen_apic.c Modified: releng/11.1/sys/x86/xen/xen_apic.c ============================================================================== --- releng/11.1/sys/x86/xen/xen_apic.c Thu Jun 21 05:17:13 2018 (r335465) +++ releng/11.1/sys/x86/xen/xen_apic.c Thu Jun 21 05:18:08 2018 (r335466) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cpufunc.h> #include <machine/cpu.h> #include <machine/intr_machdep.h> +#include <machine/md_var.h> #include <machine/smp.h> #include <x86/apicreg.h> @@ -439,6 +440,46 @@ xen_invltlb_pcid(void *arg) invltlb_pcid_handler(); 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 static int @@ -529,8 +570,18 @@ xen_setup_cpus(void) #ifdef __amd64__ if (pmap_pcid_enabled) { - xen_ipis[IPI_TO_IDX(IPI_INVLTLB)].filter = invpcid_works ? - xen_invltlb_invpcid : xen_invltlb_pcid; + if (pti) + 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 CPU_FOREACH(i)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806210518.w5L5I87s059895>