From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C616C4708D for ; Wed, 4 Jan 2023 19:40:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239490AbjADTkW (ORCPT ); Wed, 4 Jan 2023 14:40:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235302AbjADTkT (ORCPT ); Wed, 4 Jan 2023 14:40:19 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1B03BCB for ; Wed, 4 Jan 2023 11:40:18 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id d3so36871553plr.10 for ; Wed, 04 Jan 2023 11:40:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=78Xud8uaBV6HMH18sEo7KX+Q7S8hBzv9DwytUiPzVXc=; b=blRiiJyMG0QFf70ZcWAtGacCvsBwciLVCQXLdhc8+vV0GBhpFeCDB3/S4HgskxMRvn gvTjkfb32S6N6NG7A4JBQevbxu7rMxkYBb2zFwAvw4E+p3fOHPbrWy30Do3VXuLWEkDp fzU47nn8DJ3DY4bC7my3tkw+A0pW69PPrqidvOyBwPvSLCS7pafZpG6x3aEyW7nmuVWk 1y8xd6cue/C2L3r08VxPGtoDqMgLmoliw1KjwZEkmb62ipIMX+ewkYPQweuI1/OGOVDm F60F7L/T8EDwJdlUWERfFsuhyUukQVLbQ7CABuIFOjts5/i339sIvS//3ti04ZGUNwdz L2qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=78Xud8uaBV6HMH18sEo7KX+Q7S8hBzv9DwytUiPzVXc=; b=zuYW8T2R7fiDBxA6wplCOPrNiFLTMV6Kt073uNT+dUGgcUeotC3bMME6wh/93zNu6n WdVzlwVIXecBLddFoXmGpaLdct4sSvvou5HWsYGqIJlpE0vdakYSPy3CizvTmZHIUDuE 7ww1fGgBv7eaeq3mbtl/VHT8xbOSOoxUyl+75uYyTj0svV2FFuwmGk7zm2pr8BwIuMjz c+xoJdhx3iDKHQpwm4z+UAnVP8MDHsMAS97D9wxmiHvuexU4bK+Bny3cxasPSWcZ4UZc tJ13ZU3JGnaTIys+X5/S2sOq0dsAftCiopCdVBMKE2bjC5SVfJxAV3Q9hfyoDgU0MAmU svww== X-Gm-Message-State: AFqh2ko8BDYb1IQRwEdBbqMiA2P552nZaL7PMUse5r8tnQ72AJtHGAys n+O+na/6F6/4SE1WNA0gyjDfpw== X-Google-Smtp-Source: AMrXdXsH095EcaGEvfVVviy/+4gQ6bUYk6ez6u38GKfOav+N0EC7dY+ovj6RpVZufmNIKRdZf/KeSQ== X-Received: by 2002:a05:6a20:7f59:b0:ac:af5c:2970 with SMTP id e25-20020a056a207f5900b000acaf5c2970mr3251490pzk.3.1672861218316; Wed, 04 Jan 2023 11:40:18 -0800 (PST) Received: from google.com (7.104.168.34.bc.googleusercontent.com. [34.168.104.7]) by smtp.gmail.com with ESMTPSA id 11-20020a63050b000000b0049b7b1205a0sm14393894pgf.54.2023.01.04.11.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 11:40:17 -0800 (PST) Date: Wed, 4 Jan 2023 19:40:14 +0000 From: Sean Christopherson To: Paul Durrant Cc: x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , David Woodhouse Subject: Re: [PATCH v6 2/2] KVM: x86/xen: update Xen CPUID Leaf 4 (tsc info) sub-leaves, if present Message-ID: References: <20221220134053.15591-1-pdurrant@amazon.com> <20221220134053.15591-3-pdurrant@amazon.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221220134053.15591-3-pdurrant@amazon.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 20, 2022, Paul Durrant wrote: > @@ -143,6 +148,8 @@ int kvm_xen_hypercall(struct kvm_vcpu *vcpu); > #include > #include > > +#define XEN_SIGNATURE "XenVMMXenVMM" arch/x86/include/asm/xen/hypervisor.h also open codes the signature. Rather than add a KVM-specific define, what about putting in xen/cpuid.h? (I've had a version of this series sitting in my todo pile for far too long, sorry). -- From: Sean Christopherson Date: Mon, 11 Jul 2022 15:18:42 -0700 Subject: [PATCH] xen: Add a #define to provide Xen's CPUID signature as a string Add XEN_SIGNATURE instead of open coding it in xen_cpuid_base() so that KVM can reuse the definition when querying a VM's CPUID. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/xen/cpuid.h | 1 + arch/x86/include/asm/xen/hypervisor.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/xen/cpuid.h b/arch/x86/include/asm/xen/cpuid.h index 6daa9b0c8d11..38f1bd153f42 100644 --- a/arch/x86/include/asm/xen/cpuid.h +++ b/arch/x86/include/asm/xen/cpuid.h @@ -49,6 +49,7 @@ * EBX-EDX: "XenVMMXenVMM" signature, allowing positive identification * of a Xen host. */ +#define XEN_SIGNATURE "XenVMMXenVMM" #define XEN_CPUID_SIGNATURE_EBX 0x566e6558 /* "XenV" */ #define XEN_CPUID_SIGNATURE_ECX 0x65584d4d /* "MMXe" */ #define XEN_CPUID_SIGNATURE_EDX 0x4d4d566e /* "nVMM" */ diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h index 16f548a661cf..32ff6583b3d9 100644 --- a/arch/x86/include/asm/xen/hypervisor.h +++ b/arch/x86/include/asm/xen/hypervisor.h @@ -37,10 +37,11 @@ extern struct shared_info *HYPERVISOR_shared_info; extern struct start_info *xen_start_info; #include +#include static inline uint32_t xen_cpuid_base(void) { - return hypervisor_cpuid_base("XenVMMXenVMM", 2); + return hypervisor_cpuid_base(XEN_SIGNATURE, 2); } struct pci_dev; base-commit: 91dc252b0dbb6879e4067f614df1e397fec532a1 --