From patchwork Tue Feb 7 07:29:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 53761 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2701714wrn; Mon, 6 Feb 2023 23:31:12 -0800 (PST) X-Google-Smtp-Source: AK7set/OvhJd2Aj1EaOlGREIFaXzzPShfRhMKRfOaT8vx2j5YtoUnfAAQwL5zJSwu/h9RL57bxtD X-Received: by 2002:a05:6a20:12cd:b0:bc:c663:41be with SMTP id v13-20020a056a2012cd00b000bcc66341bemr2951299pzg.30.1675755072238; Mon, 06 Feb 2023 23:31:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675755072; cv=none; d=google.com; s=arc-20160816; b=QeVqL25aFkRhUy+fQ0SPfGF8c3iMJFwB5d134P2Ct6bfcKe2Mops9A07i4DLu9AQOH mBsDIIR1njBMtomMu/J5W9gWax+9S5shjwYQiV42BnVe1AD6nNn4z5ynPPIanMr3oHPT r9aXj7b49bp26DXBgJatMW8865UZQaHMtFW2wMFy14ivrVQe5K4rfr9Y994PuB4Qi8id Ozi19KC9TAnVQX4n+Aju7SrFRMfo0s3lUDmnQQ3VMrxzte96b1vKdBqjMclP0+fW1Zve cbHg4/eypf9auvBIrA21O1uKIWAzt9koju8nNZejD+RYCfmmKSJDQBVVwRDYNSPWlyKD TBaw== 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=FL8lZ8VzNgVUhkoi8dmft+rrAn+Q6LoB7UFRnauUMu0=; b=Pu17CubHZC3+HQ6pGqpGO5J6doaBSubGpt2MDG9HKIKmU5hNRlbMyKPpAtyUM5U41p c4ajPYB/oejQlONXrUtq/kbmCh2lws6NnPcyUTyDjNiUP552IqefESO6IEcsPV+oIRph 9F07/fD51DMVwjMaioQ3wDYCxsn55tW4CUQRIT0AgeYl+dbiRJtCOl9KXXKpVlhKfb1T s9HZlVrj512CMlYFAFG0eO0pMBWxvFpLRqPaFCusvg9ODcvTqwmGB8Cp4VSwuDextZWv TND951C21Oqz5WVYYUJ09o2nGKGjbA02xf+UtTpVGtDoiQeN84Qg0crX/sjFWTPOmcJo plQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=dVFX1eOA; 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 p6-20020a639506000000b004ded554485bsi13959430pgd.663.2023.02.06.23.30.59; Mon, 06 Feb 2023 23:31:12 -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=dVFX1eOA; 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 S230232AbjBGH3p (ORCPT + 99 others); Tue, 7 Feb 2023 02:29:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230079AbjBGH3i (ORCPT ); Tue, 7 Feb 2023 02:29:38 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 728B6360B3 for ; Mon, 6 Feb 2023 23:29:29 -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-out2.suse.de (Postfix) with ESMTPS id E5D1960F1F; Tue, 7 Feb 2023 07:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1675754967; 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=FL8lZ8VzNgVUhkoi8dmft+rrAn+Q6LoB7UFRnauUMu0=; b=dVFX1eOAI+AHMp/mXW02giADSuEANXVa3rEQogBIx/Qwagzw60RQaeO9BHKPUtVaTXgtfX C4zJ64w+HEu6kN8neiYYSg/4W6pAfUK2jWRY1TqABNawzFK0zT6xMk69o4yH321E9wgtBA sAewnLXp/xK10S7tEq5PljbDHH7OAkY= 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 97EE413A8C; Tue, 7 Feb 2023 07:29:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Cmm0I9f94WPQUQAAMHmgww (envelope-from ); Tue, 07 Feb 2023 07:29:27 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: lists@nerdbynature.de, mikelley@microsoft.com, torvalds@linux-foundation.org, Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 4/6] x86/mtrr: don't let mtrr_type_lookup() return MTRR_TYPE_INVALID Date: Tue, 7 Feb 2023 08:29:00 +0100 Message-Id: <20230207072902.5528-5-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230207072902.5528-1-jgross@suse.com> References: <20230207072902.5528-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?1757156550627104501?= X-GMAIL-MSGID: =?utf-8?q?1757156550627104501?= mtrr_type_lookup() should always return a valid memory type. In case there is no information available, it should return the default UC. At the same time the mtrr_type_lookup() stub for the !CONFIG_MTRR case should set uniform to 1, as if the memory range would be covered by no MTRR at all. Suggested-by: Linus Torvalds Signed-off-by: Juergen Gross --- arch/x86/include/asm/mtrr.h | 7 +++++-- arch/x86/kernel/cpu/mtrr/generic.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index 29ec2d6f0537..c12c73d48f08 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -57,9 +57,12 @@ static inline bool mtrr_enabled(void) static inline u8 mtrr_type_lookup(u64 addr, u64 end, u8 *uniform) { /* - * Return no-MTRRs: + * Return the default MTRR type, without any known other types in + * that range. */ - return MTRR_TYPE_INVALID; + *uniform = 1; + + return MTRR_TYPE_UNCACHABLE; } #define mtrr_save_fixed_ranges(arg) do {} while (0) #define mtrr_save_state() do {} while (0) diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index ee09d359e08f..c749ec4436a1 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c @@ -262,10 +262,10 @@ u8 mtrr_type_lookup(u64 start, u64 end, u8 *uniform) end--; if (!mtrr_state_set) - return MTRR_TYPE_INVALID; + return MTRR_TYPE_UNCACHABLE; if (!(mtrr_state.enabled & MTRR_STATE_MTRR_ENABLED)) - return MTRR_TYPE_INVALID; + return MTRR_TYPE_UNCACHABLE; /* * Look up the fixed ranges first, which take priority over