ipmi: Cleanup DEBUG_TIMING ifdef usage
RFC PATCH 1/2 ipmi: Cleanup DEBUG_TIMING ifdef usage
The driver uses #ifdef DEBUG_TIMING in order to conditionally print out timestamped debug messages. Unfortunately it adds the ifdefs all over the usage sites.
This patch cleans it up by adding a debug_timestamp() function which is compiled out if DEBUG_TIMING isn't present. This cleans up all the ugly ifdefs in the function logic.
--- drivers/char/ipmi/ipmi_si_intf.c | 58 +++++++++++++++------------------------- 1 file changed, 21 insertions(+), 37 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +21 -37
@@ -321,6 +321,18 @@ static int try_smi_init(struct smi_info *smi);static void cleanup_one_si (struct smi_info *to_clean);static void cleanup_ipmi_si (void ); +#ifdef DEBUG_TIMING +void debug_timestamp (char *msg) +{ +struct timeval t; + +do_gettimeofday (&t); +pr_debug ("**%s: %d.%9.9d\n" , msg, t.tv_sec, t.tv_usec); +} +#else +#define debug_timestamp (x) +#endif +static ATOMIC_NOTIFIER_HEAD (xaction_notifier_list);static int register_xaction_notifier (struct notifier_block *nb) {
@@ -370,10 +382,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info) smi_info->curr_msg = smi_info->waiting_msg; smi_info->waiting_msg =NULL ; -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Start2: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Start2" ); err =atomic_notifier_call_chain (&xaction_notifier_list,0 , smi_info);if (err &NOTIFY_STOP_MASK ) {
@@ -582,12 +591,8 @@ static void check_bt_irq(struct smi_info *smi_info, bool irq_on)static void handle_transaction_done (struct smi_info *smi_info) {struct ipmi_smi_msg *msg; -#ifdef DEBUG_TIMING -struct timeval t; -do_gettimeofday (&t); -printk (KERN_DEBUG "**Done: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Done" );switch (smi_info->si_state) {case SI_NORMAL :if (!smi_info->curr_msg)
@@ -929,17 +934,11 @@ static void sender(void *send_info,struct smi_info *smi_info = send_info;enum si_sm_result result;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif BUG_ON (smi_info->waiting_msg); smi_info->waiting_msg = msg; -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk ("**Enqueue: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Enqueue" );if (smi_info->run_to_completion) {/*
@@ -1128,15 +1127,10 @@ static void smi_timeout(unsigned long data)unsigned long jiffies_now;long time_diff;long timeout; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Timer: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Timer" ); + jiffies_now = jiffies; time_diff = (((long )jiffies_now - (long )smi_info->last_timeout_jiffies) *SI_USEC_PER_JIFFY );
@@ -1173,18 +1167,13 @@ static irqreturn_t si_irq_handler(int irq, void *data) {struct smi_info *smi_info = data;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags);smi_inc_stat (smi_info, interrupts); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Interrupt: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Interrupt" ); +smi_event_handler (smi_info,0 );spin_unlock_irqrestore (&(smi_info->si_lock), flags);return IRQ_HANDLED ;
@@ -2038,18 +2027,13 @@ static u32 ipmi_acpi_gpe(acpi_handle gpe_device, {struct smi_info *smi_info = context;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags);smi_inc_stat (smi_info, interrupts); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk ("**ACPI_GPE: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("ACPI_GPE" ); +smi_event_handler (smi_info,0 );spin_unlock_irqrestore (&(smi_info->si_lock), flags);
Signature · 1 line
1.9.1
RFC PATCH 2/2 ipmi: Update timespec usage to timespec64
As part of the internal y2038 cleanup, this patch removes timespec usage in the ipmi driver, replacing it timespec64
--- drivers/char/ipmi/ipmi_si_intf.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +13 -12
@@ -324,10 +324,10 @@ static void cleanup_ipmi_si(void);#ifdef DEBUG_TIMING void debug_timestamp (char *msg) { -struct timeval t; +struct timespec64 t; -do_gettimeofday (&t); -pr_debug ("**%s: %d.%9.9d\n" , msg, t.tv_sec, t.tv_usec); +do_getnstimeofday64 (&t); +pr_debug ("**%s: %lld.%9.9d\n" , msg, (long long ) t.tv_sec, t.tv_usec); }#else #define debug_timestamp (x)
@@ -988,18 +988,18 @@ static void set_run_to_completion(void *send_info, bool i_run_to_completion)* we are spinning in kipmid looking for something and not delaying * between checks */ -static inline void ipmi_si_set_not_busy (struct timespec *ts) +static inline void ipmi_si_set_not_busy (struct timespec64 *ts) { ts->tv_nsec =-1 ; } -static inline int ipmi_si_is_busy (struct timespec *ts) +static inline int ipmi_si_is_busy (struct timespec64 *ts) {return ts->tv_nsec !=-1 ; }static inline int ipmi_thread_busy_wait (enum si_sm_result smi_result,const struct smi_info *smi_info, -struct timespec *busy_until) +struct timespec64 *busy_until) {unsigned int max_busy_us =0 ;
@@ -1008,12 +1008,13 @@ static inline int ipmi_thread_busy_wait(enum si_sm_result smi_result,if (max_busy_us ==0 || smi_result !=SI_SM_CALL_WITH_DELAY )ipmi_si_set_not_busy (busy_until);else if (!ipmi_si_is_busy (busy_until)) { -getnstimeofday (busy_until); -timespec_add_ns (busy_until, max_busy_us*NSEC_PER_USEC ); +getnstimeofday64 (busy_until); +timespec64_add_ns (busy_until, max_busy_us*NSEC_PER_USEC ); }else { -struct timespec now; -getnstimeofday (&now); -if (unlikely (timespec_compare (&now, busy_until) >0 )) { +struct timespec64 now; + +getnstimeofday64 (&now); +if (unlikely (timespec64_compare (&now, busy_until) >0 )) {ipmi_si_set_not_busy (busy_until);return 0 ; }
@@ -1036,7 +1037,7 @@ static int ipmi_thread(void *data)struct smi_info *smi_info = data;unsigned long flags;enum si_sm_result smi_result; -struct timespec busy_until; +struct timespec64 busy_until;ipmi_si_set_not_busy (&busy_until);set_user_nice (current,MAX_NICE );
Signature · 1 line
1.9.1
Re: [PATCH 2/2][RFC] ipmi: Update timespec usage to timespec64
Quoted 8 lines · On Wednesday 07 January 2015 12:51:50 John Stultz wrote:
As part of the internal y2038 cleanup, this patch removes timespec usage in the ipmi driver, replacing it timespec64
Cc Corey Minyard <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by John Stultz <[email protected]>
In other drivers, we tended to use ktime_t and monotonic time, but your approach is definitely simpler because it doesn't have to rework the ipmi_si_is_busy logic and just do a s/timespec/timespec64/ conversion.
Do you think it makes sense to use ktime_get_ts64 instead of getnstimeofday64 to get a monotonic time? The advantage would be to have the code work slightly better when racing against settimeofday, the downside would be that the debug printk shows the changed time base, but that would hopefully be irrelevant to someone debugging the code.
Arnd
Re: [PATCH 2/2][RFC] ipmi: Update timespec usage to timespec64
Quoted 15 lines · Arnd Bergmann
Quoted 8 lines · On Wednesday 07 January 2015 12:51:50 John Stultz wrote:
As part of the internal y2038 cleanup, this patch removes timespec usage in the ipmi driver, replacing it timespec64
Cc Corey Minyard <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by John Stultz <[email protected]>In other drivers, we tended to use
ktime_tand monotonic time, but your approach is definitely simpler because it doesn't have to rework theipmi_si_is_busylogic and just do a s/timespec/timespec64/ conversion.
Quoted 6 lines
Do you think it makes sense to use
ktime_get_ts64instead of getnstimeofday64 to get a monotonic time? The advantage would be to have the code work slightly better when racing against settimeofday, the downside would be that the debug printk shows the changed time base, but that would hopefully be irrelevant to someone debugging the code.
So here they were explicitly printing wall-time in sec/usec, so I was somewhat hoping not to create any major behavioral changes.
But looking at this again, I see I sent a stale patch which has a build bug (using tv_usec w/ a timespec64)... so let me redo this anyway.
thanks
-john
PATCH v2 1/2 ipmi: Cleanup DEBUG_TIMING ifdef usage
In reply to John StultzThe driver uses #ifdef DEBUG_TIMING in order to conditionally print out timestamped debug messages. Unfortunately it adds the ifdefs all over the usage sites.
This patch cleans it up by adding a debug_timestamp() function which is compiled out if DEBUG_TIMING isn't present. This cleans up all the ugly ifdefs in the function logic.
---
v2: Caught a missed DEBUG_TIMING ifdef
drivers/char/ipmi/ipmi_si_intf.c | 61 ++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 40 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +21 -40
@@ -321,6 +321,18 @@ static int try_smi_init(struct smi_info *smi);static void cleanup_one_si (struct smi_info *to_clean);static void cleanup_ipmi_si (void ); +#ifdef DEBUG_TIMING +void debug_timestamp (char *msg) +{ +struct timeval t; + +do_gettimeofday (&t); +pr_debug ("**%s: %d.%9.9d\n" , msg, t.tv_sec, t.tv_usec); +} +#else +#define debug_timestamp (x) +#endif +static ATOMIC_NOTIFIER_HEAD (xaction_notifier_list);static int register_xaction_notifier (struct notifier_block *nb) {
@@ -358,9 +370,6 @@ static void return_hosed_msg(struct smi_info *smi_info, int cCode)static enum si_sm_result start_next_msg (struct smi_info *smi_info) {int rv; -#ifdef DEBUG_TIMING -struct timeval t; -#endif if (!smi_info->waiting_msg) { smi_info->curr_msg =NULL ;
@@ -370,10 +379,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info) smi_info->curr_msg = smi_info->waiting_msg; smi_info->waiting_msg =NULL ; -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Start2: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Start2" ); err =atomic_notifier_call_chain (&xaction_notifier_list,0 , smi_info);if (err &NOTIFY_STOP_MASK ) {
@@ -582,12 +588,8 @@ static void check_bt_irq(struct smi_info *smi_info, bool irq_on)static void handle_transaction_done (struct smi_info *smi_info) {struct ipmi_smi_msg *msg; -#ifdef DEBUG_TIMING -struct timeval t; -do_gettimeofday (&t); -printk (KERN_DEBUG "**Done: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Done" );switch (smi_info->si_state) {case SI_NORMAL :if (!smi_info->curr_msg)
@@ -929,17 +931,11 @@ static void sender(void *send_info,struct smi_info *smi_info = send_info;enum si_sm_result result;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif BUG_ON (smi_info->waiting_msg); smi_info->waiting_msg = msg; -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk ("**Enqueue: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Enqueue" );if (smi_info->run_to_completion) {/*
@@ -1128,15 +1124,10 @@ static void smi_timeout(unsigned long data)unsigned long jiffies_now;long time_diff;long timeout; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Timer: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Timer" ); + jiffies_now = jiffies; time_diff = (((long )jiffies_now - (long )smi_info->last_timeout_jiffies) *SI_USEC_PER_JIFFY );
@@ -1173,18 +1164,13 @@ static irqreturn_t si_irq_handler(int irq, void *data) {struct smi_info *smi_info = data;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags);smi_inc_stat (smi_info, interrupts); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Interrupt: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Interrupt" ); +smi_event_handler (smi_info,0 );spin_unlock_irqrestore (&(smi_info->si_lock), flags);return IRQ_HANDLED ;
@@ -2038,18 +2024,13 @@ static u32 ipmi_acpi_gpe(acpi_handle gpe_device, {struct smi_info *smi_info = context;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags);smi_inc_stat (smi_info, interrupts); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk ("**ACPI_GPE: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("ACPI_GPE" ); +smi_event_handler (smi_info,0 );spin_unlock_irqrestore (&(smi_info->si_lock), flags);
Signature · 1 line
1.9.1
PATCH v2 2/2 ipmi: Update timespec usage to timespec64
As part of the internal y2038 cleanup, this patch removes timespec usage in the ipmi driver, replacing it timespec64
---
v2: Include build fixes I mistakenly left out of v1
drivers/char/ipmi/ipmi_si_intf.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +13 -12
@@ -324,10 +324,10 @@ static void cleanup_ipmi_si(void);#ifdef DEBUG_TIMING void debug_timestamp (char *msg) { -struct timeval t; +struct timespec64 t; -do_gettimeofday (&t); -pr_debug ("**%s: %d.%9.9d\n" , msg, t.tv_sec, t.tv_usec); +getnstimeofday64 (&t); +pr_debug ("**%s: %lld.%9.9ld\n" , msg, (long long ) t.tv_sec, t.tv_nsec); }#else #define debug_timestamp (x)
@@ -985,18 +985,18 @@ static void set_run_to_completion(void *send_info, bool i_run_to_completion)* we are spinning in kipmid looking for something and not delaying * between checks */ -static inline void ipmi_si_set_not_busy (struct timespec *ts) +static inline void ipmi_si_set_not_busy (struct timespec64 *ts) { ts->tv_nsec =-1 ; } -static inline int ipmi_si_is_busy (struct timespec *ts) +static inline int ipmi_si_is_busy (struct timespec64 *ts) {return ts->tv_nsec !=-1 ; }static inline int ipmi_thread_busy_wait (enum si_sm_result smi_result,const struct smi_info *smi_info, -struct timespec *busy_until) +struct timespec64 *busy_until) {unsigned int max_busy_us =0 ;
@@ -1005,12 +1005,13 @@ static inline int ipmi_thread_busy_wait(enum si_sm_result smi_result,if (max_busy_us ==0 || smi_result !=SI_SM_CALL_WITH_DELAY )ipmi_si_set_not_busy (busy_until);else if (!ipmi_si_is_busy (busy_until)) { -getnstimeofday (busy_until); -timespec_add_ns (busy_until, max_busy_us*NSEC_PER_USEC ); +getnstimeofday64 (busy_until); +timespec64_add_ns (busy_until, max_busy_us*NSEC_PER_USEC ); }else { -struct timespec now; -getnstimeofday (&now); -if (unlikely (timespec_compare (&now, busy_until) >0 )) { +struct timespec64 now; + +getnstimeofday64 (&now); +if (unlikely (timespec64_compare (&now, busy_until) >0 )) {ipmi_si_set_not_busy (busy_until);return 0 ; }
@@ -1033,7 +1034,7 @@ static int ipmi_thread(void *data)struct smi_info *smi_info = data;unsigned long flags;enum si_sm_result smi_result; -struct timespec busy_until; +struct timespec64 busy_until;ipmi_si_set_not_busy (&busy_until);set_user_nice (current,MAX_NICE );
Signature · 1 line
1.9.1
Quoted 7 lines · John Stultz
The driver uses #ifdef
DEBUG_TIMINGin order to conditionally print out timestamped debug messages. Unfortunately it adds the ifdefs all over the usage sites.This patch cleans it up by adding a
debug_timestamp()function which is compiled out ifDEBUG_TIMINGisn't present. This cleans up all the ugly ifdefs in the function logic.
Yes, this is much better. I had looked at this recently and planned to do something
with it. Queued for 3.20, unless you need it sooner.
Thanks,
-corey
Quoted 149 lines
Cc Corey Minyard <[email protected]>Cc Arnd Bergmann <[email protected]>Signed-off-by John Stultz <[email protected]>---
v2: Caught a missedDEBUG_TIMINGifdefdrivers/char/ipmi/ipmi_si_intf.c | 61 ++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 40 deletions(-)drivers/char/ipmi/ipmi_si_intf.c +21
-40@@ -321,6 +321,18 @@ static int try_smi_init(struct smi_info *smi);static void cleanup_one_si (struct smi_info *to_clean);static void cleanup_ipmi_si (void ); +#ifdef DEBUG_TIMING +void debug_timestamp (char *msg) +{ +struct timeval t; + +do_gettimeofday (&t); +pr_debug ("**%s: %d.%9.9d\n" , msg, t.tv_sec, t.tv_usec); +} +#else +#define debug_timestamp (x) +#endif +static ATOMIC_NOTIFIER_HEAD (xaction_notifier_list);static int register_xaction_notifier (struct notifier_block *nb) {@@ -358,9 +370,6 @@ static void return_hosed_msg(struct smi_info *smi_info, int cCode)static enum si_sm_result start_next_msg (struct smi_info *smi_info) {int rv; -#ifdef DEBUG_TIMING -struct timeval t; -#endif if (!smi_info->waiting_msg) { smi_info->curr_msg =NULL ;@@ -370,10 +379,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info) smi_info->curr_msg = smi_info->waiting_msg; smi_info->waiting_msg =NULL ; -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Start2: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Start2" ); err =atomic_notifier_call_chain (&xaction_notifier_list,0 , smi_info);if (err &NOTIFY_STOP_MASK ) {@@ -582,12 +588,8 @@ static void check_bt_irq(struct smi_info *smi_info, bool irq_on)static void handle_transaction_done (struct smi_info *smi_info) {struct ipmi_smi_msg *msg; -#ifdef DEBUG_TIMING -struct timeval t; -do_gettimeofday (&t); -printk (KERN_DEBUG "**Done: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Done" );switch (smi_info->si_state) {case SI_NORMAL :if (!smi_info->curr_msg)@@ -929,17 +931,11 @@ static void sender(void *send_info,struct smi_info *smi_info = send_info;enum si_sm_result result;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif BUG_ON (smi_info->waiting_msg); smi_info->waiting_msg = msg; -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk ("**Enqueue: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Enqueue" );if (smi_info->run_to_completion) {/* @@ -1128,15 +1124,10 @@ static void smi_timeout(unsigned long data)unsigned long jiffies_now;long time_diff;long timeout; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Timer: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Timer" ); + jiffies_now = jiffies; time_diff = (((long )jiffies_now - (long )smi_info->last_timeout_jiffies) *SI_USEC_PER_JIFFY );@@ -1173,18 +1164,13 @@ static irqreturn_t si_irq_handler(int irq, void *data) {struct smi_info *smi_info = data;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags);smi_inc_stat (smi_info, interrupts); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk (KERN_DEBUG "**Interrupt: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("Interrupt" ); +smi_event_handler (smi_info,0 );spin_unlock_irqrestore (&(smi_info->si_lock), flags);return IRQ_HANDLED ;@@ -2038,18 +2024,13 @@ static u32 ipmi_acpi_gpe(acpi_handle gpe_device, {struct smi_info *smi_info = context;unsigned long flags; -#ifdef DEBUG_TIMING -struct timeval t; -#endif spin_lock_irqsave (&(smi_info->si_lock), flags);smi_inc_stat (smi_info, interrupts); -#ifdef DEBUG_TIMING -do_gettimeofday (&t); -printk ("**ACPI_GPE: %d.%9.9d\n" , t.tv_sec, t.tv_usec); -#endif +debug_timestamp ("ACPI_GPE" ); +smi_event_handler (smi_info,0 );spin_unlock_irqrestore (&(smi_info->si_lock), flags);
Quoted 5 lines · Corey Minyard
Quoted 4 lines · John Stultz
The driver uses #ifdef
DEBUG_TIMINGin order to conditionally print out timestamped debug messages. Unfortunately it adds the ifdefs all over the usage sites.
Quoted 7 lines
Quoted 3 lines
This patch cleans it up by adding a
debug_timestamp()function which is compiled out ifDEBUG_TIMINGisn't present. This cleans up all the ugly ifdefs in the function logic.Yes, this is much better. I had looked at this recently and planned to do something
with it. Queued for 3.20, unless you need it sooner.
Nope, no rush. Just wanted to make sure it gets off my queue. :)
thanks
-john