From patchwork Wed Dec 4 19:37:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13894242 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 721671F03C9; Wed, 4 Dec 2024 19:37:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733341081; cv=none; b=CBcApkhhkPFlJZYF7AtNYpY7fRhog16qQLudALWPw7l0dpOJ8ckWAjMaaD11oaD45BgrNCPkTlLHf39V6NWFj9panMJ/J3RHydhonUWKlc0VehbHva+yHIWCnGCUy64nnzNB+U/V1S/9Gzg1BTsWy3oSR3ltxB8yQxE5At0DZsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733341081; c=relaxed/simple; bh=f8xLN3ZcudczNgNboJNAgfLSKfWN18Qam/y5laaAdVY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Scz0j6DnwaDLBAgWDXB/bWzInnqTuRyYMxR+uPr4e79aEKclabd6MUAdJI22qm+mRUHu0OvsHu69ki2sqC9j/lvEk1bcW9bMJxXAe+Pa7Zo+DHssYna4tAtKfd8zMwY3acOwNxPnVMjXRHGxcT/fswtn3Jys4hFaoHfAjgHezV4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=mny+SgVH; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="mny+SgVH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1733341068; bh=f8xLN3ZcudczNgNboJNAgfLSKfWN18Qam/y5laaAdVY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mny+SgVHsEk6gvlupIf+uMy+bUeC2vs8+pfGnPcvTKgaMvh8UYBlFP8WtUGxkNoks xus6vLFzU7vQudCuEOzYxgMxJh71/n3cAFZywhKAzhA1VIr4Pwh4rvqGv1coEKwGpA 2CYGZG+DZNb4G8DihPlgKn63HPn4rxVQJdfTa9ts= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 04 Dec 2024 20:37:44 +0100 Subject: [PATCH bpf-next v3 1/2] tools/resolve_btfids: Add --fatal_warnings option Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241204-resolve_btfids-v3-1-e6a279a74cfd@weissschuh.net> References: <20241204-resolve_btfids-v3-0-e6a279a74cfd@weissschuh.net> In-Reply-To: <20241204-resolve_btfids-v3-0-e6a279a74cfd@weissschuh.net> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , 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 Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1733341067; l=2329; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=f8xLN3ZcudczNgNboJNAgfLSKfWN18Qam/y5laaAdVY=; b=+05UzyPxH/V9pGb78h49Ua93Fh8kEAapaePFhC9Be2JJO1yD+3OQdlVpucuHXAzsqpr0ZlcLe VuLO4P+FtEKDLtG3OjY9hmtaPHFmMLP2a7iteHmaSC38p7io3eVNwbz X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Currently warnings emitted by resolve_btfids are buried in the build log and are slipping into mainline frequently. Add an option to elevate warnings to hard errors so the CI bots can catch any new warnings. Signed-off-by: Thomas Weißschuh Acked-by: Jiri Olsa --- tools/bpf/resolve_btfids/main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c index bd9f960bce3d5b74dc34159b35af1e0b33524d2d..d47191c6e55e10215269774f4bdfc6e5b4bf72f8 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -141,6 +141,7 @@ struct object { }; static int verbose; +static int warnings; static int eprintf(int level, int var, const char *fmt, ...) { @@ -604,6 +605,7 @@ static int symbols_resolve(struct object *obj) if (id->id) { pr_info("WARN: multiple IDs found for '%s': %d, %d - using %d\n", str, id->id, type_id, id->id); + warnings++; } else { id->id = type_id; (*nr)--; @@ -625,8 +627,10 @@ static int id_patch(struct object *obj, struct btf_id *id) int i; /* For set, set8, id->id may be 0 */ - if (!id->id && !id->is_set && !id->is_set8) + if (!id->id && !id->is_set && !id->is_set8) { pr_err("WARN: resolve_btfids: unresolved symbol %s\n", id->name); + warnings++; + } for (i = 0; i < id->addr_cnt; i++) { unsigned long addr = id->addr[i]; @@ -782,6 +786,7 @@ int main(int argc, const char **argv) .funcs = RB_ROOT, .sets = RB_ROOT, }; + bool fatal_warnings = false; struct option btfid_options[] = { OPT_INCR('v', "verbose", &verbose, "be more verbose (show errors, etc)"), @@ -789,6 +794,8 @@ int main(int argc, const char **argv) "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, + "turn warnings into errors"), OPT_END() }; int err = -1; @@ -823,7 +830,8 @@ int main(int argc, const char **argv) if (symbols_patch(&obj)) goto out; - err = 0; + if (!(fatal_warnings && warnings)) + err = 0; out: if (obj.efile.elf) { elf_end(obj.efile.elf); From patchwork Wed Dec 4 19:37:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13894241 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 720D31F03C8; Wed, 4 Dec 2024 19:37:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733341081; cv=none; b=PW6ZPej+5LI5X+Qrdmu/WXVmtFRcck2Os+LtTmWDtO7n6HpYxjUjmWux1yEVJafC6tGVBWfme4jUmAwBSl9vRFMFUkbQpchFwpksc0vwhXGuBU1apxDad5Eaba4waFDrvmrIoB/8b+BBjihdo4WLvgarlgPgmjYB8Ofm2zwXJHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733341081; c=relaxed/simple; bh=j4sqUbGoK+7beKPluyYhWDONOZvAHpifoflwWglXinA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e9dl35b8LKO13/Youfay3QluC9Bb/0bxEtgUwbECjq2xT5b8U/g+DqKeYucj5dUA6myzmAjXJllJifPYUkrNFTYDH5qF6NYcjtSjXNJgI9Q8EOBo8uTu9dW9A+Qda4bu4L5YYWcm5CrdlSNf4v6iRVDTW0a1pHcbCuyJV68jp8k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=T4FPTuzd; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="T4FPTuzd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1733341069; bh=j4sqUbGoK+7beKPluyYhWDONOZvAHpifoflwWglXinA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=T4FPTuzd3zCvKuXeeoHzJ8IF18uvFPxonjM3k0d5eedOGVBjIj9qILRxftSdzFpL/ OWhCw6bSjlCgDqbyxsRbz7zQoQYrD3rDHQbDu8fmf23IScGtxjfnfHikOGhUuTPueU Rs8byCQVRhBJZDkWp68s0vg7tv0lZft0aWOW4UZ8= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 04 Dec 2024 20:37:45 +0100 Subject: [PATCH bpf-next v3 2/2] kbuild: propagate CONFIG_WERROR to resolve_btfids Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241204-resolve_btfids-v3-2-e6a279a74cfd@weissschuh.net> References: <20241204-resolve_btfids-v3-0-e6a279a74cfd@weissschuh.net> In-Reply-To: <20241204-resolve_btfids-v3-0-e6a279a74cfd@weissschuh.net> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , 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 Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1733341067; l=928; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=j4sqUbGoK+7beKPluyYhWDONOZvAHpifoflwWglXinA=; b=sfU1PGfUVeGccb2dwsXPUlkNGKdHhTSeyPF98pmXqLJ6JAV7Ki2AIC7IwwSjWB3kA31Ey8rQR yA2vGNaOtwHCMVFF0OhnckjjII4euJxi14jFM0vV5FjZuuw82TWu5mk X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Use CONFIG_WERROR to also fail on warnings emitted by resolve_btfids. Allow the CI bots to prevent the introduction of new warnings. Signed-off-by: Thomas Weißschuh Acked-by: Jiri Olsa --- scripts/link-vmlinux.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index a3c634b2f348f9c976cff9693caf290db7f31666..991d08c0042c68fc452210a8423d67162891c585 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -279,7 +279,11 @@ vmlinux_link vmlinux # fill in BTF IDs if is_enabled CONFIG_DEBUG_INFO_BTF; then info BTFIDS vmlinux - ${RESOLVE_BTFIDS} vmlinux + RESOLVE_BTFIDS_ARGS="" + if is_enabled CONFIG_WERROR; then + RESOLVE_BTFIDS_ARGS=" --fatal_warnings " + fi + ${RESOLVE_BTFIDS} ${RESOLVE_BTFIDS_ARGS} vmlinux fi mksysmap vmlinux System.map