Skip to content

Commit ec73859

Browse files
arndbIngo Molnar
authored andcommitted
x86/coco: Replace 'static const cc_mask' with the newly introduced cc_get_mask() function
When extra warnings are enabled, the cc_mask definition in <asm/coco.h> causes a build failure with GCC: arch/x86/include/asm/coco.h:28:18: error: 'cc_mask' defined but not used [-Werror=unused-const-variable=] 28 | static const u64 cc_mask = 0; Add a cc_get_mask() function mirroring cc_set_mask() for the one user of the variable outside of the CoCo implementation. Fixes: a0a8d15 ("x86/tdx: Preserve shared bit on mprotect()") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/20250310131114.2635497-1-arnd@kernel.org -- v2: use an inline helper instead of a __maybe_unused annotaiton.
1 parent f739365 commit ec73859

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

arch/x86/include/asm/coco.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ enum cc_vendor {
1515
extern enum cc_vendor cc_vendor;
1616
extern u64 cc_mask;
1717

18+
static inline u64 cc_get_mask(void)
19+
{
20+
return cc_mask;
21+
}
22+
1823
static inline void cc_set_mask(u64 mask)
1924
{
2025
RIP_REL_REF(cc_mask) = mask;
@@ -25,7 +30,10 @@ u64 cc_mkdec(u64 val);
2530
void cc_random_init(void);
2631
#else
2732
#define cc_vendor (CC_VENDOR_NONE)
28-
static const u64 cc_mask = 0;
33+
static inline u64 cc_get_mask(void)
34+
{
35+
return 0;
36+
}
2937

3038
static inline u64 cc_mkenc(u64 val)
3139
{

arch/x86/include/asm/pgtable_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ enum page_cache_mode {
177177
};
178178
#endif
179179

180-
#define _PAGE_CC (_AT(pteval_t, cc_mask))
180+
#define _PAGE_CC (_AT(pteval_t, cc_get_mask()))
181181
#define _PAGE_ENC (_AT(pteval_t, sme_me_mask))
182182

183183
#define _PAGE_CACHE_MASK (_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)

0 commit comments

Comments
 (0)