Skip to contentSkip to conversation

x86,apic: Use PAGE_SIZE instead of numbers

PATCH In review Cyrill Gorcunov 5 participants 8 messages Nov 8, 2009 – Nov 10, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86,apic: Use PAGE_SIZE instead of numbers

The whole page is reserved for IO-APIC fixmap due to non-cacheable requirement. So lets note this explicitly instead of playing with numbers.

CC Yinghai Lu <[email protected]>
CC "Maciej W. Rozycki" <[email protected]>

---

Perhaps I miss something and (4 * 1024) have some special meaning?

 arch/x86/kernel/apic/io_apic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
Index: linux-2.6.git/arch/x86/kernel/apic/io_apic.c
=====================================================================
@@ -4144,7 +4144,7 @@ fake_ioapic_page:
 		idx++;
 
 		ioapic_res->start = ioapic_phys;
-		ioapic_res->end = ioapic_phys + (4 * 1024) - 1;
+		ioapic_res->end = ioapic_phys + PAGE_SIZE - 1;
 		ioapic_res++;
 	}
 }
#1 lore raw

[tip:x86/apic] x86, apic: Use PAGE_SIZE instead of numbers

Commit-ID:  46dc281b1bb02527195fe2ad50a3af6d7f7f7325
Gitweb:     http://git.kernel.org/tip/46dc281b1bb02527195fe2ad50a3af6d7f7f7325
Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Sun, 8 Nov 2009 18:53:56 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 8 Nov 2009 17:06:22 +0100

x86, apic: Use PAGE_SIZE instead of numbers

The whole page is reserved for IO-APIC fixmap due to non-cacheable requirement. So lets note this explicitly instead of playing with numbers.

Cc Yinghai Lu <[email protected]>
Cc Maciej W. Rozycki <[email protected]>

LKML-Reference: <20091108155356.GB25940@lenovo>

---
 arch/x86/kernel/apic/io_apic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/apic/io_apic.c +1 -1
index 31e9db3..9ee1c16 100644
@@ -4111,7 +4111,7 @@ fake_ioapic_page:
 		idx++;
 
 		ioapic_res->start = ioapic_phys;
-		ioapic_res->end = ioapic_phys + (4 * 1024) - 1;
+		ioapic_res->end = ioapic_phys + PAGE_SIZE-1;
 		ioapic_res++;
 	}
 }
Acked-by on v1 1/1
#2 lore raw
In reply to Cyrill Gorcunov
Quoted 8 lines · Cyrill Gorcunov

The whole page is reserved for IO-APIC fixmap due to non-cacheable requirement. So lets note this explicitly instead of playing with numbers.

CC Yinghai Lu <[email protected]>
CC "Maciej W. Rozycki" <[email protected]>

---

Is PAGE_SIZE still always 4kB for the x86 these days? If so, then your
change makes sense to me.

Maciej

#3 lore raw

[Maciej W. Rozycki - Sun, Nov 08, 2009 at 05:28:05PM +0000]

| On Sun, 8 Nov 2009, Cyrill Gorcunov wrote:
| 
| > The whole page is reserved for IO-APIC fixmap
| > due to non-cacheable requirement. So lets note
| > this explicitly instead of playing with numbers.
| > 
| > CC: Yinghai Lu <[email protected]>
| > CC: "Maciej W. Rozycki" <[email protected]>
| > Signed-off-by: Cyrill Gorcunov <[email protected]>
| > ---
| 
| Acked-by: Maciej W. Rozycki <[email protected]>
| 
|  Is PAGE_SIZE still always 4kB for the x86 these days?  If so, then your 
| change makes sense to me.

Yeah, as far as I know. I didn't find any sign if we going to change PAGE_SHIFT.

| 
|   Maciej
| 

-- Cyrill

#4 lore raw
Quoted 17 lines · Cyrill Gorcunov

[Maciej W. Rozycki - Sun, Nov 08, 2009 at 05:28:05PM +0000]

| On Sun, 8 Nov 2009, Cyrill Gorcunov wrote:
| 
| > The whole page is reserved for IO-APIC fixmap
| > due to non-cacheable requirement. So lets note
| > this explicitly instead of playing with numbers.
| > 
| > CC: Yinghai Lu <[email protected]>
| > CC: "Maciej W. Rozycki" <[email protected]>
| > Signed-off-by: Cyrill Gorcunov <[email protected]>
| > ---
| 
| Acked-by: Maciej W. Rozycki <[email protected]>
| 
|  Is PAGE_SIZE still always 4kB for the x86 these days?  If so, then your 
| change makes sense to me.
Quoted 2 lines

Yeah, as far as I know. I didn't find any sign if we going to change PAGE_SHIFT.

Not in the next 10-20 years or so. (and any prediction beyond that is pointless i suspect)

Ingo

#5 lore raw
In reply to Cyrill Gorcunov
Quoted 20 lines · Cyrill Gorcunov

The whole page is reserved for IO-APIC fixmap due to non-cacheable requirement. So lets note this explicitly instead of playing with numbers.

CC Yinghai Lu <[email protected]>
CC "Maciej W. Rozycki" <[email protected]>

---

Perhaps I miss something and (4 * 1024) have some special meaning?

 arch/x86/kernel/apic/io_apic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.git/arch/x86/kernel/apic/io_apic.c
=====================================================================

arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4150

Quoted 8 lines
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -4144,7 +4144,7 @@ fake_ioapic_page:
 		idx++;
 
 		ioapic_res->start = ioapic_phys;
-		ioapic_res->end = ioapic_phys + (4 * 1024) - 1;
+		ioapic_res->end = ioapic_phys + PAGE_SIZE - 1;
 		ioapic_res++;
 	}
 }

In theory we could have more than one ioapic packed into a single page, and it is also entirely plausible we'll support other page sizes in x86 at some point. However, it's probably easier to flag something as PAGE_SIZE and have to fix it up later than have magic constants, so I think it's probably the right thing to do.

-hpa

#6 lore raw
Quoted 5 lines · H. Peter Anvin

In theory we could have more than one ioapic packed into a single page, and it is also entirely plausible we'll support other page sizes in x86 at some point. However, it's probably easier to flag something as PAGE_SIZE and have to fix it up later than have magic constants, so I think it's probably the right thing to do.

Hmm, the MPS said in Chapter 3.6.5 "APIC Memory Mapping":

"Non-default APIC base addresses can be used if the MP configuration
table is provided. (Refer to Chapter 4.) However, the local APIC base address must be aligned on a 4K boundary, and the I/O APIC base address must be aligned on a 1K boundary."

This probably still stands; I suppose it would be safer to define IOAPIC_SLOT_SIZE to 1024 and use it by default, expanding all reservations as needed where less than PAGE_SIZE / IOAPIC_SLOT_SIZE I/O APICs would be mapped in a page. This is relatively recent a piece of code -- how much has it been tested?

Well, actually not much as a quick search has revealed this message:

http://marc.info/?l=linux-kernel&m=118114792006520

which shows page alignment of I/O APICs clearly does not stand, and moreover there are two pairs of I/O APIC in the system reported which share a page each. In this case the ranges requested do not make sense and some resource insertions will silently fail. And also while page aliases created in fixmaps here should not harm, they make me feel a little bit chilly...

Overall this piece of code needs an overhaul, fixing resource allocation
and reusing fixmaps where possible.

Maciej

#7 lore raw
Quoted 10 lines · Maciej W. Rozycki
Quoted 5 lines · H. Peter Anvin

In theory we could have more than one ioapic packed into a single page, and it is also entirely plausible we'll support other page sizes in x86 at some point. However, it's probably easier to flag something as PAGE_SIZE and have to fix it up later than have magic constants, so I think it's probably the right thing to do.

Hmm, the MPS said in Chapter 3.6.5 "APIC Memory Mapping":

Quoted 8 lines

"Non-default APIC base addresses can be used if the MP configuration
table is provided. (Refer to Chapter 4.) However, the local APIC base address must be aligned on a 4K boundary, and the I/O APIC base address must be aligned on a 1K boundary."

This probably still stands; I suppose it would be safer to define IOAPIC_SLOT_SIZE to 1024 and use it by default, expanding all reservations as needed where less than PAGE_SIZE / IOAPIC_SLOT_SIZE I/O APICs would be

yes, it would be even more clear, i'll take care

Quoted 14 lines

mapped in a page. This is relatively recent a piece of code -- how much has it been tested?

Well, actually not much as a quick search has revealed this message:

http://marc.info/?l=linux-kernel&m=118114792006520

which shows page alignment of I/O APICs clearly does not stand, and moreover there are two pairs of I/O APIC in the system reported which share a page each. In this case the ranges requested do not make sense and some resource insertions will silently fail. And also while page aliases created in fixmaps here should not harm, they make me feel a little bit chilly...

Quoted 2 lines

Overall this piece of code needs an overhaul, fixing resource allocation
and reusing fixmaps where possible.

Ok

Quoted 3 lines

Maciej

thanks, Peter, Maciej for comments!
I must admit (to be fair) i was concerning about fixmap itself so that forgot about 1k alignment requirement :/ Will fix.