On Thu, 2025-07-03 at 18:37 +0300, Adrian Hunter wrote:
> tdx_clear_page() and reset_tdx_pages() duplicate the TDX page clearing
> logic. Rename reset_tdx_pages() to tdx_quirk_reset_paddr() and use it
> in place of tdx_clear_page().
>
There is a tiny functional change. reset_tdx_pages() uses mb(), where
tdx_clear_page() uses __mb(). The former has some kcsan stuff.
The log should call this out as an opportunistic change.
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
>
>
> Changes in V2:
>
> Rename reset_tdx_pages() to tdx_quirk_reset_paddr()
> Call tdx_quirk_reset_paddr() directly
>
>
> arch/x86/include/asm/tdx.h | 2 ++
> arch/x86/kvm/vmx/tdx.c | 25 +++----------------------
> arch/x86/virt/vmx/tdx/tdx.c | 5 +++--
> 3 files changed, 8 insertions(+), 24 deletions(-)
>
> diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h
> index 7ddef3a69866..f66328404724 100644
> --- a/arch/x86/include/asm/tdx.h
> +++ b/arch/x86/include/asm/tdx.h
> @@ -131,6 +131,8 @@ int tdx_guest_keyid_alloc(void);
> u32 tdx_get_nr_guest_keyids(void);
> void tdx_guest_keyid_free(unsigned int keyid);
>
> +void tdx_quirk_reset_paddr(unsigned long base, unsigned long size);
> +
> struct tdx_td {
> /* TD root structure: */
> struct page *tdr_page;
> diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
> index a08e7055d1db..031e36665757 100644
> --- a/arch/x86/kvm/vmx/tdx.c
> +++ b/arch/x86/kvm/vmx/tdx.c
> @@ -276,25 +276,6 @@ static inline void tdx_disassociate_vp(struct kvm_vcpu *vcpu)
> vcpu->cpu = -1;
> }
>
> -static void tdx_clear_page(struct page *page)
> -{
> - const void *zero_page = (const void *) page_to_virt(ZERO_PAGE(0));
> - void *dest = page_to_virt(page);
> - unsigned long i;
> -
> - /*
> - * The page could have been poisoned. MOVDIR64B also clears
> - * the poison bit so the kernel can safely use the page again.
> - */
> - for (i = 0; i < PAGE_SIZE; i += 64)
> - movdir64b(dest + i, zero_page);
> - /*
> - * MOVDIR64B store uses WC buffer. Prevent following memory reads
> - * from seeing potentially poisoned cache.
> - */
> - __mb();
> -}
> -
> static void tdx_no_vcpus_enter_start(struct kvm *kvm)
> {
> struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
> @@ -340,7 +321,7 @@ static int tdx_reclaim_page(struct page *page)
>
> r = __tdx_reclaim_page(page);
> if (!r)
> - tdx_clear_page(page);
> + tdx_quirk_reset_paddr(page_to_phys(page), PAGE_SIZE);
> return r;
> }
>
> @@ -589,7 +570,7 @@ static void tdx_reclaim_td_control_pages(struct kvm *kvm)
> pr_tdx_error(TDH_PHYMEM_PAGE_WBINVD, err);
> return;
> }
> - tdx_clear_page(kvm_tdx->td.tdr_page);
> + tdx_quirk_reset_paddr(page_to_phys(kvm_tdx->td.tdr_page), PAGE_SIZE);
>
> __free_page(kvm_tdx->td.tdr_page);
> kvm_tdx->td.tdr_page = NULL;
> @@ -1689,7 +1670,7 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn,
> pr_tdx_error(TDH_PHYMEM_PAGE_WBINVD, err);
> return -EIO;
> }
> - tdx_clear_page(page);
> + tdx_quirk_reset_paddr(page_to_phys(page), PAGE_SIZE);
> tdx_unpin(kvm, page);
> return 0;
> }
> diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c
> index c7a9a087ccaf..14d93ed05bd2 100644
> --- a/arch/x86/virt/vmx/tdx/tdx.c
> +++ b/arch/x86/virt/vmx/tdx/tdx.c
> @@ -637,7 +637,7 @@ static int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list,
> * clear these pages. Note this function doesn't flush cache of
> * these TDX private pages. The caller should make sure of that.
> */
Full comment in the base code:
/*
* Convert TDX private pages back to normal by using MOVDIR64B to
* clear these pages. Note this function doesn't flush cache of
* these TDX private pages. The caller should make sure of that.
*/
I'm not sure why it is suggesting the caller should make sure to flush the cache
in the original case, but the "tdx quirk" framing makes even less sense. Can we
update the comment too? Maybe something about what quirk is being referred to?
Probably the log needs to explain why this function is called "quirk" too.
> -static void reset_tdx_pages(unsigned long base, unsigned long size)
> +void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
> {
> const void *zero_page = (const void *)page_address(ZERO_PAGE(0));
> unsigned long phys, end;
> @@ -653,10 +653,11 @@ static void reset_tdx_pages(unsigned long base, unsigned long size)
> */
> mb();
> }
> +EXPORT_SYMBOL_GPL(tdx_quirk_reset_paddr);
>
> static void tdmr_reset_pamt(struct tdmr_info *tdmr)
> {
> - tdmr_do_pamt_func(tdmr, reset_tdx_pages);
> + tdmr_do_pamt_func(tdmr, tdx_quirk_reset_paddr);
> }
>
> static void tdmrs_reset_pamt_all(struct tdmr_info_list *tdmr_list)
