From patchwork Sat Apr 1 06:36:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 78057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1055207vqo; Fri, 31 Mar 2023 23:44:21 -0700 (PDT) X-Google-Smtp-Source: AKy350a5CJV2sSO932S1noXUa4teOknWZPVf3lDDvsGQmNUW7Dar3Yk1WBoJFPniEof3HnrjFQp8 X-Received: by 2002:a05:6402:658:b0:4fb:6523:2b38 with SMTP id u24-20020a056402065800b004fb65232b38mr30175690edx.27.1680331461511; Fri, 31 Mar 2023 23:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680331461; cv=none; d=google.com; s=arc-20160816; b=prwfrDtNQDQ82J4/2HcKU/UpEP4Zu5YBtbbg8cKpnl4OSFizun0UfzdmLzHxFSMzrZ msXVnas8XiIpiX1rdATDwSWLQblDeDOOPn7ftlQSyLAne+yYmdosXQkZc3v41JLhy9JJ ljlB63NcbD+vhEnjQD7vxbs9S65wVEypfYdYnAlCHnsmUMLQ2ombITcwWFmasw57ILWT wqMm6J+wO4uhSiUdG+eVuQSDqkvKdCDQL7f43LjYq0bjPZGt0kKT3K4yeaD6R45EJp8B Dvwl7iOCKgdc06MDSpOvKbsbmlHmqKceAoWY4fbn9s2oRPFjptXZHMN8Vebz3QbH8aA/ dvIg== 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=8lUW3P9mpcWjI7lNcX7PnUpBYL4zKefFnDWcjHwwm2k=; b=FT1XUpu673uFvPefqNZiIbbghnpQoNT9IiCOh0mUm7ligwuboQO2gK89geP++rllQt bmLIUex5p/xatbhhFUQuzceJEPNYuECa7fBcBUzB84rvjDST+PwNxzJt4XkdgZ+1sL8k 4gd4Ddg9a6q/A/aNUQZbRub4QYeDXguK5m6jBaT7YcQuFcNmyzVpdlGMdntD37NVjfMV 4CQH/0OGqHr+cQJMJhZGv7G/jJrhaBbchlVHQoJ1L6SzfbAlBWBhFuJEPWXHCNMomHC4 XRpZcnLps/SyATDvjzcCgJ+EmHImj6blYJeQLSS8PBGWkm1rRhdn1HNfS1x0Eurh2/Mz Brjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=HexWFFQQ; 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 bf11-20020a0564021a4b00b004fb16259824si3412558edb.339.2023.03.31.23.43.57; Fri, 31 Mar 2023 23:44:21 -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=HexWFFQQ; 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 S233436AbjDAGil (ORCPT + 99 others); Sat, 1 Apr 2023 02:38:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233502AbjDAGi0 (ORCPT ); Sat, 1 Apr 2023 02:38:26 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D52B1D908 for ; Fri, 31 Mar 2023 23:38:00 -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 885F421A48; Sat, 1 Apr 2023 06:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1680331072; 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=8lUW3P9mpcWjI7lNcX7PnUpBYL4zKefFnDWcjHwwm2k=; b=HexWFFQQVN5UN/qYGGwLOJTZXbNlqk67Lpl8/tvSu3uH7ydHzS+4O0feVIQhQJ973OGmFu Psqrkxh0wv+Fq+GClVWHorkEtZeRfyGUFk8NUfWidg5ha0oOMlOmIGoGC0+ODkliqiqFeo QhdZuv8XWJF+uveQWPaarVoXwuvvc5k= 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 4290B134FB; Sat, 1 Apr 2023 06:37:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id MbvdDkDRJ2RwdwAAMHmgww (envelope-from ); Sat, 01 Apr 2023 06:37:52 +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" , Michael Kelley Subject: [PATCH v5 10/15] x86/mtrr: add get_effective_type() service function Date: Sat, 1 Apr 2023 08:36:47 +0200 Message-Id: <20230401063652.23522-11-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?1761955242638261306?= X-GMAIL-MSGID: =?utf-8?q?1761955242638261306?= 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 5d60b46187f7..005f07ebb3a3 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c @@ -78,31 +78,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; } /**