From: Sherry Yang <sherry.yang@oracle.com>
To: jgg@nvidia.com, joerg.roedel@amd.com, kevin.tian@intel.com,
vasant.hegde@amd.com, joro@8bytes.org, will@kernel.org,
robin.murphy@arm.com, iommu@lists.linux.dev
Cc: sherry.yang@oracle.com, linux-kernel@vger.kernel.org
Subject: [PATCH] iommupt/amdv1: avoid GCOV builds triggering FIELD_PREP build failure
Date: Tue, 10 Mar 2026 09:31:36 -0700 [thread overview]
Message-ID: <20260310163136.1179322-1-sherry.yang@oracle.com> (raw)
After enabling CONFIG_GCOV_KERNEL and CONFIG_GCOV_PROFILE_ALL, following
build failure is observed:
In function 'amdv1pt_install_leaf_entry',
inlined from '__do_map_single_page' at drivers/iommu/generic_pt/fmt/../iommu_pt.h:650:3,
inlined from '__map_single_page0' at drivers/iommu/generic_pt/fmt/../iommu_pt.h:661:1,
inlined from 'pt_descend' at drivers/iommu/generic_pt/fmt/../pt_iter.h:391:9,
inlined from '__do_map_single_page' at drivers/iommu/generic_pt/fmt/../iommu_pt.h:657:10,
inlined from '__map_single_page1.constprop' at drivers/iommu/generic_pt/fmt/../iommu_pt.h:661:1:
././include/linux/compiler_types.h:706:45: error: call to '__compiletime_assert_71' declared with attribute error: FIELD_PREP: value too large for the field
706 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
|
......
drivers/iommu/generic_pt/fmt/amdv1.h:220:26: note: in expansion of macro 'FIELD_PREP'
220 | FIELD_PREP(AMDV1PT_FMT_OA,
| ^~~~~~~~~~
In the path '__do_map_single_page()', level 0 always invokes
'pt_install_leaf_entry(&pts, map->oa, PAGE_SHIFT, …)'. At runtime that
lands in the 'if (oasz_lg2 == isz_lg2)' arm of 'amdv1pt_install_leaf_entry()';
the contiguous-only 'else' block is unreachable for 4 KiB pages.
With CONFIG_GCOV_KERNEL + CONFIG_GCOV_PROFILE_ALL, the extra
instrumentation changes GCC's inlining so that the "dead" 'else' branch
still gets instantiated. The compiler constant-folds the contiguous OA
expression, runs the 'FIELD_PREP()' compile-time check, and produces:
FIELD_PREP: value too large for the field
gcov-enabled builds therefore fail even though the code path never executes.
Fix this by keeping the compile-time guard on the NEXT_LEVEL field but
encoding the OA field manually after a runtime 'FIELD_FIT()' check. We
shift-and-mask the value ourselves, so the compiler no longer evaluates
'FIELD_PREP(AMDV1PT_FMT_OA, …)' with constant inputs, while we preserve
the range validation and resulting bit pattern.
Fixes: 879ced2bab1b ("iommupt: Add the AMD IOMMU v1 page table format")
Signed-off-by: Sherry Yang <sherry.yang@oracle.com>
---
drivers/iommu/generic_pt/fmt/amdv1.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/generic_pt/fmt/amdv1.h b/drivers/iommu/generic_pt/fmt/amdv1.h
index aa8e1a8ec95f..c0a200afbe79 100644
--- a/drivers/iommu/generic_pt/fmt/amdv1.h
+++ b/drivers/iommu/generic_pt/fmt/amdv1.h
@@ -214,13 +214,14 @@ amdv1pt_install_leaf_entry(struct pt_state *pts, pt_oaddr_t oa,
} else {
unsigned int num_contig_lg2 = oasz_lg2 - isz_lg2;
u64 *end = tablep + log2_to_int(num_contig_lg2);
+ pt_oaddr_t contig_oa = oalog2_to_int(oasz_lg2 - PT_GRANULE_LG2SZ - 1) - 1;
+
+ if (PT_WARN_ON(!FIELD_FIT(AMDV1PT_FMT_OA, contig_oa)))
+ return;
entry |= FIELD_PREP(AMDV1PT_FMT_NEXT_LEVEL,
AMDV1PT_FMT_NL_SIZE) |
- FIELD_PREP(AMDV1PT_FMT_OA,
- oalog2_to_int(oasz_lg2 - PT_GRANULE_LG2SZ -
- 1) -
- 1);
+ (((u64)contig_oa << __bf_shf(AMDV1PT_FMT_OA)) & AMDV1PT_FMT_OA);
/* See amdv1pt_clear_entries() */
if (num_contig_lg2 <= ilog2(32)) {
--
2.50.1
next reply other threads:[~2026-03-10 16:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-10 16:31 Sherry Yang [this message]
2026-03-10 16:41 ` Jason Gunthorpe
2026-03-10 17:17 ` Sherry Yang
2026-03-10 17:57 ` Jason Gunthorpe
2026-03-25 23:39 ` Sherry Yang
2026-03-26 12:01 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260310163136.1179322-1-sherry.yang@oracle.com \
--to=sherry.yang@oracle.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joerg.roedel@amd.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=vasant.hegde@amd.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®