[PATCH v3 4/6] net/core: apply pm_runtime_set_memalloc_noio on network devices
From: Ming Lei <hidden>
Date: 2012-10-29 12:25:59
Also in:
linux-mm, linux-pm, lkml
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
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 <redacted> Cc: David Decotigny <redacted> Cc: Tom Herbert <redacted> Cc: Ingo Molnar <redacted> Signed-off-by: Ming Lei <redacted> --- net/core/net-sysfs.c | 5 +++++ 1 file changed, 5 insertions(+)
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;
--
1.7.9.5