Skip to contentSkip to conversation

Add two new system call mq_recvmmsg() and mq_sendmmsg() to posix ipc mqueue

PATCH RESEND In review Mathura_Kumar 2 participants 7 messages Jun 20 – Jun 21

Subsystems (20)
lore
Share & tools
lore
#0 lore raw

v3 cover Add two new system call mq_recvmmsg() and mq_sendmmsg() to posix ipc mqueue

Patch series overview:

1. Add New system call mq_recvmmsg(), mq_sendmmsg() and handler implementation.
2. Add system call number in all most common architectures.
3. Add entries in performance tools.
4. Prepared Documentation and test.

change since v2:
- iovec is introduced for arguments.
- since v2 does not contain batch operation and I introduced batch support now in recv or peek, due to that I added one more system call to support batch during send as well otherwise i don't see any benefites of having batching in consumer side only.

- the underlying tree structure used to store messages is augmented by introducing two additional fields on each node. This enables logarithmic-time complexity for peek operations and improves the efficiency of other tree traversals.

- some flaws in compat entry path fixed
- arguments mismatch in asmlinkages fixed
- copy_msg helper updated to be more safe for len arguments

- styles and formating improved
- test updated
- documentation is updated appropriately.
- v2 Link: https://lore.kernel.org/linux-arch/[email protected]/T/#t

Thanks for reviewing.

Mathura_Kumar (4):
IPC: Added two new system call mq_recvmmsg() and mq_sendmmsg()
IPC: Added system call entry in all of most common architectures
IPC: Added system call entry in performance tool
Test: Added self-testing and documentation

 Documentation/userspace-api/index.rst         |   2 +
 Documentation/userspace-api/mq_recvmmsg.rst   | 205 +++++++
 Documentation/userspace-api/mq_sendmmsg.rst   | 168 ++++++
 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 +
 include/linux/compat.h                        |  12 +-
 include/linux/syscalls.h                      |  10 +
 include/uapi/asm-generic/unistd.h             |   9 +-
 include/uapi/linux/mqueue.h                   |  27 +-
 ipc/mqueue.c                                  | 564 +++++++++++++++++-
 ipc/msg.c                                     |   2 +-
 ipc/msgutil.c                                 |  45 +-
 ipc/util.h                                    |   3 +-
 kernel/sys_ni.c                               |   6 +
 scripts/syscall.tbl                           |   2 +
 tools/include/uapi/asm-generic/unistd.h       |   8 +-
 .../arch/alpha/entry/syscalls/syscall.tbl     |   4 +
 .../perf/arch/arm/entry/syscalls/syscall.tbl  |   3 +
 .../arch/arm64/entry/syscalls/syscall_32.tbl  |   3 +
 .../arch/mips/entry/syscalls/syscall_n64.tbl  |   2 +
 .../arch/parisc/entry/syscalls/syscall.tbl    |   3 +
 .../arch/powerpc/entry/syscalls/syscall.tbl   |   3 +
 .../perf/arch/s390/entry/syscalls/syscall.tbl |   2 +
 tools/perf/arch/sh/entry/syscalls/syscall.tbl |   2 +
 .../arch/sparc/entry/syscalls/syscall.tbl     |   2 +
 .../arch/x86/entry/syscalls/syscall_32.tbl    |   2 +
 .../arch/x86/entry/syscalls/syscall_64.tbl    |   2 +
 .../arch/xtensa/entry/syscalls/syscall.tbl    |   2 +
 tools/scripts/syscall.tbl                     |   2 +
 tools/testing/selftests/ipc/Makefile          |   2 +-
 tools/testing/selftests/ipc/mq_recvmmsg.c     | 391 ++++++++++++
 tools/testing/selftests/ipc/mq_sendmmsg.c     | 360 +++++++++++
 46 files changed, 1818 insertions(+), 67 deletions(-)
 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
Signature · 1 line
2.43.0
#1 lore raw

PATCH RESEND v3 1/4 IPC: Added two new system call mq_recvmmsg() and mq_sendmmsg()

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.

int 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);

int 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

---
 include/linux/compat.h            |  12 +-
 include/linux/syscalls.h          |  10 +
 include/uapi/asm-generic/unistd.h |   9 +-
 include/uapi/linux/mqueue.h       |  27 +-
 ipc/mqueue.c                      | 564 ++++++++++++++++++++++++++++--
 ipc/msg.c                         |   2 +-
 ipc/msgutil.c                     |  48 ++-
 ipc/util.h                        |   3 +-
 kernel/sys_ni.c                   |   6 +
 9 files changed, 616 insertions(+), 65 deletions(-)
include/linux/compat.h +9 -3
index 8da0a15c95f4..87ba67ae700d 100644
@@ -18,10 +18,10 @@
 #include <linux/aio_abi.h>	/* for aio_context_t */
 #include <linux/uaccess.h>
 #include <linux/unistd.h>
-
 #include <asm/compat.h>
 #include <asm/siginfo.h>
 #include <asm/signal.h>
+#include <linux/mqueue.h>
 
 #ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
 /*
@@ -428,6 +428,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;
 
 void copy_siginfo_to_external32(struct compat_siginfo *to,
 		const struct kernel_siginfo *from);
@@ -805,8 +807,12 @@ asmlinkage long compat_sys_pwritev64v2(unsigned long fd,
 		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 >= 1 arch
include/linux/syscalls.h +10 -0
index 4fb7291f54b6..98979e26de55 100644
@@ -9,6 +9,7 @@
 #ifndef _LINUX_SYSCALLS_H
 #define _LINUX_SYSCALLS_H
 
+#include "linux/mqueue.h"
 struct __aio_sigset;
 struct epoll_event;
 struct iattr;
@@ -79,6 +80,8 @@ struct mnt_id_req;
 struct ns_id_req;
 struct xattr_args;
 struct file_attr;
+struct mq_msg_attrs;
+struct mq_mmsg_attrs;
 
 #include <linux/types.h>
 #include <linux/aio_abi.h>
@@ -93,6 +96,7 @@ struct file_attr;
 #include <linux/key.h>
 #include <linux/personality.h>
 #include <trace/syscall.h>
+#include <linux/mqueue.h>
 
 #ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
 /*
@@ -739,7 +743,13 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info);
 asmlinkage long sys_mq_open(const char __user *name, int oflag, umode_t mode, 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 __user *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, size_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 *notification);
 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,
include/uapi/asm-generic/unistd.h +7 -2
index a627acc8fb5f..1d06486d3aa5 100644
@@ -863,9 +863,14 @@ __SYSCALL(__NR_listns, sys_listns)
 #define __NR_rseq_slice_yield 471
 __SYSCALL(__NR_rseq_slice_yield, sys_rseq_slice_yield)
 
-#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)
 
+#undef __NR_syscalls
+#define __NR_syscalls 474
 /*
  * 32 bit systems traditionally used different
  * syscalls for off_t and loff_t arguments, while
include/uapi/linux/mqueue.h +26 -1
index b516b66840ad..836bb77a6758 100644
@@ -18,8 +18,9 @@
 
 #ifndef _LINUX_MQUEUE_H
 #define _LINUX_MQUEUE_H
-
+#include <linux/uio.h>
 #include <linux/types.h>
+#include <asm/compat.h>
 
 #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 */
 };
 
+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 passed
ipc/mqueue.c +532 -32

725 lines not on this page · raw message

ipc/msg.c +1 -1
index 62996b97f0ac..6392b11dd7f7 100644
@@ -1156,7 +1156,7 @@ static long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, in
 			 * not update queue parameters.
 			 */
 			if (msgflg & MSG_COPY) {
-				msg = copy_msg(msg, copy);
+				msg = copy_msg(msg, copy, msg->m_ts);
 				goto out_unlock0;
 			}
 
ipc/msgutil.c +23 -25

69 lines not on this page · raw message

