Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Date:   Sun, 8 Oct 2023 13:54:49 +0800
From:   Chao Gao <chao.gao@intel.com>
To:     Yang Weijiang <weijiang.yang@intel.com>
CC:     <seanjc@google.com>, <pbonzini@redhat.com>, <kvm@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <dave.hansen@intel.com>,
        <peterz@infradead.org>, <rick.p.edgecombe@intel.com>,
        <john.allen@amd.com>, Zhang Yi Z <yi.z.zhang@linux.intel.com>
Subject: Re: [PATCH v6 12/25] KVM: x86: Refresh CPUID on write to guest
 MSR_IA32_XSS
Message-ID: <ZSJEKcNMwBuO6TW3@chao-email>
References: <20230914063325.85503-1-weijiang.yang@intel.com>
 <20230914063325.85503-13-weijiang.yang@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230914063325.85503-13-weijiang.yang@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sPMYzw7H/rureMqKBJKVtfF0LXL3gYS892I9b/L5uAfJHg7RhKXCH2VeJsgp?=
 =?us-ascii?Q?/mHmqZqBhiFTpIT3d084AggCEjGs0Cyz6EQcSJ3qY8v5b5ZuLRdSYPxVL5xG?=
 =?us-ascii?Q?N904MKbTYa265bDKyxDBHP3CYT6VGIHGl/mhjKElwz5PtQ6FM0W+Xh2ixDm+?=
 =?us-ascii?Q?Jr0AMKoHdv3YMFQ3JbaTw5e7WI3J5cdcfyOINNDNy1c0JHjLNkGS4N6mgwXp?=
 =?us-ascii?Q?KiodkhArp9Qc1uaw1fr66PIOxCDi7505NXiqnzynGM5mScmzY4QT2vLWVCAT?=
 =?us-ascii?Q?/n9sr3RRwFJapdYHGSXKCQsg7ZxRxOTtdkuwj026HqowlSg7KV9MTHRLCeu9?=
 =?us-ascii?Q?9ttqfw0Bd+vcudVyBJbmzkxZwMbqTnzAiTYkiMpth4EpHqnFlx5MK5e1Jgxf?=
 =?us-ascii?Q?wJoK64hgyyzMxqj4Hf/vASKC1oSEExpNyUaS1WpGvbJ6QWc4LNZmTyo3DOg4?=
 =?us-ascii?Q?SZiPDXqLNdYcA87DDvVJ55EkjSwRby0jhBE54BLeoKXMTlBwSv8LV5zElRF8?=
 =?us-ascii?Q?FWQv6lTgBBbx2Cg4+jhOsN5TZneZe8FdR42bGQYnKQr1j/u72mUEPk6Igz5f?=
 =?us-ascii?Q?lU40eRC/hieh/Jhsn3Q93+Z24ndKo9M9MOLNYpv0caneaIM4qUUuWqkGm3r9?=
 =?us-ascii?Q?2LEJH8fd/U1XX/JyIjyVYUXjusSwNzOCyfkRuXTMAJfdlSjezPfcHtSF40PC?=
 =?us-ascii?Q?9ELTS8pbNWKvwVZvsqoTq81/2+xuB6EMS/Xe7yR3j2XTi19x8jjUfiA94CEF?=
 =?us-ascii?Q?b3+d/1WnkqZiUe1sfwD6Y4i4S1VJY7xkzzxeb9OytkdKr88bA6Sjbji95lS8?=
 =?us-ascii?Q?lPkwv2TIHP5aU+otVLemMC0x3b7Ip+5hhlc0SMg+PxqnRKJbWy24zmIGaZtR?=
 =?us-ascii?Q?+coyyf2jiAzbQlBWIsSci9iwyiN3R9wIGuQpc4Ji3XnORjAGRgJSpTPof1sd?=
 =?us-ascii?Q?9yfebsrh+aNefN4JvzoMWy4M000o/Y0yyDq6h7NHvWlQGDJ86zXUiX2Nhhui?=
 =?us-ascii?Q?3WlpsA5XH5TgcxBdjRwRYiCEyC3Dutnz52MD5TYHasFmT7tMx9wKkNQ3VYjR?=
 =?us-ascii?Q?ZMyYmHXvCfNTRFQWCIdtWEQj3l0nzw8w6d8rgWtOd/riH0kJ1ydnPBeX+p5m?=
 =?us-ascii?Q?H6vvRomyj0Pm0gyA/EiN/Lasl/xEoaJQsMETRqWjY764ReNVYLDJFrtK9r4s?=
 =?us-ascii?Q?QAEzTe2roxrmvzvh9e74St5uGQcgOghdOWYuq9pQkXCGWfQYNyoFpXlIhNjL?=
 =?us-ascii?Q?rWsiMrQ8nBycWKDcGlNvFksPT/Lg0e5plDEI0WxR+Txh2KFc0cDONv1bw6cm?=
 =?us-ascii?Q?RI3SDbHLk0TmlBIO2IDbhCbynG4iJ0PtKjN9KaqwVl8gzaUUP2wrEwYuQGRA?=
 =?us-ascii?Q?bgF0a8OKfMbi3S5wpudgO1RvqLBSaDSQhZTzzjrbj8Jv7wXtdFQxKDuHXEo3?=
 =?us-ascii?Q?Qw054fcYkNJtBcnr0zoxGC31Oz5g0AAB0D1FoXgymaNVaSQxCCKTSxNpluql?=
 =?us-ascii?Q?Yoz0IC9zHnFsWm+/QJsdU1Va8FKVnF981c9SYrdSpAMvMTuYI7GCJ2nvh40Y?=
 =?us-ascii?Q?bB7otyjqlf/TCkQ/l63GcoJ/TT4y8/QLN8OfOO9I?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c03f903-aa17-49ab-a87f-08dbc7c31bec
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB6780.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2023 05:55:00.7617
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5l3ILbIHHwQRsLcHl1riEbO3/kC0pbpRVTtLjiqZ01fMN+Ci86tvD/xeilPyMtu0AX1Ezgz4s8fw5FEavjFxLg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB8562
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 07 Oct 2023 22:55:57 -0700 (PDT)
X-Spam-Level: **

>diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
>index 0fc5e6312e93..d77b030e996c 100644
>--- a/arch/x86/include/asm/kvm_host.h
>+++ b/arch/x86/include/asm/kvm_host.h
>@@ -803,6 +803,7 @@ struct kvm_vcpu_arch {
> 
> 	u64 xcr0;
> 	u64 guest_supported_xcr0;
>+	u64 guest_supported_xss;

This structure has the ia32_xss field. how about moving it here for symmetry?

> 
> 	struct kvm_pio_request pio;
> 	void *pio_data;
>diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
>index 1f206caec559..4e7a820cba62 100644
>--- a/arch/x86/kvm/cpuid.c
>+++ b/arch/x86/kvm/cpuid.c
>@@ -275,7 +275,8 @@ static void __kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu, struct kvm_cpuid_e
> 	best = cpuid_entry2_find(entries, nent, 0xD, 1);
> 	if (best && (cpuid_entry_has(best, X86_FEATURE_XSAVES) ||
> 		     cpuid_entry_has(best, X86_FEATURE_XSAVEC)))
>-		best->ebx = xstate_required_size(vcpu->arch.xcr0, true);
>+		best->ebx = xstate_required_size(vcpu->arch.xcr0 |
>+						 vcpu->arch.ia32_xss, true);
> 
> 	best = __kvm_find_kvm_cpuid_features(vcpu, entries, nent);
> 	if (kvm_hlt_in_guest(vcpu->kvm) && best &&
>@@ -312,6 +313,17 @@ static u64 vcpu_get_supported_xcr0(struct kvm_vcpu *vcpu)
> 	return (best->eax | ((u64)best->edx << 32)) & kvm_caps.supported_xcr0;
> }
> 
>+static u64 vcpu_get_supported_xss(struct kvm_vcpu *vcpu)
>+{
>+	struct kvm_cpuid_entry2 *best;
>+
>+	best = kvm_find_cpuid_entry_index(vcpu, 0xd, 1);
>+	if (!best)
>+		return 0;
>+
>+	return (best->ecx | ((u64)best->edx << 32)) & kvm_caps.supported_xss;
>+}
>+
> static bool kvm_cpuid_has_hyperv(struct kvm_cpuid_entry2 *entries, int nent)
> {
> 	struct kvm_cpuid_entry2 *entry;
>@@ -358,6 +370,7 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
> 	}
> 
> 	vcpu->arch.guest_supported_xcr0 = vcpu_get_supported_xcr0(vcpu);
>+	vcpu->arch.guest_supported_xss = vcpu_get_supported_xss(vcpu);
> 
> 	/*
> 	 * FP+SSE can always be saved/restored via KVM_{G,S}ET_XSAVE, even if
>diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
>index 1258d1d6dd52..9a616d84bd39 100644
>--- a/arch/x86/kvm/x86.c
>+++ b/arch/x86/kvm/x86.c
>@@ -3795,20 +3795,25 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
> 			vcpu->arch.ia32_tsc_adjust_msr += adj;
> 		}
> 		break;
>-	case MSR_IA32_XSS:
>-		if (!msr_info->host_initiated &&
>-		    !guest_cpuid_has(vcpu, X86_FEATURE_XSAVES))
>+	case MSR_IA32_XSS: {
>+		bool host_msr_reset = msr_info->host_initiated && data == 0;
>+
>+		if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVES) &&
>+		    (!host_msr_reset || !msr_info->host_initiated))

!msr_info->host_initiated can be dropped here.