Skip to contentSkip to conversation

x86: simplify HIGHMEM-related Kconfig entries

PATCH In review Jan Beulich 3 participants 8 messages Jan 14, 2009 – Jan 16, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: simplify HIGHMEM-related Kconfig entries

Additionally remove the dependency of X86_PAE on !HIGHMEM4G - at least I can't understand why that dependency existed.

---
 arch/x86/Kconfig |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/Kconfig +3 -3
@@ -896,8 +896,8 @@ config X86_CPUID
 
 choice
 	prompt "High Memory Support"
-	default HIGHMEM4G if !X86_NUMAQ
 	default HIGHMEM64G if X86_NUMAQ
+	default HIGHMEM4G
 	depends on X86_32
 
 config NOHIGHMEM
@@ -1004,7 +1004,7 @@ config HIGHMEM
 
 config X86_PAE
 	bool "PAE (Physical Address Extension) Support"
-	depends on X86_32 && !HIGHMEM4G
+	depends on X86_32
 	help
 	  PAE is required for NX support, and furthermore enables
 	  larger swapspace support for non-overcommit purposes. It
@@ -1147,7 +1147,7 @@ source "mm/Kconfig"
 
 config HIGHPTE
 	bool "Allocate 3rd-level pagetables from highmem"
-	depends on X86_32 && (HIGHMEM4G || HIGHMEM64G)
+	depends on HIGHMEM
 	help
 	  The VM uses one page table entry for each page of physical memory.
 	  For systems with a lot of RAM, this can be wasteful of precious
#1 lore raw
Quoted 2 lines · Jan Beulich

Additionally remove the dependency of X86_PAE on !HIGHMEM4G - at least I can't understand why that dependency existed.

At least originally, the meaning of the x86 highmem entries were:

No highmem - No highmem, no PAE
HIGHMEM4G - Highmem, no PAE
HIGHMEM64G - Highmem, PAE

So X86_PAE and HIGHMEM4G is a bit of a contradiction. I haven't looked at the logic in detail, or remember offhand if there have been any weakening of the definitions above; e.g. someone could have implemented a way to do PAE without highmem, to get access to the NX bits.

-hpa

#2 lore raw
Quoted 7 lines
Quoted 1 line
Quoted 1 line

"H. Peter Anvin" <[email protected]> 14.01.09 20:39 >>>

Quoted 2 lines · Jan Beulich

Additionally remove the dependency of X86_PAE on !HIGHMEM4G - at least I can't understand why that dependency existed.

At least originally, the meaning of the x86 highmem entries were:

Quoted 8 lines

No highmem - No highmem, no PAE
HIGHMEM4G - Highmem, no PAE
HIGHMEM64G - Highmem, PAE

So X86_PAE and HIGHMEM4G is a bit of a contradiction. I haven't looked at the logic in detail, or remember offhand if there have been any weakening of the definitions above; e.g. someone could have implemented a way to do PAE without highmem, to get access to the NX bits.

Exactly - .23 made PAE an independently selectable option (in particular, the no-highmem+PAE combination is now valid), but I can't see why it added the !HIGHMEM4G dependency.

Jan

#3 lore raw
Quoted 11 lines · Jan Beulich
Quoted 11 lines
Quoted 1 line
Quoted 1 line

"H. Peter Anvin" <[email protected]> 14.01.09 20:39 >>>

Quoted 2 lines · Jan Beulich

Additionally remove the dependency of X86_PAE on !HIGHMEM4G - at least I can't understand why that dependency existed.

At least originally, the meaning of the x86 highmem entries were:

No highmem - No highmem, no PAE
HIGHMEM4G - Highmem, no PAE
HIGHMEM64G - Highmem, PAE

Quoted 8 lines
Quoted 4 lines

So X86_PAE and HIGHMEM4G is a bit of a contradiction. I haven't looked at the logic in detail, or remember offhand if there have been any weakening of the definitions above; e.g. someone could have implemented a way to do PAE without highmem, to get access to the NX bits.

Exactly - .23 made PAE an independently selectable option (in particular, the no-highmem+PAE combination is now valid), but I can't see why it added the !HIGHMEM4G dependency.

There's no deep reason, it just has never really been tested that way. I think we should try it.

Ingo

#4 lore raw
Quoted 9 lines · Ingo Molnar
Quoted 9 lines
Quoted 9 lines

No highmem - No highmem, no PAE
HIGHMEM4G - Highmem, no PAE
HIGHMEM64G - Highmem, PAE

So X86_PAE and HIGHMEM4G is a bit of a contradiction. I haven't looked at the logic in detail, or remember offhand if there have been any weakening of the definitions above; e.g. someone could have implemented a way to do PAE without highmem, to get access to the NX bits.

Quoted 6 lines
Quoted 3 lines

Exactly - .23 made PAE an independently selectable option (in particular, the no-highmem+PAE combination is now valid), but I can't see why it added the !HIGHMEM4G dependency.

There's no deep reason, it just has never really been tested that way. I think we should try it.

If so, what would be the difference between HIGHMEM4G and HIGHMEM64G in that case at all?

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#5 lore raw
Quoted 15 lines
Quoted 1 line
Quoted 1 line

"H. Peter Anvin" <[email protected]> 15.01.09 18:10 >>>

Quoted 13 lines · Ingo Molnar
Quoted 12 lines
Quoted 9 lines

No highmem - No highmem, no PAE
HIGHMEM4G - Highmem, no PAE
HIGHMEM64G - Highmem, PAE

So X86_PAE and HIGHMEM4G is a bit of a contradiction. I haven't looked at the logic in detail, or remember offhand if there have been any weakening of the definitions above; e.g. someone could have implemented a way to do PAE without highmem, to get access to the NX bits.

Exactly - .23 made PAE an independently selectable option (in particular, the no-highmem+PAE combination is now valid), but I can't see why it added the !HIGHMEM4G dependency.

Quoted 5 lines
Quoted 2 lines

There's no deep reason, it just has never really been tested that way. I think we should try it.

If so, what would be the difference between HIGHMEM4G and HIGHMEM64G in that case at all?

For example being able to select the DMADEVICES config option.

Jan

#6 lore raw
Quoted 4 lines · Jan Beulich
Quoted 2 lines

If so, what would be the difference between HIGHMEM4G and HIGHMEM64G in that case at all?

For example being able to select the DMADEVICES config option.

WTF?! Why would DMA device support be banned on HIGHMEM64G? That makes no sense whatsoever...

-hpa

#7 lore raw
Quoted 8 lines · H. Peter Anvin
Quoted 4 lines · Jan Beulich
Quoted 2 lines

If so, what would be the difference between HIGHMEM4G and HIGHMEM64G in that case at all?

For example being able to select the DMADEVICES config option.

WTF?! Why would DMA device support be banned on HIGHMEM64G? That makes no sense whatsoever...

yes - but i guess the point is that there is some assymetry there which needs to be investigated and fixed.

Ingo