linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the userns tree
@ 2018-03-28  7:41 Stephen Rothwell
  2018-03-28 18:32 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2018-03-28  7:41 UTC (permalink / raw)
  To: Eric W. Biederman; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List

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

Hi Eric,

After merging the userns tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

In file included from include/linux/sched.h:16:0,
                 from arch/powerpc/lib/xor_vmx_glue.c:14:
include/linux/shm.h:17:35: error: 'struct file' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
 bool is_file_shm_hugepages(struct file *file);
                                   ^~~~

and many, many more (most warnings, but some errors - arch/powerpc is
mostly built with -Werror)

Maybe caused by commit

  1a5c1349d105 ("sem: Move struct sem and struct sem_array into ipc/sem.c")

I have appplied the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Mar 2018 18:36:27 +1100
Subject: [PATCH] fix up for struct file no longer being available in shm.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/shm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/shm.h b/include/linux/shm.h
index 3a8eae3ca33c..d8e69aed3d32 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -7,6 +7,8 @@
 #include <uapi/linux/shm.h>
 #include <asm/shmparam.h>
 
+struct file;
+
 #ifdef CONFIG_SYSVIPC
 struct sysv_shm {
 	struct list_head shm_clist;
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2022-03-16  5:56 Stephen Rothwell
  2022-03-16 13:54 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2022-03-16  5:56 UTC (permalink / raw)
  To: Eric W. Biederman, Ingo Molnar
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

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")

interacting with (maybe) commit

  c4ad6fcb67c4 ("sched/headers: Reorganize, clean up and optimize kernel/sched/fair.c dependencies")

from the tip tree.

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

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2021-12-17  7:34 Stephen Rothwell
  2021-12-17 16:53 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2021-12-17  7:34 UTC (permalink / raw)
  To: Eric W. Biederman, Michael S. Tsirkin
  Cc: Mike Christie, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

ERROR: modpost: ".do_exit" [drivers/vhost/vhost.ko] undefined!

Caused by commit

  eb55e716ac1a ("exit: Stop exporting do_exit")

interacting with commit

  bbf761db7dbb ("vhost: use user_worker to check RLIMITs")

from the vhost tree.

I have added the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Dec 2021 18:24:30 +1100
Subject: [PATCH] fix up for "vhost: use user_worker to check RLIMITs"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/vhost/vhost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 8cf259d798c0..b605a79533bb 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -374,7 +374,7 @@ static int vhost_worker(void *data)
 	}
 
 	complete(worker->exit_done);
-	do_exit(0);
+	make_task_dead(0);
 }
 
 static void vhost_vq_free_iovecs(struct vhost_virtqueue *vq)

This lead to:

ERROR: modpost: ".make_task_dead" [drivers/vhost/vhost.ko] undefined!

so I added the following as well.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Dec 2021 18:30:09 +1100
Subject: [PATCH] fix 2 for "vhost: use user_worker to check RLIMITs"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 kernel/exit.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/exit.c b/kernel/exit.c
index 6c4b04531f17..dfa3e8f6ffeb 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -890,6 +890,7 @@ void __noreturn make_task_dead(int signr)
 
 	do_exit(signr);
 }
+EXPORT_SYMBOL_GPL(make_task_dead);
 
 SYSCALL_DEFINE1(exit, int, error_code)
 {

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2021-12-17  7:13 Stephen Rothwell
  0 siblings, 0 replies; 33+ messages in thread
From: Stephen Rothwell @ 2021-12-17  7:13 UTC (permalink / raw)
  To: Eric W. Biederman, Chuck Lever
  Cc: NeilBrown, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

fs/lockd/svc.c: In function 'lockd':
fs/lockd/svc.c:188:2: error: implicit declaration of function 'module_put_and_exit'; did you mean 'module_put_and_kthread_exit'? [-Werror=implicit-function-declaration]
  188 |  module_put_and_exit(0);
      |  ^~~~~~~~~~~~~~~~~~~
      |  module_put_and_kthread_exit
fs/lockd/svc.c:189:1: error: no return statement in function returning non-void [-Werror=return-type]
  189 | }
      | ^

Caused by commit

  ca3574bd653a ("exit: Rename module_put_and_exit to module_put_and_kthread_exit")

interacting with commit

  6b044fbaab02 ("lockd: use svc_set_num_threads() for thread start and stop")

