From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 691D62E7BD6 for ; Sat, 14 Feb 2026 01:27:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771032455; cv=none; b=CrfNDPlojWHqtx/Sfz4oHG7HQBbr7hHdXfxUliiZz7tT3Sf0FkOCoEGupr8gvJ4AaShI096T5bpn6IXqtR9HQcrfExxsryMnIIZ2ITvxltPofafX5ZffKqnaZLprCyD2/e37F2OQwNZz0mGtdpUW49JkU3RUxl7o4i/L37tMNYw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771032455; c=relaxed/simple; bh=n0glIiKij5SE6jJtccYoydGsQfuK8yUaTbTzRTF8FPk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UCPNiMKMvVO5P/E6tCHF0+qirGHtJ8T93uy9ANtIYrcrgOgm9KLoaZXTt+2adrbdIc2HKAvgiRkon8dxHI5dqUBP3VnkNpzKakLYyPHdfejOt1r1dCqq1qLHhU3S4ZS5+qCzFwwsGK9ytDhvxhnwdewAZ4Tm/UJMvlRDjzPRyK8= 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=krryqUSN; arc=none smtp.client-ip=209.85.214.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="krryqUSN" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2a944e6336eso77962715ad.0 for ; Fri, 13 Feb 2026 17:27:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771032453; x=1771637253; darn=lists.linux.dev; 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=fCDccjCq5My2WdlmlvmFH+sEHO27BgDMTfTEXHYAVac=; b=krryqUSN9lFXkB1h2xbdOQPVlhF6zYEcqf8cz49yTP91mzjD0NM1ez5elZF/UJqhs5 HMkFVZoV05lCv0SCn1CWJ+Pv+Rbuws7kE9GSdzb6Mw2aUcuBEBK8J9mc3cAbvHLXwkLm Nk/w1qsECk6fobTj9NAlyKHrXBRGOG7IpNzzS6OZdY/m8LhlakBVfnDlyV7MBvPFhr27 x+wM2kAvwWOa2fvMQfka869OGQmYQlA/ZFE6dpPsAbjmdEnBBWXYqN/PN0E+b2lsejxA muYBp0+BzyL4LHFuvg2yTHVvcRlQN96ETP6mc/cLByfWyOwqPs2ng6f9AGSIeuQIy5W4 QSjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771032453; x=1771637253; 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=fCDccjCq5My2WdlmlvmFH+sEHO27BgDMTfTEXHYAVac=; b=otQqnrmpoXT5G1yHFaPrd40BhTSXmsbwoxyvxlV8lrJk/OHyLYplHAHPItAtP0W7Rl CKjLLCAstOJm+tht6UFdsh6f3j+UoHGRz/U0vQ4+oQ+Sae3dJGi+YMYDgRMEMZVmLDg2 mgTxmyKj3syt4Fg/3JWcMjD19zK5TsB5htWC+ZEyGHD1lAGbrVpEdvqNpduDPoKxkV/O lQkD6LNa90VIsmqCUclk/Oo+iGgnJQTH+DC0EM2m8j8neB5KEmknWVxVrdsgd74bnvX+ ymSMFFHN6VRkwAcFN9pUhOLZI+zPiKWfY59OIk5jjBSU3WwSoWV6Yo73MxQuk5Jgjvxz OTSw== X-Forwarded-Encrypted: i=1; AJvYcCUt46QOvXjNqhQbYBf5oHz3OYEteT5SvyB7OErFlzPSgrAVvEWvSN+kXN09Ltfj7qGaSi7ERbt+pCtw@lists.linux.dev X-Gm-Message-State: AOJu0YyiZ2ZmWZiOxCPxUwrW+ZIFk0hrOobKKuPyxfBwrSO45qa9wFqv esl8L/wJusvS/KkuRl0qTBlsaJ5fiKnZ21CvAhGiud+4QpPxIPmxgsXwli0ZyiScnedpcT6gXwI BdUNegg== X-Received: from plse10.prod.google.com ([2002:a17:902:b78a:b0:2a9:5b1d:9c8a]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2450:b0:2aa:d6d5:773c with SMTP id d9443c01a7336-2ab50546cb2mr32518995ad.25.1771032452483; Fri, 13 Feb 2026 17:27:32 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 13 Feb 2026 17:27:01 -0800 In-Reply-To: <20260214012702.2368778-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260214012702.2368778-1-seanjc@google.com> X-Mailer: git-send-email 2.53.0.310.g728cabbaf7-goog Message-ID: <20260214012702.2368778-16-seanjc@google.com> Subject: [PATCH v3 15/16] KVM: Bury kvm_{en,dis}able_virtualization() in kvm_main.c once more From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Kiryl Shutsemau , Peter Zijlstra , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org, linux-perf-users@vger.kernel.org, Chao Gao , Xu Yilun , Dan Williams Content-Type: text/plain; charset="UTF-8" Now that TDX handles doing VMXON without KVM's involvement, bury the top-level APIs to enable and disable virtualization back in kvm_main.c. No functional change intended. Reviewed-by: Dan Williams Reviewed-by: Chao Gao Signed-off-by: Sean Christopherson --- include/linux/kvm_host.h | 8 -------- virt/kvm/kvm_main.c | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 981b55c0a3a7..760e0ec2c8eb 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2605,12 +2605,4 @@ long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, struct kvm_pre_fault_memory *range); #endif -#ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING -int kvm_enable_virtualization(void); -void kvm_disable_virtualization(void); -#else -static inline int kvm_enable_virtualization(void) { return 0; } -static inline void kvm_disable_virtualization(void) { } -#endif - #endif diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index e081e7244299..737b74b15bb5 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1112,6 +1112,9 @@ static inline struct kvm_io_bus *kvm_get_bus_for_destruction(struct kvm *kvm, !refcount_read(&kvm->users_count)); } +static int kvm_enable_virtualization(void); +static void kvm_disable_virtualization(void); + static struct kvm *kvm_create_vm(unsigned long type, const char *fdname) { struct kvm *kvm = kvm_arch_alloc_vm(); @@ -5704,7 +5707,7 @@ static struct syscore kvm_syscore = { .ops = &kvm_syscore_ops, }; -int kvm_enable_virtualization(void) +static int kvm_enable_virtualization(void) { int r; @@ -5749,9 +5752,8 @@ int kvm_enable_virtualization(void) --kvm_usage_count; return r; } -EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_enable_virtualization); -void kvm_disable_virtualization(void) +static void kvm_disable_virtualization(void) { guard(mutex)(&kvm_usage_lock); @@ -5762,7 +5764,6 @@ void kvm_disable_virtualization(void) cpuhp_remove_state(CPUHP_AP_KVM_ONLINE); kvm_arch_disable_virtualization(); } -EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_disable_virtualization); static int kvm_init_virtualization(void) { @@ -5778,6 +5779,14 @@ static void kvm_uninit_virtualization(void) kvm_disable_virtualization(); } #else /* CONFIG_KVM_GENERIC_HARDWARE_ENABLING */ +static int kvm_enable_virtualization(void) +{ + return 0; +} +static void kvm_disable_virtualization(void) +{ + +} static int kvm_init_virtualization(void) { return 0; -- 2.53.0.310.g728cabbaf7-goog