From patchwork Tue Feb 7 07:28:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 53762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2702852wrn; Mon, 6 Feb 2023 23:34:23 -0800 (PST) X-Google-Smtp-Source: AK7set/KvrsG7yHjtr1N8R2tIYGLwm2e8tav1TiLOnn0MZ+C+r9htEvMmoB9YY6/UGBYrU3ySBFR X-Received: by 2002:a17:907:8b14:b0:889:ed81:dff7 with SMTP id sz20-20020a1709078b1400b00889ed81dff7mr2886447ejc.9.1675755262987; Mon, 06 Feb 2023 23:34:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675755262; cv=none; d=google.com; s=arc-20160816; b=us1WKJimiiuPKZYFnc7rH5DZw8UJBGA3j6gQaMMz77uxe4Fv/v8AGV9Q14TKhRz4gQ LeGz0S5hDMWnQqgWkwP8JhX7oiw1m3OUoPkXaBmZpGCN66t5ynLYz7Np86+/kn/KF2pr U9xCa0ZfoOwDtImNCjkWc9/+UYZsb1OsT0FCQ5UVi0n+/dd4opznQqSkK90PCZ8GQgS+ 224GQa8PEJ3RZsG6htxgPvNJVYlxVfo91cAii2BkaLEC85t4RN5oBLihBYS2FXzI6bae Eqhz9rp5m+8kD9rJji0anNX0YQLfGlZhZ5OiPLzcDHG4C8xRB2zs32A4lbxaUIrUcPEZ YtEg== 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=t8iNxepBulbWBgnAjdjtTKND+wFOVAwDCXZSevLudto=; b=k2obMHPnZu5zVeA9SfPYI+tP/t+ENoUzDVnV2trPaqKEzjFAmZYbRaOheMHb7pFe4P ril+9BbbyGkSOel0FxAXkwjqAWMygiDA36ZBnSebvR7aF158VWe0gJne+5/YDSn66qvH l9hthLnWvHxWQJsoBMjjqEuTCu6zyVIEWD2jGKiYwgCHp9foRsKB9ZkpyJ7g4emr8qxh H22p/B+a62Zq7dAchQeGykIDNOMqE/07nPIEU83KahsX6lotGqmQpgoBtd/6dPu+NE6D VWcEJ2G8OZG1Q20x1f300UcJGACqM6xh6BWbFtzNU4LPz3KfWbCsijnhPlw8rXuXTxlO l+7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=Rq9h6mL+; 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 v18-20020a1709064e9200b00890ac0d6147si12360395eju.919.2023.02.06.23.33.59; Mon, 06 Feb 2023 23:34:22 -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=Rq9h6mL+; 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 S230235AbjBGH3b (ORCPT + 99 others); Tue, 7 Feb 2023 02:29:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230215AbjBGH3Z (ORCPT ); Tue, 7 Feb 2023 02:29:25 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9622036086 for ; Mon, 6 Feb 2023 23:29:23 -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 3CC2633AF4; Tue, 7 Feb 2023 07:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1675754962; 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=t8iNxepBulbWBgnAjdjtTKND+wFOVAwDCXZSevLudto=; b=Rq9h6mL+GTP/xnNyQnFdDsiIX+OQFnbl36tCwnJMdbwQvxr1N0kws9YN6BmImuHXn1JItC IIx/ndq4Q045WM2t2P6/NFeSRfczbTnJ7931JE1mX4jojk+bgyXvfiN5SHSH0NLWq0irZQ c21gnfbm/eoEHlaEEYJmvju92DYm1h4= 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 DBBD113A8C; Tue, 7 Feb 2023 07:29:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id tUFjNNH94WO+UQAAMHmgww (envelope-from ); Tue, 07 Feb 2023 07:29:21 +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 , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Subject: [PATCH 3/6] x86/mtrr: revert commit 90b926e68f50 Date: Tue, 7 Feb 2023 08:28:59 +0100 Message-Id: <20230207072902.5528-4-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?1757156750384219282?= X-GMAIL-MSGID: =?utf-8?q?1757156750384219282?= Commit 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case") has introduced a regression with Xen. Revert the patch. Signed-off-by: Juergen Gross --- arch/x86/mm/pat/memtype.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index 18f612b43763..2c6d95f95b49 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -387,8 +387,7 @@ static unsigned long pat_x_mtrr_type(u64 start, u64 end, u8 mtrr_type, uniform; mtrr_type = mtrr_type_lookup(start, end, &uniform); - if (mtrr_type != MTRR_TYPE_WRBACK && - mtrr_type != MTRR_TYPE_INVALID) + if (mtrr_type != MTRR_TYPE_WRBACK) return _PAGE_CACHE_MODE_UC_MINUS; return _PAGE_CACHE_MODE_WB;