x86/tdx: Always inline tdx_tdvpr_pa()
Subsystems (3)
Rick Edgecombe
maintainerPATCH 1/1 x86/tdx: Always inline tdx_tdvpr_pa()
In some cases tdx_tdvpr_pa() is not fully inlined into tdh_vp_enter(), which causes the following warning:
vmlinux.o: warning: objtool: tdh_vp_enter+0x8: call to tdx_tdvpr_pa() leaves .noinstr.text section
tdh_vp_enter() is marked noinstr and so can't accommodate the function being outlined. Previously this didn't cause issues because the compiler inlined the function. However, newer Clang compilers are deciding to outline it.
So mark the function __always_inline to force it to be inlined. This would leave the similar function tdx_tdr_pa() looking a bit asymmetric and odd, as it is marked inline but actually doesn't need to be inlined. So somewhat opportunistically remove the inline from tdx_tdr_pa() so that it is clear that it does not need to be inlined, unlike tdx_tdvpr_pa().
tdx_tdvpr_pa() uses page_to_phys() which can make further calls to outlines functions, but not on x86 following commit cba5d9b3e99d ("x86/mm/64: Make SPARSEMEM_VMEMMAP the only memory model").
---
Previous discussion here:
https://lore.kernel.org/kvm/[email protected]/
FWIW, I'm ok with the flatten version of the fix too, but posting this just to speed things along in case.
And note, for full correctness, this and the flatten fix will depend on the queued tip commit:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=cba5d9b3e99d6268d7909a65c2bd78f4d195aead
--- arch/x86/virt/vmx/tdx/tdx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/virt/vmx/tdx/tdx.c +2 -2
@@ -1496,12 +1496,12 @@ void tdx_guest_keyid_free(unsigned int keyid) }EXPORT_SYMBOL_GPL (tdx_guest_keyid_free); -static inline u64 tdx_tdr_pa (struct tdx_td *td) +static u64 tdx_tdr_pa (struct tdx_td *td) {return page_to_phys (td->tdr_page); } -static inline u64 tdx_tdvpr_pa (struct tdx_vp *td) +static __always_inline u64 tdx_tdvpr_pa(struct tdx_vp *td) {return page_to_phys (td->tdvpr_page); }
Signature · 1 line
2.49.0
Quoted 20 lines · Rick Edgecombe
In some cases
tdx_tdvpr_pa()is not fully inlined intotdh_vp_enter(), which causes the following warning:vmlinux.o: warning: objtool:
tdh_vp_enter+0x8: call totdx_tdvpr_pa()leaves .noinstr.text section
tdh_vp_enter()is marked noinstr and so can't accommodate the function being outlined. Previously this didn't cause issues because the compiler inlined the function. However, newer Clang compilers are deciding to outline it.So mark the function
__always_inlineto force it to be inlined. This would leave the similar functiontdx_tdr_pa()looking a bit asymmetric and odd, as it is marked inline but actually doesn't need to be inlined. So somewhat opportunistically remove the inline fromtdx_tdr_pa()so that it is clear that it does not need to be inlined, unliketdx_tdvpr_pa().
tdx_tdvpr_pa()usespage_to_phys()which can make further calls to outlines functions, but not on x86 following commitcba5d9b3e99d("x86/mm/64: MakeSPARSEMEM_VMEMMAPthe only memory model").
Quoted 6 lines
Fixes 69e23faf82b4 ("x86/virt/tdx: Add SEAMCALL wrapper to enter/exit TDX guest")Reported-by kernel test robot <[email protected]>Suggested-by Sean Christopherson <[email protected]>Signed-off-by Rick Edgecombe <[email protected]>Reviewed-by Kai Huang <[email protected]>
Quoted 34 lines
---
Previous discussion here:
https://lore.kernel.org/kvm/[email protected]/FWIW, I'm ok with the flatten version of the fix too, but posting this just to speed things along in case.
And note, for full correctness, this and the flatten fix will depend on the queued tip commit:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=cba5d9b3e99d6268d7909a65c2bd78f4d195aead--- arch/x86/virt/vmx/tdx/tdx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/virt/vmx/tdx/tdx.c +2
-2@@ -1496,12 +1496,12 @@ void tdx_guest_keyid_free(unsigned int keyid) }EXPORT_SYMBOL_GPL (tdx_guest_keyid_free); -static inline u64 tdx_tdr_pa (struct tdx_td *td) +static u64 tdx_tdr_pa (struct tdx_td *td) {return page_to_phys (td->tdr_page); } -static inline u64 tdx_tdvpr_pa (struct tdx_vp *td) +static __always_inline u64 tdx_tdvpr_pa(struct tdx_vp *td) {return page_to_phys (td->tdvpr_page); }