[CRIU] [crtools-bot for Kinsbursky Stanislav ] IPC: dump message
queue
Cyrill Gorcunov
gorcunov at openvz.org
Tue Feb 14 08:08:58 EST 2012
The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit da15281120c04023cccae8e8720a0da0717bfe3d
Author: Kinsbursky Stanislav <skinsbursky at openvz.org>
Date: Mon Feb 13 20:27:35 2012 +0300
IPC: dump message queue
v2: New "MSG_STEAL" functionality is used
Signed-off-by: Stanislav Kinsbursky <skinsbursky at openvz.org>
Acked-by: Pavel Emelyanov <xemul at parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
crtools.c | 6 ++
include/crtools.h | 3 +
include/image.h | 14 ++++
ipc_ns.c | 151 ++++++++++++++++++++++++++++++++++------
test/zdtm/live/static/msgque.c | 7 ++
5 files changed, 160 insertions(+), 21 deletions(-)
diff --git a/crtools.c b/crtools.c
index c43eeab..fee18ef 100644
--- a/crtools.c
+++ b/crtools.c
@@ -122,6 +122,12 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
.fmt = FMT_FNAME_IPCNS_SHM,
.magic = IPCNS_SHM_MAGIC,
},
+
+ /* IPC namespace message queues */
+ [CR_FD_IPCNS_MSG] = {
+ .fmt = FMT_FNAME_IPCNS_MSG,
+ .magic = IPCNS_MSG_MAGIC,
+ },
};
static struct cr_fdset *alloc_cr_fdset(void)
diff --git a/include/crtools.h b/include/crtools.h
index cf7a46b..231ea7a 100644
--- a/include/crtools.h
+++ b/include/crtools.h
@@ -39,6 +39,7 @@ enum {
CR_FD_UTSNS,
CR_FD_IPCNS_VAR,
CR_FD_IPCNS_SHM,
+ CR_FD_IPCNS_MSG,
CR_FD_MAX
};
@@ -82,6 +83,7 @@ extern struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX];
#define FMT_FNAME_UTSNS "utsns-%d.img"
#define FMT_FNAME_IPCNS_VAR "ipcns-var-%d.img"
#define FMT_FNAME_IPCNS_SHM "ipcns-shm-%d.img"
+#define FMT_FNAME_IPCNS_MSG "ipcns-msg-%d.img"
extern int get_image_path(char *path, int size, const char *fmt, int pid);
@@ -114,6 +116,7 @@ struct cr_fdset {
#define CR_FD_DESC_NS (\
CR_FD_DESC_USE(CR_FD_UTSNS) |\
CR_FD_DESC_USE(CR_FD_IPCNS_VAR) |\
+ CR_FD_DESC_USE(CR_FD_IPCNS_MSG) |\
CR_FD_DESC_USE(CR_FD_IPCNS_SHM) )
#define CR_FD_DESC_NONE (0)
diff --git a/include/image.h b/include/image.h
index ecf3aad..259caf8 100644
--- a/include/image.h
+++ b/include/image.h
@@ -23,6 +23,7 @@
#define CREDS_MAGIC 0x54023547 /* Kozelsk */
#define IPCNS_VAR_MAGIC 0x53115007 /* Samara */
#define IPCNS_SHM_MAGIC 0x46283044 /* Odessa */
+#define IPCNS_MSG_MAGIC 0x55453737 /* Moscow */
#define PIPEFS_MAGIC 0x50495045
@@ -142,6 +143,19 @@ struct ipc_shm_entry {
u64 size;
} __packed;
+struct ipc_msg {
+ u64 mtype;
+ u32 msize;
+ u8 pad[4];
+} __packed;
+
+struct ipc_msg_entry {
+ struct ipc_desc_entry desc;
+ u16 qbytes;
+ u16 qnum;
+ u8 pad[4];
+} __packed;
+
#define VMA_AREA_NONE (0 << 0)
#define VMA_AREA_REGULAR (1 << 0) /* Dumpable area */
#define VMA_AREA_STACK (1 << 1)
diff --git a/ipc_ns.c b/ipc_ns.c
index f9e19bf..7c251a7 100644
--- a/ipc_ns.c
+++ b/ipc_ns.c
@@ -27,6 +27,23 @@
#define SHM_SET 15
#endif
+#ifndef MSGMAX
+#define MSGMAX 8192
+#endif
+
+#ifndef MSG_STEAL
+
+#define MSG_STEAL 040000
+
+/* message buffer for msgrcv in case of array calls */
+struct msgbuf_a {
+ long mtype; /* type of message */
+ size_t msize; /* size of message */
+ char mtext[0]; /* message text */
+};
+
+#endif
+
static void print_ipc_desc_entry(const struct ipc_desc_entry *desc)
{
pr_info("id: %-10d key: 0x%08x ", desc->id, desc->key);
@@ -47,6 +64,118 @@ static void fill_ipc_desc(int id, struct ipc_desc_entry *desc,
desc->mode = ipcp->mode;
}
+static void print_ipc_msg(int nr, const struct ipc_msg *msg)
+{
+ pr_info(" %-5d: type: %-20ld size: %-10d\n",
+ nr++, msg->mtype, msg->msize);
+}
+
+static void print_ipc_msg_entry(const struct ipc_msg_entry *msg)
+{
+ print_ipc_desc_entry(&msg->desc);
+ pr_info ("qbytes: %-10d qnum: %-10d\n", msg->qbytes, msg->qnum);
+}
+
+static int dump_ipc_msg_queue_messages(int fd, const struct ipc_msg_entry *entry, size_t cbytes)
+{
+ void *msg_array, *ptr;
+ size_t array_size;
+ int ret, msg_nr = 0;
+
+ array_size = entry->qnum * sizeof(struct msgbuf_a) + cbytes;
+ msg_array = ptr = xmalloc(array_size);
+ if (msg_array == NULL) {
+ pr_err("Failed to allocate memory for IPC messages\n");
+ return -ENOMEM;
+ }
+
+ ret = msgrcv(entry->desc.id, msg_array, array_size, 0, IPC_NOWAIT | MSG_STEAL);
+ if (ret < 0) {
+ pr_perror("Failed to receive IPC messages array");
+ goto err;
+ }
+
+ while (msg_nr < entry->qnum) {
+ struct msgbuf_a *data = ptr;
+ struct ipc_msg msg;
+
+ msg.msize = data->msize;
+ msg.mtype = data->mtype;
+
+ print_ipc_msg(msg_nr, &msg);
+
+ ret = write_img(fd, &msg);
+ if (ret < 0) {
+ pr_err("Failed to write IPC message header\n");
+ break;
+ }
+ ret = write_img_buf(fd, data->mtext, round_up(msg.msize, sizeof(u64)));
+ if (ret < 0) {
+ pr_err("Failed to write IPC message data\n");
+ break;
+ }
+ msg_nr++;
+ ptr += sizeof(struct msgbuf_a) + data->msize;
+ }
+ ret = 0;
+err:
+ xfree(msg_array);
+ return ret;
+}
+
+static int dump_ipc_msg_queue(int fd, int id, const struct msqid_ds *ds)
+{
+ struct ipc_msg_entry msg;
+ int ret;
+
+ fill_ipc_desc(id, &msg.desc, &ds->msg_perm);
+ msg.qbytes = ds->msg_qbytes;
+ msg.qnum = ds->msg_qnum;
+ print_ipc_msg_entry(&msg);
+
+ ret = write_img(fd, &msg);
+ if (ret < 0) {
+ pr_err("Failed to write IPC message queue\n");
+ return ret;
+ }
+ return dump_ipc_msg_queue_messages(fd, &msg, ds->msg_cbytes);
+}
+
+static int dump_ipc_msg(int fd)
+{
+ int i, maxid;
+ struct msginfo info;
+ int err, slot;
+
+ maxid = msgctl(0, MSG_INFO, (struct msqid_ds *)&info);
+ if (maxid < 0) {
+ pr_perror("msgctl failed");
+ return -errno;
+ }
+
+ pr_info("IPC message queues: %d\n", info.msgpool);
+ for (i = 0, slot = 0; i <= maxid; i++) {
+ struct msqid_ds ds;
+ int id, ret;
+
+ id = msgctl(i, MSG_STAT, &ds);
+ if (id < 0) {
+ if (errno == EINVAL)
+ continue;
+ pr_perror("Failed to get stats for IPC message queue");
+ break;
+ }
+ ret = dump_ipc_msg_queue(fd, id, &ds);
+ if (!ret)
+ slot++;
+ }
+ if (slot != info.msgpool) {
+ pr_err("Failed to collect %d (only %d succeeded)\n", info.msgpool, slot);
+ return -EFAULT;
+ }
+ return info.msgpool;
+}
+
static void print_ipc_shm(const struct ipc_shm_entry *shm)
{
print_ipc_desc_entry(&shm->desc);
@@ -74,26 +203,6 @@ static int ipc_sysctl_req(struct ipc_var_entry *e, int op)
return sysctl_op(req, op);
}
-static int dump_ipc_msg(void *data)
-{
- struct msginfo info;
- int ret;
- int fd;
-
- ret = msgctl(0, MSG_INFO, (struct msqid_ds *)&info);
- if (ret < 0) {
- pr_perror("msgctl failed");
- return ret;
- }
-
- if (ret) {
- pr_err("IPC messages migration is not supported yet\n");
- return -EINVAL;
- }
-
- return 0;
-}
-
static int dump_ipc_sem(void *data)
{
int ret;
@@ -226,7 +335,7 @@ static int dump_ipc_data(const struct cr_fdset *fdset)
ret = dump_ipc_shm(fdset->fds[CR_FD_IPCNS_SHM]);
if (ret < 0)
return ret;
- ret = dump_ipc_msg(0);
+ ret = dump_ipc_msg(fdset->fds[CR_FD_IPCNS_MSG]);
if (ret < 0)
return ret;
ret = dump_ipc_sem(0);
diff --git a/test/zdtm/live/static/msgque.c b/test/zdtm/live/static/msgque.c
index e56ac8d..20bc4a4 100644
--- a/test/zdtm/live/static/msgque.c
+++ b/test/zdtm/live/static/msgque.c
@@ -86,6 +86,13 @@ static int test_fn(int argc, char **argv)
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();
More information about the CRIU
mailing list