From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: <linux-kernel@vger.kernel.org>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>, Tejun Heo <tj@kernel.org>
Subject: [PATCH 5/7 V2] workqueue: reuse the current default pwq when its attrs unchanged
Date: Tue, 12 May 2015 20:32:33 +0800 [thread overview]
Message-ID: <1431433955-3173-6-git-send-email-laijs@cn.fujitsu.com> (raw)
In-Reply-To: <1431433955-3173-1-git-send-email-laijs@cn.fujitsu.com>
When apply_wqattrs_prepare() is called, it is possible that the default
pwq is unaffected. It is always true that only the NUMA affinity is being
changed and sometimes true that the low level cpumask is being changed.
So we try to reuse the current default pwq when its attrs unchanged.
After this change, "ctx->dfl_pwq->refcnt++" could be dangerous
when ctx->dfl_pwq is being reused, so we use get_pwq_unlocked() instead.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
kernel/workqueue.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 24e5fe4..61f8ace 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3587,7 +3587,10 @@ apply_wqattrs_prepare(struct workqueue_struct *wq,
* the default pwq covering whole @attrs->cpumask. Always create
* it even if we don't use it immediately.
*/
- ctx->dfl_pwq = alloc_unbound_pwq(wq, new_attrs);
+ if (wq->dfl_pwq && wqattrs_equal(new_attrs, wq->dfl_pwq->pool->attrs))
+ ctx->dfl_pwq = get_pwq_unlocked(wq->dfl_pwq);
+ else
+ ctx->dfl_pwq = alloc_unbound_pwq(wq, new_attrs);
if (!ctx->dfl_pwq)
goto out_free;
@@ -3602,8 +3605,7 @@ apply_wqattrs_prepare(struct workqueue_struct *wq,
goto out_free;
ctx->pwq_tbl[node] = pwq;
} else {
- ctx->dfl_pwq->refcnt++;
- ctx->pwq_tbl[node] = ctx->dfl_pwq;
+ ctx->pwq_tbl[node] = get_pwq_unlocked(ctx->dfl_pwq);
}
}
--
2.1.0
next prev parent reply other threads:[~2015-05-12 12:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-12 12:32 [PATCH 0/7 V2] workqueue: cleanup for attr management Lai Jiangshan
2015-05-12 12:32 ` [PATCH 1/7 V2] workqueue: wq_pool_mutex protects the attrs-installation Lai Jiangshan
2015-05-12 12:32 ` [PATCH 2/7 V2] workqueue: simplify wq_update_unbound_numa() Lai Jiangshan
2015-05-18 20:21 ` Tejun Heo
2015-05-12 12:32 ` [PATCH 3/7 V2] workqueue: introduce get_pwq_unlocked() Lai Jiangshan
2015-05-18 20:28 ` Tejun Heo
2015-05-18 20:41 ` Tejun Heo
2015-05-12 12:32 ` [PATCH 4/7 V2] workqueue: reuse the current per-node pwq when its attrs unchanged Lai Jiangshan
2015-05-18 20:34 ` Tejun Heo
2015-05-25 9:47 ` Lai Jiangshan
2015-05-26 18:51 ` Tejun Heo
2015-05-12 12:32 ` Lai Jiangshan [this message]
2015-05-18 20:38 ` [PATCH 5/7 V2] workqueue: reuse the current default " Tejun Heo
2015-05-12 12:32 ` [PATCH 6/7 V2] workqueue: reuse wq_update_unbound_numa_attrs_buf as temporary attrs Lai Jiangshan
2015-05-12 12:32 ` [PATCH 7/7 V2] workqueue: add get_node_unbound_pwq() Lai Jiangshan
2015-05-18 0:39 ` [PATCH 0/7 V2] workqueue: cleanup for attr management Lai Jiangshan
2015-05-18 1:26 ` Tejun Heo
2015-05-18 2:06 ` Lai Jiangshan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431433955-3173-6-git-send-email-laijs@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®