from the cel tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Dec 2021 18:10:42 +1100
Subject: [PATCH] fix up for "lockd: use svc_set_num_threads() for thread start
 and stop"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/lockd/svc.c             | 2 +-
 include/linux/sunrpc/svc.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 4defefd89cbf..0475c5a5d061 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -185,7 +185,7 @@ lockd(void *vrqstp)
 
 	svc_exit_thread(rqstp);
 
-	module_put_and_exit(0);
+	module_put_and_kthread_exit(0);
 }
 
 static int create_lockd_listener(struct svc_serv *serv, const char *name,
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index cf175d47c6b7..f35c22b3355f 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -65,7 +65,7 @@ struct svc_serv_ops {
 	void		(*svo_enqueue_xprt)(struct svc_xprt *);
 
 	/* optional module to count when adding threads.
-	 * Thread function must call module_put_and_exit() to exit.
+	 * Thread function must call module_put_and_kthread_exit() to exit.
 	 */
 	struct module	*svo_module;
 };
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2021-10-20  3:46 Stephen Rothwell
  2021-10-20 16:00 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2021-10-20  3:46 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Yu Zhao,
	Alexey Gladkov

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

Hi all,

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

In file included from arch/x86/include/asm/bug.h:84,
                 from include/linux/bug.h:5,
                 from arch/x86/include/asm/paravirt.h:15,
                 from arch/x86/include/asm/irqflags.h:63,
                 from include/linux/irqflags.h:16,
                 from include/linux/rcupdate.h:26,
                 from include/linux/rculist.h:11,
                 from include/linux/pid.h:5,
                 from include/linux/sched.h:14,
                 from security/keys/process_keys.c:9:
security/keys/process_keys.c: In function 'key_change_session_keyring':
security/keys/process_keys.c:923:16: error: format '%s' expects a matching 'char *' argument [-Werror=format=]
  923 |   WARN_ONCE(1, "In %s get_ucounts failed\n");
      |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/bug.h:99:17: note: in definition of macro '__WARN_printf'
   99 |   __warn_printk(arg);     \
      |                 ^~~
include/linux/once_lite.h:19:4: note: in expansion of macro 'WARN'
   19 |    func(__VA_ARGS__);    \
      |    ^~~~
include/asm-generic/bug.h:150:2: note: in expansion of macro 'DO_ONCE_LITE_IF'
  150 |  DO_ONCE_LITE_IF(condition, WARN, 1, format)
      |  ^~~~~~~~~~~~~~~
security/keys/process_keys.c:923:3: note: in expansion of macro 'WARN_ONCE'
  923 |   WARN_ONCE(1, "In %s get_ucounts failed\n");
      |   ^~~~~~~~~
security/keys/process_keys.c:923:21: note: format string is defined here
  923 |   WARN_ONCE(1, "In %s get_ucounts failed\n");
      |                    ~^
      |                     |
      |                     char *
cc1: all warnings being treated as errors

Caused by commit

  346b5b4aa656 ("ucounts: Move get_ucounts from cred_alloc_blank to key_change_session_keyring")

I have used the userns tree from next-20211019 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2021-10-07  3:47 Stephen Rothwell
  2021-10-07 18:56 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2021-10-07  3:47 UTC (permalink / raw)
  To: Eric W. Biederman; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

In file included from include/linux/kernel.h:19,
                 from mm/debug.c:9:
mm/debug.c: In function 'dump_mm':
mm/debug.c:251:28: error: 'const struct mm_struct' has no member named 'core_state'
  251 |   mm->binfmt, mm->flags, mm->core_state,
      |                            ^~
include/linux/printk.h:418:19: note: in definition of macro 'printk_index_wrap'
  418 |   _p_func(_fmt, ##__VA_ARGS__);    \
      |                   ^~~~~~~~~~~
include/linux/printk.h:459:2: note: in expansion of macro 'printk'
  459 |  printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
      |  ^~~~~~
mm/debug.c:208:2: note: in expansion of macro 'pr_emerg'
  208 |  pr_emerg("mm %px mmap %px seqnum %llu task_size %lu\n"
      |  ^~~~~~~~

Caused by commit

  483f2bb374b7 ("coredump: Limit coredumps to a single thread group")

I have used the userns tree from next-20211006 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2020-05-21  8:22 Stephen Rothwell
  0 siblings, 0 replies; 33+ messages in thread
From: Stephen Rothwell @ 2020-05-21  8:22 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Kees Cook,
	Linus Torvalds

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

Hi all,

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

In file included from init/do_mounts.c:9:
include/linux/security.h: In function 'security_bprm_repopulate_creds':
include/linux/security.h:580:9: error: implicit declaration of function 'cap_bprm_repopluate_creds'; did you mean 'cap_bprm_repopulate_creds'? [-Werror=implicit-function-declaration]
  580 |  return cap_bprm_repopluate_creds(bprm);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~
      |         cap_bprm_repopulate_creds

Caused by commit

  d9d67b76eed6 ("exec: Convert security_bprm_set_creds into security_bprm_repopulate_creds")

I have used the userns tree from next-20200519 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2018-01-26  1:05 Stephen Rothwell
  2018-01-26  2:45 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2018-01-26  1:05 UTC (permalink / raw)
  To: Eric W. Biederman; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List

Hi Eric,

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

arch/powerpc/kernel/mce.c: In function 'machine_process_ue_event':
arch/powerpc/kernel/mce.c:276:5: error: too many arguments to function 'memory_failure'
     memory_failure(pfn, SIGBUS, 0);
     ^~~~~~~~~~~~~~
In file included from include/linux/pid_namespace.h:7:0,
                 from include/linux/ptrace.h:10,
                 from arch/powerpc/kernel/mce.c:27:
include/linux/mm.h:2571:12: note: declared here
 extern int memory_failure(unsigned long pfn, int flags);
            ^~~~~~~~~~~~~~

Caused by commit

  83b57531c58f ("mm/memory_failure: Remove unused trapno from memory_failure")

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Jan 2018 11:54:39 +1100
Subject: [PATCH] mm/memory_failure: update powerpc for memory_failure() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kernel/mce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c
index d2fecaec4fec..efdd16a79075 100644
--- a/arch/powerpc/kernel/mce.c
+++ b/arch/powerpc/kernel/mce.c
@@ -273,7 +273,7 @@ static void machine_process_ue_event(struct work_struct *work)
 
 				pfn = evt->u.ue_error.physical_address >>
 					PAGE_SHIFT;
-				memory_failure(pfn, SIGBUS, 0);
+				memory_failure(pfn, 0);
 			} else
 				pr_warn("Failed to identify bad address from "
 					"where the uncorrectable error (UE) "
-- 
2.15.1

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2017-07-20  3:25 Stephen Rothwell
  2017-07-20 12:17 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2017-07-20  3:25 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kirill Tkhai

Hi Eric,

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

kernel/pid_namespace.c: In function 'create_pid_namespace':
kernel/pid_namespace.c:105:7: error: too many arguments to function 'in_userns'
  if (!in_userns(parent_pid_ns->user_ns, user_ns))
       ^
In file included from kernel/pid_namespace.c:13:0:
include/linux/user_namespace.h:148:20: note: declared here
 static inline bool in_userns(const struct user_namespace *target_ns)
                    ^

Caused by commit

  1f1b28d80cd9 ("userns,pidns: Verify the userns for new pid namespaces")

I have used the userns tree from next-20170719 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2015-05-25 10:39 Stephen Rothwell
  0 siblings, 0 replies; 33+ messages in thread
From: Stephen Rothwell @ 2015-05-25 10:39 UTC (permalink / raw)
  To: Eric W. Biederman; +Cc: linux-next, linux-kernel, Greg Kroah-Hartman

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

Hi Eric,

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

In file included from include/linux/kobject.h:21:0,
                 from include/linux/device.h:17,
                 from arch/powerpc/include/asm/io.h:27,
                 from arch/powerpc/include/asm/pgtable-ppc32.h:9,
                 from arch/powerpc/include/asm/pgtable.h:19,
                 from include/linux/mm.h:53,
                 from include/linux/pid_namespace.h:6,
                 from include/linux/ptrace.h:8,
                 from arch/powerpc/mm/fault.c:24:
include/linux/sysfs.h: In function 'sysfs_remove_mount_point':
include/linux/sysfs.h:314:2: error: 'return' with a value, in function returning void [-Werror]
  return 0;
  ^

and many more :-(

Caused by commit f7e299595408 ("sysfs: Add support for permanently
empty directories to serve as mount points.").

I have added the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 May 2015 20:20:44 +1000
Subject: [PATCH] sysfs: void functions do not return values

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/sysfs.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 3e7e41acc451..9f65758311a4 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -311,7 +311,6 @@ static inline int sysfs_create_mount_point(struct kobject *parent_kobj,
 static inline void sysfs_remove_mount_point(struct kobject *parent_kobj,
 					    const char *name)
 {
-	return 0;
 }
 
 static inline int sysfs_create_file_ns(struct kobject *kobj,
-- 
2.1.4

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

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2014-04-17  5:12 Stephen Rothwell
  2014-04-17  7:18 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2014-04-17  5:12 UTC (permalink / raw)
  To: Eric W. Biederman; +Cc: linux-next, linux-kernel, Al Viro, David Howells

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

Hi Eric,

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

fs/namespace.c: In function 'new_mountpoint':
fs/namespace.c:725:9: error: implicit declaration of function 'hash' [-Werror=implicit-function-declaration]
  struct list_head *chain = mountpoint_hashtable + hash(NULL, dentry);
         ^
fs/namespace.c:725:28: warning: initialization from incompatible pointer type [enabled by default]
  struct list_head *chain = mountpoint_hashtable + hash(NULL, dentry);
                            ^
fs/namespace.c:741:2: warning: passing argument 2 of 'hlist_add_head' from incompatible pointer type [enabled by default]
  hlist_add_head(&mp->m_hash, chain);
  ^
In file included from include/linux/signal.h:4:0,
                 from include/linux/syscalls.h:72,
                 from fs/namespace.c:11:
include/linux/list.h:637:20: note: expected 'struct hlist_head *' but argument is of type 'struct list_head *'
 static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
                    ^

So clearly my merge conflict resolution was not sufficient.

I will just drop the userns tree for today.  Please give me some help
with the resolutions - or fix this stuff up yourselves.

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

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

^ permalink raw reply	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2013-11-08  7:07 Stephen Rothwell
  2013-11-08 23:15 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2013-11-08  7:07 UTC (permalink / raw)
  To: Eric W. Biederman, Al Viro; +Cc: linux-next, linux-kernel

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

Hi Eric,

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

fs/namespace.c: In function 'detach_mounts':
fs/namespace.c:1340:2: error: implicit declaration of function 'br_write_lock' [-Werror=implicit-function-declaration]
  br_write_lock(&vfsmount_lock);
  ^
fs/namespace.c:1340:17: error: 'vfsmount_lock' undeclared (first use in this function)
  br_write_lock(&vfsmount_lock);
                 ^
fs/namespace.c:1340:17: note: each undeclared identifier is reported only once for each function it appears in
fs/namespace.c:1345:2: error: implicit declaration of function 'br_write_unlock' [-Werror=implicit-function-declaration]
  br_write_unlock(&vfsmount_lock);
  ^

Caused by the interaction between commit d7e58b8abc4f ("vfs: Add a
function to lazily unmount all mounts from any dentry. v3") from the
userns tree and commit 84550b9356af ("RCU'd vfsmounts") from the vfs tree.

I don't know how to fix this up, so I have just dropped the userns tree
for today.  I only dropped that tree because it was the latter of the two
conflicting trees.

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

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

^ permalink raw reply	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2013-11-08  6:58 Stephen Rothwell
  2013-11-08  7:27 ` Christoph Hellwig
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2013-11-08  6:58 UTC (permalink / raw)
  To: Eric W. Biederman, Al Viro; +Cc: linux-next, linux-kernel

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

Hi Eric,

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

fs/namei.c: In function 'covered':
fs/namei.c:3528:2: error: too many arguments to function '__lookup_mnt'
  is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry, 1);
  ^

Caused by my incomplete merge resolution between commits 474279dc0f77
("split __lookup_mnt() in two functions") from the vfs tree and
a3b4491433f2 ("vfs: Don't allow overwriting mounts in the current mount
namespace") from the userns tree.

I added the following fix up patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Nov 2013 17:56:35 +1100
Subject: [PATCH] vfs: merge fixup for __lookup_mnt() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/namei.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/namei.c b/fs/namei.c
index 83463500c582..03d999bf9a89 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3525,7 +3525,7 @@ static bool covered(struct vfsmount *mnt, struct dentry *dentry)
 	bool is_covered;
 
 	rcu_read_lock();
-	is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry, 1);
+	is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry);
 	rcu_read_unlock();
 
 	return is_covered;
-- 
1.8.4.2

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

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2012-09-24 12:18 Stephen Rothwell
  0 siblings, 0 replies; 33+ messages in thread
From: Stephen Rothwell @ 2012-09-24 12:18 UTC (permalink / raw)
  To: Eric W. Biederman; +Cc: linux-next, linux-kernel, David Miller, netdev

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

Hi Eric,

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

kernel/audit.c: In function 'audit_receive_msg':
kernel/audit.c:753:37: error: 'struct netlink_skb_parms' has no member named 'pid'

I missed the conflict between commit 35ce9888ad2a ("audit: Properly set
the origin port id of audit messages") from the userns tree and commit
15e473046cb6 ("netlink: Rename pid to portid to avoid confusion") from
the net-next tree.  I have added the following merge fix patch and can
carry it as necessary.

From 55a9ee70146f37c559333b1f35154618c708203f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Sep 2012 22:05:38 +1000
Subject: [PATCH] audit: fix up for pid to portid change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 kernel/audit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index ea9b67a..4d0ceed 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -750,7 +750,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 					size--;
 				audit_log_n_untrustedstring(ab, data, size);
 			}
-			audit_set_pid(ab, NETLINK_CB(skb).pid);
+			audit_set_pid(ab, NETLINK_CB(skb).portid);
 			audit_log_end(ab);
 		}
 		break;
-- 
1.7.10.280.gaa39

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

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2012-05-21  7:50 Stephen Rothwell
  2012-05-21 22:05 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2012-05-21  7:50 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
	H. Peter Anvin, Peter Zijlstra

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

Hi Eric,

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

kernel/sched/numa.c: In function 'ng_allowed':
kernel/sched/numa.c:1270:16: error: 'struct user_struct' has no member named 'user_ns'
kernel/sched/numa.c:1270:40: error: 'struct user_struct' has no member named 'user_ns'
kernel/sched/numa.c:1278:28: error: 'struct user_struct' has no member named 'user_ns'

Caused by commit a2dae61eb839 ("sched/numa: Introduce sys_numa_{t,m}bind
()") from the tip tree interacting with commit d0bd6594e286 ("userns:
Deprecate and rename the user_namespace reference in the user_struct")
from the userns tree.

I applied this merge fix up patch (more may be required):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 21 May 2012 17:40:55 +1000
Subject: [PATCH] userns: fix up for user_ns move to struct cred

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

diff --git a/kernel/sched/numa.c b/kernel/sched/numa.c
index 8eb92f7..1149993 100644
--- a/kernel/sched/numa.c
+++ b/kernel/sched/numa.c
@@ -1267,7 +1267,7 @@ static int ng_allowed(struct numa_group *ng, struct task_struct *p)
 
 	rcu_read_lock();
 	tcred = __task_cred(p);
-	if (cred->user->user_ns == tcred->user->user_ns &&
+	if (cred->user_ns == tcred->user_ns &&
 	    (cred->uid == tcred->euid &&
 	     cred->uid == tcred->suid &&
 	     cred->uid == tcred->uid  &&
@@ -1275,7 +1275,7 @@ static int ng_allowed(struct numa_group *ng, struct task_struct *p)
 	     cred->gid == tcred->sgid &&
 	     cred->gid == tcred->gid))
 		goto ok;
-	if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
+	if (ns_capable(tcred->user_ns, CAP_SYS_PTRACE))
 		goto ok;
 	rcu_read_unlock();
 	return -EPERM;
-- 
1.7.10.280.gaa39


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

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread
* linux-next: build failure after merge of the userns tree
@ 2012-05-14  9:13 Stephen Rothwell
  2012-05-16  1:12 ` Eric W. Biederman
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2012-05-14  9:13 UTC (permalink / raw)
  To: Eric W. Biederman; +Cc: linux-next, linux-kernel

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

Hi Eric,

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

fs/stat.c: In function 'cp_new_stat64':
fs/stat.c:354:61: error: expected ';' before ')' token
fs/stat.c:354:61: error: expected statement before ')' token
fs/stat.c:355:61: error: expected ';' before ')' token
fs/stat.c:355:61: error: expected statement before ')' token

I have dropped the userns tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2022-03-16 14:33 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-28  7:41 linux-next: build failure after merge of the userns tree Stephen Rothwell
2018-03-28 18:32 ` Eric W. Biederman
  -- strict thread matches above, loose matches on Subject: below --
2022-03-16  5:56 Stephen Rothwell
2022-03-16 13:54 ` Eric W. Biederman
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-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

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).