This is a note to let you know that I've just added the patch titled
KVM: VMX: clean up declaration of VPID/EPT invalidation types
to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...
The filename of the patch is: kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.
From foo@baz Fri Feb 23 17:34:09 CET 2018
From: Jack Wang jinpu.wang@profitbricks.com Date: Fri, 23 Feb 2018 11:42:17 +0100 Subject: KVM: VMX: clean up declaration of VPID/EPT invalidation types To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: "Jan Dakinevich" jan.dakinevich@gmail.com, "Radim Krčmář" rkrcmar@redhat.com, "Jack Wang" jinpu.wang@profitbricks.com Message-ID: 1519382538-15143-29-git-send-email-jinpu.wangl@profitbricks.com
From: Jan Dakinevich jan.dakinevich@gmail.com
commit 63f3ac48133a19110c8a3666028dbd9b1bf3dcb3 upstream
- Remove VMX_EPT_EXTENT_INDIVIDUAL_ADDR, since there is no such type of EPT invalidation
- Add missing VPID types names
Signed-off-by: Jan Dakinevich jan.dakinevich@gmail.com Tested-by: Ladi Prosek lprosek@redhat.com Signed-off-by: Radim Krčmář rkrcmar@redhat.com [jwang: port to 4.4] Signed-off-by: Jack Wang jinpu.wang@profitbricks.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- arch/x86/include/asm/vmx.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
--- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -399,10 +399,11 @@ enum vmcs_field { #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT (KVM_USER_MEM_SLOTS + 2)
#define VMX_NR_VPIDS (1 << 16) +#define VMX_VPID_EXTENT_INDIVIDUAL_ADDR 0 #define VMX_VPID_EXTENT_SINGLE_CONTEXT 1 #define VMX_VPID_EXTENT_ALL_CONTEXT 2 +#define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL 3
-#define VMX_EPT_EXTENT_INDIVIDUAL_ADDR 0 #define VMX_EPT_EXTENT_CONTEXT 1 #define VMX_EPT_EXTENT_GLOBAL 2 #define VMX_EPT_EXTENT_SHIFT 24 @@ -419,8 +420,10 @@ enum vmcs_field { #define VMX_EPT_EXTENT_GLOBAL_BIT (1ull << 26)
#define VMX_VPID_INVVPID_BIT (1ull << 0) /* (32 - 32) */ +#define VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT (1ull << 8) /* (40 - 32) */ #define VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT (1ull << 9) /* (41 - 32) */ #define VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT (1ull << 10) /* (42 - 32) */ +#define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT (1ull << 11) /* (43 - 32) */
#define VMX_EPT_DEFAULT_GAW 3 #define VMX_EPT_MAX_GAW 0x4
Patches currently in stable-queue which might be from jinpu.wang@profitbricks.com are
queue-4.9/kvm-nvmx-invvpid-handling-improvements.patch queue-4.9/kvm-async_pf-fix-df-due-to-inject-page-not-present-and-page-ready-exceptions-simultaneously.patch queue-4.9/kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch