x86: make sure IDT is page aligned
PATCH v5 1/1 x86: make sure IDT is page aligned
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other *_idt_table variables into common locations.
This avoids the risk of the IDT ever being moved in the bss and having the mapping be offset, resulting in calling incorrect handlers. In the current upstream kernel this is not a manifested bug, but heavily patched kernels (such as those using the PaX patch series) did encounter this bug.
---
v5:
- add comments to all IDTs about alignment reasoning, suggested by Linus
v4:
- rework using __page_aligned_bss, suggested by Yinghai LU
- move all the other IDT variables as well, suggested by HPA
v3:
- merge 32-bit and 64-bit idt_table definition
v2:
- 32-bit was already aligned
--- arch/x86/kernel/head_64.S | 15 --------------- arch/x86/kernel/tracepoint.c | 6 ++---- arch/x86/kernel/traps.c | 12 ++++++------ 3 files changed, 8 insertions(+), 25 deletions(-)
arch/x86/kernel/head_64.S +0 -15
@@ -512,21 +512,6 @@ ENTRY(phys_base) #include "../../x86/xen/xen-head.S" - .section .bss, "aw", @nobits - .align L1_CACHE_BYTES -ENTRY(idt_table) - .skip IDT_ENTRIES * 16 - - .align L1_CACHE_BYTES -ENTRY(debug_idt_table) - .skip IDT_ENTRIES * 16 - -#ifdef CONFIG_TRACING - .align L1_CACHE_BYTES -ENTRY(trace_idt_table) - .skip IDT_ENTRIES * 16 -#endif - __PAGE_ALIGNED_BSS NEXT_PAGE(empty_zero_page) .skip PAGE_SIZE
arch/x86/kernel/tracepoint.c +2 -4
@@ -12,10 +12,8 @@ atomic_t trace_idt_ctr = ATOMIC_INIT(0);struct desc_ptr trace_idt_descr = {NR_VECTORS *16 -1 , (unsigned long ) trace_idt_table }; -#ifndef CONFIG_X86_64 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_data - = { { { {0 ,0 } } }, }; -#endif +/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;static int trace_irq_vector_refcount;static DEFINE_MUTEX (irq_vector_mutex);
arch/x86/kernel/traps.c +6 -6
@@ -63,19 +63,19 @@#include <asm/x86_init.h> #include <asm/pgalloc.h> #include <asm/proto.h> + +/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;#else #include <asm/processor-flags.h> #include <asm/setup.h> asmlinkage int system_call(void); - -/* -* The IDT has to be page-aligned to simplify the Pentium -* F0 0F bug workaround. -*/ -gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };#endif +/* Must be page-aligned because the real IDT is used in a fixmap. */ +gate_desc idt_table[NR_VECTORS] __page_aligned_bss; +DECLARE_BITMAP (used_vectors,NR_VECTORS );EXPORT_SYMBOL_GPL (used_vectors);
Signature · 6 lines
1.7.9.5 -- Kees Cook Chrome OS Security
Quoted 5 lines · Kees Cook
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other
*_idt_tablevariables into common locations.
Quoted 7 lines
This avoids the risk of the IDT ever being moved in the bss and having the mapping be offset, resulting in calling incorrect handlers. In the current upstream kernel this is not a manifested bug, but heavily patched kernels (such as those using the PaX patch series) did encounter this bug.
Signed-off-by Kees Cook <[email protected]>Reported-by PaX Team <[email protected]>
I like it just because it removes those nasty #ifdef blocks for x86_64 or not.
-- Steve
Quoted 93 lines
---
v5:
- add comments to all IDTs about alignment reasoning, suggested by Linus
v4:
- rework using__page_aligned_bss, suggested by Yinghai LU
- move all the other IDT variables as well, suggested by HPA
v3:
- merge 32-bit and 64-bitidt_tabledefinition
v2:
- 32-bit was already aligned--- arch/x86/kernel/head_64.S | 15 --------------- arch/x86/kernel/tracepoint.c | 6 ++---- arch/x86/kernel/traps.c | 12 ++++++------ 3 files changed, 8 insertions(+), 25 deletions(-)arch/x86/kernel/head_64.S +0
-15@@ -512,21 +512,6 @@ ENTRY(phys_base) #include "../../x86/xen/xen-head.S" - .section .bss, "aw", @nobits - .align L1_CACHE_BYTES -ENTRY(idt_table) - .skip IDT_ENTRIES * 16 - - .align L1_CACHE_BYTES -ENTRY(debug_idt_table) - .skip IDT_ENTRIES * 16 - -#ifdef CONFIG_TRACING - .align L1_CACHE_BYTES -ENTRY(trace_idt_table) - .skip IDT_ENTRIES * 16 -#endif - __PAGE_ALIGNED_BSS NEXT_PAGE(empty_zero_page) .skip PAGE_SIZEarch/x86/kernel/tracepoint.c +2
-4@@ -12,10 +12,8 @@ atomic_t trace_idt_ctr = ATOMIC_INIT(0);struct desc_ptr trace_idt_descr = {NR_VECTORS *16 -1 , (unsigned long ) trace_idt_table }; -#ifndef CONFIG_X86_64 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_data - = { { { {0 ,0 } } }, }; -#endif +/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;static int trace_irq_vector_refcount;static DEFINE_MUTEX (irq_vector_mutex);arch/x86/kernel/traps.c +6
-6@@ -63,19 +63,19 @@#include <asm/x86_init.h> #include <asm/pgalloc.h> #include <asm/proto.h> + +/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;#else #include <asm/processor-flags.h> #include <asm/setup.h> asmlinkage int system_call(void); - -/* -* The IDT has to be page-aligned to simplify the Pentium -* F0 0F bug workaround. -*/ -gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };#endif +/* Must be page-aligned because the real IDT is used in a fixmap. */ +gate_desc idt_table[NR_VECTORS] __page_aligned_bss; +DECLARE_BITMAP (used_vectors,NR_VECTORS );EXPORT_SYMBOL_GPL (used_vectors);Signature · 1 line
1.7.9.5
Quoted 10 lines · Kees Cook
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other
*_idt_tablevariables into common locations.This avoids the risk of the IDT ever being moved in the bss and having the mapping be offset, resulting in calling incorrect handlers. In the current upstream kernel this is not a manifested bug, but heavily patched kernels (such as those using the PaX patch series) did encounter this bug.
Quoted 5 lines
Signed-off-by Kees Cook <[email protected]>Reported-by PaX Team <[email protected]>---
v5:
- add comments to all IDTs about alignment reasoning, suggested by Linus
Where is thread for that?
Quoted 44 lines
v4:
- rework using__page_aligned_bss, suggested by Yinghai LU
- move all the other IDT variables as well, suggested by HPA
v3:
- merge 32-bit and 64-bitidt_tabledefinition
v2:
- 32-bit was already aligned--- arch/x86/kernel/head_64.S | 15 --------------- arch/x86/kernel/tracepoint.c | 6 ++---- arch/x86/kernel/traps.c | 12 ++++++------ 3 files changed, 8 insertions(+), 25 deletions(-)arch/x86/kernel/head_64.S +0
-15@@ -512,21 +512,6 @@ ENTRY(phys_base) #include "../../x86/xen/xen-head.S" - .section .bss, "aw", @nobits - .align L1_CACHE_BYTES -ENTRY(idt_table) - .skip IDT_ENTRIES * 16 - - .align L1_CACHE_BYTES -ENTRY(debug_idt_table) - .skip IDT_ENTRIES * 16 - -#ifdef CONFIG_TRACING - .align L1_CACHE_BYTES -ENTRY(trace_idt_table) - .skip IDT_ENTRIES * 16 -#endif - __PAGE_ALIGNED_BSS NEXT_PAGE(empty_zero_page) .skip PAGE_SIZEarch/x86/kernel/tracepoint.c +0
-0
arch/x86/kernel/tracepoint.c atomic_t trace_idt_ctr = ATOMIC_INIT(0); · line 16
Quoted 9 lines
arch/x86/kernel/tracepoint.c +2
-4@@ -12,10 +12,8 @@ atomic_t trace_idt_ctr = ATOMIC_INIT(0);struct desc_ptr trace_idt_descr = {NR_VECTORS *16 -1 , (unsigned long ) trace_idt_table }; -#ifndef CONFIG_X86_64 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_data - = { { { {0 ,0 } } }, }; -#endif +/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
in that case why not add __cacheline_aligned_bss?
Yinghai
Quoted 11 lines · Yinghai Lu
Quoted 10 lines · Kees Cook
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other
*_idt_tablevariables into common locations.This avoids the risk of the IDT ever being moved in the bss and having the mapping be offset, resulting in calling incorrect handlers. In the current upstream kernel this is not a manifested bug, but heavily patched kernels (such as those using the PaX patch series) did encounter this bug.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Kees Cook <[email protected]>Reported-by PaX Team <[email protected]>---
v5:
- add comments to all IDTs about alignment reasoning, suggested by LinusWhere is thread for that?
That was off list, part of trying to coordinate this cleanup vs minimal changes for the stable tree.
Quoted 47 lines
Quoted 47 lines
v4:
- rework using__page_aligned_bss, suggested by Yinghai LU
- move all the other IDT variables as well, suggested by HPA
v3:
- merge 32-bit and 64-bitidt_tabledefinition
v2:
- 32-bit was already aligned--- arch/x86/kernel/head_64.S | 15 --------------- arch/x86/kernel/tracepoint.c | 6 ++---- arch/x86/kernel/traps.c | 12 ++++++------ 3 files changed, 8 insertions(+), 25 deletions(-)arch/x86/kernel/head_64.S +0
-15@@ -512,21 +512,6 @@ ENTRY(phys_base) #include "../../x86/xen/xen-head.S" - .section .bss, "aw", @nobits - .align L1_CACHE_BYTES -ENTRY(idt_table) - .skip IDT_ENTRIES * 16 - - .align L1_CACHE_BYTES -ENTRY(debug_idt_table) - .skip IDT_ENTRIES * 16 - -#ifdef CONFIG_TRACING - .align L1_CACHE_BYTES -ENTRY(trace_idt_table) - .skip IDT_ENTRIES * 16 -#endif - __PAGE_ALIGNED_BSS NEXT_PAGE(empty_zero_page) .skip PAGE_SIZEarch/x86/kernel/tracepoint.c +0
-0@@ -12,10 +12,8 @@ atomic_t trace_idt_ctr = ATOMIC_INIT(0);struct desc_ptr trace_idt_descr = {NR_VECTORS *16 -1 , (unsigned long ) trace_idt_table };
Quoted 8 lines
arch/x86/kernel/tracepoint.c atomic_t trace_idt_ctr = ATOMIC_INIT(0); · line 16
Quoted 6 lines
arch/x86/kernel/tracepoint.c +2
-4-#ifndef CONFIG_X86_64 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_data - = { { { {0 ,0 } } }, }; -#endif +/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;in that case why not add
__cacheline_aligned_bss?
It seemed more correct to me to define all the IDTs the same, but there was no technical reason for that, just one of regularity. I only care about keeping the real IDT page aligned. :) I'm fine to do whatever is deemed "correct". :)
-Kees
--
Kees Cook
Chrome OS Security
Quoted 8 lines · Kees Cook
Quoted 6 lines · Yinghai Lu
Quoted 5 lines · Kees Cook
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other
*_idt_tablevariables into common locations.
Quoted 4 lines
It seemed more correct to me to define all the IDTs the same, but there was no technical reason for that, just one of regularity. I only care about keeping the real IDT page aligned. :) I'm fine to do whatever is deemed "correct". :)
I'm actually unfamiliar with the F00F bug (heard of it, but have no idea what it is). What happens if the F00F bug exists and we switch to an IDT that's not paged aligned? Is that an issue?
-- Steve
H. Peter Anvin
reviewerThe F00F big just means the IDT must be readonly.
Quoted 27 lines · Steven Rostedt
Quoted 1 line · Kees Cook
On Tue, Jul 16, 2013 at 1:21 PM, Yinghai Lu <[email protected]>
Quoted 1 line · wrote:
Quoted 1 line
On Tue, Jul 16, 2013 at 11:34 AM, Kees Cook <[email protected]>
Quoted 1 line · wrote:
Quoted 1 line
Quoted 1 line
Since the IDT is referenced from a fixmap, make sure it is page
aligned.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Merge with 32-bit one, since it was already aligned to deal with
F00F
Quoted 1 line
Quoted 1 line
Quoted 1 line
bug. Since bss is cleared before IDT setup, it can live there.
This also
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
moves the other
*_idt_tablevariables into common locations.It seemed more correct to me to define all the IDTs the same, but there was no technical reason for that, just one of regularity. I
only
Quoted 2 lines
care about keeping the real IDT page aligned. :) I'm fine to do whatever is deemed "correct". :)
I'm actually unfamiliar with the F00F bug (heard of it, but have no idea
what it is). What happens if the F00F bug exists and we switch to an IDT
that's not paged aligned? Is that an issue?-- Steve
Signature · 1 line
Sent from my mobile phone. Please excuse brevity and lack of formatting.
Quoted 9 lines · Steven Rostedt
Quoted 7 lines · Kees Cook
Quoted 6 lines · Yinghai Lu
Quoted 5 lines · Kees Cook
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other
*_idt_tablevariables into common locations.
Quoted 8 lines
Quoted 4 lines
It seemed more correct to me to define all the IDTs the same, but there was no technical reason for that, just one of regularity. I only care about keeping the real IDT page aligned. :) I'm fine to do whatever is deemed "correct". :)
I'm actually unfamiliar with the F00F bug (heard of it, but have no idea what it is). What happens if the F00F bug exists and we switch to an IDT that's not paged aligned? Is that an issue?
Regardless of F00F, the IDT is now unconditionally being set up in a fixmap entry (so that the unprivileged "sidt" instruction won't leak a "real" kernel address, and so that this exposed address is read-only). If the real IDT is not page aligned, the fixmap IDT will appear offset and everything starts calling the wrong handlers.
The other IDTs don't need to be page aligned, but I marked them that way in the clean up because it seemed sensible to define these tables similarly. I can change the others to be __cacheline_aligned_bss if that's desired.
-Kees
--
Kees Cook
Chrome OS Security
H. Peter Anvin
reviewerQuoted 25 lines · Kees Cook
Quoted 9 lines · Steven Rostedt
Quoted 7 lines · Kees Cook
Quoted 6 lines · Yinghai Lu
Quoted 5 lines · Kees Cook
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other
*_idt_tablevariables into common locations.Quoted 8 lines
Quoted 4 lines
It seemed more correct to me to define all the IDTs the same, but there was no technical reason for that, just one of regularity. I only care about keeping the real IDT page aligned. :) I'm fine to do whatever is deemed "correct". :)
I'm actually unfamiliar with the F00F bug (heard of it, but have no idea what it is). What happens if the F00F bug exists and we switch to an IDT that's not paged aligned? Is that an issue?
Regardless of F00F, the IDT is now unconditionally being set up in a fixmap entry (so that the unprivileged "sidt" instruction won't leak a "real" kernel address, and so that this exposed address is read-only). If the real IDT is not page aligned, the fixmap IDT will appear offset and everything starts calling the wrong handlers.
Quoted 5 lines
The other IDTs don't need to be page aligned, but I marked them that way in the clean up because it seemed sensible to define these tables similarly. I can change the others to be
__cacheline_aligned_bssif that's desired.
I'm fine keeping them as page aligned. They are page-sized on x86-64 anyway (half page on i386).
-hpa
Quoted 10 lines · H. Peter Anvin
Quoted 5 lines · Kees Cook
The other IDTs don't need to be page aligned, but I marked them that way in the clean up because it seemed sensible to define these tables similarly. I can change the others to be
__cacheline_aligned_bssif that's desired.I'm fine keeping them as page aligned. They are page-sized on x86-64 anyway (half page on i386).
ok, then should change
arch/x86/kernel/tracepoint.c atomic_t trace_idt_ctr = ATOMIC_INIT(0); · line 16
Quoted 2 lines
arch/x86/kernel/tracepoint.c +2
-0+/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
==>
Quoted 2 lines
(quoted diff) +2
-0+/* Only need to be cacheline aligned, but keep all IDTs defined the same way to be page aligned. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
H. Peter Anvin
reviewerQuoted 10 lines · Yinghai Lu
ok, then should change
Review
Quoted 2 lines
(quoted diff) +2
-0+/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;==>
Review
Quoted 2 lines
(quoted diff) +2
-0+/* Only need to be cacheline aligned, but keep all IDTs defined the same way to be page aligned. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
It doesn't need to be cacheline aligned, either, to the best of my knowledge. The former comment is more correct.
-hpa
Quoted 9 lines · H. Peter Anvin
Quoted 8 lines · Yinghai Lu
ok, then should change
Review
Quoted 2 lines
(quoted diff) +2
-0+/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;==>
Quoted 5 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+/* Only need to be cacheline aligned, but keep all IDTs defined the same way to be page aligned. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;It doesn't need to be cacheline aligned, either, to the best of my knowledge. The former comment is more correct.
ok. so the old code is just for optimization to keep it cacheline aligned?
H. Peter Anvin
reviewerQuoted 3 lines · Yinghai Lu
ok. so the old code is just for optimization to keep it cacheline aligned?
To the best of my knowledge. I guess I should look through the git log to make sure it isn't some old erratum fix.
-hpa
Quoted 8 lines · H. Peter Anvin
Quoted 3 lines · Yinghai Lu
ok. so the old code is just for optimization to keep it cacheline aligned?
To the best of my knowledge. I guess I should look through the git log to make sure it isn't some old erratum fix.
looks like before
commit e57113bc1ff591005ec0b0fb4885d97c01de73d8
Author: Jan Beulich <[email protected]> Date: Sat Mar 25 16:30:01 2006 +0100
[PATCH] x86_64: miscellaneous cleanup
- adjust limits of GDT/IDT pseudo-descriptors (some were off by one)
- move empty_zero_page into .bss.page_aligned
- move cpu_gdt_table into .data.page_aligned
- move idt_table into .bss
- align inital_code and init_rsp
- eliminate pointless (re-)declaration of idt_table in traps.c
it is PAGE aligned as it is after gdt page, after the commit, it is cacheline aligned.
@@ -378,9 +378,12 @@ gdt_end:
/* zero the remaining page */
.fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0-ENTRY(idt_table)
- .rept 256 - .quad 0 - .quad 0 - .endr + .section .bss, "aw", @nobits + .align L1_CACHE_BYTES
+ENTRY(idt_table)
+ .skip 256 * 16
+ .section .bss.page_aligned, "aw", @nobits
+ .align PAGE_SIZE
+ENTRY(empty_zero_page)
+ .skip PAGE_SIZE
tip-bot for Kees Cook
merge bot[tip:x86/urgent] x86: Make sure IDT is page aligned
In reply to Kees Cookx86: Make sure IDT is page aligned
Commit-ID: 4df05f361937ee86e5a8c9ead8aeb6a19ea9b7d7 Gitweb: http://git.kernel.org/tip/4df05f361937ee86e5a8c9ead8aeb6a19ea9b7d7 Author: Kees Cook <[email protected]> AuthorDate: Tue, 16 Jul 2013 11:34:41 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Tue, 16 Jul 2013 15:14:48 -0700
x86: Make sure IDT is page aligned
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other *_idt_table variables into common locations.
This avoids the risk of the IDT ever being moved in the bss and having the mapping be offset, resulting in calling incorrect handlers. In the current upstream kernel this is not a manifested bug, but heavily patched kernels (such as those using the PaX patch series) did encounter this bug.
The tables other than idt_table technically do not need to be page aligned, at least not at the current time, but using a common declaration avoids mistakes. On 64 bits the table is exactly one page long, anyway.
--- arch/x86/kernel/head_64.S | 15 --------------- arch/x86/kernel/tracepoint.c | 6 ++---- arch/x86/kernel/traps.c | 12 ++++++------ 3 files changed, 8 insertions(+), 25 deletions(-)
arch/x86/kernel/head_64.S +0 -15
@@ -512,21 +512,6 @@ ENTRY(phys_base) #include "../../x86/xen/xen-head.S" - .section .bss, "aw", @nobits - .align L1_CACHE_BYTES -ENTRY(idt_table) - .skip IDT_ENTRIES * 16 - - .align L1_CACHE_BYTES -ENTRY(debug_idt_table) - .skip IDT_ENTRIES * 16 - -#ifdef CONFIG_TRACING - .align L1_CACHE_BYTES -ENTRY(trace_idt_table) - .skip IDT_ENTRIES * 16 -#endif - __PAGE_ALIGNED_BSS NEXT_PAGE(empty_zero_page) .skip PAGE_SIZE
arch/x86/kernel/tracepoint.c +2 -4
@@ -12,10 +12,8 @@ atomic_t trace_idt_ctr = ATOMIC_INIT(0);struct desc_ptr trace_idt_descr = {NR_VECTORS *16 -1 , (unsigned long ) trace_idt_table }; -#ifndef CONFIG_X86_64 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_data - = { { { {0 ,0 } } }, }; -#endif +/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;static int trace_irq_vector_refcount;static DEFINE_MUTEX (irq_vector_mutex);
arch/x86/kernel/traps.c +6 -6
@@ -63,19 +63,19 @@#include <asm/x86_init.h> #include <asm/pgalloc.h> #include <asm/proto.h> + +/* No need to be aligned, but done to keep all IDTs defined the same way. */ +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;#else #include <asm/processor-flags.h> #include <asm/setup.h> asmlinkage int system_call(void); - -/* -* The IDT has to be page-aligned to simplify the Pentium -* F0 0F bug workaround. -*/ -gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };#endif +/* Must be page-aligned because the real IDT is used in a fixmap. */ +gate_desc idt_table[NR_VECTORS] __page_aligned_bss; +DECLARE_BITMAP (used_vectors,NR_VECTORS );EXPORT_SYMBOL_GPL (used_vectors);
Re: [tip:x86/urgent] x86: Make sure IDT is page aligned
Quoted 24 lines · tip-bot for Kees Cook
Commit-ID: 4df05f361937ee86e5a8c9ead8aeb6a19ea9b7d7 Gitweb: http://git.kernel.org/tip/4df05f361937ee86e5a8c9ead8aeb6a19ea9b7d7 Author: Kees Cook <[email protected]> AuthorDate: Tue, 16 Jul 2013 11:34:41 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Tue, 16 Jul 2013 15:14:48 -0700x86: Make sure IDT is page aligned
Since the IDT is referenced from a fixmap, make sure it is page aligned. Merge with 32-bit one, since it was already aligned to deal with F00F bug. Since bss is cleared before IDT setup, it can live there. This also moves the other
*_idt_tablevariables into common locations.This avoids the risk of the IDT ever being moved in the bss and having the mapping be offset, resulting in calling incorrect handlers. In the current upstream kernel this is not a manifested bug, but heavily patched kernels (such as those using the PaX patch series) did encounter this bug.
The tables other than
idt_tabletechnically do not need to be page aligned, at least not at the current time, but using a common declaration avoids mistakes. On 64 bits the table is exactly one page long, anyway.
Quoted 4 lines
Signed-off-by Kees Cook <[email protected]>Reported-by PaX Team <[email protected]>Signed-off-by H. Peter Anvin <[email protected]>
Hi, Peter,
Any reason for why following changelog get dropped?
---
v5:
- add comments to all IDTs about alignment reasoning, suggested by Linus
v4:
- rework using __page_aligned_bss, suggested by Yinghai LU
- move all the other IDT variables as well, suggested by HPA
v3:
- merge 32-bit and 64-bit idt_table definition
v2:
- 32-bit was already aligned
---
That at least would help us to check if you apply the right version.
Yinghai
H. Peter Anvin
reviewerRe: [tip:x86/urgent] x86: Make sure IDT is page aligned
Quoted 17 lines · Yinghai Lu
Hi, Peter,
Any reason for why following changelog get dropped?
---
v5:
- add comments to all IDTs about alignment reasoning, suggested by Linus
v4:
- rework using__page_aligned_bss, suggested by Yinghai LU
- move all the other IDT variables as well, suggested by HPA
v3:
- merge 32-bit and 64-bitidt_tabledefinition
v2:
- 32-bit was already aligned
---
Quoted 2 lines
That at least would help us to check if you apply the right version.
Procedurally, the changelogs don't belong in commit messages. I tend to leave them in if they are particularly illustrative or if the commit message only makes sense with the additional context, but neither of those is really ideal.
Technically, because of the --- line which indicates the end of the commit message.
-hpa
Re: [tip:x86/urgent] x86: Make sure IDT is page aligned
Quoted 21 lines · H. Peter Anvin
Quoted 17 lines · Yinghai Lu
Hi, Peter,
Any reason for why following changelog get dropped?
---
v5:
- add comments to all IDTs about alignment reasoning, suggested by Linus
v4:
- rework using__page_aligned_bss, suggested by Yinghai LU
- move all the other IDT variables as well, suggested by HPA
v3:
- merge 32-bit and 64-bitidt_tabledefinition
v2:
- 32-bit was already aligned
---Quoted 2 lines
That at least would help us to check if you apply the right version.
Quoted 7 lines
Procedurally, the changelogs don't belong in commit messages. I tend to leave them in if they are particularly illustrative or if the commit message only makes sense with the additional context, but neither of those is really ideal.
Technically, because of the --- line which indicates the end of the commit message.
Furthermote, the -tip notification email will generally email-thread on lkml to the patch submission that was applied.
That is a more robust indication of which submission was applied than any changelog detail.
Thanks,
Ingo