Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752168Ab1EKAXV (ORCPT ); Tue, 10 May 2011 20:23:21 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:41787 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752083Ab1EKAXN (ORCPT ); Tue, 10 May 2011 20:23:13 -0400 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2472 Lines: 84 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 -- 1.7.3.2.146.gca209 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/