lkml.org 
[lkml]   [2015]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 060/130] ipc: modify message queue accounting to not take kernel data structures into account
    Date
    3.16.7-ckt17 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marcus Gelderie <redmnic@gmail.com>

    commit de54b9ac253787c366bbfb28d901a31954eb3511 upstream.

    A while back, the message queue implementation in the kernel was
    improved to use btrees to speed up retrieval of messages, in commit
    d6629859b36d ("ipc/mqueue: improve performance of send/recv").

    That patch introducing the improved kernel handling of message queues
    (using btrees) has, as a by-product, changed the meaning of the QSIZE
    field in the pseudo-file created for the queue. Before, this field
    reflected the size of the user-data in the queue. Since, it also takes
    kernel data structures into account. For example, if 13 bytes of user
    data are in the queue, on my machine the file reports a size of 61
    bytes.

    There was some discussion on this topic before (for example
    https://lkml.org/lkml/2014/10/1/115). Commenting on a th lkml, Michael
    Kerrisk gave the following background
    (https://lkml.org/lkml/2015/6/16/74):

    The pseudofiles in the mqueue filesystem (usually mounted at
    /dev/mqueue) expose fields with metadata describing a message
    queue. One of these fields, QSIZE, as originally implemented,
    showed the total number of bytes of user data in all messages in
    the message queue, and this feature was documented from the
    beginning in the mq_overview(7) page. In 3.5, some other (useful)
    work happened to break the user-space API in a couple of places,
    including the value exposed via QSIZE, which now includes a measure
    of kernel overhead bytes for the queue, a figure that renders QSIZE
    useless for its original purpose, since there's no way to deduce
    the number of overhead bytes consumed by the implementation.
    (The other user-space breakage was subsequently fixed.)

    This patch removes the accounting of kernel data structures in the
    queue. Reporting the size of these data-structures in the QSIZE field
    was a breaking change (see Michael's comment above). Without the QSIZE
    field reporting the total size of user-data in the queue, there is no
    way to deduce this number.

    It should be noted that the resource limit RLIMIT_MSGQUEUE is counted
    against the worst-case size of the queue (in both the old and the new
    implementation). Therefore, the kernel overhead accounting in QSIZE is
    not necessary to help the user understand the limitations RLIMIT imposes
    on the processes.

    Signed-off-by: Marcus Gelderie <redmnic@gmail.com>
    Acked-by: Doug Ledford <dledford@redhat.com>
    Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
    Acked-by: Davidlohr Bueso <dbueso@suse.de>
    Cc: David Howells <dhowells@redhat.com>
    Cc: Alexander Viro <viro@zeniv.linux.org.uk>
    Cc: John Duffy <jb_duffy@btinternet.com>
    Cc: Arto Bendiken <arto@bendiken.net>
    Cc: Manfred Spraul <manfred@colorfullife.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    ipc/mqueue.c | 5 -----
    1 file changed, 5 deletions(-)

    diff --git a/ipc/mqueue.c b/ipc/mqueue.c
    index 4fcf39af1776..f65a044d66c5 100644
    --- a/ipc/mqueue.c
    +++ b/ipc/mqueue.c
    @@ -143,7 +143,6 @@ static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info)
    if (!leaf)
    return -ENOMEM;
    INIT_LIST_HEAD(&leaf->msg_list);
    - info->qsize += sizeof(*leaf);
    }
    leaf->priority = msg->m_type;
    rb_link_node(&leaf->rb_node, parent, p);
    @@ -188,7 +187,6 @@ try_again:
    "lazy leaf delete!\n");
    rb_erase(&leaf->rb_node, &info->msg_tree);
    if (info->node_cache) {
    - info->qsize -= sizeof(*leaf);
    kfree(leaf);
    } else {
    info->node_cache = leaf;
    @@ -201,7 +199,6 @@ try_again:
    if (list_empty(&leaf->msg_list)) {
    rb_erase(&leaf->rb_node, &info->msg_tree);
    if (info->node_cache) {
    - info->qsize -= sizeof(*leaf);
    kfree(leaf);
    } else {
    info->node_cache = leaf;
    @@ -1026,7 +1023,6 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
    /* Save our speculative allocation into the cache */
    INIT_LIST_HEAD(&new_leaf->msg_list);
    info->node_cache = new_leaf;
    - info->qsize += sizeof(*new_leaf);
    new_leaf = NULL;
    } else {
    kfree(new_leaf);
    @@ -1133,7 +1129,6 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
    /* Save our speculative allocation into the cache */
    INIT_LIST_HEAD(&new_leaf->msg_list);
    info->node_cache = new_leaf;
    - info->qsize += sizeof(*new_leaf);
    } else {
    kfree(new_leaf);
    }

    \
     
     \ /
      Last update: 2015-09-04 16:01    [W:4.296 / U:1.704 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site