From patchwork Mon Mar 28 08:37:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiri Olsa X-Patchwork-Id: 12793297 X-Patchwork-Delegate: bpf@iogearbox.net 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 781DAC433F5 for ; Mon, 28 Mar 2022 08:37:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239437AbiC1Iiw (ORCPT ); Mon, 28 Mar 2022 04:38:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231753AbiC1Iiv (ORCPT ); Mon, 28 Mar 2022 04:38:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89FC93C497; Mon, 28 Mar 2022 01:37:11 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 472F7B80EFF; Mon, 28 Mar 2022 08:37:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6FD2C004DD; Mon, 28 Mar 2022 08:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648456629; bh=2FBmeLW7AhMRYwb0H5oB+VudLAfARIHjF7aGtQtAxao=; h=From:To:Cc:Subject:Date:From; b=tBCQhVUq24aySaOpMWxwq5o/79akHRDBwLZrlMYRcu+MVOUDSIqZwFtJ1OpI1uMLc ppDwDEtekoJY/GJmVutHfZPgF/iTcjrfxo4LEdVZWJEZ4fzJqKzGAtDv2KNXIOoZdr bjlcQD2zqN2Lou7E7BHwPVkFoiZArgFHjwOaVZzTff3yqjWQq6OBLpnYZ9nidfAPYS zl6tE2e93rc2crZq1X2G8iQHwYLSEs6kgJHj84I4BPgbJ62g0LtiOEs0xnWZHvZdhR iRvLTLiX/KCryl5yESfvJYFZ7Iza8dwoq+YtSZuDM0fBRsbtO2iUPSWIwSSdQ9O4bx 2ii3zJ8r5n1bA== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Delyan Kratunov , Arnaldo Carvalho de Melo , netdev@vger.kernel.org, bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh Subject: [PATCH] bpftool: Fix generated code in codegen_asserts Date: Mon, 28 Mar 2022 10:37:03 +0200 Message-Id: <20220328083703.2880079-1-jolsa@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Arnaldo reported perf compilation fail with: $ make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 ... In file included from util/bpf_counter.c:28: /tmp/build/perf//util/bpf_skel/bperf_leader.skel.h: In function ‘bperf_leader_bpf__assert’: /tmp/build/perf//util/bpf_skel/bperf_leader.skel.h:351:51: error: unused parameter ‘s’ [-Werror=unused-parameter] 351 | bperf_leader_bpf__assert(struct bperf_leader_bpf *s) | ~~~~~~~~~~~~~~~~~~~~~~~~~^ cc1: all warnings being treated as errors If there's nothing to generate in the new assert function, we will get unused 's' warn/error, adding 'unused' attribute to it. Cc: Delyan Kratunov Reported-by: Arnaldo Carvalho de Melo Fixes: 08d4dba6ae77 ("bpftool: Bpf skeletons assert type sizes") Signed-off-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo --- tools/bpf/bpftool/gen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c index 7ba7ff55d2ea..91af2850b505 100644 --- a/tools/bpf/bpftool/gen.c +++ b/tools/bpf/bpftool/gen.c @@ -477,7 +477,7 @@ static void codegen_asserts(struct bpf_object *obj, const char *obj_name) codegen("\ \n\ __attribute__((unused)) static void \n\ - %1$s__assert(struct %1$s *s) \n\ + %1$s__assert(struct %1$s *s __attribute__((unused))) \n\ { \n\ #ifdef __cplusplus \n\ #define _Static_assert static_assert \n\