ipmi: Cleanups for allowing IPMI support to always be "y"
cover ipmi: Cleanups for allowing IPMI support to always be "y"
Three patches to remove issues with probing interface default, to make sure the driver is completely idle if nothing is happening on it, and to compile the IPMI driver into the kernel if ACPI is enabled.
The ACPI spec really requires that the IPMI driver be built into the kernel because ACPI uses IPMI for some operations. But some people do not want the driver even using the mimimal amount of CPU it uses when idle. And the default probing, even though sort of implied to be required by the spec, is really a bad idea and can result in hangs on systems with other hardware at those location.
Hopefully these patches make everyone happy.
PATCH 1/3 ipmi: Turn off default probing of interfaces
From: Corey Minyard <[email protected]>
The default probing can cause problems with some system, slow booting, extra CPU usages, etc. Turn it off by default and give a config option to enable it.
From: Matthew Garrett <[email protected]>
--- drivers/char/ipmi/Kconfig | 10 ++++++++++ drivers/char/ipmi/ipmi_si_intf.c | 4 ++++ 2 files changed, 14 insertions(+)
drivers/char/ipmi/Kconfig +10 -0
@@ -50,6 +50,16 @@ config IPMI_SI Currently, only KCS and SMIC are supported. If you are using IPMI, you should probably say "y" here. +config IPMI_SI_PROBE_DEFAULTS + bool 'Probe for all possible IPMI system interfaces by default' + help + Modern systems will usually expose IPMI interfaces via a discoverable + firmware mechanism such as ACPI or DMI. Older systems do not, and so + the driver is forced to probe hardware manually. This may cause boot + delays. Say "n" here to disable this manual probing. IPMI will then + only be available on older systems if the "ipmi_si_intf.trydefaults=1" + boot argument is passed. + config IPMI_WATCHDOG tristate 'IPMI Watchdog Timer' help
drivers/char/ipmi/ipmi_si_intf.c +4 -0
@@ -1230,7 +1230,11 @@ static bool si_tryplatform = 1;#ifdef CONFIG_PCI static bool si_trypci =1 ;#endif +#ifdef CONFIG_IPMI_SI_PROBE_DEFAULTS static bool si_trydefaults =1 ; +#else +static bool si_trydefaults; +#endif static char *si_type[SI_MAX_PARMS ];#define MAX_SI_TYPE_STR 30static char si_type_str[MAX_SI_TYPE_STR ];
Signature · 1 line
1.8.3.1
Re: [PATCH 1/3] ipmi: Turn off default probing of interfaces
Hi Corey,
On Sun, Feb 23, 2014 at 08:23:34PM -0600, [email protected] wrote:
Would not
static bool si_trydefaults = IS_ENABLED(CONFIG_IPMI_SI_PROBE_DEFAULTS);
work better here?
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH 1/3] ipmi: Turn off default probing of interfaces
Quoted 5 lines · Dmitry Torokhov
Would not
static bool
si_trydefaults=IS_ENABLED(CONFIG_IPMI_SI_PROBE_DEFAULTS);work better here?
Yes, it would. Sorry, I should have thought of that.
Signature · 1 line
Matthew Garrett <[email protected]>
Re: [PATCH 1/3] ipmi: Turn off default probing of interfaces
In reply to Dmitry TorokhovQuoted 11 lines · Dmitry Torokhov
Hi Corey,
On Sun, Feb 23, 2014 at 08:23:34PM -0600, [email protected] wrote:
Would notstatic bool
si_trydefaults=IS_ENABLED(CONFIG_IPMI_SI_PROBE_DEFAULTS);work better here?
Thanks.
Certainly. I will update it. Thanks,
-corey
PATCH 2/3 ipmi: Turn off all activity on an idle ipmi interface
In reply to [email protected]From: Corey Minyard <[email protected]>
The IPMI driver would wake up periodically looking for events and watchdog pretimeouts. If there is nothing waiting for these events, it's really kind of pointless to be checking for them. So modify the driver so the message handler can pass down if it needs the lower layer to be waiting for these. Modify the system interface lower layer to turn off all timer and thread activity if the upper layer doesn't need anything and it is not currently handling messages. And modify the message handler to not restart the timer if its timer is not needed.
The timers and kthread will still be enabled if:
* The SI interface is handling a message.
* A user has enabled watching for events.
* The IPMI watchdog timer is in use (since it uses pretimeouts).
* The message handler is waiting on a remote response.
* A user has registered to receive commands.
This mostly affects interfaces without interrupts. Interfaces with interrupts already don't use CPU in the system interface when the interface is idle.
--- drivers/char/ipmi/ipmi_msghandler.c | 215 ++++++++++++++++++++++-------------- drivers/char/ipmi/ipmi_si_intf.c | 67 +++++++---- include/linux/ipmi_smi.h | 7 ++ 3 files changed, 187 insertions(+), 102 deletions(-)
drivers/char/ipmi/ipmi_msghandler.c +133 -82
@@ -55,6 +55,7 @@ static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);static int ipmi_init_msghandler (void );static void smi_recv_tasklet (unsigned long );static void handle_new_recv_msgs (ipmi_smi_t intf); +static void need_waiter (ipmi_smi_t intf);static int initialized;
@@ -73,6 +74,20 @@ static struct proc_dir_entry *proc_ipmi_root;*/ #define MAX_MSG_TIMEOUT 60000 +/* Call every ~1000 ms. */ +#define IPMI_TIMEOUT_TIME 1000 + +/* How many jiffies does it take to get to the timeout time. */ +#define IPMI_TIMEOUT_JIFFIES ((IPMI_TIMEOUT_TIME * HZ) / 1000) + +/* +* Request events from the queue every second (this is the number of +* IPMI_TIMEOUT_TIMES between event requests). Hopefully, in the +* future, IPMI will add a way to know immediately if an event is in +* the queue and this silliness can go away. +*/ +#define IPMI_REQUEST_EV_TIME (1000 / (IPMI_TIMEOUT_TIME)) +/* * The main "user" data structure. */
@@ -383,6 +398,9 @@ struct ipmi_smi {unsigned int waiting_events_count;/* How many events in queue? */ char delivering_events;char event_msg_printed; +atomic_t event_waiters; +unsigned int ticks_to_req_ev; +int last_needs_timer;/* * The event receiver for my BMC, only really used at panic
@@ -451,7 +469,6 @@ static DEFINE_MUTEX(ipmi_interfaces_mutex);static LIST_HEAD (smi_watchers);static DEFINE_MUTEX (smi_watchers_mutex); -#define ipmi_inc_stat (intf, stat) \ atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])#define ipmi_get_stat (intf, stat) \
@@ -772,6 +789,7 @@ static int intf_next_seq(ipmi_smi_t intf, *seq = i; *seqid = intf->seq_table[i].seqid; intf->curr_seq = (i+1 )%IPMI_IPMB_NUM_SEQ ; +need_waiter (intf); }else { rv = -EAGAIN ; }
@@ -966,6 +984,11 @@ int ipmi_create_user(unsigned int if_num,spin_lock_irqsave (&intf->seq_lock, flags);list_add_rcu (&new_user->link, &intf->users);spin_unlock_irqrestore (&intf->seq_lock, flags); +if (handler->ipmi_watchdog_pretimeout) { +/* User wants pretimeouts, so make sure to watch for them. */ +if (atomic_inc_return (&intf->event_waiters) ==1 ) +need_waiter (intf); + } *user = new_user;return 0 ;
@@ -1021,6 +1044,12 @@ int ipmi_destroy_user(ipmi_user_t user) user->valid =0 ; +if (user->handler->ipmi_watchdog_pretimeout) +atomic_dec (&intf->event_waiters); + +if (user->gets_events) +atomic_dec (&intf->event_waiters); +/* Remove the user from the interface's sequence table. */ spin_lock_irqsave (&intf->seq_lock, flags);list_del_rcu (&user->link);
@@ -1194,7 +1223,17 @@ int ipmi_set_gets_events(ipmi_user_t user, int val)INIT_LIST_HEAD (&msgs);spin_lock_irqsave (&intf->events_lock, flags); - user->gets_events = val; +if (user->gets_events == !!val) + goto out; + + user->gets_events = !!val; + +if (val) { +if (atomic_inc_return (&intf->event_waiters) ==1 ) +need_waiter (intf); + }else { +atomic_dec (&intf->event_waiters); + }if (intf->delivering_events)/*
@@ -1289,6 +1328,9 @@ int ipmi_register_for_cmd(ipmi_user_t user, goto out_unlock; } +if (atomic_inc_return (&intf->event_waiters) ==1 ) +need_waiter (intf); +list_add_rcu (&rcvr->link, &intf->cmd_rcvrs); out_unlock:
@@ -1330,6 +1372,7 @@ int ipmi_unregister_for_cmd(ipmi_user_t user,mutex_unlock (&intf->cmd_rcvrs_mutex);synchronize_rcu ();while (rcvrs) { +atomic_dec (&intf->event_waiters); rcvr = rcvrs; rcvrs = rcvr->next;kfree (rcvr);
@@ -2876,6 +2919,8 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers, (unsigned long) intf);atomic_set (&intf->watchdog_pretimeouts_to_deliver,0 );spin_lock_init (&intf->events_lock); +atomic_set (&intf->event_waiters,0 ); + intf->ticks_to_req_ev =IPMI_REQUEST_EV_TIME ;INIT_LIST_HEAD (&intf->waiting_events); intf->waiting_events_count =0 ;mutex_init (&intf->cmd_rcvrs_mutex);
@@ -3965,7 +4010,8 @@ smi_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg,static void check_msg_timeout (ipmi_smi_t intf,struct seq_table *ent,struct list_head *timeouts,long timeout_period, -int slot,unsigned long *flags) +int slot,unsigned long *flags, +unsigned int *waiting_msgs) {struct ipmi_recv_msg *msg;struct ipmi_smi_handlers *handlers;
@@ -3977,8 +4023,10 @@ static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent,return ; ent->timeout -= timeout_period; -if (ent->timeout >0 ) +if (ent->timeout >0 ) { + (*waiting_msgs)++;return ; + }if (ent->retries_left ==0 ) {/* The message has used all its retries. */
@@ -3995,6 +4043,8 @@ static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent,struct ipmi_smi_msg *smi_msg;/* More retries, send again. */ + (*waiting_msgs)++; +/* * Start with the max timer, set to normal timer after * the message is sent.
@@ -4040,117 +4090,118 @@ static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent, } } -static void ipmi_timeout_handler (long timeout_period) +static unsigned int ipmi_timeout_handler (ipmi_smi_t intf,long timeout_period) { -ipmi_smi_t intf;struct list_head timeouts;struct ipmi_recv_msg *msg, *msg2;unsigned long flags;int i; +unsigned int waiting_msgs =0 ; -rcu_read_lock (); -list_for_each_entry_rcu (intf, &ipmi_interfaces, link) { -tasklet_schedule (&intf->recv_tasklet); - -/* -* Go through the seq table and find any messages that -* have timed out, putting them in the timeouts -* list. -*/ -INIT_LIST_HEAD (&timeouts); -spin_lock_irqsave (&intf->seq_lock, flags); -for (i =0 ; i <IPMI_IPMB_NUM_SEQ ; i++) -check_msg_timeout (intf, &(intf->seq_table[i]), - &timeouts, timeout_period, i, - &flags); -spin_unlock_irqrestore (&intf->seq_lock, flags); +/* +* Go through the seq table and find any messages that +* have timed out, putting them in the timeouts +* list. +*/ +INIT_LIST_HEAD (&timeouts); +spin_lock_irqsave (&intf->seq_lock, flags); +for (i =0 ; i <IPMI_IPMB_NUM_SEQ ; i++) +check_msg_timeout (intf, &(intf->seq_table[i]), + &timeouts, timeout_period, i, + &flags, &waiting_msgs); +spin_unlock_irqrestore (&intf->seq_lock, flags); -list_for_each_entry_safe (msg, msg2, &timeouts, link) -deliver_err_response (msg,IPMI_TIMEOUT_COMPLETION_CODE ); +list_for_each_entry_safe (msg, msg2, &timeouts, link) +deliver_err_response (msg,IPMI_TIMEOUT_COMPLETION_CODE ); -/* -* Maintenance mode handling. Check the timeout -* optimistically before we claim the lock. It may -* mean a timeout gets missed occasionally, but that -* only means the timeout gets extended by one period -* in that case. No big deal, and it avoids the lock -* most of the time. -*/ +/* +* Maintenance mode handling. Check the timeout +* optimistically before we claim the lock. It may +* mean a timeout gets missed occasionally, but that +* only means the timeout gets extended by one period +* in that case. No big deal, and it avoids the lock +* most of the time. +*/ +if (intf->auto_maintenance_timeout >0 ) { +spin_lock_irqsave (&intf->maintenance_mode_lock, flags);if (intf->auto_maintenance_timeout >0 ) { -spin_lock_irqsave (&intf->maintenance_mode_lock, flags); -if (intf->auto_maintenance_timeout >0 ) { - intf->auto_maintenance_timeout - -= timeout_period; -if (!intf->maintenance_mode - && (intf->auto_maintenance_timeout <=0 )) { - intf->maintenance_mode_enable =0 ; -maintenance_mode_update (intf); - } + intf->auto_maintenance_timeout + -= timeout_period; +if (!intf->maintenance_mode + && (intf->auto_maintenance_timeout <=0 )) { + intf->maintenance_mode_enable =0 ; +maintenance_mode_update (intf); } -spin_unlock_irqrestore (&intf->maintenance_mode_lock, - flags); } +spin_unlock_irqrestore (&intf->maintenance_mode_lock, + flags); } -rcu_read_unlock (); + +tasklet_schedule (&intf->recv_tasklet); + +return waiting_msgs; } -static void ipmi_request_event (void ) +static void ipmi_request_event (ipmi_smi_t intf) { -ipmi_smi_t intf;struct ipmi_smi_handlers *handlers; -rcu_read_lock (); -/* -* Called from the timer, no need to check if handlers is -* valid. -*/ -list_for_each_entry_rcu (intf, &ipmi_interfaces, link) { -/* No event requests when in maintenance mode. */ -if (intf->maintenance_mode_enable) -continue ; +/* No event requests when in maintenance mode. */ +if (intf->maintenance_mode_enable) +return ; - handlers = intf->handlers; -if (handlers) - handlers->request_events (intf->send_info); - } -rcu_read_unlock (); + handlers = intf->handlers; +if (handlers) + handlers->request_events (intf->send_info); }static struct timer_list ipmi_timer; -/* Call every ~1000 ms. */ -#define IPMI_TIMEOUT_TIME 1000 - -/* How many jiffies does it take to get to the timeout time. */ -#define IPMI_TIMEOUT_JIFFIES ((IPMI_TIMEOUT_TIME * HZ) / 1000) - -/* -* Request events from the queue every second (this is the number of -* IPMI_TIMEOUT_TIMES between event requests). Hopefully, in the -* future, IPMI will add a way to know immediately if an event is in -* the queue and this silliness can go away. -*/ -#define IPMI_REQUEST_EV_TIME (1000 / (IPMI_TIMEOUT_TIME)) -static atomic_t stop_operation; -static unsigned int ticks_to_req_ev =IPMI_REQUEST_EV_TIME ;static void ipmi_timeout (unsigned long data) { +ipmi_smi_t intf; +int nt =0 ; +if (atomic_read (&stop_operation))return ; - ticks_to_req_ev--; -if (ticks_to_req_ev ==0 ) { -ipmi_request_event (); - ticks_to_req_ev =IPMI_REQUEST_EV_TIME ; - } +rcu_read_lock (); +list_for_each_entry_rcu (intf, &ipmi_interfaces, link) { +int lnt =0 ; + +if (atomic_read (&intf->event_waiters)) { + intf->ticks_to_req_ev--; +if (intf->ticks_to_req_ev ==0 ) { +ipmi_request_event (intf); + intf->ticks_to_req_ev =IPMI_REQUEST_EV_TIME ; + } + lnt++; + } -ipmi_timeout_handler (IPMI_TIMEOUT_TIME ); + lnt +=ipmi_timeout_handler (intf,IPMI_TIMEOUT_TIME ); -mod_timer (&ipmi_timer, jiffies +IPMI_TIMEOUT_JIFFIES ); + lnt = !!lnt; +if (lnt != intf->last_needs_timer && + intf->handlers->set_need_watch) + intf->handlers->set_need_watch (intf->send_info, lnt); + intf->last_needs_timer = lnt; + + nt += lnt; + } +rcu_read_unlock (); + +if (nt) +mod_timer (&ipmi_timer, jiffies +IPMI_TIMEOUT_JIFFIES ); } +static void need_waiter (ipmi_smi_t intf) +{ +/* Racy, but worst case we start the timer twice. */ +if (!timer_pending (&ipmi_timer)) +mod_timer (&ipmi_timer, jiffies +IPMI_TIMEOUT_JIFFIES ); +}static atomic_t smi_msg_inuse_count =ATOMIC_INIT (0 );static atomic_t recv_msg_inuse_count =ATOMIC_INIT (0 );
drivers/char/ipmi/ipmi_si_intf.c +47 -20
109 lines not on this page · raw message
include/linux/ipmi_smi.h +7 -0
@@ -109,6 +109,13 @@ struct ipmi_smi_handlers {events from the BMC we are attached to. */ void (*request_events)(void *send_info); +/* Called by the upper layer when some user requires that the +interface watch for events, received messages, watchdog +pretimeouts, or not. Used by the SMI to know if it should +watch for these. This may be NULL if the SMI does not +implement it. */ +void (*set_need_watch)(void *send_info,int enable); +/* Called when the interface should go into "run to completion" mode. If this call sets the value to true, the interface should make sure that all messages are flushed
Signature · 1 line
1.8.3.1
Re: [PATCH 2/3] ipmi: Turn off all activity on an idle ipmi interface
drivers/char/ipmi/ipmi_msghandler.c int ipmi_set_gets_events(ipmi_user_t user, int val) · line 1229
Quoted 9 lines · On Sun, Feb 23, 2014 at 08:23:35PM -0600, [email protected] wrote:
drivers/char/ipmi/ipmi_msghandler.c +4
-1@@ -1194,7 +1223,17 @@ int ipmi_set_gets_events(ipmi_user_t user, int val)INIT_LIST_HEAD (&msgs);spin_lock_irqsave (&intf->events_lock, flags); - user->gets_events = val; +if (user->gets_events == !!val) + goto out; + + user->gets_events = !!val;
Why not have val declared as bool and let compiler convert as needed?
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH 2/3] ipmi: Turn off all activity on an idle ipmi interface
Quoted 12 lines · Dmitry Torokhov
drivers/char/ipmi/ipmi_msghandler.c int ipmi_set_gets_events(ipmi_user_t user, int val) · line 1229
Quoted 9 lines · On Sun, Feb 23, 2014 at 08:23:35PM -0600, [email protected] wrote:
drivers/char/ipmi/ipmi_msghandler.c +4
-1@@ -1194,7 +1223,17 @@ int ipmi_set_gets_events(ipmi_user_t user, int val)INIT_LIST_HEAD (&msgs);spin_lock_irqsave (&intf->events_lock, flags); - user->gets_events = val; +if (user->gets_events == !!val) + goto out; + + user->gets_events = !!val;Why not have val declared as bool and let compiler convert as needed?
Quoted 2 lines
Thanks.
Because I've been programming in C since long before there was a bool type, and I need to change the way I think. Fixed, thanks.
-core
PATCH 3/3 Change ACPI IPMI support to "default y"
In reply to [email protected]From: Matthew Garrett <[email protected]>
The ACPI IPMI driver implements IPMI operation region support for the ACPI core. Systems that declare ACPI operation regions may reference them at any time, including during kernel initialisation. These accesses will fail unless the ACPI IPMI driver is present, and undesirable system behaviour may result. Set the default to Y in order to encourage distributions and users to configure kernels to avoid awkward surprises.
--- drivers/acpi/Kconfig | 2 +- drivers/char/ipmi/Kconfig | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/acpi/Kconfig +1 -1
@@ -162,7 +162,7 @@ config ACPI_PROCESSOR config ACPI_IPMI tristate "IPMI" depends on IPMI_SI - default n + default y help This driver enables the ACPI to access the BMC controller. And it uses the IPMI request/response message to communicate with BMC
drivers/char/ipmi/Kconfig +2 -0
@@ -5,6 +5,7 @@ menuconfig IPMI_HANDLER tristate 'IPMI top-level message handler' depends on HAS_IOMEM + default y if ACPI help This enables the central IPMI message handler, required for IPMI to work.
@@ -45,6 +46,7 @@ config IPMI_DEVICE_INTERFACE config IPMI_SI tristate 'IPMI System Interface handler' + default y if ACPI help Provides a driver for System Interfaces (KCS, SMIC, BT). Currently, only KCS and SMIC are supported. If
Signature · 9 lines
1.8.3.1 ------------------------------------------------------------------------------ Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis & security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
Quoted 4 lines · On Sunday, February 23, 2014 08:23:33 PM [email protected] wrote:
Three patches to remove issues with probing interface default, to make sure the driver is completely idle if nothing is happening on it, and to compile the IPMI driver into the kernel if ACPI is enabled.
Quoted 8 lines
The ACPI spec really requires that the IPMI driver be built into the kernel because ACPI uses IPMI for some operations. But some people do not want the driver even using the mimimal amount of CPU it uses when idle. And the default probing, even though sort of implied to be required by the spec, is really a bad idea and can result in hangs on systems with other hardware at those location.
Hopefully these patches make everyone happy.
No objections from my side.
I'll drop the Matthew's patch ([3/3] in this series) from my tree, then, so please carry it along will any followups if needed.
Thanks,
Rafael