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 <cho@microsoft.com>

Fixes: 41394e33f3a0 ("x86/tdx: Extend the confidential computing API to support TDX guests")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/all/20240424082035.4092071-1-kirill.shutemov%40linux.intel.com

authored by Kirill A. Shutemov and committed by Dave Hansen a0a8d15a b53c6bd5

Changed files
+3 -1
arch
x86
include
+1
arch/x86/include/asm/coco.h
··· 25 25 void cc_random_init(void); 26 26 #else 27 27 #define cc_vendor (CC_VENDOR_NONE) 28 + static const u64 cc_mask = 0; 28 29 29 30 static inline u64 cc_mkenc(u64 val) 30 31 {
+2 -1
arch/x86/include/asm/pgtable_types.h
··· 148 148 #define _COMMON_PAGE_CHG_MASK (PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT | \ 149 149 _PAGE_SPECIAL | _PAGE_ACCESSED | \ 150 150 _PAGE_DIRTY_BITS | _PAGE_SOFT_DIRTY | \ 151 - _PAGE_DEVMAP | _PAGE_ENC | _PAGE_UFFD_WP) 151 + _PAGE_DEVMAP | _PAGE_CC | _PAGE_UFFD_WP) 152 152 #define _PAGE_CHG_MASK (_COMMON_PAGE_CHG_MASK | _PAGE_PAT) 153 153 #define _HPAGE_CHG_MASK (_COMMON_PAGE_CHG_MASK | _PAGE_PSE | _PAGE_PAT_LARGE) 154 154 ··· 173 173 }; 174 174 #endif 175 175 176 + #define _PAGE_CC (_AT(pteval_t, cc_mask)) 176 177 #define _PAGE_ENC (_AT(pteval_t, sme_me_mask)) 177 178 178 179 #define _PAGE_CACHE_MASK (_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)