[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <gtaaadq6asaxiop2f6cph2dffarruw2lq5yolltiy5snqwc5fr@pofskdkfamqh>
Date: Tue, 1 Jul 2025 12:11:45 +0300
From: "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>
To: Kai Huang <kai.huang@...el.com>
Cc: dave.hansen@...el.com, peterz@...radead.org, tglx@...utronix.de,
bp@...en8.de, mingo@...hat.com, hpa@...or.com, rick.p.edgecombe@...el.com,
pbonzini@...hat.com, seanjc@...gle.com, x86@...nel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] x86/virt/tdx: Further fix tdh_vp_enter() calls
instrumentable code warning
On Tue, Jul 01, 2025 at 11:27:42AM +1200, Kai Huang wrote:
> tdh_vp_enter() needs to be marked noinstr, which means it can't call any
> non-inlined noinstr functions. Commit e9f17038d814 ("x86/tdx: mark
> tdh_vp_enter() as __flatten") tried to address a build warning caused by
> tdx_tdvpr_pa() not getting inlined. Unfortunately that commit didn't
> fix the warning completely due to the inconsistent behavior of the
> __flatten annotation.
>
> There are two problems that can come up depending on the compiler and
> config. One is that tdx_tdvpr_pa() doesn't get inlined, the other is
> that page_to_phys() doesn't get inlined.
>
> The __flatten annotation makes the compiler inline all function calls
> that the annotated function makes, and the aforementioned commit assumed
> this is always honored, recursively. But it turns out it's not always
> true:
>
> - Gcc may ignore __flatten when CONFIG_CC_OPTIMIZE_FOR_SIZE=y.
> - Clang doesn't support recursive inlining for __flatten, which can
> trigger another similar warning when page_to_phys() calls pfn_valid()
> when CONFIG_DEBUG_VIRTUAL=y.
>
> Therefore using __flatten is not the right fix.
>
> To fix the first problem, remove the __flatten for tdh_vp_enter() and
> instead annotate tdx_tdvpr_pa() with __always_inline to make sure it is
> always inlined.
>
> To fix the second problem, change tdx_tdvpr_pa() to use
> PFN_PHYS(page_to_pfn()) instead of page_to_phys() so that there will be
> no more function call inside tdx_tdvpr_pa()[*].
>
> The TDVPR page is always an actual page out of page allocator, so the
> additional warning around pfn_valid() check in page_to_phys() doesn't
> help a lot anyway. It's not worth complicating the code for such
> warning when CONFIG_DEBUG_VIRTUAL=y.
>
> [*] Since commit cba5d9b3e99d ("x86/mm/64: Make SPARSEMEM_VMEMMAP the
> only memory model") page_to_pfn() has been a simple macro without
> any function call.
>
> Fixes: e9f17038d814 ("x86/tdx: mark tdh_vp_enter() as __flatten")
> Signed-off-by: Kai Huang <kai.huang@...el.com>
> Reviewed-by: Rick Edgecombe <rick.p.edgecombe@...el.com>
Reviewed-by: Kirill A. Shutemov <kirill.shutemov@...ux.intel.com>
--
Kiryl Shutsemau / Kirill A. Shutemov
Powered by blists - more mailing lists