From: Sean Christopherson <sean.j.christopherson@intel.com>
To: "Thomas Hellström (VMware)" <thomas_os@shipmail.org>
Cc: linux-kernel@vger.kernel.org,
Thomas Hellstrom <thellstrom@vmware.com>,
"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>, x86-ml <x86@kernel.org>,
Borislav Petkov <bp@suse.de>
Subject: Re: [PATCH 2/2] x86/cpu/vmware: Fix platform detection VMWARE_PORT macro
Date: Fri, 18 Oct 2019 09:38:27 -0700 [thread overview]
Message-ID: <20191018163827.GC26319@linux.intel.com> (raw)
In-Reply-To: <20191018134052.3023-3-thomas_os@shipmail.org>
On Fri, Oct 18, 2019 at 03:40:52PM +0200, Thomas Hellström (VMware) wrote:
> 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.
>
> Fixes: b4dd4f6e3648 ("Add a header file for hypercall definitions")
> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.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>
> ---
> 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 f5fbe3778aef..d20eda0c6ed8 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 \
> + 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", \
Same comment on wrapping in the middle of an instruction. Wrapping after
movw will stick out, but only by a char or two.
> "vmcall", X86_FEATURE_VMCALL, \
> "vmmcall", X86_FEATURE_VMW_VMMCALL)
> #endif
> --
> 2.21.0
>
prev parent reply other threads:[~2019-10-18 16:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 13:40 [PATCH 0/2] x86/cpu/vmware: Fixes for 5.4 Thomas Hellström (VMware)
2019-10-18 13:40 ` [PATCH 1/2] x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL Thomas Hellström (VMware)
2019-10-18 16:28 ` Nick Desaulniers
2019-10-18 16:33 ` Sean Christopherson
2019-10-18 13:40 ` [PATCH 2/2] x86/cpu/vmware: Fix platform detection VMWARE_PORT macro Thomas Hellström (VMware)
2019-10-18 16:38 ` Sean Christopherson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018163827.GC26319@linux.intel.com \
--to=sean.j.christopherson@intel.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=thellstrom@vmware.com \
--cc=thomas_os@shipmail.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).