Skip to contentSkip to conversation

ipc, mqueue: lazy call kern_mount_data in new namespaces

PATCH Superseded Giuseppe Scrivano 2 participants 2 messages Nov 30, 2017 – Dec 3, 2017

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ipc, mqueue: lazy call kern_mount_data in new namespaces

kern_mount_data is a relatively expensive operation when creating a new IPC namespace, so delay the mount until its first usage when not creating the the global namespace.

This is a net saving for new IPC namespaces that don't use mq_open(). In this case there won't be any kern_mount_data() cost at all.

On my machine, the time for creating 1000 new IPC namespaces dropped from ~8s to ~2s.

---

v1 here: https://lkml.org/lkml/2017/11/27/427

v1 -> v2:

Declare and use a mutex instead of a spinlock.

 include/linux/ipc_namespace.h |  2 +-
 ipc/mqueue.c                  | 48 ++++++++++++++++++++++++++++++++++---------
 ipc/namespace.c               |  2 +-
 3 files changed, 40 insertions(+), 12 deletions(-)
include/linux/ipc_namespace.h +1 -1
index b5630c8eb2f3..a06617c113f1 100644
@@ -81,7 +81,7 @@ static inline void shm_destroy_orphaned(struct ipc_namespace *ns) {}
 #endif /* CONFIG_SYSVIPC */
 
 #ifdef CONFIG_POSIX_MQUEUE
-extern int mq_init_ns(struct ipc_namespace *ns);
+extern int mq_init_ns(struct ipc_namespace *ns, bool mount);
 /*
  * POSIX Message Queue default values:
  *
ipc/mqueue.c +38 -10

96 lines not on this page · raw message

ipc/namespace.c +1 -1
index f59a89966f92..9d3689577f66 100644
@@ -65,7 +65,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
 	if (err)
 		goto fail_destroy_msg;
 
-	err = mq_init_ns(ns);
+	err = mq_init_ns(ns, false);
 	if (err)
 		goto fail_destroy_shm;
 
Signature · 1 line
2.14.3
#1 lore raw
Thank you for the patch! Yet something to improve:

Hi Giuseppe,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on v4.15-rc2 next-20171201]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Giuseppe-Scrivano/ipc-mqueue-lazy-call-kern_mount_data-in-new-namespaces/20171203-201041
config: i386-randconfig-c0-12032036 (attached as .config)
compiler: gcc-7 (Debian 7.2.0-12) 7.2.1 20171025 reproduce:

        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

ipc/namespace.c: In function 'create_ipc_ns':

>> ipc/namespace.c:68:8: error: too many arguments to function 'mq_init_ns'
     err = mq_init_ns(ns, false);
           ^~~~~~~~~~
   In file included from ipc/namespace.c:9:0:
   include/linux/ipc_namespace.h:119:19: note: declared here
    static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
                      ^~~~~~~~~~
   In file included from include/linux/kernel.h:10:0,
                    from include/linux/list.h:9,
                    from include/linux/preempt.h:11,
                    from include/linux/spinlock.h:51,
                    from include/linux/ipc.h:5,
                    from ipc/namespace.c:7:
   ipc/namespace.c: At top level:
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'strcpy' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:422:2: note: in expansion of macro 'if'
     if (p_size == (size_t)-1 && q_size == (size_t)-1)
     ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'kmemdup' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:412:2: note: in expansion of macro 'if'
     if (p_size < size)
     ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'kmemdup' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:410:2: note: in expansion of macro 'if'
     if (__builtin_constant_p(size) && p_size < size)
     ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'memchr_inv' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:401:2: note: in expansion of macro 'if'
     if (p_size < size)
     ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'memchr_inv' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:399:2: note: in expansion of macro 'if'
     if (__builtin_constant_p(size) && p_size < size)
     ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'memchr' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:390:2: note: in expansion of macro 'if'
     if (p_size < size)
     ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'memchr' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:388:2: note: in expansion of macro 'if'
     if (__builtin_constant_p(size) && p_size < size)
     ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'memcmp' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:380:2: note: in expansion of macro 'if'
     if (p_size < size || q_size < size)
     ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'memcmp' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~
   include/linux/string.h:377:3: note: in expansion of macro 'if'
      if (q_size < size)
      ^~
   include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'memcmp' which is not static
       ______f = {     \
       ^
   include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
    #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
                          ^~~~~~~~~~

vim +/mq_init_ns +68 ipc/namespace.c

    31	
    32	static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
    33						   struct ipc_namespace *old_ns)
    34	{
    35		struct ipc_namespace *ns;
    36		struct ucounts *ucounts;
    37		int err;
    38	
    39		err = -ENOSPC;
    40		ucounts = inc_ipc_namespaces(user_ns);
    41		if (!ucounts)
    42			goto fail;
    43	
    44		err = -ENOMEM;
    45		ns = kmalloc(sizeof(struct ipc_namespace), GFP_KERNEL);
    46		if (ns == NULL)
    47			goto fail_dec;
    48	
    49		err = ns_alloc_inum(&ns->ns);
    50		if (err)
    51			goto fail_free;
    52		ns->ns.ops = &ipcns_operations;
    53	
    54		refcount_set(&ns->count, 1);
    55		ns->user_ns = get_user_ns(user_ns);
    56		ns->ucounts = ucounts;
    57	
    58		err = sem_init_ns(ns);
    59		if (err)
    60			goto fail_put;
    61		err = msg_init_ns(ns);
    62		if (err)
    63			goto fail_destroy_sem;
    64		err = shm_init_ns(ns);
    65		if (err)
    66			goto fail_destroy_msg;
    67	
  > 68		err = mq_init_ns(ns, false);
    69		if (err)
    70			goto fail_destroy_shm;
    71	
    72		return ns;
    73	
    74	fail_destroy_shm:
    75		shm_exit_ns(ns);
    76	fail_destroy_msg:
    77		msg_exit_ns(ns);
    78	fail_destroy_sem:
    79		sem_exit_ns(ns);
    80	fail_put:
    81		put_user_ns(ns->user_ns);
    82		ns_free_inum(&ns->ns);
    83	fail_free:
    84		kfree(ns);
    85	fail_dec:
    86		dec_ipc_namespaces(ucounts);
    87	fail:
    88		return ERR_PTR(err);
    89	}
    90	

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation