Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp777651ybt; Fri, 19 Jun 2020 13:31:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwump/9Pq/jZahoh73ImIBoaTb7seAKJYshwjEwUj0hiTDtRpmL+/6x/WEILOFwTSOh9Y3U X-Received: by 2002:a05:6402:22e4:: with SMTP id dn4mr5212262edb.288.1592598664435; Fri, 19 Jun 2020 13:31:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592598664; cv=none; d=google.com; s=arc-20160816; b=S4dhblY7oDByA5kGvZ8ntBkgOz/sgP/ie1j9DdoO3Pcp7t3KmcqPaMcMygA3X4QR+o ofZ2wRoB51FbrhZGyj5aE8xJ9lYI1C3JiidMC5bVKNBlXyhPbOelEnJpZGvv1iSS/Bnw Z0r1AGbyffv/fNyXHk6OCMYPAz7gEfgmWdPASfigPhM2iIdcoRsVadWMbCd3dhjn/5lV XKmqvTH5goruFp6F1FXvhkQZxzDXV9NT7yhrmwlEOA221uZQkUUIAL66tHMKLgwMOqsX sTQNYE9tP1GsOncdC9c87RY0ChDy25kFoO4BgwJVhMMDsQ3dLUqWUuvw2kVvJSK7OUOn tvbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jGD3ziBitVA1ZFE7XNBqfjDVVE4K9aq/SdSOF17WmCo=; b=dRq9f3+f4ljROyQAIH3lVrjydmSvJvP7RwUBQyFgwjxr3MRJTSqxrg8D3ARFvlww98 mMe7l4uzqe0a/cR1726FK0u8mwFSuCweXJxZwG9UqnF6CLn7YJTaQGOF8kmqkeI5dj1+ J4j/ngGzApLHzQBfI3eKFRaLgMQ6Oc2b2O3QBHNVnEyZ/68NmpFprQ1ZJYuINo4Ig1Of 72zpYgIcnoxT8GpQxbs9kbivAejuhY/MDcN8od4hQo6a1s0RbBnwNjjFEkofX6X4xf1s b26y752zyW1kQi8TMIn5PUGwCmRKNZ7eG9E50ikXj4PLhGDO8kjC5RRnWIcpjf9+oc76 SWfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=maYreR44; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id be28si4661900edb.525.2020.06.19.13.30.41; Fri, 19 Jun 2020 13:31:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=maYreR44; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391162AbgFSPEh (ORCPT + 99 others); Fri, 19 Jun 2020 11:04:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:33250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391159AbgFSPEe (ORCPT ); Fri, 19 Jun 2020 11:04:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 65BF521BE5; Fri, 19 Jun 2020 15:04:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579074; bh=JIa2fZ5uYzXJGrxpo4sin+agMu0xyiE7nCJ3NmMdIO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=maYreR443pKDo7tGn8kk5glVBwEm8x1UeUX5qPwihBfexWrQ9A4/KwI0+V8M4VPTU S9mXon2Y2D5Fva7wmtdj+OqrssNDliKrF7GfHPiJJabuPEtquY9V7zMX2oEWa+fXQc a3qpGKIHK0AALjofJMgBgq3WqZcO8niia3c3ntPM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnaldo Carvalho de Melo , Masami Hiramatsu , Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim Subject: [PATCH 4.19 266/267] perf probe: Check address correctness by map instead of _etext Date: Fri, 19 Jun 2020 16:34:11 +0200 Message-Id: <20200619141701.440516763@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141648.840376470@linuxfoundation.org> References: <20200619141648.840376470@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu commit 2ae5d0d7d8868df7c05c2013c0b9cddd4d40610e upstream. Since commit 03db8b583d1c ("perf tools: Fix maps__find_symbol_by_name()") introduced map address range check in maps__find_symbol_by_name(), we can not get "_etext" from kernel map because _etext is placed on the edge of the kernel .text section (= kernel map in perf.) To fix this issue, this checks the address correctness by map address range information (map->start and map->end) instead of using _etext address. This can cause an error if the target inlined function is embedded in both __init function and normal function. For exaample, request_resource() is a normal function but also embedded in __init reserve_setup(). In this case, the probe point in reserve_setup() must be skipped. However, without this fix, it failes to setup all probe points: # ./perf probe -v request_resource probe-definition(0): request_resource symbol:request_resource file:(null) line:0 offset:0 return:0 lazy:(null) 0 arguments Looking at the vmlinux_path (8 entries long) Using /usr/lib/debug/lib/modules/5.5.17-200.fc31.x86_64/vmlinux for symbols Open Debuginfo file: /usr/lib/debug/lib/modules/5.5.17-200.fc31.x86_64/vmlinux Try to find probe point from debuginfo. Matched function: request_resource [15e29ad] found inline addr: 0xffffffff82fbf892 Probe point found: reserve_setup+204 found inline addr: 0xffffffff810e9790 Probe point found: request_resource+0 Found 2 probe_trace_events. Opening /sys/kernel/debug/tracing//kprobe_events write=1 Opening /sys/kernel/debug/tracing//README write=0 Writing event: p:probe/request_resource _text+33290386 Failed to write event: Invalid argument Error: Failed to add events. Reason: Invalid argument (Code: -22) # With this fix, # ./perf probe request_resource reserve_setup is out of .text, skip it. Added new events: (null):(null) (on request_resource) probe:request_resource (on request_resource) You can now use it in all perf tools, such as: perf record -e probe:request_resource -aR sleep 1 # Fixes: 03db8b583d1c ("perf tools: Fix maps__find_symbol_by_name()") Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Masami Hiramatsu Tested-by: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Namhyung Kim Cc: stable@vger.kernel.org Link: http://lore.kernel.org/lkml/158763967332.30755.4922496724365529088.stgit@devnote2 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/probe-event.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -245,21 +245,22 @@ static void clear_probe_trace_events(str static bool kprobe_blacklist__listed(unsigned long address); static bool kprobe_warn_out_range(const char *symbol, unsigned long address) { - u64 etext_addr = 0; - int ret; + struct map *map; + bool ret = false; - /* Get the address of _etext for checking non-probable text symbol */ - ret = kernel_get_symbol_address_by_name("_etext", &etext_addr, - false, false); - - if (ret == 0 && etext_addr < address) - pr_warning("%s is out of .text, skip it.\n", symbol); - else if (kprobe_blacklist__listed(address)) + map = kernel_get_module_map(NULL); + if (map) { + ret = address <= map->start || map->end < address; + if (ret) + pr_warning("%s is out of .text, skip it.\n", symbol); + map__put(map); + } + if (!ret && kprobe_blacklist__listed(address)) { pr_warning("%s is blacklisted function, skip it.\n", symbol); - else - return false; + ret = true; + } - return true; + return ret; } /*