ipc/util.h +2 -1
index a55d6cebe6d3..374abeee79b3 100644
@@ -197,8 +197,9 @@ int ipc_parse_version(int *cmd);
 
 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);
 
 static inline int ipc_checkid(struct kern_ipc_perm *ipcp, int id)
 {
kernel/sys_ni.c +6 -0
index add3032da16f..8219d76c72a0 100644
@@ -392,5 +392,11 @@ COND_SYSCALL(setuid16);
 COND_SYSCALL(rseq);
 COND_SYSCALL(rseq_slice_yield);
 
+/* 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);
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH RESEND v3 1/4] IPC: Added two new system call mq_recvmmsg() and mq_sendmmsg()

Quoted 14 lines · Mathura_Kumar

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.

int 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);

Quoted 6 lines

int 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

Please don't forget to run ./scripts/checkpatch.pl. It reports many warnings for this patch. I think tabstop is set incorrectly in your editor.

Here are a few links that you may consider to read:
https://kernelnewbies.org/FirstKernelPatch
https://docs.kernel.org/process/1.Intro.html

Quoted 1,034 lines
---
 include/linux/compat.h            |  12 +-
 include/linux/syscalls.h          |  10 +
 include/uapi/asm-generic/unistd.h |   9 +-
 include/uapi/linux/mqueue.h       |  27 +-
 ipc/mqueue.c                      | 564 ++++++++++++++++++++++++++++--
 ipc/msg.c                         |   2 +-
 ipc/msgutil.c                     |  48 ++-
 ipc/util.h                        |   3 +-
 kernel/sys_ni.c                   |   6 +
 9 files changed, 616 insertions(+), 65 deletions(-)
include/linux/compat.h +9 -3
index 8da0a15c95f4..87ba67ae700d 100644
@@ -18,10 +18,10 @@
 #include <linux/aio_abi.h>     /* for aio_context_t */
 #include <linux/uaccess.h>
 #include <linux/unistd.h>
-
 #include <asm/compat.h>
 #include <asm/siginfo.h>
 #include <asm/signal.h>
+#include <linux/mqueue.h>
 
 #ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
 /*
@@ -428,6 +428,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;
 
 void copy_siginfo_to_external32(struct compat_siginfo *to,
                const struct kernel_siginfo *from);
@@ -805,8 +807,12 @@ asmlinkage long compat_sys_pwritev64v2(unsigned long fd,
                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 >= 1 arch
include/linux/syscalls.h +10 -0
index 4fb7291f54b6..98979e26de55 100644
@@ -9,6 +9,7 @@
 #ifndef _LINUX_SYSCALLS_H
 #define _LINUX_SYSCALLS_H
 
+#include "linux/mqueue.h"
 struct __aio_sigset;
 struct epoll_event;
 struct iattr;
@@ -79,6 +80,8 @@ struct mnt_id_req;
 struct ns_id_req;
 struct xattr_args;
 struct file_attr;
+struct mq_msg_attrs;
+struct mq_mmsg_attrs;
 
 #include <linux/types.h>
 #include <linux/aio_abi.h>
@@ -93,6 +96,7 @@ struct file_attr;
 #include <linux/key.h>
 #include <linux/personality.h>
 #include <trace/syscall.h>
+#include <linux/mqueue.h>
 
 #ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
 /*
@@ -739,7 +743,13 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info);
 asmlinkage long sys_mq_open(const char __user *name, int oflag, umode_t mode, 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 __user *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, size_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 *notification);
 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,
include/uapi/asm-generic/unistd.h +7 -2
index a627acc8fb5f..1d06486d3aa5 100644
@@ -863,9 +863,14 @@ __SYSCALL(__NR_listns, sys_listns)
 #define __NR_rseq_slice_yield 471
 __SYSCALL(__NR_rseq_slice_yield, sys_rseq_slice_yield)
 
-#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)
 
+#undef __NR_syscalls
+#define __NR_syscalls 474
 /*
  * 32 bit systems traditionally used different
  * syscalls for off_t and loff_t arguments, while
include/uapi/linux/mqueue.h +26 -1
index b516b66840ad..836bb77a6758 100644
@@ -18,8 +18,9 @@
 
 #ifndef _LINUX_MQUEUE_H
 #define _LINUX_MQUEUE_H
-
+#include <linux/uio.h>
 #include <linux/types.h>
+#include <asm/compat.h>
 
 #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 */
 };
 
+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 passed
ipc/mqueue.c +532 -32
index 4798b375972b..c568c013a5ad 100644
@@ -38,8 +38,10 @@
 #include <linux/sched/wake_q.h>
 #include <linux/sched/signal.h>
 #include <linux/sched/user.h>
-
+#include <linux/uio.h>
+#include <linux/uaccess.h>
 #include <net/sock.h>
