Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
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 4/4] KVM: SVM: Don't flush cache if hardware enforces cache coherency across encryption domains
Date:   Fri, 11 Mar 2022 11:29:27 +0000
Message-Id: <20220311112927.8400-5-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?7gI9y8phHMD+jGmnS9v0KhU84FmuEnqtMEu4lP44UOP/AcYgPbFmNAXR4ytZ?=
 =?us-ascii?Q?+ahkGOwfuY/+aFjPNysF0em3civw18L/6gUS+GL1pkMZCvH/TUhZS8txKMBp?=
 =?us-ascii?Q?Ebv6bJsmXO8RMq8B3w0R33lsUw7tWDTm1YZ8z4zV4imhot53P3vO+2+wjim3?=
 =?us-ascii?Q?kHDjyUau7Rj/C29kDdU9fUdPmDrqd1h450ZJj5EQf1Oek3rm/lDVO5Qt3WaA?=
 =?us-ascii?Q?mYKrb9r6YcqnClTGwcHvcDES2nmp28jjC3gJXKR5QeFb15xSDGjTeADcnUzo?=
 =?us-ascii?Q?5tt1Jn7e2VO88EHV9eSSrEfzpjzzkeE/S02Nsp/d85uo382r0fU3FL7KxIqB?=
 =?us-ascii?Q?XLVvcv6iQntBJC78otzV3zl/Klrzz9zNuUYKiVfkhprZtLEYeOxAKTd4r1oP?=
 =?us-ascii?Q?sAe97alZCyw1L4NvooW22tSfiJteLIPytZQGqp3j7yOc+060thTtQwYMREFT?=
 =?us-ascii?Q?bQE95aozSpBNTTQXlmkuP+/W7W2MFl6mvt81PfBPQ9dugViLEcjpiV5VIQHN?=
 =?us-ascii?Q?37n6LhIUDmv/cVOQ2NTeaxf/8tqb6h0ADB8AJkpzT5emSNGygjhhcXSOc528?=
 =?us-ascii?Q?uFXO8emFLJeHFe04iWEBshA203EUM15aikcEr3uCAPZk9kNcbeCmEHQMCTDN?=
 =?us-ascii?Q?21ZhQTI5bgtVWhFtturvZfvz0aBaR1TVfKdQlILZ1TmJYRuIwaPlDv1gvBz0?=
 =?us-ascii?Q?CuCMXZ2u9qyrleG7r2W9P6zxFl0IAndTw+IfDLGdLvZO5MUpGjUHeMw4J3HO?=
 =?us-ascii?Q?dLKp/gzs3pXH3WDPoqD2uP4yOwcf3Uje2sg7J1fOVsu/6V6Bhcb+Zd3qyc+l?=
 =?us-ascii?Q?gk8+RKh7RPBGsCYAJVZJfPyctWcwf9q4Q5PbLhHH0hkpQDmo/v2//kBeMbBa?=
 =?us-ascii?Q?1MxgTqx3CK442EzmJL9eBsIXnB61RtKJClhKFR/ymXdq+Fc33cmZMlJ1NMvd?=
 =?us-ascii?Q?Dg+lAUtYFwL5ihtLvdEQKv3nfGu6FY3nzZ0aGO6pUrY51FqIK0/AgJ8mxspo?=
 =?us-ascii?Q?GAjuFsEAafmjRNOJNy7u+JOnBcanYoSswZyPxVhdy8IS/CYRwMnw+7v1flaB?=
 =?us-ascii?Q?rQBnhTLRUVE+DQdFd6FZDM5bUmNKINxqdFI/vnz3x5MYgK5Zql2M7Od04ohT?=
 =?us-ascii?Q?a5+Yf0E1ErjFxWLiVSv9KUjZT+BUF+E+2+otkb0krjIPAXg3+xpldRhOT9XP?=
 =?us-ascii?Q?bSXHar5MMjWc6QEPWSlouiXX4A+3uin3+/ApNOXYg8QRFOU1GWUjnokHelQN?=
 =?us-ascii?Q?cYYB5jgVdptGJbAxIEyeN6OZLgs6fHtSOvbD4azKEYAAEgBCiNS+5vxYtXA6?=
 =?us-ascii?Q?3mbxbLY6G4T/HGyqwN5lrtK5e+/m9eQNbL3RbfcKvicuSj4H/WDLO/0N1lYO?=
 =?us-ascii?Q?UDpKWPKN2Z6Lrquf0kgGvMAftPDqmqPpJ/Ny7etvb0wQpkHaN1oQ53p8jufF?=
 =?us-ascii?Q?lAoPrBz2KBjNcRqC4PpME996UcMst/eC3xjWhgUgnovo4sOXIVwi1luJPprL?=
 =?us-ascii?Q?olSlRLxqNS4YbNQtDYaFVm1/xcrttrTsky+Z4bC4oZMRtqWpq55zb4YBnbFU?=
 =?us-ascii?Q?n3O9fhr63yqGJyEePRz4XbbgAvZXS6DwBZIxFR+moac6FkW52yEMxnAVAcvQ?=
 =?us-ascii?Q?4sxk5s/d3qSbLZx0Jjg4TmA=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2b20373c-d8ee-4083-38f1-08da035285fa
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:19.8047
 (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: rV1Z1loqvLcA9JrBKPMN8RBi45ya+ctWeyXmARNfA3ro9i1iaBtfcqJgvEqxgy9ybTbaoYRkc4vPjTE4qGgl8g==
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 spamscore=0 mlxlogscore=999 bulkscore=0
 phishscore=0 malwarescore=0 suspectscore=0 mlxscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2203110055
X-Proofpoint-ORIG-GUID: f5VO2VnAsKEXHoIqy-vdF6E1xC-IwR7x
X-Proofpoint-GUID: f5VO2VnAsKEXHoIqy-vdF6E1xC-IwR7x
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 e1ebb2b49048c4767cfa0d8466f9c701e549fa5e upstream.

In some hardware implementations, coherency between the encrypted and
unencrypted mappings of the same physical page in a VM is enforced. In
such a system, it is not required for software to flush the VM's page
from all CPU caches in the system prior to changing the value of the
C-bit for the page.

So check that bit before flushing the cache.

Signed-off-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Link: https://lkml.kernel.org/r/20200917212038.5090-4-krish.sadhukhan@oracle.com
Signed-off-by: Liam Merwick <liam.merwick@oracle.com>

Conflicts:
	arch/x86/kvm/svm/sev.c
[ The linux-5.4.y stable branch does not have the Linux 5.7 refactoring commit
  eaf78265a4ab ("KVM: SVM: Move SEV code to separate file") so the
  change was manually applied to sev_clflush_pages() in arch/x86/kvm/svm.c. ]
---
 arch/x86/kvm/svm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 2f84509f2828..125970286f28 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1904,7 +1904,8 @@ static void sev_clflush_pages(struct page *pages[], unsigned long npages)
 	uint8_t *page_virtual;
 	unsigned long i;
 
-	if (npages == 0 || pages == NULL)
+	if (this_cpu_has(X86_FEATURE_SME_COHERENT) || npages == 0 ||
+	    pages == NULL)
 		return;
 
 	for (i = 0; i < npages; i++) {
-- 
2.27.0