From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 DF10621FF33 for ; Wed, 18 Feb 2026 16:44:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771433081; cv=none; b=euaUhTyk+DK3LDGejN88beodfjkMGfXxQHwYtEiVmTKylgZM6nNASTmslHZTIRNrx2KiCwg6jC423BcAVXxo1HB5zoUSDMMaheZD4DCXi0O97tZLtrKa9uXFJU2qy6sNGEQ4MOBGr6nkCkJw8T5cJbVbSTHLyoTWHLkyKa4V0jA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771433081; c=relaxed/simple; bh=vDDK33jEEp5EBnlC1HW/sV8/8MtglVuuHrpA5xFbNiE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=XIpCRaQ4jp1bmoHjOClp62DxGKVQ9PGS8/y5dro2kiLR56RzHcPoD8QCHKzn185OC1ji7uNSGySOXA3sxGSueTkgY4IfAK7kWIuJul3bOO+kT1lec1aVwlKZv/UwKh4i/m5VHSBf1q5iUyOhHt9Jy0F1txmZiiNnS25M0H0YHtU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RiOIjF/B; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RiOIjF/B" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-43767807cf3so31431f8f.1 for ; Wed, 18 Feb 2026 08:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771433077; x=1772037877; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=YDPdRiLpk91DL+wD8eFDTLzfQNR/e0JmMVHM/MS0nx4=; b=RiOIjF/Bokjyvqe8rDsXL1nOdlpxmmjJqy+scnxxkKNuFi38g03wY72A3cXe0dc4JM 5BdrP2/Qq8Zx2JlFNIWe7q4aT7VoPWdT3bknOQCGjMA9Gntv8KNLmdP8R2cuoEn2IjEG jZfVmrjHSqD4tUOZN7gxNVVT4rIyUgnWF+Tal8bRTZgNbWURpfci81+rsbr1uhV72mQU QKh6cYj4JRQ2TenIPDyDIlUMR7+FrfRa0Bq1lbChASiV4FvSSMmWkXLGIiyOzbACOrGF 6xEXoIUdf24p5Jq9sqAQBXYfK5Kzh8TU/t+Si7w7bvVBSwzQtXgwSg26zTOtlyD+UlT6 plrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771433077; x=1772037877; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YDPdRiLpk91DL+wD8eFDTLzfQNR/e0JmMVHM/MS0nx4=; b=SVxvtngAu8BR7MtychEEc5D5Hla8NaT0FB8SnyBFpZwBszvw5zMU7btcnfdjoKGVFA jyeyaLYwgjmNKpE5qwyWNpkGcwq4kwer0FQWScdfXXIKsiRK+IM2CS3BOyRwPlqOIG0y dO7kfzaTHZr5bhq6CDPuV7mVU/xWFTa92iOEm3ba17+MsbTU59XNg1uouOnWNFQybHpt F5LZNpw4lE4hZnplwToUo6XS/k096A0qi58IRjXtJb8c3FRtDATxN/fCmsPRemkDWmnF +n067NUjlbhGDfUH/0JTw4HqBQyJ8vW8nw7AV2xhlvmxX3y3LKA+eBQR7UQfwSPkFqsL i0QA== X-Forwarded-Encrypted: i=1; AJvYcCVWx418tfkIcuQFOARaiZIXpCM8Y/hiCs1Jyo9zRQlrelouLzxf9vAwrbK+gS/Zlkd4aDDjoviyoEic2+k=@vger.kernel.org X-Gm-Message-State: AOJu0YxlVx+ydgibyt6PVAJPCr1oJbDoW1lXWAJZSknRMT9YVqaakFUj SvgFGLFLT9jGqfb5dJxkb1zz5pEDn1OhT52JmULG3THEiWaoo7DMUHpN X-Gm-Gg: AZuq6aLbw7nQ2yfsCQaNJt1xEnwsE1Y21lAzUPAA2SNijB0U3e7z4tTBA2m9cxsNsPv q0F3usqeB5mfuCFYZ4RLZ7xs9EhyDkXaHhuEp7TovT9CbfyFg9rUurqj9u/7kbYk5E2nnHu9WLf 2p9MyyNS3SHTjykDcPiocxcKKQKwnBq/8+20sR68eQU6zoeJz4HNqHCqlVV38x1PL7I2mlZ6Y++ MgbRI+QoEbZ3PNsUYEqxBHH7E7KgsXLRecacnGgsjRYW+Qcx9wpK+KUwDuaBtAdRDdU9ORmsKzZ gwLnELXQO+MsqRWcigBMFWJ3y0CQrTdncoyQifpvbcQQcrkq5aQ9hyOgphvFTfqUeF+X2V5Hrb+ rxSEwz09YPlCKF4N2YmzTToVzKFNqIPn/0qZ2l/SAyKABfKmJowZtxpHPJFNjRsnts1eGk1pgvx 9lDgQ28zYIcV8XLzPbQqqlqGrtfn9Rh6VB8L/hBanCMcmQ7OBvTh8o5wEAaiWepRjslB52h/zWV w== X-Received: by 2002:a05:6000:40df:b0:437:7168:af52 with SMTP id ffacd0b85a97d-4379db25d28mr29641189f8f.11.1771433077064; Wed, 18 Feb 2026 08:44:37 -0800 (PST) Received: from ?IPV6:2a03:83e0:1126:4:93ab:614:2c34:ab35? ([2620:10d:c092:500::6:66e8]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-437969fd36dsm45197117f8f.0.2026.02.18.08.44.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Feb 2026 08:44:36 -0800 (PST) Message-ID: <31abfaef-f536-4778-8aa1-767fcc3da48b@gmail.com> Date: Wed, 18 Feb 2026 16:44:36 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH bpf v2 14/15] selftests/bpf: Check BPFTOOL env var in detect_bpftool_path() To: Ihor Solodrai , Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Eduard Zingerman , Jiri Olsa , Mykyta Yatsenko , =?UTF-8?Q?Alexis_Lothor=C3=A9?= Cc: Amery Hung , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com References: <20260218003041.1156774-1-ihor.solodrai@linux.dev> <20260218003041.1156774-15-ihor.solodrai@linux.dev> Content-Language: en-US From: Mykyta Yatsenko In-Reply-To: <20260218003041.1156774-15-ihor.solodrai@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/18/26 00:30, Ihor Solodrai wrote: > The bpftool_maps_access and bpftool_metadata tests may fail on BPF CI > with "command not found", depending on a workflow. > This happens because detect_bpftool_path() only checks two hardcoded > relative paths: > - ./tools/sbin/bpftool > - ../tools/sbin/bpftool > > Add support for a BPFTOOL environment variable that allows specifying > the exact path to the bpftool binary. > > Also replace strncpy() with snprintf() for proper null-termination. > > Signed-off-by: Ihor Solodrai Acked-by: Mykyta Yatsenko > --- > tools/testing/selftests/bpf/bpftool_helpers.c | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/bpf/bpftool_helpers.c b/tools/testing/selftests/bpf/bpftool_helpers.c > index a5824945a4a5..d810e73da6c8 100644 > --- a/tools/testing/selftests/bpf/bpftool_helpers.c > +++ b/tools/testing/selftests/bpf/bpftool_helpers.c > @@ -1,5 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0-only > #include "bpftool_helpers.h" > +#include > #include > #include > #include > @@ -12,13 +13,24 @@ > static int detect_bpftool_path(char *buffer) > { > char tmp[BPFTOOL_PATH_MAX_LEN]; > + const char *env_path; > + > + /* First, check if BPFTOOL environment variable is set */ > + env_path = getenv("BPFTOOL"); > + if (env_path && access(env_path, X_OK) == 0) { > + snprintf(buffer, BPFTOOL_PATH_MAX_LEN, "%s", env_path); > + return 0; > + } else if (env_path) { > + fprintf(stderr, "bpftool '%s' doesn't exist or is not executable\n", env_path); > + return 1; > + } > > /* Check default bpftool location (will work if we are running the > * default flavor of test_progs) > */ > snprintf(tmp, BPFTOOL_PATH_MAX_LEN, "./%s", BPFTOOL_DEFAULT_PATH); > if (access(tmp, X_OK) == 0) { > - strncpy(buffer, tmp, BPFTOOL_PATH_MAX_LEN); > + snprintf(buffer, BPFTOOL_PATH_MAX_LEN, "%s", tmp); > return 0; > } > > @@ -27,11 +39,11 @@ static int detect_bpftool_path(char *buffer) > */ > snprintf(tmp, BPFTOOL_PATH_MAX_LEN, "../%s", BPFTOOL_DEFAULT_PATH); > if (access(tmp, X_OK) == 0) { > - strncpy(buffer, tmp, BPFTOOL_PATH_MAX_LEN); > + snprintf(buffer, BPFTOOL_PATH_MAX_LEN, "%s", tmp); > return 0; > } > > - /* Failed to find bpftool binary */ > + fprintf(stderr, "Failed to detect bpftool path, use BPFTOOL env var to override\n"); > return 1; > } > > @@ -71,4 +83,3 @@ int get_bpftool_command_output(char *args, char *output_buf, size_t output_max_l > { > return run_command(args, output_buf, output_max_len); > } > -