From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33057400E15 for ; Mon, 20 Jul 2026 11:13:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784546008; cv=none; b=hiHrrJjUlpM8Qs0JuMGILg/3zIwQMVfwvDNzomaULVTGlAz3ktTb/KlPKEf3u3KnOD/O3Sq7trlHMDHWXMZ2+trfQK6ppNcws9+owDtbenCyzBZUyhgyEpPgHNvgRIdazb9XLDC/qKkVTM/V91f04NB+PjsFWauRqv16WoUyOe8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784546008; c=relaxed/simple; bh=XLOtvvCv66YQSGuoLu3eRvzMzjzimYKdjqYj+ocM9dc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TK0b5RHIRTAOLzGMUQvg7louNZReFXgURiiQDqAriL4Lb97gdz99dFwSJWBWTv+SU8ls2K+m1VUTIm3lYh3D6FmYcrVR7pzjqSu/v+VXIxAdcm5cAlINL6cOGiTGra9kHt6l3boYCssbm6fZBCOvxX3xYSluICHNAk5M5fDofi4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=Ge6OkG3T; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="Ge6OkG3T" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-47ddf7b09e5so6170890f8f.1 for ; Mon, 20 Jul 2026 04:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1784546003; x=1785150803; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=QN6Sa3FnT7k2MKcUIt4Usx9BRVJXnBuQBTO+EcPn68M=; b=Ge6OkG3TP92/iXi07TiwUwlyIaiHvPexNobUh2rFQy7SYb/p+Ik6hIPUy2kwyxhnjN TAH3nzkTV0oIXFfJV1LO03NsyP6pRrHkdyxvo6BhA4UuYpJR9IS0Ocek3dHF5fOQbe2M E+kmsRbYFRMZAvUpUhr0AWmnwO3vUFg2EIl0Ldury4DhMMp5YbrMDdwu28PHJKibxUo5 +bGDnh55LrP3clGIESdgHhqCh7he/NfTDR3dwjcSegYyI5aSpSLLKEFbC+RoLe9YTy8L ax6lzqQwMWEWACTsIRNqnkG1otsY6sE9K+jgtJgWAyXeNII/nFdq2haVSLqZIjDkdNh4 eaHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784546003; x=1785150803; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=QN6Sa3FnT7k2MKcUIt4Usx9BRVJXnBuQBTO+EcPn68M=; b=IeAaNbGMgvirevhkCBKgpqfasr8CgVWsuxHC5wwbp+47xJxo//FCuTqv8f4440gVUn eUULRm64DO8cA70m2e/Wh28Hih+V5v+uCrdFZd7d+8+W5RSDOwC/nDg2/EvrtpmKoz5G 3Vz7sSW7XIkdNlCaboYUdklyt++C46nu0nHa7Txt/JtbM5IY/mzC2BeHt3ll5/aazlmQ EwmW1L7sa3eMT9NWo8NyMjVda4FA61LLGgZECAUl8d0d/igQsmPyShSQflujxYUsNnDy 6hf+9sSVfn1j2qDme3hDoJfZtxzTUPDXB+Au40cO0ksRHY06ap8vfWiNt4Cre2o8FW1T KGXg== X-Forwarded-Encrypted: i=1; AHgh+RqRroHBh9dvzSuehDTGDUC8Gga8zhWUbQ32d8Fp7LsHhmO+JIY6Qjfo4+SCNjir4Bb8Fg3OFOV+B3Rq6pg=@vger.kernel.org X-Gm-Message-State: AOJu0YzCTZoZnIoDM6vr9AJXTrNr50Ocnh2lQF28MmERWEwyoEJjfQH6 fqWZFLPPUg4/pjC781SV+ej0oEopJIgjTA5ChuwqCzIwMA8alVyYWWHgn0wHj8xkOkQ= X-Gm-Gg: AfdE7cmnFBWbORgNjNc7CmGpe47glq5D94PIBh2FgYeQJnJDYhUJBxah/vb+DYHB6Rn OfbUfVOctXThPXRHx4LDquuqcrysTdKMTr3QFyZoOscSSPdETKdPsICxkbJVchN3Iwhpf9vgAc3 OdaVojA6GWrN9r2bDmBrlzrzYji1ydT4TyE/VGmPmBzyPgodngLZhqbU1s6S3cSJDdHkpQkfp+a x/5j1b3ryyigKepcPAXRpYMxwjgx7mzjmpxhm2fzVUUaWuHNNyB0HmQCJiNhCVz/t7/wjdrKDC3 qxPM+5sLP6eEpMakL3tMRohdSonO80NwEjHz51aTXge347Gqo4eHmgt7PAtBC8MadDaMVip0u5j ChGf/hQ511l7mC/ubqKHdsNPmAknHPZR2EsckU9JpOFyMMeVw1FMcZkIRzTaKnYiZUsO+wrLFIk xg X-Received: by 2002:a05:600c:3112:b0:495:472c:208d with SMTP id 5b1f17b1804b1-4954a41307cmr135152415e9.38.1784546003305; Mon, 20 Jul 2026 04:13:23 -0700 (PDT) Received: from localhost ([2804:7f0:b765:c3e:cc5f:6c4b:db0a:5d2a]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-5c1eecc8e5bsm9088749e0c.4.2026.07.20.04.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 04:13:22 -0700 (PDT) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Mon, 20 Jul 2026 08:13:09 -0300 Subject: [PATCH v2 3/3] libbpf: Search /lib64 and /lib in resolve_full_path() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260720-selftests-bpf_fixes-v2-3-b450eda93dfe@suse.com> References: <20260720-selftests-bpf_fixes-v2-0-b450eda93dfe@suse.com> In-Reply-To: <20260720-selftests-bpf_fixes-v2-0-b450eda93dfe@suse.com> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Shuah Khan , =?utf-8?q?Alexis_Lothor=C3=A9_=28eBPF_Foundation=29?= , Ihor Solodrai , Christian Brauner Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openssh-sha256; t=1784545988; l=1421; i=rbm@suse.com; h=from:subject:message-id; bh=XLOtvvCv66YQSGuoLu3eRvzMzjzimYKdjqYj+ocM9dc=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QAtQoVs8IKXZ/WoGcNMf6XZxbYamJT38nyl50KUKsxxjuXmVJKzag8UU4v/8YhQKRvRJE4sCI9/ G/ieYJUQyrQo= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g attach_probe/uprobe-lib and uprobe_autoattach selftests fail with "failed to resolve full path for libc.so.6" on older non-usrmerged distros, where libc.so.6 lives under a top-level /lib64 or /lib rather than /usr/lib64 or /usr/lib. Add /lib64:/lib to the search paths, alongside the existing /usr/lib64:/usr/lib and Debian multiarch entries. Acked-by: Ihor Solodrai Fixes: 1ce3a60e3c28 ("libbpf: auto-resolve programs/libraries when necessary for uprobes") Signed-off-by: Ricardo B. Marlière --- tools/lib/bpf/libbpf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 1368752aa13c..1ab939dfb7f0 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -12973,13 +12973,14 @@ 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] = "/lib64:/lib"; perm = R_OK; } else { search_paths[0] = getenv("PATH"); -- 2.55.0