From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: lists@nerdbynature.de, mikelley@microsoft.com,
torvalds@linux-foundation.org, Juergen Gross <jgross@suse.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 3/6] x86/mtrr: revert commit 90b926e68f50
Date: Tue, 7 Feb 2023 08:28:59 +0100 [thread overview]
Message-ID: <20230207072902.5528-4-jgross@suse.com> (raw)
In-Reply-To: <20230207072902.5528-1-jgross@suse.com>
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 <jgross@suse.com>
---
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;
--
2.35.3
next prev parent reply other threads:[~2023-02-07 7:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 7:28 [PATCH 0/6] x86/mtrr: fix handling with PAT but without MTRR Juergen Gross
2023-02-07 7:28 ` [PATCH 1/6] x86/mtrr: make mtrr_enabled() non-static Juergen Gross
2023-02-07 7:28 ` [PATCH 2/6] x86/pat: check for MTRRs enabled in memtype_reserve() Juergen Gross
2023-02-07 8:49 ` Ingo Molnar
2023-02-07 9:12 ` Juergen Gross
2023-02-07 11:31 ` Borislav Petkov
2023-02-07 7:28 ` Juergen Gross [this message]
2023-02-07 7:29 ` [PATCH 4/6] x86/mtrr: don't let mtrr_type_lookup() return MTRR_TYPE_INVALID Juergen Gross
2023-02-07 16:20 ` Linus Torvalds
2023-02-08 6:20 ` Juergen Gross
2023-02-08 15:42 ` Linus Torvalds
2023-02-07 7:29 ` [PATCH 5/6] x86/mm: only check uniform after calling mtrr_type_lookup() Juergen Gross
2023-02-07 11:42 ` Borislav Petkov
2023-02-07 11:54 ` Juergen Gross
2023-02-07 12:21 ` Borislav Petkov
2023-02-08 1:13 ` Kani, Toshi
2023-02-07 7:29 ` [PATCH 6/6] x86/mtrr: drop sanity check in mtrr_type_lookup_fixed() Juergen Gross
2023-02-08 15:08 ` [PATCH 0/6] x86/mtrr: fix handling with PAT but without MTRR Michael Kelley (LINUX)
2023-02-08 15:19 ` Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230207072902.5528-4-jgross@suse.com \
--to=jgross@suse.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lists@nerdbynature.de \
--cc=luto@kernel.org \
--cc=mikelley@microsoft.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox