From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 7016C3346B4 for ; Tue, 30 Jun 2026 22:56:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782860194; cv=none; b=IyFw8Uy0OS1FPkzJNXQXOjQJf9UTI0urhX/j8RlN5/ER8A5AaIVsEaqPYB615Ga0+NGehuw9zAmN9oIvqOqHHY/YLNmHAPHIZX0z44sRzoEt3lmx03YRTJd6oct/TvtCmMnZURytzSAHH1xXGNDpJIttdiNIlGVxPpsuEq2UKgw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782860194; c=relaxed/simple; bh=1kNFPkL0jjqmM1CIfdQrQjKKjNMyqeQX86Cc49gOi6Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DfHLKJSn0A1FkKgXSekjdDtrjRAFbnbffmWKBfqRDYS4n505zAf4t24Rz4QvQ0V8mP9OZo+brDQDh8PRfukiFN2waBpYXleWkHd+LJz8Kp4vENw/0dTIsVa0Ml6S2vSxFmDIe/14jsNcM/cTeD8K27J6M1pCm85ep2F1Vjeh15Q= 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=aZbnVTFi; arc=none smtp.client-ip=209.85.210.201 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="aZbnVTFi" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-8478423e020so103590b3a.0 for ; Tue, 30 Jun 2026 15:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782860189; x=1783464989; 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=a16gRjtRn86UfUtiEbOop3NuB+KG8sDr/q18ZbA3jUg=; b=aZbnVTFiJuJgkwuMmKejFh+tqLlk1jHzkyKrHntUOlPcDyxL9tXTBqx3X3udMK8WS1 x/Jds45lcAMm4XJ63HE5mOgweYf+zsqdpQ/xeHdOwH3YNdGIWOg0sgjdNPhaetZGlqCm WP+Ah48OlHbz7a4+w0CRV7wDOpmc8M+6XQ9MRCbET1g/9HZdMNf9NlywR2J0WVF0PuYK EjLb+kCtKTp5e7Ms5yNjbbb1M5aqtJms3A6Y1qmAUKvQtKla9y8bE095SNzoTv9HIB6C mhdpz+v1FdPtq1K7h7S4RBepPUiBQcWHYnjrpgAb4vDad72TmEg4DnKoLNMRtQ7F/9Uq 9/Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782860189; x=1783464989; 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=a16gRjtRn86UfUtiEbOop3NuB+KG8sDr/q18ZbA3jUg=; b=sT4FnPzMKipDyxNoh/1LcTTkZutqNwJROfjSco9fP2ZbNru+KN6LbaycjhSmd1uz8B tTNQ2GFDwX2G0H7lpW9m6jzh/KmMbse2HouyLLuhwpYOlNgpZ7CjeugvU6c2NiuaizZe VickNPR1apSVxnebYn4P5TJEi37WIpJNy/4TvHWy+aOmNaUt+WnKn6hjaNkicP3kBiiT VQ5F+L1Oi1f9pxdILkRYnUQcoDuqqa/STeccIuH60sGwsj/FLB3K28bDw/FC+nR9rPFJ yEDPyBzmYyea01BVjVDPMXWto7VyCLQYAk3qTb6VWSNE22LMB+dBpHklXDBDLFGy2e0G gz6A== X-Forwarded-Encrypted: i=1; AHgh+RolZeqa+wCywaMtZWOKADd16V71/JJinKteS0ti75eO4P9PzVCPPEzQrYflFeraSWacLkD20tEs0jecjLc=@vger.kernel.org X-Gm-Message-State: AOJu0YzN5unw+wuw6JowtZmSDRaRZxOtVbaN0OHBSqS/XD/HXwGEs3WK 93UFFFpjLghc+2gSYFRE0DmgrZ5avGbB2MxJebzCWw+e18ag9h38bedJDlqAMEx4asMLGCgBQ8e leDwHsw== X-Received: from pfnj5.prod.google.com ([2002:aa7:83c5:0:b0:847:b1ea:950a]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4c09:b0:846:bc60:5bf7 with SMTP id d2e1a72fcca58-8479f0dd9d5mr4923141b3a.6.1782860189484; Tue, 30 Jun 2026 15:56:29 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 30 Jun 2026 15:56:15 -0700 In-Reply-To: <20260630225619.511632-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: <20260630225619.511632-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260630225619.511632-9-seanjc@google.com> Subject: [PATCH v4 08/11] KVM: Move nVMX's lockdep logic for vcpu->mutex to a common helper From: Sean Christopherson To: Vitaly Kuznetsov , Sean Christopherson , Paolo Bonzini , David Woodhouse , Paul Durrant Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, syzbot+5b32c49cd8f005e65654@syzkaller.appspotmail.com, syzbot+5d2b94b77112148d1744@syzkaller.appspotmail.com, David Woodhouse 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 ab8cfaec82d3..b10814f99a50 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.55.0.rc0.799.gd6f94ed593-goog