On Wed, Jul 31, 2013 at 06:27:52AM -0400, Tejun Heo wrote:
> Hello,
>
> On Wed, Jul 31, 2013 at 09:39:29AM +0800, Shaohua Li wrote:
> > Hmm, I didn't agree it's more confusing to change copy_workqueue_attrs(),
> > the
>
> We're talking past each other. I'm not saying copy_workqueue_attrs()
> shouldn't copy no_numa. I'm saying get_unbound_pool() should clear
> no_numa so that pools don't have random no_numa settings.
>
> > name of the function suggests it is a 'copy'. And clearing no_numa in
> > apply_workqueue_attrs() after copy_workqueue_attrs() looks like a hack to
> > me.
>
> Why would apply_workqueue_attrs() modify no_numa when it *is* dealing
> with an actual workqueue attr. I've been talking about
> get_unbound_pool() not apply_workqueue_attrs() the whole time.
>
> > But it depends on you, feel free to fix it by yourself.
>
> Please update the patch to add no_numa clearing to get_unbound_pool()
> and explain what's going on.
Something like this?
Subject: workqueue: copy workqueue_attrs with all fields
$echo '0' > /sys/bus/workqueue/devices/xxx/numa
$cat /sys/bus/workqueue/devices/xxx/numa
I got 1. It should be 0, the reason is copy_workqueue_attrs() called in
apply_workqueue_attrs() doesn't copy no_numa field.
Signed-off-by: Shaohua Li <s...@fusionio.com>
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0b72e81..daf3f03 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3411,6 +3411,7 @@ static void copy_workqueue_attrs(struct workqueue_attrs
*to,
{
to->nice = from->nice;
cpumask_copy(to->cpumask, from->cpumask);
+ to->no_numa = from->no_numa;
}
/* hash value of the content of @attr */
@@ -3578,6 +3579,12 @@ static struct worker_pool *get_unbound_pool(const struct
workqueue_attrs *attrs)
lockdep_set_subclass(&pool->lock, 1); /* see put_pwq() */
copy_workqueue_attrs(pool->attrs, attrs);
+ /*
+ * no_numa isn't a worker_pool attribute, always clear it. See 'struct
+ * workqueue_attrs' comments for detail.
+ */
+ pool->attrs->no_numa = 0;
+
/* if cpumask is contained inside a NUMA node, we belong to that node */
if (wq_numa_enabled) {
for_each_node(node) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
