Skip to content

Commit a0a8d15

Browse files
kirylhansendc
authored andcommitted
x86/tdx: Preserve shared bit on mprotect()
The TDX guest platform takes one bit from the physical address to indicate if the page is shared (accessible by VMM). This bit is not part of the physical_mask and is not preserved during mprotect(). As a result, the 'shared' bit is lost during mprotect() on shared mappings. _COMMON_PAGE_CHG_MASK specifies which PTE bits need to be preserved during modification. AMD includes 'sme_me_mask' in the define to preserve the 'encrypt' bit. To cover both Intel and AMD cases, include 'cc_mask' in _COMMON_PAGE_CHG_MASK instead of 'sme_me_mask'. Reported-and-tested-by: Chris Oo <[email protected]> Fixes: 41394e3 ("x86/tdx: Extend the confidential computing API to support TDX guests") Signed-off-by: Kirill A. Shutemov <[email protected]> Signed-off-by: Dave Hansen <[email protected]> Reviewed-by: Rick Edgecombe <[email protected]> Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]> Reviewed-by: Tom Lendacky <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/all/20240424082035.4092071-1-kirill.shutemov%40linux.intel.com
1 parent b53c6bd commit a0a8d15

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

arch/x86/include/asm/coco.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ u64 cc_mkdec(u64 val);
2525
void cc_random_init(void);
2626
#else
2727
#define cc_vendor (CC_VENDOR_NONE)
28+
static const u64 cc_mask = 0;
2829

2930
static inline u64 cc_mkenc(u64 val)
3031
{

arch/x86/include/asm/pgtable_types.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
#define _COMMON_PAGE_CHG_MASK (PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT | \
149149
_PAGE_SPECIAL | _PAGE_ACCESSED | \
150150
_PAGE_DIRTY_BITS | _PAGE_SOFT_DIRTY | \
151-
_PAGE_DEVMAP | _PAGE_ENC | _PAGE_UFFD_WP)
151+
_PAGE_DEVMAP | _PAGE_CC | _PAGE_UFFD_WP)
152152
#define _PAGE_CHG_MASK (_COMMON_PAGE_CHG_MASK | _PAGE_PAT)
153153
#define _HPAGE_CHG_MASK (_COMMON_PAGE_CHG_MASK | _PAGE_PSE | _PAGE_PAT_LARGE)
154154

@@ -173,6 +173,7 @@ enum page_cache_mode {
173173
};
174174
#endif
175175

176+
#define _PAGE_CC (_AT(pteval_t, cc_mask))
176177
#define _PAGE_ENC (_AT(pteval_t, sme_me_mask))
177178

178179
#define _PAGE_CACHE_MASK (_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)

0 commit comments

Comments
 (0)