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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D707C5ACD3 for ; Fri, 20 Feb 2026 16:46:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=o2NjEt0nlzd3sSfAI7ozchxl45oY7orW7xyZnr6QEkg=; b=WQrNJAEzmpuoMPowyE857/oI2Q 0jM66HSoCguARFAg+dLgDJJvczaE/s9a6eE+A9xtyrHDfEmKbIihHFQER7r662w+FbQUoGSdqZv5u UzFaQmgNMf6VH8HjtW7OQ/F8cqiZGlrTUerzVoKiGfKmBh1Ej+HxN+Kcm6qtnYcPF7FkLTcMPSuqI 7UIDhRJo1f2QATExzMkJRiB5nouRDBCrzQhzuSqoD6mosvgDmbOV2ghazSHy3RN1KaN0w91QDaE29 NJKVPV5KsOsX+o9ZGbvnGEshkiASHlrh+FpvabzZ1ZdW3GDKaa+FNbGntIkaWnZyjuONbGXJcp1A8 1+Ddb9LQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vtTdt-0000000FJZ9-49sI; Fri, 20 Feb 2026 16:46:13 +0000 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vtTdr-0000000FJXi-2SeJ for linux-arm-kernel@lists.infradead.org; Fri, 20 Feb 2026 16:46:12 +0000 Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-2a77040ede0so27844535ad.2 for ; Fri, 20 Feb 2026 08:46:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771605969; x=1772210769; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=o2NjEt0nlzd3sSfAI7ozchxl45oY7orW7xyZnr6QEkg=; b=LQWCe5f3XmIjbise9KGht1W67PR/CECsFeB06ivaU8xg/6Ei9A2Laj9muG9icO2Ph2 hco1N0hIBUr0T2N3411kodWqYhNE9LzX0mNJNth4Fuzn6ORR47sfVwX7Vp8SAwpDTCmx mp79UittUckifmNYO66w1w9zDOs91ikLqYyKyfMwaiPYu3IMXH281+3Nl+bZt+QkexWu 27abSCCF68guKM5YQQoKXmzTY/wKlQ7C9Hk7IuWMsRXxSgZBxLYyYhykOpa/WfrX7SaQ afU+6Pr/9pDtC0q0I+zFh9pftuR2nWU2SMDxsbR2SUifWrJ0HLW+un8XQqAXydsyNxjk 1Kgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771605969; x=1772210769; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=o2NjEt0nlzd3sSfAI7ozchxl45oY7orW7xyZnr6QEkg=; b=J/uWNpZ6Z6FYFUoRl0tk5gCWf4tuc+S/UG+uYhwUTFdu4POGCj1Cz6h6w7Ea7rwPFh J+v33dOs1tqIrZ70uAkuW/llk9XhDOUxV1btyJo66gCCDA8W9Pvpc20s8VC5Dwiidw8S i4Q7E7LsCV51Q2h6uJiCQTqzQUeBbZXTyWaTCvsxWqqfGawwCDkW1emPK98+6zXd5BsQ wJ8DyU5fTLjmGVnaiM1F/Z/dOfvj/VMthsfkT1f2HR4eUh1GDzebIEtxkGvtTYMaqjZG gAh/Sg3uDgCXaolTzs6KBNVNUojdxDkBglAEhwn3RviC4iI30l0611It0lz1liDOsCOc xIOw== X-Forwarded-Encrypted: i=1; AJvYcCU1UArfJQQZ6jIqmQOn1FASCypzIvtWQuN6VdV7m09+giXSvXTbvcJzawiW5nd/vWcynmMio8qxCs+UlBSEqHL7@lists.infradead.org X-Gm-Message-State: AOJu0YyJl2pV1m36b8oUpb4KmOosd3J5ZYz9BUGuwEufYBA2ZRQ6JAkV NgXtcR236svYPs75av5gkkcFg7I0w87nO2sQuXRkzEYCrRoEdrTfV4EBrxtmPd9ZqEyPt//d8mW I7jy0bQ== X-Received: from plma6.prod.google.com ([2002:a17:902:7d86:b0:2a9:622c:47d6]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e80c:b0:2a1:388d:8ef3 with SMTP id d9443c01a7336-2ad7444e7fcmr1749985ad.18.1771605969111; Fri, 20 Feb 2026 08:46:09 -0800 (PST) Date: Fri, 20 Feb 2026 08:46:07 -0800 In-Reply-To: Mime-Version: 1.0 References: <20251206001720.468579-1-seanjc@google.com> <20251206001720.468579-43-seanjc@google.com> Message-ID: Subject: Re: [PATCH v6 42/44] KVM: VMX: Dedup code for adding MSR to VMCS's auto list From: Sean Christopherson To: Namhyung Kim Cc: 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 , Paolo Bonzini , 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 , Dapeng Mi , Xiong Zhang , Manali Shukla , Jim Mattson Content-Type: text/plain; charset="us-ascii" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260220_084611_648566_FADD91D8 X-CRM114-Status: GOOD ( 25.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Feb 19, 2026, Namhyung Kim wrote: > Hello, > > On Fri, Dec 05, 2025 at 04:17:18PM -0800, Sean Christopherson wrote: > > Add a helper to add an MSR to a VMCS's "auto" list to deduplicate the code > > in add_atomic_switch_msr(), and so that the functionality can be used in > > the future for managing the MSR auto-store list. > > > > No functional change intended. > > > > Signed-off-by: Sean Christopherson > > --- > > arch/x86/kvm/vmx/vmx.c | 41 +++++++++++++++++++---------------------- > > 1 file changed, 19 insertions(+), 22 deletions(-) > > > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > > index 018e01daab68..3f64d4b1b19c 100644 > > --- a/arch/x86/kvm/vmx/vmx.c > > +++ b/arch/x86/kvm/vmx/vmx.c > > @@ -1093,12 +1093,28 @@ static __always_inline void add_atomic_switch_msr_special(struct vcpu_vmx *vmx, > > vm_exit_controls_setbit(vmx, exit); > > } > > > > +static void vmx_add_auto_msr(struct vmx_msrs *m, u32 msr, u64 value, > > + unsigned long vmcs_count_field, struct kvm *kvm) > > +{ > > + int i; > > + > > + i = vmx_find_loadstore_msr_slot(m, msr); > > + if (i < 0) { > > + if (KVM_BUG_ON(m->nr == MAX_NR_LOADSTORE_MSRS, kvm)) > > + return; > > + > > + i = m->nr++; > > + m->val[i].index = msr; > > + vmcs_write32(vmcs_count_field, m->nr); > > + } > > + m->val[i].value = value; > > +} > > + > > static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr, > > u64 guest_val, u64 host_val) > > { > > struct msr_autoload *m = &vmx->msr_autoload; > > struct kvm *kvm = vmx->vcpu.kvm; > > - int i; > > > > switch (msr) { > > case MSR_EFER: > > @@ -1132,27 +1148,8 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr, > > wrmsrq(MSR_IA32_PEBS_ENABLE, 0); > > } > > > > - i = vmx_find_loadstore_msr_slot(&m->guest, msr); > > - 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; > > - > > - 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[i].value = host_val; > > + vmx_add_auto_msr(&m->guest, msr, guest_val, VM_ENTRY_MSR_LOAD_COUNT, kvm); > > + vmx_add_auto_msr(&m->guest, msr, host_val, VM_EXIT_MSR_LOAD_COUNT, kvm); > > Shouldn't it be &m->host for the host_val? Ouch. Yes. How on earth did this escape testing... Ah, because in practice only MSR_IA32_PEBS_ENABLE goes through the load lists, and the VM-Entry load list will use the guest's value due to VM_ENTRY_MSR_LOAD_COUNT not covering the bad host value. Did you happen to run into problems when using PEBS events in the host? Regardless, do you want to send a patch? Either way, I'll figure out a way to verify the bug and the fix.