1. Patchew
  2. linux
  3. View series

[tip: x86/urgent] x86/mtrr: Revert 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case")

tip-bot2 for Juergen Gross posted 1 patch 2 years, 6 months ago 
arch/x86/mm/pat/memtype.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[tip: x86/urgent] x86/mtrr: Revert 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case")
Posted by tip-bot2 for Juergen Gross 2 years, 6 months ago 
The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     f9f57da2c2d119dbf109e3f6e1ceab7659294046
Gitweb:        https://git.kernel.org/tip/f9f57da2c2d119dbf109e3f6e1ceab7659294046
Author:        Juergen Gross <jgross@suse.com>
AuthorDate:    Thu, 09 Feb 2023 08:22:17 +01:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 14 Feb 2023 10:16:34 +01:00

x86/mtrr: Revert 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case")

Commit

  90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case")

broke the use case of running Xen dom0 kernels on machines with an
external disk enclosure attached via USB, see Link tag.

What this commit was originally fixing - SEV-SNP guests on Hyper-V - is
a more specialized situation which has other issues at the moment anyway
so reverting this now and addressing the issue properly later is the
prudent thing to do.

So revert it in time for the 6.2 proper release.

  [ bp: Rewrite commit message. ]

Reported-by: Christian Kujau <lists@nerdbynature.de>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/4fe9541e-4d4c-2b2a-f8c8-2d34a7284930@nerdbynature.de
---
 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 fb4b1b5..46de9cf 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;
Re: [tip: x86/urgent] x86/mtrr: Revert 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case")
Posted by Christian Kujau 2 years, 6 months ago 
On Tue, 14 Feb 2023, tip-bot2 for Juergen Gross wrote:
> The following commit has been merged into the x86/urgent branch of tip:

Sorry for being dense but I couldn't figure this out from the tip tree 
handbook[0]: will this be included in 6.2 or has this ship sailed? If so, 
I'll start bugging the Alpine folks to maybe carry this around until the 
next release.

Thanks,
Christian.

[0] https://www.kernel.org/doc/html/latest/process/maintainer-tip.html

> 
> Commit-ID:     f9f57da2c2d119dbf109e3f6e1ceab7659294046
> Gitweb:        https://git.kernel.org/tip/f9f57da2c2d119dbf109e3f6e1ceab7659294046
> Author:        Juergen Gross <jgross@suse.com>
> AuthorDate:    Thu, 09 Feb 2023 08:22:17 +01:00
> Committer:     Borislav Petkov (AMD) <bp@alien8.de>
> CommitterDate: Tue, 14 Feb 2023 10:16:34 +01:00
> 
> x86/mtrr: Revert 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case")
> 
> Commit
> 
>   90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case")
> 
> broke the use case of running Xen dom0 kernels on machines with an
> external disk enclosure attached via USB, see Link tag.
> 
> What this commit was originally fixing - SEV-SNP guests on Hyper-V - is
> a more specialized situation which has other issues at the moment anyway
> so reverting this now and addressing the issue properly later is the
> prudent thing to do.
> 
> So revert it in time for the 6.2 proper release.
> 
>   [ bp: Rewrite commit message. ]
> 
> Reported-by: Christian Kujau <lists@nerdbynature.de>
> Tested-by: Christian Kujau <lists@nerdbynature.de>
> Signed-off-by: Juergen Gross <jgross@suse.com>
> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
> Link: https://lore.kernel.org/r/4fe9541e-4d4c-2b2a-f8c8-2d34a7284930@nerdbynature.de
> ---
>  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 fb4b1b5..46de9cf 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;
> 

-- 
BOFH excuse #155:

Dumb terminal
Re: [tip: x86/urgent] x86/mtrr: Revert 90b926e68f50 ("x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case")
Posted by Borislav Petkov 2 years, 6 months ago 
On Sat, Feb 18, 2023 at 10:47:46AM +0100, Christian Kujau wrote:
> Sorry for being dense but I couldn't figure this out from the tip tree 
> handbook[0]: will this be included in 6.2 or has this ship sailed?

Yes, it will. Urgent branches go usually to Linus in the current
stabilization phase. If you wanna do a patch for the handbook to fix
that shortcoming, I'll take it.

:-)

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
[tip: x86/cleanups] Documentation/process: Explain when tip branches get merged into mainline
Posted by tip-bot2 for Christian Kujau 2 years, 3 months ago 
The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     4f1192559707eaa7adef307f5b9ad3a444b248f8
Gitweb:        https://git.kernel.org/tip/4f1192559707eaa7adef307f5b9ad3a444b248f8
Author:        Christian Kujau <lists@nerdbynature.de>
AuthorDate:    Sat, 18 Feb 2023 22:29:44 +01:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 15 May 2023 17:11:28 +02:00

Documentation/process: Explain when tip branches get merged into mainline

Explain when tip branches get merged into mainline.

Suggested-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Christian Kujau <lists@nerdbynature.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/8a1fd8b7-9fe3-b2b5-406e-fa6f5e03e7c0@nerdbynature.de
---
 Documentation/process/maintainer-tip.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/process/maintainer-tip.rst b/Documentation/process/maintainer-tip.rst
index 178c95f..93d8a79 100644
--- a/Documentation/process/maintainer-tip.rst
+++ b/Documentation/process/maintainer-tip.rst
@@ -421,6 +421,9 @@ allowing themselves a breath. Please respect that.
 The release candidate -rc1 is the starting point for new patches to be
 applied which are targeted for the next merge window.
 
+So called _urgent_ branches will be merged into mainline during the
+stabilization phase of each release.
+
 
 Git
 ^^^
[tip: x86/cleanups] Documentation/process: Explain when tip branches get merged into mainline
Posted by tip-bot2 for Christian Kujau 2 years, 4 months ago 
The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     cb5d28c01b2d56700e1656cd6c3742b40e840bf9
Gitweb:        https://git.kernel.org/tip/cb5d28c01b2d56700e1656cd6c3742b40e840bf9
Author:        Christian Kujau <lists@nerdbynature.de>
AuthorDate:    Sat, 18 Feb 2023 22:29:44 +01:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 08 May 2023 15:35:00 +02:00

Documentation/process: Explain when tip branches get merged into mainline

Explain when tip branches get merged into mainline.

Suggested-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Christian Kujau <lists@nerdbynature.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/8a1fd8b7-9fe3-b2b5-406e-fa6f5e03e7c0@nerdbynature.de
---
 Documentation/process/maintainer-tip.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/process/maintainer-tip.rst b/Documentation/process/maintainer-tip.rst
index 178c95f..93d8a79 100644
--- a/Documentation/process/maintainer-tip.rst
+++ b/Documentation/process/maintainer-tip.rst
@@ -421,6 +421,9 @@ allowing themselves a breath. Please respect that.
 The release candidate -rc1 is the starting point for new patches to be
 applied which are targeted for the next merge window.
 
+So called _urgent_ branches will be merged into mainline during the
+stabilization phase of each release.
+
 
 Git
 ^^^

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.