show: Use pr_msg for showing contents on console

Due to code sharing, especially in IPC area,
the unbinding is done via helper macros and
sysclt engine tuning (new CTL_SHOW action
added).
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: Pavel Emelyanov <xemul@parallels.com>

crtools.c

@@ -404,7 +404,6 @@ int main(int argc, char *argv[])
 		ret = cr_restore_tasks(pid, &opts);
 		break;
 	case 's':
-		log_set_loglevel(LOG_INFO);
 		ret = cr_show(pid, &opts);
 		break;
 	default:

include/sysctl.h

@@ -13,6 +13,7 @@ enum {
 	CTL_READ,
 	CTL_WRITE,
 	CTL_PRINT,
+	CTL_SHOW,
 };
 
 #define CTL_SHIFT	4	/* Up to 16 types */

include/util.h

@@ -136,14 +136,18 @@ extern void pr_info_siginfo(siginfo_t *siginfo);
 struct vma_area;
 struct list_head;
 
-extern void pr_info_vma(struct vma_area *vma_area);
+extern void pr_vma(unsigned int loglevel, struct vma_area *vma_area);
 
-#define pr_info_vma_list(head)					\
+#define pr_info_vma(vma_area)	pr_vma(LOG_INFO, vma_area)
+#define pr_msg_vma(vma_area)	pr_vma(LOG_MSG, vma_area)
+
+#define pr_vma_list(level, head)				\
 	do {							\
 		struct vma_area *vma;				\
 		list_for_each_entry(vma, head, list)		\
-			pr_info_vma(vma);			\
+			pr_vma(level, vma);			\
 	} while (0)
