Home » Mailing lists » Devel » [PATCH I2O] memory leak in i2o_exec_lct_modified
| [PATCH I2O] memory leak in i2o_exec_lct_modified [message #1889] |
Sat, 04 March 2006 08:26  |
vaverin
Messages: 708
Registered: September 2005
|
Senior Member |
|
|
i2o_exec_lct_modified() does not release memory allocated for work_struct.
Signed-off-by: Vasily Averin <vvs@sw.ru>
Thank you,
Vasily Averin
SWsoft Virtuozzo/OpenVZ Linux kernel team
--- ./drivers/message/i2o/exec-osm.c.i2ml 2006-03-04 11:09:45.000000000 +0300
+++ ./drivers/message/i2o/exec-osm.c 2006-03-04 11:09:03.000000000 +0300
@@ -57,6 +57,11 @@ struct i2o_exec_wait {
struct list_head list; /* node in global wait list */
};
+struct i2o_workqueue {
+ struct work_struct work;
+ struct i2o_controller *c;
+};
+
/* Exec OSM class handling definition */
static struct i2o_class_id i2o_exec_class_id[] = {
{I2O_CLASS_EXECUTIVE},
@@ -355,16 +360,19 @@ static int i2o_exec_remove(struct device
* new LCT and if the buffer for the LCT was to small sends a LCT NOTIFY
* again, otherwise send LCT NOTIFY to get informed on next LCT change.
*/
-static void i2o_exec_lct_modified(struct i2o_controller *c)
+static void i2o_exec_lct_modified(void *data)
{
u32 change_ind = 0;
+ struct i2o_workqueue *cp;
- if (i2o_device_parse_lct(c) != -EAGAIN)
- change_ind = c->lct->change_ind + 1;
+ cp = (struct i2o_workqueue *)data;
+ if (i2o_device_parse_lct(cp->c) != -EAGAIN)
+ change_ind = cp->c->lct->change_ind + 1;
#ifdef CONFIG_I2O_LCT_NOTIFY_ON_CHANGES
- i2o_exec_lct_notify(c, change_ind);
+ i2o_exec_lct_notify(cp->c, change_ind);
#endif
+ kfree(cp);
};
/**
@@ -410,16 +418,22 @@ static int i2o_exec_reply(struct i2o_con
return i2o_msg_post_wait_complete(c, m, msg, context);
if ((le32_to_cpu(msg->u.head[1]) >> 24) == I2O_CMD_LCT_NOTIFY) {
- struct work_struct *work;
+ struct i2o_workqueue *cp;
pr_debug("%s: LCT notify received\n", c->name);
- work = kmalloc(sizeof(*work), GFP_ATOMIC);
- if (!work)
+ cp = kmalloc(sizeof(struct i2o_workqueue), GFP_ATOMIC);
+ if (!cp)
return -ENOMEM;
- INIT_WORK(work, (void (*)(void *))i2o_exec_lct_modified, c);
- queue_work(i2o_exec_driver.event_queue, work);
+ cp->c = c;
+ INIT_WORK(&cp->work, i2o_exec_lct_modified, cp);
+ if (!queue_work(i2o_exec_driver.event_queue, &cp->work)) {
+ printk(KERN_DEBUG "i2o_exec_reply:"
+ " call to queue_work() failed.\n");
+ kfree(cp);
+ return -EIO;
+ }
return 1;
}
|
|
|
|
| Re: [PATCH I2O] memory leak in i2o_exec_lct_modified [message #1914 is a reply to message #1889] |
Sun, 05 March 2006 22:18  |
Markus Lidel
Messages: 7
Registered: March 2006
|
Junior Member |
|
|
Hello,
Vasily Averin wrote:
> i2o_exec_lct_modified() does not release memory allocated for work_struct.
> Signed-off-by: Vasily Averin <vvs@sw.ru>
> ------------------------------------------------------------ ------------
>
> --- ./drivers/message/i2o/exec-osm.c.i2ml 2006-03-04 11:09:45.000000000 +0300
> +++ ./drivers/message/i2o/exec-osm.c 2006-03-04 11:09:03.000000000 +0300
> @@ -57,6 +57,11 @@ struct i2o_exec_wait {
> struct list_head list; /* node in global wait list */
> };
>
> +struct i2o_workqueue {
> + struct work_struct work;
> + struct i2o_controller *c;
> +};
> +
> /* Exec OSM class handling definition */
> static struct i2o_class_id i2o_exec_class_id[] = {
> {I2O_CLASS_EXECUTIVE},
> @@ -355,16 +360,19 @@ static int i2o_exec_remove(struct device
> * new LCT and if the buffer for the LCT was to small sends a LCT NOTIFY
> * again, otherwise send LCT NOTIFY to get informed on next LCT change.
> */
> -static void i2o_exec_lct_modified(struct i2o_controller *c)
> +static void i2o_exec_lct_modified(void *data)
> {
> u32 change_ind = 0;
> + struct i2o_workqueue *cp;
>
> - if (i2o_device_parse_lct(c) != -EAGAIN)
> - change_ind = c->lct->change_ind + 1;
> + cp = (struct i2o_workqueue *)data;
> + if (i2o_device_parse_lct(cp->c) != -EAGAIN)
> + change_ind = cp->c->lct->change_ind + 1;
>
> #ifdef CONFIG_I2O_LCT_NOTIFY_ON_CHANGES
> - i2o_exec_lct_notify(c, change_ind);
> + i2o_exec_lct_notify(cp->c, change_ind);
> #endif
> + kfree(cp);
> };
>
> /**
> @@ -410,16 +418,22 @@ static int i2o_exec_reply(struct i2o_con
> return i2o_msg_post_wait_complete(c, m, msg, context);
>
> if ((le32_to_cpu(msg->u.head[1]) >> 24) == I2O_CMD_LCT_NOTIFY) {
> - struct work_struct *work;
> + struct i2o_workqueue *cp;
>
> pr_debug("%s: LCT notify received\n", c->name);
>
> - work = kmalloc(sizeof(*work), GFP_ATOMIC);
> - if (!work)
> + cp = kmalloc(sizeof(struct i2o_workqueue), GFP_ATOMIC);
> + if (!cp)
> return -ENOMEM;
>
> - INIT_WORK(work, (void (*)(void *))i2o_exec_lct_modified, c);
> - queue_work(i2o_exec_driver.event_queue, work);
> + cp->c = c;
> + INIT_WORK(&cp->work, i2o_exec_lct_modified, cp);
> + if (!queue_work(i2o_exec_driver.event_queue, &cp->work)) {
> + printk(KERN_DEBUG "i2o_exec_reply:"
> + " call to queue_work() failed.\n");
> + kfree(cp);
> + return -EIO;
> + }
> return 1;
> }
>
Although your patch is the same, i've rewritten it a little bit for
naming consistency in the I2O driver.
Thank you very much for your help!
Best regards,
Markus Lidel
------------------------------------------
Markus Lidel (Senior IT Consultant)
Shadow Connect GmbH
Carl-Reisch-Weg 12
D-86381 Krumbach
Germany
Phone: +49 82 82/99 51-0
Fax: +49 82 82/99 51-11
E-Mail: Markus.Lidel@shadowconnect.com
URL: http://www.shadowconnect.com
|
|
|
|
Goto Forum:
Current Time: Tue Aug 26 09:41:04 GMT 2025
Total time taken to generate the page: 0.11034 seconds
|
OpenVZ Forum
Members
Search
Help
Register
Login
Home
