Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Liam Merwick <liam.merwick@oracle.com>
To:     kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org, x86@kernel.org
Cc:     pbonzini@redhat.com, bp@alien8.de, thomas.lendacky@amd.com,
        brijesh.singh@amd.com, krish.sadhukhan@oracle.com,
        liam.merwick@oracle.com
Subject: [PATCH 5.4 2/4] x86/cpu: Add hardware-enforced cache coherency as a CPUID feature
Date:   Fri, 11 Mar 2022 11:29:25 +0000
Message-Id: <20220311112927.8400-3-liam.merwick@oracle.com>
In-Reply-To: <20220311112927.8400-1-liam.merwick@oracle.com>
References: <20220311112927.8400-1-liam.merwick@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Za7NjJxkq7fsGwmBaK8wH3cmpzkQOohIBbuNHFcpQMoOcHRCSHeupskEoKeN?=
 =?us-ascii?Q?8Ib7YS98dxCWkcKOveVQE5JAsShPtryZHMJd2avL1m2SxoNdNkjjeTXXy14k?=
 =?us-ascii?Q?Shcyh+Ka+ycL/HfyLfAod5WA6BSPvc1D2z87pooWcIFkJJoWYKeJ9fZc+YvZ?=
 =?us-ascii?Q?T1sJI7I8f0cz/eW3/ziQzJHzD0DdJLufi8ZFXhjQ3e43kw+dVE/Tc1F82v81?=
 =?us-ascii?Q?05xUlpQR+fNxRAaz3noOqDgayaVunUiYgeBvwwwlR3mI84woiGd52hmDOAbg?=
 =?us-ascii?Q?EDPmFVgMEh2d+9EEeeDhTQ8F7eBubmFp4eX/sHbD1fH90OzsdYj72lQ1UILp?=
 =?us-ascii?Q?11N7l2zVYs+4YTwSC9ORQRj8RE999jDzRXnBWWj5x5HcO7891iOplGF96bzk?=
 =?us-ascii?Q?cHKddUjKFw7NSLlL5c60y3jnulrN1czBF55auHElayKERSp7Lr8A9LXgnqMP?=
 =?us-ascii?Q?uOZaqkNcE9YkHwOge8VRniWWkwcUwbYkwCOPN2/Z9eka/4x78E1rxeKRU4RD?=
 =?us-ascii?Q?RWKWSkApfCBoCJ/uU0vEaRSjH/4Z8Nx7WY+wynuSeuI26fLpZnjUDaj6wKbW?=
 =?us-ascii?Q?GrZSsIT0GJV/X4Jd8QnWxZtNxoafSa5iy7m8Uo6sNgDo13dPlMOoxmtfwfOg?=
 =?us-ascii?Q?rU8o6FuP/nzCFe7wDd1J+TCq1A3SJNRNoj28RDR6zSmSvsxrL8X09dfJsqYn?=
 =?us-ascii?Q?OcIwyMiUokN/8g3yNgmKyAaKtp9MUSEZxW2YqhGk4ODKbsijkAwo/ToX70R9?=
 =?us-ascii?Q?fKoGjdmOOiS+viWPOyn4cjQ5wvXkZXLv3divOBHqnE0uwCjGKjqyE1CouOQg?=
 =?us-ascii?Q?FDsp0uCHaW2lKFWONFhiAF+rxtQUkLvGR+UVzIj+63tY1m8p0Z0zlLA6VX27?=
 =?us-ascii?Q?gnoA3qSu7FPTiQ/oxYioNTOaumklgzw2km4dv98+w9yMJq14legWbY66uaxH?=
 =?us-ascii?Q?3a0eDW3LgeudJ8Y5xPOfQqLQWIlYdBjEe7KlzEQkNcR0Id2sYONIQLpevB+3?=
 =?us-ascii?Q?XWTAC4S4DAJtyoEj0diUvgkgtSGcguIYDAdU1VStUbPZe1xAW65XT0+bqC+y?=
 =?us-ascii?Q?dxBflMe58fBCbFhFOZQyKV0Srh49EF+QJMyHpA5Q6JIiD350Idz2UfJX8aH9?=
 =?us-ascii?Q?ZcqQVZE+ekyxHSw/BcW/tEx9vGsJoja/ap+BDlMrS5CeOxM7G6Ut5xv5ukXl?=
 =?us-ascii?Q?JRqKVbzLbxvCtXq6iBPP8J4+zibBcDUPKm82pvnzpHQF8mb9Yz0EI+BZ+dVU?=
 =?us-ascii?Q?Rp5Zp36PyirNd6+C/xsRMAw7d/Up/GYJ9p3WmvC5T2WComAA+Bnm6mgEfnBK?=
 =?us-ascii?Q?oRHukLcs8e8dk1ZEwUPlBCCr2Uaf6dLWHUR5H68pMFBLl0PMnT2EJW/3s2FY?=
 =?us-ascii?Q?/wwXwnVNxcu1kVO6FhHNe0bePpFWzvcjUn2CD+OxksVk2qwFN7QFnryMiUrw?=
 =?us-ascii?Q?PBQFqRVZRPFSmLpw/3GE2M/tbWUtjHDWWn3itG3TphDYBbqHYgC5Rr3oQZ1O?=
 =?us-ascii?Q?K9zN7B9Tpzo7XLIh6L1e/CXLuM7pLkOLz4v5SYBKARp6rWkIFiG1VR13fUvK?=
 =?us-ascii?Q?iBvm5wMZhGYKlxivsR0J0STvH6FmS20WJUOhVQeMArFjCb7NES+iYZppangb?=
 =?us-ascii?Q?jpy66wKiabdG+pNs6JhOynI=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ed07ef7-0584-488e-ece3-08da0352839e
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5030.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2022 11:30:15.8653
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: HcX7IYCNzZ8wCdSzZYPzz+hBitj3ZKi1UX4B5e8RSzrKL+IZnu+oSYqCRzTcjkaMTo8d6ype1Srid1ghVQD51A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR10MB1430
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10282 signatures=692556
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0
 phishscore=0 bulkscore=0 adultscore=0 malwarescore=0 suspectscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2203110055
