Skip to contentSkip to conversation

mpt: modify mptctl_exit() to call proper deregister functions

PATCH In review Kei Tokunaga 2 participants 2 messages Mar 15, 2010 – Mar 17, 2010

Subsystems (2)
SCSI LSI Logic MPT fusion drivers (FC/SAS/SPI)
lore
Share & tools
lore

Kei Tokunaga

author
#0 lore raw

PATCH 1/1 mpt: modify mptctl_exit() to call proper deregister functions

Hi Desai,

This patch fixes some issues of mptctl_exit().

1) It doesn't call mpt_deregister() for mptctl_taskmgmt_id => Insmoding/rmmoding mptctl.ko repeadtedly (up to MPT_MAX_PROTOCOL_DRIVERS-1 at most) can eat up all cb_idx, and that would cause a lack of MptCallbacks[], MptDriverClass[], and MptEvHandlers[].

2) It doesn't call mpt_event_deregister() for mptctl_id => Need to call it.

3) It calls mpt_reset_deregister() for mptctl_taskmgmt_id => This could accidentally deregister an innocent reset handler that you don't want to.

This patch also adds a check for mptctl_taskmgmt_id.

This applies to 2.6.34-rc1.

Thanks,
Kei

Signed-off-by Kei Tokunaga <[email protected]>

---

 linux-2.6.34-rc1-kei/drivers/message/fusion/mptctl.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/message/fusion/mptctl.c renamed from drivers/message/fusion/mptctl.c~fix-mptctl_exit +12 -1
diff -puN drivers/message/fusion/mptctl.c~fix-mptctl_exit drivers/message/fusion/mptctl.c
@@ -2991,6 +2991,14 @@ static int __init mptctl_init(void)
 	}
 
 	mptctl_taskmgmt_id = mpt_register(mptctl_taskmgmt_reply, MPTCTL_DRIVER);
+	if (!mptctl_taskmgmt_id || mptctl_taskmgmt_id >= MPT_MAX_PROTOCOL_DRIVERS) {
+		printk(KERN_ERR MYNAM ": ERROR: Failed to register with Fusion MPT base driver\n");
+		mpt_deregister(mptctl_id);
+		misc_deregister(&mptctl_miscdev);
+		err = -EBUSY;
+		goto out_fail;
+	}
+
 	mpt_reset_register(mptctl_id, mptctl_ioc_reset);
 	mpt_event_register(mptctl_id, mptctl_event_process);
 

@@ -3010,12 +3018,15 @@ static void mptctl_exit(void)
 	printk(KERN_INFO MYNAM ": Deregistered /dev/%s @ (major,minor=%d,%d)\n",
 			 mptctl_miscdev.name, MISC_MAJOR, mptctl_miscdev.minor);
 
+	/* De-register event handler from base module */
+	mpt_event_deregister(mptctl_id);
+
 	/* De-register reset handler from base module */
 	mpt_reset_deregister(mptctl_id);
 
 	/* De-register callback handler from base module */
+	mpt_deregister(mptctl_taskmgmt_id);
 	mpt_deregister(mptctl_id);
-	mpt_reset_deregister(mptctl_taskmgmt_id);
 
         mpt_device_driver_deregister(MPTCTL_DRIVER);

_

#1 lore raw

Kei,

I do agree, your patch looks fine to me. We can consider if for upstream acceptance. Please consider this patch as an ACKed.

--Kashyap

Quoted 88 lines

-----Original Message-----
From: Kei Tokunaga [mailto:[email protected]]
Sent: Monday, March 15, 2010 11:19 AM
To: Desai, Kashyap
Cc: [email protected]; Kei Tokunaga
Subject: [PATCH] mpt: modify mptctl_exit() to call proper deregister functions

Hi Desai,

This patch fixes some issues of mptctl_exit().

1) It doesn't call mpt_deregister() for mptctl_taskmgmt_id => Insmoding/rmmoding mptctl.ko repeadtedly (up to MPT_MAX_PROTOCOL_DRIVERS-1 at most) can eat up all cb_idx, and that would cause a lack of MptCallbacks[],
MptDriverClass[],

        and MptEvHandlers[].

2) It doesn't call mpt_event_deregister() for mptctl_id => Need to call it.

3) It calls mpt_reset_deregister() for mptctl_taskmgmt_id => This could accidentally deregister an innocent reset handler that you don't want to.

This patch also adds a check for mptctl_taskmgmt_id.

This applies to 2.6.34-rc1.

Thanks,
Kei

Signed-off-by Kei Tokunaga <[email protected]>

---

 linux-2.6.34-rc1-kei/drivers/message/fusion/mptctl.c |   13
++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff -puN drivers/message/fusion/mptctl.c~fix-mptctl_exit drivers/message/fusion/mptctl.c
--- linux-2.6.34-rc1/drivers/message/fusion/mptctl.c~fix-mptctl_exit

	2010-03-15 09:40:43.000000000 +0900

+++ linux-2.6.34-rc1-kei/drivers/message/fusion/mptctl.c 2010-03-15
09:40:43.000000000 +0900

drivers/message/fusion/mptctl.c renamed from drivers/message/fusion/mptctl.c~fix-mptctl_exit +8 -0
@@ -2991,6 +2991,14 @@ static int __init mptctl_init(void)
 	}
 
 	mptctl_taskmgmt_id = mpt_register(mptctl_taskmgmt_reply,
 MPTCTL_DRIVER);
+	if (!mptctl_taskmgmt_id || mptctl_taskmgmt_id >=
 MPT_MAX_PROTOCOL_DRIVERS) {
+		printk(KERN_ERR MYNAM ": ERROR: Failed to register with
 Fusion MPT base driver\n");
+		mpt_deregister(mptctl_id);
+		misc_deregister(&mptctl_miscdev);
+		err = -EBUSY;
+		goto out_fail;
+	}
+
drivers/message/fusion/mptctl.c renamed from drivers/message/fusion/mptctl.c~fix-mptctl_exit +4 -1
 	mpt_reset_register(mptctl_id, mptctl_ioc_reset);
 	mpt_event_register(mptctl_id, mptctl_event_process);

@@ -3010,12 +3018,15 @@ static void mptctl_exit(void)
 	printk(KERN_INFO MYNAM ": Deregistered /dev/%s @
 (major,minor=%d,%d)\n",
 			 mptctl_miscdev.name, MISC_MAJOR,
 mptctl_miscdev.minor);
 
+	/* De-register event handler from base module */
+	mpt_event_deregister(mptctl_id);
+
 	/* De-register reset handler from base module */
 	mpt_reset_deregister(mptctl_id);
 
 	/* De-register callback handler from base module */
+	mpt_deregister(mptctl_taskmgmt_id);
 	mpt_deregister(mptctl_id);
-	mpt_reset_deregister(mptctl_taskmgmt_id);
 

         mpt_device_driver_deregister(MPTCTL_DRIVER);

_