From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65F083D669A for ; Fri, 12 Jun 2026 23:06:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781305598; cv=none; b=PZUbHjFeJiDDahU69/KIIaOmlE1DNtDvtKpkdWWOj26hX6KlbW914sitW5dNrqLenAoB2m0117b0O/LVCnWaolLsMWQE/1/59I5u3IZpod83tGnfp3rYa7Eacx11cwcEeLDedrb5paS+/9mt+QfSDMfvDw36UIPUBdIM0A6EBDo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781305598; c=relaxed/simple; bh=m6dVurRgYnxp0sE8HOQaFVvKBubpdu74b/5Ww1K0kT4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ELAPQ2OPAYNwbWb93WmLDLqaud/IuI0q9+Bs7G0Exrw22B51h1Dz620Gd/AhivA19Nc1Hvm6698x6EvTN+Aco2YIz/xl22uL/bHjBAhMfMeHeU6/6y0KWBpXuXAxJvwjHY5IjJX6ItwYQB62KFQJ/glireYvz446SgcwIwtA4t4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ly5Th6li; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ly5Th6li" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-8423f544944so1093134b3a.3 for ; Fri, 12 Jun 2026 16:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781305597; x=1781910397; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=c1HJ7r3naWN/gXYFxqoncE94o9SKi21l/ZVbf+vfGC0=; b=ly5Th6li2IcArhawrKBMhhEQ8tUaAU2CAY+uvHAUOx2qh8epVyEJfsCpP0nSdE1Fhc 9CYZB4QYMfRlbLBVsk7Cid1HRdsVBT2vTkWsSQpozWqDHhzZJREZswPAFiuk664/yJgF qynOiXyVJqqAPlyq+nneRAuSFef+3rltDJUAAoyShjvaF30e1bRuMxv4csM9JfzrZJYJ nNEymy3GopACoBymoxZ83KpA33OwiS3UnJuLKSI/xGmDnc/DeFrutWXX3GkyzH/myF9w QP5qPx1TuWW0aabG0y8DOOUCjUftXOv4m93vbAY6XcXSB9sJvDXM+zBAJBr7R1rgJiG9 YXIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781305597; x=1781910397; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=c1HJ7r3naWN/gXYFxqoncE94o9SKi21l/ZVbf+vfGC0=; b=E65ufm7ULQUNdIVAmaPlYJ4kOJLbINs+HLj1hcXymI9NMz+LKGpYpov1Aw6g6kbx71 TSBlDw2ng6zEfmCk2eVqZbnJRGfSIRLuSUMJRat5sz38bs1eo56dJVvpEzZwwDkGfuN8 aCE/QI+beb7YI3L3ctmFE8QrFsruVsIUjZNjTbPcJUX8hjL2uRBJo0rH4KE+Hd1i/Z8q HWrjZXjKstoqME2Vvo/DVsOhGmtimEh/sPCT9I8uaxbaWtjyax9rex47bpjRFAYl2nTZ JjYTCfeBgf7W47rAx3CwQ0g7Z2hw5NPQu3/Mbzho06T74FwQXAWPwYDEZ9N99BP5tUGG bwDA== X-Forwarded-Encrypted: i=1; AFNElJ/Aw5BQnHqHmDuVdy8odvX5ZMWfhamLLDS6B2HhGb3m55hrJaQPuzqTnIhS5iBrpbn6/79HVvr54grJtFo=@vger.kernel.org X-Gm-Message-State: AOJu0Yxk2nlVubyH6mmR5Bd1nyJy3ppqWNnP2nXalwjdMZJiGh1YWKiy JXfUbEfLoX43vkdKzuT8c5nnjVhrUB0cr4g54kRuspc/1JhJFnTjaQDZRrDr8BBBDqFPIPXQfTP zdsTR0A== X-Received: from pfnj4.prod.google.com ([2002:aa7:83c4:0:b0:842:4a9c:2fd3]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:993:b0:839:9ad:ee31 with SMTP id d2e1a72fcca58-8434cdcadcfmr5403349b3a.8.1781305596569; Fri, 12 Jun 2026 16:06:36 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 Jun 2026 16:06:19 -0700 In-Reply-To: <20260612230622.687665-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260612230622.687665-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260612230622.687665-6-seanjc@google.com> Subject: [PATCH v2 5/8] KVM: Move nVMX's lockdep logic for vcpu->mutex to a common helper From: Sean Christopherson To: Vitaly Kuznetsov , Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, syzbot+5b32c49cd8f005e65654@syzkaller.appspotmail.com Content-Type: text/plain; charset="UTF-8" Extract nVMX's lockdep assertion that a vCPU is locked or otherwise unreachable into a common helper, as KVM x86 is about to gain another user, but there is nothing x86-specific about the logic, i.e. the assertion may be useful for other architectures. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/nested.h | 6 ++---- include/linux/kvm_host.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/vmx/nested.h b/arch/x86/kvm/vmx/nested.h index 6d6cd5904ddf..c6de848bd9ce 100644 --- a/arch/x86/kvm/vmx/nested.h +++ b/arch/x86/kvm/vmx/nested.h @@ -57,16 +57,14 @@ bool nested_vmx_check_io_bitmaps(struct kvm_vcpu *vcpu, unsigned int port, static inline struct vmcs12 *get_vmcs12(struct kvm_vcpu *vcpu) { - lockdep_assert_once(lockdep_is_held(&vcpu->mutex) || - !refcount_read(&vcpu->kvm->users_count)); + kvm_lockdep_assert_vcpu_is_locked_or_unreachable(vcpu); return to_vmx(vcpu)->nested.cached_vmcs12; } static inline struct vmcs12 *get_shadow_vmcs12(struct kvm_vcpu *vcpu) { - lockdep_assert_once(lockdep_is_held(&vcpu->mutex) || - !refcount_read(&vcpu->kvm->users_count)); + kvm_lockdep_assert_vcpu_is_locked_or_unreachable(vcpu); return to_vmx(vcpu)->nested.cached_shadow_vmcs12; } diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 27498e990dff..82696b27b145 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -989,6 +989,12 @@ static inline struct kvm_io_bus *kvm_get_bus(struct kvm *kvm, enum kvm_bus idx) lockdep_is_held(&kvm->slots_lock)); } +static inline void kvm_lockdep_assert_vcpu_is_locked_or_unreachable(struct kvm_vcpu *vcpu) +{ + lockdep_assert_once(lockdep_is_held(&vcpu->mutex) || + !refcount_read(&vcpu->kvm->users_count)); +} + static inline struct kvm_vcpu *kvm_get_vcpu(struct kvm *kvm, int i) { int num_vcpus = atomic_read(&kvm->online_vcpus); -- 2.54.0.1136.gdb2ca164c4-goog