X-Proofpoint-ORIG-GUID: ROEi2xeJUoUrtr4KeeHf51EPsjjHzUuJ
X-Proofpoint-GUID: ROEi2xeJUoUrtr4KeeHf51EPsjjHzUuJ
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Krish Sadhukhan <krish.sadhukhan@oracle.com>

commit 5866e9205b47a983a77ebc8654949f696342f2ab upstream.

In some hardware implementations, coherency between the encrypted and
unencrypted mappings of the same physical page is enforced. In such a system,
it is not required for software to flush the page from all CPU caches in the
system prior to changing the value of the C-bit for a page. This hardware-
enforced cache coherency is indicated by EAX[10] in CPUID leaf 0x8000001f.

 [ bp: Use one of the free slots in word 3. ]

Suggested-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200917212038.5090-2-krish.sadhukhan@oracle.com
Signed-off-by: Liam Merwick <liam.merwick@oracle.com>
---
 arch/x86/include/asm/cpufeatures.h | 2 +-
 arch/x86/kernel/cpu/scattered.c    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
index c934eb807f23..4705533eb88d 100644
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@ -96,7 +96,7 @@
 #define X86_FEATURE_SYSCALL32		( 3*32+14) /* "" syscall in IA32 userspace */
 #define X86_FEATURE_SYSENTER32		( 3*32+15) /* "" sysenter in IA32 userspace */
 #define X86_FEATURE_REP_GOOD		( 3*32+16) /* REP microcode works well */
-/* free					( 3*32+17) */
+#define X86_FEATURE_SME_COHERENT	( 3*32+17) /* "" AMD hardware-enforced cache coherency */
 #define X86_FEATURE_LFENCE_RDTSC	( 3*32+18) /* "" LFENCE synchronizes RDTSC */
 #define X86_FEATURE_ACC_POWER		( 3*32+19) /* AMD Accumulated Power Mechanism */
 #define X86_FEATURE_NOPL		( 3*32+20) /* The NOPL (0F 1F) instructions */
diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
index adf9b71386ef..53004dbd55c4 100644
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@ -41,6 +41,7 @@ static const struct cpuid_bit cpuid_bits[] = {
 	{ X86_FEATURE_MBA,		CPUID_EBX,  6, 0x80000008, 0 },
 	{ X86_FEATURE_SME,		CPUID_EAX,  0, 0x8000001f, 0 },
 	{ X86_FEATURE_SEV,		CPUID_EAX,  1, 0x8000001f, 0 },
+	{ X86_FEATURE_SME_COHERENT,	CPUID_EAX, 10, 0x8000001f, 0 },
 	{ 0, 0, 0, 0, 0 }
 };
 
-- 
2.27.0