From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2209064-1524730324-2-4151041069486164907 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES endaro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='utf-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1524730324; b=U+Wwvxh5r3lkRuBj25OWtcNUsVwAunQyWC5eL8ylydPCMoOrXM U/PJHpq8KD40+jQqpWZlfgqsPVMd3m/PH928V+7eZKX2fat+tdkzNmZv6F6ZY+U6 qkqZifbPFebGFfj6hAY8TQbrGgXJvj6Otzi9N9n80nUfkUcib4xZjb1DnItxlOs4 wkjcl1JcSlKqTF3VIlKRmyDn00+Kb/rZtfpmzGCKx7Ta/qJQNIKpzeU0ySdgmf69 QZW57MdNil75Hg6yXYMyjfIPDHjD0UjHYDebEaRGZefQXa54CxNxnamy/VspLV8t bm8juh0/A0a91N/tW+P+MyFAqbEOQ9jQQThw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding:sender:list-id; s=fm2; t=1524730324; bh=Emk5t4COnT75B63F3shf1+n2HqWxYVt/mMYcb0hLjCg=; b=SDNPVb5c4rpj 6raSVBjKz4p8hznbwzyu7/KaLgqwKg3myw59kMwvX37nEu++nezEBrJaBRuPkk+x ZcjHnFpKo8pb7AULL7/b9PxgRXkRjxhVbfdyNDgp8hGLcWFIm8HoAeJvLQFsYedZ KAQZVreEufbAhLIPXFcCkRSVIACbMsJ+EXdFg7wA93oobj+2NE9iJTV8lZeA8mYB tkfDqU6CaT1zue7sdg0X3bU4GeuG1GIbLuuo6FbbQaaJpYkuau1zTR4HU9LIlwps dmzC7vKkkrq457a1eHtFXk73E46veWWk+aNzBu+TsWzSiHbScUHlTIuH559otIkt mrxmskh75A== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=kernel.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=orgdomain_pass (Domain org match); x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=kernel.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=kernel.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=orgdomain_pass (Domain org match); x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=kernel.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfFhibdYGfspCr4/fDITUiaeY8B8ZkOOMGJzuoOj2fZ6u5PC7x6YrhnxdCvac3/HzqzadB1/HHNBv++pNKX3HcLRaMPXiBhppfoUkpmK1LMlpMShT61LQ 1EoWZXeeE/HzmBZdxWjmbLG5FXaV78nevUptx+noFV9RJkli1mC6Y+/QKkOfUF1wty9/OH4ii3v/q8oyTvfhRFhY1CA+zTtKBX6WgbirVBthWMAgAi7eySAD X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=VwQbUJbxAAAA:8 a=34FZtt5sH-iwMvU2J7IA:9 a=fMUUyhbYWDDmsi4t:21 a=xPkGj4zQBENzrIrD:21 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754391AbeDZIKD (ORCPT ); Thu, 26 Apr 2018 04:10:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:34908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754128AbeDZIJ6 (ORCPT ); Thu, 26 Apr 2018 04:09:58 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3031021781 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org From: Masami Hiramatsu To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Ingo Molnar , "H . Peter Anvin" , x86@kernel.org, Masami Hiramatsu , Ananth N Mavinakayanahalli , Anil S Keshavamurthy , "David S . Miller" , Jon Medhurst , Will Deacon , Arnd Bergmann , David Howells , Heiko Carstens , "Tobin C . Harding" , Linus Torvalds , Thomas Richter , akpm@linux-foundation.org, acme@kernel.org, rostedt@goodmis.org, brueckner@linux.vnet.ibm.com, schwidefsky@de.ibm.com, stable@vger.kernel.org Subject: [PATCH -tip v2 3/7] kprobes: Show address of kprobes if kallsyms does Date: Thu, 26 Apr 2018 17:09:33 +0900 Message-Id: <152473017303.8819.1403957389248242878.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <152473007907.8819.10449983839199591406.stgit@devbox> References: <152473007907.8819.10449983839199591406.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Show probed address in debugfs kprobe list file as same as kallsyms does. This information is used for checking kprobes are placed in the expected address. So it should be able to compared with address in kallsyms. Signed-off-by: Masami Hiramatsu --- kernel/kprobes.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index e7d7e3e8598a..94af7c99cf81 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -2326,6 +2326,7 @@ static void report_probe(struct seq_file *pi, struct kprobe *p, const char *sym, int offset, char *modname, struct kprobe *pp) { char *kprobe_type; + void *addr = p->addr; if (p->pre_handler == pre_handler_kretprobe) kprobe_type = "r"; @@ -2334,13 +2335,16 @@ static void report_probe(struct seq_file *pi, struct kprobe *p, else kprobe_type = "k"; + if (!kallsyms_show_value()) + addr = NULL; + if (sym) - seq_printf(pi, "%p %s %s+0x%x %s ", - p->addr, kprobe_type, sym, offset, + seq_printf(pi, "%px %s %s+0x%x %s ", + addr, kprobe_type, sym, offset, (modname ? modname : " ")); - else - seq_printf(pi, "%p %s %p ", - p->addr, kprobe_type, p->addr); + else /* try to use %pS */ + seq_printf(pi, "%px %s %pS ", + addr, kprobe_type, p->addr); if (!pp) pp = p;