IPC: CRIU enhancements update
Subsystems (2)
cover IPC: CRIU enhancements update
This patch set is aimed to fix some errors in previously commited "[RFC PATCH v8 0/5] IPC: checkpoint/restore in userspace enhancements" patch set.
Is particular it:
1) wraps new sysctl in CONFIG_CHECKPOINT_RESTORE macro and updates documentation
2) fixes self-test to work with new sysctls.
3) cleanup do_msgrcv() to make it looks less ugly aroung MSG_COPY feature.
The following series implements...
---
Stanislav Kinsbursky (5):
ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE
ipc: remove redundant MSG_COPY check
test: IPC message queue copy feature test update
Documentation: update sysctl/kernel.txt
ipc: cleanup do_msgrcv() aroung MSG_COPY feature
Documentation/sysctl/kernel.txt | 19 ++++++++ include/linux/msg.h | 3 + ipc/compat.c | 3 + ipc/ipc_sysctl.c | 4 ++ ipc/msg.c | 84 ++++++++++++++++++++-------------- ipc/util.c | 2 - tools/testing/selftests/ipc/msgque.c | 83 ++++++++++++++++++++-------------- 7 files changed, 126 insertions(+), 72 deletions(-)
PATCH 1/5 ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE
This patch set wraps "msg_next_id", "sem_next_id" and "shm_next_id" inside CONFIG_CHECKPOINT_RESTORE macro.
Signed-off-by Stanislav Kinsbursky <[email protected]>
--- ipc/ipc_sysctl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
ipc/ipc_sysctl.c +4 -0
@@ -158,7 +158,9 @@ static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,static int zero;static int one =1 ; +#ifdef CONFIG_CHECKPOINT_RESTORE static int int_max =INT_MAX ; +#endif static struct ctl_table ipc_kern_table[] = { {
@@ -228,6 +230,7 @@ static struct ctl_table ipc_kern_table[] = { .extra1 = &zero, .extra2 = &one, }, +#ifdef CONFIG_CHECKPOINT_RESTORE { .procname = "sem_next_id", .data = &init_ipc_ns.ids[IPC_SEM_IDS].next_id,
@@ -255,6 +258,7 @@ static struct ctl_table ipc_kern_table[] = { .extra1 = &zero, .extra2 = &int_max, }, +#endif {} };
PATCH 2/5 ipc: remove redundant MSG_COPY check
In reply to Stanislav KinsburskySmall cleanup patch.
Signed-off-by Stanislav Kinsbursky <[email protected]>
--- ipc/msg.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
ipc/msg.c +2 -5
@@ -786,11 +786,8 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,return -EINVAL ;if (msgflg &MSG_COPY ) {#ifdef CONFIG_CHECKPOINT_RESTORE - -if (msgflg &MSG_COPY ) { - copy_number = msgtyp; - msgtyp =0 ; - } + copy_number = msgtyp; + msgtyp =0 ;/* * Create dummy message to copy real message to.
PATCH 3/5 test: IPC message queue copy feature test update
In reply to Stanislav KinsburskyThis update fixes coding style problems (80-characters line and others). Also, it fixes test to work with new IPC sysctls (instead of using experimental API logic, which was throwed away and replaced by sysctls).
Signed-off-by Stanislav Kinsbursky <[email protected]>
--- include/linux/msg.h | 3 + ipc/compat.c | 3 + ipc/msg.c | 2 - ipc/util.c | 2 - tools/testing/selftests/ipc/msgque.c | 83 ++++++++++++++++++++-------------- 5 files changed, 55 insertions(+), 38 deletions(-)
include/linux/msg.h +2 -1
@@ -36,6 +36,7 @@ extern long do_msgsnd(int msqid, long mtype, void __user *mtext, size_t msgsz, int msgflg);extern long do_msgrcv (int msqid,void __user *buf,size_t bufsz,long msgtyp,int msgflg, -long (*msg_fill)(void __user *,struct msg_msg *,size_t )); +long (*msg_fill)(void __user *,struct msg_msg *, +size_t ));#endif /* _LINUX_MSG_H */
ipc/compat.c +2 -1
@@ -365,7 +365,8 @@ long compat_sys_msgrcv(int first, int second, int msgtyp, int third, uptr =compat_ptr (ipck.msgp); msgtyp = ipck.msgtyp; } -return do_msgrcv (first, uptr, second, msgtyp, third, compat_do_msg_fill); +return do_msgrcv (first, uptr, second, msgtyp, third, + compat_do_msg_fill); }#else long compat_sys_semctl (int semid,int semnum,int cmd,int arg)
ipc/msg.c +1 -1
@@ -771,7 +771,7 @@ static long do_msg_fill(void __user *dest, struct msg_msg *msg, size_t bufsz)long do_msgrcv (int msqid,void __user *buf,size_t bufsz,long msgtyp,int msgflg, -long (*msg_handler)(void __user *,struct msg_msg *,size_t )) +long (*msg_handler)(void __user *,struct msg_msg *,size_t )) {struct msg_queue *msq;struct msg_msg *msg;
ipc/util.c +1 -1
@@ -282,7 +282,7 @@ int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size)if (next_id <0 ) { new->seq = ids->seq++; -if (ids->seq > ids->seq_max) +if (ids->seq > ids->seq_max) ids->seq =0 ; }else { new->seq =ipcid_to_seqx (next_id);
tools/testing/selftests/ipc/msgque.c +49 -34
174 lines not on this page · raw message
PATCH 4/5 Documentation: update sysctl/kernel.txt
In reply to Stanislav KinsburskyThis patch adds documentation about new "msg_next_id", "sem_next_id" and "shm_next_id" sysctls.
Signed-off-by Stanislav Kinsbursky <[email protected]>
--- Documentation/sysctl/kernel.txt | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-)
Documentation/sysctl/kernel.txt +19 -0
@@ -38,6 +38,7 @@ show up in /proc/sys/kernel: - l2cr [ PPC only ] - modprobe ==> Documentation/debugging-modules.txt - modules_disabled +- msg_next_id [ sysv ipc ] - msgmax - msgmnb - msgmni
@@ -62,7 +63,9 @@ show up in /proc/sys/kernel: - rtsig-max - rtsig-nr - sem +- sem_next_id [ sysv ipc ] - sg-big-buff [ generic SCSI device (sg) ] +- shm_next_id [ sysv ipc ] - shm_rmid_forced - shmall - shmmax [ sysv ipc ]
@@ -320,6 +323,22 @@ to false. ============================================================== +msg_next_id, sem_next_id, and shm_next_id: + +These three toggles allows to specify desired id for next allocated IPC +object: message, semaphore or shared memory respectively. + +By default they are equal to -1, which means generic allocation logic. +Possible values to set are in range {0..INT_MAX}. + +Notes: +1) kernel doesn't guarantee, that new object will have desired id. So, +it's up to userspace, how to handle an object with "wrong" id. +2) Toggle with non-default value will be set back to -1 by kernel after +successful IPC object allocation. + +============================================================== + nmi_watchdog: Enables/Disables the NMI watchdog on x86 systems. When the value is
PATCH 5/5 ipc: cleanup do_msgrcv() aroung MSG_COPY feature
In reply to Stanislav KinsburskyMSG_COPY feature was developed for Checkpoint/Restart In User space project and thus wrapped in CONFIG_CHECKPOINT_RESTORE macro. But code look a bit ugly. So this patch is an attempt to cleanup do_msgrcv() a bit and make it looks better.
Signed-off-by Stanislav Kinsbursky <[email protected]>
--- ipc/msg.c | 79 +++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 31 deletions(-)
ipc/msg.c +48 -31
@@ -769,6 +769,45 @@ static long do_msg_fill(void __user *dest, struct msg_msg *msg, size_t bufsz)return msgsz; } +#ifdef CONFIG_CHECKPOINT_RESTORE +static inline struct msg_msg *fill_copy (unsigned long copy_nr, +unsigned long msg_nr, +struct msg_msg *msg, +struct msg_msg *copy) +{ +if (copy_nr == msg_nr) +return copy_msg (msg, copy); +return NULL ; +} + +static inline struct msg_msg *prepare_copy (void __user *buf,size_t bufsz, +int msgflg,long *msgtyp, +unsigned long *copy_number) +{ +struct msg_msg *copy; + + *copy_number = *msgtyp; + *msgtyp =0 ; +/* +* Create dummy message to copy real message to. +*/ + copy =load_msg (buf, bufsz); +if (!IS_ERR (copy)) + copy->m_ts = bufsz; +return copy; +} + +static inline void free_copy (int msgflg,struct msg_msg *copy) +{ +if (msgflg &MSG_COPY ) +free_msg (copy); +} +#else +#define free_copy (msgflg, copy) do {} while (0) +#define prepare_copy (buf, sz, msgflg, msgtyp, copy_nr) ERR_PTR(-ENOSYS) +#define fill_copy (copy_nr, msg_nr, msg, copy) NULL +#endif +long do_msgrcv (int msqid,void __user *buf,size_t bufsz,long msgtyp,int msgflg,long (*msg_handler)(void __user *,struct msg_msg *,size_t ))
@@ -777,38 +816,22 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,struct msg_msg *msg;int mode;struct ipc_namespace *ns; -#ifdef CONFIG_CHECKPOINT_RESTORE -struct msg_msg *copy =NULL ; -unsigned long copy_number =0 ; -#endif +struct msg_msg *copy; +unsigned long __maybe_unused copy_number;if (msqid <0 || (long ) bufsz <0 )return -EINVAL ;if (msgflg &MSG_COPY ) { -#ifdef CONFIG_CHECKPOINT_RESTORE - copy_number = msgtyp; - msgtyp =0 ; - -/* -* Create dummy message to copy real message to. -*/ - copy =load_msg (buf, bufsz); + copy =prepare_copy (buf, bufsz, msgflg, &msgtyp, ©_number);if (IS_ERR (copy))return PTR_ERR (copy); - copy->m_ts = bufsz; -#else -return -ENOSYS ; -#endif } mode =convert_mode (&msgtyp, msgflg); ns = current->nsproxy->ipc_ns; msq =msg_lock_check (ns, msqid);if (IS_ERR (msq)) { -#ifdef CONFIG_CHECKPOINT_RESTORE -if (msgflg &MSG_COPY ) -free_msg (copy); -#endif +free_copy (msgflg, copy);return PTR_ERR (msq); }
@@ -835,13 +858,12 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,if (mode ==SEARCH_LESSEQUAL && walk_msg->m_type !=1 ) { msgtyp = walk_msg->m_type -1 ; -#ifdef CONFIG_CHECKPOINT_RESTORE }else if (msgflg &MSG_COPY ) { -if (copy_number == msg_counter) { - msg =copy_msg (walk_msg, copy); + msg =fill_copy (copy_number, + msg_counter, + walk_msg, copy); +if (msg)break ; - } -#endif }else break ; msg_counter++;
@@ -857,10 +879,8 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, msg =ERR_PTR (-E2BIG ); goto out_unlock; } -#ifdef CONFIG_CHECKPOINT_RESTORE if (msgflg &MSG_COPY ) goto out_unlock; -#endif list_del (&msg->m_list); msq->q_qnum--; msq->q_rtime =get_seconds ();
@@ -945,10 +965,7 @@ out_unlock: } }if (IS_ERR (msg)) { -#ifdef CONFIG_CHECKPOINT_RESTORE -if (msgflg &MSG_COPY ) -free_msg (copy); -#endif +free_copy (msgflg, copy);return PTR_ERR (msg); }