[PATCH] ipmi: Fix IPMI errors due to timing problems

[PATCH] ipmi: Fix IPMI errors due to timing problems

[Corey Minyard]

From: Doe, YiCheng <yicheng.doe@hp.com>

This patch fixes an issue in OpenIPMI module where sometimes an ABORT command
is sent after sending an IPMI request to BMC causing the IPMI request to fail.

Signed-off-by: YiCheng Doe <yicheng.doe@hp.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Acked-by: Tom Mingarelli <thomas.mingarelli@hp.com>
Tested-by: Andy Cress <andy.cress@us.kontron.com>
Tested-by: Mika Lansirine <Mika.Lansirinne@stonesoft.com>
Tested-by: Brian De Wolf <bldewolf@csupomona.edu>
Cc: Jean Michel Audet <Jean-Michel.Audet@ca.Kontron.com>
Cc: Jozef Sudelsky <jozef.sudolsky@elbiahosting.sk>
Cc: Matthew Garrett <mjg@redhat.com>
---
 drivers/char/ipmi/ipmi_si_intf.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 7855f9f..5b88096 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -900,6 +900,14 @@ static void sender(void                *send_info,
 	printk("**Enqueue: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
 
+	/*
+	 * last_timeout_jiffies is updated here to avoid
+	 * smi_timeout() handler passing very large time_diff
+	 * value to smi_event_handler() that causes
+	 * the send command to abort.
+	 */
+	smi_info->last_timeout_jiffies ÿiffies;
+
 	mod_timer(&smi_info->si_timer, jiffies + SI_TIMEOUT_JIFFIES);
 
 	if (smi_info->thread)
-- 
1.7.1

Re: [PATCH] ipmi: Fix IPMI errors due to timing problems

[Matthew Garrett]

On Thu, Mar 10, 2011 at 01:12:50PM -0600, Corey Minyard wrote:

> +	smi_info->last_timeout_jiffies ?iffies;

Something looks mangled here? Otherwise, ACK.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [PATCH] ipmi: Fix IPMI errors due to timing problems

[Corey Minyard]

On 03/10/2011 01:17 PM, Matthew Garrett wrote:
> On Thu, Mar 10, 2011 at 01:12:50PM -0600, Corey Minyard wrote:
>
>> +	smi_info->last_timeout_jiffies ?iffies;
> Something looks mangled here? Otherwise, ACK.
>
I have no idea how that happened, but it wasn't that way before I 
compiled with it.  I guess I'll resend.

-corey

[PATCH] ipmi: Fix IPMI errors due to timing problems

[Corey Minyard]

From: Doe, YiCheng <yicheng.doe@hp.com>

This patch fixes an issue in OpenIPMI module where sometimes an ABORT command
is sent after sending an IPMI request to BMC causing the IPMI request to fail.

Signed-off-by: YiCheng Doe <yicheng.doe@hp.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Acked-by: Tom Mingarelli <thomas.mingarelli@hp.com>
Tested-by: Andy Cress <andy.cress@us.kontron.com>
Tested-by: Mika Lansirine <Mika.Lansirinne@stonesoft.com>
Tested-by: Brian De Wolf <bldewolf@csupomona.edu>
Cc: Jean Michel Audet <Jean-Michel.Audet@ca.Kontron.com>
Cc: Jozef Sudelsky <jozef.sudolsky@elbiahosting.sk>
Cc: Matthew Garrett <mjg@redhat.com>
---
 drivers/char/ipmi/ipmi_si_intf.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 7855f9f..62787e3 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -900,6 +900,14 @@ static void sender(void                *send_info,
 	printk("**Enqueue: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
 
+	/*
+	 * last_timeout_jiffies is updated here to avoid
+	 * smi_timeout() handler passing very large time_diff
+	 * value to smi_event_handler() that causes
+	 * the send command to abort.
+	 */
+	smi_info->last_timeout_jiffies = jiffies;
+
 	mod_timer(&smi_info->si_timer, jiffies + SI_TIMEOUT_JIFFIES);
 
 	if (smi_info->thread)
-- 
1.7.1

Re: [PATCH] ipmi: Fix IPMI errors due to timing problems

[Matthew Garrett]

On Thu, Mar 10, 2011 at 02:00:21PM -0600, Corey Minyard wrote:
> From: Doe, YiCheng <yicheng.doe@hp.com>
> 
> This patch fixes an issue in OpenIPMI module where sometimes an ABORT command
> is sent after sending an IPMI request to BMC causing the IPMI request to fail.
> 
> Signed-off-by: YiCheng Doe <yicheng.doe@hp.com>
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> Acked-by: Tom Mingarelli <thomas.mingarelli@hp.com>
> Tested-by: Andy Cress <andy.cress@us.kontron.com>
> Tested-by: Mika Lansirine <Mika.Lansirinne@stonesoft.com>
> Tested-by: Brian De Wolf <bldewolf@csupomona.edu>
> Cc: Jean Michel Audet <Jean-Michel.Audet@ca.Kontron.com>
> Cc: Jozef Sudelsky <jozef.sudolsky@elbiahosting.sk>
> Cc: Matthew Garrett <mjg@redhat.com>

Acked-by: Matthew Garrett <mjg@redhat.com>

-- 
Matthew Garrett | mjg59@srcf.ucam.org