+#include <linux/rbtree_augmented.h>
 #include "util.h"
 
 struct mqueue_fs_context {
@@ -54,6 +56,10 @@ struct mqueue_fs_context {
 #define SEND           0
 #define RECV           1
 
+#define MQ_PEEK     0x02
+#define MQ_RECV     0x04
+#define MQ_VALID_FLAGS (MQ_PEEK | MQ_RECV)
+
 #define STATE_NONE     0
 #define STATE_READY    1
 
@@ -61,6 +67,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 descendants */
 };
 
 /*
@@ -186,7 +194,41 @@ static struct ipc_namespace *get_ns_from_inode(struct inode *inode)
        return ns;
 }
 
-/* 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_count;
+}
+
+static void msg_tree_propagate_subtree_msg_count(struct rb_node *node, struct rb_node *stop)
+{
+       while (node != stop) {
+               struct posix_msg_tree_node *leaf = rb_entry(node, struct posix_msg_tree_node, rb_node);
+               unsigned int new_count = leaf->msg_count +
+                                        get_subtree_count(node->rb_left) +
+                                        get_subtree_count(node->rb_right);
+               if (leaf->subtree_msg_count == new_count)
+                       break;
+               leaf->subtree_msg_count = new_count;
+               node = 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 = rb_entry(old, struct posix_msg_tree_node, rb_node);
+       struct posix_msg_tree_node *new_leaf = rb_entry(new, struct posix_msg_tree_node, rb_node);
+
+       new_leaf->subtree_msg_count = old_leaf->subtree_msg_count;
+}
+
+static const struct rb_augment_callbacks msg_tree_callbacks = {
+       .propagate = msg_tree_propagate_subtree_msg_count,
+       .copy = msg_tree_copy_subtree_msg_count,
+       .rotate = msg_tree_propagate_subtree_msg_count,
+};
+
 static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info)
 {
        struct rb_node **p, *parent = NULL;
@@ -216,13 +258,19 @@ static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info)
                INIT_LIST_HEAD(&leaf->msg_list);
        }
        leaf->priority = msg->m_type;
+       leaf->msg_count = 1;
+       leaf->subtree_msg_count = 1;
 
        if (rightmost)
                info->msg_tree_rightmost = &leaf->rb_node;
 
        rb_link_node(&leaf->rb_node, parent, p);
-       rb_insert_color(&leaf->rb_node, &info->msg_tree);
+       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 += msg->m_ts;
        list_add_tail(&msg->m_list, &leaf->msg_list);
@@ -236,8 +284,7 @@ static inline void msg_tree_erase(struct posix_msg_tree_node *leaf,
 
        if (info->msg_tree_rightmost == node)
                info->msg_tree_rightmost = 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 +324,11 @@ static inline struct msg_msg *msg_get(struct mqueue_inode_info *info)
                msg = 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 +815,6 @@ static struct ext_wait_queue *wq_get_first_waiter(
        return list_entry(ptr, struct ext_wait_queue, list);
 }
 
-
 static inline void set_cookie(struct sk_buff *skb, char code)
 {
        ((char *)skb->data)[NOTIFY_COOKIE_LEN-1] = code;
@@ -1034,28 +1083,22 @@ static inline void pipelined_receive(struct wake_q_head *wake_q,
        __pipelined_op(wake_q, info, sender);
 }
 
-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,
+                                               size_t msg_len, unsigned int msg_prio,
+                                               const struct timespec64 *ts, ktime_t *timeout)
 {
        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 = NULL;
        struct posix_msg_tree_node *new_leaf = NULL;
-       int ret = 0;
+       ssize_t ret = 0;
        DEFINE_WAKE_Q(wake_q);
 
        if (unlikely(msg_prio >= (unsigned long) MQ_PRIO_MAX))
                return -EINVAL;
 
-       if (ts) {
-               expires = timespec64_to_ktime(*ts);
-               timeout = &expires;
-       }
-
        audit_mq_sendrecv(mqdes, msg_len, msg_prio, ts);
 
        CLASS(fd, f)(mqdes);
@@ -1139,23 +1182,31 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
        return ret;
 }
 
-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)
 {
-       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 = NULL;
-       struct posix_msg_tree_node *new_leaf = NULL;
 
        if (ts) {
                expires = timespec64_to_ktime(*ts);
                timeout = &expires;
        }
 
+       return do_mq_sendmsg(mqdes, u_msg_ptr, msg_len, msg_prio, ts, timeout);
+}
+
+static ssize_t do_mq_recvmsg(mqd_t mqdes, char __user *u_msg_ptr, size_t msg_len,
+                                               unsigned int __user *u_msg_prio, const struct timespec64 *ts,
+                                               ktime_t *timeout)
+{
+       ssize_t ret;
+       struct msg_msg *msg_ptr;
+       struct inode *inode;
+       struct mqueue_inode_info *info;
+       struct ext_wait_queue wait;
+       struct posix_msg_tree_node *new_leaf = NULL;
+
        audit_mq_sendrecv(mqdes, msg_len, 0, ts);
 
        CLASS(fd, f)(mqdes);
@@ -1230,13 +1281,364 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
        return ret;
 }
 
+static ssize_t do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr, size_t msg_len,
+                                                        unsigned int __user *u_msg_prio, struct timespec64 *ts)
+{
+       ktime_t expires, *timeout = NULL;
+
+       if (ts) {
+               expires = timespec64_to_ktime(*ts);
+               timeout = &expires;
+       }
+
+       return do_mq_recvmsg(mqdes, u_msg_ptr, msg_len, u_msg_prio, ts, timeout);
+}
+
+static struct msg_msg *mq_peek_index(struct mqueue_inode_info *info, unsigned 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 = 0;
+
+       node = info->msg_tree.rb_node;
+       while (node) {
+               leaf = rb_entry(node, struct posix_msg_tree_node, rb_node);
+               right_count = get_subtree_count(node->rb_right);
+
+               if (index < right_count) {
+                       node = node->rb_right;
+               } else if (index < (right_count + leaf->msg_count)) {
+                       /* Target is at this priority level */
+                       offset = index - right_count;
+                       list_for_each_entry(msg, &leaf->msg_list, m_list) {
+                               if (i == offset)
+                                       return msg;
+                               i++;
+                       }
+                       break;
+               } else {
+                       index -= (right_count + leaf->msg_count);
+                       node = node->rb_left;
+               }
+       }
+
+       return NULL;
+}
+
+static ssize_t do_mq_recvmsg2(mqd_t mqdes, struct mq_msg_attrs *args, unsigned int flags,
+                                                unsigned long index, const struct timespec64 *ts,
+                                                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;
+
+       if (flags & MQ_PEEK) {
+               audit_mq_sendrecv(mqdes, args->msg_len, 0, ts);
+
+               CLASS(fd, f)(mqdes);
+               if (fd_empty(f))
+                       return -EBADF;
+
+               inode = file_inode(fd_file(f));
+               if (unlikely(fd_file(f)->f_op != &mqueue_file_operations))
+                       return -EBADF;
+
+               info = 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 >= (unsigned long)info->attr.mq_maxmsg)
+                       return -EINVAL;
+
+               spin_lock(&info->lock);
+
+               if (info->attr.mq_curmsgs == 0) {
+                       spin_unlock(&info->lock);
+                       return -EAGAIN;
+               }
+               msg_ptr = mq_peek_index(info, index);
+               if (!msg_ptr) {
+                       spin_unlock(&info->lock);
+                       return -ENODATA;
+               }
+               k_m_type = msg_ptr->m_type;
+               k_m_ts = msg_ptr->m_ts;
+
+               spin_unlock(&info->lock);
+
+               k_msg_buffer = alloc_msg(k_m_ts);
+
+               if (!k_msg_buffer)
+                       return -ENOMEM;
+               ret = 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 = mq_peek_index(info, index);
+               if (!msg_ptr || msg_ptr->m_type != k_m_type ||
+                       msg_ptr->m_ts != k_m_ts) {
+                       spin_unlock(&info->lock);
+                       free_msg(k_msg_buffer);
+                       return -EAGAIN;
+               }
+               msg_ptr = 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 = 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, ts, 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)
+{
+       if (unlikely(attrs_len < sizeof(*attrs)))
+               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 = {};
+       int err;
+
+       if (unlikely(attrs_len < sizeof(v)))
+               return -EINVAL;
+       if (unlikely(attrs_len > PAGE_SIZE))
+               return -E2BIG;
+       err = copy_struct_from_user(&v, sizeof(v), uattrs, attrs_len);
+
+       if (err)
+               return err;
+       attrs->msg_attrs_vec = (struct iovec __user *)compat_ptr((unsigned long)v.msg_attrs_vec);
+       attrs->ret = (int *)compat_ptr(v.ret);
+       attrs->vlen = 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 = {};
+
+               if (desc_iov->iov_len != sizeof(v))
+                       return -EINVAL;
+               if (copy_from_user(&v, desc_iov->iov_base, sizeof(v)))
+                       return -EFAULT;
+
+               attr->msg_len = v.msg_len;
+               attr->msg_prio = (unsigned int *)compat_ptr(v.msg_prio);
+               attr->msg_ptr = compat_ptr(v.msg_ptr);
+               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 != sizeof(*attr))
+               return -EINVAL;
+       if (copy_from_user(attr, desc_iov->iov_base, sizeof(*attr)))
+               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 *attrs,
+                                                        unsigned int flags, unsigned long start_idx,
+                                                        struct timespec64 *ts, bool compat)
+{
+       struct iov_iter iter;
+       struct iovec outer_iovstack[UIO_FASTIOV], *free_iov = outer_iovstack;
+       const struct iovec *msg_iov;
+       ktime_t batch_deadline, *timeout = NULL;
+       ssize_t ret = 0;
+       ssize_t batch_success = 0;
+       unsigned long index;
+       unsigned int i;
+
+       if (flags & (~MQ_VALID_FLAGS))
+               return -EINVAL;
+       if ((flags & MQ_RECV) && (flags & MQ_PEEK))
+               return -EINVAL;
+       if (start_idx > attrs->vlen)
+               return -EINVAL;
+       if (!attrs->vlen || attrs->vlen > UIO_MAXIOV)
+               return -EINVAL;
+
+       ret = __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 = iter_iov(&iter);
+
+       /* One absolute deadline for the whole batch. */
+       if (ts) {
+               batch_deadline = timespec64_to_ktime(*ts);
+               timeout = &batch_deadline;
+       }
+       for (i = start_idx; i < attrs->vlen; i++) {
+               struct mq_msg_attrs desc = {};
+
+               ret = mq_mmsg_copy_msg_attr(&desc, &msg_iov[i], compat);
+               if (ret < 0)
+                       break;
+
+               index = (flags & MQ_PEEK) ? i : 0;
+               ret = do_mq_recvmsg2(mqdes, &desc, flags, index, ts, timeout);
+
+               if (ret < 0) {
+                       if (attrs->ret && put_user(ret, attrs->ret)) {
+                               kfree(free_iov);
+                               return -EFAULT;
+                       }
+                       break;
+               }
+               batch_success++;
+       }
+
+       if (!(batch_success != attrs->vlen)) {
+               if (attrs->ret && put_user(0, attrs->ret)) {
+                       kfree(free_iov);
+                       return -EFAULT;
+                       }
+       }
+       kfree(free_iov);
+       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 *attrs,
+                                                        unsigned long start_idx, struct timespec64 *ts,
+                                                        bool compat)
+{
+       struct iov_iter iter;
+       struct iovec outer_iovstack[UIO_FASTIOV], *free_iov = outer_iovstack;
+       const struct iovec *msg_iov;
+       ktime_t batch_deadline, *timeout = NULL;
+       ssize_t ret = 0;
+       ssize_t batch_success = 0;
+       unsigned int i;
+
+       if (!attrs->vlen || attrs->vlen > UIO_MAXIOV || start_idx > attrs->vlen)
+               return -EINVAL;
+
+       ret = __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 = iter_iov(&iter);
+
+       if (ts) {
+               batch_deadline = timespec64_to_ktime(*ts);
+               timeout = &batch_deadline;
+       }
+       for (i = start_idx; i < attrs->vlen; i++) {
+               struct mq_msg_attrs desc = {};
+               unsigned int msg_prio = 0;
+
+               ret = mq_mmsg_copy_msg_attr(&desc, &msg_iov[i], compat);
+               if (ret < 0)
+                       break;
+               if (!desc.msg_prio) {
+                       ret = -EINVAL;
+                       break;
+               }
+               if (get_user(msg_prio, desc.msg_prio)) {
+                       ret = -EFAULT;
+                       break;
+               }
+               ret = do_mq_sendmsg(mqdes, desc.msg_ptr, desc.msg_len,
+                                                  msg_prio, ts, timeout);
+
+               if (ret < 0) {
+                       if (attrs->ret && put_user(ret, attrs->ret)) {
+                               kfree(free_iov);
+                               return -EFAULT;
+                       }
+               break;
+               }
+               batch_success++;
+       }
+
+       if (!(batch_success != attrs->vlen)) {
+               if (attrs->ret && put_user(0, attrs->ret)) {
+                       kfree(free_iov);
+                       return -EFAULT;
+                       }
+       }
+       kfree(free_iov);
+       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)
+                          size_t, msg_len, unsigned int, msg_prio,
+                          const struct __kernel_timespec __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
+
        if (u_abs_timeout) {
                int res = prepare_timeout(u_abs_timeout, &ts);
+
                if (res)
                        return res;
                p = &ts;
@@ -1244,13 +1646,36 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
        return do_mq_timedsend(mqdes, u_msg_ptr, msg_len, msg_prio, p);
 }
 
