From patchwork Mon Mar 6 16:34:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 64938 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1943298wrd; Mon, 6 Mar 2023 08:39:44 -0800 (PST) X-Google-Smtp-Source: AK7set94HliLkK3eoxYrbBKPGohW4u7K6pj3LqryJalG2z4kTpA0y8/nbnz8KwTyBLhSH7W6Gqek X-Received: by 2002:a17:90b:1b48:b0:237:401c:9bd5 with SMTP id nv8-20020a17090b1b4800b00237401c9bd5mr11488372pjb.46.1678120783766; Mon, 06 Mar 2023 08:39:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678120783; cv=none; d=google.com; s=arc-20160816; b=DQ7UOwNfcwrKNXIyg1WLqr20EobuLp/RXHytiRkWqDVjGvUh7ZYHdBPDBj7wRQ6i2h i0TWe3dWiGQutFyI3FdFz8AuVrkyeBqhdZsPb2P/P2bZ7UrqyyZdVec5q8lWnkiiWHi5 FIhk814sIgRDbpakHU/0ssvYWxHWS4QrUk0d1zGbBQ+HtnfTPNzVgR99cDsmKXREK1Mm cphKmPtCWK6vDsxuurOvQjjKnzSx71pcSIdIQu73Xwl677zldItZhWKQKAbPyG9IOIz4 vVNb8Jd6GhfuxtiElRZwHb4YJIhh4kZ71LkRrNrVQdJMHSZhzWLuGS+HIsRjw7pOGwCv 8EkQ== 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=5wTDwZv06EmUbfQ1jDWIuEcre1E3183cNpPdoj5eT8U=; b=UVG9PJiKZZQzsIchfYOA1a1XQb+k/8Q2hX52wSa4Lfzwr6vdk+V4bxDfy4zWEnR0JZ 5rQBTlnpLxnRP53nkiXbLkXmMIIZH9WnoI0QqweeWeVA8BLyeKCTWe1iMmqdN4T6QebO NoGVNd2YY8xQF1KbMpf+2ilKKTCCRID8O1/RmkmnRXSl54Zj5drVC4tK+AOFVXCWP91q rc2J9Aic5+TqB9durSWYf5uZNfcQ23O/7wsx6L7nhjrdI494Mhi5yyo3DvQtqUvrm8rO Ou9X/YusYGTj3+PTpScflXagCMBM070qGB61KWoV3k7hyOsT/ygr2sEpHpY9T0ihQmgv FpBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=VAmf1J7B; 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 s6-20020a634506000000b004fbd4ae5651si9839265pga.170.2023.03.06.08.39.29; Mon, 06 Mar 2023 08:39:43 -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=VAmf1J7B; 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 S230261AbjCFQhT (ORCPT + 99 others); Mon, 6 Mar 2023 11:37:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229794AbjCFQg3 (ORCPT ); Mon, 6 Mar 2023 11:36:29 -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 B6AC03C17 for ; Mon, 6 Mar 2023 08:36:00 -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 301321FDEC; Mon, 6 Mar 2023 16:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1678120530; 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=5wTDwZv06EmUbfQ1jDWIuEcre1E3183cNpPdoj5eT8U=; b=VAmf1J7BrJMNASYAzGdYE3xlWvYmcISrJbv3oJgYGvqbgLPfCDHFE+ZVdv2q5+kTN2HgDF 0tdvJ4bpn3Hg618ZiJDgubq5lopaHA6vh8KSQzTIeuJLqXv+/lGpOHU0E/n556tuAR8jvV RWy/qWkiQJXZnQ/1Qqu4sc4KH5Byhsk= 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 DE67613A66; Mon, 6 Mar 2023 16:35:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Vaq7NFEWBmSvUwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:35:29 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Linus Torvalds Subject: [PATCH v4 11/12] x86/mtrr: don't let mtrr_type_lookup() return MTRR_TYPE_INVALID Date: Mon, 6 Mar 2023 17:34:24 +0100 Message-Id: <20230306163425.8324-12-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230306163425.8324-1-jgross@suse.com> References: <20230306163425.8324-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?1759637178980683915?= X-GMAIL-MSGID: =?utf-8?q?1759637178980683915?= mtrr_type_lookup() should always return a valid memory type. In case there is no information available, it should return the default UC. This will remove the last case where mtrr_type_lookup() can return MTRR_TYPE_INVALID, so adjust the comment in include/uapi/asm/mtrr.h. Note that removing the MTRR_TYPE_INVALID #define from that header could break user code, so it has to stay. 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 --- V2: - always set uniform - set uniform to 1 in case of disabled MTRRs (Linus Torvalds) V3: - adjust include/uapi/asm/mtrr.h comment --- arch/x86/include/asm/mtrr.h | 7 +++++-- arch/x86/include/uapi/asm/mtrr.h | 6 +++--- arch/x86/kernel/cpu/mtrr/generic.c | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index f1cb81330a64..0d7ea8a54d81 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -59,9 +59,12 @@ static inline void mtrr_overwrite_state(struct mtrr_var_range *var, 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/include/uapi/asm/mtrr.h b/arch/x86/include/uapi/asm/mtrr.h index 376563f2bac1..4aa05c2ffa78 100644 --- a/arch/x86/include/uapi/asm/mtrr.h +++ b/arch/x86/include/uapi/asm/mtrr.h @@ -115,9 +115,9 @@ struct mtrr_state_type { #define MTRR_NUM_TYPES 7 /* - * Invalid MTRR memory type. mtrr_type_lookup() returns this value when - * MTRRs are disabled. Note, this value is allocated from the reserved - * values (0x7-0xff) of the MTRR memory types. + * Invalid MTRR memory type. No longer used outside of MTRR code. + * Note, this value is allocated from the reserved values (0x7-0xff) of + * the MTRR memory types. */ #define MTRR_TYPE_INVALID 0xff diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index de6d74d6e3a0..3d48e9d06bfb 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c @@ -417,13 +417,13 @@ u8 mtrr_type_lookup(u64 start, u64 end, u8 *uniform) if (!mtrr_state_set) { *uniform = 0; /* Uniformity is unknown. */ - return MTRR_TYPE_INVALID; + return MTRR_TYPE_UNCACHABLE; } *uniform = 1; if (!(mtrr_state.enabled & MTRR_STATE_MTRR_ENABLED)) - return MTRR_TYPE_INVALID; + return MTRR_TYPE_UNCACHABLE; for (i = 0; i < cache_map_n && start < end; i++) { if (start >= cache_map[i].end)