mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
namespaces: mqueue namespace: adapt sysctl
Largely inspired from ipc/ipc_sysctl.c. This patch isolates the mqueue sysctl stuff in its own file. [akpm@linux-foundation.org: build fix] Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net> Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7eafd7c74c
commit
bdc8e5f85f
5 changed files with 138 additions and 64 deletions
|
@ -128,4 +128,18 @@ static inline void put_ipc_ns(struct ipc_namespace *ns)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_POSIX_MQUEUE_SYSCTL
|
||||||
|
|
||||||
|
struct ctl_table_header;
|
||||||
|
extern struct ctl_table_header *mq_register_sysctl_table(void);
|
||||||
|
|
||||||
|
#else /* CONFIG_POSIX_MQUEUE_SYSCTL */
|
||||||
|
|
||||||
|
static inline struct ctl_table_header *mq_register_sysctl_table(void)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* CONFIG_POSIX_MQUEUE_SYSCTL */
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -208,6 +208,12 @@ config POSIX_MQUEUE
|
||||||
|
|
||||||
If unsure, say Y.
|
If unsure, say Y.
|
||||||
|
|
||||||
|
config POSIX_MQUEUE_SYSCTL
|
||||||
|
bool
|
||||||
|
depends on POSIX_MQUEUE
|
||||||
|
depends on SYSCTL
|
||||||
|
default y
|
||||||
|
|
||||||
config BSD_PROCESS_ACCT
|
config BSD_PROCESS_ACCT
|
||||||
bool "BSD Process Accounting"
|
bool "BSD Process Accounting"
|
||||||
help
|
help
|
||||||
|
|
|
@ -8,4 +8,5 @@ obj-$(CONFIG_SYSVIPC_SYSCTL) += ipc_sysctl.o
|
||||||
obj_mq-$(CONFIG_COMPAT) += compat_mq.o
|
obj_mq-$(CONFIG_COMPAT) += compat_mq.o
|
||||||
obj-$(CONFIG_POSIX_MQUEUE) += mqueue.o msgutil.o $(obj_mq-y)
|
obj-$(CONFIG_POSIX_MQUEUE) += mqueue.o msgutil.o $(obj_mq-y)
|
||||||
obj-$(CONFIG_IPC_NS) += namespace.o
|
obj-$(CONFIG_IPC_NS) += namespace.o
|
||||||
|
obj-$(CONFIG_POSIX_MQUEUE_SYSCTL) += mq_sysctl.o
|
||||||
|
|
||||||
|
|
116
ipc/mq_sysctl.c
Normal file
116
ipc/mq_sysctl.c
Normal file
|
@ -0,0 +1,116 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2007 IBM Corporation
|
||||||
|
*
|
||||||
|
* Author: Cedric Le Goater <clg@fr.ibm.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation, version 2 of the
|
||||||
|
* License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/nsproxy.h>
|
||||||
|
#include <linux/ipc_namespace.h>
|
||||||
|
#include <linux/sysctl.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define the ranges various user-specified maximum values can
|
||||||
|
* be set to.
|
||||||
|
*/
|
||||||
|
#define MIN_MSGMAX 1 /* min value for msg_max */
|
||||||
|
#define MAX_MSGMAX HARD_MSGMAX /* max value for msg_max */
|
||||||
|
#define MIN_MSGSIZEMAX 128 /* min value for msgsize_max */
|
||||||
|
#define MAX_MSGSIZEMAX (8192*128) /* max value for msgsize_max */
|
||||||
|
|
||||||
|
static void *get_mq(ctl_table *table)
|
||||||
|
{
|
||||||
|
char *which = table->data;
|
||||||
|
struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;
|
||||||
|
which = (which - (char *)&init_ipc_ns) + (char *)ipc_ns;
|
||||||
|
return which;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_PROC_SYSCTL
|
||||||
|
static int proc_mq_dointvec(ctl_table *table, int write, struct file *filp,
|
||||||
|
void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||||
|
{
|
||||||
|
struct ctl_table mq_table;
|
||||||
|
memcpy(&mq_table, table, sizeof(mq_table));
|
||||||
|
mq_table.data = get_mq(table);
|
||||||
|
|
||||||
|
return proc_dointvec(&mq_table, write, filp, buffer, lenp, ppos);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int proc_mq_dointvec_minmax(ctl_table *table, int write,
|
||||||
|
struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||||
|
{
|
||||||
|
struct ctl_table mq_table;
|
||||||
|
memcpy(&mq_table, table, sizeof(mq_table));
|
||||||
|
mq_table.data = get_mq(table);
|
||||||
|
|
||||||
|
return proc_dointvec_minmax(&mq_table, write, filp, buffer,
|
||||||
|
lenp, ppos);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#define proc_mq_dointvec NULL
|
||||||
|
#define proc_mq_dointvec_minmax NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static int msg_max_limit_min = MIN_MSGMAX;
|
||||||
|
static int msg_max_limit_max = MAX_MSGMAX;
|
||||||
|
|
||||||
|
static int msg_maxsize_limit_min = MIN_MSGSIZEMAX;
|
||||||
|
static int msg_maxsize_limit_max = MAX_MSGSIZEMAX;
|
||||||
|
|
||||||
|
static ctl_table mq_sysctls[] = {
|
||||||
|
{
|
||||||
|
.procname = "queues_max",
|
||||||
|
.data = &init_ipc_ns.mq_queues_max,
|
||||||
|
.maxlen = sizeof(int),
|
||||||
|
.mode = 0644,
|
||||||
|
.proc_handler = proc_mq_dointvec,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.procname = "msg_max",
|
||||||
|
.data = &init_ipc_ns.mq_msg_max,
|
||||||
|
.maxlen = sizeof(int),
|
||||||
|
.mode = 0644,
|
||||||
|
.proc_handler = proc_mq_dointvec_minmax,
|
||||||
|
.extra1 = &msg_max_limit_min,
|
||||||
|
.extra2 = &msg_max_limit_max,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.procname = "msgsize_max",
|
||||||
|
.data = &init_ipc_ns.mq_msgsize_max,
|
||||||
|
.maxlen = sizeof(int),
|
||||||
|
.mode = 0644,
|
||||||
|
.proc_handler = proc_mq_dointvec_minmax,
|
||||||
|
.extra1 = &msg_maxsize_limit_min,
|
||||||
|
.extra2 = &msg_maxsize_limit_max,
|
||||||
|
},
|
||||||
|
{ .ctl_name = 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
static ctl_table mq_sysctl_dir[] = {
|
||||||
|
{
|
||||||
|
.procname = "mqueue",
|
||||||
|
.mode = 0555,
|
||||||
|
.child = mq_sysctls,
|
||||||
|
},
|
||||||
|
{ .ctl_name = 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
static ctl_table mq_sysctl_root[] = {
|
||||||
|
{
|
||||||
|
.ctl_name = CTL_FS,
|
||||||
|
.procname = "fs",
|
||||||
|
.mode = 0555,
|
||||||
|
.child = mq_sysctl_dir,
|
||||||
|
},
|
||||||
|
{ .ctl_name = 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
struct ctl_table_header *mq_register_sysctl_table(void)
|
||||||
|
{
|
||||||
|
return register_sysctl_table(mq_sysctl_root);
|
||||||
|
}
|
65
ipc/mqueue.c
65
ipc/mqueue.c
|
@ -47,15 +47,6 @@
|
||||||
#define STATE_PENDING 1
|
#define STATE_PENDING 1
|
||||||
#define STATE_READY 2
|
#define STATE_READY 2
|
||||||
|
|
||||||
/*
|
|
||||||
* Define the ranges various user-specified maximum values can
|
|
||||||
* be set to.
|
|
||||||
*/
|
|
||||||
#define MIN_MSGMAX 1 /* min value for msg_max */
|
|
||||||
#define MAX_MSGMAX HARD_MSGMAX /* max value for msg_max */
|
|
||||||
#define MIN_MSGSIZEMAX 128 /* min value for msgsize_max */
|
|
||||||
#define MAX_MSGSIZEMAX (8192*128) /* max value for msgsize_max */
|
|
||||||
|
|
||||||
struct ext_wait_queue { /* queue of sleeping tasks */
|
struct ext_wait_queue { /* queue of sleeping tasks */
|
||||||
struct task_struct *task;
|
struct task_struct *task;
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
|
@ -1271,60 +1262,6 @@ void mq_put_mnt(struct ipc_namespace *ns)
|
||||||
mntput(ns->mq_mnt);
|
mntput(ns->mq_mnt);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int msg_max_limit_min = MIN_MSGMAX;
|
|
||||||
static int msg_max_limit_max = MAX_MSGMAX;
|
|
||||||
|
|
||||||
static int msg_maxsize_limit_min = MIN_MSGSIZEMAX;
|
|
||||||
static int msg_maxsize_limit_max = MAX_MSGSIZEMAX;
|
|
||||||
|
|
||||||
static ctl_table mq_sysctls[] = {
|
|
||||||
{
|
|
||||||
.procname = "queues_max",
|
|
||||||
.data = &init_ipc_ns.mq_queues_max,
|
|
||||||
.maxlen = sizeof(int),
|
|
||||||
.mode = 0644,
|
|
||||||
.proc_handler = &proc_dointvec,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
.procname = "msg_max",
|
|
||||||
.data = &init_ipc_ns.mq_msg_max,
|
|
||||||
.maxlen = sizeof(int),
|
|
||||||
.mode = 0644,
|
|
||||||
.proc_handler = &proc_dointvec_minmax,
|
|
||||||
.extra1 = &msg_max_limit_min,
|
|
||||||
.extra2 = &msg_max_limit_max,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
.procname = "msgsize_max",
|
|
||||||
.data = &init_ipc_ns.mq_msgsize_max,
|
|
||||||
.maxlen = sizeof(int),
|
|
||||||
.mode = 0644,
|
|
||||||
.proc_handler = &proc_dointvec_minmax,
|
|
||||||
.extra1 = &msg_maxsize_limit_min,
|
|
||||||
.extra2 = &msg_maxsize_limit_max,
|
|
||||||
},
|
|
||||||
{ .ctl_name = 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
static ctl_table mq_sysctl_dir[] = {
|
|
||||||
{
|
|
||||||
.procname = "mqueue",
|
|
||||||
.mode = 0555,
|
|
||||||
.child = mq_sysctls,
|
|
||||||
},
|
|
||||||
{ .ctl_name = 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
static ctl_table mq_sysctl_root[] = {
|
|
||||||
{
|
|
||||||
.ctl_name = CTL_FS,
|
|
||||||
.procname = "fs",
|
|
||||||
.mode = 0555,
|
|
||||||
.child = mq_sysctl_dir,
|
|
||||||
},
|
|
||||||
{ .ctl_name = 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
static int __init init_mqueue_fs(void)
|
static int __init init_mqueue_fs(void)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
@ -1336,7 +1273,7 @@ static int __init init_mqueue_fs(void)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
/* ignore failues - they are not fatal */
|
/* ignore failues - they are not fatal */
|
||||||
mq_sysctl_table = register_sysctl_table(mq_sysctl_root);
|
mq_sysctl_table = mq_register_sysctl_table();
|
||||||
|
|
||||||
error = register_filesystem(&mqueue_fs_type);
|
error = register_filesystem(&mqueue_fs_type);
|
||||||
if (error)
|
if (error)
|
||||||
|
|
Loading…
Reference in a new issue