From patchwork Tue May 2 12:09:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 89326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp565973vqo; Tue, 2 May 2023 05:21:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7YSDpRldEFzrA8ga9riQZsc2SHm8WVtmjSeN153jie8k8PD+XM+f8+5OoSDwcqsXKYt9Vc X-Received: by 2002:a05:6a00:1905:b0:63d:3595:26db with SMTP id y5-20020a056a00190500b0063d359526dbmr23230571pfi.23.1683030107935; Tue, 02 May 2023 05:21:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683030107; cv=none; d=google.com; s=arc-20160816; b=m8k9gNCRZPOZVU4EWUjERJVIXML9paokrlN+5wNMFppTVl4mcHkHsj/NHzwkQnpf5U GE7l1Gak2tkzcp2lAouw3L0NpPmadTe3vol5W8klm0gn8hLo3WYHlUHlAZoHYIEhYLx8 175frWQVDSPq7gzlwofCADiRHut6/xvCnq559f251h8vfYvSsHpi1QIu1+Z38fka0dPh Eb+zUst66JaLJpScXFTzn8VkdAMWRpTUH5/I4EelTVZRdrezWbKhwoL6oww1PGmc7l87 NjR2AgNwDkQonSuODW9tUDcPJ0mJKAxqN5dsgc+LyHKhz90O5XmOXtedQco40hj0G5Av xxtw== 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=oOpgBV0+omk7fDWKz1A1GeqrS6LU5ZyU3wjqQk4HBv4=; b=mS8J50lIvfjRD+Jjq720LUHE7V3Q6CGngbyfMatiQdVSHiDFMoRkMBJVdVbPL0rTWG /779jJgfjRhVgAJzOrBzocJlbxP+QfSUIqJX5JjMI88OP3qDbu/TmjYi9V/W0lKDme4S EOlQrvVKAsSs0FSdQy20U51rgXkOxWXjrA0xRB+ANBXcJC7MXL7zLSuJsKdJsc+tH5wv q44QuuMIi2yRSaPLAGmGeMRQ7SsJKK6RF2sWyShsmf84dqWcKkPG6581c3g4HTZ6x2+R GOnuwSKDv12B1/V5OKtKCweKT8U6n/GfU2mPPIIcjoXL+UlwnuSGvO5X6kF1jfMDL8Wy idiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=aRpPaRY7; 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 q5-20020aa78425000000b0063b88f52220si30380363pfn.144.2023.05.02.05.21.33; Tue, 02 May 2023 05:21:47 -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=aRpPaRY7; 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 S234159AbjEBML2 (ORCPT + 99 others); Tue, 2 May 2023 08:11:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234171AbjEBMLR (ORCPT ); Tue, 2 May 2023 08:11:17 -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 32DF459FA for ; Tue, 2 May 2023 05:10:42 -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 5E2142225C; Tue, 2 May 2023 12:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1683029439; 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=oOpgBV0+omk7fDWKz1A1GeqrS6LU5ZyU3wjqQk4HBv4=; b=aRpPaRY7wbWUOC22ExpKgXITJImcgArvtXJ6bzrgqUDF+b/R9yrYhp3sOqag5LMiNu/PsH CFNLiWWRXDtSb4qTVhDFOsv4M1gOi3nPpfrHiGUfQ9UTebzktfP3kk+adioMMemYpadqOr CTSGhp5BMwnOu9vsxNVxCsBXOmammhU= 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 1A9C1139C3; Tue, 2 May 2023 12:10:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id hQwMBb/9UGQOMAAAMHmgww (envelope-from ); Tue, 02 May 2023 12:10:39 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: mikelley@microsoft.com, Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v6 10/16] x86/mtrr: add get_effective_type() service function Date: Tue, 2 May 2023 14:09:25 +0200 Message-Id: <20230502120931.20719-11-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230502120931.20719-1-jgross@suse.com> References: <20230502120931.20719-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,T_SCC_BODY_TEXT_LINE 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?1764784978234541993?= X-GMAIL-MSGID: =?utf-8?q?1764784978234541993?= Add a service function for obtaining the effective cache mode of overlapping MTRR registers. Make use of that function in check_type_overlap(). Signed-off-by: Juergen Gross Tested-by: Michael Kelley --- V3: - new patch --- arch/x86/kernel/cpu/mtrr/generic.c | 39 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index cd887327ba3a..44e035a8e9fb 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c @@ -86,31 +86,30 @@ static u64 get_mtrr_size(u64 mask) return size; } +static u8 get_effective_type(u8 type1, u8 type2) +{ + if (type1 == MTRR_TYPE_UNCACHABLE || type2 == MTRR_TYPE_UNCACHABLE) + return MTRR_TYPE_UNCACHABLE; + + if ((type1 == MTRR_TYPE_WRBACK && type2 == MTRR_TYPE_WRTHROUGH) || + (type1 == MTRR_TYPE_WRTHROUGH && type2 == MTRR_TYPE_WRBACK)) + return MTRR_TYPE_WRTHROUGH; + + if (type1 != type2) + return MTRR_TYPE_UNCACHABLE; + + return type1; +} + /* * Check and return the effective type for MTRR-MTRR type overlap. - * Returns 1 if the effective type is UNCACHEABLE, else returns 0 + * Returns true if the effective type is UNCACHEABLE, else returns false */ -static int check_type_overlap(u8 *prev, u8 *curr) +static bool check_type_overlap(u8 *prev, u8 *curr) { - if (*prev == MTRR_TYPE_UNCACHABLE || *curr == MTRR_TYPE_UNCACHABLE) { - *prev = MTRR_TYPE_UNCACHABLE; - *curr = MTRR_TYPE_UNCACHABLE; - return 1; - } - - if ((*prev == MTRR_TYPE_WRBACK && *curr == MTRR_TYPE_WRTHROUGH) || - (*prev == MTRR_TYPE_WRTHROUGH && *curr == MTRR_TYPE_WRBACK)) { - *prev = MTRR_TYPE_WRTHROUGH; - *curr = MTRR_TYPE_WRTHROUGH; - } + *prev = *curr = get_effective_type(*curr, *prev); - if (*prev != *curr) { - *prev = MTRR_TYPE_UNCACHABLE; - *curr = MTRR_TYPE_UNCACHABLE; - return 1; - } - - return 0; + return *prev == MTRR_TYPE_UNCACHABLE; } /**