* [PATCH v2 0/2] x86/cpu/vmware: Fixes for 5.4 @ 2019-10-21 17:24 Thomas Hellström (VMware) 2019-10-21 17:24 ` [PATCH v2 1/2] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL Thomas Hellström (VMware) 2019-10-21 17:24 ` [PATCH v2 2/2] x86/cpu/vmware: Fix platform detection VMWARE_PORT macro Thomas Hellström (VMware) 0 siblings, 2 replies; 5+ messages in thread From: Thomas Hellström (VMware) @ 2019-10-21 17:24 UTC (permalink / raw) To: linux-kernel Cc: Sean Christopherson, Thomas Hellstrom, clang-built-linux, H. Peter Anvin, Ingo Molnar, Thomas Gleixner, x86-ml, Borislav Petkov From: Thomas Hellstrom <thellstrom@vmware.com> Two fixes for recently introduced regressions: Patch 1 is more or less idential to a previous patch fixing the VMW_PORT macro on LLVM's assembler. However, that patch left out the VMW_HYPERCALL macro (probably not configured for use), so let's fix that also. Patch 2 fixes another VMW_PORT run-time regression at platform detection time v2: - Added an R-B for patch 1 (Nick Desaulniers) - Improved on asm formatting in patch 2 (Sean Christopherson) Cc: clang-built-linux@googlegroups.com Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Cc: Borislav Petkov <bp@suse.de> ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL 2019-10-21 17:24 [PATCH v2 0/2] x86/cpu/vmware: Fixes for 5.4 Thomas Hellström (VMware) @ 2019-10-21 17:24 ` Thomas Hellström (VMware) 2019-10-21 22:56 ` [tip: x86/urgent] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL, for clang/llvm tip-bot2 for Thomas Hellstrom 2019-10-21 17:24 ` [PATCH v2 2/2] x86/cpu/vmware: Fix platform detection VMWARE_PORT macro Thomas Hellström (VMware) 1 sibling, 1 reply; 5+ messages in thread From: Thomas Hellström (VMware) @ 2019-10-21 17:24 UTC (permalink / raw) To: linux-kernel Cc: Sean Christopherson, Thomas Hellstrom, clang-built-linux, H. Peter Anvin, Ingo Molnar, Thomas Gleixner, x86-ml, Borislav Petkov, Sami Tolvanen, Nick Desaulniers From: Thomas Hellstrom <thellstrom@vmware.com> LLVM's assembler doesn't accept the short form INL instruction: inl (%%dx) but instead insists on the output register to be explicitly specified. This was previously fixed for the VMWARE_PORT macro. Fix it also for the VMWARE_HYPERCALL macro. Cc: clang-built-linux@googlegroups.com Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Cc: Borislav Petkov <bp@suse.de> Fixes: b4dd4f6e3648 ("Add a header file for hypercall definitions") Suggested-by: Sami Tolvanen <samitolvanen@google.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> --- arch/x86/include/asm/vmware.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index e00c9e875933..3caac90f9761 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -29,7 +29,8 @@ /* The low bandwidth call. The low word of edx is presumed clear. */ #define VMWARE_HYPERCALL \ - ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; inl (%%dx)", \ + ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; " \ + "inl (%%dx), %%eax", \ "vmcall", X86_FEATURE_VMCALL, \ "vmmcall", X86_FEATURE_VMW_VMMCALL) -- 2.21.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip: x86/urgent] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL, for clang/llvm 2019-10-21 17:24 ` [PATCH v2 1/2] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL Thomas Hellström (VMware) @ 2019-10-21 22:56 ` tip-bot2 for Thomas Hellstrom 0 siblings, 0 replies; 5+ messages in thread From: tip-bot2 for Thomas Hellstrom @ 2019-10-21 22:56 UTC (permalink / raw) To: linux-tip-commits Cc: Sami Tolvanen, Thomas Hellstrom, Nick Desaulniers, Borislav Petkov, H. Peter Anvin, Linus Torvalds, Peter Zijlstra, Sean Christopherson, Thomas Gleixner, clang-built-linux, Ingo Molnar, Borislav Petkov, linux-kernel The following commit has been merged into the x86/urgent branch of tip: Commit-ID: db633a4e0e6eda69b6065e3e106f9ea13a0676c3 Gitweb: https://git.kernel.org/tip/db633a4e0e6eda69b6065e3e106f9ea13a0676c3 Author: Thomas Hellstrom <thellstrom@vmware.com> AuthorDate: Mon, 21 Oct 2019 19:24:02 +02:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Tue, 22 Oct 2019 00:51:44 +02:00 x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL, for clang/llvm LLVM's assembler doesn't accept the short form INL instruction: inl (%%dx) but instead insists on the output register to be explicitly specified. This was previously fixed for the VMWARE_PORT macro. Fix it also for the VMWARE_HYPERCALL macro. Suggested-by: Sami Tolvanen <samitolvanen@google.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Cc: Borislav Petkov <bp@suse.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sean Christopherson <sean.j.christopherson@intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: clang-built-linux@googlegroups.com Fixes: b4dd4f6e3648 ("Add a header file for hypercall definitions") Link: https://lkml.kernel.org/r/20191021172403.3085-2-thomas_os@shipmail.org Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/include/asm/vmware.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index e00c9e8..3caac90 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -29,7 +29,8 @@ /* The low bandwidth call. The low word of edx is presumed clear. */ #define VMWARE_HYPERCALL \ - ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; inl (%%dx)", \ + ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; " \ + "inl (%%dx), %%eax", \ "vmcall", X86_FEATURE_VMCALL, \ "vmmcall", X86_FEATURE_VMW_VMMCALL) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] x86/cpu/vmware: Fix platform detection VMWARE_PORT macro 2019-10-21 17:24 [PATCH v2 0/2] x86/cpu/vmware: Fixes for 5.4 Thomas Hellström (VMware) 2019-10-21 17:24 ` [PATCH v2 1/2] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL Thomas Hellström (VMware) @ 2019-10-21 17:24 ` Thomas Hellström (VMware) 2019-10-21 22:56 ` [tip: x86/urgent] " tip-bot2 for Thomas Hellstrom 1 sibling, 1 reply; 5+ messages in thread From: Thomas Hellström (VMware) @ 2019-10-21 17:24 UTC (permalink / raw) To: linux-kernel Cc: Sean Christopherson, Thomas Hellstrom, H. Peter Anvin, Ingo Molnar, Thomas Gleixner, x86-ml, Borislav Petkov From: Thomas Hellstrom <thellstrom@vmware.com> The platform detection VMWARE_PORT macro uses the VMWARE_HYPERVISOR_PORT definition, but expects it to be an integer. However, when it was moved to the new vmware.h include file, it was changed to be a string to better fit into the VMWARE_HYPERCALL set of macros. This obviously breaks the platform detection VMWARE_PORT functionality. Change the VMWARE_HYPERVISOR_PORT and VMWARE_HYPERVISOR_PORT_HB definitions to be integers, and use __stringify() for their stringified form when needed. Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Cc: Borislav Petkov <bp@suse.de> Fixes: b4dd4f6e3648 ("Add a header file for hypercall definitions") Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> --- arch/x86/include/asm/vmware.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index 3caac90f9761..ac9fc51e2b18 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -4,6 +4,7 @@ #include <asm/cpufeatures.h> #include <asm/alternative.h> +#include <linux/stringify.h> /* * The hypercall definitions differ in the low word of the %edx argument @@ -20,8 +21,8 @@ */ /* Old port-based version */ -#define VMWARE_HYPERVISOR_PORT "0x5658" -#define VMWARE_HYPERVISOR_PORT_HB "0x5659" +#define VMWARE_HYPERVISOR_PORT 0x5658 +#define VMWARE_HYPERVISOR_PORT_HB 0x5659 /* Current vmcall / vmmcall version */ #define VMWARE_HYPERVISOR_HB BIT(0) @@ -29,7 +30,7 @@ /* The low bandwidth call. The low word of edx is presumed clear. */ #define VMWARE_HYPERCALL \ - ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; " \ + ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT) ", %%dx; " \ "inl (%%dx), %%eax", \ "vmcall", X86_FEATURE_VMCALL, \ "vmmcall", X86_FEATURE_VMW_VMMCALL) @@ -39,7 +40,8 @@ * HB and OUT bits set. */ #define VMWARE_HYPERCALL_HB_OUT \ - ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT_HB ", %%dx; rep outsb", \ + ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \ + "rep outsb", \ "vmcall", X86_FEATURE_VMCALL, \ "vmmcall", X86_FEATURE_VMW_VMMCALL) @@ -48,7 +50,8 @@ * HB bit set. */ #define VMWARE_HYPERCALL_HB_IN \ - ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT_HB ", %%dx; rep insb", \ + ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \ + "rep insb", \ "vmcall", X86_FEATURE_VMCALL, \ "vmmcall", X86_FEATURE_VMW_VMMCALL) #endif -- 2.21.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip: x86/urgent] x86/cpu/vmware: Fix platform detection VMWARE_PORT macro 2019-10-21 17:24 ` [PATCH v2 2/2] x86/cpu/vmware: Fix platform detection VMWARE_PORT macro Thomas Hellström (VMware) @ 2019-10-21 22:56 ` tip-bot2 for Thomas Hellstrom 0 siblings, 0 replies; 5+ messages in thread From: tip-bot2 for Thomas Hellstrom @ 2019-10-21 22:56 UTC (permalink / raw) To: linux-tip-commits Cc: Thomas Hellstrom, Borislav Petkov, H. Peter Anvin, Linus Torvalds, Peter Zijlstra, Sean Christopherson, Thomas Gleixner, Ingo Molnar, Borislav Petkov, linux-kernel The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 6fee2a0be0ecae939d4b6cd8297d88b5cbb61654 Gitweb: https://git.kernel.org/tip/6fee2a0be0ecae939d4b6cd8297d88b5cbb61654 Author: Thomas Hellstrom <thellstrom@vmware.com> AuthorDate: Mon, 21 Oct 2019 19:24:03 +02:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Tue, 22 Oct 2019 00:51:44 +02:00 x86/cpu/vmware: Fix platform detection VMWARE_PORT macro The platform detection VMWARE_PORT macro uses the VMWARE_HYPERVISOR_PORT definition, but expects it to be an integer. However, when it was moved to the new vmware.h include file, it was changed to be a string to better fit into the VMWARE_HYPERCALL set of macros. This obviously breaks the platform detection VMWARE_PORT functionality. Change the VMWARE_HYPERVISOR_PORT and VMWARE_HYPERVISOR_PORT_HB definitions to be integers, and use __stringify() for their stringified form when needed. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Cc: Borislav Petkov <bp@suse.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sean Christopherson <sean.j.christopherson@intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Fixes: b4dd4f6e3648 ("Add a header file for hypercall definitions") Link: https://lkml.kernel.org/r/20191021172403.3085-3-thomas_os@shipmail.org Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/include/asm/vmware.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index 3caac90..ac9fc51 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -4,6 +4,7 @@ #include <asm/cpufeatures.h> #include <asm/alternative.h> +#include <linux/stringify.h> /* * The hypercall definitions differ in the low word of the %edx argument @@ -20,8 +21,8 @@ */ /* Old port-based version */ -#define VMWARE_HYPERVISOR_PORT "0x5658" -#define VMWARE_HYPERVISOR_PORT_HB "0x5659" +#define VMWARE_HYPERVISOR_PORT 0x5658 +#define VMWARE_HYPERVISOR_PORT_HB 0x5659 /* Current vmcall / vmmcall version */ #define VMWARE_HYPERVISOR_HB BIT(0) @@ -29,7 +30,7 @@ /* The low bandwidth call. The low word of edx is presumed clear. */ #define VMWARE_HYPERCALL \ - ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; " \ + ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT) ", %%dx; " \ "inl (%%dx), %%eax", \ "vmcall", X86_FEATURE_VMCALL, \ "vmmcall", X86_FEATURE_VMW_VMMCALL) @@ -39,7 +40,8 @@ * HB and OUT bits set. */ #define VMWARE_HYPERCALL_HB_OUT \ - ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT_HB ", %%dx; rep outsb", \ + ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \ + "rep outsb", \ "vmcall", X86_FEATURE_VMCALL, \ "vmmcall", X86_FEATURE_VMW_VMMCALL) @@ -48,7 +50,8 @@ * HB bit set. */ #define VMWARE_HYPERCALL_HB_IN \ - ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT_HB ", %%dx; rep insb", \ + ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \ + "rep insb", \ "vmcall", X86_FEATURE_VMCALL, \ "vmmcall", X86_FEATURE_VMW_VMMCALL) #endif ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-21 22:56 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-10-21 17:24 [PATCH v2 0/2] x86/cpu/vmware: Fixes for 5.4 Thomas Hellström (VMware) 2019-10-21 17:24 ` [PATCH v2 1/2] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL Thomas Hellström (VMware) 2019-10-21 22:56 ` [tip: x86/urgent] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL, for clang/llvm tip-bot2 for Thomas Hellstrom 2019-10-21 17:24 ` [PATCH v2 2/2] x86/cpu/vmware: Fix platform detection VMWARE_PORT macro Thomas Hellström (VMware) 2019-10-21 22:56 ` [tip: x86/urgent] " tip-bot2 for Thomas Hellstrom
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®