x86, MCE: Clean get_cpu_xxx with this_cpu_xxx
PATCH 1/1 x86, MCE: Clean get_cpu_xxx with this_cpu_xxx
This is a cleanup patch suggested by Peter. Use new this_cpu_xxx to improve operation speed. Meanwhile, it fixes an issue introduced in commit 27f6c573e0. I forget to execute put_cpu_var operation after get_cpu_var.
--- arch/x86/kernel/cpu/mcheck/mce.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +18 -22
@@ -402,7 +402,7 @@ static u64 mce_rdmsrl(u32 msr)if (offset <0 )return 0 ; -return *(u64 *)((char *)&__get_cpu_var (injectm) + offset); +return *(u64 *)((char *)this_cpu_ptr (&injectm) + offset); }if (rdmsrl_safe (msr, &v)) {
@@ -424,7 +424,7 @@ static void mce_wrmsrl(u32 msr, u64 v)int offset =msr_to_offset (msr);if (offset >=0 ) - *(u64 *)((char *)&__get_cpu_var (injectm) + offset) = v; + *(u64 *)((char *)this_cpu_ptr (&injectm) + offset) = v;return ; }wrmsrl (msr, v);
@@ -480,7 +480,7 @@ static DEFINE_PER_CPU(struct mce_ring, mce_ring);/* Runs with CPU affinity in workqueue */ static int mce_ring_empty (void ) { -struct mce_ring *r = &__get_cpu_var (mce_ring); +struct mce_ring *r =this_cpu_ptr (&mce_ring);return r->start == r->end; }
@@ -492,7 +492,7 @@ static int mce_ring_get(unsigned long *pfn) *pfn =0 ;get_cpu (); - r = &__get_cpu_var (mce_ring); + r =this_cpu_ptr (&mce_ring);if (r->start == r->end) goto out; *pfn = r->ring[r->start];
@@ -506,7 +506,7 @@ out:/* Always runs in MCE context with preempt off */ static int mce_ring_add (unsigned long pfn) { -struct mce_ring *r = &__get_cpu_var (mce_ring); +struct mce_ring *r =this_cpu_ptr (&mce_ring);unsigned next; next = (r->end +1 ) %MCE_RING_SIZE ;
@@ -528,7 +528,7 @@ int mce_available(struct cpuinfo_x86 *c)static void mce_schedule_work (void ) {if (!mce_ring_empty ()) -schedule_work (&__get_cpu_var (mce_work)); +schedule_work (this_cpu_ptr (&mce_work)); } DEFINE_PER_CPU(struct irq_work, mce_irq_work);
@@ -553,7 +553,7 @@ static void mce_report_event(struct pt_regs *regs)return ; } -irq_work_queue (&__get_cpu_var (mce_irq_work)); +irq_work_queue (this_cpu_ptr (&mce_irq_work)); }/*
@@ -598,7 +598,6 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b) {struct mce m;int i; -unsigned long *v;this_cpu_inc (mce_poll_count);
@@ -618,8 +617,7 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)if (!(m.status &MCI_STATUS_VAL ))continue ; - v = &get_cpu_var (mce_polled_error); -set_bit (0 , v); +this_cpu_write (mce_polled_error,1 );/* * Uncorrected or signalled events are handled by the exception * handler when it is enabled, so don't process those here.
@@ -1052,7 +1050,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)mce_gather_info (&m, regs); - final = &__get_cpu_var (mces_seen); + final =this_cpu_ptr (&mces_seen); *final = m;memset (valid_banks,0 ,sizeof (valid_banks));
@@ -1284,16 +1282,14 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default; -static int cmc_error_seen (void ) +static inline int cmc_error_seen (void ) { -unsigned long *v = &__get_cpu_var (mce_polled_error); - -return test_and_clear_bit (0 , v); +return this_cpu_xchg (mce_polled_error,0 ); }static void mce_timer_fn (unsigned long data) { -struct timer_list *t = &__get_cpu_var (mce_timer); +struct timer_list *t =this_cpu_ptr (&mce_timer);unsigned long iv;int notify;
@@ -1301,7 +1297,7 @@ static void mce_timer_fn(unsigned long data)if (mce_available (__this_cpu_ptr (&cpu_info))) {machine_check_poll (MCP_TIMESTAMP , - &__get_cpu_var (mce_poll_banks)); +this_cpu_ptr (&mce_poll_banks));mce_intel_cmci_poll (); }
@@ -1331,7 +1327,7 @@ static void mce_timer_fn(unsigned long data)*/ void mce_timer_kick (unsigned long interval) { -struct timer_list *t = &__get_cpu_var (mce_timer); +struct timer_list *t =this_cpu_ptr (&mce_timer);unsigned long when = jiffies + interval;unsigned long iv =__this_cpu_read (mce_next_interval);
@@ -1667,7 +1663,7 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t)static void __mcheck_cpu_init_timer (void ) { -struct timer_list *t = &__get_cpu_var (mce_timer); +struct timer_list *t =this_cpu_ptr (&mce_timer);unsigned int cpu =smp_processor_id ();setup_timer (t, mce_timer_fn, cpu);
@@ -1710,8 +1706,8 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)__mcheck_cpu_init_generic ();__mcheck_cpu_init_vendor (c);__mcheck_cpu_init_timer (); -INIT_WORK (&__get_cpu_var (mce_work), mce_process_work); -init_irq_work (&__get_cpu_var (mce_irq_work), &mce_irq_work_cb); +INIT_WORK (this_cpu_ptr (&mce_work), mce_process_work); +init_irq_work (this_cpu_ptr (&mce_irq_work), &mce_irq_work_cb); }/*
@@ -1963,7 +1959,7 @@ static struct miscdevice mce_chrdev_device = {static void __mce_disable_bank (void *arg) {int bank = *((int *)arg); -__clear_bit (bank,__get_cpu_var (mce_poll_banks)); +__clear_bit (bank, *this_cpu_ptr (&mce_poll_banks));cmci_disable_bank (bank); }
Signature · 1 line
1.9.0
Quoted 4 lines · Chen, Gong
This is a cleanup patch suggested by Peter. Use new
this_cpu_xxxto improve operation speed. Meanwhile, it fixes an issue introduced in commit27f6c573e0. I forget to executeput_cpu_varoperation afterget_cpu_var.
What 'issue'? Is it a bug? If yes, what are the symptoms to the user?
Also, fixes must be separate from cleanups.
Thanks,
Ingo
Quoted 9 lines · Ingo Molnar
Date: Tue, 15 Apr 2014 11:03:48 +0200
From: Ingo Molnar <[email protected]>
To: "Chen, Gong" <[email protected]>
Cc: [email protected], [email protected], [email protected],
[email protected], [email protected]
Subject: Re: [PATCH] x86, MCE: Cleanget_cpu_xxxwiththis_cpu_xxx
User-Agent: Mutt/1.5.21 (2010-09-15)
Quoted 8 lines
Quoted 4 lines · Chen, Gong
This is a cleanup patch suggested by Peter. Use new
this_cpu_xxxto improve operation speed. Meanwhile, it fixes an issue introduced in commit27f6c573e0. I forget to executeput_cpu_varoperation afterget_cpu_var.What 'issue'? Is it a bug? If yes, what are the symptoms to the user?
I forget put_cpu_var after get_cpu_var.
Quoted 2 lines
Also, fixes must be separate from cleanups.
OK, I will.
PATCH v2 1/2 x86, MCE: Fix a bug in CMCI handler
In reply to Chen, GongThis bug is introduced by me in commit 27f6c573e0. I forget to execute put_cpu_var operation after get_cpu_var. Fix it via this_cpu_write instead of get_cpu_var.
v2 -> v1: Separate cleanup from bug fix.
--- arch/x86/kernel/cpu/mcheck/mce.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +1 -3
@@ -598,7 +598,6 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b) {struct mce m;int i; -unsigned long *v;this_cpu_inc (mce_poll_count);
@@ -618,8 +617,7 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)if (!(m.status &MCI_STATUS_VAL ))continue ; - v = &get_cpu_var (mce_polled_error); -set_bit (0 , v); +this_cpu_write (mce_polled_error,1 );/* * Uncorrected or signalled events are handled by the exception * handler when it is enabled, so don't process those here.
Signature · 1 line
1.9.0
PATCH v2 2/2 x86, MCE: Clean get_cpu_xxx with this_cpu_xxx
This is a cleanup patch suggested by Peter. Use new this_cpu_xxx to improve operation speed.
v2 -> v1: Separate cleanup from bug fix.
--- arch/x86/kernel/cpu/mcheck/mce.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +17 -19
@@ -402,7 +402,7 @@ static u64 mce_rdmsrl(u32 msr)if (offset <0 )return 0 ; -return *(u64 *)((char *)&__get_cpu_var (injectm) + offset); +return *(u64 *)((char *)this_cpu_ptr (&injectm) + offset); }if (rdmsrl_safe (msr, &v)) {
@@ -424,7 +424,7 @@ static void mce_wrmsrl(u32 msr, u64 v)int offset =msr_to_offset (msr);if (offset >=0 ) - *(u64 *)((char *)&__get_cpu_var (injectm) + offset) = v; + *(u64 *)((char *)this_cpu_ptr (&injectm) + offset) = v;return ; }wrmsrl (msr, v);
@@ -480,7 +480,7 @@ static DEFINE_PER_CPU(struct mce_ring, mce_ring);/* Runs with CPU affinity in workqueue */ static int mce_ring_empty (void ) { -struct mce_ring *r = &__get_cpu_var (mce_ring); +struct mce_ring *r =this_cpu_ptr (&mce_ring);return r->start == r->end; }
@@ -492,7 +492,7 @@ static int mce_ring_get(unsigned long *pfn) *pfn =0 ;get_cpu (); - r = &__get_cpu_var (mce_ring); + r =this_cpu_ptr (&mce_ring);if (r->start == r->end) goto out; *pfn = r->ring[r->start];
@@ -506,7 +506,7 @@ out:/* Always runs in MCE context with preempt off */ static int mce_ring_add (unsigned long pfn) { -struct mce_ring *r = &__get_cpu_var (mce_ring); +struct mce_ring *r =this_cpu_ptr (&mce_ring);unsigned next; next = (r->end +1 ) %MCE_RING_SIZE ;
@@ -528,7 +528,7 @@ int mce_available(struct cpuinfo_x86 *c)static void mce_schedule_work (void ) {if (!mce_ring_empty ()) -schedule_work (&__get_cpu_var (mce_work)); +schedule_work (this_cpu_ptr (&mce_work)); } DEFINE_PER_CPU(struct irq_work, mce_irq_work);
@@ -553,7 +553,7 @@ static void mce_report_event(struct pt_regs *regs)return ; } -irq_work_queue (&__get_cpu_var (mce_irq_work)); +irq_work_queue (this_cpu_ptr (&mce_irq_work)); }/*
@@ -1050,7 +1050,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)mce_gather_info (&m, regs); - final = &__get_cpu_var (mces_seen); + final =this_cpu_ptr (&mces_seen); *final = m;memset (valid_banks,0 ,sizeof (valid_banks));
@@ -1282,16 +1282,14 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default; -static int cmc_error_seen (void ) +static inline int cmc_error_seen (void ) { -unsigned long *v = &__get_cpu_var (mce_polled_error); - -return test_and_clear_bit (0 , v); +return this_cpu_xchg (mce_polled_error,0 ); }static void mce_timer_fn (unsigned long data) { -struct timer_list *t = &__get_cpu_var (mce_timer); +struct timer_list *t =this_cpu_ptr (&mce_timer);unsigned long iv;int notify;
@@ -1299,7 +1297,7 @@ static void mce_timer_fn(unsigned long data)if (mce_available (__this_cpu_ptr (&cpu_info))) {machine_check_poll (MCP_TIMESTAMP , - &__get_cpu_var (mce_poll_banks)); +this_cpu_ptr (&mce_poll_banks));mce_intel_cmci_poll (); }
@@ -1329,7 +1327,7 @@ static void mce_timer_fn(unsigned long data)*/ void mce_timer_kick (unsigned long interval) { -struct timer_list *t = &__get_cpu_var (mce_timer); +struct timer_list *t =this_cpu_ptr (&mce_timer);unsigned long when = jiffies + interval;unsigned long iv =__this_cpu_read (mce_next_interval);
@@ -1665,7 +1663,7 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t)static void __mcheck_cpu_init_timer (void ) { -struct timer_list *t = &__get_cpu_var (mce_timer); +struct timer_list *t =this_cpu_ptr (&mce_timer);unsigned int cpu =smp_processor_id ();setup_timer (t, mce_timer_fn, cpu);
@@ -1708,8 +1706,8 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)__mcheck_cpu_init_generic ();__mcheck_cpu_init_vendor (c);__mcheck_cpu_init_timer (); -INIT_WORK (&__get_cpu_var (mce_work), mce_process_work); -init_irq_work (&__get_cpu_var (mce_irq_work), &mce_irq_work_cb); +INIT_WORK (this_cpu_ptr (&mce_work), mce_process_work); +init_irq_work (this_cpu_ptr (&mce_irq_work), &mce_irq_work_cb); }/*
@@ -1961,7 +1959,7 @@ static struct miscdevice mce_chrdev_device = {static void __mce_disable_bank (void *arg) {int bank = *((int *)arg); -__clear_bit (bank,__get_cpu_var (mce_poll_banks)); +__clear_bit (bank, *this_cpu_ptr (&mce_poll_banks));cmci_disable_bank (bank); }
Signature · 1 line
1.9.0