+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 = {};
+       struct timespec64 ts, *p = NULL;
+       int ret;
+
+       ret = mq_mmsg_copy_attrs_from_user(&kattrs, attrs, attrs_len);
+       if (ret)
+               return ret;
+       if (u_abs_timeout) {
+               int res = prepare_timeout(u_abs_timeout, &ts);
+
+               if (res)
+                       return res;
+               p = &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)
+                          size_t, msg_len, unsigned int __user *, u_msg_prio,
+                          const struct __kernel_timespec __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
+
        if (u_abs_timeout) {
                int res = prepare_timeout(u_abs_timeout, &ts);
+
                if (res)
                        return res;
                p = &ts;
@@ -1258,6 +1683,26 @@ 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);
 }
 
+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 = {};
+       struct timespec64 ts, *p = NULL;
+       int ret;
+
+       ret = mq_mmsg_copy_attrs_from_user(&kattrs, attrs, attrs_len);
+       if (ret)
+               return ret;
+       if (u_abs_timeout) {
+               int res = prepare_timeout(u_abs_timeout, &ts);
+
+               if (res)
+                       return res;
+               p = &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 discarded.
@@ -1460,7 +1905,7 @@ struct compat_mq_attr {
 };
 
 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;
 
@@ -1476,7 +1921,7 @@ static inline int get_compat_mq_attr(struct mq_attr *attr,
 }
 
 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;
 
@@ -1541,11 +1986,61 @@ COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
                return -EFAULT;
        return 0;
 }
