public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: Igor Mammedov <imammedo@redhat.com>
Cc: Jiang Liu <liuj97@gmail.com>,
	linux-kernel@vger.kernel.org, mingo@kernel.org, pjt@google.com,
	tglx@linutronix.de, seto.hidetoshi@jp.fujitsu.com,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [RFC][PATCH] printk: Add %pb to print bitmaps
Date: Wed, 09 May 2012 15:27:23 +0200	[thread overview]
Message-ID: <1336570043.2527.38.camel@twins> (raw)
In-Reply-To: <1336566644.2527.33.camel@twins>

On Wed, 2012-05-09 at 14:30 +0200, Peter Zijlstra wrote:
> on a related note, we should add a printk-%p modifier for cpulist,
> this cpulist_scnprintf() stuff gets annoying. 

Something like so I guess.. I'll try and convert some of the sched_debug
code to test it..

---
 lib/vsprintf.c |   36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index abbabec..90bfcd1 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -25,6 +25,9 @@
 #include <linux/kallsyms.h>
 #include <linux/uaccess.h>
 #include <linux/ioport.h>
+#include <linux/bitmap.h>
+#include <linux/cpumask.h>
+#include <linux/numa.h>
 #include <net/addrconf.h>
 
 #include <asm/page.h>		/* for PAGE_SIZE */
@@ -857,15 +860,19 @@ int kptr_restrict __read_mostly;
  *       correctness of the format string and va_list arguments.
  * - 'K' For a kernel pointer that should be hidden from unprivileged users
  * - 'NF' For a netdev_features_t
+ * - 'b' For a bitmap, consumes 2 args, second is int
+ * - 'bc' For a cpumask
+ * - 'bn' For a nodemask
  *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
  * pointer to the real address.
  */
-static noinline_for_stack
-char *pointer(const char *fmt, char *buf, char *end, void *ptr,
-	      struct printf_spec spec)
+static noinline_for_stack 
+char *pointer(const char *fmt, char *buf, char *end, va_list args, struct printf_spec spec)
 {
+	void *ptr = va_arg(args, void *);
+
 	if (!ptr && *fmt != 'K') {
 		/*
 		 * Print (null) with the same width as a pointer so it makes
@@ -941,6 +948,26 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
 			return netdev_feature_string(buf, end, ptr, spec);
 		}
 		break;
+	case 'b':
+		{
+			int bits, len;
+
+			switch (fmt[1]) {
+			case 'c':
+				bits = nr_cpumask_bits;
+				break;
+			case 'n':
+				bits = MAX_NUMNODES;
+				break;
+			default:
+				bits = va_arg(args, int);
+				break;
+			}
+		       
+			len = bitmap_scnlistprintf(buf, end - buf, ptr, bits);
+
+			return buf + len;
+		}
 	}
 	spec.flags |= SMALL;
 	if (spec.field_width == -1) {
@@ -1261,8 +1288,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
 			break;
 
 		case FORMAT_TYPE_PTR:
-			str = pointer(fmt+1, str, end, va_arg(args, void *),
-				      spec);
+			str = pointer(fmt+1, str, end, args, spec);
 			while (isalnum(*fmt))
 				fmt++;
 			break;


  reply	other threads:[~2012-05-09 13:28 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-09 10:38 [PATCH] sched_groups are expected to be circular linked list, make it so right after allocation Igor Mammedov
2012-05-09 10:21 ` Jiang Liu
2012-05-09 11:44   ` Igor Mammedov
2012-05-09 11:52     ` Peter Zijlstra
2012-05-09 11:58       ` Igor Mammedov
2012-05-09 12:21         ` Peter Zijlstra
2012-05-09 12:22           ` Peter Zijlstra
2012-05-09 12:35             ` Igor Mammedov
2012-05-09 12:30           ` Peter Zijlstra
2012-05-09 13:27             ` Peter Zijlstra [this message]
2012-05-09 13:29               ` [RFC][PATCH] printk: Add %pb to print bitmaps Peter Zijlstra
2012-05-09 13:36               ` Ingo Molnar
2012-05-09 13:44                 ` Peter Zijlstra
2012-05-09 13:59                   ` Peter Zijlstra
2012-05-09 14:15                     ` Ingo Molnar
2012-05-09 14:24                       ` Peter Zijlstra
2012-05-09 15:32                       ` Peter Zijlstra
2012-05-09 15:41                         ` Ingo Molnar
2012-05-09 16:06                           ` Peter Zijlstra
2012-05-09 16:39                             ` Joe Perches
2012-05-09 17:22                               ` Ingo Molnar
2012-05-09 17:24                             ` Ingo Molnar
2012-05-09 17:25                               ` Peter Zijlstra
2012-05-09 17:31                                 ` Ingo Molnar
2012-05-09 14:19                     ` Joe Perches
2012-05-09 15:34                       ` Ingo Molnar
2012-05-09 17:15               ` Linus Torvalds
2012-05-09 17:22                 ` Peter Zijlstra
2012-05-09 17:26                   ` Ingo Molnar
2012-05-09 17:30                     ` Peter Zijlstra
2012-05-09 19:07               ` Andrew Morton
2012-05-09 20:58                 ` Peter Zijlstra
2012-05-10  7:45                   ` Ingo Molnar
2012-05-10 13:26             ` [PATCH] sched_groups are expected to be circular linked list, make it so right after allocation Igor Mammedov
2012-05-10 13:45               ` Peter Zijlstra
2012-05-10 17:01                 ` Igor Mammedov
2012-05-10 17:33                   ` Peter Zijlstra
2012-05-09 10:35 ` [tip:sched/urgent] sched: Fix KVM and ia64 boot crash due to sched_groups circular linked list assumption tip-bot for Igor Mammedov
2012-05-09 11:41 ` [PATCH] sched_groups are expected to be circular linked list, make it so right after allocation Peter Zijlstra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1336570043.2527.38.camel@twins \
    --to=peterz@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=imammedo@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=liuj97@gmail.com \
    --cc=mingo@kernel.org \
    --cc=pjt@google.com \
    --cc=seto.hidetoshi@jp.fujitsu.com \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox