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 79F0644CAEC for ; Fri, 29 May 2026 22:23:07 +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=1780093388; cv=none; b=D8pLbLarMMzCIBZrJYfeusMaCIhsrTd2fLce9w2g9LmEGLR/g9fdYsaQczMM+0dFYG26b0aoJCkWVEYC7leIXhCKZnnLuWT/35j27gneYAW8VXAhvtDX/2tU8Dq4NG5+2IeJpUrPjdd/SjqWND3oD+8f1akhX8zzjLJ0ySpD4h0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093388; c=relaxed/simple; bh=3bWgCpS2MbNhs++wve21pEQGVhhVlqSYucSuMxg7WfU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ljVOvE2vF1HBbc/fYS9HYIKja518O/xtuLJ0CLX+DPJI0VxvPIZVs4AoIffWqObYB5DGn/xDqpZJ/ZBGxUTQikbtjX4c/cC45GpAUyOgXeZ7+xJuoqmd6Bde1jWWPAl1ILhrUDYYoGUOdbmow5PJ3WLRH2YFcdjrxsxBhK1h4x0= 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=DnMzeHGD; 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="DnMzeHGD" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c85868c32b6so274449a12.0 for ; Fri, 29 May 2026 15:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780093387; x=1780698187; 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=z4vKYiOMnnjQ6reYOu2qF0Gs5UxLrj65gv1yx1wc+84=; b=DnMzeHGDitw8KxuzKkhnriPV5vF7Ij/+PuXXEgP6t5sprmpIokgLBPirv9Wm237O6P TmeSHAJlI5lQzoAAWo0JCSRuJ72q1o5x7I9AMCjAk7jsMrLTSy1OBcpvo8Vo4gK5DYWo VGHS02HxOMUSHCKNPACB1iQbvjlqi2U695bt0vFSLecpyyIiWzr9CoB0RAwc0YtETlRQ KZ9H2QIlp9yV27xQC7aBanrXKZls+ZFTpRwfpaqI04uFt2jHBgTxLPIWGPpye2gq9rsE 6Hjv/Jy9hWL8ozacCfDxLZhdViaUqk98pKfnYL+zsy3RzMC4ib3G3Ifa9LnGVXiTsfqk qKJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780093387; x=1780698187; 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=z4vKYiOMnnjQ6reYOu2qF0Gs5UxLrj65gv1yx1wc+84=; b=jlHsy25jue2+M63cZYKOc3tqKe3FPWlosIKW6mbT3muPOE7YQFqwhw3YBTb6an4Tfj IXTc0Rfh+7rAVFvltiyhVRMXQWxyWATWXMzt34QzHSfUH1FNGuT4VQXddy8F862OqWcv TX+fcm1oSwZqvUvs0bA/mlgDgrmDjd4WXWJtKWLqKbmxDtYnV8EIS3jT+QlcO8uQ83RH uwCzVM6EN/guljCjBFSIi0VTUUllDcSqMNTFBLDa+b0Duk9RQrY9nMYC1pRSMFX8LPn8 xKOQ5YIsFmDYlumMIvjvQegd3l15nWJe8+Rm4B8Mx+Oo5a0dBYEnlRJRIRxfCW8/vytt mNcQ== X-Forwarded-Encrypted: i=1; AFNElJ8DC60pfT5hTihgh7Xt0hEkgHDJwUwV/n9rZX4hDngIYTmbco1fXApftDViLJRQ5tcRD9YaRpa6vrtyVJ4=@vger.kernel.org X-Gm-Message-State: AOJu0YwPg5hY4DaLe6U4IZ3AiIpSWlXJJmcYPnMA9dnE0D8rBY/NO7Dn EDXXMD8raoZRv7+emHm72HbaLU7H4KvcBrreGyyd3OpIkrn+0VswIQfyyG2kgr7XVlWBETLQc39 etYITeA== X-Received: from pgcq19.prod.google.com ([2002:a63:7513:0:b0:c76:3f60:53ff]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6017:b0:39f:a42:9251 with SMTP id adf61e73a8af0-3b427f2af2cmr1232182637.22.1780093386530; Fri, 29 May 2026 15:23:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 15:22:03 -0700 In-Reply-To: <20260529222223.870923-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: <20260529222223.870923-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260529222223.870923-21-seanjc@google.com> Subject: [PATCH v3 20/40] KVM: x86: Move tdp_enabled from kvm_host.h to mmu.h From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov , David Woodhouse , Paul Durrant Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , Binbin Wu , David Woodhouse , Kai Huang Content-Type: text/plain; charset="UTF-8" Relocated the declaration of tdp_enabled into mmu.h, and opportunistically hoist tdp_mmu_enabled up to the top so that the two are co-located. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 2 -- arch/x86/kvm/mmu.h | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index f7130eb98473..19091d89d3cc 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2188,8 +2188,6 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end); int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3); -extern bool tdp_enabled; - /* * EMULTYPE_NO_DECODE - Set when re-emulating an instruction (after completing * userspace I/O) to indicate that the emulation context diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h index 28fca48dcf64..0eaea2d4fac9 100644 --- a/arch/x86/kvm/mmu.h +++ b/arch/x86/kvm/mmu.h @@ -6,6 +6,12 @@ #include "regs.h" #include "cpuid.h" +extern bool tdp_enabled; +#ifdef CONFIG_X86_64 +extern bool tdp_mmu_enabled; +#else +#define tdp_mmu_enabled false +#endif extern bool __read_mostly enable_mmio_caching; #define PT_WRITABLE_SHIFT 1 @@ -260,12 +266,6 @@ static inline bool kvm_shadow_root_allocated(struct kvm *kvm) return smp_load_acquire(&kvm->arch.shadow_root_allocated); } -#ifdef CONFIG_X86_64 -extern bool tdp_mmu_enabled; -#else -#define tdp_mmu_enabled false -#endif - int kvm_tdp_mmu_map_private_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, kvm_pfn_t pfn); static inline bool kvm_memslots_have_rmaps(struct kvm *kvm) -- 2.54.0.823.g6e5bcc1fc9-goog