+#define pr_info_vma_list(head)	pr_vma_list(LOG_INFO, head)
 
 /*
  * Note since VMA_AREA_NONE = 0 we can skip assignment
@@ -252,8 +256,8 @@ int do_open_proc(pid_t pid, int flags, const char *fmt, ...);
 		__ret;							\
 	 })
 
-#define pr_img_head(type, ...)	pr_info("\n"#type __VA_ARGS__ "\n----------------\n")
-#define pr_img_tail(type)	pr_info("----------------\n")
+#define pr_img_head(type, ...)	pr_msg("\n"#type __VA_ARGS__ "\n----------------\n")
+#define pr_img_tail(type)	pr_msg("----------------\n")
 
 #define KDEV_MINORBITS	20
 #define KDEV_MINORMASK	((1UL << KDEV_MINORBITS) - 1)

ipc_ns.c

@@ -51,12 +51,12 @@ struct msgbuf_a {
 #define SEM_SET			20
 #endif
 
-static void print_ipc_desc_entry(const struct ipc_desc_entry *desc)
+static void pr_ipc_desc_entry(unsigned int loglevel, const struct ipc_desc_entry *desc)
 {
-	pr_info("id: %-10d key: 0x%08x ", desc->id, desc->key);
-	pr_info("uid: %-10d gid: %-10d ", desc->uid, desc->gid);
-	pr_info("cuid: %-10d cgid: %-10d ", desc->cuid, desc->cgid);
-	pr_info("mode: %-10o ", desc->mode);
+	print_on_level(loglevel, "id: %-10d key: 0x%08x ", desc->id, desc->key);
+	print_on_level(loglevel, "uid: %-10d gid: %-10d ", desc->uid, desc->gid);
+	print_on_level(loglevel, "cuid: %-10d cgid: %-10d ", desc->cuid, desc->cgid);
+	print_on_level(loglevel, "mode: %-10o ", desc->mode);
 }
 
 static void fill_ipc_desc(int id, struct ipc_desc_entry *desc,
@@ -71,19 +71,25 @@ static void fill_ipc_desc(int id, struct ipc_desc_entry *desc,
 	desc->mode = ipcp->mode;
 }
 
-static void print_ipc_sem_array(int nr, u16 *values)
+static void pr_ipc_sem_array(unsigned int loglevel, int nr, u16 *values)
 {
 	while(nr--)
-		pr_info("  %-5d", values[nr]);
-	pr_info("\n");
+		print_on_level(loglevel, "  %-5d", values[nr]);
+	print_on_level(loglevel, "\n");
 }
 
-static void print_ipc_sem_entry(const struct ipc_sem_entry *sem)
+#define pr_info_ipc_sem_array(nr, values)	pr_ipc_sem_array(LOG_INFO, nr, values)
+#define pr_msg_ipc_sem_array(nr, values)	pr_ipc_sem_array(LOG_MSG, nr, values)
+
+static void pr_ipc_sem_entry(unsigned int loglevel, const struct ipc_sem_entry *sem)
 {
-	print_ipc_desc_entry(&sem->desc);
-	pr_info ("nsems: %-10d\n", sem->nsems);
+	pr_ipc_desc_entry(loglevel, &sem->desc);
+	print_on_level(loglevel, "nsems: %-10d\n", sem->nsems);
 }
 
+#define pr_info_ipc_sem_entry(sem)		pr_ipc_sem_entry(LOG_INFO, sem)
+#define pr_msg_ipc_sem_entry(sem)		pr_ipc_sem_entry(LOG_MSG, sem)
+
 static int dump_ipc_sem_set(int fd, const struct ipc_sem_entry *entry)
 {
 	int ret, size;
@@ -102,7 +108,7 @@ static int dump_ipc_sem_set(int fd, const struct ipc_sem_entry *entry)
 		ret = -errno;
 		goto out;
 	}
-	print_ipc_sem_array(entry->nsems, values);
+	pr_info_ipc_sem_array(entry->nsems, values);
 
 	ret = write_img_buf(fd, values, round_up(size, sizeof(u64)));
 	if (ret < 0) {
@@ -121,7 +127,7 @@ static int dump_ipc_sem_desc(int fd, int id, const struct semid_ds *ds)
 
 	fill_ipc_desc(id, &sem.desc, &ds->sem_perm);
 	sem.nsems = ds->sem_nsems;
-	print_ipc_sem_entry(&sem);
+	pr_info_ipc_sem_entry(&sem);
 
 	ret = write_img(fd, &sem);
 	if (ret < 0) {
@@ -166,18 +172,25 @@ static int dump_ipc_sem(int fd)
 	return info.semusz;
 }
 
-static void print_ipc_msg(int nr, const struct ipc_msg *msg)
+static void pr_ipc_msg(unsigned int loglevel, int nr, const struct ipc_msg *msg)
 {
-	pr_info("  %-5d: type: %-20ld size: %-10d\n",
-		nr++, msg->mtype, msg->msize);
+	print_on_level(loglevel, "  %-5d: type: %-20ld size: %-10d\n",
+		       nr++, msg->mtype, msg->msize);
 }
 
-static void print_ipc_msg_entry(const struct ipc_msg_entry *msg)
+#define pr_info_ipc_msg(nr, msg)	pr_ipc_msg(LOG_INFO, nr, msg)
+#define pr_msg_ipc_msg(nr, msg)		pr_ipc_msg(LOG_MSG, nr, msg)
+
+static void pr_ipc_msg_entry(unsigned int loglevel, const struct ipc_msg_entry *msg)
 {
-	print_ipc_desc_entry(&msg->desc);
-	pr_info ("qbytes: %-10d qnum: %-10d\n", msg->qbytes, msg->qnum);
+	pr_ipc_desc_entry(loglevel, &msg->desc);
+	print_on_level(loglevel, "qbytes: %-10d qnum: %-10d\n",
+		       msg->qbytes, msg->qnum);
 }
 
+#define pr_info_ipc_msg_entry(msg)	pr_ipc_msg_entry(LOG_INFO, msg)
+#define pr_msg_ipc_msg_entry(msg)	pr_ipc_msg_entry(LOG_MSG, msg)
+
 static int dump_ipc_msg_queue_messages(int fd, const struct ipc_msg_entry *entry, size_t cbytes)
 {
 	void *msg_array, *ptr;
@@ -208,7 +221,7 @@ static int dump_ipc_msg_queue_messages(int fd, const struct ipc_msg_entry *entry
 		msg.msize = data->msize;
 		msg.mtype = data->mtype;
 
-		print_ipc_msg(msg_nr, &msg);
+		pr_info_ipc_msg(msg_nr, &msg);
 
 		ret = write_img(fd, &msg);
 		if (ret < 0) {
@@ -237,7 +250,7 @@ static int dump_ipc_msg_queue(int fd, int id, const struct msqid_ds *ds)
 	fill_ipc_desc(id, &msg.desc, &ds->msg_perm);
 	msg.qbytes = ds->msg_qbytes;
 	msg.qnum = ds->msg_qnum;
-	print_ipc_msg_entry(&msg);
+	pr_info_ipc_msg_entry(&msg);
 
 	ret = write_img(fd, &msg);
 	if (ret < 0) {
@@ -282,12 +295,15 @@ static int dump_ipc_msg(int fd)
 	return info.msgpool;
 }
 
-static void print_ipc_shm(const struct ipc_shm_entry *shm)
+static void pr_ipc_shm(unsigned int loglevel, const struct ipc_shm_entry *shm)
 {
-	print_ipc_desc_entry(&shm->desc);
-	pr_info("size: %-10lu\n", shm->size);
+	pr_ipc_desc_entry(loglevel, &shm->desc);
+	print_on_level(loglevel, "size: %-10lu\n", shm->size);
 }
 
+#define pr_info_ipc_shm(shm)	pr_ipc_shm(LOG_INFO, shm)
+#define pr_msg_ipc_shm(shm)	pr_ipc_shm(LOG_MSG, shm)
+
 static int ipc_sysctl_req(struct ipc_var_entry *e, int op)
 {
 	struct sysctl_req req[] = {
@@ -342,7 +358,7 @@ static int dump_ipc_shm_seg(int fd, int id, const struct shmid_ds *ds)
 
 	fill_ipc_desc(id, &shm.desc, &ds->shm_perm);
 	shm.size = ds->shm_segsz;
-	print_ipc_shm(&shm);
+	pr_info_ipc_shm(&shm);
 
 	ret = write_img(fd, &shm);
 	if (ret < 0) {
@@ -443,14 +459,9 @@ int dump_ipc_ns(int ns_pid, const struct cr_fdset *fdset)
 	return 0;
 }
 
-static void show_var_entry(struct ipc_var_entry *entry)
-{
-	ipc_sysctl_req(entry, CTL_PRINT);
-}
-
 static void show_ipc_sem_entries(int fd)
 {
-	pr_info("\nSemaphores sets:\n");
+	pr_msg("\nSemaphores sets:\n");
 	while (1) {
 		int size;
 		struct ipc_sem_entry entry;
@@ -458,14 +469,14 @@ static void show_ipc_sem_entries(int fd)
 
 		if (read_img_eof(fd, &entry) <= 0)
 			return;
-		print_ipc_sem_entry(&entry);
+		pr_msg_ipc_sem_entry(&entry);
 		size = sizeof(u16) * entry.nsems;
 		values = xmalloc(size);
 		if (values == NULL)
 			return;
 		if (read_img_buf(fd, values, round_up(size, sizeof(u64))) <= 0)
 			return;
-		print_ipc_sem_array(entry.nsems, values);
+		pr_msg_ipc_sem_array(entry.nsems, values);
 	}
 }
 
@@ -478,7 +489,7 @@ void show_ipc_sem(int fd)
 
 static void show_ipc_msg_entries(int fd)
 {
-	pr_info("\nMessage queues:\n");
+	pr_msg("\nMessage queues:\n");
 	while (1) {
 		int ret;
 		struct ipc_msg_entry entry;
@@ -488,7 +499,7 @@ static void show_ipc_msg_entries(int fd)
 		if (ret <= 0)
 			return;
 
-		print_ipc_msg_entry(&entry);
+		pr_msg_ipc_msg_entry(&entry);
 
 		while (msg_nr < entry.qnum) {
 			struct ipc_msg msg;
@@ -497,7 +508,7 @@ static void show_ipc_msg_entries(int fd)
 			if (ret <= 0)
 				return;
 
-			print_ipc_msg(msg_nr, &msg);
+			pr_msg_ipc_msg(msg_nr, &msg);
 
 			if (lseek(fd, round_up(msg.msize, sizeof(u64)),
 						SEEK_CUR) == (off_t) -1)
@@ -516,7 +527,7 @@ void show_ipc_msg(int fd)
 
 static void show_ipc_shm_entries(int fd)
 {
-	pr_info("\nShared memory segments:\n");
+	pr_msg("\nShared memory segments:\n");
 	while (1) {
 		int ret;
 		struct ipc_shm_entry shm;
@@ -525,7 +536,7 @@ static void show_ipc_shm_entries(int fd)
 		if (ret <= 0)
 			return;
 
-		print_ipc_shm(&shm);
+		pr_msg_ipc_shm(&shm);
 
 		if (lseek(fd, round_up(shm.size, sizeof(u32)), SEEK_CUR) == (off_t) -1)
 			return;
@@ -547,7 +558,7 @@ static void show_ipc_var_entry(int fd)
 	ret = read_img_eof(fd, &var);
 	if (ret <= 0)
 		return;
-	show_var_entry(&var);
+	ipc_sysctl_req(&var, CTL_SHOW);
 }
 
 void show_ipc_var(int fd)
@@ -577,7 +588,7 @@ static int prepare_ipc_sem_values(int fd, const struct ipc_sem_entry *entry)
 		goto out;
 	}
 
-	print_ipc_sem_array(entry->nsems, values);
+	pr_info_ipc_sem_array(entry->nsems, values);
 
 	ret = semctl(entry->desc.id, 0, SETALL, values);
 	if (ret < 0) {
@@ -647,7 +658,7 @@ static int prepare_ipc_sem(int pid)
 		if (ret == 0)
 			break;
 
-		print_ipc_sem_entry(&entry);
+		pr_info_ipc_sem_entry(&entry);
 
 		ret = prepare_ipc_sem_desc(fd, &entry);
 		if (ret < 0) {
@@ -674,7 +685,7 @@ static int prepare_ipc_msg_queue_messages(int fd, const struct ipc_msg_entry *en
 		if (ret <= 0)
 			return -EIO;
 
-		print_ipc_msg(msg_nr, &msg);
+		pr_info_ipc_msg(msg_nr, &msg);
 
 		if (msg.msize > MSGMAX) {
 			pr_err("Unsupported message size: %d (MAX: %d)\n",
@@ -760,7 +771,7 @@ static int prepare_ipc_msg(int pid)
 		if (ret == 0)
 			break;
 
-		print_ipc_msg_entry(&entry);
+		pr_info_ipc_msg_entry(&entry);
 
 		ret = prepare_ipc_msg_queue(fd, &entry);
 		if (ret < 0) {
@@ -852,7 +863,7 @@ static int prepare_ipc_shm(int pid)
 		if (ret == 0)
 			break;
 
-		print_ipc_shm(&shm);
+		pr_info_ipc_shm(&shm);
 
 		ret = prepare_ipc_shm_seg(fd, &shm);
 		if (ret < 0) {
@@ -879,7 +890,7 @@ static int prepare_ipc_var(int pid)
 		return -EFAULT;
 	}
 
-	show_var_entry(&var);
+	ipc_sysctl_req(&var, CTL_PRINT);
 
 	ret = ipc_sysctl_req(&var, CTL_WRITE);
 	if (ret < 0) {

sysctl.c

@@ -20,6 +20,10 @@ do {									\
 		__ret = sysctl_print_##__type(__fd, __req,		\
 					      (__type *)(__req)->arg,	\
 					      __nr);			\
+	else if (__op == CTL_PRINT)					\
+		__ret = sysctl_show_##__type(__fd, __req,		\
+					      (__type *)(__req)->arg,	\
+					      __nr);			\
 	else								\
 		__ret = -1;						\
 } while (0)
@@ -109,6 +113,21 @@ static int sysctl_print_##__type(int fd,				\
 	return 0;							\
 }
 
+#define GEN_SYSCTL_SHOW_FUNC(__type, __fmt)				\
+static int sysctl_show_##__type(int fd,					\
+				 struct sysctl_req *req,		\
+				 __type *arg,				\
+				 int nr)				\
+{									\
+	int i;								\
+	pr_msg("sysctl: <%s> = <", req->name);				\
+	for (i = 0; i < nr; i++)					\
+		pr_msg(__fmt, arg[i]);					\
+	pr_msg(">\n");							\
+									\
+	return 0;							\
+}
+
 GEN_SYSCTL_READ_FUNC(u32, strtoul);
 GEN_SYSCTL_READ_FUNC(u64, strtoull);
 
@@ -119,6 +138,10 @@ GEN_SYSCTL_PRINT_FUNC(u32, "%u ");
 GEN_SYSCTL_PRINT_FUNC(u64, "%lu ");
 GEN_SYSCTL_PRINT_FUNC(char, "%c");
 
+GEN_SYSCTL_SHOW_FUNC(u32, "%u ");
+GEN_SYSCTL_SHOW_FUNC(u64, "%lu ");
+GEN_SYSCTL_SHOW_FUNC(char, "%c");
+
 static int
 sysctl_write_char(int fd, struct sysctl_req *req, char *arg, int nr)
 {
@@ -195,7 +218,7 @@ int sysctl_op(struct sysctl_req *req, int op)
 	int ret = 0;
 	int dir = -1;
 
-	if (op != CTL_PRINT) {
+	if (op != CTL_PRINT && op != CTL_SHOW) {
 		dir = open("/proc/sys", O_RDONLY);
 		if (dir < 0) {
 			pr_perror("Can't open sysctl dir");

util.c

@@ -57,29 +57,29 @@ void pr_info_siginfo(siginfo_t *siginfo)
 		siginfo->si_signo, siginfo->si_errno, siginfo->si_code);
 }
 
-void pr_info_vma(struct vma_area *vma_area)
+void pr_vma(unsigned int loglevel, struct vma_area *vma_area)
 {
 	if (!vma_area)
 		return;
 
-	pr_info("s: %16lx e: %16lx l: %4liK p: %8x f: %8x pg: %8lx "
-		"vf: %s st: %s spc: %s\n",
-		vma_area->vma.start, vma_area->vma.end,
-		KBYTES(vma_area_len(vma_area)),
-		vma_area->vma.prot,
-		vma_area->vma.flags,
-		vma_area->vma.pgoff,
-		vma_area->vm_file_fd < 0 ? "n" : "y",
-		!vma_area->vma.status ? "--" :
-		((vma_area->vma.status & VMA_FILE_PRIVATE) ? "FP" :
-		 ((vma_area->vma.status & VMA_FILE_SHARED) ? "FS" :
-		  ((vma_area->vma.status & VMA_ANON_SHARED) ? "AS" :
-		   ((vma_area->vma.status & VMA_ANON_PRIVATE) ? "AP" : "--")))),
-		!vma_area->vma.status ? "--" :
-		((vma_area->vma.status & VMA_AREA_STACK) ? "stack" :
-		 ((vma_area->vma.status & VMA_AREA_HEAP) ? "heap" :
-		  ((vma_area->vma.status & VMA_AREA_VSYSCALL) ? "vsyscall" :
-		   ((vma_area->vma.status & VMA_AREA_VDSO) ? "vdso" : "n")))));
+	print_on_level(loglevel, "s: %16lx e: %16lx l: %4liK p: %8x f: %8x pg: %8lx "
+		       "vf: %s st: %s spc: %s\n",
+		       vma_area->vma.start, vma_area->vma.end,
+		       KBYTES(vma_area_len(vma_area)),
+		       vma_area->vma.prot,
+		       vma_area->vma.flags,
+		       vma_area->vma.pgoff,
+		       vma_area->vm_file_fd < 0 ? "n" : "y",
+		       !vma_area->vma.status ? "--" :
+		       ((vma_area->vma.status & VMA_FILE_PRIVATE) ? "FP" :
+			((vma_area->vma.status & VMA_FILE_SHARED) ? "FS" :
+			 ((vma_area->vma.status & VMA_ANON_SHARED) ? "AS" :
+			  ((vma_area->vma.status & VMA_ANON_PRIVATE) ? "AP" : "--")))),
+		       !vma_area->vma.status ? "--" :
+		       ((vma_area->vma.status & VMA_AREA_STACK) ? "stack" :
+			((vma_area->vma.status & VMA_AREA_HEAP) ? "heap" :
+			 ((vma_area->vma.status & VMA_AREA_VSYSCALL) ? "vsyscall" :
+			  ((vma_area->vma.status & VMA_AREA_VDSO) ? "vdso" : "n")))));
 }
 
 int close_safe(int *fd)