From nobody Sun Feb 8 21:47:15 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 A514934F46F for ; Thu, 29 Jan 2026 01:16:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769649383; cv=none; b=T5zjXFflqG0xmQDloroBlEFBN+r8iZN4ncqK3ck9n6H8ZOs0fCF1WU8FwfdiJX3n4sICzkFrVS3daSx/QhAqRkiT42j2KrtSAo38U5Ijd4TWAEoVSYN8wYnPwyOUdfVhbDeXSoC7BgwESrvBcztJuYiDyHwXcJoHbRz6fj1VRKo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769649383; c=relaxed/simple; bh=CYTYIlGGcrH6BQ0d71EBgYmrRkYDF9cUwwiwLMPdHys=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uaXbA1nc6zrsFSqIjDcpKroxqGHl7gpZ+LeE1qmd8uyZKf0uW4FDMsxfVCXEumiH1w9bs3q2XlyYDqm1LQ6IyS9h+Df3d8mpIEEWyko5XwoGVSHnj5csAVLM3e32tWgOmGkAMh2XmXr8pdJCHTZ6kDIsFmo8of9vkOT3I5j1hU8= 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=eLELBRAQ; arc=none smtp.client-ip=209.85.216.74 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="eLELBRAQ" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-34abd303b4aso804619a91.1 for ; Wed, 28 Jan 2026 17:16:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769649381; x=1770254181; 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=msD2jv18E2L4HOYUfz15g4GHsjmr/D9b7fjjCRW4KGo=; b=eLELBRAQUs7O/ZEHD6Bcq9OUbL5b5azWsYCDabQzX7VMxDPTDXcnN+gDxiHTFfMh5j hPIBSk3zORQuGE5kT4mJ+6ajCD+AuYkjgfwfabyMUP6YB4MESSe4oK87+GdIDF0ZpoG5 P7AlT0jSGLEbXt/7ATwSQrm1wV6iCszrJBMutfqXN4Z/Fg9vLPnzbErNGuEXF9ftBfsP 2oRplLmRHW31QmesfrOitAPBFdIXufeKFPXs54yJdCIXpIBiDnPEh7BlAArgbCvrt0fZ vMA7upCi8gatuj8En1wUwysnKtmXZ9rjj2S/DZH30iF3BMpQ3VqeoIKn5qalbymqrzNb TRVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769649381; x=1770254181; 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=msD2jv18E2L4HOYUfz15g4GHsjmr/D9b7fjjCRW4KGo=; b=TX6rWUDq9bUOMdfdCNGxJkYJvR7pz4MgVgJ10h+kWEIILyi1RrHjRyDpNbltEb4YkZ uioe6k/GkwLAaE7ZfMskBvTO0HXM14ZWnKQ2TngJxLpLOeza1x3X8++SQDkQcmFZLr9X 7i9fOvdFya2NcEhr5s5sCbCDCTCrGmly5rmWdix77CrEYJ7+zx3ueEv1i7LPh9G4qpus lcNyOR/c2/laWoQ98UJC+avGDxOorwKZktKExuxmhDjNfXj9G2E3wXV9HapAqPmZTSd5 +tZWDtjj9/x/xW1rjjAVEHegAVdJxBblBJ94qGfXFWF6kRpJm8nDS/9D0+uhTwDTHBEt dFOA== X-Gm-Message-State: AOJu0YwVxOQqtcvLeYSzDmkC7PRu8HVUtuteNv4iLwrmt8OThgVBrx99 S+yxCtSaaO3c9sFeRkoph4SLBe0H/OTkjiGwoo5798pngRaTz20sFsA/j+dNbJxdCkYIvrx9hzu 6S6K3IQ== X-Received: from pjof4.prod.google.com ([2002:a17:90a:8e84:b0:34c:cb46:dad7]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2789:b0:34c:cb3c:f536 with SMTP id 98e67ed59e1d1-353fedbb396mr7057728a91.36.1769649380899; Wed, 28 Jan 2026 17:16:20 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 28 Jan 2026 17:15:00 -0800 In-Reply-To: <20260129011517.3545883-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: <20260129011517.3545883-1-seanjc@google.com> X-Mailer: git-send-email 2.53.0.rc1.217.geba53bf80e-goog Message-ID: <20260129011517.3545883-29-seanjc@google.com> Subject: [RFC PATCH v5 28/45] x86/virt/tdx: Extend "reset page" quirk to support huge pages From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Kiryl Shutsemau , Sean Christopherson , Paolo Bonzini Cc: linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org, Kai Huang , Rick Edgecombe , Yan Zhao , Vishal Annapurve , Ackerley Tng , Sagi Shahar , Binbin Wu , Xiaoyao Li , Isaku Yamahata Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extend the APIs for "resetting" TDX pages to workaround the TDX_PW_MCE erratum to support huge pages, e.g. so that KVM can pass in the pfn+level without having to manually calculate the size in multiple locations. No functional change intended (because KVM doesn't currently support anything but level=3DPG_LEVEL_4K). Suggested-by: Vishal Annapurve Signed-off-by: Sean Christopherson --- arch/x86/include/asm/tdx.h | 7 ++++++- arch/x86/kvm/vmx/tdx.c | 2 +- arch/x86/virt/vmx/tdx/tdx.c | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h index 8ceaebc6c1a9..e61b0b3cc403 100644 --- a/arch/x86/include/asm/tdx.h +++ b/arch/x86/include/asm/tdx.h @@ -157,7 +157,12 @@ int tdx_topup_pamt_cache(struct tdx_pamt_cache *cache,= unsigned long npages); int tdx_pamt_get(u64 pfn, struct tdx_pamt_cache *cache); void tdx_pamt_put(u64 pfn); =20 -void tdx_quirk_reset_page(u64 pfn); +void __tdx_quirk_reset_page(u64 pfn, enum pg_level level); + +static inline void tdx_quirk_reset_page(u64 pfn) +{ + __tdx_quirk_reset_page(pfn, PG_LEVEL_4K); +} =20 int tdx_guest_keyid_alloc(void); u32 tdx_get_nr_guest_keyids(void); diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 90133e8f5c53..aca556923822 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1871,7 +1871,7 @@ static void tdx_sept_remove_private_spte(struct kvm *= kvm, gfn_t gfn, if (TDX_BUG_ON(err, TDH_PHYMEM_PAGE_WBINVD, kvm)) return; =20 - tdx_quirk_reset_page(pfn); + __tdx_quirk_reset_page(pfn, level); tdx_pamt_put(pfn); } =20 diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 367df9366d57..411e5feef39f 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -799,11 +799,11 @@ static void tdx_quirk_reset_paddr(unsigned long base,= unsigned long size) mb(); } =20 -void tdx_quirk_reset_page(u64 pfn) +void __tdx_quirk_reset_page(u64 pfn, enum pg_level level) { - tdx_quirk_reset_paddr(PFN_PHYS(pfn), PAGE_SIZE); + tdx_quirk_reset_paddr(PFN_PHYS(pfn), page_level_size(level)); } -EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_page); +EXPORT_SYMBOL_FOR_KVM(__tdx_quirk_reset_page); =20 static void tdmr_quirk_reset_pamt(struct tdmr_info *tdmr) { --=20 2.53.0.rc1.217.geba53bf80e-goog