uml:
PATCH 1/1 uml:
fixup the work on stack and exit scope trouble by placing the work_struct in the uml_net_private data.
--- arch/um/drivers/net_kern.c | 15 +++++++++------ arch/um/include/net_kern.h | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-)
arch/um/drivers/net_kern.c +9 -6
@@ -72,9 +72,11 @@ static int uml_net_rx(struct net_devicereturn pkt_len; } -static void uml_dev_close (void * dev) +static void uml_dev_close (struct work_struct *work) { -dev_close ( (struct net_device *) dev); +struct uml_net_private *lp = + container_of(work, struct uml_net_private, work); +dev_close (lp->dev); }irqreturn_t uml_net_interrupt (int irq,void *dev_id)
@@ -89,7 +91,6 @@ irqreturn_t uml_net_interrupt(int irq, vspin_lock (&lp->lock);while ((err =uml_net_rx (dev)) >0 ) ;if (err <0 ) { -DECLARE_WORK (close_work, uml_dev_close, dev);printk (KERN_ERR "Device '%s' read returned %d, shutting it down\n" , dev->name, err);
@@ -97,9 +98,10 @@ irqreturn_t uml_net_interrupt(int irq, v* again lp->lock. * And dev_close() can be safely called multiple times on the * same device, since it tests for (dev->flags & IFF_UP). So -* there's no harm in delaying the device shutdown. */ -schedule_work (&close_work); -#error this is not permitted - close_work will go out of scope +* there's no harm in delaying the device shutdown. +* Furthermore, the workqueue will not re-enqueue an already +* enqueued work item. */ +schedule_work (&lp->work); goto out; }reactivate_fd (lp->fd,UM_ETH_IRQ );
@@ -366,6 +368,7 @@ static int eth_configure(int n, void *in/* This points to the transport private data. It's still clear, but we * must memset it to 0 *now*. Let's help the drivers. */ memset (lp,0 , size); +INIT_WORK (&lp->work, uml_dev_close);/* sysfs register */ if (!driver_registered) {
arch/um/include/net_kern.h +2 -0
@@ -11,6 +11,7 @@#include <linux/skbuff.h> #include <linux/socket.h> #include <linux/list.h> +#include <linux/workqueue.h> struct uml_net {struct list_head list;
@@ -26,6 +27,7 @@ struct uml_net_private {struct net_device *dev;struct timer_list tl;struct net_device_stats stats; +struct work_struct work;int fd;unsigned char mac[ETH_ALEN ];unsigned short (*protocol)(struct sk_buff *);
Re: [PATCH] uml: fix net_kern workqueue abuse
Garh, it seems I forgot to finish the subject.
Quoted 84 lines · Peter Zijlstra
fixup the work on stack and exit scope trouble by placing the
work_structin theuml_net_privatedata.Signed-off-by Peter Zijlstra <[email protected]>--- arch/um/drivers/net_kern.c | 15 +++++++++------ arch/um/include/net_kern.h | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-)Index:
linux-2.6-git/arch/um/drivers/net_kern.c
===================================================================arch/um/drivers/net_kern.c +9
-6@@ -72,9 +72,11 @@ static int uml_net_rx(struct net_devicereturn pkt_len; } -static void uml_dev_close (void * dev) +static void uml_dev_close (struct work_struct *work) { -dev_close ( (struct net_device *) dev); +struct uml_net_private *lp = + container_of(work, struct uml_net_private, work); +dev_close (lp->dev); }irqreturn_t uml_net_interrupt (int irq,void *dev_id)@@ -89,7 +91,6 @@ irqreturn_t uml_net_interrupt(int irq, vspin_lock (&lp->lock);while ((err =uml_net_rx (dev)) >0 ) ;if (err <0 ) { -DECLARE_WORK (close_work, uml_dev_close, dev);printk (KERN_ERR "Device '%s' read returned %d, shutting it down\n" , dev->name, err);@@ -97,9 +98,10 @@ irqreturn_t uml_net_interrupt(int irq, v* again lp->lock. * And dev_close() can be safely called multiple times on the * same device, since it tests for (dev->flags & IFF_UP). So -* there's no harm in delaying the device shutdown. */ -schedule_work (&close_work); -#error this is not permitted - close_work will go out of scope +* there's no harm in delaying the device shutdown. +* Furthermore, the workqueue will not re-enqueue an already +* enqueued work item. */ +schedule_work (&lp->work); goto out; }reactivate_fd (lp->fd,UM_ETH_IRQ );@@ -366,6 +368,7 @@ static int eth_configure(int n, void *in/* This points to the transport private data. It's still clear, but we * must memset it to 0 *now*. Let's help the drivers. */ memset (lp,0 , size); +INIT_WORK (&lp->work, uml_dev_close);/* sysfs register */ if (!driver_registered) {Index:
linux-2.6-git/arch/um/include/net_kern.h
===================================================================arch/um/include/net_kern.h +2
-1@@ -11,6 +11,7 @@#include <linux/skbuff.h> #include <linux/socket.h> #include <linux/list.h> +#include <linux/workqueue.h> struct uml_net {struct list_head list;@@ -26,6 +27,7 @@ struct uml_net_private {struct net_device *dev;struct timer_list tl;struct net_device_stats stats; +struct work_struct work;int fd;unsigned char mac[ETH_ALEN ];unsigned short (*protocol)(struct sk_buff *); -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Quoted 5 lines · Peter Zijlstra
fixup the work on stack and exit scope trouble by placing the
work_structin theuml_net_privatedata.Signed-off-by Peter Zijlstra <[email protected]>
Signature · 1 line
Work email - jdike at linux dot intel dot com