From patchwork Thu Feb 23 09:32:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 60881 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp230610wrd; Thu, 23 Feb 2023 02:06:37 -0800 (PST) X-Google-Smtp-Source: AK7set/ZnLmKoo25RJOg7ubMywLDgG27EzgAlovCkQwU9FUSO8xYvf43VEW8VfCUUbziX4KzdDy7 X-Received: by 2002:a17:906:20d7:b0:889:d24e:6017 with SMTP id c23-20020a17090620d700b00889d24e6017mr19031096ejc.3.1677146797160; Thu, 23 Feb 2023 02:06:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677146797; cv=none; d=google.com; s=arc-20160816; b=w9UVCgXgTyIrn+s2aiPlwjwezYTGswhA6R8QDyFRM6P80YNavEsUV0HtMizZuBmgcx k1dstzV2H1KdQnzXqfFedsTe3WkrS4GqfYsO4IxtgsN9IXVw6jEFdL/ny+XgjkLpY9B/ zLgdo4OO0xzIo+dBlmWED1qyR7djoUyPxCjFBb1LLvk6JjSlarxemLsDdgYhXOUSscnK oQI3iQPbeuuu9V4V00JXzLgLKOwPTZWM7iw4vfL0Ey4gwIiaQ13BFGsmTUF7IVEkF6Lw 6ErFX0oJI5gYJSEmL/avWbx9muvdgxbSeOhKnwMGvEVmhAhD1a+Ru1aiOqEvUockdyWR 2TTA== 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=+ofUIuPQzCXz4x5AZ2jKl8mI1RQt2u+dS3skjEQjrkE=; b=wES/P2V5o+2el7uoLimvtugz+41FYwdpEk1hWp74N9beqrZv1edy+G9D/IFzcqWd3L s62z75B3GVxhPhyc0X+MLCA1kRKgxSGpbcXj0qo+0Y6Bssbh3v3kmNnPSRqiupqeINtf I9P52Olkr8ztZzgJktqamDDy55VYLvfNw8sd0mJ708UAQyG6Fv64I73EhRPWUbJQGD3r ih256S5Q23raTv/obBBShyukArDpD8uWDyh28yBMW6SVZihsmMYjU8eGmINypAAuBhi1 NauQqjgVX8SfWGGXL1QGLBIM4X37UXJkfL1afpxS8Q9rv4MOE4YOSn0O77VpC67+7jcw bVeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=c0M+XIgo; 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 j18-20020a170906105200b008e5082870a9si7261621ejj.574.2023.02.23.02.06.14; Thu, 23 Feb 2023 02:06:37 -0800 (PST) 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=c0M+XIgo; 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 S233362AbjBWJdj (ORCPT + 99 others); Thu, 23 Feb 2023 04:33:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233617AbjBWJdh (ORCPT ); Thu, 23 Feb 2023 04:33:37 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 342E353EEF; Thu, 23 Feb 2023 01:33:11 -0800 (PST) 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 9E087337AC; Thu, 23 Feb 2023 09:33:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1677144789; 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=+ofUIuPQzCXz4x5AZ2jKl8mI1RQt2u+dS3skjEQjrkE=; b=c0M+XIgoq0CQq6ZMLqfzCUMBjPu6EtDslCanknZBqDxtcr+DglId3s0M7nE8h4fhrSwvwx 9FZzkfOI0YziUrd3hZBN4Qt+YMz7PY1F+Mt+vQLrkLxKhDla0vk5yTYQFWh8yg+zPNe8Xf ZCtz17T+IpB+jcBMnA1XHfNGEU5jbfk= 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 4654013928; Thu, 23 Feb 2023 09:33:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id B/DdD9Uy92OUbAAAMHmgww (envelope-from ); Thu, 23 Feb 2023 09:33:09 +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" Subject: [PATCH v3 04/12] x86/hyperv: set MTRR state when running as SEV-SNP Hyper-V guest Date: Thu, 23 Feb 2023 10:32:35 +0100 Message-Id: <20230223093243.1180-5-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230223093243.1180-1-jgross@suse.com> References: <20230223093243.1180-1-jgross@suse.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham 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?1758615879911309256?= X-GMAIL-MSGID: =?utf-8?q?1758615879911309256?= 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 --- 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 f924a76c6923..95f17394eca0 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)) {