From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 DF1A6276051 for ; Fri, 10 Oct 2025 22:04:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760133862; cv=none; b=SH9vpYzBw+hVqbysfFyR13LM032PBtpEqqLwqFBjTlXUWeaQSCpVPbEDe+RNYyFQ30zTCauzV3IbQnPbkFBd5YQ9gduakvM9+4nd9X2PnESsPVjnd6rBu/pUJq7mJT46lAanbFrwuM8ndhg1N71S8B6PVdzKUPOHC5yJfEywr3k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760133862; c=relaxed/simple; bh=fiWFhBmnXVNpJMyu1KdW1wPURNpipX/se+mCAmgbMfM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GuBNRdiy7pbv3NzhYiofYSbgNXRItF/X4/9gpmOFtzRFX+qIVTJ6aAGERY25mK55jHGfWnSKWEztBNSdHHMXXoDI3UhZ09Fr2HRNoktKU04UfBEI6BZMvBFVVFG0G+CcCq1JTFk+eImEUSrJxI5xyEhDOW+AIMM5CZu62qWg0L8= 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=Ir16J6Tv; arc=none smtp.client-ip=209.85.215.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="Ir16J6Tv" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b5edecdf94eso8364063a12.2 for ; Fri, 10 Oct 2025 15:04:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1760133860; x=1760738660; 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=/zWlSX8DyUzRe9Li2JnpKDvY+0TGXw1UHSLvOrmpoc8=; b=Ir16J6TvqNB3SF+W/ZhIL3m3XFnBdJKQvZMxpZOzdipSrkG52CfN64oqNWCtBA5+aM yHhA9FJnw6J3wyUe1+bmon12UevrWhKGGeuCyQmSPzDwVUTGUJTVbjRHAPJya1AZ64nY BSWMVVm5hu8qfH8MJgHaO71obOlDZYaZvXio/XVJw/lVWH/8lzOFpsLL9JDtNbXioU/2 bX8pHETTHdBYR10L0Is5t69PVygRNKLyEqWrstM3h95+tKhomdXb/HMPvihyRC1VOU4N 2q5HfDhU9xTm7SY2FzEcVfxiCEuQatoETMeoVOO+tLzxFRlkHwT7jwuhtyXtrEeQsWj5 ldzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760133860; x=1760738660; 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=/zWlSX8DyUzRe9Li2JnpKDvY+0TGXw1UHSLvOrmpoc8=; b=dluG9qR+l3eK0AY+pOvIhec0xhWbv4u2/UKPJ6JPtLpnGkbH0io+f4Rg19FOVD9I0X J7BFYa9k8gskFTG2vUikDPTzIzg1qt/Zyf/Yv8yoDXF0HJ1Y3Y0dzmSvqCMrisOLqI/x qOGhOg+UA8Z3hBqMFmFyMzggzSnZHY0+T9mwkDA7pmlKWiAjIi7HX9rcHwXaHk7xtFv6 zDql3g+0YhV36jqJx5JG6yRsQTj3wzfwxHk05k7viLJykonBg5KeS3a0JczByZEIwCnm Wwro6KJAYbmHtusWojfdiDUkOxCOZJ1LQefg+Tsor+taarDD/AmdURoXdF/ozzR4frs4 s+lQ== X-Forwarded-Encrypted: i=1; AJvYcCVNL4FE0HXzRtMlKHDccl5N2+peO7DySXFUdLVGjjshObZ3gnB+ldsl2jMlLFd6tatSx5yejVbfNLQ4@lists.linux.dev X-Gm-Message-State: AOJu0Yz8BOGArAzAnpCxeqPfIU5WZpmZF5i+Vq6iRYkqQZn6epdz+ErA N0ROnp1D9IBILSos4EzMRaVAjcsiS3TC6f1vpfIKb1sIlme1oCG3pZgRwEfLOOqtRPqTiF8A6jV rifLkvw== X-Google-Smtp-Source: AGHT+IEHOxGS/S94kHuqCPOuRdy7tjdj1GXwqOLUftwCbLIcV6PzVsh1I3YOlDMqz5KOmjUZSEt2hxkw5TE= X-Received: from pjto23.prod.google.com ([2002:a17:90a:c717:b0:33b:51fe:1a8b]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1806:b0:32d:db5b:7636 with SMTP id 98e67ed59e1d1-33b513cdaf5mr18862070a91.27.1760133860154; Fri, 10 Oct 2025 15:04:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 10 Oct 2025 15:04:02 -0700 In-Reply-To: <20251010220403.987927-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: <20251010220403.987927-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.740.g6adb054d12-goog Message-ID: <20251010220403.987927-5-seanjc@google.com> Subject: [RFC PATCH 4/4] 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, "Kirill A. Shutemov" , Sean Christopherson , Paolo Bonzini Cc: linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org, Chao Gao , Dan Williams , Xin Li , Kai Huang , Adrian Hunter 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. 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 c4f18e6b1604..8eb1b0908e1e 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2595,12 +2595,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 4b61889289f0..6bec30b6b6c1 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1111,6 +1111,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(); @@ -5678,7 +5681,7 @@ static struct syscore_ops kvm_syscore_ops = { .shutdown = kvm_shutdown, }; -int kvm_enable_virtualization(void) +static int kvm_enable_virtualization(void) { int r; @@ -5723,9 +5726,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); @@ -5736,7 +5738,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) { @@ -5752,6 +5753,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.51.0.740.g6adb054d12-goog