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

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

[Stephen Rothwell]

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

Hi all,

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

kernel/sysctl.c:1776:36: error: 'C_A_D' undeclared here (not in a function)
 1776 |                 .data           = &C_A_D,
      |                                    ^~~~~

Caused by commit

  84053cc7ef2f ("ftrace: move sysctl_ftrace_enabled to ftrace.c")

I can't imagine how that happened (though I do note that the whole branch
has been rebased and not tested :-( ).

I have used the sysctl tree from next-20220329 for today.

-- 
Cheers,
Stephen Rothwell

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

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

[Luis Chamberlain]

On Wed, Mar 30, 2022 at 11:56:17AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sysctl tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> kernel/sysctl.c:1776:36: error: 'C_A_D' undeclared here (not in a function)
>  1776 |                 .data           = &C_A_D,
>       |                                    ^~~~~
> 
> Caused by commit
> 
>   84053cc7ef2f ("ftrace: move sysctl_ftrace_enabled to ftrace.c")
> 
> I can't imagine how that happened (though I do note that the whole branch
> has been rebased and not tested :-( ).

Sorry about that, indeed I rebased it and only test compiled the
conflicts.

> I have used the sysctl tree from next-20220329 for today.

I'll push to 0-day testing before pushing a new iteration.
Trying to prepare to push to Linus.

  Luis

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

[Stephen Rothwell]

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

Hi all,

On Wed, 30 Mar 2022 11:56:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the sysctl tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> kernel/sysctl.c:1776:36: error: 'C_A_D' undeclared here (not in a function)
>  1776 |                 .data           = &C_A_D,
>       |                                    ^~~~~
> 
> Caused by commit
> 
>   84053cc7ef2f ("ftrace: move sysctl_ftrace_enabled to ftrace.c")
> 
> I can't imagine how that happened (though I do note that the whole branch
> has been rebased and not tested :-( ).
> 
> I have used the sysctl tree from next-20220329 for today.

I am still getting this failure.

-- 
Cheers,
Stephen Rothwell

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

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

[Luis Chamberlain]

On Mon, Apr 04, 2022 at 10:26:17AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 30 Mar 2022 11:56:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> > 
> > After merging the sysctl tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > kernel/sysctl.c:1776:36: error: 'C_A_D' undeclared here (not in a function)
> >  1776 |                 .data           = &C_A_D,
> >       |                                    ^~~~~
> > 
> > Caused by commit
> > 
> >   84053cc7ef2f ("ftrace: move sysctl_ftrace_enabled to ftrace.c")
> > 
> > I can't imagine how that happened (though I do note that the whole branch
> > has been rebased and not tested :-( ).
> > 
> > I have used the sysctl tree from next-20220329 for today.
> 
> I am still getting this failure.

I have fixed these issues in a new push to sysctl-next just now.
This all goes tested through 0-day with no issues found there.
Sorry for the delay in fixing this.

  Luis

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

[Stephen Rothwell]

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

Hi Luis,

On Sun, 3 Apr 2022 18:46:47 -0700 Luis Chamberlain <mcgrof@kernel.org> wrote:
>
> I have fixed these issues in a new push to sysctl-next just now.
> This all goes tested through 0-day with no issues found there.
> Sorry for the delay in fixing this.

OK, thanks.  I will pick it up tomorrow.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

ipc/mq_sysctl.c:115:24: error: initialization of 'int (*)(struct ctl_table_header *, const struct ctl_table *)' from incompatible pointer type 'int (*)(struct ctl_table_header *, struct ctl_table *)' [-Werror=incompatible-pointer-types]
  115 |         .permissions = mq_permissions,
      |                        ^~~~~~~~~~~~~~
ipc/mq_sysctl.c:115:24: note: (near initialization for 'set_root.permissions')
ipc/mq_sysctl.c:116:26: error: initialization of 'void (*)(struct ctl_table_header *, const struct ctl_table *, kuid_t *, kgid_t *)' from incompatible pointer type 'void (*)(struct ctl_table_header *, struct ctl_table *, kuid_t *, kgid_t *)' [-Werror=incompatible-pointer-types]
  116 |         .set_ownership = mq_set_ownership,
      |                          ^~~~~~~~~~~~~~~~
ipc/mq_sysctl.c:116:26: note: (near initialization for 'set_root.set_ownership')

Caused by commits

  a6dd7f5a787b ("sysctl: treewide: constify ctl_table_root::permissions")
  a56545552ecf ("sysctl: treewide: constify ctl_table_root::set_ownership")

interacting with commit

  7608b6a72ed0 ("sysctl: Allow to change limits for posix messages queues")

from the userns tree.

I have applied the following merge resolution patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Dec 2023 14:12:02 +1100
Subject: [PATCH] fixup for "sysctl: treewide: constify
 ctl_table_root::permissions"

and "sysctl: treewide: constify ctl_table_root::set_ownership" interacting
with "sysctl: Allow to change limits for posix messages queues".

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

diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
index 69c709262f5a..850dfc83af23 100644
--- a/ipc/mq_sysctl.c
+++ b/ipc/mq_sysctl.c
@@ -78,7 +78,7 @@ static int set_is_seen(struct ctl_table_set *set)
 }
 
 static void mq_set_ownership(struct ctl_table_header *head,
-			     struct ctl_table *table,
+			     const struct ctl_table *table,
 			     kuid_t *uid, kgid_t *gid)
 {
 	struct ipc_namespace *ns =
@@ -91,7 +91,7 @@ static void mq_set_ownership(struct ctl_table_header *head,
 	*gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
 }
 
-static int mq_permissions(struct ctl_table_header *head, struct ctl_table *table)
+static int mq_permissions(struct ctl_table_header *head, const struct ctl_table *table)
 {
 	int mode = table->mode;
 	kuid_t ns_root_uid;
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

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