From patchwork Wed May 11 00:23:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 1444 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:52:01 -0000 Delivered-To: patches@linaro.org Received: by 10.224.61.3 with SMTP id r3cs39590qah; Tue, 10 May 2011 17:23:15 -0700 (PDT) Received: by 10.101.99.18 with SMTP id b18mr5475509anm.120.1305073395630; Tue, 10 May 2011 17:23:15 -0700 (PDT) Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx.google.com with ESMTPS id x10si20388038anx.159.2011.05.10.17.23.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 May 2011 17:23:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.154 as permitted sender) client-ip=32.97.110.154; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.154 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4B0HVbA031697; Tue, 10 May 2011 18:17:31 -0600 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p4B0NAp3235876; Tue, 10 May 2011 18:23:10 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p4B0N9Vl032579; Tue, 10 May 2011 18:23:10 -0600 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p4B0N9ki032575; Tue, 10 May 2011 18:23:09 -0600 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 0835A1E7510; Tue, 10 May 2011 17:23:09 -0700 (PDT) From: John Stultz To: LKML Cc: John Stultz , "Ted Ts'o" , KOSAKI Motohiro , David Rientjes , Dave Hansen , Andrew Morton , linux-mm@kvack.org Subject: [PATCH 2/3] printk: Add %ptc to safely print a task's comm Date: Tue, 10 May 2011 17:23:05 -0700 Message-Id: <1305073386-4810-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1305073386-4810-1-git-send-email-john.stultz@linaro.org> References: <1305073386-4810-1-git-send-email-john.stultz@linaro.org> Acessing task->comm requires proper locking. However in the past access to current->comm could be done without locking. This is no longer the case, so all comm access needs to be done while holding the comm_lock. In my attempt to clean up unprotected comm access, I've noticed most comm access is done for printk output. To simpify correct locking in these cases, I've introduced a new %ptc format, which will safely print the corresponding task's comm. Example use: printk("%ptc: unaligned epc - sending SIGBUS.\n", current); CC: Ted Ts'o CC: KOSAKI Motohiro CC: David Rientjes CC: Dave Hansen CC: Andrew Morton CC: linux-mm@kvack.org Signed-off-by: John Stultz --- lib/vsprintf.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index bc0ac6b..b9c97b8 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -797,6 +797,26 @@ char *uuid_string(char *buf, char *end, const u8 *addr, return string(buf, end, uuid, spec); } +static noinline_for_stack +char *task_comm_string(char *buf, char *end, u8 *addr, + struct printf_spec spec, const char *fmt) +{ + struct task_struct *tsk = (struct task_struct *) addr; + char *ret; + unsigned long seq; + + do { + seq = read_seqbegin(&tsk->comm_lock); + + ret = string(buf, end, tsk->comm, spec); + + } while (read_seqretry(&tsk->comm_lock, seq)); + + return ret; +} + + + int kptr_restrict = 1; /* @@ -864,6 +884,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, } switch (*fmt) { + case 't': + switch (fmt[1]) { + case 'c': + return task_comm_string(buf, end, ptr, spec, fmt); + } + break; case 'F': case 'f': ptr = dereference_function_descriptor(ptr); @@ -1151,6 +1177,7 @@ qualifier: * http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00 * %pU[bBlL] print a UUID/GUID in big or little endian using lower or upper * case. + * %ptc outputs the task's comm name * %n is ignored * * The return value is the number of characters which would