From: "Eric W. Biederman" <ebiederm@xmission.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ingo Molnar <mingo@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the userns tree
Date: Wed, 16 Mar 2022 08:54:15 -0500 [thread overview]
Message-ID: <871qz257g8.fsf@email.froward.int.ebiederm.org> (raw)
In-Reply-To: <20220316165612.4f50faad@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 16 Mar 2022 16:56:12 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> After merging the userns tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> kernel/sched/fair.c: In function 'init_numa_balancing':
> kernel/sched/fair.c:2884:9: error: implicit declaration of function 'init_task_work'; did you mean 'init_irq_work'? [-Werror=implicit-function-declaration]
> 2884 | init_task_work(&p->numa_work, task_numa_work);
> | ^~~~~~~~~~~~~~
> | init_irq_work
> kernel/sched/fair.c: In function 'task_tick_numa':
> kernel/sched/fair.c:2935:25: error: implicit declaration of function 'task_work_add' [-Werror=implicit-function-declaration]
> 2935 | task_work_add(curr, work, TWA_RESUME);
> | ^~~~~~~~~~~~~
> kernel/sched/fair.c:2935:51: error: 'TWA_RESUME' undeclared (first use in this function)
> 2935 | task_work_add(curr, work, TWA_RESUME);
> | ^~~~~~~~~~
>
> Maybe caused by commit
>
> 03248addadf1 ("resume_user_mode: Move to resume_user_mode.h")
> or
> 8ca07e17c9dd ("task_work: Remove unnecessary include from posix_timers.h")
Yes. That has the potential to have hidden a bug like this.
> interacting with (maybe) commit
>
> c4ad6fcb67c4 ("sched/headers: Reorganize, clean up and optimize kernel/sched/fair.c dependencies")
>
> from the tip tree.
>
It is commit 4ff8f2ca6ccd ("sched/headers: Reorganize, clean up and
optimize kernel/sched/sched.h dependencies") that ultimately removes the
include of task_work.h from "sched.h".
But yes ideally commit c4ad6fcb67c4 ("sched/headers: Reorganize, clean
up and optimize kernel/sched/fair.c dependencies") would have added an
include of task_work.h into kernel/sched/fair.c
Ingo any chance you can fix this in your tree? kernel/sched/fair.c
needs to include <linux/task_work.h> regardless. So I don't think this
is a bad thing.
Eric
> I have applied this merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 16 Mar 2022 16:41:42 +1100
> Subject: [PATCH] fixup for moving of linux/task_work.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> kernel/sched/fair.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index 89d21fda106c..7a6678fdffb0 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -31,6 +31,7 @@
> #include <linux/lockdep_api.h>
> #include <linux/softirq.h>
> #include <linux/refcount_api.h>
> +#include <linux/task_work.h>
> #include <linux/topology.h>
> #include <linux/sched/clock.h>
> #include <linux/sched/cond_resched.h>
> --
>
> 2.34.1
next prev parent reply other threads:[~2022-03-16 14:33 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-16 5:56 linux-next: build failure after merge of the userns tree Stephen Rothwell
2022-03-16 13:54 ` Eric W. Biederman [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-17 7:34 Stephen Rothwell
2021-12-17 16:53 ` Eric W. Biederman
2021-12-17 7:13 Stephen Rothwell
2021-10-20 3:46 Stephen Rothwell
2021-10-20 16:00 ` Eric W. Biederman
2021-10-07 3:47 Stephen Rothwell
2021-10-07 18:56 ` Eric W. Biederman
2020-05-21 8:22 Stephen Rothwell
2018-03-28 7:41 Stephen Rothwell
2018-03-28 18:32 ` Eric W. Biederman
2018-01-26 1:05 Stephen Rothwell
2018-01-26 2:45 ` Eric W. Biederman
2017-07-20 3:25 Stephen Rothwell
2017-07-20 12:17 ` Eric W. Biederman
2015-05-25 10:39 Stephen Rothwell
2014-04-17 5:12 Stephen Rothwell
2014-04-17 7:18 ` Eric W. Biederman
2014-04-22 1:34 ` Stephen Rothwell
2013-11-08 7:07 Stephen Rothwell
2013-11-08 23:15 ` Eric W. Biederman
2013-11-11 5:25 ` Stephen Rothwell
2013-11-08 6:58 Stephen Rothwell
2013-11-08 7:27 ` Christoph Hellwig
2013-11-08 15:55 ` Al Viro
2013-11-08 22:50 ` Eric W. Biederman
2013-11-09 8:32 ` Christoph Hellwig
2012-09-24 12:18 Stephen Rothwell
2012-05-21 7:50 Stephen Rothwell
2012-05-21 22:05 ` Eric W. Biederman
2012-05-14 9:13 Stephen Rothwell
2012-05-16 1:12 ` Eric W. Biederman
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=871qz257g8.fsf@email.froward.int.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).