linux-next: build failure after merge of the workqueues tree

linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2025 bytes --]

Hi Tejun,

After merging the workqueues tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

kernel/workqueue.c: In function 'unbound_pwq_by_node':
kernel/workqueue.c:570:2: error: implicit declaration of function 'rcu_lockdep_assert' [-Werror=implicit-function-declaration]
  assert_rcu_or_wq_mutex_or_pool_mutex(wq);
  ^
kernel/workqueue.c:570:2: error: implicit declaration of function 'lockdep_is_held' [-Werror=implicit-function-declaration]

Caused by commit:

  5b95e1af8d17 ("workqueue: wq_pool_mutex protects the attrs-installation")

from the workqueues tree interacting with commit:

  eeacf8982637 ("rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()")

from the rcu tree.

I applied the followinf merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 20 Jun 2015 19:39:43 +1000
Subject: [PATCH] workqueue: fix up for rcu_lockdep_assert() rename

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 kernel/workqueue.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 837427cc5bdf..44cd4144ebcb 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -348,10 +348,10 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
 			 "sched RCU or wq->mutex should be held")
 
 #define assert_rcu_or_wq_mutex_or_pool_mutex(wq)			\
-	rcu_lockdep_assert(rcu_read_lock_sched_held() ||		\
-			   lockdep_is_held(&wq->mutex) ||		\
-			   lockdep_is_held(&wq_pool_mutex),		\
-			   "sched RCU, wq->mutex or wq_pool_mutex should be held")
+	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() &&		\
+			 !lockdep_is_held(&wq->mutex) &&		\
+			 !lockdep_is_held(&wq_pool_mutex),		\
+			 "sched RCU, wq->mutex or wq_pool_mutex should be held")
 
 #define for_each_cpu_worker_pool(pool, cpu)				\
 	for ((pool) = &per_cpu(cpu_worker_pools, cpu)[0];		\
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

On Thu, Nov 02, 2017 at 02:34:40PM +1100, Stephen Rothwell wrote:
> Hi Tejun,
> 
> After merging the workqueues tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> kernel/workqueue.c: In function 'workqueue_init_early':
> kernel/workqueue.c:5561:56: error: 'cpu_isolated_map' undeclared (first use in this function)
>   cpumask_andnot(wq_unbound_cpumask, cpu_possible_mask, cpu_isolated_map);
>                                                         ^
> 
> Caused by commit
> 
>   b5149873a0c2 ("workqueue: respect isolated cpus when queueing an unbound work")
> 
> interacting with commit
> 
>   edb9382175c3 ("sched/isolation: Move isolcpus= handling to the housekeeping code")
> 
> from the tip tree.
> 
> I am not sure how to fix this, so I have reverted b5149873a0c2 for today.

I'm reverting it from my tree.  Tal, can you please spin up a new
patch against the sched branch?  Let's either route it through sched
branch or try again after the rc1.

Thanks.

-- 
tejun

linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

Hi Tejun,

After merging the workqueues tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

kernel/workqueue.c: In function 'workqueue_init_early':
kernel/workqueue.c:5561:56: error: 'cpu_isolated_map' undeclared (first use in this function)
  cpumask_andnot(wq_unbound_cpumask, cpu_possible_mask, cpu_isolated_map);
                                                        ^

Caused by commit

  b5149873a0c2 ("workqueue: respect isolated cpus when queueing an unbound work")

interacting with commit

  edb9382175c3 ("sched/isolation: Move isolcpus= handling to the housekeeping code")

from the tip tree.

I am not sure how to fix this, so I have reverted b5149873a0c2 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the workqueues tree

[Dmitry Torokhov]

Hi Stephen,

On Mon, Feb 21, 2011 at 01:27:08PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> On Fri, 18 Feb 2011 14:57:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the workqueues tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/input/input-polldev.c: In function 'input_polldev_init':
> > drivers/input/input-polldev.c:259: error: 'WQ_FREEZEABLE' undeclared (first use in this function)
> > 
> > Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
> > freezer: unify spelling of 'freeze' + 'able' to 'freezable'") interacting
> > with commit 8fb3f6f6bf6e17e97712d216f230ba05f2e88ed8 ("Input:
> > input-polldev - create workqueue upfront") from the input tree.
> > 
> > I applied the following fix up patch (and can carry it as necessary):
> 
> This patch is now applicable after the input tree merge as the workqueues
> patch has been merged into Linus' tree.  So, Dmitry, if you merge Linus'
> tree sometime, you should apply this merge fixup.
> 

Actually I will just pull the patch and wait till Tejun's patch
introducing global freezable workqueue hits mainline and convert
input_polldev to use it.

Thanks.

-- 
Dmitry

Re: linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1926 bytes --]

Hi Dmitry,

On Fri, 18 Feb 2011 14:57:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the workqueues tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/input/input-polldev.c: In function 'input_polldev_init':
> drivers/input/input-polldev.c:259: error: 'WQ_FREEZEABLE' undeclared (first use in this function)
> 
> Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
> freezer: unify spelling of 'freeze' + 'able' to 'freezable'") interacting
> with commit 8fb3f6f6bf6e17e97712d216f230ba05f2e88ed8 ("Input:
> input-polldev - create workqueue upfront") from the input tree.
> 
> I applied the following fix up patch (and can carry it as necessary):

This patch is now applicable after the input tree merge as the workqueues
patch has been merged into Linus' tree.  So, Dmitry, if you merge Linus'
tree sometime, you should apply this merge fixup.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 18 Feb 2011 14:50:46 +1100
> Subject: [PATCH] input: update for FREEZEABLE -> FREEZABLE change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/input/input-polldev.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
> index 0a5304c..d89e9a9 100644
> --- a/drivers/input/input-polldev.c
> +++ b/drivers/input/input-polldev.c
> @@ -257,7 +257,7 @@ static int __init input_polldev_init(void)
>  	 * system goes into sleep mode.
>  	 */
>  	polldev_wq = alloc_workqueue("ipolldev_wq",
> -				     WQ_FREEZEABLE | WQ_UNBOUND, 0);
> +				     WQ_FREEZABLE | WQ_UNBOUND, 0);
>  	if (!polldev_wq) {
>  		pr_err("failed to create ipolldev_wq workqueue\n");
>  		return -ENOMEM;
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

Hello,

On Fri, Feb 18, 2011 at 02:57:47PM +1100, Stephen Rothwell wrote:
> drivers/input/input-polldev.c: In function 'input_polldev_init':
> drivers/input/input-polldev.c:259: error: 'WQ_FREEZEABLE' undeclared (first use in this function)
> 
> Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
> freezer: unify spelling of 'freeze' + 'able' to 'freezable'") interacting
> with commit 8fb3f6f6bf6e17e97712d216f230ba05f2e88ed8 ("Input:
> input-polldev - create workqueue upfront") from the input tree.
> 
> I applied the following fix up patch (and can carry it as necessary):

Yeah, looks good to me.  I already sent pull request for the rename to
Linus so once it gets pulled, Dmitry should be able to pull in the
mainline and resolve the conflict there.

Thank you.

-- 
tejun

linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

Hi Tejun,

After merging the workqueues tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/input/input-polldev.c: In function 'input_polldev_init':
drivers/input/input-polldev.c:259: error: 'WQ_FREEZEABLE' undeclared (first use in this function)

Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
freezer: unify spelling of 'freeze' + 'able' to 'freezable'") interacting
with commit 8fb3f6f6bf6e17e97712d216f230ba05f2e88ed8 ("Input:
input-polldev - create workqueue upfront") from the input tree.

I applied the following fix up patch (and can carry it as necessary):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 18 Feb 2011 14:50:46 +1100
Subject: [PATCH] input: update for FREEZEABLE -> FREEZABLE change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/input/input-polldev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index 0a5304c..d89e9a9 100644
--- a/drivers/input/input-polldev.c
+++ b/drivers/input/input-polldev.c
@@ -257,7 +257,7 @@ static int __init input_polldev_init(void)
 	 * system goes into sleep mode.
 	 */
 	polldev_wq = alloc_workqueue("ipolldev_wq",
-				     WQ_FREEZEABLE | WQ_UNBOUND, 0);
+				     WQ_FREEZABLE | WQ_UNBOUND, 0);
 	if (!polldev_wq) {
 		pr_err("failed to create ipolldev_wq workqueue\n");
 		return -ENOMEM;
-- 
1.7.2.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

Hello,

On Thu, Feb 17, 2011 at 02:33:21PM +1100, Stephen Rothwell wrote:
> Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
> freezer: unify spelling of 'freeze' + 'able' to 'freezable'") being
> mismerged with commit 4149efb22da66e326fc48baf80d628834509f7f0
> ("workqueue: add system_freezeable_wq") which added another use of
> WQ_FREEZEABLE.
> 
> Please do at least simple build testing before submitting to
> linux-next ...

Yeap, please feel free to call me an idiot.  After verifying the
original branch, I completely forgot merge could introduce this type
of silent conflicts.  I apologize for the late screwups.

Thank you.

-- 
tejun

linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 821 bytes --]

Hi Tejun,

After merging the workqueues tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

kernel/workqueue.c: In function 'init_workqueues':
kernel/workqueue.c:3780: error: 'WQ_FREEZEABLE' undeclared (first use in this function)

Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
freezer: unify spelling of 'freeze' + 'able' to 'freezable'") being
mismerged with commit 4149efb22da66e326fc48baf80d628834509f7f0
("workqueue: add system_freezeable_wq") which added another use of
WQ_FREEZEABLE.

Please do at least simple build testing before submitting to
linux-next ...

I have used the version of the workqueues tree from next-20110216 for
today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

Hello,

On Wed, Feb 09, 2011 at 03:12:04PM +1100, Stephen Rothwell wrote:
> After merging the workqueues tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> kernel/built-in.o:(.toc1+0x14c0): undefined reference to `system_freezeable_wq'
> 
> Caused by commit de62c151df9b6568c67977920267392c432f340a ("workqueue:
> add system_freezeable_wq").
> 
> I have used the workqueues tree from next-20110208 for today.

That was embarrassing.  Sorry.  Updated.

-- 
tejun

linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]

Hi Tejun,

After merging the workqueues tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

kernel/built-in.o:(.toc1+0x14c0): undefined reference to `system_freezeable_wq'

Caused by commit de62c151df9b6568c67977920267392c432f340a ("workqueue:
add system_freezeable_wq").

I have used the workqueues tree from next-20110208 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]