From nobody Mon Dec 1 22:03:45 2025 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAAD8283FEE for ; Thu, 27 Nov 2025 18:53:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764269604; cv=none; b=JhdLuPot/Wam3V2nCPQFUbGIM5J2lcpVvgA7zcvOM6yDxDiT2afgwhBAb5vfpn9JQ0ruqszFtA3/Q9tUqn6UlKTcAqJMR214RGuGbPE7y/GOX48XcS0e0ZgWDLaLTsDOsgbJ9RGah/+iCWl4tq/aZKvtV+mGJjs2NL5qZC/1/xQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764269604; c=relaxed/simple; bh=OGljzmU0DkQ+x9fsECZTDJgZ2OLFsyJKQITIodlLZY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gC9xkt51NUjqKaOSqlNu9k7UW8wqNriPorR3MobBfQXabmIr6aCjhEgQUk43PVAaYblazUirOiltir3A0BSmdw+/kjd8/5DEKqM8SxsCdCaEKtOd9PeEdhk08zWWv137QDCoukgvq8mdTBy00cl5rQNbzQ25gqHijIL8pTiGZv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=vh/2nFAb; arc=none smtp.client-ip=95.215.58.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="vh/2nFAb" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1764269601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GkubKcSTNE4kKDdz7gUmlKO6JRAaq9Yff0unvyM5a5E=; b=vh/2nFAbmvdxajM7iTr61Dj2BLyrmCRbpofhmY4haJZ5bok6qmfLfriiVj0QDQOXPSEbEu F/87xb+qrzA0P+fIfHs+9kr+bXgAFAPuwM0yZaYQJ97Edymn8ZOAckErGLiuGpC44Wcp4X pmk3qXxSxmPSppIp1flbojKpbPLim28= From: Ihor Solodrai To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Nathan Chancellor , Nicolas Schier , Nick Desaulniers , Bill Wendling , Justin Stitt , Alan Maguire , Donglin Peng Cc: bpf@vger.kernel.org, dwarves@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org Subject: [PATCH bpf-next v2 1/4] resolve_btfids: rename object btf field to btf_path Date: Thu, 27 Nov 2025 10:52:39 -0800 Message-ID: <20251127185242.3954132-2-ihor.solodrai@linux.dev> In-Reply-To: <20251127185242.3954132-1-ihor.solodrai@linux.dev> References: <20251127185242.3954132-1-ihor.solodrai@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Rename the member of `struct object` holding the path to BTF data if provided via --btf arg. `btf_path` is less ambiguous. Signed-off-by: Ihor Solodrai --- tools/bpf/resolve_btfids/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/mai= n.c index d47191c6e55e..164f0c941f04 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -113,7 +113,7 @@ struct btf_id { =20 struct object { const char *path; - const char *btf; + const char *btf_path; const char *base_btf_path; =20 struct { @@ -550,11 +550,11 @@ static int symbols_resolve(struct object *obj) } } =20 - btf =3D btf__parse_split(obj->btf ?: obj->path, base_btf); + btf =3D btf__parse_split(obj->btf_path ?: obj->path, base_btf); err =3D libbpf_get_error(btf); if (err) { pr_err("FAILED: load BTF from %s: %s\n", - obj->btf ?: obj->path, strerror(-err)); + obj->btf_path ?: obj->path, strerror(-err)); goto out; } =20 @@ -790,8 +790,8 @@ int main(int argc, const char **argv) struct option btfid_options[] =3D { OPT_INCR('v', "verbose", &verbose, "be more verbose (show errors, etc)"), - OPT_STRING(0, "btf", &obj.btf, "BTF data", - "BTF data"), + OPT_STRING(0, "btf", &obj.btf_path, "file", + "path to a file with input BTF data"), OPT_STRING('b', "btf_base", &obj.base_btf_path, "file", "path of file providing base BTF"), OPT_BOOLEAN(0, "fatal_warnings", &fatal_warnings, --=20 2.52.0