IPC: checkpoint/restore in userspace enhancements
Subsystems (4)
v4 cover IPC: checkpoint/restore in userspace enhancements
v4:
1) If MSG_COPY flag is specified, then "mtype" is not a type, but message number to copy.
2) MSG_SET_COPY logic for sys_msgctl() was removed.
v3:
1) Copy messages to user-space under spinlock was replaced by allocation of dummy message before queue lock and then copy of desired message to the dummy one instead of unlinking it from queue list.
I.e. the message queue copy logic was changed: messages can be retrived one by one (instead of receiving of the whole list at once).
This patch set is aimed to provide additional functionality for all IPC objects, which is required for migration of these objects by user-space checkpoint/restore utils (CRIU).
The main problem here was impossibility to set up object id. This patch set solves the problem in two steps:
1) Makes it possible to create new object (shared memory, semaphores set or messages queue) with ID, equal to passed key.
2) Makes it possible to change existent object key.
Another problem was to peek messages from queues without deleting them. This was achived by introducing of new MSG_COPY flag for sys_msgrcv() and MSG_SET_COPY command for sys_msgctl() (which can be used to select message number to copy).
The following series implements...
---
Stanislav Kinsbursky (9):
ipc: remove forced assignment of selected message
ipc: "use key as id" functionality for resource get system call introduced
ipc: segment key change helper introduced
ipc: add new SHM_SET command for sys_shmctl() call
ipc: add new MSG_SET command for sys_msgctl() call
ipc: add new SEM_SET command for sys_semctl() call
IPC: message queue receive cleanup
IPC: message queue copy feature introduced
test: IPC message queue migration test
arch/tile/kernel/compat.c | 29 +++++++ include/linux/compat.h | 2 include/linux/ipc.h | 1 include/linux/msg.h | 7 +- include/linux/sem.h | 1 include/linux/shm.h | 1 ipc/compat.c | 42 ++++++--- ipc/msg.c | 110 +++++++++++++++++++------ ipc/msgutil.c | 38 +++++++++ ipc/sem.c | 11 ++ ipc/shm.c | 14 +++ ipc/util.c | 59 ++++++++++++- ipc/util.h | 4 + security/selinux/hooks.c | 3 + security/smack/smack_lsm.c | 3 + tools/testing/selftests/ipc/msgque.c | 151 ++++++++++++++++++++++++++++++++++ 16 files changed, 424 insertions(+), 52 deletions(-) create mode 100644 tools/testing/selftests/ipc/msgque.c
PATCH v4 1/9 ipc: remove forced assignment of selected message
This is a cleanup patch. The assignment is redundant.
--- ipc/msg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
ipc/msg.c +0 -1
@@ -787,7 +787,6 @@ long do_msgrcv(int msqid, long *pmtype, void __user *mtext, !security_msg_queue_msgrcv(msq, walk_msg, current, msgtyp, mode)) { - msg = walk_msg;if (mode ==SEARCH_LESSEQUAL && walk_msg->m_type !=1 ) { msg = walk_msg;
PATCH v4 2/9 ipc: "use key as id" functionality for resource get system call introduced
In reply to Stanislav KinsburskyThis patch introduces new IPC resource get request flag IPC_PRESET, which should be interpreted as a request to try to allocate IPC slot with number, starting from value resented by key. IOW, kernel will try allocate new segment in specified slot. If slot is not emply, them -EEXIST returned.
--- include/linux/ipc.h | 1 + ipc/msg.c | 1 + ipc/sem.c | 1 + ipc/shm.c | 1 + ipc/util.c | 8 +++++++- ipc/util.h | 1 + 6 files changed, 12 insertions(+), 1 deletions(-)
include/linux/ipc.h +1 -0
@@ -24,6 +24,7 @@ struct ipc_perm#define IPC_CREAT 00001000/* create if key is nonexistent */ #define IPC_EXCL 00002000/* fail if key exists */ #define IPC_NOWAIT 00004000/* return error on wait */ +#define IPC_PRESET 00040000/* use key as id */ /* these fields are used by the DIPC package so the kernel as standard should avoid using them if possible */
ipc/msg.c +1 -0
@@ -190,6 +190,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params) msq->q_perm.mode = msgflg &S_IRWXUGO ; msq->q_perm.key = key; + msq->q_perm.id = (msgflg &IPC_PRESET ) ? key :0 ; msq->q_perm.security =NULL ; retval =security_msg_queue_alloc (msq);
ipc/sem.c +1 -0
@@ -306,6 +306,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params) sma->sem_perm.mode = (semflg &S_IRWXUGO ); sma->sem_perm.key = key; + sma->sem_perm.id = (semflg &IPC_PRESET ) ? key :0 ; sma->sem_perm.security =NULL ; retval =security_sem_alloc (sma);
ipc/shm.c +1 -0
@@ -480,6 +480,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) shp->shm_perm.key = key; shp->shm_perm.mode = (shmflg &S_IRWXUGO ); + shp->shm_perm.id = (shmflg &IPC_PRESET ) ? key :0 ; shp->mlock_user =NULL ; shp->shm_perm.security =NULL ;
ipc/util.c +7 -1
@@ -264,7 +264,8 @@ int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size)rcu_read_lock ();spin_lock (&new->lock); - err =idr_get_new (&ids->ipcs_idr, new, &id); + err =idr_get_new_above (&ids->ipcs_idr, new, +ipcid_to_idx (new->id), &id);if (err) {spin_unlock (&new->lock);rcu_read_unlock ();
@@ -277,6 +278,11 @@ int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size) new->cuid = new->uid = euid; new->gid = new->cgid = egid; +if (new->id &&ipcid_to_idx (new->id) == id) { + new->seq =ipcid_to_seq (new->id); +return id; + } + new->seq = ids->seq++;if (ids->seq > ids->seq_max) ids->seq =0 ;
ipc/util.h +1 -0
@@ -92,6 +92,7 @@ void __init ipc_init_proc_interface(const char *path, const char *header,#define IPC_SHM_IDS 2#define ipcid_to_idx (id) ((id) % SEQ_MULTIPLIER) +#define ipcid_to_seq (id) ((id) / SEQ_MULTIPLIER)/* must be called with ids->rw_mutex acquired for writing */ int ipc_addid (struct ipc_ids *,struct kern_ipc_perm *,int );
PATCH v4 3/9 ipc: segment key change helper introduced
In reply to Stanislav KinsburskyThis patch introduces existent segment key changing infrastructure. New function ipc_update_key() can be used change segment key, cuid, cgid values. It checks for that new key is not used (except IPC_PRIVATE) prior to set it on existent.
To make this possible, added copying of this fields from user-space in __get_compat_ipc_perm() and __get_compat_ipc64_perm() functions. Also segment search by key and lock were splitted into different functions, because ipc_update_key() doesn't need to lock the segment during check that new key is not used.
--- ipc/compat.c | 6 ++++++ ipc/util.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- ipc/util.h | 2 ++ 3 files changed, 56 insertions(+), 3 deletions(-)
ipc/compat.c +6 -0
@@ -144,6 +144,9 @@ static inline int __get_compat_ipc64_perm(struct ipc64_perm *p64, err =__get_user (p64->uid, &up64->uid); err |=__get_user (p64->gid, &up64->gid); err |=__get_user (p64->mode, &up64->mode); + err |=__get_user (p64->cuid, &up64->cuid); + err |=__get_user (p64->cgid, &up64->cgid); + err |=__get_user (p64->key, &up64->key);return err; }
@@ -155,6 +158,9 @@ static inline int __get_compat_ipc_perm(struct ipc64_perm *p, err =__get_user (p->uid, &up->uid); err |=__get_user (p->gid, &up->gid); err |=__get_user (p->mode, &up->mode); + err |=__get_user (p->cuid, &up->cuid); + err |=__get_user (p->cgid, &up->cgid); + err |=__get_user (p->key, &up->key);return err; }
ipc/util.c +48 -3
81 lines not on this page · raw message
ipc/util.h +2 -0
@@ -126,6 +126,8 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int);void kernel_to_ipc64_perm (struct kern_ipc_perm *in,struct ipc64_perm *out);void ipc64_perm_to_ipc_perm (struct ipc64_perm *in,struct ipc_perm *out); +int ipc_update_key (struct ipc_ids *ids,struct ipc64_perm *in, +struct kern_ipc_perm *out);void ipc_update_perm (struct ipc64_perm *in,struct kern_ipc_perm *out); struct kern_ipc_perm *ipcctl_pre_down(struct ipc_namespace *ns, struct ipc_ids *ids, int id, int cmd,
PATCH v4 4/9 ipc: add new SHM_SET command for sys_shmctl() call
In reply to Stanislav KinsburskyNew SHM_SET command will be interpreted exactly as IPC_SET, but also will update key, cuid and cgid values. IOW, it allows to change existent key value. The fact, that key is not used is checked before update. Otherwise -EEXIST is returned.
--- include/linux/shm.h | 1 + ipc/compat.c | 1 + ipc/shm.c | 13 +++++++++++-- security/selinux/hooks.c | 1 + security/smack/smack_lsm.c | 1 + 5 files changed, 15 insertions(+), 2 deletions(-)
include/linux/shm.h +1 -0
@@ -63,6 +63,7 @@ struct shmid_ds {/* ipcs ctl commands */ #define SHM_STAT 13#define SHM_INFO 14 +#define SHM_SET 15/* Obsolete, used only for backwards compatibility */ struct shminfo {
ipc/compat.c +1 -0
@@ -688,6 +688,7 @@ long compat_sys_shmctl(int first, int second, void __user *uptr)case IPC_SET : +case SHM_SET :if (version ==IPC_64 ) { err =get_compat_shmid64_ds (&s64, uptr); }else {
ipc/shm.c +11 -2
@@ -635,6 +635,9 @@ copy_shmid_from_user(struct shmid64_ds *out, void __user *buf, int version) out->shm_perm.uid = tbuf_old.shm_perm.uid; out->shm_perm.gid = tbuf_old.shm_perm.gid; out->shm_perm.mode = tbuf_old.shm_perm.mode; + out->shm_perm.cuid = tbuf_old.shm_perm.cuid; + out->shm_perm.cgid = tbuf_old.shm_perm.cgid; + out->shm_perm.key = tbuf_old.shm_perm.key;return 0 ; }
@@ -739,12 +742,13 @@ static int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd,struct shmid_kernel *shp;int err; -if (cmd ==IPC_SET ) { +if (cmd ==IPC_SET || cmd ==SHM_SET ) {if (copy_shmid_from_user (&shmid64, buf, version))return -EFAULT ; } - ipcp =ipcctl_pre_down (ns, &shm_ids (ns), shmid, cmd, + ipcp =ipcctl_pre_down (ns, &shm_ids (ns), shmid, + (cmd !=SHM_SET ) ? :IPC_SET , &shmid64.shm_perm,0 );if (IS_ERR (ipcp))return PTR_ERR (ipcp);
@@ -758,6 +762,10 @@ static int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd,case IPC_RMID :do_shm_rmid (ns, ipcp); goto out_up; +case SHM_SET : + err =ipc_update_key (&shm_ids (ns), &shmid64.shm_perm, ipcp); +if (err) +break ;case IPC_SET :ipc_update_perm (&shmid64.shm_perm, ipcp); shp->shm_ctim =get_seconds ();
@@ -935,6 +943,7 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf) }case IPC_RMID :case IPC_SET : +case SHM_SET : err =shmctl_down (ns, shmid, cmd, buf, version);return err;default :
security/selinux/hooks.c +1 -0
@@ -5054,6 +5054,7 @@ static int selinux_shm_shmctl(struct shmid_kernel *shp, int cmd) perms =SHM__GETATTR |SHM__ASSOCIATE ;break ;case IPC_SET : +case SHM_SET : perms =SHM__SETATTR ;break ;case SHM_LOCK :
security/smack/smack_lsm.c +1 -0
@@ -2145,6 +2145,7 @@ static int smack_shm_shmctl(struct shmid_kernel *shp, int cmd) may =MAY_READ ;break ;case IPC_SET : +case SHM_SET :case SHM_LOCK :case SHM_UNLOCK :case IPC_RMID :
PATCH v4 5/9 ipc: add new MSG_SET command for sys_msgctl() call
In reply to Stanislav KinsburskyNew MSG_SET command will be interpreted exactly as IPC_SET, but also will update key, cuid and cgid values. IOW, it allows to change existent key value. The fact, that key is not used is checked before update. Otherwise -EEXIST is returned.
--- include/linux/msg.h | 1 + ipc/compat.c | 1 + ipc/msg.c | 13 +++++++++++-- security/selinux/hooks.c | 1 + security/smack/smack_lsm.c | 1 + 5 files changed, 15 insertions(+), 2 deletions(-)
include/linux/msg.h +1 -0
@@ -6,6 +6,7 @@/* ipcs ctl commands */ #define MSG_STAT 11#define MSG_INFO 12 +#define MSG_SET 13/* msgrcv options */ #define MSG_NOERROR 010000/* no error if message is too big */
ipc/compat.c +1 -0
@@ -483,6 +483,7 @@ long compat_sys_msgctl(int first, int second, void __user *uptr)break ;case IPC_SET : +case MSG_SET :if (version ==IPC_64 ) { err =get_compat_msqid64 (&m64, uptr); }else {
ipc/msg.c +11 -2
@@ -391,6 +391,9 @@ copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version) out->msg_perm.uid = tbuf_old.msg_perm.uid; out->msg_perm.gid = tbuf_old.msg_perm.gid; out->msg_perm.mode = tbuf_old.msg_perm.mode; + out->msg_perm.cuid = tbuf_old.msg_perm.cuid; + out->msg_perm.cgid = tbuf_old.msg_perm.cgid; + out->msg_perm.key = tbuf_old.msg_perm.key;if (tbuf_old.msg_qbytes ==0 ) out->msg_qbytes = tbuf_old.msg_lqbytes;
@@ -417,12 +420,13 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,struct msg_queue *msq;int err; -if (cmd ==IPC_SET ) { +if (cmd ==IPC_SET || cmd ==MSG_SET ) {if (copy_msqid_from_user (&msqid64, buf, version))return -EFAULT ; } - ipcp =ipcctl_pre_down (ns, &msg_ids (ns), msqid, cmd, + ipcp =ipcctl_pre_down (ns, &msg_ids (ns), msqid, + (cmd !=MSG_SET ) ? cmd :IPC_SET , &msqid64.msg_perm, msqid64.msg_qbytes);if (IS_ERR (ipcp))return PTR_ERR (ipcp);
@@ -438,6 +442,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,freeque (ns, ipcp); goto out_up;case IPC_SET : +case MSG_SET :if (msqid64.msg_qbytes > ns->msg_ctlmnb && !capable (CAP_SYS_RESOURCE )) { err = -EPERM ;
@@ -446,6 +451,9 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, msq->q_qbytes = msqid64.msg_qbytes; +if (cmd ==MSG_SET ) +ipc_update_key (&msg_ids (ns), &msqid64.msg_perm, ipcp); +ipc_update_perm (&msqid64.msg_perm, ipcp); msq->q_ctime =get_seconds ();/* sleeping receivers might be excluded by
@@ -565,6 +573,7 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf) }case IPC_SET :case IPC_RMID : +case MSG_SET : err =msgctl_down (ns, msqid, cmd, buf, version);return err;default :
security/selinux/hooks.c +1 -0
@@ -4912,6 +4912,7 @@ static int selinux_msg_queue_msgctl(struct msg_queue *msq, int cmd) perms =MSGQ__GETATTR |MSGQ__ASSOCIATE ;break ;case IPC_SET : +case MSG_SET : perms =MSGQ__SETATTR ;break ;case IPC_RMID :
security/smack/smack_lsm.c +1 -0
@@ -2398,6 +2398,7 @@ static int smack_msg_queue_msgctl(struct msg_queue *msq, int cmd) may =MAY_READ ;break ;case IPC_SET : +case MSG_SET :case IPC_RMID : may =MAY_READWRITE ;break ;
PATCH v4 6/9 ipc: add new SEM_SET command for sys_semctl() call
In reply to Stanislav KinsburskyNew SEM_SET command will be interpreted exactly as IPC_SET, but also will update key, cuid and cgid values. IOW, it allows to change existent key value. The fact, that key is not used is checked before update. Otherwise -EEXIST is returned.
--- include/linux/sem.h | 1 + ipc/compat.c | 1 + ipc/sem.c | 10 ++++++++-- security/selinux/hooks.c | 1 + security/smack/smack_lsm.c | 1 + 5 files changed, 12 insertions(+), 2 deletions(-)
include/linux/sem.h +1 -0
@@ -18,6 +18,7 @@/* ipcs ctl cmds */ #define SEM_STAT 18#define SEM_INFO 19 +#define SEM_SET 20/* Obsolete, used only for backwards compatibility and libc5 compiles */ struct semid_ds {
ipc/compat.c +1 -0
@@ -290,6 +290,7 @@ static long do_compat_semctl(int first, int second, int third, u32 pad)break ;case IPC_SET : +case SEM_SET :if (version ==IPC_64 ) { err =get_compat_semid64_ds (&s64,compat_ptr (pad)); }else {
ipc/sem.c +8 -2
@@ -1084,12 +1084,13 @@ static int semctl_down(struct ipc_namespace *ns, int semid,struct semid64_ds semid64;struct kern_ipc_perm *ipcp; -if (cmd ==IPC_SET ) { +if (cmd ==IPC_SET || cmd ==SEM_SET ) {if (copy_semid_from_user (&semid64, arg.buf, version))return -EFAULT ; } - ipcp =ipcctl_pre_down (ns, &sem_ids (ns), semid, cmd, + ipcp =ipcctl_pre_down (ns, &sem_ids (ns), semid, + (cmd !=SEM_SET ) ? :IPC_SET , &semid64.sem_perm,0 );if (IS_ERR (ipcp))return PTR_ERR (ipcp);
@@ -1104,6 +1105,10 @@ static int semctl_down(struct ipc_namespace *ns, int semid,case IPC_RMID :freeary (ns, ipcp); goto out_up; +case SEM_SET : + err =ipc_update_key (&sem_ids (ns), &semid64.sem_perm, ipcp); +if (err) +break ;case IPC_SET :ipc_update_perm (&semid64.sem_perm, ipcp); sma->sem_ctime =get_seconds ();
@@ -1149,6 +1154,7 @@ SYSCALL_DEFINE(semctl)(int semid, int semnum, int cmd, union semun arg)return err;case IPC_RMID :case IPC_SET : +case SEM_SET : err =semctl_down (ns, semid, cmd, version, arg);return err;default :
security/selinux/hooks.c +1 -0
@@ -5160,6 +5160,7 @@ static int selinux_sem_semctl(struct sem_array *sma, int cmd) perms =SEM__DESTROY ;break ;case IPC_SET : +case SEM_SET : perms =SEM__SETATTR ;break ;case IPC_STAT :
security/smack/smack_lsm.c +1 -0
@@ -2277,6 +2277,7 @@ static int smack_sem_semctl(struct sem_array *sma, int cmd)case SETALL :case IPC_RMID :case IPC_SET : +case SEM_SET : may =MAY_READWRITE ;break ;case IPC_INFO :
PATCH v4 7/9 IPC: message queue receive cleanup
In reply to Stanislav KinsburskyThis patch moves all message related manipulation into one function msg_fill(). Actually, two functions because of the compat one.
Conflicts:
arch/tile/kernel/compat.c
include/linux/compat.h
--- arch/tile/kernel/compat.c | 29 +++++++++++++++++++++++++++++ include/linux/compat.h | 2 ++ include/linux/msg.h | 5 +++-- ipc/compat.c | 33 +++++++++++++++++---------------- ipc/msg.c | 44 +++++++++++++++++++++++--------------------- 5 files changed, 74 insertions(+), 39 deletions(-)
arch/tile/kernel/compat.c +29 -0
@@ -94,6 +94,35 @@ long compat_sys_sched_rr_get_interval(compat_pid_t pid,return ret; } +/* +* The usual compat_sys_msgsnd() and _msgrcv() seem to be assuming +* some different calling convention than our normal 32-bit tile code. +*/ + +/* Already defined in ipc/compat.c, but we need it here. */ +struct compat_msgbuf { +compat_long_t mtype; +char mtext[1 ]; +}; + +long tile_compat_sys_msgsnd (int msqid, +struct compat_msgbuf __user *msgp, +size_t msgsz,int msgflg) +{ +compat_long_t mtype; + +if (get_user (mtype, &msgp->mtype)) +return -EFAULT ; +return do_msgsnd (msqid, mtype, msgp->mtext, msgsz, msgflg); +} + +long tile_compat_sys_msgrcv (int msqid, +struct compat_msgbuf __user *msgp, +size_t msgsz,long msgtyp,int msgflg) +{ +return do_msgrcv (msqid, msgp, msgsz, msgtyp, msgflg, compat_do_msg_fill); +} +/* Provide the compat syscall number to call mapping. */ #undef __SYSCALL#define __SYSCALL (nr, call) [nr] = (call),
include/linux/compat.h +2 -0
@@ -245,6 +245,7 @@ struct compat_sysctl_args;struct compat_kexec_segment ;struct compat_mq_attr ;struct compat_msgbuf ; +struct msg_msg ;extern void compat_exit_robust_list (struct task_struct *curr);
@@ -258,6 +259,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,#ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC long compat_sys_semctl (int first,int second,int third,void __user *uptr);long compat_sys_msgsnd (int first,int second,int third,void __user *uptr); +long compat_do_msg_fill (void __user *dest,struct msg_msg *msg,size_t bufsz);long compat_sys_msgrcv (int first,int second,int msgtyp,int third,int version,void __user *uptr); long compat_sys_shmat(int first, int second, compat_uptr_t third, int version,
include/linux/msg.h +3 -2
@@ -105,8 +105,9 @@ struct msg_queue {/* Helper routines for sys_msgsnd and sys_msgrcv */ extern long do_msgsnd (int msqid,long mtype,void __user *mtext,size_t msgsz,int msgflg); -extern long do_msgrcv (int msqid,long *pmtype,void __user *mtext, -size_t msgsz,long msgtyp,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 ));#endif /* __KERNEL__ */
ipc/compat.c +17 -16
@@ -341,13 +341,23 @@ long compat_sys_msgsnd(int first, int second, int third, void __user *uptr)return do_msgsnd (first, type, up->mtext, second, third); } +long compat_do_msg_fill (void __user *dest,struct msg_msg *msg,size_t bufsz) +{ +struct compat_msgbuf __user *msgp; +size_t msgsz; + +if (put_user (msg->m_type, &msgp->mtype)) +return -EFAULT ; + + msgsz = (bufsz > msg->m_ts) ? msg->m_ts : bufsz; +if (store_msg (msgp->mtext, msg, msgsz)) +return -EFAULT ; +return msgsz; +} +long compat_sys_msgrcv (int first,int second,int msgtyp,int third,int version,void __user *uptr) { -struct compat_msgbuf __user *up; -long type; -int err; -if (first <0 )return -EINVAL ;if (second <0 )
@@ -355,23 +365,14 @@ long compat_sys_msgrcv(int first, int second, int msgtyp, int third,if (!version) {struct compat_ipc_kludge ipck; - err = -EINVAL ;if (!uptr) - goto out; - err = -EFAULT ; +return -EINVAL ;if (copy_from_user (&ipck, uptr,sizeof (ipck))) - goto out; +return -EFAULT ; uptr =compat_ptr (ipck.msgp); msgtyp = ipck.msgtyp; } - up = uptr; - err =do_msgrcv (first, &type, up->mtext, second, msgtyp, third); -if (err <0 ) - goto out; -if (put_user (type, &up->mtype)) - err = -EFAULT ; -out: - return err; + 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 +23 -21
81 lines not on this page · raw message
PATCH v4 8/9 IPC: message queue copy feature introduced
In reply to Stanislav KinsburskyThis patch is required for checkpoint/restore in userspace.
IOW, c/r requires some way to get all pending IPC messages without deleting them from the queue (checkpoint can fail and in this case tasks will be resumed, so queue have to be valid).
To achive this, new operation flag MSG_COPY for sys_msgrcv() system call was introduced. If this flag was specified, then mtype is interpreted as number of the message to copy.
If MSG_COPY is set, then kernel will allocate dummy message with passed size, and then use new copy_msg() helper function to copy desired message (instead of unlinking it from the queue).
Notes:
1) Return -ENOSYS if MSG_COPY is specified, but CONFIG_CHECKPOINT_RESTORE is not set.
--- include/linux/msg.h | 1 + ipc/msg.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- ipc/msgutil.c | 38 ++++++++++++++++++++++++++++++++++++++ ipc/util.h | 1 + 4 files changed, 89 insertions(+), 2 deletions(-)
include/linux/msg.h +1 -0
@@ -11,6 +11,7 @@/* msgrcv options */ #define MSG_NOERROR 010000/* no error if message is too big */ #define MSG_EXCEPT 020000/* recv any msg except of specified type.*/ +#define MSG_COPY 040000/* copy (not remove) all queue messages */ /* Obsolete, used only for backwards compatibility and libc5 compiles */ struct msqid_ds {
ipc/msg.c +49 -2
92 lines not on this page · raw message
ipc/msgutil.c +38 -0
@@ -100,7 +100,45 @@ out_err: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_msgseg *dst_pseg, *src_pseg; +int len = src->m_ts; +int alen; + +BUG_ON (dst ==NULL ); +if (src->m_ts > dst->m_ts) +return ERR_PTR (-EINVAL ); + + alen = len; +if (alen >DATALEN_MSG ) + alen =DATALEN_MSG ; + + dst->next =NULL ; + dst->security =NULL ; +memcpy (dst +1 , src +1 , alen); + + len -= alen; + dst_pseg = dst->next; + src_pseg = src->next; +while (len >0 ) { + alen = len; +if (alen >DATALEN_SEG ) + alen =DATALEN_SEG ; +memcpy (dst_pseg +1 , src_pseg +1 , alen); + dst_pseg = dst_pseg->next; + len -= alen; + src_pseg = src_pseg->next; + } + + dst->m_type = src->m_type; + dst->m_ts = src->m_ts; + +return dst; +} +#endif int store_msg (void __user *dest,struct msg_msg *msg,int len) {int alen;
ipc/util.h +1 -0
@@ -142,6 +142,7 @@ int ipc_parse_version (int *cmd);extern void free_msg (struct msg_msg *msg);extern struct msg_msg *load_msg (const void __user *src,int len); +extern struct msg_msg *copy_msg (struct msg_msg *src,struct msg_msg *dst);extern int store_msg (void __user *dest,struct msg_msg *msg,int len);extern void recompute_msgmni (struct ipc_namespace *);
Re: [PATCH v4 8/9] IPC: message queue copy feature introduced
Quoted 11 lines · Stanislav Kinsbursky
This patch is required for checkpoint/restore in userspace.
IOW, c/r requires some way to get all pending IPC messages without deleting them from the queue (checkpoint can fail and in this case tasks will be resumed, so queue have to be valid).
To achive this, new operation flagMSG_COPYforsys_msgrcv()system call was introduced. If this flag was specified, then mtype is interpreted as number of the message to copy.
IfMSG_COPYis set, then kernel will allocate dummy message with passed size, and then use newcopy_msg()helper function to copy desired message (instead of unlinking it from the queue).
Quoted 3 lines
Notes:
1) Return-ENOSYSifMSG_COPYis specified, butCONFIG_CHECKPOINT_RESTOREis not set.
How is CONFIG_CHECKPOINT_RESTORE set?
I'm not sure, but I think it should be added to Kconfig.
--
Manfred
PATCH v4 9/9 test: IPC message queue migration test
In reply to Stanislav KinsburskyThis test is a part of CRIU development test suit.
--- tools/testing/selftests/ipc/msgque.c | 151 ++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 0 deletions(-) create mode 100644 tools/testing/selftests/ipc/msgque.c
tools/testing/selftests/ipc/msgque.c new file +151 -0
@@ -0,0 +1,151 @@ +#define _GNU_SOURCE +#include <sched.h> + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <sys/sem.h> +#include <sys/ipc.h> +#include <sys/msg.h> +#include <signal.h> +#include <errno.h> + +#include "zdtmtst.h" + +const char *test_doc="Tests sysv5 msg queues support by user space checkpointing" ; +const char *test_author="Stanislav Kinsbursky <[email protected]>" ; + +struct msg1 { +long mtype; +char mtext[20 ]; +}; +#define TEST_STRING "Test sysv5 msg" +#define MSG_TYPE 1 + +#define ANOTHER_TEST_STRING "Yet another test sysv5 msg" +#define ANOTHER_MSG_TYPE 26538 + +static int test_fn (int argc,char **argv) +{ +key_t key; +int msg, pid; +struct msg1 msgbuf; +int chret; + + key =ftok (argv[0 ],822155650 ); +if (key ==-1 ) { +err ("Can't make key" ); +exit (1 ); + } + + pid =test_fork (); +if (pid <0 ) { +err ("Can't fork" ); +exit (1 ); + } + + msg =msgget (key,IPC_CREAT |IPC_EXCL |0666 ); +if (msg ==-1 ) { + msg =msgget (key,0666 ); +if (msg ==-1 ) { +err ("Can't get queue" ); + goto err_kill; + } + } + +if (pid ==0 ) { +/* +* Here is the place where test sleeps and waits for signal. +* This place is used for suspend/restore test. +*/ +test_waitsig (); + +if (msgrcv (msg, &msgbuf,sizeof (TEST_STRING ),MSG_TYPE ,IPC_NOWAIT ) ==-1 ) { +fail ("Child: msgrcv failed (%m)" ); +return -errno; + } + +if (strncmp (TEST_STRING , msgbuf.mtext,sizeof (TEST_STRING ))) { +fail ("Child: the source and received strings aren't equal" ); +return -errno; + } +test_msg ("Child: received %s\n" , msgbuf.mtext); + + msgbuf.mtype =ANOTHER_MSG_TYPE ; +memcpy (msgbuf.mtext,ANOTHER_TEST_STRING ,sizeof (ANOTHER_TEST_STRING )); +if (msgsnd (msg, &msgbuf,sizeof (ANOTHER_TEST_STRING ),IPC_NOWAIT ) !=0 ) { +fail ("Child: msgsnd failed (%m)" ); +return -errno; + }; +pass (); +return 0 ; + }else { + msgbuf.mtype =MSG_TYPE ; +memcpy (msgbuf.mtext,TEST_STRING ,sizeof (TEST_STRING )); +if (msgsnd (msg, &msgbuf,sizeof (TEST_STRING ),IPC_NOWAIT ) !=0 ) { +fail ("Parent: msgsnd failed (%m)" ); + goto err_kill; + }; + + msgbuf.mtype =ANOTHER_MSG_TYPE ; +memcpy (msgbuf.mtext,ANOTHER_TEST_STRING ,sizeof (ANOTHER_TEST_STRING )); +if (msgsnd (msg, &msgbuf,sizeof (ANOTHER_TEST_STRING ),IPC_NOWAIT ) !=0 ) { +fail ("child: msgsnd (2) failed (%m)" ); +return -errno; + }; + +test_daemon (); +test_waitsig (); + +kill (pid,SIGTERM ); + +wait (&chret); + chret =WEXITSTATUS (chret); +if (chret) { +fail ("Parent: child exited with non-zero code %d (%s)\n" , + chret,strerror (chret)); + goto out; + } + +if (msgrcv (msg, &msgbuf,sizeof (ANOTHER_TEST_STRING ),ANOTHER_MSG_TYPE ,IPC_NOWAIT ) ==-1 ) { +fail ("Parent: msgrcv failed (%m)" ); + goto err; + } + +if (strncmp (ANOTHER_TEST_STRING , msgbuf.mtext,sizeof (ANOTHER_TEST_STRING ))) { +fail ("Parent: the source and received strings aren't equal" ); + goto err; + } +test_msg ("Parent: received %s\n" , msgbuf.mtext); + +pass (); + } + +out: +if (msgctl (msg,IPC_RMID ,0 )) { +fail ("Failed to destroy message queue: %d\n" , -errno); +return -errno; + } +return chret; + +err_kill: +kill (pid,SIGKILL ); +wait (NULL ); +err: + chret = -errno; + goto out; +} + +int main (int argc,char **argv) +{ +#ifdef NEW_IPC_NS +test_init_ns (argc, argv,CLONE_NEWIPC , test_fn); +#else +test_init (argc, argv); +test_fn (); +#endif +return 0 ; +}
Re: [PATCH v4 9/9] test: IPC message queue migration test
Hi Stanislav,
sorry for the slow reply, I finally got the time to perform tests with your patches.
Quoted 18 lines · Stanislav Kinsbursky
This test is a part of CRIU development test suit.
--- tools/testing/selftests/ipc/msgque.c | 151 ++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 0 deletions(-)create mode 100644
tools/testing/selftests/ipc/msgque.ctools/testing/selftests/ipc/msgque.c new file +6
-0@@ -0,0 +1,151 @@ +#define _GNU_SOURCE +#include <sched.h> + +#include <stdio.h> +#include <string.h> +#include <stdlib.h>
tools/testing/selftests/ipc/msgque.c line 16
Quoted 10 lines
tools/testing/selftests/ipc/msgque.c new file +10
-0+#include <unistd.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <sys/sem.h> +#include <sys/ipc.h> +#include <sys/msg.h> +#include <signal.h> +#include <errno.h> + +#include "zdtmtst.h"
- This file "zdtmtst.h" seems to be missing
- There is no "Makefile" in this folder
- The folder "ipc" is not aded to tools/testing/selftests/Makefile.
---
Hi, Andrew.
Looks like there are no objections against this patch set. Will you take it?
Signature · 2 lines
Best regards, Stanislav Kinsbursky