| Message ID | 1350894794-1494-5-git-send-email-ming.lei@canonical.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 22 Oct 2012, Ming Lei wrote: > Deadlock might be caused by allocating memory with GFP_KERNEL in > runtime_resume callback of network devices in iSCSI situation, so > mark network devices and its ancestor as 'memalloc_noio_resume' > with the introduced pm_runtime_set_memalloc_noio(). Is this really needed? Even with iSCSI, doesn't register_disk() have to be called for the underlying block device? And given your 3/6 patch, wouldn't that mark the network device? Alan Stern -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 23, 2012 at 3:18 AM, Alan Stern <stern@rowland.harvard.edu> wrote: > On Mon, 22 Oct 2012, Ming Lei wrote: > Is this really needed? Even with iSCSI, doesn't register_disk() have > to be called for the underlying block device? And given your 3/6 > patch, wouldn't that mark the network device? The problem is that network device is not one ancestor of the iSCSI disk device, which transfers data over tcp stack. Thanks, -- Ming Lei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index bcf02f6..9aba5be 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -22,6 +22,7 @@ #include <linux/vmalloc.h> #include <linux/export.h> #include <linux/jiffies.h> +#include <linux/pm_runtime.h> #include <net/wext.h> #include "net-sysfs.h" @@ -1386,6 +1387,8 @@ void netdev_unregister_kobject(struct net_device * net) remove_queue_kobjects(net); + pm_runtime_set_memalloc_noio(dev, false); + device_del(dev); } @@ -1411,6 +1414,8 @@ int netdev_register_kobject(struct net_device *net) *groups++ = &netstat_group; #endif /* CONFIG_SYSFS */ + pm_runtime_set_memalloc_noio(dev, true); + error = device_add(dev); if (error) return error;
Deadlock might be caused by allocating memory with GFP_KERNEL in runtime_resume callback of network devices in iSCSI situation, so mark network devices and its ancestor as 'memalloc_noio_resume' with the introduced pm_runtime_set_memalloc_noio(). Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: David Decotigny <david.decotigny@google.com> Cc: Tom Herbert <therbert@google.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Ming Lei <ming.lei@canonical.com> --- net/core/net-sysfs.c | 5 +++++ 1 file changed, 5 insertions(+)