From patchwork Sat Apr 1 06:36:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 78055 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1053570vqo; Fri, 31 Mar 2023 23:38:55 -0700 (PDT) X-Google-Smtp-Source: AKy350ad01hAiH/AW5LjV2tjPZrW/O1U7hpJk+w+msKR27QR1SauZMLLqWPu1g21C1MQOenE9+cF X-Received: by 2002:a17:90b:1b49:b0:23f:9439:9a27 with SMTP id nv9-20020a17090b1b4900b0023f94399a27mr32954623pjb.20.1680331135496; Fri, 31 Mar 2023 23:38:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680331135; cv=none; d=google.com; s=arc-20160816; b=i3M7Jt26yMUjsj3uQt63p0WJVd9c8gsEYSF/Q0EYEO0+4iAQ+ftZzbDI4UQ+BQ1sSm 7eoTQl1d9t7Ct6tupotSYvvZkcnaNpljM1Cqi305IqvcVN/ES0BvLeUT3gEnl8jrlSN7 p+t5lzSUzYai/+nZziSRRO1bix4knOZrFtK+Z02feFzlg5Bw82rHuRUGE705h10WtTSc Riiaxo/jIoQucRp6nanhK69lj+RH+Tc+cyWyuayYXtlmdRjG8s9jm55EQ1O0MQ2eyHgC EP7Pf0nyAuS69jnjFmoiJ03l2hC3Pt+dx5xvGYu5/PVxk4EJdL9GyD0XxNRf+oBtUkZs GS6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Pb/qNhjjqBGVJo7Fmuv925HQ9Z5bT3aQVdQm6MKlfSg=; b=hXyFY1zB1nW06wrDWwH8Q9kUygVjbKwD0gCShr4hS819b/uOYcw8l8q6bK5IDMQHji LhXfaF0CDbkGqcxBAr1dbyYeg+7p+ZCOVv0r+vqoNCpDQzUWPZxSb7aq9KfIx6qvFYxl WesLBzIwf6QAgnUkPyAYGOwjr3jxn1nktOUh7AIUkB+oJ8BKteNTpxcDIoC9WolUx3Js WHFTQCpIuCyafCrI5NQLHWfswPTIIyoBVCK/GnGGjrPRHkeDyLQDkZN6wQp/whkFj0U/ yTeIVZAimZGKZWfed37UKYPfbz2kfNNkATDhOCV/qTbzfL/RsuYU1dD1xeAfUj8iRJae RTYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=TGo1WV1P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id il15-20020a17090b164f00b0023f1072583asi4247921pjb.76.2023.03.31.23.38.41; Fri, 31 Mar 2023 23:38:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=TGo1WV1P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231879AbjDAGhv (ORCPT + 99 others); Sat, 1 Apr 2023 02:37:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232426AbjDAGhr (ORCPT ); Sat, 1 Apr 2023 02:37:47 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B38991D912; Fri, 31 Mar 2023 23:37:25 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 08D4C21A48; Sat, 1 Apr 2023 06:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1680331044; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pb/qNhjjqBGVJo7Fmuv925HQ9Z5bT3aQVdQm6MKlfSg=; b=TGo1WV1P/iS2JNstiqxFXFknQ8WqtOvAk0laUW9IOlTsCtclVDPucDgnXk1y1mDR/zGroE RCt3W57dqASE+DqaeItDKCm2lZA2tTpSsf2Foe++Ec2E9xZgnhoaxnyUKzjGZdHlSUCWPo RPuhmyAkLXUtcLY1j/c9MxD0q4KTXn8= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9E137134FB; Sat, 1 Apr 2023 06:37:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 3pc7JSPRJ2RDdwAAMHmgww (envelope-from ); Sat, 01 Apr 2023 06:37:23 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-hyperv@vger.kernel.org Cc: Juergen Gross , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Michael Kelley Subject: [PATCH v5 05/15] x86/hyperv: set MTRR state when running as SEV-SNP Hyper-V guest Date: Sat, 1 Apr 2023 08:36:42 +0200 Message-Id: <20230401063652.23522-6-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230401063652.23522-1-jgross@suse.com> References: <20230401063652.23522-1-jgross@suse.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761954900398851124?= X-GMAIL-MSGID: =?utf-8?q?1761954900398851124?= In order to avoid mappings using the UC- cache attribute, set the MTRR state to use WB caching as the default. This is needed in order to cope with the fact that PAT is enabled, while MTRRs are not supported by the hypervisor. Fixes: 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case") Signed-off-by: Juergen Gross Tested-by: Michael Kelley --- V2: - new patch --- arch/x86/kernel/cpu/mshyperv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index f36dc2f796c5..0a6cc3cf8919 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -34,6 +34,7 @@ #include #include #include +#include /* Is Linux running as the root partition? */ bool hv_root_partition; @@ -408,6 +409,9 @@ static void __init ms_hyperv_init_platform(void) #ifdef CONFIG_SWIOTLB swiotlb_unencrypted_base = ms_hyperv.shared_gpa_boundary; #endif + + /* Set WB as the default cache mode. */ + mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); } /* Isolation VMs are unenlightened SEV-based VMs, thus this check: */ if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT)) {