+
+COMPAT_SYSCALL_DEFINE5(mq_sendmmsg, mqd_t, mqdes, struct compat_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 = {};
+       struct timespec64 ts, *p = NULL;
+       struct iovec msg_atrrs_vec = {};
+       int ret;
+
+       kattrs.msg_attrs_vec = &msg_atrrs_vec;
+       ret = mq_mmsg_copy_compat_attrs(&kattrs, attrs, attrs_len);
+       if (ret)
+               return ret;
+
+       if (u_abs_timeout) {
+               int res = prepare_timeout(u_abs_timeout, &ts);
+
+               if (res)
+                       return res;
+               p = &ts;
+       }
+
+       return do_mq_sendmmsg(mqdes, &kattrs, start_idx, p, true);
+}
+
+COMPAT_SYSCALL_DEFINE6(mq_recvmmsg, mqd_t, mqdes, struct compat_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 = {};
+       struct timespec64 ts, *p = NULL;
+       struct iovec msg_atrrs_vec = {};
+       int ret;
+
+       kattrs.msg_attrs_vec = &msg_atrrs_vec;
+       ret = mq_mmsg_copy_compat_attrs(&kattrs, attrs, attrs_len);
+       if (ret)
+               return ret;
+
+       if (u_abs_timeout) {
+               int res = prepare_timeout(u_abs_timeout, &ts);
+
+               if (res)
+                       return res;
+               p = &ts;
+       }
+
+       return do_mq_recvmmsg(mqdes, &kattrs, flags, start_idx, p, true);
+}
 #endif
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 static int compat_prepare_timeout(const struct old_timespec32 __user *p,
-                                  struct timespec64 *ts)
+                                                                struct timespec64 *ts)
 {
        if (get_old_timespec32(ts, p))
                return -EFAULT;
@@ -1560,8 +2055,10 @@ SYSCALL_DEFINE5(mq_timedsend_time32, mqd_t, mqdes,
                const struct old_timespec32 __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
+
        if (u_abs_timeout) {
                int res = compat_prepare_timeout(u_abs_timeout, &ts);
+
                if (res)
                        return res;
                p = &ts;
@@ -1575,14 +2072,17 @@ SYSCALL_DEFINE5(mq_timedreceive_time32, mqd_t, mqdes,
                const struct old_timespec32 __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
+
        if (u_abs_timeout) {
                int res = compat_prepare_timeout(u_abs_timeout, &ts);
+
                if (res)
                        return res;
                p = &ts;
        }
        return do_mq_timedreceive(mqdes, u_msg_ptr, msg_len, u_msg_prio, p);
 }
+
 #endif
 
 static const struct inode_operations mqueue_dir_inode_operations = {
ipc/msg.c +1 -1
index 62996b97f0ac..6392b11dd7f7 100644
@@ -1156,7 +1156,7 @@ static long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, in
                         * not update queue parameters.
                         */
                        if (msgflg & MSG_COPY) {
-                               msg = copy_msg(msg, copy);
+                               msg = copy_msg(msg, copy, msg->m_ts);
                                goto out_unlock0;
                        }
 
ipc/msgutil.c +23 -25
index e28f0cecb2ec..f2854fd8d7a4 100644
@@ -51,7 +51,7 @@ static int __init init_msg_buckets(void)
 }
 subsys_initcall(init_msg_buckets);
 
-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,37 @@ 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 = src->m_ts;
-       size_t alen;
+       struct msg_msgseg *src_seg, *dst_seg;
+       size_t remaining, chunk;
 
-       if (src->m_ts > dst->m_ts)
+       if (len > src->m_ts)
                return ERR_PTR(-EINVAL);
 
-       alen = min(len, DATALEN_MSG);
-       memcpy(dst + 1, src + 1, alen);
+       chunk = min(len, DATALEN_MSG);
 
-       for (dst_pseg = dst->next, src_pseg = src->next;
-            src_pseg != NULL;
-            dst_pseg = dst_pseg->next, src_pseg = src_pseg->next) {
+       memcpy(dst + 1, src + 1, chunk);
+       remaining = len - chunk;
+       src_seg = src->next;
+       dst_seg = dst->next;
 
-               len -= alen;
-               alen = min(len, DATALEN_SEG);
-               memcpy(dst_pseg + 1, src_pseg + 1, alen);
+       while (remaining > 0 && src_seg && dst_seg) {
+               chunk = min(remaining, DATALEN_SEG);
+               memcpy(dst_seg + 1, src_seg + 1, chunk);
+               remaining -= chunk;
+               src_seg = src_seg->next;
+               dst_seg = dst_seg->next;
        }
-
+       if (remaining != 0)
+               return ERR_PTR(-EINVAL);
        dst->m_type = src->m_type;
-       dst->m_ts = src->m_ts;
-
+       dst->m_ts = 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;
ipc/util.h +2 -1
index a55d6cebe6d3..374abeee79b3 100644
@@ -197,8 +197,9 @@ int ipc_parse_version(int *cmd);
 
 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);
 
 static inline int ipc_checkid(struct kern_ipc_perm *ipcp, int id)
 {
kernel/sys_ni.c +6 -1
index add3032da16f..8219d76c72a0 100644
@@ -392,5 +392,11 @@ COND_SYSCALL(setuid16);
 COND_SYSCALL(rseq);
 COND_SYSCALL(rseq_slice_yield);
 
+/* 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);
--

2.43.0

author
#3 lore raw

Re: [PATCH RESEND v3 1/4] IPC: Added two new system call mq_recvmmsg() and mq_sendmmsg()

Hi, Andrei
Thanks for clue of tab regarding formatting error,

Although it is not tabstop but related with tab, I was literally surprised It just fixes all problems (every bit of styling inconsistency solved now) by taking tab width size '8' and after that taking indentation in code.

For a long time I was boggling my head with the same style inconsistency. I have tab width of 4, visually looking in code all seems properly indented by taking
multiple of 4 then, what the hell happens after creating a patch ? but guys, all of your configuration and environment interpreting in different ways include git.

So, finally I would say Thanks and insist on doing a complete review and if there are
any implementation bugs.

Please reply to me after that, I will now only submit patches after all is ok because it is also
creating a mess as I was not increasing the version of the patchset.

Some of the main concerns are syscall wiring end to end connected, tree augmentation properly propagating subtree count or not, self test on live kernel
for 64 bit as well as 32 bit compat seem ok from my end and all tests
seem passing.

Thanks and regards.

Quoted 1,065 lines · Andrei Vagin
Quoted 14 lines · Mathura_Kumar

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.

int 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);

Quoted 6 lines

int 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

Please don't forget to run ./scripts/checkpatch.pl. It reports many warnings for this patch. I think tabstop is set incorrectly in your editor.

Here are a few links that you may consider to read:
https://kernelnewbies.org/FirstKernelPatch
https://docs.kernel.org/process/1.Intro.html

Quoted 1,034 lines
---
 include/linux/compat.h            |  12 +-
 include/linux/syscalls.h          |  10 +
 include/uapi/asm-generic/unistd.h |   9 +-
 include/uapi/linux/mqueue.h       |  27 +-
 ipc/mqueue.c                      | 564 ++++++++++++++++++++++++++++--
 ipc/msg.c                         |   2 +-
 ipc/msgutil.c                     |  48 ++-
 ipc/util.h                        |   3 +-
 kernel/sys_ni.c                   |   6 +
 9 files changed, 616 insertions(+), 65 deletions(-)
include/linux/compat.h +9 -3
index 8da0a15c95f4..87ba67ae700d 100644
@@ -18,10 +18,10 @@
 #include <linux/aio_abi.h>     /* for aio_context_t */
 #include <linux/uaccess.h>
 #include <linux/unistd.h>
-
 #include <asm/compat.h>
 #include <asm/siginfo.h>
 #include <asm/signal.h>
+#include <linux/mqueue.h>
 
 #ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
 /*
@@ -428,6 +428,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;
 
 void copy_siginfo_to_external32(struct compat_siginfo *to,
                const struct kernel_siginfo *from);
@@ -805,8 +807,12 @@ asmlinkage long compat_sys_pwritev64v2(unsigned long fd,
                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 >= 1 arch
include/linux/syscalls.h +10 -0
index 4fb7291f54b6..98979e26de55 100644
@@ -9,6 +9,7 @@
 #ifndef _LINUX_SYSCALLS_H
 #define _LINUX_SYSCALLS_H
 
+#include "linux/mqueue.h"
 struct __aio_sigset;
 struct epoll_event;
 struct iattr;
@@ -79,6 +80,8 @@ struct mnt_id_req;
 struct ns_id_req;
 struct xattr_args;
 struct file_attr;
+struct mq_msg_attrs;
+struct mq_mmsg_attrs;
 
 #include <linux/types.h>
 #include <linux/aio_abi.h>
@@ -93,6 +96,7 @@ struct file_attr;
 #include <linux/key.h>
 #include <linux/personality.h>
 #include <trace/syscall.h>
+#include <linux/mqueue.h>
 
 #ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
 /*
@@ -739,7 +743,13 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info);
 asmlinkage long sys_mq_open(const char __user *name, int oflag, umode_t mode, 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 __user *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, size_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 *notification);
 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,
include/uapi/asm-generic/unistd.h +7 -2
index a627acc8fb5f..1d06486d3aa5 100644
@@ -863,9 +863,14 @@ __SYSCALL(__NR_listns, sys_listns)
 #define __NR_rseq_slice_yield 471
 __SYSCALL(__NR_rseq_slice_yield, sys_rseq_slice_yield)
 
-#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)
 
+#undef __NR_syscalls
+#define __NR_syscalls 474
 /*
  * 32 bit systems traditionally used different
  * syscalls for off_t and loff_t arguments, while
include/uapi/linux/mqueue.h +26 -1
index b516b66840ad..836bb77a6758 100644
@@ -18,8 +18,9 @@
 
 #ifndef _LINUX_MQUEUE_H
 #define _LINUX_MQUEUE_H
-
+#include <linux/uio.h>
 #include <linux/types.h>
+#include <asm/compat.h>
 
 #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 */
 };
 
+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 passed
ipc/mqueue.c +532 -32
index 4798b375972b..c568c013a5ad 100644
@@ -38,8 +38,10 @@
 #include <linux/sched/wake_q.h>
 #include <linux/sched/signal.h>
 #include <linux/sched/user.h>
-
+#include <linux/uio.h>
+#include <linux/uaccess.h>
 #include <net/sock.h>
+#include <linux/rbtree_augmented.h>
 #include "util.h"
 
 struct mqueue_fs_context {
@@ -54,6 +56,10 @@ struct mqueue_fs_context {
 #define SEND           0
 #define RECV           1
 
+#define MQ_PEEK     0x02
+#define MQ_RECV     0x04
+#define MQ_VALID_FLAGS (MQ_PEEK | MQ_RECV)
+
 #define STATE_NONE     0
 #define STATE_READY    1
 
@@ -61,6 +67,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 descendants */
 };
 
 /*
@@ -186,7 +194,41 @@ static struct ipc_namespace *get_ns_from_inode(struct inode *inode)
        return ns;
 }
 
-/* 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_count;
+}
+
+static void msg_tree_propagate_subtree_msg_count(struct rb_node *node, struct rb_node *stop)
+{
+       while (node != stop) {
+               struct posix_msg_tree_node *leaf = rb_entry(node, struct posix_msg_tree_node, rb_node);
+               unsigned int new_count = leaf->msg_count +
+                                        get_subtree_count(node->rb_left) +
+                                        get_subtree_count(node->rb_right);
+               if (leaf->subtree_msg_count == new_count)
+                       break;
+               leaf->subtree_msg_count = new_count;
+               node = 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 = rb_entry(old, struct posix_msg_tree_node, rb_node);
+       struct posix_msg_tree_node *new_leaf = rb_entry(new, struct posix_msg_tree_node, rb_node);
+
+       new_leaf->subtree_msg_count = old_leaf->subtree_msg_count;
+}
+
+static const struct rb_augment_callbacks msg_tree_callbacks = {
+       .propagate = msg_tree_propagate_subtree_msg_count,
+       .copy = msg_tree_copy_subtree_msg_count,
+       .rotate = msg_tree_propagate_subtree_msg_count,
+};
+
 static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info)
 {
        struct rb_node **p, *parent = NULL;
@@ -216,13 +258,19 @@ static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info)
                INIT_LIST_HEAD(&leaf->msg_list);
        }
        leaf->priority = msg->m_type;
+       leaf->msg_count = 1;
+       leaf->subtree_msg_count = 1;
 
        if (rightmost)
                info->msg_tree_rightmost = &leaf->rb_node;
 
        rb_link_node(&leaf->rb_node, parent, p);
-       rb_insert_color(&leaf->rb_node, &info->msg_tree);
+       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 += msg->m_ts;
        list_add_tail(&msg->m_list, &leaf->msg_list);
@@ -236,8 +284,7 @@ static inline void msg_tree_erase(struct posix_msg_tree_node *leaf,
 
        if (info->msg_tree_rightmost == node)
                info->msg_tree_rightmost = 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 +324,11 @@ static inline struct msg_msg *msg_get(struct mqueue_inode_info *info)
                msg = 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 +815,6 @@ static struct ext_wait_queue *wq_get_first_waiter(
        return list_entry(ptr, struct ext_wait_queue, list);
 }
 
-
 static inline void set_cookie(struct sk_buff *skb, char code)
 {
        ((char *)skb->data)[NOTIFY_COOKIE_LEN-1] = code;
@@ -1034,28 +1083,22 @@ static inline void pipelined_receive(struct wake_q_head *wake_q,
        __pipelined_op(wake_q, info, sender);
 }
 
-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,
+                                               size_t msg_len, unsigned int msg_prio,
+                                               const struct timespec64 *ts, ktime_t *timeout)
 {
        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 = NULL;
        struct posix_msg_tree_node *new_leaf = NULL;
-       int ret = 0;
+       ssize_t ret = 0;
        DEFINE_WAKE_Q(wake_q);
 
        if (unlikely(msg_prio >= (unsigned long) MQ_PRIO_MAX))
                return -EINVAL;
 
-       if (ts) {
-               expires = timespec64_to_ktime(*ts);
-               timeout = &expires;
-       }
-
        audit_mq_sendrecv(mqdes, msg_len, msg_prio, ts);
 
        CLASS(fd, f)(mqdes);
@@ -1139,23 +1182,31 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
        return ret;
 }
 
-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)
 {
-       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 = NULL;
-       struct posix_msg_tree_node *new_leaf = NULL;
 
        if (ts) {
                expires = timespec64_to_ktime(*ts);
                timeout = &expires;
        }
 
+       return do_mq_sendmsg(mqdes, u_msg_ptr, msg_len, msg_prio, ts, timeout);
+}
+
+static ssize_t do_mq_recvmsg(mqd_t mqdes, char __user *u_msg_ptr, size_t msg_len,
+                                               unsigned int __user *u_msg_prio, const struct timespec64 *ts,
+                                               ktime_t *timeout)
+{
+       ssize_t ret;
+       struct msg_msg *msg_ptr;
+       struct inode *inode;
+       struct mqueue_inode_info *info;
+       struct ext_wait_queue wait;
+       struct posix_msg_tree_node *new_leaf = NULL;
+
        audit_mq_sendrecv(mqdes, msg_len, 0, ts);
 
        CLASS(fd, f)(mqdes);
@@ -1230,13 +1281,364 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
        return ret;
 }
 
+static ssize_t do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr, size_t msg_len,
+                                                        unsigned int __user *u_msg_prio, struct timespec64 *ts)
+{
+       ktime_t expires, *timeout = NULL;
+
+       if (ts) {
+               expires = timespec64_to_ktime(*ts);
+               timeout = &expires;
+       }
+
+       return do_mq_recvmsg(mqdes, u_msg_ptr, msg_len, u_msg_prio, ts, timeout);
+}
+
+static struct msg_msg *mq_peek_index(struct mqueue_inode_info *info, unsigned 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 = 0;
+
+       node = info->msg_tree.rb_node;
+       while (node) {
+               leaf = rb_entry(node, struct posix_msg_tree_node, rb_node);
+               right_count = get_subtree_count(node->rb_right);
+
+               if (index < right_count) {
+                       node = node->rb_right;
+               } else if (index < (right_count + leaf->msg_count)) {
+                       /* Target is at this priority level */
+                       offset = index - right_count;
+                       list_for_each_entry(msg, &leaf->msg_list, m_list) {
+                               if (i == offset)
+                                       return msg;
+                               i++;
+                       }
+                       break;
+               } else {
+                       index -= (right_count + leaf->msg_count);
+                       node = node->rb_left;
+               }
+       }
+
+       return NULL;
+}
+
+static ssize_t do_mq_recvmsg2(mqd_t mqdes, struct mq_msg_attrs *args, unsigned int flags,
+                                                unsigned long index, const struct timespec64 *ts,
+                                                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;
+
+       if (flags & MQ_PEEK) {
+               audit_mq_sendrecv(mqdes, args->msg_len, 0, ts);
+
+               CLASS(fd, f)(mqdes);
+               if (fd_empty(f))
+                       return -EBADF;
+
+               inode = file_inode(fd_file(f));
+               if (unlikely(fd_file(f)->f_op != &mqueue_file_operations))
+                       return -EBADF;
+
+               info = 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 >= (unsigned long)info->attr.mq_maxmsg)
+                       return -EINVAL;
+
+               spin_lock(&info->lock);
+
+               if (info->attr.mq_curmsgs == 0) {
+                       spin_unlock(&info->lock);
+                       return -EAGAIN;
+               }
+               msg_ptr = mq_peek_index(info, index);
+               if (!msg_ptr) {
+                       spin_unlock(&info->lock);
+                       return -ENODATA;
+               }
+               k_m_type = msg_ptr->m_type;
+               k_m_ts = msg_ptr->m_ts;
+
+               spin_unlock(&info->lock);
+
+               k_msg_buffer = alloc_msg(k_m_ts);
+
+               if (!k_msg_buffer)
+                       return -ENOMEM;
+               ret = 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 = mq_peek_index(info, index);
+               if (!msg_ptr || msg_ptr->m_type != k_m_type ||
+                       msg_ptr->m_ts != k_m_ts) {
+                       spin_unlock(&info->lock);
+                       free_msg(k_msg_buffer);
+                       return -EAGAIN;
+               }
+               msg_ptr = 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 = 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, ts, 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)
+{
+       if (unlikely(attrs_len < sizeof(*attrs)))
+               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 = {};
+       int err;
+
+       if (unlikely(attrs_len < sizeof(v)))
+               return -EINVAL;
+       if (unlikely(attrs_len > PAGE_SIZE))
+               return -E2BIG;
+       err = copy_struct_from_user(&v, sizeof(v), uattrs, attrs_len);
+
+       if (err)
+               return err;
+       attrs->msg_attrs_vec = (struct iovec __user *)compat_ptr((unsigned long)v.msg_attrs_vec);
+       attrs->ret = (int *)compat_ptr(v.ret);
+       attrs->vlen = 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 = {};
+
+               if (desc_iov->iov_len != sizeof(v))
+                       return -EINVAL;
+               if (copy_from_user(&v, desc_iov->iov_base, sizeof(v)))
+                       return -EFAULT;
+
+               attr->msg_len = v.msg_len;
+               attr->msg_prio = (unsigned int *)compat_ptr(v.msg_prio);
+               attr->msg_ptr = compat_ptr(v.msg_ptr);
+               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 != sizeof(*attr))
+               return -EINVAL;
+       if (copy_from_user(attr, desc_iov->iov_base, sizeof(*attr)))
+               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 *attrs,
+                                                        unsigned int flags, unsigned long start_idx,
+                                                        struct timespec64 *ts, bool compat)
+{
+       struct iov_iter iter;
+       struct iovec outer_iovstack[UIO_FASTIOV], *free_iov = outer_iovstack;
+       const struct iovec *msg_iov;
+       ktime_t batch_deadline, *timeout = NULL;
+       ssize_t ret = 0;
+       ssize_t batch_success = 0;
+       unsigned long index;
+       unsigned int i;
+
+       if (flags & (~MQ_VALID_FLAGS))
+               return -EINVAL;
+       if ((flags & MQ_RECV) && (flags & MQ_PEEK))
+               return -EINVAL;
+       if (start_idx > attrs->vlen)
+               return -EINVAL;
+       if (!attrs->vlen || attrs->vlen > UIO_MAXIOV)
+               return -EINVAL;
+
+       ret = __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 = iter_iov(&iter);
+
+       /* One absolute deadline for the whole batch. */
+       if (ts) {
+               batch_deadline = timespec64_to_ktime(*ts);
+               timeout = &batch_deadline;
+       }
+       for (i = start_idx; i < attrs->vlen; i++) {
+               struct mq_msg_attrs desc = {};
+
+               ret = mq_mmsg_copy_msg_attr(&desc, &msg_iov[i], compat);
+               if (ret < 0)
+                       break;
+
+               index = (flags & MQ_PEEK) ? i : 0;
+               ret = do_mq_recvmsg2(mqdes, &desc, flags, index, ts, timeout);
+
+               if (ret < 0) {
+                       if (attrs->ret && put_user(ret, attrs->ret)) {
+                               kfree(free_iov);
+                               return -EFAULT;
+                       }
+                       break;
+               }
+               batch_success++;
+       }
+
+       if (!(batch_success != attrs->vlen)) {
+               if (attrs->ret && put_user(0, attrs->ret)) {
+                       kfree(free_iov);
+                       return -EFAULT;
+                       }
+       }
+       kfree(free_iov);
+       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 *attrs,
+                                                        unsigned long start_idx, struct timespec64 *ts,
+                                                        bool compat)
+{
+       struct iov_iter iter;
+       struct iovec outer_iovstack[UIO_FASTIOV], *free_iov = outer_iovstack;
+       const struct iovec *msg_iov;
+       ktime_t batch_deadline, *timeout = NULL;
+       ssize_t ret = 0;
+       ssize_t batch_success = 0;
+       unsigned int i;
+
+       if (!attrs->vlen || attrs->vlen > UIO_MAXIOV || start_idx > attrs->vlen)
+               return -EINVAL;
+
+       ret = __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 = iter_iov(&iter);
+
+       if (ts) {
+               batch_deadline = timespec64_to_ktime(*ts);
+               timeout = &batch_deadline;
+       }
+       for (i = start_idx; i < attrs->vlen; i++) {
+               struct mq_msg_attrs desc = {};
+               unsigned int msg_prio = 0;
+
+               ret = mq_mmsg_copy_msg_attr(&desc, &msg_iov[i], compat);
+               if (ret < 0)
+                       break;
+               if (!desc.msg_prio) {
+                       ret = -EINVAL;
+                       break;
+               }
+               if (get_user(msg_prio, desc.msg_prio)) {
+                       ret = -EFAULT;
+                       break;
+               }
+               ret = do_mq_sendmsg(mqdes, desc.msg_ptr, desc.msg_len,
+                                                  msg_prio, ts, timeout);
+
+               if (ret < 0) {
+                       if (attrs->ret && put_user(ret, attrs->ret)) {
+                               kfree(free_iov);
+                               return -EFAULT;
+                       }
+               break;
+               }
+               batch_success++;
+       }
+
+       if (!(batch_success != attrs->vlen)) {
+               if (attrs->ret && put_user(0, attrs->ret)) {
+                       kfree(free_iov);
+                       return -EFAULT;
+                       }
+       }
+       kfree(free_iov);
+       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)
+                          size_t, msg_len, unsigned int, msg_prio,
+                          const struct __kernel_timespec __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
+
        if (u_abs_timeout) {
                int res = prepare_timeout(u_abs_timeout, &ts);
+
                if (res)
                        return res;
                p = &ts;
@@ -1244,13 +1646,36 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
        return do_mq_timedsend(mqdes, u_msg_ptr, msg_len, msg_prio, p);
 }
 
