lkml.org 
[lkml]   [2009]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/17] x86-64: Move irqcount from PDA to per-cpu.
    Date
    Signed-off-by: Brian Gerst <brgerst@gmail.com>
    ---
    arch/x86/include/asm/pda.h | 2 +-
    arch/x86/kernel/asm-offsets_64.c | 1 -
    arch/x86/kernel/cpu/common.c | 4 ++--
    arch/x86/kernel/entry_64.S | 12 ++++++------
    4 files changed, 9 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/include/asm/pda.h b/arch/x86/include/asm/pda.h
    index ae23deb..4527d70 100644
    --- a/arch/x86/include/asm/pda.h
    +++ b/arch/x86/include/asm/pda.h
    @@ -15,7 +15,7 @@ struct x8664_pda {
    unsigned long unused2;
    unsigned long unused3;
    unsigned long unused4;
    - int irqcount; /* 32 Irq nesting counter. Starts -1 */
    + int unused5;
    unsigned int unused6; /* 36 was cpunumber */
    #ifdef CONFIG_CC_STACKPROTECTOR
    unsigned long stack_canary; /* 40 stack canary value */
    diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
    index 6a13983..fbc6045 100644
    --- a/arch/x86/kernel/asm-offsets_64.c
    +++ b/arch/x86/kernel/asm-offsets_64.c
    @@ -48,7 +48,6 @@ int main(void)
    BLANK();
    #undef ENTRY
    #define ENTRY(entry) DEFINE(pda_ ## entry, offsetof(struct x8664_pda, entry))
    - ENTRY(irqcount);
    DEFINE(pda_size, sizeof(struct x8664_pda));
    BLANK();
    #undef ENTRY
    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index f653860..62f9665 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -888,6 +888,8 @@ DEFINE_PER_CPU(unsigned long, kernelstack) = (unsigned long)&init_thread_union -
    KERNELSTACK_OFFSET + THREAD_SIZE;
    EXPORT_PER_CPU_SYMBOL(kernelstack);

    +DEFINE_PER_CPU(unsigned int, irqcount) = -1;
    +
    void __cpuinit pda_init(int cpu)
    {
    struct x8664_pda *pda = cpu_pda(cpu);
    @@ -898,8 +900,6 @@ void __cpuinit pda_init(int cpu)

    load_pda_offset(cpu);

    - pda->irqcount = -1;
    -
    if (cpu != 0) {
    if (pda->nodenumber == 0 && cpu_to_node(cpu) != NUMA_NO_NODE)
    pda->nodenumber = cpu_to_node(cpu);
    diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
    index 1331fd2..c97a1b5 100644
    --- a/arch/x86/kernel/entry_64.S
    +++ b/arch/x86/kernel/entry_64.S
    @@ -342,7 +342,7 @@ ENTRY(save_args)
    * a little cheaper to use a separate counter in the PDA (short of
    * moving irq_enter into assembly, which would be too much work)
    */
    -1: incl %gs:pda_irqcount
    +1: incl PER_CPU_VAR(irqcount)
    jne 2f
    popq_cfi %rax /* move return address... */
    mov PER_CPU_VAR(irqstackptr),%rsp
    @@ -837,7 +837,7 @@ common_interrupt:
    ret_from_intr:
    DISABLE_INTERRUPTS(CLBR_NONE)
    TRACE_IRQS_OFF
    - decl %gs:pda_irqcount
    + decl PER_CPU_VAR(irqcount)
    leaveq
    CFI_DEF_CFA_REGISTER rsp
    CFI_ADJUST_CFA_OFFSET -8
    @@ -1260,14 +1260,14 @@ ENTRY(call_softirq)
    CFI_REL_OFFSET rbp,0
    mov %rsp,%rbp
    CFI_DEF_CFA_REGISTER rbp
    - incl %gs:pda_irqcount
    + incl PER_CPU_VAR(irqcount)
    cmove PER_CPU_VAR(irqstackptr),%rsp
    push %rbp # backlink for old unwinder
    call __do_softirq
    leaveq
    CFI_DEF_CFA_REGISTER rsp
    CFI_ADJUST_CFA_OFFSET -8
    - decl %gs:pda_irqcount
    + decl PER_CPU_VAR(irqcount)
    ret
    CFI_ENDPROC
    END(call_softirq)
    @@ -1297,7 +1297,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
    movq %rdi, %rsp # we don't return, adjust the stack frame
    CFI_ENDPROC
    DEFAULT_FRAME
    -11: incl %gs:pda_irqcount
    +11: incl PER_CPU_VAR(irqcount)
    movq %rsp,%rbp
    CFI_DEF_CFA_REGISTER rbp
    cmovzq PER_CPU_VAR(irqstackptr),%rsp
    @@ -1305,7 +1305,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
    call xen_evtchn_do_upcall
    popq %rsp
    CFI_DEF_CFA_REGISTER rsp
    - decl %gs:pda_irqcount
    + decl PER_CPU_VAR(irqcount)
    jmp error_exit
    CFI_ENDPROC
    END(do_hypervisor_callback)
    --
    1.6.1.rc1


    \
     
     \ /
      Last update: 2009-01-16 15:27    [W:4.736 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site