From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21A2A32B9A2; Mon, 8 Dec 2025 09:36:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765186610; cv=none; b=nt6BvDaAuENnI8huKnt0XT+ib/Vu1tcdmjzzoAtzqb1D8OMEyMjOHpZEVnHhAWgtV3t+It2THxRB/ClTQA7CNgQJkM220slunc77XPz7vokCBvjTIy8eiewSsYdjevZf/cvmswJeLUTF342dmaPGsFfMb9dgHnnGdHGpJ8kARcU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765186610; c=relaxed/simple; bh=10zHr1SKSV4NU1wJMxeh9bCQVTkfIemMgU27+u6iC/0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HJ0FtCSB/xMnI1Tf5A2b/XyrsQxgCbB3WVNpB/DgkSjEF/YTeVp4GkVWDfx7YiEjtEqnZJoHAOXF3Jf9oBEicN/T035OR4Ok/TxTkTWUHCO4XeaMAtwtFNBabDK3eYuw3+6g3LWDqX/GzCPO9742U/JKJMdRS2SSX2dsW/5H1QU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=PP7dzO0e; arc=none smtp.client-ip=198.175.65.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="PP7dzO0e" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1765186610; x=1796722610; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=10zHr1SKSV4NU1wJMxeh9bCQVTkfIemMgU27+u6iC/0=; b=PP7dzO0evI4UAjcZxKUHfLu3IaqCmD6XnlIaBOqa8Fc0WA0RZ3gG5vbx n2AeZjmYIZENMnh5X0RJblsgSSlOwEkqqqLCkeXlHJ7aqhNsg9StR8mSF Rstjsg1Z4dbkrGjE9Ts2xCV7l3fam/v7CZO/r742VMOp/eycHMEGuAPqq El+2/ecbojZxgVm5JhBo0Cqwy7hYdeoK2Yl0p5TXkgwZ3zPVDVjc5HK2U yeU4NCPO62vI3XdHRqL4CKbMu9LQi0Vq8xZuuhu6dPt42UtcwTJaKQQje AqpecE32HoPkfXzh0k0knHlkyEemZM65xZHCytRuQ8vSCl8O5tGgCuU2c A==; X-CSE-ConnectionGUID: XZUzun6sTLmNVQHg6hT7MQ== X-CSE-MsgGUID: HKhb6VdFQ3ioPS3/VfGlzQ== X-IronPort-AV: E=McAfee;i="6800,10657,11635"; a="67288458" X-IronPort-AV: E=Sophos;i="6.20,258,1758610800"; d="scan'208";a="67288458" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2025 01:36:49 -0800 X-CSE-ConnectionGUID: bsfJ0l67RQmzvo/wRHYFCA== X-CSE-MsgGUID: d+3gSK50QVqn044E2530nA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,258,1758610800"; d="scan'208";a="196157499" Received: from dapengmi-mobl1.ccr.corp.intel.com (HELO [10.124.240.12]) ([10.124.240.12]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2025 01:36:40 -0800 Message-ID: <78fb04ca-59a2-493a-a82b-d59aaf6b557a@linux.intel.com> Date: Mon, 8 Dec 2025 17:36:38 +0800 Precedence: bulk X-Mailing-List: loongarch@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 41/44] KVM: VMX: Compartmentalize adding MSRs to host vs. guest auto-load list To: Sean Christopherson , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Xin Li , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Mingwei Zhang , Xudong Hao , Sandipan Das , Xiong Zhang , Manali Shukla , Jim Mattson References: <20251206001720.468579-1-seanjc@google.com> <20251206001720.468579-42-seanjc@google.com> Content-Language: en-US From: "Mi, Dapeng" In-Reply-To: <20251206001720.468579-42-seanjc@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 12/6/2025 8:17 AM, Sean Christopherson wrote: > Undo the bundling of the "host" and "guest" MSR auto-load list logic so > that the code can be deduplicated by factoring out the logic to a separate > helper. Now that "list full" situations are treated as fatal to the VM, > there is no need to pre-check both lists. > > For all intents and purposes, this reverts the add_atomic_switch_msr() > changes made by commit 3190709335dd ("x86/KVM/VMX: Separate the VMX > AUTOLOAD guest/host number accounting"). > > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/vmx/vmx.c | 23 ++++++++++++----------- > 1 file changed, 12 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index be2a2580e8f1..018e01daab68 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -1096,9 +1096,9 @@ static __always_inline void add_atomic_switch_msr_special(struct vcpu_vmx *vmx, > static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr, > u64 guest_val, u64 host_val) > { > - int i, j = 0; > struct msr_autoload *m = &vmx->msr_autoload; > struct kvm *kvm = vmx->vcpu.kvm; > + int i; > > switch (msr) { > case MSR_EFER: > @@ -1133,25 +1133,26 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr, > } > > i = vmx_find_loadstore_msr_slot(&m->guest, msr); > - j = vmx_find_loadstore_msr_slot(&m->host, msr); > - > - if (KVM_BUG_ON(i < 0 && m->guest.nr == MAX_NR_LOADSTORE_MSRS, kvm) || > - KVM_BUG_ON(j < 0 && m->host.nr == MAX_NR_LOADSTORE_MSRS, kvm)) > - return; > - > if (i < 0) { > + if (KVM_BUG_ON(m->guest.nr == MAX_NR_LOADSTORE_MSRS, kvm)) > + return; > + > i = m->guest.nr++; > m->guest.val[i].index = msr; > vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, m->guest.nr); > } > m->guest.val[i].value = guest_val; > > - if (j < 0) { > - j = m->host.nr++; > - m->host.val[j].index = msr; > + i = vmx_find_loadstore_msr_slot(&m->host, msr); > + if (i < 0) { > + if (KVM_BUG_ON(m->host.nr == MAX_NR_LOADSTORE_MSRS, kvm)) > + return; > + > + i = m->host.nr++; > + m->host.val[i].index = msr; > vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, m->host.nr); > } > - m->host.val[j].value = host_val; > + m->host.val[i].value = host_val; > } > > static bool update_transition_efer(struct vcpu_vmx *vmx) Reviewed-by: Dapeng Mi