Skip to contentSkip to conversation

workqueue: Allocate the unbound pool using local node memory

PATCH Hillf Danton 2 participants 2 messages Oct 9, 2015 – Oct 10, 2015 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 34 lines

From: Xunlei Pang <[email protected]>

Currently, get_unbound_pool() uses kzalloc() to allocate the worker pool. Actually, we can use the right node to do the allocation, achieving local memory access.

This patch selects target node first, and uses kzalloc_node() instead.

---
 kernel/workqueue.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
kernel/workqueue.c +5 -0
index ca71582..96d3747 100644
@@ -3199,6 +3199,7 @@ static struct worker_pool *get_unbound_pool(const struct workqueue_attrs *attrs)
 	u32 hash = wqattrs_hash(attrs);
 	struct worker_pool *pool;
 	int node;
+	int target_node = NUMA_NO_NODE;
 
 	lockdep_assert_held(&wq_pool_mutex);
 
@@ -3210,13 +3211,25 @@ static struct worker_pool *get_unbound_pool(const struct workqueue_attrs *attrs)
 		}
 	}
 
+	/* if cpumask is contained inside a NUMA node, we belong to that node */
+	if (wq_numa_enabled) {
+		for_each_node(node) {
+			if (cpumask_subset(attrs->cpumask,

kernel/workqueue.c static struct worker_pool *get_unbound_pool(const struct workqueue_attrs *attrs) · line 3226

Quoted 10 lines
kernel/workqueue.c +8 -1
+					   wq_numa_possible_cpumask[node])) {
+				target_node = node;
+				break;
+			}
+		}
+	}
+
 	/* nope, create a new one */
-	pool = kzalloc(sizeof(*pool), GFP_KERNEL);
+	pool = kzalloc_node(sizeof(*pool), GFP_KERNEL, target_node);

What if target_node is short of pages at the moment?

Quoted 29 lines
kernel/workqueue.c +1 -12
 	if (!pool || init_worker_pool(pool) < 0)
 		goto fail;
 
 	lockdep_set_subclass(&pool->lock, 1);	/* see put_pwq() */
 	copy_workqueue_attrs(pool->attrs, attrs);
+	pool->node = target_node;
 
 	/*
 	 * no_numa isn't a worker_pool attribute, always clear it.  See
@@ -3224,17 +3237,6 @@ static struct worker_pool *get_unbound_pool(const struct workqueue_attrs *attrs)
 	 */
 	pool->attrs->no_numa = false;
 
-	/* if cpumask is contained inside a NUMA node, we belong to that node */
-	if (wq_numa_enabled) {
-		for_each_node(node) {
-			if (cpumask_subset(pool->attrs->cpumask,
-					   wq_numa_possible_cpumask[node])) {
-				pool->node = node;
-				break;
-			}
-		}
-	}
-
 	if (worker_pool_assign_id(pool) < 0)
 		goto fail;
 
--

1.9.1

#2 lore raw

Hello,

"Hillf Danton" <[email protected]> wrote 2015-10-09 PM 06:05:20:

Quoted 28 lines

Re: [PATCH] workqueue: Allocate the unbound pool using local node memory

kernel/workqueue.c static struct worker_pool *get_unbound_pool

Quoted 19 lines

From: Xunlei Pang <[email protected]>

Currently, get_unbound_pool() uses kzalloc() to allocate the worker pool. Actually, we can use the right node to do the allocation, achieving local memory access.

This patch selects target node first, and uses kzalloc_node() instead.

---
 kernel/workqueue.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
kernel/workqueue.c +0 -0
index ca71582..96d3747 100644
@@ -3199,6 +3199,7 @@ static struct worker_pool *get_unbound_pool

(const struct workqueue_attrs *attrs)

Quoted 5 lines
kernel/workqueue.c +1 -0
    u32 hash = wqattrs_hash(attrs);
    struct worker_pool *pool;
    int node;
+   int target_node = NUMA_NO_NODE;
 
Quoted 8 lines

kernel/workqueue.c static struct worker_pool

Quoted 3 lines
kernel/workqueue.c +0 -0
    lockdep_assert_held(&wq_pool_mutex);
 
@@ -3210,13 +3211,25 @@ static struct worker_pool 

*get_unbound_pool(const struct workqueue_attrs *attrs)

Quoted 4 lines
kernel/workqueue.c +1 -0
       }
    }
 
+   /* if cpumask is contained inside a NUMA node, we belong to that 

node */

Quoted 14 lines

kernel/workqueue.c static struct worker_pool · line 3226

Quoted 13 lines
kernel/workqueue.c +11 -1
+   if (wq_numa_enabled) {
+      for_each_node(node) {
+         if (cpumask_subset(attrs->cpumask,
+                  wq_numa_possible_cpumask[node])) {
+            target_node = node;
+            break;
+         }
+      }
+   }
+
    /* nope, create a new one */
-   pool = kzalloc(sizeof(*pool), GFP_KERNEL);
+   pool = kzalloc_node(sizeof(*pool), GFP_KERNEL, target_node);
Quoted 1 line

What if target_node is short of pages at the moment?

IIRC, the zonelist to be used contains all nodes' zones in order (otherwise __GFP_THISNODE is set)with target_node's zones having the highest priority, so it should automatically fall back to other nodes if target_node is short of pages.

Regards,
-Xunlei

Quoted 4 lines
Quoted 4 lines
kernel/workqueue.c +0 -0
    if (!pool || init_worker_pool(pool) < 0)
       goto fail;
 
Quoted 12 lines

kernel/workqueue.c static struct worker_pool *get_unbound_pool

Quoted 7 lines
kernel/workqueue.c +1 -0
    lockdep_set_subclass(&pool->lock, 1);   /* see put_pwq() */
    copy_workqueue_attrs(pool->attrs, attrs);
+   pool->node = target_node;
 
    /*
     * no_numa isn't a worker_pool attribute, always clear it.  See
@@ -3224,17 +3237,6 @@ static struct worker_pool *get_unbound_pool

(const struct workqueue_attrs *attrs)

Quoted 4 lines
kernel/workqueue.c +0 -1
     */
    pool->attrs->no_numa = false;
 
-   /* if cpumask is contained inside a NUMA node, we belong to that 

node */

Quoted 13 lines
Quoted 13 lines
kernel/workqueue.c +0 -10
-   if (wq_numa_enabled) {
-      for_each_node(node) {
-         if (cpumask_subset(pool->attrs->cpumask,
-                  wq_numa_possible_cpumask[node])) {
-            pool->node = node;
-            break;
-         }
-      }
-   }
-
    if (worker_pool_assign_id(pool) < 0)
       goto fail;
 
Quoted 3 lines
Quoted 2 lines

--
1.9.1

--------------------------------------------------------
ZTE Information Security Notice: The information contained in this mail (and any attachment transmitted herewith) is privileged and confidential and is intended for the exclusive use of the addressee(s). If you are not an intended recipient, any disclosure, reproduction, distribution or other dissemination or use of the information contained is strictly prohibited. If you have received this mail in error, please delete it and notify us immediately.