From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 897EBC7EE30 for ; Tue, 28 Feb 2023 09:33:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B3626B0071; Tue, 28 Feb 2023 04:33:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 264266B0072; Tue, 28 Feb 2023 04:33:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 104D76B0073; Tue, 28 Feb 2023 04:33:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 029586B0071 for ; Tue, 28 Feb 2023 04:33:08 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BCF92A5B78 for ; Tue, 28 Feb 2023 09:33:07 +0000 (UTC) X-FDA: 80516186814.26.6F15948 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id 207D31C001F for ; Tue, 28 Feb 2023 09:33:05 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=m6kPxmfU; spf=pass (imf18.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677576786; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=21ZcV3iop64YVxmHDxSZ9xcbaXWaQmOe/vXsohNTMmc=; b=Z2EkHBdCF24+438KWWCFMn3kjBrD4qDMCPThVoV06++tfbZNCTiz2pz8JJsikF4xTC99oA NXR0aNNjNMu2hJxYB1aFzHPA3OuPNwoq6UTS4nrf+jA3Mbchz5Q/MFC/FFCOmAMoQFcYM/ fIdISYyPc6aw9us5NL/3Qc9Bttgoo0g= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=m6kPxmfU; spf=pass (imf18.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677576786; a=rsa-sha256; cv=none; b=72Gzpxe/pX2SzeA+BWN/dtmA7GUzpahzOsDVmb4byAlc7CYXSAQyVKULEZSKC+yrBrKJY8 59fMPz3S7wNOJbpjAghFaeyhZbW0zCUyRUyVSI8YEjJQWfvNoAXQMLZy3e90IbxDcBJVuA XKUswlGvxQWrNi5BwgOOE7OlR0bnJmA= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4B27461037; Tue, 28 Feb 2023 09:33:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB3D7C433EF; Tue, 28 Feb 2023 09:32:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677576785; bh=QJB3wPU2HWgjAFGuMz7NkbXXZcNkRHN6drkDJ+SyIYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m6kPxmfUjqBPyP1zjk/AUvq0/knP93c2G+bJV20AAk00Bn5Qy1ceLoPdeWzhhd66V C9PoDgaO8rIzmIHx+zhN6nkA+kRPYAwGKfC1VDZEgYNjMAhQbGB0eypPdGJFHD2N2y vaePjn5SoDDn0dEkIf75C8Pfa7RvzbalnvALHj9mvgHJy8WdgTPhm9JEmabCzuuo/k fDGJm19tk2+IfAuCsGapu6TbdLHo4eP/EqBsqwW6qqkL/Lc0+Fv/y1RTxYHDh8tlHE GkDspDLRDbIm19taZ2SguntVqk7d/0F/NViAB3I+CONr1oBs9FaKr8W63nBjkqhJNr LtdzQ20YTBC/w== From: Jiri Olsa To: Alexei Starovoitov , Andrii Nakryiko , Hao Luo , Andrew Morton , Alexander Viro , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Matthew Wilcox Cc: bpf@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-perf-users@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Daniel Borkmann , Namhyung Kim Subject: [PATCH RFC v2 bpf-next 4/9] libbpf: Allow to resolve binary path in current directory Date: Tue, 28 Feb 2023 10:32:01 +0100 Message-Id: <20230228093206.821563-5-jolsa@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228093206.821563-1-jolsa@kernel.org> References: <20230228093206.821563-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 207D31C001F X-Stat-Signature: 5p9hmhgt63dqziouueebey4zzpmzkzci X-HE-Tag: 1677576785-417288 X-HE-Meta: U2FsdGVkX1+pGlGcOuQoLnq2hvZMo+Gn/t6UCz95OUHoy3RtDLVdd9yOKzvhro8BwNF9t2lNNSS+0/QhygXX3eupI/0pAM6ZpN/7IZ4HkWKEp4SG5fMsch4Om+hsQUEN+8Rxl3cNNAdCl0rkT1Y1dkpSCq+AmawNfpty33UwPVNdVUGnoR1eDra9B5kzbocOt0Z0/UFwoAe1aLlPkG6iJ99o7A53bR2KM2iRkpKf5C1E0NKHheeJXlFqwX38itfTeeHrar3XX06b7P59sFtz/FG103jWbbpMViW5vJCe4vSxVgzL8a/7T24xnfkzEw6wTLl3Qpc/V0QWVzX2p2xNiU16117sgLD2yFqY/WJZGWgGUp0N6bPqkehcvPwU0F7/IGaIrvj/8ORhH9BEBzBCJ+q49B4o7evX+x6sewBLgfVWKNtylpCnooq8X9q/NmsC0khbKOk4o7lUoFYXfTu07YULphGNUUTFysTa/e5a9Ffbu8GEDTlaZpBE/DoGyV3KlbbkKuW8AhdcNB7+/03nholcEA2IUnr7FEMQeRRFWYG+g6BEWy3ODRgTepMNPJQ1tBhpuK/PuIRw6JzR9scMf/VZnG67MRHm91fXKXKUhAo5JE+AC4Pe5G4q5lhtdk+N6/CcqVh0S6u3cnU0uSeCJ1R0cpc/L3Ehbajuv14m62AjuzOhuQaZy1eg/+QleKOrZP3lGza6sNVh+4bXLvBFSBO0lpdjsa0IWDmc9d4DABbLIWcNNwBvOe2G+Rq4ol3QdIL9pp135iK5GlKvjihyVucgYleasFwzHCo/qO09GxbcME/JYX51TNsqtkmitnuuKs3wZ8dq1WrRYXjJrCu1fMkgsOpucrF2XRXiqZzjMWSd5H/ZsKpIWcW6ByURi04d1ssv40hxwZ9T1x2Km7y9T4uSYLZxXBPtvGeI0dnWN3f4pcAxlXYIqOK0/mXAQMXkE5Byxxr8xnBwjvywnfz 2i+Jxpmf vaLlHXZ6Wc0XtD2pCobfZbpSesJiSPzTn2e0+jXDCEMh/o8wqptfczTfAYMdP7Dsj0qWFjujMZbXxATnvhKI2G9UzcLu2Uyb677zzY9lsgJtcEZpIOtEiGHeFAWBntR4qb19XEg6CYa+MI5TlAG8kzHgkEfQMz2SYA4lrPG+w95PCh7B0w1qhlgaE2zAZl0/6YwX6NlBnzc/z/HH/TTpIRAFrxtr2TrYaJPvdiIpPtVmZwLpVMbnqxrjz2qLxZrjh9JUT1ezQtrEtTt0fjwVSDc2NZLhmK2f7Z7NPmPxQ2wbxpm9RbJT0/M1CAUXQxlh3+qNCUAetBQR3VE9FkkO1IyFRiFmSD2/R2HdqQNVuHdU+Bwr9Gk/LFwoowDA2dMkm8q4WnhJPUw0WUKs8oNghpiCxrtLHYTQadURMwYnGq5jnz0g= 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: Try to resolve uprobe/usdt binary path also in current directory, it's used in the test code in following changes. Signed-off-by: Jiri Olsa --- tools/lib/bpf/libbpf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 05c4db355f28..f72115e8b7f9 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -10727,17 +10727,19 @@ static const char *arch_specific_lib_paths(void) /* Get full path to program/shared library. */ static int resolve_full_path(const char *file, char *result, size_t result_sz) { - const char *search_paths[3] = {}; + const char *search_paths[4] = {}; int i, perm; if (str_has_sfx(file, ".so") || strstr(file, ".so.")) { search_paths[0] = getenv("LD_LIBRARY_PATH"); search_paths[1] = "/usr/lib64:/usr/lib"; search_paths[2] = arch_specific_lib_paths(); + search_paths[3] = "."; perm = R_OK; } else { search_paths[0] = getenv("PATH"); search_paths[1] = "/usr/bin:/usr/sbin"; + search_paths[2] = "."; perm = R_OK | X_OK; } -- 2.39.2