From patchwork Sat Feb 18 23:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 59052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp603812wrn; Sat, 18 Feb 2023 15:53:32 -0800 (PST) X-Google-Smtp-Source: AK7set998glvw4qBaNUjuDyrr97FD528ClF+PsDqCE3KmiHHAyJya8koI3NdffroCKhVXhgvZCaJ X-Received: by 2002:a17:907:2da8:b0:8b1:7274:1a72 with SMTP id gt40-20020a1709072da800b008b172741a72mr1859810ejc.6.1676764412759; Sat, 18 Feb 2023 15:53:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676764412; cv=none; d=google.com; s=arc-20160816; b=RiJmQkqK0lRRKnW6F72Dew+4rLnB6bcgcMhMV0xtXLicpQ9p2utMLXBBuH/Da5Nesp 4bAd0JhNFYW9EBwfN8SAQgbUD3h57o/VHmTpke9duQdiqnNpumM5LqdrYlVOdCxDWTMx uBsfFkWOqo6D+w4AkZC0LExnnTDb+B00iY+PULRsMXZaFwcqQlh/Rw2E+zRHSSQXyv8Z zZAp0dgAGKvf0TMbOgwTjQCSf3gpwIUKRRQ15M/XMeOc+RXqEaiMTg1xoHiafwQ9+KAT r3JMjlyV0eG9WRU3r+LMwI79aINQhV+gnbKANXxMfMB1TDzKw+CD5ac67C2xYWBXV30S 9ptg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:content-transfer-encoding :message-id:references:subject:cc:to:dkim-signature:dkim-signature :from; bh=ZfNxsI7L8MCxv+cU8Wm5VrQr4Yl+lq86a4e/TvMo7s8=; b=hqjKZWgkVGTqfgZzfcXESp9/sBjFtai5IHdZlt/DpJfmkOVJpFQt292+jLD613k3X7 8w4huEKvaiAog8DzGpFAwyx6w78AxvsPLl4rv5thY0ANovA7bMDfN/o0SHLuVAOTazjQ TMaN4+QuS00yglLIsMlNDdXAfw7W6e6m6CbD4oiQc/mI/RNJCdbGLsf+dPSJDqOK3XtO +n09b0VTJeEV4D+rjBSRok9OrVI9ggxXZv1jsmtrDHTXljD//TX7UzPoTzR+hb7JAPUu +YO6BqwP20IxI/lycdAMPGLNf80p8r6XsZmL3y6npC1+pjDe6Zl4madRURSDfdNtN4W5 7NKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YEjO+F9j; dkim=neutral (no key) header.i=@linutronix.de; 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=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 28-20020a170906029c00b008b17e88ee87si9666957ejf.537.2023.02.18.15.53.08; Sat, 18 Feb 2023 15:53:32 -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=@linutronix.de header.s=2020 header.b=YEjO+F9j; dkim=neutral (no key) header.i=@linutronix.de; 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=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbjBRXmf (ORCPT + 99 others); Sat, 18 Feb 2023 18:42:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbjBRXma (ORCPT ); Sat, 18 Feb 2023 18:42:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7034213DC1 for ; Sat, 18 Feb 2023 15:42:29 -0800 (PST) From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1676763747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=ZfNxsI7L8MCxv+cU8Wm5VrQr4Yl+lq86a4e/TvMo7s8=; b=YEjO+F9jV+WouyWEYIOdTnZSCBrQC0S9v4VgopnUa90uKEQorkF2s6VxUSS/pIeDE4wiHS aaf6CS3qLQcvvjIvKzNYv4igjpw9sZGXnC+75ToRnxbdsBqyDhhLr+TxwZwmW/80Kb1lM2 QCY0WaxfXJVDQVxvS8Y9Jcr2dIbaciYkD8cp17BWL9MZK45gfbjX2SWbaqVG9ghNL81JCj CtB7fwhxqPx2XbgLcK26RRWq2OFl/uiAXherhoTRnv0+1azApQqn1Ie+C5uExg0/dlKMvq cxppJKrj10lDoEILYWDKxQwPCWwbb2RiLakq2P1jaMs7aLYt6YNJTUVDvriu9g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1676763747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=ZfNxsI7L8MCxv+cU8Wm5VrQr4Yl+lq86a4e/TvMo7s8=; b=nrg2yKh6c+lOBcS4UsMfUzSWAkRjoo7b/FWeGpNWXknhCyntZNgsCg1HljNmKhiCGMR5+W Vh13pLoSENDUqBBQ== To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, x86@kernel.org Subject: [GIT pull] x86/urgent for v6.2 References: <167676366161.269954.1941292974323519398.tglx@xen13> Message-ID: <167676366450.269954.1214202439225962646.tglx@xen13> MIME-Version: 1.0 Date: Sun, 19 Feb 2023 00:42:26 +0100 (CET) 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?1758214921024916035?= X-GMAIL-MSGID: =?utf-8?q?1758214921024916035?= Linus, please pull the latest x86/urgent branch from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2023-02-19 up to: f9f57da2c2d1: x86/mtrr: Revert 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case") A single fix for x86: Revert the recent change to the MTRR code which aimed to support SEV-SNP guests on Hyper-V. It cuased a regression on XEN Dom0 kernels. The underlying issue of MTTR (mis)handling in the x86 code needs some deeper investigation and is definitely not 6.2 material. Thanks, tglx ------------------> Juergen Gross (1): x86/mtrr: Revert 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case") 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 fb4b1b5e0dea..46de9cf5c91d 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;