x86/idt: Make IDT init functions static inlines

Move these two functions from kernel/idt.c to include/asm/desc.h:

	* init_idt_data()
	* idt_init_desc()

These functions are needed to setup IDT entries very early and need to
be called from head64.c. To be usable this early, these functions need
to be compiled without instrumentation and the stack-protector feature.

These features need to be kept enabled for kernel/idt.c, so head64.c
must use its own versions.

 [ bp: Take Kees' suggested patch title and add his Rev-by. ]

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20200907131613.12703-35-joro@8bytes.org

diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
index 1ced11d..476082a 100644 (file)
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -383,6 +383,33 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
 
 void alloc_intr_gate(unsigned int n, const void *addr);
 
+static inline void init_idt_data(struct idt_data *data, unsigned int n,
+                                const void *addr)
+{
+       BUG_ON(n > 0xFF);
+
+       memset(data, 0, sizeof(*data));
+       data->vector    = n;
+       data->addr      = addr;
+       data->segment   = __KERNEL_CS;
+       data->bits.type = GATE_INTERRUPT;
+       data->bits.p    = 1;
+}
+
+static inline void idt_init_desc(gate_desc *gate, const struct idt_data *d)
+{
+       unsigned long addr = (unsigned long) d->addr;
+
+       gate->offset_low        = (u16) addr;
+       gate->segment           = (u16) d->segment;
+       gate->bits              = d->bits;
+       gate->offset_middle     = (u16) (addr >> 16);
+#ifdef CONFIG_X86_64
+       gate->offset_high       = (u32) (addr >> 32);
+       gate->reserved          = 0;
+#endif
+}
+
 extern unsigned long system_vectors[];
 
 extern void load_current_idt(void);

diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
index 5621fb3..f7e7099 100644 (file)
--- a/arch/x86/include/asm/desc_defs.h
+++ b/arch/x86/include/asm/desc_defs.h
@@ -74,6 +74,13 @@ struct idt_bits {
                        p       : 1;
 } __attribute__((packed));
 
+struct idt_data {
+       unsigned int    vector;
+       unsigned int    segment;
+       struct idt_bits bits;
+       const void      *addr;
+};
+
 struct gate_struct {
        u16             offset_low;
        u16             segment;

diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c
index 53946c1..4bb4e3d 100644 (file)
--- a/arch/x86/kernel/idt.c
+++ b/arch/x86/kernel/idt.c
@@ -11,13 +11,6 @@
 #include <asm/desc.h>
 #include <asm/hw_irq.h>
 
-struct idt_data {
-       unsigned int    vector;
-       unsigned int    segment;
-       struct idt_bits bits;
-       const void      *addr;
-};
-
 #define DPL0           0x0
 #define DPL3           0x3
 
@@ -178,20 +171,6 @@ bool idt_is_f00f_address(unsigned long address)
 }
 #endif
 
-static inline void idt_init_desc(gate_desc *gate, const struct idt_data *d)
-{
-       unsigned long addr = (unsigned long) d->addr;
-
-       gate->offset_low        = (u16) addr;
-       gate->segment           = (u16) d->segment;
-       gate->bits              = d->bits;
-       gate->offset_middle     = (u16) (addr >> 16);
-#ifdef CONFIG_X86_64
-       gate->offset_high       = (u32) (addr >> 32);
-       gate->reserved          = 0;
-#endif
-}
-
 static __init void
 idt_setup_from_table(gate_desc *idt, const struct idt_data *t, int size, bool sys)
 {
@@ -205,19 +184,6 @@ idt_setup_from_table(gate_desc *idt, const struct idt_data *t, int size, bool sy
        }
 }
 
-static void init_idt_data(struct idt_data *data, unsigned int n,
-                         const void *addr)
-{
-       BUG_ON(n > 0xFF);
-
-       memset(data, 0, sizeof(*data));
-       data->vector    = n;
-       data->addr      = addr;
-       data->segment   = __KERNEL_CS;
-       data->bits.type = GATE_INTERRUPT;
-       data->bits.p    = 1;
-}
-
 static __init void set_intr_gate(unsigned int n, const void *addr)
 {
        struct idt_data data;