+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 = {};
+       struct timespec64 ts, *p = NULL;
+       int ret;
+
+       ret = mq_mmsg_copy_attrs_from_user(&kattrs, attrs, attrs_len);
+       if (ret)
+               return ret;
+       if (u_abs_timeout) {
+               int res = prepare_timeout(u_abs_timeout, &ts);
+
+               if (res)
+                       return res;
+               p = &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)
+                          size_t, msg_len, unsigned int __user *, u_msg_prio,
+                          const struct __kernel_timespec __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
+
        if (u_abs_timeout) {
                int res = prepare_timeout(u_abs_timeout, &ts);
+
                if (res)
                        return res;
                p = &ts;
@@ -1258,6 +1683,26 @@ 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);
 }
 
+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 = {};
+       struct timespec64 ts, *p = NULL;
+       int ret;
+
+       ret = mq_mmsg_copy_attrs_from_user(&kattrs, attrs, attrs_len);
+       if (ret)
+               return ret;
+       if (u_abs_timeout) {
+               int res = prepare_timeout(u_abs_timeout, &ts);
+
+               if (res)
+                       return res;
+               p = &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 discarded.
@@ -1460,7 +1905,7 @@ struct compat_mq_attr {
 };
 
 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;
 
@@ -1476,7 +1921,7 @@ static inline int get_compat_mq_attr(struct mq_attr *attr,
 }
 
 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;
 
@@ -1541,11 +1986,61 @@ COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
                return -EFAULT;
        return 0;
 }
