Now that the driver core can properly handle constant struct bus_type,
move the wq_subsys variable to be a constant structure as well,
placing it into read-only memory which can not be modified at runtime.
Cc: Greg Kroah-Hartman <[email protected]>
Suggested-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Ricardo B. Marliere <[email protected]>
---
kernel/workqueue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index ffb625db9771..09caa1a34630 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -6686,7 +6686,7 @@ static struct device_attribute wq_sysfs_unbound_attrs[] = {
__ATTR_NULL,
};
-static struct bus_type wq_subsys = {
+static const struct bus_type wq_subsys = {
.name = "workqueue",
.dev_groups = wq_sysfs_groups,
};
---
base-commit: d49e20ca05ef22580bd4ae3219a31e4630f8df97
change-id: 20240204-bus_cleanup-workqueue-b5544924b8b9
Best regards,
--
Ricardo B. Marliere <[email protected]>
On Sun, Feb 04, 2024 at 10:47:05AM -0300, Ricardo B. Marliere wrote:
> Now that the driver core can properly handle constant struct bus_type,
> move the wq_subsys variable to be a constant structure as well,
> placing it into read-only memory which can not be modified at runtime.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Suggested-by: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Ricardo B. Marliere <[email protected]>
> ---
> kernel/workqueue.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Greg Kroah-Hartman <[email protected]>
On Sun, Feb 04, 2024 at 10:47:05AM -0300, Ricardo B. Marliere wrote:
> Now that the driver core can properly handle constant struct bus_type,
> move the wq_subsys variable to be a constant structure as well,
> placing it into read-only memory which can not be modified at runtime.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Suggested-by: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Ricardo B. Marliere <[email protected]>
Applied to wq/for-6.9.
Thanks.
--
tejun
On Tue, Feb 06, 2024 at 03:05:06PM -0300, Ricardo B. Marliere wrote:
> Now that the driver core can properly handle constant struct bus_type,
> move the wq_subsys variable to be a constant structure as well,
> placing it into read-only memory which can not be modified at runtime.
>
> Suggested-by: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Ricardo B. Marliere <[email protected]>
> ---
> The maintainer asked [1] for this patch to be received through the
> driver-core tree.
> [1]: https://lore.kernel.org/all/[email protected]/
There is no cross-tree dependency at all, but hey, I'll take it, no
worries...
thanks,
greg k-h
On Wed, Feb 07, 2024 at 10:12:34AM +0000, Greg Kroah-Hartman wrote:
> On Tue, Feb 06, 2024 at 03:05:06PM -0300, Ricardo B. Marliere wrote:
> > Now that the driver core can properly handle constant struct bus_type,
> > move the wq_subsys variable to be a constant structure as well,
> > placing it into read-only memory which can not be modified at runtime.
> >
> > Suggested-by: Greg Kroah-Hartman <[email protected]>
> > Signed-off-by: Ricardo B. Marliere <[email protected]>
> > ---
> > The maintainer asked [1] for this patch to be received through the
> > driver-core tree.
> > [1]: https://lore.kernel.org/all/[email protected]/
>
> There is no cross-tree dependency at all, but hey, I'll take it, no
> worries...
Ah, my bad. I branched out wq/for-6.9 before rc1 and was assuming the
dependent commit was still in the driver core branch. I should have just
pulled linus#master. That said, that patch going through driver-core should
still be fine.
Thanks.
--
tejun
On Wed, Feb 07, 2024 at 06:34:27AM -1000, Tejun Heo wrote:
> On Wed, Feb 07, 2024 at 10:12:34AM +0000, Greg Kroah-Hartman wrote:
> > On Tue, Feb 06, 2024 at 03:05:06PM -0300, Ricardo B. Marliere wrote:
> > > Now that the driver core can properly handle constant struct bus_type,
> > > move the wq_subsys variable to be a constant structure as well,
> > > placing it into read-only memory which can not be modified at runtime.
> > >
> > > Suggested-by: Greg Kroah-Hartman <[email protected]>
> > > Signed-off-by: Ricardo B. Marliere <[email protected]>
> > > ---
> > > The maintainer asked [1] for this patch to be received through the
> > > driver-core tree.
> > > [1]: https://lore.kernel.org/all/[email protected]/
> >
> > There is no cross-tree dependency at all, but hey, I'll take it, no
> > worries...
>
> Ah, my bad. I branched out wq/for-6.9 before rc1 and was assuming the
> dependent commit was still in the driver core branch. I should have just
> pulled linus#master.
The dependent changes are in 6.4, so before -rc1 would have been ok as
well :)
> That said, that patch going through driver-core should still be fine.
Great, will do that, thanks!
greg k-jh
On Thu, Feb 08, 2024 at 10:10:56AM +0000, Greg Kroah-Hartman wrote:
> On Wed, Feb 07, 2024 at 06:34:27AM -1000, Tejun Heo wrote:
> > On Wed, Feb 07, 2024 at 10:12:34AM +0000, Greg Kroah-Hartman wrote:
> > > On Tue, Feb 06, 2024 at 03:05:06PM -0300, Ricardo B. Marliere wrote:
> > > > Now that the driver core can properly handle constant struct bus_type,
> > > > move the wq_subsys variable to be a constant structure as well,
> > > > placing it into read-only memory which can not be modified at runtime.
> > > >
> > > > Suggested-by: Greg Kroah-Hartman <[email protected]>
> > > > Signed-off-by: Ricardo B. Marliere <[email protected]>
> > > > ---
> > > > The maintainer asked [1] for this patch to be received through the
> > > > driver-core tree.
> > > > [1]: https://lore.kernel.org/all/[email protected]/
> > >
> > > There is no cross-tree dependency at all, but hey, I'll take it, no
> > > worries...
> >
> > Ah, my bad. I branched out wq/for-6.9 before rc1 and was assuming the
> > dependent commit was still in the driver core branch. I should have just
> > pulled linus#master.
>
> The dependent changes are in 6.4, so before -rc1 would have been ok as
> well :)
Hmmm....
> git log -1 --oneline 32f78abe59c7
32f78abe59c7 driver core: bus: constantify subsys_register() calls
> git describe --contains 32f78abe59c7
v6.8-rc1~61^2~10
--
tejun
On Thu, Feb 08, 2024 at 06:54:57AM -1000, Tejun Heo wrote:
> On Thu, Feb 08, 2024 at 10:10:56AM +0000, Greg Kroah-Hartman wrote:
> > On Wed, Feb 07, 2024 at 06:34:27AM -1000, Tejun Heo wrote:
> > > On Wed, Feb 07, 2024 at 10:12:34AM +0000, Greg Kroah-Hartman wrote:
> > > > On Tue, Feb 06, 2024 at 03:05:06PM -0300, Ricardo B. Marliere wrote:
> > > > > Now that the driver core can properly handle constant struct bus_type,
> > > > > move the wq_subsys variable to be a constant structure as well,
> > > > > placing it into read-only memory which can not be modified at runtime.
> > > > >
> > > > > Suggested-by: Greg Kroah-Hartman <[email protected]>
> > > > > Signed-off-by: Ricardo B. Marliere <[email protected]>
> > > > > ---
> > > > > The maintainer asked [1] for this patch to be received through the
> > > > > driver-core tree.
> > > > > [1]: https://lore.kernel.org/all/[email protected]/
> > > >
> > > > There is no cross-tree dependency at all, but hey, I'll take it, no
> > > > worries...
> > >
> > > Ah, my bad. I branched out wq/for-6.9 before rc1 and was assuming the
> > > dependent commit was still in the driver core branch. I should have just
> > > pulled linus#master.
> >
> > The dependent changes are in 6.4, so before -rc1 would have been ok as
> > well :)
>
> Hmmm....
>
> > git log -1 --oneline 32f78abe59c7
> 32f78abe59c7 driver core: bus: constantify subsys_register() calls
> > git describe --contains 32f78abe59c7
> v6.8-rc1~61^2~10
Ugh, sorry, you are totally right. Too many different "make X const"
series are floating around now, my fault. I'll go suck this in now to
end the pointless discussion where I am proven wrong multiple times :)
greg k-h