lkml.org 
[lkml]   [2012]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch 1/8] ipc/mqueue: cleanup definition names and locations
    Date
    The various defines for minimums and maximums of the sysctl controllable
    mqueue values are scattered amongst different files and named
    inconsistently. Move them all into ipc_namespace.h and make them have
    consistent names. Additionally, make the number of queues per namespace
    also have a minimum and maximum and use the same sysctl function as the
    other two settable variables.

    Signed-off-by: Doug Ledford <dledford@redhat.com>
    ---
    include/linux/ipc_namespace.h | 5 +++++
    ipc/mq_sysctl.c | 31 ++++++++-----------------------
    2 files changed, 13 insertions(+), 23 deletions(-)

    diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
    index 8a297a5..1372b56 100644
    --- a/include/linux/ipc_namespace.h
    +++ b/include/linux/ipc_namespace.h
    @@ -91,10 +91,15 @@ static inline void shm_destroy_orphaned(struct ipc_namespace *ns) {}
    #ifdef CONFIG_POSIX_MQUEUE
    extern int mq_init_ns(struct ipc_namespace *ns);
    /* default values */
    +#define MIN_QUEUESMAX 1
    #define DFLT_QUEUESMAX 256 /* max number of message queues */
    +#define HARD_QUEUESMAX 1024
    +#define MIN_MSGMAX 1
    #define DFLT_MSGMAX 10 /* max number of messages in each queue */
    #define HARD_MSGMAX (32768*sizeof(void *)/4)
    +#define MIN_MSGSIZEMAX 128
    #define DFLT_MSGSIZEMAX 8192 /* max message size */
    +#define HARD_MSGSIZEMAX (8192*128)
    #else
    static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
    #endif
    diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
    index 0c09366..e22336a 100644
    --- a/ipc/mq_sysctl.c
    +++ b/ipc/mq_sysctl.c
    @@ -13,15 +13,6 @@
    #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 */
    -
    #ifdef CONFIG_PROC_SYSCTL
    static void *get_mq(ctl_table *table)
    {
    @@ -31,16 +22,6 @@ static void *get_mq(ctl_table *table)
    return which;
    }

    -static int proc_mq_dointvec(ctl_table *table, int write,
    - 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, buffer, lenp, ppos);
    -}
    -
    static int proc_mq_dointvec_minmax(ctl_table *table, int write,
    void __user *buffer, size_t *lenp, loff_t *ppos)
    {
    @@ -52,15 +33,17 @@ static int proc_mq_dointvec_minmax(ctl_table *table, int write,
    lenp, ppos);
    }
    #else
    -#define proc_mq_dointvec NULL
    #define proc_mq_dointvec_minmax NULL
    #endif

    +static int msg_queues_limit_min = MIN_QUEUESMAX;
    +static int msg_queues_limit_max = HARD_QUEUESMAX;
    +
    static int msg_max_limit_min = MIN_MSGMAX;
    -static int msg_max_limit_max = MAX_MSGMAX;
    +static int msg_max_limit_max = HARD_MSGMAX;

    static int msg_maxsize_limit_min = MIN_MSGSIZEMAX;
    -static int msg_maxsize_limit_max = MAX_MSGSIZEMAX;
    +static int msg_maxsize_limit_max = HARD_MSGSIZEMAX;

    static ctl_table mq_sysctls[] = {
    {
    @@ -68,7 +51,9 @@ static ctl_table mq_sysctls[] = {
    .data = &init_ipc_ns.mq_queues_max,
    .maxlen = sizeof(int),
    .mode = 0644,
    - .proc_handler = proc_mq_dointvec,
    + .proc_handler = proc_mq_dointvec_minmax,
    + .extra1 = &msg_queues_limit_min,
    + .extra2 = &msg_queues_limit_max,
    },
    {
    .procname = "msg_max",
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-04-17 17:49    [W:3.532 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site