From nobody Mon Sep 28 22:30:47 2026 Received: from mail-pz2-f39.google.com (mail-pz2-f39.google.com [74.125.228.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AA1B353A79 for ; Sat, 26 Sep 2026 04:01:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790395287; cv=none; b=h3rKbhrp5HIP5SOVA+yyeC0LN46S9+eZNiiYc37K0zTOd+IgWK7U4dwqxK8dztQ1zEJLVppnBLlCiippqfgfX0ZY568yt6jYxTP2ZU1xdQPg8RHsHQNCe+/eopuFWs8PzxcEXyh2odg4Wkk3Ttp3LuxkCi45a0BGkNb72VzxrT4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790395287; c=relaxed/simple; bh=Hvuopt53d1xngL9GZ56T+pV8tuo3jc1KU3Sbc1fHmHw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r3sEuTyoVaO5HcsfZ31AmNH5r6oqbcGdhDJQEfpz1jJqn2c7gD3liLWy5KFSyRuBTEeIKTa/MR6r9xhbuthBAZHTM4vAFlq25SDpFV+kyLJGOCqSEK9yTxzjRWUE1IgBiq5epk+7Hv+Sc8W51zsNA2hRBlAs9WJFW1uloRiu5MQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Mq+4rpXK; arc=none smtp.client-ip=74.125.228.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Mq+4rpXK" Received: by mail-pz2-f39.google.com with SMTP id 41be03b00d2f7-cc78d59bb02so464394a12.1 for ; Fri, 25 Sep 2026 21:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790395285; x=1791000085; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=PIPvif62lsuhH3YcEVBGwzzd3B2FXpamvPrZEZOJgaA=; b=Mq+4rpXKgkn4RSAYHiflu7a9AIbUXPMGp4OaQNYiKCNJczv48cQgfbzg6ObkOAj64b elx2ygWiSx9emjjoWeMFOydT5bPhahMSrkdEl6Wu0um34GIgeoOo5d5IWuvtUMXtW8Ob Xnh8lppUClLtuSnxeLQInaxrzLO3LY2MrnazeDh9TJ+8zowT8KNHmVTIa4c/9weihMF0 76axI4daHTxBj0E9D1Rki48y8rSz9azNt7XQ13EtomQYRwoAUz7dcsvd1moBCrZdx4Gy n+102OdI5Jiwgzo+I4IGz3SmV5w7ow5XtZCkpOq6eSEeKRBbLp8I+p5PL0/ndy6M8kzl E83w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790395285; x=1791000085; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=PIPvif62lsuhH3YcEVBGwzzd3B2FXpamvPrZEZOJgaA=; b=0Nu+ZQapYKt+HcsGlA5JK8U15zWZLfm3pqWwjrcURLmtJGxuBCgaYynKDfoOk6hhlj 33nI9ioBondb6hi+U3uyRX/jKwJyKGsv9xzfNMl+MsNg25Uzm5vEsxXmzU1rKXbMdpJ2 /qZZMwARlf/lDn/Eyz66f0EXKX6YvsHE4tBvHl8oaTFclkzZEs9y9ZmQrWRzCEn3hdzg ZYAcme4GAeyD5Tv5ShdYwjDt1P5/InvmlKV16KOW2k5F/ZTYRelGt565t1DQazMmfcUT 4Z7PBe+nrh4UqNOkawyRN8qN1bk78h25QiOFOVmnF5s0C2wP42cebXw46IzAnEs13MKB swnA== X-Gm-Message-State: AFuF++mk5QHlaoRaREe41bkfXAPgktB6vMDrDK2VfaB7bGLx22lEZ1ia H95UJmLOS22y4O7vpqrb6WD0WXl/WPNZbk61g8ssYIasIpyMOTcQncVj X-Gm-Gg: AYBFou3931WX6eT9cVoFVqlZ+Go8Dz8Biupls9FO9ItOAbPy0P5Un9aWyzXrqm+UCQJ IxdOeAoC32DiDHc7tmb+XS5QrjtagRSQrHnm3xAcoejlEwqTWpqhQB/YpqUg5GFH7SLdEdRRdk9 E1rTfeJwrTya9DFT2vOJyrmNj74gO8gfgUDMXI/7gQuxNMD4kfHJOfuagsDSaIlMP3n++SMLf29 207ZWcAUoEXHL5IQBv/UW4fsf8UBOw1OH+qp2gIk+lBCl1ixwc3x2kOYGP0Ya+oRZ1k1qmheaWU dhLB0PWW6okXUlQ6V3sCySdNTWdxSxNmsBxmN0Ms5XayHqXlRLhMzRvkDoMHH9JBQJcMaqY0T/U jovROBKj54Gl9FHH92xMRY5vENeRy6Rh13TFIsQRsKHt8DD5Rl7WpuXBaG86bbR8PByB5UjtSoy 5CIkWaXJPciZE28Z5D9zhezSTE35C3R+Lzaddqm1pbfBGeQiCcLTXPFFMutC7yz6ZDJFM8nNFfz qMrDmY0H+o0Tw== X-Received: by 2002:a17:90b:4b12:b0:39e:6c6a:4b78 with SMTP id 98e67ed59e1d1-3a098e43c20mr6893790a91.66.1790395284514; Fri, 25 Sep 2026 21:01:24 -0700 (PDT) Received: from Modern-15.. ([2401:4900:8206:fc0b:ca44:7562:7898:358b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0bda430b3sm6845063a91.0.2026.09.25.21.01.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 21:01:24 -0700 (PDT) From: mathura kumar To: brauner@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, corbet@lwn.net, mathura.kumar.tech@gmail.com Subject: [PATCH v5 1/4] IPC: Added two new system call mq_recvmmsg() and mq_sendmmsg() Date: Sat, 26 Sep 2026 09:30:55 +0530 Message-ID: <20260926040102.308350-2-mathura.kumar.tech@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260926040102.308350-1-mathura.kumar.tech@gmail.com> References: <20260926040102.308350-1-mathura.kumar.tech@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement two new POSIX message queue system calls, mq_sendmmsg() and mq_recvmmsg(), analogous to the existing sendmmsg()/recvmmsg() socket system calls. These allow sending and receiving or peek multiple messages in a single syscall,reducing the overhead of repeated context switches per discrete message. It contains the core implementation of both system calls as part of a larger patchset. long mq_sendmmsg(mqd_t mqdes, struct mq_mmsg_attrs *attrs, unsigned int attrs_len, unsigned long start_idx, const struct __kernel_timespec *u_abs_timeout); long mq_recvmmsg(mqd_t mqdes, struct mq_mmsg_attrs *attrs, unsigned int attrs_len, unsigned int flags, unsigned long start_idx, const struct __kernel_timespec *u_abs_timeout); Implementation complete details available under mq_recvmmsg.rst and mq_sendmmsg.rst Signed-off-by: mathura kumar --- include/linux/compat.h | 12 +- include/linux/syscalls.h | 9 + include/uapi/asm-generic/unistd.h | 9 +- include/uapi/linux/mqueue.h | 27 +- ipc/mqueue.c | 664 ++++++++++++++++++++++++++++-- ipc/msg.c | 2 +- ipc/msgutil.c | 45 +- ipc/util.h | 3 +- kernel/sys_ni.c | 6 + 9 files changed, 714 insertions(+), 63 deletions(-) diff --git a/include/linux/compat.h b/include/linux/compat.h index 8da0a15c95f4..cb6cda4aebdd 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -18,7 +18,6 @@ #include /* for aio_context_t */ #include #include - #include #include #include @@ -428,6 +427,8 @@ struct compat_sysctl_args; struct compat_kexec_segment; struct compat_mq_attr; struct compat_msgbuf; +struct compat_msg_attrs; +struct compat_mq_mmsg_attrs; =20 void copy_siginfo_to_external32(struct compat_siginfo *to, const struct kernel_siginfo *from); @@ -805,8 +806,13 @@ asmlinkage long compat_sys_pwritev64v2(unsigned long f= d, const struct iovec __user *vec, unsigned long vlen, loff_t pos, rwf_t flags); #endif - - +asmlinkage long compat_sys_mq_sendmmsg(mqd_t mqdes, struct compat_mq_mmsg_= attrs __user *attrs, + unsigned int attrs_len, unsigned long start_index, + const struct __kernel_timespec __user *abs_timeout); +asmlinkage long compat_sys_mq_recvmmsg(mqd_t mqdes, struct compat_mq_mmsg_= attrs __user *attrs, + unsigned int attrs_len, unsigned int flags, + unsigned long start_index, + const struct __kernel_timespec __user *abs_timeout); /* * Deprecated system calls which are still defined in * include/uapi/asm-generic/unistd.h and wanted by >=3D 1 arch diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 874d9067a43b..0abf938e86da 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -79,6 +79,8 @@ struct mnt_id_req; struct ns_id_req; struct xattr_args; struct file_attr; +struct mq_msg_attrs; +struct mq_mmsg_attrs; =20 #include #include @@ -739,7 +741,14 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *inf= o); asmlinkage long sys_mq_open(const char __user *name, int oflag, umode_t mo= de, struct mq_attr __user *attr); asmlinkage long sys_mq_unlink(const char __user *name); asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *msg_ptr, = size_t msg_len, unsigned int msg_prio, const struct __kernel_timespec __use= r *abs_timeout); +asmlinkage long sys_mq_sendmmsg(mqd_t mqdes, struct mq_mmsg_attrs __user *= attrs, + unsigned int attrs_len, unsigned long start_index, + const struct __kernel_timespec __user *abs_timeout); asmlinkage long sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, siz= e_t msg_len, unsigned int __user *msg_prio, const struct __kernel_timespec = __user *abs_timeout); +asmlinkage long sys_mq_recvmmsg(mqd_t mqdes, struct mq_mmsg_attrs __user *= attrs, + unsigned int attrs_len, unsigned int flags, + unsigned long start_index, + const struct __kernel_timespec __user *abs_timeout); asmlinkage long sys_mq_notify(mqd_t mqdes, const struct sigevent __user *n= otification); asmlinkage long sys_mq_getsetattr(mqd_t mqdes, const struct mq_attr __user= *mqstat, struct mq_attr __user *omqstat); asmlinkage long sys_mq_timedreceive_time32(mqd_t mqdes, diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/u= nistd.h index a627acc8fb5f..1d06486d3aa5 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -863,9 +863,14 @@ __SYSCALL(__NR_listns, sys_listns) #define __NR_rseq_slice_yield 471 __SYSCALL(__NR_rseq_slice_yield, sys_rseq_slice_yield) =20 -#undef __NR_syscalls -#define __NR_syscalls 472 +#define __NR_mq_recvmmsg 472 +__SC_COMP(__NR_mq_recvmmsg, sys_mq_recvmmsg, compat_sys_mq_recvmmsg) + +#define __NR_mq_sendmmsg 473 +__SC_COMP(__NR_mq_sendmmsg, sys_mq_sendmmsg, compat_sys_mq_sendmmsg) =20 +#undef __NR_syscalls +#define __NR_syscalls 474 /* * 32 bit systems traditionally used different * syscalls for off_t and loff_t arguments, while diff --git a/include/uapi/linux/mqueue.h b/include/uapi/linux/mqueue.h index b516b66840ad..6ce21e41eb18 100644 --- a/include/uapi/linux/mqueue.h +++ b/include/uapi/linux/mqueue.h @@ -18,8 +18,9 @@ =20 #ifndef _LINUX_MQUEUE_H #define _LINUX_MQUEUE_H - +#include #include +#include =20 #define MQ_PRIO_MAX 32768 /* per-uid limit of kernel memory used by mqueue, in bytes */ @@ -33,6 +34,30 @@ struct mq_attr { __kernel_long_t __reserved[4]; /* ignored for input, zeroed for output */ }; =20 +struct mq_msg_attrs { + __kernel_size_t msg_len; + unsigned int __user *msg_prio; + void __user *msg_ptr; +}; + +struct mq_mmsg_attrs { + struct iovec __user *msg_attrs_vec; + __kernel_size_t vlen; + int __user *ret; +}; + +struct compat_msg_attrs { + compat_size_t msg_len; + compat_uptr_t __user msg_prio; + compat_uptr_t __user msg_ptr; +}; + +struct compat_mq_mmsg_attrs { + compat_uptr_t __user msg_attrs_vec; + compat_size_t vlen; + compat_uptr_t __user ret; +}; + /* * SIGEV_THREAD implementation: * SIGEV_THREAD must be implemented in user space. If SIGEV_THREAD is pass= ed diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 4798b375972b..784c48c25333 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -11,7 +11,6 @@ * * Audit: George Wilson (ltcgcw@us.ibm.com) */ - #include #include #include @@ -39,7 +38,10 @@ #include #include =20 +#include +#include #include +#include #include "util.h" =20 struct mqueue_fs_context { @@ -54,6 +56,18 @@ struct mqueue_fs_context { #define SEND 0 #define RECV 1 =20 +#define MQ_PEEK 0x02 +#define MQ_RECV 0x04 +#define MQ_START_AT 0x08 +#define MQ_RESUME 0x10 +#define MQ_VALID_FLAGS (MQ_PEEK | MQ_RECV | MQ_START_AT | MQ_RESUME) + +/* List of all mq_mmsg_attrs "versions". */ +#define MQ_MMSG_ATTRS_SIZE_VER0 24 +#define MQ_MMSG_ATTRS_SIZE_LATEST MQ_MMSG_ATTRS_SIZE_VER0 +#define COMPAT_MQ_MMSG_ATTRS_SIZE_VER0 12 +#define COMPAT_MQ_MMSG_ATTRS_SIZE_LATEST COMPAT_MQ_MMSG_ATTRS_SIZE_VER0 + #define STATE_NONE 0 #define STATE_READY 1 =20 @@ -61,6 +75,8 @@ struct posix_msg_tree_node { struct rb_node rb_node; struct list_head msg_list; int priority; + unsigned int msg_count; /* Total messages at exactly this priority */ + unsigned int subtree_msg_count; /* sum of messages in this node and all d= escendants */ }; =20 /* @@ -186,7 +202,53 @@ static struct ipc_namespace *get_ns_from_inode(struct = inode *inode) return ns; } =20 -/* Auxiliary functions to manipulate messages' list */ +static inline unsigned int get_subtree_count(struct rb_node *node) +{ + if (!node) + return 0; + return rb_entry(node, struct posix_msg_tree_node, rb_node)->subtree_msg_c= ount; +} + +static void msg_tree_propagate_subtree_msg_count(struct rb_node *node, str= uct rb_node *stop) +{ + while (node !=3D stop) { + struct posix_msg_tree_node *leaf =3D rb_entry(node, struct posix_msg_tre= e_node, + rb_node); + unsigned int new_count =3D leaf->msg_count + + get_subtree_count(node->rb_left) + + get_subtree_count(node->rb_right); + if (leaf->subtree_msg_count =3D=3D new_count) + break; + leaf->subtree_msg_count =3D new_count; + node =3D rb_parent(node); + } +} + +static void msg_tree_copy_subtree_msg_count(struct rb_node *old, struct rb= _node *new) +{ + struct posix_msg_tree_node *old_leaf =3D rb_entry(old, struct posix_msg_t= ree_node, rb_node); + struct posix_msg_tree_node *new_leaf =3D rb_entry(new, struct posix_msg_t= ree_node, rb_node); + + new_leaf->subtree_msg_count =3D old_leaf->subtree_msg_count; +} + +static void msg_tree_rotate_subtree_msg_count(struct rb_node *old, struct = rb_node *new) +{ + struct posix_msg_tree_node *old_leaf =3D rb_entry(old, struct posix_msg_t= ree_node, rb_node); + struct posix_msg_tree_node *new_leaf =3D rb_entry(new, struct posix_msg_t= ree_node, rb_node); + + new_leaf->subtree_msg_count =3D old_leaf->subtree_msg_count; + old_leaf->subtree_msg_count =3D old_leaf->msg_count + + get_subtree_count(old->rb_left) + + get_subtree_count(old->rb_right); +} + +static const struct rb_augment_callbacks msg_tree_callbacks =3D { + .propagate =3D msg_tree_propagate_subtree_msg_count, + .copy =3D msg_tree_copy_subtree_msg_count, + .rotate =3D msg_tree_rotate_subtree_msg_count +}; + static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info) { struct rb_node **p, *parent =3D NULL; @@ -216,13 +278,20 @@ static int msg_insert(struct msg_msg *msg, struct mqu= eue_inode_info *info) INIT_LIST_HEAD(&leaf->msg_list); } leaf->priority =3D msg->m_type; + leaf->msg_count =3D 1; + leaf->subtree_msg_count =3D 1; =20 if (rightmost) info->msg_tree_rightmost =3D &leaf->rb_node; =20 rb_link_node(&leaf->rb_node, parent, p); - rb_insert_color(&leaf->rb_node, &info->msg_tree); + msg_tree_propagate_subtree_msg_count(parent, NULL); + rb_insert_augmented(&leaf->rb_node, &info->msg_tree, &msg_tree_callbacks); + goto common_insert; insert_msg: + leaf->msg_count++; + msg_tree_propagate_subtree_msg_count(&leaf->rb_node, NULL); +common_insert: info->attr.mq_curmsgs++; info->qsize +=3D msg->m_ts; list_add_tail(&msg->m_list, &leaf->msg_list); @@ -236,8 +305,7 @@ static inline void msg_tree_erase(struct posix_msg_tree= _node *leaf, =20 if (info->msg_tree_rightmost =3D=3D node) info->msg_tree_rightmost =3D rb_prev(node); - - rb_erase(node, &info->msg_tree); + rb_erase_augmented(node, &info->msg_tree, &msg_tree_callbacks); if (info->node_cache) kfree(leaf); else @@ -277,8 +345,11 @@ static inline struct msg_msg *msg_get(struct mqueue_in= ode_info *info) msg =3D list_first_entry(&leaf->msg_list, struct msg_msg, m_list); list_del(&msg->m_list); + leaf->msg_count--; if (list_empty(&leaf->msg_list)) { msg_tree_erase(leaf, info); + } else { + msg_tree_propagate_subtree_msg_count(&leaf->rb_node, NULL); } } info->attr.mq_curmsgs--; @@ -765,7 +836,6 @@ static struct ext_wait_queue *wq_get_first_waiter( return list_entry(ptr, struct ext_wait_queue, list); } =20 - static inline void set_cookie(struct sk_buff *skb, char code) { ((char *)skb->data)[NOTIFY_COOKIE_LEN-1] =3D code; @@ -1034,29 +1104,27 @@ static inline void pipelined_receive(struct wake_q_= head *wake_q, __pipelined_op(wake_q, info, sender); } =20 -static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr, - size_t msg_len, unsigned int msg_prio, - struct timespec64 *ts) +static ssize_t do_mq_sendmsg(mqd_t mqdes, const char __user *u_msg_ptr, si= ze_t msg_len, + unsigned int msg_prio, ktime_t *timeout) { + ssize_t ret =3D 0; struct inode *inode; struct ext_wait_queue wait; struct ext_wait_queue *receiver; struct msg_msg *msg_ptr; struct mqueue_inode_info *info; - ktime_t expires, *timeout =3D NULL; struct posix_msg_tree_node *new_leaf =3D NULL; - int ret =3D 0; - DEFINE_WAKE_Q(wake_q); + struct timespec64 ts, *abs_timeout =3D NULL; =20 + DEFINE_WAKE_Q(wake_q); if (unlikely(msg_prio >=3D (unsigned long) MQ_PRIO_MAX)) return -EINVAL; =20 - if (ts) { - expires =3D timespec64_to_ktime(*ts); - timeout =3D &expires; + if (timeout) { + ts =3D ktime_to_timespec64(*timeout); + abs_timeout =3D &ts; } - - audit_mq_sendrecv(mqdes, msg_len, msg_prio, ts); + audit_mq_sendrecv(mqdes, msg_len, msg_prio, abs_timeout); =20 CLASS(fd, f)(mqdes); if (fd_empty(f)) @@ -1139,24 +1207,37 @@ static int do_mq_timedsend(mqd_t mqdes, const char = __user *u_msg_ptr, return ret; } =20 -static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr, - size_t msg_len, unsigned int __user *u_msg_prio, - struct timespec64 *ts) +static ssize_t do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr, + size_t msg_len, unsigned int msg_prio, + struct timespec64 *ts) +{ + ktime_t expires, *timeout =3D NULL; + + if (ts) { + expires =3D timespec64_to_ktime(*ts); + timeout =3D &expires; + } + + return do_mq_sendmsg(mqdes, u_msg_ptr, msg_len, msg_prio, timeout); +} + +static ssize_t do_mq_recvmsg(mqd_t mqdes, char __user *u_msg_ptr, size_t m= sg_len, + unsigned int __user *u_msg_prio, ktime_t *timeout) { ssize_t ret; struct msg_msg *msg_ptr; struct inode *inode; struct mqueue_inode_info *info; struct ext_wait_queue wait; - ktime_t expires, *timeout =3D NULL; struct posix_msg_tree_node *new_leaf =3D NULL; + struct timespec64 ts, *abs_timeout =3D NULL; =20 - if (ts) { - expires =3D timespec64_to_ktime(*ts); - timeout =3D &expires; + if (timeout) { + ts =3D ktime_to_timespec64(*timeout); + abs_timeout =3D &ts; } =20 - audit_mq_sendrecv(mqdes, msg_len, 0, ts); + audit_mq_sendrecv(mqdes, msg_len, 0, abs_timeout); =20 CLASS(fd, f)(mqdes); if (fd_empty(f)) @@ -1222,7 +1303,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __use= r *u_msg_ptr, ret =3D msg_ptr->m_ts; =20 if ((u_msg_prio && put_user(msg_ptr->m_type, u_msg_prio)) || - store_msg(u_msg_ptr, msg_ptr, msg_ptr->m_ts)) { + store_msg(u_msg_ptr, msg_ptr, msg_ptr->m_ts)) { ret =3D -EFAULT; } free_msg(msg_ptr); @@ -1230,6 +1311,435 @@ static int do_mq_timedreceive(mqd_t mqdes, char __u= ser *u_msg_ptr, return ret; } =20 +static ssize_t do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr, siz= e_t msg_len, + unsigned int __user *u_msg_prio, struct timespec64 *ts) +{ + ktime_t expires, *timeout =3D NULL; + + if (ts) { + expires =3D timespec64_to_ktime(*ts); + timeout =3D &expires; + } + + return do_mq_recvmsg(mqdes, u_msg_ptr, msg_len, u_msg_prio, timeout); +} + +static struct msg_msg *mq_peek_index(struct mqueue_inode_info *info, unsig= ned long index) +{ + struct rb_node *node; + struct posix_msg_tree_node *leaf; + struct msg_msg *msg; + unsigned int right_count; + unsigned int offset; + unsigned int i =3D 0; + + node =3D info->msg_tree.rb_node; + while (node) { + leaf =3D rb_entry(node, struct posix_msg_tree_node, rb_node); + right_count =3D get_subtree_count(node->rb_right); + + if (index < right_count) { + node =3D node->rb_right; + } else if (index < (right_count + leaf->msg_count)) { + /* Target is at this priority level */ + offset =3D index - right_count; + list_for_each_entry(msg, &leaf->msg_list, m_list) { + if (i =3D=3D offset) + return msg; + i++; + } + WARN_ON_ONCE(i !=3D offset); + break; + } else { + index -=3D (right_count + leaf->msg_count); + node =3D node->rb_left; + } + } + + return NULL; +} + +static ssize_t do_mq_recvmsg2(mqd_t mqdes, struct mq_msg_attrs *args, unsi= gned int flags, + unsigned long index, ktime_t *timeout) +{ + ssize_t ret; + struct msg_msg *msg_ptr, *k_msg_buffer; + long k_m_type; + size_t k_m_ts; + struct inode *inode; + struct mqueue_inode_info *info; + struct timespec64 ts, *abs_timeout =3D NULL; + + if (timeout) { + ts =3D ktime_to_timespec64(*timeout); + abs_timeout =3D &ts; + } + if (flags & MQ_PEEK) { + audit_mq_sendrecv(mqdes, args->msg_len, 0, abs_timeout); + CLASS(fd, f)(mqdes); + if (fd_empty(f)) + return -EBADF; + + inode =3D file_inode(fd_file(f)); + if (unlikely(fd_file(f)->f_op !=3D &mqueue_file_operations)) + return -EBADF; + + info =3D MQUEUE_I(inode); + audit_file(fd_file(f)); + if (unlikely(!(fd_file(f)->f_mode & FMODE_READ))) + return -EBADF; + + if (unlikely(args->msg_len < info->attr.mq_msgsize)) + return -EMSGSIZE; + + if (index >=3D (unsigned long)info->attr.mq_maxmsg) + return -EINVAL; + + spin_lock(&info->lock); + + if (info->attr.mq_curmsgs =3D=3D 0) { + spin_unlock(&info->lock); + return -EAGAIN; + } + msg_ptr =3D mq_peek_index(info, index); + if (!msg_ptr) { + spin_unlock(&info->lock); + return -ENODATA; + } + k_m_type =3D msg_ptr->m_type; + k_m_ts =3D msg_ptr->m_ts; + + spin_unlock(&info->lock); + + k_msg_buffer =3D alloc_msg(k_m_ts); + + if (!k_msg_buffer) + return -ENOMEM; + ret =3D security_msg_msg_alloc(k_msg_buffer); + if (ret) { + free_msg(k_msg_buffer); + return ret; + } + + /* + * Two spin locks are necessary here. We are avoiding atomic memory + * allocation and premature allocation before confirming + * a message actually exists to peek and retrieving required buffer size + * when first lock was taken. + */ + spin_lock(&info->lock); + + msg_ptr =3D mq_peek_index(info, index); + if (!msg_ptr || msg_ptr->m_type !=3D k_m_type || + msg_ptr->m_ts !=3D k_m_ts) { + spin_unlock(&info->lock); + free_msg(k_msg_buffer); + return -EAGAIN; + } + msg_ptr =3D copy_msg(msg_ptr, k_msg_buffer, k_m_ts); + if (IS_ERR(msg_ptr)) { + spin_unlock(&info->lock); + free_msg(k_msg_buffer); + return PTR_ERR(msg_ptr); + } + spin_unlock(&info->lock); + + ret =3D k_msg_buffer->m_ts; + if (args->msg_prio && put_user(k_m_type, args->msg_prio)) { + free_msg(k_msg_buffer); + return -EFAULT; + } + if (store_msg((char *)args->msg_ptr, k_msg_buffer, k_m_ts)) { + free_msg(k_msg_buffer); + return -EFAULT; + } + free_msg(k_msg_buffer); + return ret; + } + if (flags & MQ_RECV) { + return do_mq_recvmsg(mqdes, (char *)args->msg_ptr, args->msg_len, + args->msg_prio, timeout); + } + + return -EINVAL; +} + +static int mq_mmsg_copy_attrs_from_user(struct mq_mmsg_attrs *attrs, + const struct mq_mmsg_attrs __user *uattrs, + unsigned int attrs_len) +{ + BUILD_BUG_ON(sizeof(*attrs) < MQ_MMSG_ATTRS_SIZE_VER0); + BUILD_BUG_ON(sizeof(*attrs) !=3D MQ_MMSG_ATTRS_SIZE_LATEST); + + if (unlikely(attrs_len < MQ_MMSG_ATTRS_SIZE_VER0)) + return -EINVAL; + if (unlikely(attrs_len > PAGE_SIZE)) + return -E2BIG; + return copy_struct_from_user(attrs, sizeof(*attrs), uattrs, attrs_len); +} + +#ifdef CONFIG_COMPAT +static int mq_mmsg_copy_compat_attrs(struct mq_mmsg_attrs *attrs, + const struct compat_mq_mmsg_attrs __user *uattrs, + unsigned int attrs_len) +{ + struct compat_mq_mmsg_attrs v =3D {}; + int err; + + BUILD_BUG_ON(sizeof(*attrs) < MQ_MMSG_ATTRS_SIZE_VER0); + BUILD_BUG_ON(sizeof(*attrs) !=3D MQ_MMSG_ATTRS_SIZE_LATEST); + BUILD_BUG_ON(sizeof(v) !=3D COMPAT_MQ_MMSG_ATTRS_SIZE_VER0); + + if (unlikely(attrs_len < COMPAT_MQ_MMSG_ATTRS_SIZE_VER0)) + return -EINVAL; + if (unlikely(attrs_len > PAGE_SIZE)) + return -E2BIG; + err =3D copy_struct_from_user(&v, sizeof(v), uattrs, attrs_len); + + if (err) + return err; + attrs->msg_attrs_vec =3D (struct iovec __user *)compat_ptr((unsigned long= )v.msg_attrs_vec); + attrs->ret =3D (int *)compat_ptr(v.ret); + attrs->vlen =3D v.vlen; + return 0; +} + +static int mq_mmsg_copy_compat_msg_attr(struct mq_msg_attrs *attr, + const struct iovec *desc_iov) +{ + struct compat_msg_attrs v =3D {}; + + if (desc_iov->iov_len !=3D sizeof(v)) + return -EINVAL; + if (copy_from_user(&v, desc_iov->iov_base, sizeof(v))) + return -EFAULT; + attr->msg_len =3D v.msg_len; + attr->msg_prio =3D (unsigned int *)compat_ptr(v.msg_prio); + attr->msg_ptr =3D compat_ptr(v.msg_ptr); + return 0; +} + +static int mq_mmsg_copy_compat_msg_attr_to_user(struct mq_msg_attrs *attr, + const struct iovec *desc_iov) +{ + struct compat_msg_attrs v =3D {}; + + v.msg_len =3D (__u32)attr->msg_len; + v.msg_prio =3D ptr_to_compat(attr->msg_prio); + v.msg_ptr =3D ptr_to_compat(attr->msg_ptr); + + if (desc_iov->iov_len !=3D sizeof(v)) + return -EINVAL; + + if (copy_struct_to_user(desc_iov->iov_base, desc_iov->iov_len, &v, sizeof= (v), 0)) + return -EFAULT; + return 0; +} + +#endif + +static int mq_mmsg_copy_msg_attr(struct mq_msg_attrs *attr, + const struct iovec *desc_iov, bool compat) +{ + if (compat) + return mq_mmsg_copy_compat_msg_attr(attr, desc_iov); + if (desc_iov->iov_len !=3D sizeof(*attr)) + return -EINVAL; + if (copy_from_user(attr, desc_iov->iov_base, sizeof(*attr))) + return -EFAULT; + return 0; +} + +static int mq_mmsg_atrr_to_user(struct mq_msg_attrs *attr, const struct io= vec *desc_iov, + bool compat) +{ + if (compat) + return mq_mmsg_copy_compat_msg_attr_to_user(attr, desc_iov); + + if (desc_iov->iov_len !=3D sizeof(*attr)) + return -EINVAL; + if (copy_struct_to_user(desc_iov->iov_base, desc_iov->iov_len, attr, size= of(*attr), 0)) + return -EFAULT; + return 0; +} + +static inline long mq_mmsg_done_or_error(unsigned int done, int ret) +{ + if (ret < 0 && done) + return done; + return ret; +} + +static ssize_t do_mq_recvmmsg(mqd_t mqdes, const struct mq_mmsg_attrs *att= rs, + unsigned int flags, unsigned long start_idx, + struct timespec64 *ts, bool compat) +{ + struct iov_iter iter; + struct iovec outer_iovstack[UIO_FASTIOV], *free_iov =3D outer_iovstack; + const struct iovec *msg_iov; + ktime_t batch_deadline, *timeout =3D NULL; + ssize_t ret =3D 0; + ssize_t batch_success =3D 0; + unsigned long logical_index; + unsigned int iov_idx; + + if (flags & ~MQ_VALID_FLAGS) + return -EINVAL; + if ((flags & MQ_RECV) && (flags & MQ_PEEK)) + return -EINVAL; + if ((flags & MQ_START_AT) && (flags & MQ_RESUME)) + return -EINVAL; + if ((flags & (MQ_START_AT | MQ_RESUME)) =3D=3D 0) + return -EINVAL; + + if (start_idx > attrs->vlen) + return -EINVAL; + if (!attrs->vlen || attrs->vlen > UIO_MAXIOV) + return -EINVAL; + + ret =3D __import_iovec(ITER_DEST, + attrs->msg_attrs_vec, attrs->vlen, + ARRAY_SIZE(outer_iovstack), &free_iov, &iter, + compat); + if (ret < 0) + return ret; + msg_iov =3D iter_iov(&iter); + + /* One absolute deadline for the whole batch. */ + if (ts) { + batch_deadline =3D timespec64_to_ktime(*ts); + timeout =3D &batch_deadline; + } + if (flags & MQ_START_AT) { + iov_idx =3D 0; + logical_index =3D start_idx + iov_idx; + } + if (flags & MQ_RESUME) { + iov_idx =3D start_idx; + logical_index =3D iov_idx; + } + + for (; iov_idx < attrs->vlen; iov_idx++, logical_index++) { + struct mq_msg_attrs desc =3D {}; + + ret =3D mq_mmsg_copy_msg_attr(&desc, &msg_iov[iov_idx], compat); + if (ret < 0) + goto clean_up_failure; + + logical_index =3D (flags & MQ_PEEK) ? logical_index : 0; + ret =3D do_mq_recvmsg2(mqdes, &desc, flags, logical_index, timeout); + + if (ret =3D=3D -ERESTARTSYS && logical_index =3D=3D start_idx) { + kfree(free_iov); + return ret; + } + if (ret =3D=3D -ERESTARTSYS && logical_index !=3D start_idx) { + ret =3D -EINTR; + goto clean_up_failure; + } + if (ret < 0) + goto clean_up_failure; + + desc.msg_len =3D ret; + if (mq_mmsg_atrr_to_user(&desc, &msg_iov[iov_idx], compat)) + goto clean_up_failure; + batch_success++; + } + + if (!(batch_success !=3D attrs->vlen)) { + if (attrs->ret && put_user(0, attrs->ret)) { + kfree(free_iov); + return -EFAULT; + } + } + kfree(free_iov); +clean_up_failure: + if (attrs->ret && put_user(ret, attrs->ret)) { + kfree(free_iov); + return -EFAULT; + } + return mq_mmsg_done_or_error(batch_success, ret < 0 ? ret : batch_success= ); +} + +static ssize_t do_mq_sendmmsg(mqd_t mqdes, const struct mq_mmsg_attrs *att= rs, + unsigned long start_idx, struct timespec64 *ts, + bool compat) +{ + struct iov_iter iter; + struct iovec outer_iovstack[UIO_FASTIOV], *free_iov =3D outer_iovstack; + const struct iovec *msg_iov; + ktime_t batch_deadline, *timeout =3D NULL; + ssize_t ret =3D 0; + ssize_t batch_success =3D 0; + unsigned int i; + + if (!attrs->vlen || attrs->vlen > UIO_MAXIOV || start_idx > attrs->vlen) + return -EINVAL; + + ret =3D __import_iovec(ITER_SOURCE, + attrs->msg_attrs_vec, attrs->vlen, + ARRAY_SIZE(outer_iovstack), &free_iov, &iter, + compat); + if (ret < 0) + return ret; + msg_iov =3D iter_iov(&iter); + + if (ts) { + batch_deadline =3D timespec64_to_ktime(*ts); + timeout =3D &batch_deadline; + } + for (i =3D start_idx; i < attrs->vlen; i++) { + struct mq_msg_attrs desc =3D {}; + unsigned int msg_prio =3D 0; + + ret =3D mq_mmsg_copy_msg_attr(&desc, &msg_iov[i], compat); + + if (ret < 0) + goto clean_up_failure; + if (!desc.msg_prio) { + ret =3D -EINVAL; + goto clean_up_failure; + } + if (get_user(msg_prio, desc.msg_prio)) { + ret =3D -EFAULT; + goto clean_up_failure; + } + + ret =3D do_mq_sendmsg(mqdes, desc.msg_ptr, desc.msg_len, + msg_prio, timeout); + + if (ret =3D=3D -ERESTARTSYS && i =3D=3D start_idx) { + kfree(free_iov); + return ret; + } + if (ret =3D=3D -ERESTARTSYS && i !=3D start_idx) { + ret =3D -EINTR; + goto clean_up_failure; + } + if (ret < 0) + goto clean_up_failure; + + desc.msg_len =3D ret; + if (mq_mmsg_atrr_to_user(&desc, &msg_iov[i], compat)) + goto clean_up_failure; + batch_success++; + } + + if (!(batch_success !=3D attrs->vlen)) { + if (attrs->ret && put_user(0, attrs->ret)) { + kfree(free_iov); + return -EFAULT; + } + } + kfree(free_iov); +clean_up_failure: + if (attrs->ret && put_user(ret, attrs->ret)) { + kfree(free_iov); + return -EFAULT; + } + return mq_mmsg_done_or_error(batch_success, ret < 0 ? ret : batch_success= ); +} + SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, size_t, msg_len, unsigned int, msg_prio, const struct __kernel_timespec __user *, u_abs_timeout) @@ -1244,6 +1754,27 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const ch= ar __user *, u_msg_ptr, return do_mq_timedsend(mqdes, u_msg_ptr, msg_len, msg_prio, p); } =20 +SYSCALL_DEFINE5(mq_sendmmsg, mqd_t, mqdes, struct mq_mmsg_attrs __user *, = attrs, + unsigned int, attrs_len, unsigned long, start_idx, + const struct __kernel_timespec __user *, u_abs_timeout) +{ + struct mq_mmsg_attrs kattrs =3D {}; + struct timespec64 ts, *p =3D NULL; + int ret; + + ret =3D mq_mmsg_copy_attrs_from_user(&kattrs, attrs, attrs_len); + if (ret) + return ret; + if (u_abs_timeout) { + int res =3D prepare_timeout(u_abs_timeout, &ts); + + if (res) + return res; + p =3D &ts; + } + return do_mq_sendmmsg(mqdes, &kattrs, start_idx, p, false); +} + SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, size_t, msg_len, unsigned int __user *, u_msg_prio, const struct __kernel_timespec __user *, u_abs_timeout) @@ -1258,6 +1789,27 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char = __user *, u_msg_ptr, return do_mq_timedreceive(mqdes, u_msg_ptr, msg_len, u_msg_prio, p); } =20 +SYSCALL_DEFINE6(mq_recvmmsg, mqd_t, mqdes, struct mq_mmsg_attrs __user *, = attrs, + unsigned int, attrs_len, unsigned int, flags, unsigned long, start_idx, + const struct __kernel_timespec __user *, u_abs_timeout) +{ + struct mq_mmsg_attrs kattrs =3D {}; + struct timespec64 ts, *p =3D NULL; + int ret; + + ret =3D mq_mmsg_copy_attrs_from_user(&kattrs, attrs, attrs_len); + if (ret) + return ret; + if (u_abs_timeout) { + int res =3D prepare_timeout(u_abs_timeout, &ts); + + if (res) + return res; + p =3D &ts; + } + return do_mq_recvmmsg(mqdes, &kattrs, flags, start_idx, p, false); +} + /* * Notes: the case when user wants us to deregister (with NULL as pointer) * and he isn't currently owner of notification, will be silently discarde= d. @@ -1460,7 +2012,7 @@ struct compat_mq_attr { }; =20 static inline int get_compat_mq_attr(struct mq_attr *attr, - const struct compat_mq_attr __user *uattr) + const struct compat_mq_attr __user *uattr) { struct compat_mq_attr v; =20 @@ -1476,7 +2028,7 @@ static inline int get_compat_mq_attr(struct mq_attr *= attr, } =20 static inline int put_compat_mq_attr(const struct mq_attr *attr, - struct compat_mq_attr __user *uattr) + struct compat_mq_attr __user *uattr) { struct compat_mq_attr v; =20 @@ -1491,8 +2043,8 @@ static inline int put_compat_mq_attr(const struct mq_= attr *attr, } =20 COMPAT_SYSCALL_DEFINE4(mq_open, const char __user *, u_name, - int, oflag, compat_mode_t, mode, - struct compat_mq_attr __user *, u_attr) + int, oflag, compat_mode_t, mode, + struct compat_mq_attr __user *, u_attr) { struct mq_attr attr, *p =3D NULL; if (u_attr && oflag & O_CREAT) { @@ -1504,7 +2056,7 @@ COMPAT_SYSCALL_DEFINE4(mq_open, const char __user *, = u_name, } =20 COMPAT_SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes, - const struct compat_sigevent __user *, u_notification) + const struct compat_sigevent __user *, u_notification) { struct sigevent n, *p =3D NULL; if (u_notification) { @@ -1541,6 +2093,56 @@ COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes, return -EFAULT; return 0; } + +COMPAT_SYSCALL_DEFINE5(mq_sendmmsg, mqd_t, mqdes, struct compat_mq_mmsg_at= trs __user *, attrs, + unsigned int, attrs_len, unsigned long, start_idx, + const struct __kernel_timespec __user *, u_abs_timeout) +{ + struct mq_mmsg_attrs kattrs =3D {}; + struct timespec64 ts, *p =3D NULL; + struct iovec msg_atrrs_vec =3D {}; + int ret; + + kattrs.msg_attrs_vec =3D &msg_atrrs_vec; + ret =3D mq_mmsg_copy_compat_attrs(&kattrs, attrs, attrs_len); + if (ret) + return ret; + + if (u_abs_timeout) { + int res =3D prepare_timeout(u_abs_timeout, &ts); + + if (res) + return res; + p =3D &ts; + } + + return do_mq_sendmmsg(mqdes, &kattrs, start_idx, p, true); +} + +COMPAT_SYSCALL_DEFINE6(mq_recvmmsg, mqd_t, mqdes, struct compat_mq_mmsg_at= trs __user *, attrs, + unsigned int, attrs_len, unsigned int, flags, unsigned long, star= t_idx, + const struct __kernel_timespec __user *, u_abs_timeout) +{ + struct mq_mmsg_attrs kattrs =3D {}; + struct timespec64 ts, *p =3D NULL; + struct iovec msg_atrrs_vec =3D {}; + int ret; + + kattrs.msg_attrs_vec =3D &msg_atrrs_vec; + ret =3D mq_mmsg_copy_compat_attrs(&kattrs, attrs, attrs_len); + if (ret) + return ret; + + if (u_abs_timeout) { + int res =3D prepare_timeout(u_abs_timeout, &ts); + + if (res) + return res; + p =3D &ts; + } + + return do_mq_recvmmsg(mqdes, &kattrs, flags, start_idx, p, true); +} #endif =20 #ifdef CONFIG_COMPAT_32BIT_TIME diff --git a/ipc/msg.c b/ipc/msg.c index 62996b97f0ac..53c1632dc22a 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -1156,7 +1156,7 @@ static long do_msgrcv(int msqid, void __user *buf, si= ze_t bufsz, long msgtyp, in * not update queue parameters. */ if (msgflg & MSG_COPY) { - msg =3D copy_msg(msg, copy); + msg =3D copy_msg(msg, copy, min_t(size_t, bufsz, ns->msg_ctlmax)); goto out_unlock0; } =20 diff --git a/ipc/msgutil.c b/ipc/msgutil.c index e28f0cecb2ec..296af343eb07 100644 --- a/ipc/msgutil.c +++ b/ipc/msgutil.c @@ -51,7 +51,7 @@ static int __init init_msg_buckets(void) } subsys_initcall(init_msg_buckets); =20 -static struct msg_msg *alloc_msg(size_t len) +struct msg_msg *alloc_msg(size_t len) { struct msg_msg *msg; struct msg_msgseg **pseg; @@ -122,39 +122,36 @@ struct msg_msg *load_msg(const void __user *src, size= _t len) free_msg(msg); return ERR_PTR(err); } -#ifdef CONFIG_CHECKPOINT_RESTORE -struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst) + +struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst, size_t = len) { - struct msg_msgseg *dst_pseg, *src_pseg; - size_t len =3D src->m_ts; - size_t alen; + struct msg_msgseg *src_seg, *dst_seg; + size_t remaining, chunk; =20 - if (src->m_ts > dst->m_ts) + if (src->m_ts > len) return ERR_PTR(-EINVAL); =20 - alen =3D min(len, DATALEN_MSG); - memcpy(dst + 1, src + 1, alen); + chunk =3D min(len, DATALEN_MSG); =20 - for (dst_pseg =3D dst->next, src_pseg =3D src->next; - src_pseg !=3D NULL; - dst_pseg =3D dst_pseg->next, src_pseg =3D src_pseg->next) { + memcpy(dst + 1, src + 1, chunk); + remaining =3D len - chunk; + src_seg =3D src->next; + dst_seg =3D dst->next; =20 - len -=3D alen; - alen =3D min(len, DATALEN_SEG); - memcpy(dst_pseg + 1, src_pseg + 1, alen); + while (remaining > 0 && src_seg && dst_seg) { + chunk =3D min(remaining, DATALEN_SEG); + memcpy(dst_seg + 1, src_seg + 1, chunk); + remaining -=3D chunk; + src_seg =3D src_seg->next; + dst_seg =3D dst_seg->next; } - + if (remaining !=3D 0) + return ERR_PTR(-EINVAL); dst->m_type =3D src->m_type; - dst->m_ts =3D src->m_ts; - + dst->m_ts =3D len; return dst; } -#else -struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst) -{ - return ERR_PTR(-ENOSYS); -} -#endif + int store_msg(void __user *dest, struct msg_msg *msg, size_t len) { size_t alen; diff --git a/ipc/util.h b/ipc/util.h index a55d6cebe6d3..374abeee79b3 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -197,8 +197,9 @@ int ipc_parse_version(int *cmd); =20 extern void free_msg(struct msg_msg *msg); extern struct msg_msg *load_msg(const void __user *src, size_t len); -extern struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst); +extern struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst, = size_t len); extern int store_msg(void __user *dest, struct msg_msg *msg, size_t len); +extern struct msg_msg *alloc_msg(size_t len); =20 static inline int ipc_checkid(struct kern_ipc_perm *ipcp, int id) { diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index add3032da16f..8219d76c72a0 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -392,5 +392,11 @@ COND_SYSCALL(setuid16); COND_SYSCALL(rseq); COND_SYSCALL(rseq_slice_yield); =20 +/* ipc */ +COND_SYSCALL(mq_recvmmsg); +COND_SYSCALL_COMPAT(mq_recvmmsg); +COND_SYSCALL(mq_sendmmsg); +COND_SYSCALL_COMPAT(mq_sendmmsg); + COND_SYSCALL(uretprobe); COND_SYSCALL(uprobe); --=20 2.43.0 From nobody Mon Sep 28 22:30:47 2026 Received: from mail-pj2-f42.google.com (mail-pj2-f42.google.com [74.125.227.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ADAC33264CC for ; Sat, 26 Sep 2026 04:01:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790395292; cv=none; b=oco/l3Khu+SuImBq4i8TuubK/9PeehNRDLsISGHOz4ZjYjoWHjduTbppF7g2ZmImacH4DAjNd/r9fVOzqRU5lmwtbe1n7Wqt+s0xdl96s/saKxAkmBH9E9+1UBGMN0hgmCkkFwlZE9s2ut2Q8rePy+KCpinPvFfYaSR6JsWs0zY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790395292; c=relaxed/simple; bh=MaU/7mPDJMeiixRYuVialuhS9Ch9lgCwcXdW+wj4Idw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tGVp1GPAs6Z7QHuidx79aXnzV1RwRDwgly4vInuXQY9SNa+99e5cYx+KQP6yXa/lgS8zxilSbjSQnvsNzIF1urnkWYgKw+oY2ffYdd1ETooCDQRBc9fPv/UTVTGwYHJr+J6r+0CdLt4rVTEVa+rNDF0J2b1nIl/SAaQTjQgioAI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YIjSWjS5; arc=none smtp.client-ip=74.125.227.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YIjSWjS5" Received: by mail-pj2-f42.google.com with SMTP id 98e67ed59e1d1-396ccd5cf02so817444a91.3 for ; Fri, 25 Sep 2026 21:01:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790395290; x=1791000090; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ps2Mul73UWS8TSnsgDmtr1shDveDexZA9drtRRJEyO8=; b=YIjSWjS5ajWhL8yZPTgxTWK4eJU+W2r14XPQGDa2eoy+/hmVLdnEhwRM2IE5GX/zlH BMMfB9dVL/IGZRKpfsh/pz7d3ILKd/cg96s1BHt6GPY8MkOxIv2gVYJSfNXi5AUyHa8L hMq98VSZ3C8n4jA71lwFZoGr8m/nYRy+THl+pC5NYAknj2k3bsFvidpfoQLbKbxf5M9O +V1qio7DwnTSg4UPBFNA1KzzBJWXHZmVyhAYUYzYjd7RM2obZH5V6DsZ0nBdvQve/1L6 gSfHb6u36ck1JJL281TDWSS+OqdvSwFNF8DOUIA0jUX5bumzKGoNvtLhWxqA7X7+A8Th 0SBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790395290; x=1791000090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ps2Mul73UWS8TSnsgDmtr1shDveDexZA9drtRRJEyO8=; b=Ek9zTCZzrPbtn/rXbpRRd5q7xAngpHe2EUr57zBLx2/Lc+LHGzk+rv21zf07aeCPRq fSYEBdyW5Q0g+aBUN+Sl2b0vy4CQ7LFl3zLlgRH41Uju5uCQQydfqYarxd2ojZ+FuYeD 8gy6uPYT0p41/UlGlzA9V+p8B5plFmefPJZcnPA4DLq3SgaMZpW4ohkS/fMKon5NIqcM o0yoAtv2wEy7P5iivlYaAncYK6Ha04+ZvsOB6PXDPZpfYzl813Wxi8+CSgoaqurNfhLk AzLnvhdiKtkPkNtSdmK7KjaLIjOmIEoF9+EIZB+HzDFeT6lkfnENQC1wSOorWqVNCyBb KaPw== X-Gm-Message-State: AFuF++mHx/bkKBG/nu1q6c9YU6nExQE3+9xCAvSUM/FqttQOgWz9D+xG 6uVGwyatuImebM22YqEZVIUAYHMnJTcoI6RiwAAaITt4zLzU60LRKtp4 X-Gm-Gg: AYBFou1nssDiuxPtQvmIeCg+nJVsgMvcc18s15HotfkpR7TX+yfj3G1OdZ5Wi80lXYQ hCz2Q8cj6fuyVnseDSQwfXi+K95toGzlbVrPT7v9kzijXKiZEuA/eY4kqdNr4aKOGz0WKK9o1kQ 2uM6NnPz0eUkl0AGWHOhYhSF8KFX3lD/ihUa/uKxeeb0Vg7X0GCz02RrDP9tC6rsYm37Uaoj9Zp FuGUAifB6yboZS5umZo4LlkbUQWeFuE+LH54h0kq5LEOPeV7bEcA7PODJ2BYE+1EcS8y4/+EkdI g1UH95pvJOQc23VBsKzmGF4GiRdDm5ylYoLn78zSsUbJTFGDBuQVN2IWKF4K/Npdfh57pjl3iPp UE7wzNtXAnl8XCjpLoXwnpxgNUeRwrErBwSDYRvyHLfooaCQ7uC73pa3hmbHU0hVbYAjrDRnxBK D8Y7GYxOStrTi77XEUV7U8NdO0/1I7XMi1C+cOfAms4Xn4XZBjOApaCYdstvBtcrE7Uim3oOa0z 9AJJE69+SfvXufBQODMNPGx X-Received: by 2002:a17:90b:288c:b0:3a0:d651:3957 with SMTP id 98e67ed59e1d1-3a0d65147cemr1328817a91.35.1790395289956; Fri, 25 Sep 2026 21:01:29 -0700 (PDT) Received: from Modern-15.. ([2401:4900:8206:fc0b:ca44:7562:7898:358b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0bda430b3sm6845063a91.0.2026.09.25.21.01.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 21:01:29 -0700 (PDT) From: mathura kumar To: brauner@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, corbet@lwn.net, mathura.kumar.tech@gmail.com Subject: [PATCH v5 2/4] IPC: Added system call entry in all of most common architectures Date: Sat, 26 Sep 2026 09:30:56 +0530 Message-ID: <20260926040102.308350-3-mathura.kumar.tech@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260926040102.308350-1-mathura.kumar.tech@gmail.com> References: <20260926040102.308350-1-mathura.kumar.tech@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Wire up the new syscall numbers for all common architectures in their respective syscall tables. Signed-off-by: mathura kumar --- arch/alpha/kernel/syscalls/syscall.tbl | 2 ++ arch/arm/tools/syscall.tbl | 2 ++ arch/arm64/tools/syscall_32.tbl | 3 +++ arch/m68k/kernel/syscalls/syscall.tbl | 2 ++ arch/microblaze/kernel/syscalls/syscall.tbl | 2 ++ arch/mips/kernel/syscalls/syscall_n32.tbl | 2 ++ arch/mips/kernel/syscalls/syscall_n64.tbl | 3 +++ arch/mips/kernel/syscalls/syscall_o32.tbl | 2 ++ arch/parisc/kernel/syscalls/syscall.tbl | 2 ++ arch/powerpc/kernel/syscalls/syscall.tbl | 2 ++ arch/s390/kernel/syscalls/syscall.tbl | 3 +++ arch/sh/kernel/syscalls/syscall.tbl | 2 ++ arch/sparc/kernel/syscalls/syscall.tbl | 3 +++ arch/x86/entry/syscalls/syscall_32.tbl | 2 ++ arch/x86/entry/syscalls/syscall_64.tbl | 3 ++- arch/xtensa/kernel/syscalls/syscall.tbl | 2 ++ scripts/syscall.tbl | 2 ++ 17 files changed, 38 insertions(+), 1 deletion(-) diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/sys= calls/syscall.tbl index f31b7afffc34..d3f73725239b 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@ -511,3 +511,5 @@ 579 common file_setattr sys_file_setattr 580 common listns sys_listns 581 common rseq_slice_yield sys_rseq_slice_yield +582 common mq_recvmmsg sys_mq_recvmmsg +583 common mq_sendmmsg sys_mq_sendmmsg diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index 94351e22bfcf..ad9080eb5800 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -486,3 +486,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg diff --git a/arch/arm64/tools/syscall_32.tbl b/arch/arm64/tools/syscall_32.= tbl index 62d93d88e0fe..7d758c8de10f 100644 --- a/arch/arm64/tools/syscall_32.tbl +++ b/arch/arm64/tools/syscall_32.tbl @@ -483,3 +483,6 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg + diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/sysca= lls/syscall.tbl index 248934257101..42e277f7f1bc 100644 --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl @@ -471,3 +471,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/= kernel/syscalls/syscall.tbl index 223d26303627..8f92da4e6c86 100644 --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl @@ -477,3 +477,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/s= yscalls/syscall_n32.tbl index 7430714e2b8f..03099ba20103 100644 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl @@ -410,3 +410,5 @@ 469 n32 file_setattr sys_file_setattr 470 n32 listns sys_listns 471 n32 rseq_slice_yield sys_rseq_slice_yield +472 n32 mq_recvmmsg compat_sys_mq_recvmmsg +473 n32 mq_sendmmsg compat_sys_mq_sendmmsg diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/s= yscalls/syscall_n64.tbl index 630aab9e5425..49b52129b110 100644 --- a/arch/mips/kernel/syscalls/syscall_n64.tbl +++ b/arch/mips/kernel/syscalls/syscall_n64.tbl @@ -386,3 +386,6 @@ 469 n64 file_setattr sys_file_setattr 470 n64 listns sys_listns 471 n64 rseq_slice_yield sys_rseq_slice_yield +472 n64 mq_recvmmsg sys_mq_recvmmsg +473 n64 mq_sendmmsg sys_mq_sendmmsg + diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/s= yscalls/syscall_o32.tbl index 128653112284..c26fa87ae06e 100644 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl @@ -459,3 +459,5 @@ 469 o32 file_setattr sys_file_setattr 470 o32 listns sys_listns 471 o32 rseq_slice_yield sys_rseq_slice_yield +472 o32 mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 o32 mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/s= yscalls/syscall.tbl index c6331dad9461..fd3c4fde3298 100644 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl @@ -470,3 +470,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel= /syscalls/syscall.tbl index 4fcc7c58a105..a84355ada041 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -562,3 +562,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 nospu rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/sysca= lls/syscall.tbl index 09a7ef04d979..a3ce9c216477 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@ -398,3 +398,6 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg + diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/= syscall.tbl index 70b315cbe710..b14d8f4614c4 100644 --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl @@ -475,3 +475,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/sys= calls/syscall.tbl index 7e71bf7fcd14..7ce825b9f531 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@ -517,3 +517,6 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg + diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscal= ls/syscall_32.tbl index f832ebd2d79b..b40cce591f20 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -477,3 +477,5 @@ 469 i386 file_setattr sys_file_setattr 470 i386 listns sys_listns 471 i386 rseq_slice_yield sys_rseq_slice_yield +472 i386 mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 i386 mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscal= ls/syscall_64.tbl index 524155d655da..16b29007e210 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -396,7 +396,8 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield - +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg # # Due to a historical design error, certain syscalls are numbered differen= tly # in x32 as compared to native x86_64. These syscalls have numbers 512-54= 7. diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/s= yscalls/syscall.tbl index a9bca4e484de..377f27d70a65 100644 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl @@ -442,3 +442,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg diff --git a/scripts/syscall.tbl b/scripts/syscall.tbl index 7a42b32b6577..8e50ab85b951 100644 --- a/scripts/syscall.tbl +++ b/scripts/syscall.tbl @@ -412,3 +412,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg --=20 2.43.0 From nobody Mon Sep 28 22:30:47 2026 Received: from mail-pz2-f42.google.com (mail-pz2-f42.google.com [74.125.228.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 423A238944E for ; Sat, 26 Sep 2026 04:01:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790395299; cv=none; b=mcXi4br+z0uMxeMkptFW7vjONPPAq9mdNZ7mUtNZ8nqjnfefQ/9FjXQ7mLSDjODgXhHESsZrS5RK/D9HM4vfXwIsSxfiUZQBHA8Wf6KP4jBgAon/ZpnuIfbd33JbGnCPurX4t5A2vZKO3HpcqunVywYQIHJ1U1RbJ6ClBrkcPgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790395299; c=relaxed/simple; bh=mbW0//BGLoiGM7/KqsbbDvaT7TOxpU6dppbfGoucxow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fADfi73DswVmvGUeZ13QC98TKAvIPTMsTO0GPH5oQ306qC933iZicbRuJ7lZHJtqt8urF5XaW4Q02IBjkXSS1088vAjeUQav3axot2+NnejwlUunSrvHZSpx0FWwUKPHkwcnMhOyXbBR2yYL1ECF0hCDw1zkLQhGr6vKK76O53o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BfebqXGM; arc=none smtp.client-ip=74.125.228.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BfebqXGM" Received: by mail-pz2-f42.google.com with SMTP id 41be03b00d2f7-cc4d04d740cso568956a12.0 for ; Fri, 25 Sep 2026 21:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790395296; x=1791000096; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=PHq3kx/aITpUfp32gN2q1/ndjJiSSW3d7Xl6YJ8epP0=; b=BfebqXGMlGv9uZLZts3PRKj02oeQhx1hTd+Hl5m3DN1Ke83QeLoZv5+1a4ue0RoCh+ gOm63DPzawcET1r91zrfampa4J4WOQODHVafE3qk2XNVQCLz1ukcjd0crhAqtvFwv86h QJ3Ho+ISuq5byI7XprHZqAs706yHBLAUgbeLsuB+Zgmkcz6A4fYFYNOhIwZsTC2ez7TW pImM7s8+WZN3kcOQrESD7++FW+NLeT4KQwK0fyiPgS8gkLRrZnTuaOHUg4ioyW7tLtwG zvhr2T0IRL7S5O9bG3CdQYCQLQ7F5ykryL61jaclbc9VHBJyNF/7z7/i+zLI24mDZk+D rjSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790395296; x=1791000096; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=PHq3kx/aITpUfp32gN2q1/ndjJiSSW3d7Xl6YJ8epP0=; b=OhID527qHviF5FtULk2WP5rPCiJJAsM51PEYPkBRLW7S2n8ArUewlE0VQfz6Y6s+IO HVGkZSmNysKRhUgjaswuO0qeUNOtUpy+768QCl/YmqubGnE84Y+sBc6XnGjI39MFIUrk VjTNKgdoIBna/DneRMLmqoU/6TGgm9yXdSKpbEcgoZhj/MhO52AIf67cNw6pr4IxWr4a 4O5u0KAEVdjIyL2zisVcohMnRc+uY0FYGZNKC/5d9NkA1A+jjHtEJEqIder5aBKoFvRG nkar4nrTYgg7Psz5hkLjuzadZ/mWnFksv3HPi5ab5XPUQrGJbhe3zY22fd+XDDt3Dz+v 2S4w== X-Gm-Message-State: AFuF++mOoTBjr7D0BNQhG2mLTOzyT9ZIcO+22ahQHvhx0x7l/5jmBZcv 5/3RN8Qwj9cEaD0Z2RHR5z3+1iQavGy2fGQ2qReHNf+Pm2ZkrtfuKlkr X-Gm-Gg: AYBFou2iUfl9PMV06JMuHYZkoyacsGKUxbj8lMonRJmYyTOhWd7DokSGF3ZpKHjo7TG IwnWb6xWzAqBjjJ3hlnNNAjpxAghQjWvABtnW4L0lTGaf1Bn8682gdfq7pTXXxNCVHi1O8Lv2PV 8p2YACQVH1kWruzSTYM1Tsbop+4FAt3NCgmDDRV6zt1imk5jRcxC4PeTGMr8Jx/nNsGqrv2OJO2 AoAkLQqiVSBXIqoOa1+JkxmwzMIBqsixkH3uzx520UdrZs6uKmKr6Uy8WBj0u2rNvYLtW9U9qZz T0AQC//WiKgqZhgsVjZ0Yyeyrj/ukijzoAsi1B7UMV0sJOTZQKrtnRRw7dxT7Vbyeq+Olxg0u66 6N8w2DQOvDjiQP4NN5ZJircBJh+JyQWjitvFZk0XxDDvBOnqMvKG/v7nPGx6qhPiR5Monc9M+9l T0hpI3uPI41KxoEKm4byQrzR/dwk6tF5/GN4nTho1WnmDY64PC94G6q4EipHVq0uNLw4Eq2FPQ/ /tUypZwXYiGtg== X-Received: by 2002:a17:90b:48cc:b0:39e:261:4e12 with SMTP id 98e67ed59e1d1-3a09875f70dmr7110878a91.23.1790395295789; Fri, 25 Sep 2026 21:01:35 -0700 (PDT) Received: from Modern-15.. ([2401:4900:8206:fc0b:ca44:7562:7898:358b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0bda430b3sm6845063a91.0.2026.09.25.21.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 21:01:35 -0700 (PDT) From: mathura kumar To: brauner@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, corbet@lwn.net, mathura.kumar.tech@gmail.com Subject: [PATCH v5 3/4] IPC: Added system call entry in performance tool Date: Sat, 26 Sep 2026 09:30:57 +0530 Message-ID: <20260926040102.308350-4-mathura.kumar.tech@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260926040102.308350-1-mathura.kumar.tech@gmail.com> References: <20260926040102.308350-1-mathura.kumar.tech@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It include all the entries made up in performance tools for both new system call. Signed-off-by: mathura kumar --- tools/include/uapi/asm-generic/unistd.h | 8 +++++++- tools/perf/arch/alpha/entry/syscalls/syscall.tbl | 4 ++++ tools/perf/arch/arm/entry/syscalls/syscall.tbl | 3 +++ tools/perf/arch/arm64/entry/syscalls/syscall_32.tbl | 3 +++ tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl | 2 ++ tools/perf/arch/parisc/entry/syscalls/syscall.tbl | 3 +++ tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 3 +++ tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 ++ tools/perf/arch/sh/entry/syscalls/syscall.tbl | 2 ++ tools/perf/arch/sparc/entry/syscalls/syscall.tbl | 2 ++ tools/perf/arch/x86/entry/syscalls/syscall_32.tbl | 2 ++ tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 ++ tools/perf/arch/xtensa/entry/syscalls/syscall.tbl | 2 ++ tools/scripts/syscall.tbl | 2 ++ 14 files changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/a= sm-generic/unistd.h index a627acc8fb5f..b891edfebdf9 100644 --- a/tools/include/uapi/asm-generic/unistd.h +++ b/tools/include/uapi/asm-generic/unistd.h @@ -863,8 +863,14 @@ __SYSCALL(__NR_listns, sys_listns) #define __NR_rseq_slice_yield 471 __SYSCALL(__NR_rseq_slice_yield, sys_rseq_slice_yield) =20 +#define __NR_mq_recvmmsg 472 +__SC_COMP(__NR_mq_recvmmsg, sys_mq_recvmmsg, compat_sys_mq_recvmmsg) + +#define __NR_mq_sendmmsg 473 +__SC_COMP(__NR_mq_sendmmsg, sys_mq_sendmmsg, compat_sys_mq_sendmmsg) + #undef __NR_syscalls -#define __NR_syscalls 472 +#define __NR_syscalls 474 =20 /* * 32 bit systems traditionally used different diff --git a/tools/perf/arch/alpha/entry/syscalls/syscall.tbl b/tools/perf/= arch/alpha/entry/syscalls/syscall.tbl index 74720667fe09..44cb7657bd44 100644 --- a/tools/perf/arch/alpha/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/alpha/entry/syscalls/syscall.tbl @@ -502,3 +502,7 @@ 570 common lsm_set_self_attr sys_lsm_set_self_attr 571 common lsm_list_modules sys_lsm_list_modules 572 common mseal sys_mseal +# 573-581 are kept reserved for existing system call +582 common mq_recvmmsg sys_mq_recvmmsg +583 common mq_sendmmsg sys_mq_sendmmsg + diff --git a/tools/perf/arch/arm/entry/syscalls/syscall.tbl b/tools/perf/ar= ch/arm/entry/syscalls/syscall.tbl index 94351e22bfcf..714b3964e31c 100644 --- a/tools/perf/arch/arm/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/arm/entry/syscalls/syscall.tbl @@ -486,3 +486,6 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg + diff --git a/tools/perf/arch/arm64/entry/syscalls/syscall_32.tbl b/tools/pe= rf/arch/arm64/entry/syscalls/syscall_32.tbl index 9a37930d4e26..3d408a842d07 100644 --- a/tools/perf/arch/arm64/entry/syscalls/syscall_32.tbl +++ b/tools/perf/arch/arm64/entry/syscalls/syscall_32.tbl @@ -474,3 +474,6 @@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal +# 463-471 are kept reserved for existing system call +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg diff --git a/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl b/tools/pe= rf/arch/mips/entry/syscalls/syscall_n64.tbl index 630aab9e5425..de1000dff765 100644 --- a/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +++ b/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl @@ -386,3 +386,5 @@ 469 n64 file_setattr sys_file_setattr 470 n64 listns sys_listns 471 n64 rseq_slice_yield sys_rseq_slice_yield +472 n64 mq_recvmmsg sys_mq_recvmmsg +473 n64 mq_sendmmsg sys_mq_sendmmsg diff --git a/tools/perf/arch/parisc/entry/syscalls/syscall.tbl b/tools/perf= /arch/parisc/entry/syscalls/syscall.tbl index 66dc406b12e4..e1d442f17f25 100644 --- a/tools/perf/arch/parisc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/parisc/entry/syscalls/syscall.tbl @@ -461,3 +461,6 @@ 460 common lsm_set_self_attr sys_lsm_set_self_attr 461 common lsm_list_modules sys_lsm_list_modules 462 common mseal sys_mseal +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg + diff --git a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl b/tools/per= f/arch/powerpc/entry/syscalls/syscall.tbl index 4fcc7c58a105..4a9edd38da52 100644 --- a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl @@ -562,3 +562,6 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 nospu rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg + diff --git a/tools/perf/arch/s390/entry/syscalls/syscall.tbl b/tools/perf/a= rch/s390/entry/syscalls/syscall.tbl index 09a7ef04d979..eba3ed5b7576 100644 --- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl @@ -398,3 +398,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg diff --git a/tools/perf/arch/sh/entry/syscalls/syscall.tbl b/tools/perf/arc= h/sh/entry/syscalls/syscall.tbl index 70b315cbe710..b14d8f4614c4 100644 --- a/tools/perf/arch/sh/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/sh/entry/syscalls/syscall.tbl @@ -475,3 +475,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg diff --git a/tools/perf/arch/sparc/entry/syscalls/syscall.tbl b/tools/perf/= arch/sparc/entry/syscalls/syscall.tbl index 7e71bf7fcd14..35ee3651e66c 100644 --- a/tools/perf/arch/sparc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/sparc/entry/syscalls/syscall.tbl @@ -517,3 +517,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg diff --git a/tools/perf/arch/x86/entry/syscalls/syscall_32.tbl b/tools/perf= /arch/x86/entry/syscalls/syscall_32.tbl index f832ebd2d79b..b40cce591f20 100644 --- a/tools/perf/arch/x86/entry/syscalls/syscall_32.tbl +++ b/tools/perf/arch/x86/entry/syscalls/syscall_32.tbl @@ -477,3 +477,5 @@ 469 i386 file_setattr sys_file_setattr 470 i386 listns sys_listns 471 i386 rseq_slice_yield sys_rseq_slice_yield +472 i386 mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 i386 mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg diff --git a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl b/tools/perf= /arch/x86/entry/syscalls/syscall_64.tbl index 524155d655da..c16fb5d613b2 100644 --- a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl @@ -396,6 +396,8 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg =20 # # Due to a historical design error, certain syscalls are numbered differen= tly diff --git a/tools/perf/arch/xtensa/entry/syscalls/syscall.tbl b/tools/perf= /arch/xtensa/entry/syscalls/syscall.tbl index a9bca4e484de..377f27d70a65 100644 --- a/tools/perf/arch/xtensa/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/xtensa/entry/syscalls/syscall.tbl @@ -442,3 +442,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg diff --git a/tools/scripts/syscall.tbl b/tools/scripts/syscall.tbl index 7a42b32b6577..8e50ab85b951 100644 --- a/tools/scripts/syscall.tbl +++ b/tools/scripts/syscall.tbl @@ -412,3 +412,5 @@ 469 common file_setattr sys_file_setattr 470 common listns sys_listns 471 common rseq_slice_yield sys_rseq_slice_yield +472 common mq_recvmmsg sys_mq_recvmmsg compat_sys_mq_recvmmsg +473 common mq_sendmmsg sys_mq_sendmmsg compat_sys_mq_sendmmsg --=20 2.43.0 From nobody Mon Sep 28 22:30:47 2026 Received: from mail-pj2-f13.google.com (mail-pj2-f13.google.com [74.125.227.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8933E38B14C for ; Sat, 26 Sep 2026 04:01:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790395305; cv=none; b=FSdpce+a0La5JTb+ZyqfoLdGoDQiNE5Zc/YDS8ijqddmQVoZkwPvGxzpNfasgIxqaJ8vXzZdd4ujNmj3aQMy2yIJH6c+h5F0LJKUnl7Kq5pKkMWxGI61r2DzSyqfafdGLGnITxrE7UTs/z2y8p5WN8guxfjUoBOpiWa4oewMJL4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790395305; c=relaxed/simple; bh=ZX3hvAflA7tismK5P5m6KxdaIEYFNXjxM1VE2EO+kuM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KK6N3iZuf+M7Let/zyfZ+0Zxq1smTMgBvpUINN/7NYUbO2xxtGFzU1PgKRN31I3cVj1bAfp/WIHfvGd0j2xmkqJMLcpWdf/veN1i5QyqC+G791hszcir6sB3DhG6p2+F+lyxHLn4vPwSEMjH5u3+Evu28HAlnPm/S1CP6mLdwuI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Gf2h78Wi; arc=none smtp.client-ip=74.125.227.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Gf2h78Wi" Received: by mail-pj2-f13.google.com with SMTP id d9443c01a7336-2d747ee1f38so6779515ad.2 for ; Fri, 25 Sep 2026 21:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790395302; x=1791000102; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=m3Zzy/u0jjWRQw6cc5srUs0K5AzOfbtKSo5oXeQu16o=; b=Gf2h78WiTY0vXcEzkX8a04gh37FmVNzFODcjPJM0ihQvvpSE5habIe8b3VKshcLJR2 7m/7mT0sS6kQQHOWd38ksQ7D2BGwGM+qhSMANeQz7wcXZUjXQgQwku9kp8Px6JxkgVys IRVr1TrETZI7BW/tzujHNcsCs7c9buID5riUZzq3VlezGJK4ZlMhECazbQkB0Hxfw2+h /Bm0GMZRyC4tLKD6dCzXNw21MXibCTgbpM3tX4DPdf5fHdKhVldgz8mM+Lwfhl7/5SFX okRacHiqb7rUW98QV3nXzX/a/QujtEqN/rX52R/Pi81v1k13zbCdlVmykVjcKJ0TA6O9 2KpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790395302; x=1791000102; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=m3Zzy/u0jjWRQw6cc5srUs0K5AzOfbtKSo5oXeQu16o=; b=MxDjv67xfCErHPB3VKV5qkcAYHTXrhk5aHr5GmypVE9xnfYdnlF+XZGLZzLvUOqU3T rQV0iiaBSRN0ZbMbJODpoz7s/FvRbJqPMKJnVG3tW6yD3Rnq+beD5C3OczddqVdVHUHg +pv63O3xqfd3u2uapTeOlL+w8Ju6JHvrads0nXZIeTi4/NaoS48qJrJRcdGJWdMJyf8n 9ZkZUWNMbLzT8KgGAzD+iMnnsjGWSzZ0Oa/JoWvGhmiRtlXTE3LF2yVxztTD79ZYdKyC KOVcn7MS31Bj1hz5voOBFpCFMs885wGMH8KUi+gNCE4LtTxmo/p9sUs7pmUJIPz93Itl v5RA== X-Gm-Message-State: AFuF++l/Ukqasj9orIcD2LAbd8fNCOGWySw5NueVehWzDjBasDmTffOb SttRoQtGPaD0GdhkDupWhWjIC2B0sfS8Pp14z0rRA2Bgt0QcL1ukvmfk X-Gm-Gg: AYBFou2WrzlfMfBX5ddm3N2YBzGMS/bf6M83E2vGjVRX8gJGqpeH8LbnPHmETIPi2hF D1HRpGS0Jt0lko1fgQGkr7PJqUCr6QzaJ51eGHPYU3tx24cera3epZgfoCvjEb4jc3qxWDotyuf 9auj49LrCuUMYt4fjqLl1eIZ8UIka5/y56v8fJkGrVnF0dV/y9PzFNSlnQGF2ZqiEewwhk9e/V0 tHP1yw9NTLOFv7MNL4Da3OtNamSfyaahwKABZnhAn+a/MHijzO2ubJhxpZ/udrc2fys0ySQUHnI lAVyVIlgOX2tCslCUbURmvDTPgaPWts3+f78dsHrxfL7Fw2DlRQOzIAo6UjmcW79fBVmGKLO66z gnUq1Wx8orzZc4UF/meN46U4ugX3omRbervRrHPbsmB47hAz/R1wOFh5Dc+G1FjZhYw+oUXlcOd r0pmmt82mdG5f4OWOA9BOfsyJk7jyC5ZEN1olx+odS+XxHroUsajXZP6sjoZRX+JGBwf7rJLobq uIkRegWmIDovg== X-Received: by 2002:a17:90b:44:b0:3a0:cc33:2285 with SMTP id 98e67ed59e1d1-3a0cc3324bcmr1881361a91.22.1790395301442; Fri, 25 Sep 2026 21:01:41 -0700 (PDT) Received: from Modern-15.. ([2401:4900:8206:fc0b:ca44:7562:7898:358b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0bda430b3sm6845063a91.0.2026.09.25.21.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 21:01:40 -0700 (PDT) From: mathura kumar To: brauner@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, corbet@lwn.net, mathura.kumar.tech@gmail.com Subject: [PATCH v5 4/4] Test: Added self-testing and documentation Date: Sat, 26 Sep 2026 09:30:58 +0530 Message-ID: <20260926040102.308350-5-mathura.kumar.tech@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260926040102.308350-1-mathura.kumar.tech@gmail.com> References: <20260926040102.308350-1-mathura.kumar.tech@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Add test coverage to verify system call behavior under different-different cases. Update index documentation to include two new doc. 1) mq_recvmmsg.rst 2) mq_sendmmsg.rst The tests validate: 1) Offset boundries. 2) Partial success behaviors. 3) Timeout behavior. Documentation changes include: 1) Updated implementation details. 2) Error handlings mechanism. 3) Tests details. Signed-off-by: mathura kumar --- Documentation/userspace-api/index.rst | 2 + Documentation/userspace-api/mq_recvmmsg.rst | 224 +++++++++++ Documentation/userspace-api/mq_sendmmsg.rst | 174 +++++++++ tools/testing/selftests/ipc/Makefile | 2 +- tools/testing/selftests/ipc/mq_recvmmsg.c | 393 ++++++++++++++++++++ tools/testing/selftests/ipc/mq_sendmmsg.c | 360 ++++++++++++++++++ 6 files changed, 1154 insertions(+), 1 deletion(-) create mode 100644 Documentation/userspace-api/mq_recvmmsg.rst create mode 100644 Documentation/userspace-api/mq_sendmmsg.rst create mode 100644 tools/testing/selftests/ipc/mq_recvmmsg.c create mode 100644 tools/testing/selftests/ipc/mq_sendmmsg.c diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspac= e-api/index.rst index a68b1bea57a8..4e9cbdd8c3a8 100644 --- a/Documentation/userspace-api/index.rst +++ b/Documentation/userspace-api/index.rst @@ -22,6 +22,8 @@ System calls ioctl/index mseal rseq + mq_recvmmsg + mq_sendmmsg =20 Security-related interfaces =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D diff --git a/Documentation/userspace-api/mq_recvmmsg.rst b/Documentation/us= erspace-api/mq_recvmmsg.rst new file mode 100644 index 000000000000..96446ca8f12b --- /dev/null +++ b/Documentation/userspace-api/mq_recvmmsg.rst @@ -0,0 +1,224 @@ +.. SPDX-License-Identifier: GPL-2.0 + +mq_recvmmsg system call +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D + +This document describes the mq_recvmmsg() system call. It provides +an overview of the feature, interface specification, design, and +test specification. + +Contents +-------- + + 1) Overview + 2) Functional Specification + 3) Design + 4) Test Specification + +1) Overview +----------- + +POSIX message queues on Linux provide mq_timedreceive() for consuming +messages from a queue.This interface requires the caller to pass the +message buffer, length and priority pointer as individual arguments to +the system call. This imposes a fixed calling convention that cannot be +extended without breaking the ABI. + +mq_recvmmsg() introduces a new system call entry point that accepts +message buffer parameters via a struct argument inside a iovec rather +than as individual syscall arguments. + +One 64-bit variant is provided with compat handling: + mq_recvmmsg() + +2) Functional Specification +--------------------------- + +NAME + mq_recvmmsg - receive or peek as a batch of messages from a + POSIX message queue + +SYNOPSIS + +.. code-block:: c + + #include + + struct mq_msg_attrs { + __kernel_size_t msg_len; + unsigned int __user *msg_prio; + void __user *msg_ptr; + }; + + struct mq_mmsg_attrs { + struct iovec __user *msg_attrs_vec; + __kernel_size_t vlen; + int *ret; + }; + + ssize_t mq_recvmmsg(mqd_t mqdes, struct mq_mmsg_attrs *attrs, + unsigned int attrs_len, unsigned int flags, + unsigned long start_idx, + const struct __kernel_timespec *abs_timeout); + + +DESCRIPTION + mq_recvmmsg() receives or peeks as a batch of messages from the + message queue referred to by the descriptor mqdes. + + The flags argument controls receive behavior. The following + flag is defined: + + ``MQ_PEEK`` + Copies the message into struct mq_msg_attrs without removi= ng it from + the queue. The queue is not modified. + + ``MQ_RECV`` + Copies and consumes messages from the queue up to the coun= t specified + by vlen. + + ``MQ_START_AT`` + Tweaks peek/consume behavior. When enabled, writes to the = userspace + iovec always start at index zero, regardless of ``start_id= x``. + This allows a caller to consume or peek at data further do= wn the + queue without having to allocate memory for the region bei= ng + skipped. + + ``MQ_RESUME`` + Tweak peek or path behavior, when it enabled, write starti= ng index + will be same start_idx,it should be use for retry after ba= tch partial + success. + ``MQ_START_AT`` and ``MQ_RESUME`` + Both are mutually exclusive flags but at least one is mand= atory. + + The start_idx argument specifies which message to begin operating = on within + the priority-ordered queue, relative to the requested batch range. + + The abs_timeout argument specifies an absolute timeout for the ent= ire batch + operation. When MQ_PEEK is set, abs_timeout is ignored, since peek= is a + non-blocking snapshot operation. When MQ_PEEK is not set, abs_time= out be the + timeout for the entire batch. + +RETURN VALUE + On success, returns the number of messages copied into user-space. + + On failure, the function returns an error directly without writing + to the ret field of struct mq_mmsg_attrs in two situations: + + * An error occurred before a single message was successfully copie= d to user space. + * new error occurred in writing error itself in ret field of struc= t mq_mmsg_attrs + after partial success before completing batch and passing a bad = address in ret can + cause successfully dequeued messages to be permanently lost, as = userspace has no other + way to know about messages already dequeued in the non-peek path. + * interrupted system call and not a single messages processed + + +ERRORS + ``EAGAIN`` + Queue is empty and MQ_PEEK is set. Peek is always + non-blocking and returns immediately on empty queue. + + ``EBADF`` + mqdes is not a valid message queue descriptor open + for reading. + + ``EFAULT`` + attrs, msg_ptr, msg_prio, or abs_timeout points to + an invalid address or any invalid address. + + ``EINVAL`` + The batch size is too large, start_idx is inconsistent wit= h the + current queue state, flags contains an unrecognized value,= or contradictory + flags were passed. + + ``EMSGSIZE`` + msg_len is less than the mq_msgsize attribute of + the queue. + + ``E2BIG`` + attrs_len is greater than PAGE_SIZE. + + ``ETIMEDOUT`` + Pop path only. The call timed out before a message + became available. Never returned on peek path. + + ``ENODATA`` + No valid message exists matching the given parameters. + + ``ENOMEM`` + Insufficient memory to complete the operation. + ``EINTR`` + Interrupted system call + +3) Design +--------- + +3.1 Struct-based argument passing +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The message buffer parameters (msg_ptr, msg_len, msg_prio) are consolidated +into struct mq_msg_attrs rather than passed as individual syscall argument= s. +These are then referenced via struct mq_mmsg_attrs, which contains an +iovec msg_attrs_vec and a vlen count. The base of msg_attrs_vec holds indi= vidual +mq_msg_attrs entries, and length store struct mq_msg_attrs size. + + +3.2 Compat handling +~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: c + + struct compat_msg_attrs { + compat_size_t msg_len; + compat_uptr_t msg_prio; + compat_uptr_t msg_ptr; + }; + + struct compat_mq_mmsg_attrs { + compat_uptr_t msg_attrs_vec; + compat_size_t vlen; + compat_uptr_t ret; + }; + + +The compat entry point performs the necessary conversions before +calling the shared do_mq_recvmmsg() implementation. + +3.3 Peek implementation +~~~~~~~~~~~~~~~~~~~~~~~~ + +When MQ_PEEK is set, the implementation locates the target message +in the priority tree but does not remove it. Two locks are taken: +the first confirms a message exists before any allocation is +attempted and retrieve required buffer size to do memory allocation +outside of critical section, avoiding allocation on empty queues. +The second protects the kernel temporary buffer copy operation. + +3.4 start_idx argument +~~~~~~~~~~~~~~~~~~~~~~~ + +The start_idx argument specifies which message to begin operating on withi= n the queue. +If a batch request fails partway through, user space is expected to supply= an updated +start_idx reflecting the number of messages already handled, failing to do= so may result +in unexpected message delivery. + +4) Test Specification +---------------------- + +Tests for mq_recvmmsg() should cover the following: + +1) Basic receive and peek =E2=80=94 Verify that without MQ_PEEK the messag= e is consumed and +the queue depth decreases by one. Verify that the message body, priority, = and return +value are correct. + +2) Offset and boundary handling =E2=80=94 Verify that the implementation c= orrectly respects +batch size and start_idx boundary conditions. + +3) Partial success =E2=80=94 Verify that when an error occurs mid-batch, t= he call returns +successfully with the count of messages processed so far, rather than disc= arding partial +results. + + + + + diff --git a/Documentation/userspace-api/mq_sendmmsg.rst b/Documentation/us= erspace-api/mq_sendmmsg.rst new file mode 100644 index 000000000000..423f477f9b75 --- /dev/null +++ b/Documentation/userspace-api/mq_sendmmsg.rst @@ -0,0 +1,174 @@ +.. SPDX-License-Identifier: GPL-2.0 + +mq_sendmmsg system call +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D + +This document describes the mq_sendmmsg() system call. It provides +an overview of the feature, interface specification, design, and +test specification. + +Contents +-------- + + 1) Overview + 2) Functional Specification + 3) Design + 4) Test Specification + +1) Overview +----------- + +POSIX message queues on Linux provide mq_timedsend() for storing +messages in a queue one at time. + +mq_sendmmsg() introduces a new system call entry point that take +messages in batch and store in queues. + +One 64-bit variant is provided with compat handling: + mq_sendmmsg() + +2) Functional Specification +--------------------------- + +NAME + mq_sendmmsg - send messages as a batch to queues. + +SYNOPSIS + +.. code-block:: c + + #include + + struct mq_msg_attrs { + __kernel_size_t msg_len; + unsigned int __user *msg_prio; + void __user *msg_ptr; + }; + + struct mq_mmsg_attrs { + struct iovec __user *msg_attrs_vec; + __kernel_size_t vlen; + int *ret; + }; + + ssize_t mq_sendmmsg(mqd_t mqdes, struct mq_mmsg_attrs *attrs, + unsigned int attrs_len, unsigned long start_idx, + const struct __kernel_timespec *abs_timeout); + + +DESCRIPTION + mq_sendmmsg() send messages in batch to message queue referred + to by the descriptor mqdes. + + The start_idx argument specifies which message to begin operating = on within + relative to the requested batch range. + + The abs_timeout argument specifies an absolute timeout for the ent= ire batch + operation. + +RETURN VALUE + On success, returns the number of messages stored into the queues. + + On failure, the function returns an error directly without writing + to the ret field of struct mq_mmsg_attrs in two situations: + + * An error occurred before a single message was successfully store= d into the queues. + * A new error occurred in writing error itself in ret field of str= uct mq_mmsg_attrs + after partial success before completing batch and passing a bad = address in ret can + cause successfully enqueued messages to be processed again in a = future call, resulting + in duplicates, as userspace has no other way to know about messa= ges processed so far in + previous call. + * interrupted system call and not a single messages processed + + +ERRORS + ``EAGAIN`` + Queue is not empty. + + ``EBADF`` + mqdes is not a valid message queue descriptor open + for reading. + + ``EFAULT`` + attrs, msg_ptr, msg_prio, or abs_timeout points to + an invalid address. + + ``EINVAL`` + The batch size is too large, start_idx is inconsistent wit= h the + current queue state. + + ``EMSGSIZE`` + msg_len is greater than the mq_msgsize attribute of + the queue. + + ``E2BIG`` + attrs_len is greater than PAGE_SIZE. + + ``ETIMEDOUT`` + The call timed out before a space became available to store + new messages. + + ``ENOMEM`` + Insufficient memory to complete the operation. + ``EINTR`` + Interrupted system call + +3) Design +--------- + +3.1 Struct-based argument passing +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The message buffer parameters (msg_ptr, msg_len, msg_prio) are consolidated +into struct mq_msg_attrs rather than passed as individual syscall argument= s. +These are then referenced via struct mq_mmsg_attrs, which contains an +iovec msg_attrs_vec and a vlen count. The base of msg_attrs_vec holds indi= vidual +mq_msg_attrs entries, and length store struct mq_msg_attrs size. + + +3.2 Compat handling +~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: c + + struct compat_msg_attrs { + compat_size_t msg_len; + compat_uptr_t msg_prio; + compat_uptr_t msg_ptr; + }; + + struct compat_mq_mmsg_attrs { + compat_uptr_t msg_attrs_vec; + compat_size_t vlen; + compat_uptr_t ret; + }; + + +The compat entry point performs the necessary conversions before +calling the shared do_mq_sendmmsg() implementation. + + +3.3 start_idx argument +~~~~~~~~~~~~~~~~~~~~~~~ + +The start_idx argument specifies the message at which to begin storing mes= sages in the queue. +If a batch request fails partway through, user space is expected to supply= an updated +start_idx reflecting the number of messages already handled, failing to do= so may result +in duplicate message passed to the queues. + +4) Test Specification +---------------------- + +Tests for mq_sendmmsg() should cover the following: + +1) Offset and boundary handling =E2=80=94 Verify that the implementation w= ork correctly as per +batch size and start_idx boundary conditions. + +2) Partial success =E2=80=94 Verify that when an error occurs mid-batch, t= he call returns +successfully with the count of messages processed so far. + +3) Batch Timeout - Verify batch absolute deadline return expected value wh= en +queue is completely full. + + + diff --git a/tools/testing/selftests/ipc/Makefile b/tools/testing/selftests= /ipc/Makefile index fad10f2bb57b..04da0efd67d7 100644 --- a/tools/testing/selftests/ipc/Makefile +++ b/tools/testing/selftests/ipc/Makefile @@ -12,7 +12,7 @@ endif =20 CFLAGS +=3D $(KHDR_INCLUDES) =20 -TEST_GEN_PROGS :=3D msgque +TEST_GEN_PROGS :=3D msgque mq_recvmmsg mq_sendmmsg =20 include ../lib.mk =20 diff --git a/tools/testing/selftests/ipc/mq_recvmmsg.c b/tools/testing/self= tests/ipc/mq_recvmmsg.c new file mode 100644 index 000000000000..bf75499934b0 --- /dev/null +++ b/tools/testing/selftests/ipc/mq_recvmmsg.c @@ -0,0 +1,393 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "kselftest.h" +#include + +#ifndef __NR_mq_recvmmsg +#if defined(__alpha__) +#define __NR_mq_recvmmsg 582 +#else +#define __NR_mq_recvmmsg 472 +#endif +#endif + +#define MQ_PEEK 0x02 +#define MQ_RECV 0x04 +#define MQ_START_AT 0x08 +#define MQ_RESUME 0x10 +#define MQ_NAME_PREFIX "/mq_peek_test" +#define MQ_MAXMSG 16 +#define MAX_MSG_SIZE 8192 + +struct msg_attrs { + long msg_len; + unsigned int *msg_prio; + void *msg_ptr; +}; + +struct mmsg_attrs { + struct iovec *msg_attrs_vec; + long vlen; + int *err; +}; + +struct batch_slot { + struct msg_attrs desc; + struct iovec iov; + char buf[MAX_MSG_SIZE]; + unsigned int prio; +}; + +static long mq_recvmmsg(mqd_t mqdes, struct mmsg_attrs *attrs, unsigned in= t attrs_len, + unsigned int flags, unsigned int start_idx, + const struct __kernel_timespec *timeout) +{ + return syscall(__NR_mq_recvmmsg, mqdes, attrs, attrs_len, flags, + start_idx, timeout); +} + +static long queue_depth(mqd_t mqd) +{ + struct mq_attr attr; + + if (mq_getattr(mqd, &attr)) + return -1; + + return attr.mq_curmsgs; +} + +static mqd_t open_queue(const char *suffix) +{ + static unsigned int seq; + char name[128]; + struct mq_attr attr =3D { + .mq_flags =3D 0, + .mq_maxmsg =3D MQ_MAXMSG, + .mq_msgsize =3D MAX_MSG_SIZE, + }; + + mqd_t mqd; + + snprintf(name, sizeof(name), "%s%s_%d_%u", MQ_NAME_PREFIX, suffix, getpid= (), + seq++); + + mq_unlink(name); + + mqd =3D mq_open(name, O_NONBLOCK | O_RDWR | O_CREAT | O_EXCL, 0600, &attr= ); + if (mqd =3D=3D (mqd_t)-1) { + ksft_test_result_fail("mq_open(%s) failed: %m\n", name); + ksft_exit_fail(); + } + + mq_unlink(name); + return mqd; +} + +static void build_slot(struct batch_slot *slot) +{ + memset(slot, 0, sizeof(*slot)); + slot->desc.msg_len =3D sizeof(slot->buf); + slot->desc.msg_prio =3D &slot->prio; + slot->desc.msg_ptr =3D slot->buf; + slot->iov.iov_base =3D &slot->desc; + slot->iov.iov_len =3D sizeof(slot->desc); +} + +static void build_slots(struct batch_slot *slots, size_t nr) +{ + size_t i; + + for (i =3D 0; i < nr; i++) + build_slot(&slots[i]); +} + +static long batch_recv(mqd_t mqd, struct batch_slot *slots, size_t nr, + int *err, unsigned int flags, unsigned int start_idx, + const struct __kernel_timespec *timeout) +{ + struct iovec vec[MQ_MAXMSG]; + struct mmsg_attrs attrs; + size_t i; + + for (i =3D 0; i < nr; i++) + vec[i] =3D slots[i].iov; + + attrs.msg_attrs_vec =3D vec; + attrs.vlen =3D nr; + attrs.err =3D err; + + return mq_recvmmsg(mqd, &attrs, sizeof(attrs), flags, start_idx, + timeout); +} + + +static void send_or_die(mqd_t mqd, unsigned int prio, const char *payload) +{ + if (mq_send(mqd, payload, strlen(payload), prio)) { + ksft_test_result_fail("mq_send(%s, %u) failed: %m\n", + payload, prio); + ksft_exit_fail(); + } +} + +static bool check_slot(const struct batch_slot *slot, const char *payload, + unsigned int prio) +{ + size_t len =3D strlen(payload); + + if (slot->prio !=3D prio) + return false; + if (memcmp(slot->buf, payload, len)) + return false; + return true; +} + +static void test_peek_batch_success_count(void) +{ + mqd_t mqd =3D open_queue("peek_count"); + struct batch_slot slots[3]; + long ret; + int err; + + send_or_die(mqd, 1, "low"); + send_or_die(mqd, 9, "high"); + + build_slots(slots, ARRAY_SIZE(slots)); + ret =3D batch_recv(mqd, slots, ARRAY_SIZE(slots), &err, MQ_PEEK | MQ_STAR= T_AT, 0, NULL); + + if (ret !=3D 2) { + ksft_test_result_fail("peek count: ret=3D%ld expected=3D2\n", ret); + goto out; + } + if (!check_slot(&slots[0], "high", 9) || + !check_slot(&slots[1], "low", 1)) { + ksft_test_result_fail("peek count: payload/prio mismatch\n"); + goto out; + } + if (queue_depth(mqd) !=3D 2) { + ksft_test_result_fail("peek count: queue depth changed to %ld\n", + queue_depth(mqd)); + goto out; + } + + ksft_test_result_pass("peek batch returns number of successful messages\n= "); +out: + mq_close(mqd); +} + +static void test_receive_batch_success_count(void) +{ + static const struct __kernel_timespec expired =3D { 0, 0 }; + mqd_t mqd =3D open_queue("recv_count"); + struct batch_slot slots[3]; + long ret; + int err; + + send_or_die(mqd, 2, "two"); + send_or_die(mqd, 7, "seven"); + + build_slots(slots, ARRAY_SIZE(slots)); + ret =3D batch_recv(mqd, slots, ARRAY_SIZE(slots), &err, MQ_RECV | MQ_STAR= T_AT, 0, &expired); + + if (ret !=3D 2) { + ksft_test_result_fail("receive count: ret=3D%ld expected=3D2\n", ret); + goto out; + } + if (!check_slot(&slots[0], "seven", 7) || + !check_slot(&slots[1], "two", 2)) { + ksft_test_result_fail("receive count: payload/prio mismatch\n"); + goto out; + } + if (queue_depth(mqd) !=3D 0) { + ksft_test_result_fail("receive count: queue depth=3D%ld expected=3D0\n", + queue_depth(mqd)); + goto out; + } + + ksft_test_result_pass("receive batch returns success count and consumes m= essages\n"); +out: + mq_close(mqd); +} + +static void test_peek_start_idx_uses_absolute_index(void) +{ + mqd_t mqd =3D open_queue("peek_offset"); + struct batch_slot slots[3]; + long ret; + int err; + + send_or_die(mqd, 9, "high"); + send_or_die(mqd, 5, "mid"); + send_or_die(mqd, 1, "low"); + + build_slots(slots, ARRAY_SIZE(slots)); + memset(slots[0].buf, 0x5a, sizeof(slots[0].buf)); + ret =3D batch_recv(mqd, slots, ARRAY_SIZE(slots), &err, MQ_PEEK | MQ_RESU= ME, 1, NULL); + + if (ret !=3D 2) { + ksft_test_result_fail("peek start_idx: ret=3D%ld expected=3D2\n", ret); + goto out; + } + if (!check_slot(&slots[1], "mid", 5) || + !check_slot(&slots[2], "low", 1)) { + ksft_test_result_fail("peek start_idx: wrong messages returned\n"); + goto out; + } + if (slots[0].buf[0] !=3D 0x5a) { + ksft_test_result_fail("peek start_idx: slot 0 was written by kernel unne= cessarily\n"); + goto out; + } + + ksft_test_result_pass("peek start_idx maps directly to queue\n"); +out: + mq_close(mqd); +} + +static void test_receive_start_idx_not_receives_from_outside_range(void) +{ + mqd_t mqd =3D open_queue("recv_offset"); + struct batch_slot slots[3]; + long ret; + int err; + + send_or_die(mqd, 8, "first"); + send_or_die(mqd, 3, "second"); + + build_slots(slots, ARRAY_SIZE(slots)); + memset(slots[0].buf, 0x6b, sizeof(slots[0].buf)); + ret =3D batch_recv(mqd, slots, ARRAY_SIZE(slots), &err, MQ_RECV | MQ_RESU= ME, 1, NULL); + + if (ret !=3D 2) { + ksft_test_result_fail("receive start_idx: ret=3D%ld expected=3D2\n", + ret); + goto out; + } + if (!check_slot(&slots[1], "first", 8) || + !check_slot(&slots[2], "second", 3)) { + ksft_test_result_fail("receive start_idx: wrong receive order\n"); + goto out; + } + if (slots[0].buf[0] !=3D 0x6b) { + ksft_test_result_fail("receive start_idx: slot 0 was written by kernel u= nnecessarily\n"); + goto out; + } + + ksft_test_result_pass("non-peek path ignores queue indexing and receives = from head within range\n"); +out: + mq_close(mqd); +} + +static void test_peek_partial_success_on_small_buffer(void) +{ + mqd_t mqd =3D open_queue("peek_small"); + struct batch_slot slots[2]; + long ret; + int err; + + send_or_die(mqd, 9, "abc"); + send_or_die(mqd, 4, "1234"); + + build_slots(slots, ARRAY_SIZE(slots)); + slots[1].desc.msg_len =3D 1; + ret =3D batch_recv(mqd, slots, ARRAY_SIZE(slots), &err, MQ_PEEK | MQ_STAR= T_AT, 0, NULL); + + if (ret !=3D 1) { + ksft_test_result_fail("peek partial small buffer: ret=3D%ld expected=3D1= \n", + ret); + goto out; + } + if (!check_slot(&slots[0], "abc", 9)) { + ksft_test_result_fail("peek partial small buffer: first slot mismatch\n"= ); + goto out; + } + if (queue_depth(mqd) !=3D 2) { + ksft_test_result_fail("peek partial small buffer: queue depth=3D%ld expe= cted=3D2\n", + queue_depth(mqd)); + goto out; + } + + ksft_test_result_pass("peek batch reports completed so far before EMSGSIZ= E\n"); +out: + mq_close(mqd); +} + +static void test_receive_partial_success_on_bad_desc_len(void) +{ + mqd_t mqd =3D open_queue("recv_desc"); + struct batch_slot slots[2]; + long ret; + int err; + + send_or_die(mqd, 6, "driver"); + send_or_die(mqd, 2, "module"); + + build_slots(slots, ARRAY_SIZE(slots)); + slots[1].iov.iov_len =3D sizeof(slots[1].desc) - 1; + ret =3D batch_recv(mqd, slots, ARRAY_SIZE(slots), &err, MQ_RECV | MQ_STAR= T_AT, 0, NULL); + + if (ret !=3D 1) { + ksft_test_result_fail("receive partial desc len: ret=3D%ld expected=3D1\= n", + ret); + goto out; + } + if (!check_slot(&slots[0], "driver", 6)) { + ksft_test_result_fail("receive partial desc len: first slot mismatch\n"); + goto out; + } + if (queue_depth(mqd) !=3D 1) { + ksft_test_result_fail("receive partial desc len: queue depth=3D%ld expec= ted=3D1\n", + queue_depth(mqd)); + goto out; + } + + ksft_test_result_pass("receive batch reports completed so far before desc= riptor error\n"); +out: + mq_close(mqd); +} + +static const struct { + const char *name; + void (*fn)(void); +} tests[] =3D { + { "peek batch success count", test_peek_batch_success_count }, + { "receive batch success count", test_receive_batch_success_count }, + { "peek absolute index with start_idx", test_peek_start_idx_uses_absolute= _index }, + { "receive start_idx obey offset boundary", test_receive_start_idx_not_re= ceives_from_outside_range }, + { "peek partial success before EMSGSIZE", test_peek_partial_success_on_sm= all_buffer }, + { "receive partial success before desc error", test_receive_partial_succe= ss_on_bad_desc_len }, +}; + +int main(void) +{ + size_t i; + struct batch_slot probe; + long ret; + int err; + + ksft_print_header(); + + build_slot(&probe); + ret =3D batch_recv((mqd_t)-1, &probe, 1, &err, MQ_PEEK | MQ_START_AT, 0, = NULL); + if (ret =3D=3D -1 && errno =3D=3D ENOSYS) + ksft_exit_skip("mq_recvmmsg syscall not available\n"); + + ksft_set_plan(ARRAY_SIZE(tests)); + + for (i =3D 0; i < ARRAY_SIZE(tests); i++) { + ksft_print_msg("[%02zu] %s\n", i + 1, tests[i].name); + tests[i].fn(); + } + + return ksft_get_fail_cnt() ? 1 : 0; +} diff --git a/tools/testing/selftests/ipc/mq_sendmmsg.c b/tools/testing/self= tests/ipc/mq_sendmmsg.c new file mode 100644 index 000000000000..3f51ba75d1cb --- /dev/null +++ b/tools/testing/selftests/ipc/mq_sendmmsg.c @@ -0,0 +1,360 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "kselftest.h" + +#ifndef __NR_mq_sendmmsg +#if defined(__alpha__) +#define __NR_mq_sendmmsg 583 +#else +#define __NR_mq_sendmmsg 473 +#endif +#endif + +#define MQ_NAME_PREFIX "/mq_sendmmsg_test_" +#define MQ_MAXMSG 16 +#define MAX_MSG_SIZE 128 + +struct msg_attrs { + long msg_len; + unsigned int *msg_prio; + void *msg_ptr; +}; + +struct mmsg_attrs { + struct iovec *msg_attrs_vec; + long vlen; + int *err; +}; + +struct send_slot { + struct msg_attrs desc; + struct iovec iov; + const char *payload; + unsigned int prio; +}; + +static long mq_sendmmsg(mqd_t mqdes, struct mmsg_attrs *attrs, + unsigned int attrs_len, unsigned long start_idx, + const struct __kernel_timespec *timeout) +{ + return syscall(__NR_mq_sendmmsg, mqdes, attrs, attrs_len, start_idx, + timeout); +} + +static mqd_t open_queue_rw(const char *suffix, unsigned int O_FLAGS, long = maxmsg) +{ + static unsigned int seq; + char name[128]; + struct mq_attr attr =3D { + .mq_flags =3D 0, + .mq_maxmsg =3D maxmsg, + .mq_msgsize =3D MAX_MSG_SIZE, + }; + + mqd_t mqd; + + snprintf(name, sizeof(name), "%s%s_%d_%u", MQ_NAME_PREFIX, suffix, getpid= (), seq++); + mq_unlink(name); + + mqd =3D mq_open(name, O_FLAGS, 0600, &attr); + if (mqd =3D=3D (mqd_t)-1) { + ksft_test_result_fail("mq_open(%s) failed: %m\n", name); + ksft_exit_fail(); + } + + mq_unlink(name); + return mqd; +} + +static void init_send_slot(struct send_slot *slot, const char *payload, + unsigned int prio) +{ + memset(slot, 0, sizeof(*slot)); + slot->payload =3D payload; + slot->prio =3D prio; + slot->desc.msg_len =3D strlen(payload); + slot->desc.msg_prio =3D &slot->prio; + slot->desc.msg_ptr =3D (void *)payload; + slot->iov.iov_base =3D &slot->desc; + slot->iov.iov_len =3D sizeof(slot->desc); +} + +static void init_send_slots(struct send_slot *slots, char *const *payloads, + const unsigned int *prios, size_t nr) +{ + size_t i; + + for (i =3D 0; i < nr; i++) + init_send_slot(&slots[i], payloads[i], prios[i]); +} + +static long batch_send(mqd_t mqd, struct send_slot *slots, size_t nr, int = *err, + unsigned int start_idx, + const struct __kernel_timespec *timeout) +{ + struct iovec vec[MQ_MAXMSG]; + struct mmsg_attrs attrs; + size_t i; + + for (i =3D 0; i < nr; i++) + vec[i] =3D slots[i].iov; + + attrs.msg_attrs_vec =3D vec; + attrs.vlen =3D nr; + attrs.err =3D err; + + return mq_sendmmsg(mqd, &attrs, sizeof(attrs), start_idx, timeout); +} + +static long queue_depth(mqd_t mqd) +{ + struct mq_attr attr; + + if (mq_getattr(mqd, &attr)) + return -1; + + return attr.mq_curmsgs; +} + +static bool recv_expect(mqd_t mqd, const char *payload, unsigned int prio) +{ + char buf[MAX_MSG_SIZE]; + unsigned int got_prio =3D 0; + ssize_t ret; + size_t len =3D strlen(payload); + + memset(buf, 0, sizeof(buf)); + ret =3D mq_receive(mqd, buf, sizeof(buf), &got_prio); + if (ret < 0) + return false; + if ((size_t)ret !=3D len) + return false; + if (got_prio !=3D prio) + return false; + if (memcmp(buf, payload, len)) + return false; + return true; +} + +static void test_start_idx_obeys_offset(void) +{ + mqd_t mqd =3D open_queue_rw("offset", O_NONBLOCK | O_RDWR | O_CREAT | O_E= XCL, MQ_MAXMSG); + struct send_slot slots[3]; + static char *const payloads[] =3D { "first", "second", "third" }; + unsigned int prios[] =3D { 1, 5, 9 }; + long ret; + int err; + + init_send_slots(slots, payloads, prios, ARRAY_SIZE(slots)); + ret =3D batch_send(mqd, slots, ARRAY_SIZE(slots), &err, 1, NULL); + + if (ret !=3D 2) { + ksft_test_result_fail("start_idx skip: ret=3D%ld expected=3D2\n", ret); + goto out; + } + if (queue_depth(mqd) !=3D 2) { + ksft_test_result_fail("start_idx skip: queue depth=3D%ld expected=3D2\n", + queue_depth(mqd)); + goto out; + } + if (!recv_expect(mqd, "third", 9) || + !recv_expect(mqd, "second", 5)) { + ksft_test_result_fail("start_idx skip: wrong messages sent\n"); + goto out; + } + + ksft_test_result_pass("start_idx skips earlier descriptors\n"); +out: + mq_close(mqd); +} + +static void test_partial_success_on_null_prio(void) +{ + mqd_t mqd =3D open_queue_rw("null_prio", O_NONBLOCK | O_RDWR | O_CREAT | = O_EXCL, MQ_MAXMSG); + struct send_slot slots[2]; + static char *const payloads[] =3D { "ok", "bad" }; + unsigned int prios[] =3D { 7, 3 }; + long ret; + int err; + + init_send_slots(slots, payloads, prios, ARRAY_SIZE(slots)); + slots[1].desc.msg_prio =3D NULL; + ret =3D batch_send(mqd, slots, ARRAY_SIZE(slots), &err, 0, NULL); + + if (ret !=3D 1) { + ksft_test_result_fail("partial null prio: ret=3D%ld expected=3D1\n", ret= ); + goto out; + } + if (queue_depth(mqd) !=3D 1 || !recv_expect(mqd, "ok", 7)) { + ksft_test_result_fail("partial null prio: queue contents mismatch\n"); + goto out; + } + + ksft_test_result_pass("completed prefix is returned before NULL prio erro= r\n"); +out: + mq_close(mqd); +} + +static void test_partial_success_on_bad_desc_len(void) +{ + mqd_t mqd =3D open_queue_rw("bad_desc", O_NONBLOCK | O_RDWR | O_CREAT | O= _EXCL, MQ_MAXMSG); + struct send_slot slots[2]; + static char *const payloads[] =3D { "ok", "bad" }; + unsigned int prios[] =3D { 8, 2 }; + long ret; + int err; + + init_send_slots(slots, payloads, prios, ARRAY_SIZE(slots)); + slots[1].iov.iov_len =3D sizeof(slots[1].desc) - 1; + ret =3D batch_send(mqd, slots, ARRAY_SIZE(slots), &err, 0, NULL); + + if (ret !=3D 1) { + ksft_test_result_fail("partial bad desc len: ret=3D%ld expected=3D1\n", = ret); + goto out; + } + if (queue_depth(mqd) !=3D 1 || !recv_expect(mqd, "ok", 8)) { + ksft_test_result_fail("partial bad desc len: queue contents mismatch\n"); + goto out; + } + + ksft_test_result_pass("completed prefix is returned before descriptor err= or\n"); +out: + mq_close(mqd); +} + +static void test_partial_success_on_bad_prio_ptr(void) +{ + mqd_t mqd =3D open_queue_rw("bad_prio_ptr", O_NONBLOCK | O_RDWR | O_CREAT= | O_EXCL, MQ_MAXMSG); + struct send_slot slots[2]; + static char *const payloads[] =3D { "ok", "bad" }; + unsigned int prios[] =3D { 6, 4 }; + long ret; + int err; + + init_send_slots(slots, payloads, prios, ARRAY_SIZE(slots)); + slots[1].desc.msg_prio =3D (void *)1; + ret =3D batch_send(mqd, slots, ARRAY_SIZE(slots), &err, 0, NULL); + + if (ret !=3D 1) { + ksft_test_result_fail("partial bad prio ptr: ret=3D%ld expected=3D1\n", = ret); + goto out; + } + if (queue_depth(mqd) !=3D 1 || !recv_expect(mqd, "ok", 6)) { + ksft_test_result_fail("partial bad prio ptr: queue contents mismatch\n"); + goto out; + } + + ksft_test_result_pass("completed prefix is returned before bad prio point= er fault\n"); +out: + mq_close(mqd); +} + +static void test_full_queue_timeout(void) +{ + static const struct __kernel_timespec expired =3D { 0, 0 }; + mqd_t mqd =3D open_queue_rw("full_timeout", O_RDWR | O_CREAT | O_EXCL, 1); + struct send_slot slot; + long ret; + int err; + + init_send_slot(&slot, "first", 1); + ret =3D batch_send(mqd, &slot, 1, &err, 0, NULL); + if (ret !=3D 1) + ksft_exit_fail_msg("failed to prefill queue\n"); + + init_send_slot(&slot, "second", 2); + ret =3D batch_send(mqd, &slot, 1, &err, 0, &expired); + + if (ret =3D=3D -1 && errno =3D=3D ETIMEDOUT && queue_depth(mqd) =3D=3D 1) + ksft_test_result_pass("full queue with expired timeout returns ETIMEDOUT= \n"); + else + ksft_test_result_fail("full queue timeout: ret=3D%ld errno=3D%d depth=3D= %ld\n", + ret, errno, queue_depth(mqd)); + + mq_close(mqd); +} + +static void test_partial_success_when_queue_fills(void) +{ + static const struct __kernel_timespec expired =3D { 0, 0 }; + mqd_t mqd =3D open_queue_rw("queue_fills", O_NONBLOCK | O_RDWR | O_CREAT = | O_EXCL, 2); + struct send_slot slots[2]; + static char *const payloads[] =3D { "fit", "overflow" }; + unsigned int prios[] =3D { 1, 2 }; + long ret; + int err; + + init_send_slot(&slots[0], "prefill", 3); + ret =3D batch_send(mqd, &slots[0], 1, &err, 0, NULL); + if (ret !=3D 1) + ksft_exit_fail_msg("failed to prefill queue\n"); + + init_send_slots(slots, payloads, prios, ARRAY_SIZE(slots)); + ret =3D batch_send(mqd, slots, ARRAY_SIZE(slots), &err, 0, &expired); + + if (ret !=3D 1) { + ksft_test_result_fail("queue fills partial: ret=3D%ld expected=3D1\n", r= et); + goto out; + } + if (queue_depth(mqd) !=3D 2) { + ksft_test_result_fail("queue fills partial: depth=3D%ld expected=3D2\n", + queue_depth(mqd)); + goto out; + } + if (!recv_expect(mqd, "prefill", 3) || !recv_expect(mqd, "fit", 1)) { + ksft_test_result_fail("queue fills partial: queue contents mismatch\n"); + goto out; + } + + ksft_test_result_pass("completed operation is returned when queue fills m= id-batch\n"); +out: + mq_close(mqd); +} + +static const struct { + const char *name; + void (*fn)(void); +} tests[] =3D { + { "start_idx obey offset", test_start_idx_obeys_offset }, + { "partial success on NULL prio", test_partial_success_on_null_prio }, + { "partial success on bad desc len", test_partial_success_on_bad_desc_len= }, + { "partial success on bad prio pointer", test_partial_success_on_bad_prio= _ptr }, + { "full queue timeout", test_full_queue_timeout }, + { "partial success when queue fills", test_partial_success_when_queue_fil= ls }, +}; + +int main(void) +{ + size_t i; + struct send_slot probe; + long ret; + int err; + + ksft_print_header(); + + init_send_slot(&probe, "probe", 1); + ret =3D batch_send((mqd_t)-1, &probe, 1, &err, 0, NULL); + if (ret =3D=3D -1 && errno =3D=3D ENOSYS) + ksft_exit_skip("mq_sendmmsg syscall not available\n"); + + ksft_set_plan(ARRAY_SIZE(tests)); + + for (i =3D 0; i < ARRAY_SIZE(tests); i++) { + ksft_print_msg("[%02zu] %s\n", i + 1, tests[i].name); + tests[i].fn(); + } + + return ksft_get_fail_cnt() ? 1 : 0; +} --=20 2.43.0