+
+COMPAT_SYSCALL_DEFINE5(mq_sendmmsg, mqd_t, mqdes, struct compat_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 = {};
+       struct timespec64 ts, *p = NULL;
+       struct iovec msg_atrrs_vec = {};
+       int ret;
+
+       kattrs.msg_attrs_vec = &msg_atrrs_vec;
+       ret = mq_mmsg_copy_compat_attrs(&kattrs, attrs, attrs_len);
+       if (ret)
+               return ret;
+
+       if (u_abs_timeout) {
+               int res = prepare_timeout(u_abs_timeout, &ts);
+
+               if (res)
+                       return res;
+               p = &ts;
+       }
+
+       return do_mq_sendmmsg(mqdes, &kattrs, start_idx, p, true);
+}
+
+COMPAT_SYSCALL_DEFINE6(mq_recvmmsg, mqd_t, mqdes, struct compat_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 = {};
+       struct timespec64 ts, *p = NULL;
+       struct iovec msg_atrrs_vec = {};
+       int ret;
+
+       kattrs.msg_attrs_vec = &msg_atrrs_vec;
+       ret = mq_mmsg_copy_compat_attrs(&kattrs, attrs, attrs_len);
+       if (ret)
+               return ret;
+
+       if (u_abs_timeout) {
+               int res = prepare_timeout(u_abs_timeout, &ts);
+
+               if (res)
+                       return res;
+               p = &ts;
+       }
+
+       return do_mq_recvmmsg(mqdes, &kattrs, flags, start_idx, p, true);
+}
 #endif
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 static int compat_prepare_timeout(const struct old_timespec32 __user *p,
-                                  struct timespec64 *ts)
+                                                                struct timespec64 *ts)
 {
        if (get_old_timespec32(ts, p))
                return -EFAULT;
@@ -1560,8 +2055,10 @@ SYSCALL_DEFINE5(mq_timedsend_time32, mqd_t, mqdes,
                const struct old_timespec32 __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
+
        if (u_abs_timeout) {
                int res = compat_prepare_timeout(u_abs_timeout, &ts);
+
                if (res)
                        return res;
                p = &ts;
@@ -1575,14 +2072,17 @@ SYSCALL_DEFINE5(mq_timedreceive_time32, mqd_t, mqdes,
                const struct old_timespec32 __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
+
        if (u_abs_timeout) {
                int res = compat_prepare_timeout(u_abs_timeout, &ts);
+
                if (res)
                        return res;
                p = &ts;
        }
        return do_mq_timedreceive(mqdes, u_msg_ptr, msg_len, u_msg_prio, p);
 }
+
 #endif
 
 static const struct inode_operations mqueue_dir_inode_operations = {
ipc/msg.c +1 -1
index 62996b97f0ac..6392b11dd7f7 100644
@@ -1156,7 +1156,7 @@ static long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, in
                         * not update queue parameters.
                         */
                        if (msgflg & MSG_COPY) {
-                               msg = copy_msg(msg, copy);
+                               msg = copy_msg(msg, copy, msg->m_ts);
                                goto out_unlock0;
                        }
 
ipc/msgutil.c +23 -25
index e28f0cecb2ec..f2854fd8d7a4 100644
@@ -51,7 +51,7 @@ static int __init init_msg_buckets(void)
 }
 subsys_initcall(init_msg_buckets);
 
-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,37 @@ 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 = src->m_ts;
-       size_t alen;
+       struct msg_msgseg *src_seg, *dst_seg;
+       size_t remaining, chunk;
 
-       if (src->m_ts > dst->m_ts)
+       if (len > src->m_ts)
                return ERR_PTR(-EINVAL);
 
-       alen = min(len, DATALEN_MSG);
-       memcpy(dst + 1, src + 1, alen);
+       chunk = min(len, DATALEN_MSG);
 
-       for (dst_pseg = dst->next, src_pseg = src->next;
-            src_pseg != NULL;
-            dst_pseg = dst_pseg->next, src_pseg = src_pseg->next) {
+       memcpy(dst + 1, src + 1, chunk);
+       remaining = len - chunk;
+       src_seg = src->next;
+       dst_seg = dst->next;
 
-               len -= alen;
-               alen = min(len, DATALEN_SEG);
-               memcpy(dst_pseg + 1, src_pseg + 1, alen);
+       while (remaining > 0 && src_seg && dst_seg) {
+               chunk = min(remaining, DATALEN_SEG);
+               memcpy(dst_seg + 1, src_seg + 1, chunk);
+               remaining -= chunk;
+               src_seg = src_seg->next;
+               dst_seg = dst_seg->next;
        }
-
+       if (remaining != 0)
+               return ERR_PTR(-EINVAL);
        dst->m_type = src->m_type;
-       dst->m_ts = src->m_ts;
-
+       dst->m_ts = 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;
ipc/util.h +2 -1
index a55d6cebe6d3..374abeee79b3 100644
@@ -197,8 +197,9 @@ int ipc_parse_version(int *cmd);
 
 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);
 
 static inline int ipc_checkid(struct kern_ipc_perm *ipcp, int id)
 {
kernel/sys_ni.c +6 -1
index add3032da16f..8219d76c72a0 100644
@@ -392,5 +392,11 @@ COND_SYSCALL(setuid16);
 COND_SYSCALL(rseq);
 COND_SYSCALL(rseq_slice_yield);
 
+/* 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);
--

2.43.0

#4 lore raw

PATCH RESEND v3 2/4 IPC: Added system call entry in all of most common architectures

In reply to Mathura_Kumar

Wire up the new syscall numbers for all common architectures in their respective syscall tables and unistd headers.

---
 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(-)
arch/alpha/kernel/syscalls/syscall.tbl +2 -0
index f31b7afffc34..918e38415665 100644
@@ -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
arch/arm/tools/syscall.tbl +2 -0
index 94351e22bfcf..cc44a0a56bf2 100644
@@ -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
arch/arm64/tools/syscall_32.tbl +3 -0
index 62d93d88e0fe..3b50eda2970c 100644
@@ -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
+
arch/m68k/kernel/syscalls/syscall.tbl +2 -0
index 248934257101..37f81ca45aee 100644
@@ -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
arch/microblaze/kernel/syscalls/syscall.tbl +2 -0
index 223d26303627..7a42b1ac167d 100644
@@ -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
+473 common	mq_sendmmsg	        sys_mq_sendmmsg
+472 common	mq_recvmmsg	        sys_mq_recvmmsg
arch/mips/kernel/syscalls/syscall_n32.tbl +2 -0
index 7430714e2b8f..60e67d7e2b0e 100644
@@ -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
arch/mips/kernel/syscalls/syscall_n64.tbl +3 -0
index 630aab9e5425..49b52129b110 100644
@@ -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
+
arch/mips/kernel/syscalls/syscall_o32.tbl +2 -0
index 128653112284..0cc9e5ebc7c9 100644
@@ -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
arch/parisc/kernel/syscalls/syscall.tbl +2 -0
index c6331dad9461..de3406745995 100644
@@ -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
arch/powerpc/kernel/syscalls/syscall.tbl +2 -0
index 4fcc7c58a105..820a77c6b93b 100644
@@ -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
arch/s390/kernel/syscalls/syscall.tbl +3 -0
index 09a7ef04d979..acf0eabbd629 100644
@@ -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
+
arch/sh/kernel/syscalls/syscall.tbl +2 -0
index 70b315cbe710..f572b846a0d1 100644
@@ -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
arch/sparc/kernel/syscalls/syscall.tbl +3 -0
index 7e71bf7fcd14..a0e588531a4e 100644
@@ -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
+
arch/x86/entry/syscalls/syscall_32.tbl +2 -0
index f832ebd2d79b..b40cce591f20 100644
@@ -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
arch/x86/entry/syscalls/syscall_64.tbl +2 -1
index 524155d655da..16b29007e210 100644
@@ -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 differently
 # in x32 as compared to native x86_64.  These syscalls have numbers 512-547.
arch/xtensa/kernel/syscalls/syscall.tbl +2 -0
index a9bca4e484de..02f8f1da88b5 100644
@@ -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
scripts/syscall.tbl +2 -0
index 7a42b32b6577..a3a2345732bb 100644
@@ -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
Signature · 1 line
2.43.0
#5 lore raw

PATCH RESEND v3 3/4 IPC: Added system call entry in performance tool

In reply to Mathura_Kumar

It include all the entires made up in performance tools for both new system call.

---
 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(-)
tools/include/uapi/asm-generic/unistd.h +7 -1
index a627acc8fb5f..b891edfebdf9 100644
@@ -863,8 +863,14 @@ __SYSCALL(__NR_listns, sys_listns)
 #define __NR_rseq_slice_yield 471
 __SYSCALL(__NR_rseq_slice_yield, sys_rseq_slice_yield)
 
+#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
 
 /*
  * 32 bit systems traditionally used different
tools/perf/arch/alpha/entry/syscalls/syscall.tbl +4 -0
index 74720667fe09..5cf0c5d3f123 100644
@@ -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
+
tools/perf/arch/arm/entry/syscalls/syscall.tbl +3 -0
index 94351e22bfcf..868bbb6539a5 100644
@@ -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
+
tools/perf/arch/arm64/entry/syscalls/syscall_32.tbl +3 -0
index 9a37930d4e26..a6103dbcd359 100644
@@ -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
tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +2 -0
index 630aab9e5425..51d0a1d5023f 100644
@@ -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
tools/perf/arch/parisc/entry/syscalls/syscall.tbl +3 -0
index 66dc406b12e4..a93b7b0d6ac1 100644
@@ -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
+
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +3 -0
index 4fcc7c58a105..a6c97ec03646 100644
@@ -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
+
tools/perf/arch/s390/entry/syscalls/syscall.tbl +2 -0
index 09a7ef04d979..c9f9b89c24f0 100644
@@ -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
tools/perf/arch/sh/entry/syscalls/syscall.tbl +2 -0
index 70b315cbe710..2888f649ba20 100644
@@ -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
tools/perf/arch/sparc/entry/syscalls/syscall.tbl +2 -0
index 7e71bf7fcd14..7f52018977c6 100644
@@ -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
tools/perf/arch/x86/entry/syscalls/syscall_32.tbl +2 -0
index f832ebd2d79b..85a847c2a784 100644
@@ -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
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +2 -0
index 524155d655da..b4f065b311b4 100644
@@ -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
 
 #
 # Due to a historical design error, certain syscalls are numbered differently
tools/perf/arch/xtensa/entry/syscalls/syscall.tbl +2 -0
index a9bca4e484de..af161058fbb9 100644
@@ -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
tools/scripts/syscall.tbl +2 -0
index 7a42b32b6577..fdfee8bb36a3 100644
@@ -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
Signature · 1 line
2.43.0
#6 lore raw

PATCH RESEND v3 4/4 Test: Added self-testing and documentation

In reply to Mathura_Kumar

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.

---
 Documentation/userspace-api/index.rst       |   2 +
 Documentation/userspace-api/mq_recvmmsg.rst | 205 ++++++++++
 Documentation/userspace-api/mq_sendmmsg.rst | 168 +++++++++
 ipc/msgutil.c                               |   3 +-
 tools/testing/selftests/ipc/Makefile        |   2 +-
 tools/testing/selftests/ipc/mq_recvmmsg.c   | 391 ++++++++++++++++++++
 tools/testing/selftests/ipc/mq_sendmmsg.c   | 360 ++++++++++++++++++
 7 files changed, 1128 insertions(+), 3 deletions(-)
 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
Documentation/userspace-api/index.rst +2 -0
index a68b1bea57a8..4e9cbdd8c3a8 100644
@@ -22,6 +22,8 @@ System calls
    ioctl/index
    mseal
    rseq
+   mq_recvmmsg
+   mq_sendmmsg
 
 Security-related interfaces
 ===========================
Documentation/userspace-api/mq_recvmmsg.rst new file +205 -0

205 lines not on this page · raw message

Documentation/userspace-api/mq_sendmmsg.rst new file +168 -0

168 lines not on this page · raw message

ipc/msgutil.c +1 -2
index f2854fd8d7a4..a022fd36a356 100644
@@ -150,8 +150,7 @@ struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst, size_t len)
 	dst->m_type = src->m_type;
 	dst->m_ts = len;
 	return dst;
-
- }
+}
 
 int store_msg(void __user *dest, struct msg_msg *msg, size_t len)
 {
tools/testing/selftests/ipc/Makefile +1 -1
index fad10f2bb57b..04da0efd67d7 100644
@@ -12,7 +12,7 @@ endif
 
 CFLAGS += $(KHDR_INCLUDES)
 
-TEST_GEN_PROGS := msgque
+TEST_GEN_PROGS := msgque mq_recvmmsg mq_sendmmsg
 
 include ../lib.mk
 
tools/testing/selftests/ipc/mq_recvmmsg.c new file +391 -0

391 lines not on this page · raw message

tools/testing/selftests/ipc/mq_sendmmsg.c new file +360 -0

360 lines not on this page · raw message

Signature · 1 line
2.43.0