From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=213.97.179.56 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792661942; b=lI7ypx0joZpMlVoXIosU5nquALXnzLe0AgpIew8pANi/P8PWeoi71w5oQAXmDSj2chr9 ojuyW2Y0vnOo8BY+6woQGHFpSApLiSFsD5L3neAs0nK8mYduI/FWFnXXSXIv0RVSDV46d mJRmIQMKGCd14+hBVfJ6xaO1b0GaUq4BSpO+N8CTUOLAHwOPbd2jI7J94cAkqYlYP+3nr 8LlaXmHQtenN/soOd34TLeWZ5rGu7+f/DzfOiTNSE4S7Je9T4WJbAYaFw4KH6o3LN35iC UT7Oc3e4nY0GEzgbRBIS3C2VWj3Vb0kgmE5LtWZqKDS68L6DZH4IgGwHvLnu+mhJmoQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792661942; h=DMARC-Filter:DKIM-Signature:Received:From:To:Cc:Subject:Date: Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=OWPsKdHOesUph1DVnQaZQMDjdp6tZdx8drucLPbYHgQ=; b=FqWIWcOImQniRnnZt5yZ5FD7FZ/+K456CgbXJoEAEaA0Jt4pPZVB2FiJns4SCdIsimDV Hx+ggY8Y3PHpECTlBAXAZtWH2eeVVnN79raKTNhxpDo5xHUJ9Cm0iyx9S+XrbtAJDotCi q5OIhTOc1jSd/CIQPuU6qIAerVKS5/hjLcJOX9HW0Xk1DF/18ZiBVJeZlHVi3+IHQWUf2 vobDFINLtY58zPAO/Mlzi7uqPtWpd9ACNLA91ZMx42RQZ9T4zzVimw/iB46gLY6s2/4rI J6RVSXgR8JckKE9tO4aNzHobL5G0WPXrU63itcq5X2XNf2ySUAH5w2pJFCD5zifVgHw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=igalia.com; spf=pass smtp.mailfrom=igalia.com; dkim=pass header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=H4izDL57; arc=none smtp.remote-ip=213.97.179.56 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D48BD606A324 for ; Thu, 22 Oct 2026 09:39:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org D48BD606A324 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=igalia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=H4izDL57 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:From:Reply-To; bh=OWPsKdHOesUph1DVnQaZQMDjdp6tZdx8drucLPbYHgQ=; b= H4izDL57w4YC8AGpnVokwKwhtrEVsaCurQ6PDg3ZM2MeLB9qF9wE3pmuVzjucCvSreKVb1GNIm1wx tf4h+JULA7SmaRYKoVGfx6PU89ZCjUwwsqt2bHEr4IJk94G3Osav3Ysxj2OKsyAnSfpxxHuRLOsbk bke/ltoiYlvPl630uPr0KP6OJbhoU8ed88UtZULjc293x0vSrUACfukOHR0nW7Vrgj8wHCGq5OkA2 iQ18Q9kF97wNkjzFVRyZhRVIXPM1Fgq5/5AKl7azMiloLMPabL5OiKXwR13OXac7KLmqhou1ekjPz MTn10bs18LwlkYrEoHDnh6ge+7l/N7Etzw==; Received: from [81.79.79.1] (helo=localhost) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1xJpG7-006erY-10; Thu, 22 Oct 2026 11:38:51 +0200 From: Tvrtko Ursulin To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, kernel-dev@igalia.com, Tvrtko Ursulin , Boris Brezillon , Bradley Morgan , Chia-I Wu , Liviu Dudau , Matthew Brost , Steven Price , Tejun Heo Subject: [PATCH v7 1/4] workqueue: Simplify unbound sysfs attribute registration Date: Thu, 22 Oct 2026 10:38:45 +0100 Message-ID: <20261022093848.5727-2-tvrtko.ursulin@igalia.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261022093848.5727-1-tvrtko.ursulin@igalia.com> References: <20261022093848.5727-1-tvrtko.ursulin@igalia.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Instead of manually registering each attribute we can put them in an attribute group with a visibility check and device core will handle the rest, which simplifies the registration and error unwind. Signed-off-by: Tvrtko Ursulin Cc: Boris Brezillon Cc: Bradley Morgan Cc: Chia-I Wu Cc: Liviu Dudau Cc: Matthew Brost Cc: Steven Price Cc: Tejun Heo --- v2: * Fix accidental rename of affinity_scope. v3: * SYSFS_GROUP_INVISIBLE should not be used for un-named groups. --- kernel/workqueue.c | 98 ++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 41754f4126a6..d8cf546d853f 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -7599,8 +7599,8 @@ static const struct attribute_group wq_sysfs_group = { }; __ATTRIBUTE_GROUPS(wq_sysfs); -static ssize_t wq_nice_show(struct device *dev, struct device_attribute *attr, - char *buf) +static ssize_t nice_show(struct device *dev, struct device_attribute *attr, + char *buf) { struct workqueue_struct *wq = dev_to_wq(dev); int written; @@ -7627,8 +7627,8 @@ static struct workqueue_attrs *wq_sysfs_prep_attrs(struct workqueue_struct *wq) return attrs; } -static ssize_t wq_nice_store(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t nice_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) { struct workqueue_struct *wq = dev_to_wq(dev); struct workqueue_attrs *attrs; @@ -7652,8 +7652,8 @@ static ssize_t wq_nice_store(struct device *dev, struct device_attribute *attr, return ret ?: count; } -static ssize_t wq_cpumask_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t unbound_cpumask_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct workqueue_struct *wq = dev_to_wq(dev); int written; @@ -7665,9 +7665,9 @@ static ssize_t wq_cpumask_show(struct device *dev, return written; } -static ssize_t wq_cpumask_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t unbound_cpumask_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct workqueue_struct *wq = dev_to_wq(dev); struct workqueue_attrs *attrs; @@ -7689,8 +7689,8 @@ static ssize_t wq_cpumask_store(struct device *dev, return ret ?: count; } -static ssize_t wq_affn_scope_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t affinity_scope_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct workqueue_struct *wq = dev_to_wq(dev); int written; @@ -7708,9 +7708,9 @@ static ssize_t wq_affn_scope_show(struct device *dev, return written; } -static ssize_t wq_affn_scope_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t affinity_scope_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct workqueue_struct *wq = dev_to_wq(dev); struct workqueue_attrs *attrs; @@ -7731,8 +7731,8 @@ static ssize_t wq_affn_scope_store(struct device *dev, return ret ?: count; } -static ssize_t wq_affinity_strict_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t affinity_strict_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct workqueue_struct *wq = dev_to_wq(dev); @@ -7740,9 +7740,9 @@ static ssize_t wq_affinity_strict_show(struct device *dev, wq->attrs->affn_strict); } -static ssize_t wq_affinity_strict_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t affinity_strict_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct workqueue_struct *wq = dev_to_wq(dev); struct workqueue_attrs *attrs; @@ -7762,14 +7762,40 @@ static ssize_t wq_affinity_strict_store(struct device *dev, return ret ?: count; } -static struct device_attribute wq_sysfs_unbound_attrs[] = { - __ATTR(nice, 0644, wq_nice_show, wq_nice_store), - __ATTR(cpumask, 0644, wq_cpumask_show, wq_cpumask_store), - __ATTR(affinity_scope, 0644, wq_affn_scope_show, wq_affn_scope_store), - __ATTR(affinity_strict, 0644, wq_affinity_strict_show, wq_affinity_strict_store), - __ATTR_NULL, +static DEVICE_ATTR_RW(nice); +static DEVICE_ATTR_RW(affinity_scope); +static DEVICE_ATTR_RW(affinity_strict); +/* Avoid naming clash with the other cpumask */ +static struct device_attribute dev_attr_unbound_cpumask = + __ATTR(cpumask, 0644, unbound_cpumask_show, unbound_cpumask_store); + +static struct attribute *wq_sysfs_unbound_attrs[] = { + &dev_attr_nice.attr, + &dev_attr_unbound_cpumask.attr, + &dev_attr_affinity_scope.attr, + &dev_attr_affinity_strict.attr, + NULL, }; +static umode_t wq_sysfs_unbound_group_visible(struct kobject *kobj, + struct attribute *attr, int n) +{ + struct device *dev = kobj_to_dev(kobj); + struct workqueue_struct *wq = dev_to_wq(dev); + + if (!(wq->flags & WQ_UNBOUND)) + return 0; + + return attr->mode; +} + +static const struct attribute_group wq_sysfs_unbound_group = { + .is_visible = wq_sysfs_unbound_group_visible, + .attrs = wq_sysfs_unbound_attrs, +}; + +__ATTRIBUTE_GROUPS(wq_sysfs_unbound); + static const struct bus_type wq_subsys = { .name = "workqueue", .dev_groups = wq_sysfs_groups, @@ -7907,14 +7933,9 @@ int workqueue_sysfs_register(struct workqueue_struct *wq) wq_dev->wq = wq; wq_dev->dev.bus = &wq_subsys; wq_dev->dev.release = wq_device_release; + wq_dev->dev.groups = wq_sysfs_unbound_groups; dev_set_name(&wq_dev->dev, "%s", wq->name); - /* - * attrs are created separately. Suppress uevent until - * everything is ready. - */ - dev_set_uevent_suppress(&wq_dev->dev, true); - ret = device_register(&wq_dev->dev); if (ret) { put_device(&wq_dev->dev); @@ -7922,21 +7943,6 @@ int workqueue_sysfs_register(struct workqueue_struct *wq) return ret; } - if (wq->flags & WQ_UNBOUND) { - struct device_attribute *attr; - - for (attr = wq_sysfs_unbound_attrs; attr->attr.name; attr++) { - ret = device_create_file(&wq_dev->dev, attr); - if (ret) { - device_unregister(&wq_dev->dev); - wq->wq_dev = NULL; - return ret; - } - } - } - - dev_set_uevent_suppress(&wq_dev->dev, false); - kobject_uevent(&wq_dev->dev.kobj, KOBJ_ADD); return 0; } -- 2.56.0