From patchwork Fri Feb 26 01:20:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12105507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 867BBC433E0 for ; Fri, 26 Feb 2021 01:20:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1116464F33 for ; Fri, 26 Feb 2021 01:20:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1116464F33 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9028D6B00D4; Thu, 25 Feb 2021 20:20:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B2B46B00D5; Thu, 25 Feb 2021 20:20:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C9426B00D6; Thu, 25 Feb 2021 20:20:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0225.hostedemail.com [216.40.44.225]) by kanga.kvack.org (Postfix) with ESMTP id 62C226B00D4 for ; Thu, 25 Feb 2021 20:20:48 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 24E12181C8591 for ; Fri, 26 Feb 2021 01:20:48 +0000 (UTC) X-FDA: 77858664576.09.AF1CC16 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf29.hostedemail.com (Postfix) with ESMTP id B7217E4 for ; Fri, 26 Feb 2021 01:20:47 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 7516964F37; Fri, 26 Feb 2021 01:20:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1614302446; bh=RIFWirqVoySBFQi0YuQBdwuuYD+3im2cq5Fc5C2gp9M=; h=Date:From:To:Subject:In-Reply-To:From; b=JM2/8YP7+jksG/fytmuOKE+yEwsG8yy2bNO4GTTxXwyBUGl8t0idLo+MQqCE2b05n 0r43jZWzEMWTot8IzSQZHwn37kG1+xDlEQV5qSJcwh7lvhdoNYIl4RhSBmjm7/bxoL 3IjczXPbU6TwEmuKg38dzUdHniFwLH6Z6ZLaiB60= Date: Thu, 25 Feb 2021 17:20:45 -0800 From: Andrew Morton To: adobriyan@gmail.com, akpm@linux-foundation.org, deller@gmx.de, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 083/118] proc/wchan: use printk format instead of lookup_symbol_name() Message-ID: <20210226012045.H_Iz_JaD3%akpm@linux-foundation.org> In-Reply-To: <20210225171452.713967e96554bb6a53e44a19@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: B7217E4 X-Stat-Signature: 99qenyxpqfqp3j4td8jc18qawihei3an Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf29; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614302447-614010 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Helge Deller Subject: proc/wchan: use printk format instead of lookup_symbol_name() To resolve the symbol fuction name for wchan, use the printk format specifier %ps instead of manually looking up the symbol function name via lookup_symbol_name(). Link: https://lkml.kernel.org/r/20201217165413.GA1959@ls3530.fritz.box Signed-off-by: Helge Deller Cc: Alexey Dobriyan Signed-off-by: Andrew Morton --- fs/proc/base.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) --- a/fs/proc/base.c~proc-wchan-use-printk-format-instead-of-lookup_symbol_name +++ a/fs/proc/base.c @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -386,19 +385,17 @@ static int proc_pid_wchan(struct seq_fil struct pid *pid, struct task_struct *task) { unsigned long wchan; - char symname[KSYM_NAME_LEN]; - if (!ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS)) - goto print0; + if (ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS)) + wchan = get_wchan(task); + else + wchan = 0; + + if (wchan) + seq_printf(m, "%ps", (void *) wchan); + else + seq_putc(m, '0'); - wchan = get_wchan(task); - if (wchan && !lookup_symbol_name(wchan, symname)) { - seq_puts(m, symname); - return 0; - } - -print0: - seq_putc(m, '0'); return 0; } #endif /* CONFIG_KALLSYMS */