From patchwork Thu Apr 20 00:33:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Monnet X-Patchwork-Id: 13217690 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 2507BC77B73 for ; Thu, 20 Apr 2023 00:33:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230247AbjDTAdo (ORCPT ); Wed, 19 Apr 2023 20:33:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230059AbjDTAdo (ORCPT ); Wed, 19 Apr 2023 20:33:44 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CFE910FD for ; Wed, 19 Apr 2023 17:33:40 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f1738d0d4cso1710955e9.1 for ; Wed, 19 Apr 2023 17:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent.com; s=google; t=1681950819; x=1684542819; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UIYP4oG1399xp7l5yP6cSIIg2FxTbL9dP4yBn1WImQY=; b=JiD0HLB4IPZqnQlRjhFpYel4v73OXFbuVhB5xuxT9uQk56WeKSe8l7UsExUGyLhpq7 V4IcSV+KFq1DdFsK9/sWFKLHGSvFri7cM715tDAahDDFI4ZPrUMkFxCZxBGr452zgT0D +t22BplNWJTIFj+6w4BpgF9l6uZNp3PYzxIGrEcbUedIFzFAK0+cLLDaxYNTgjRdcv8T pkmyv76Fg5hIcsUI24euTV8AWDKpRxrOldHhv0KWTATqLHyWoBqMUvErYnSqK0PZ2+Kj 16Et/7YTkH61aBDE5AFgcrsCtOw1ng0rnWaTxa3qhilS+bgg3PaAP1KilXkJrLQjk5SD KI1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681950819; x=1684542819; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UIYP4oG1399xp7l5yP6cSIIg2FxTbL9dP4yBn1WImQY=; b=gpRgX22QZcM7TSJI6D+JPXXW0RZWZKQSPz/NmJnMGS5hzsDA5vV6JznZIEE05SGQgu hthPOWnTs741qDYthfM2AdBUV5RVvt/ZSccRVstKPPDwyEA7dk3y6oAuZffq8tu+jrAL Ye1/9m9MqMOgV095Mzq+KJRiOww1cLov/nDga3M/IkRbDa/MlJeyy1L+Je1lOb1IS4IH zptRuh1ceLpXvBYVrr2HWxBcnFnTXbH46xKGVU7D6n4K2wSASWpwfnIVYOLqrSIr8s5Y wULFS67jZ1/NmqsKhdA4RU4c7vYmi4L0yxOJli4Ri1tw/xsXXX/gwQIeq97cfZlw7GWZ FVRA== X-Gm-Message-State: AAQBX9dXzR+/pfcMZXDj6n2ARPMUpM3QQLQ4BkZu77YnB0rSfZTMIKHu Y3jJw5dUEmXV2KHL73aptwq90g== X-Google-Smtp-Source: AKy350bXPjnvaazksfhlNMyVg+0CF91uqAGJT5BXI14h98mrvzq5l03wL7ziuCIorQRvaMNeDEoReg== X-Received: by 2002:a05:6000:1112:b0:2fe:562c:c0dc with SMTP id z18-20020a056000111200b002fe562cc0dcmr4042380wrw.40.1681950818815; Wed, 19 Apr 2023 17:33:38 -0700 (PDT) Received: from harfang.fritz.box ([2a02:8011:e80c:0:9d89:dbf3:be67:5a7b]) by smtp.gmail.com with ESMTPSA id w9-20020a05600c474900b003f17e37ce60sm3623446wmo.47.2023.04.19.17.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 17:33:38 -0700 (PDT) From: Quentin Monnet To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , bpf@vger.kernel.org, Mark Brown , Heiko Carstens , Stephen Rothwell , Liam Howlett , Arnaldo Carvalho de Melo , Sven Schnelle , Thomas Richter Subject: [PATCH bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict Date: Thu, 20 Apr 2023 01:33:33 +0100 Message-Id: <20230420003333.90901-1-quentin@isovalent.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net The recent support for inline annotations in control flow graphs generated by bpftool introduced the usage of the "__fallthrough" macro in a switch/case block in btf_dumper.c. This change went through the bpf-next tree, but resulted in a merge conflict in linux-next, because this macro has been renamed "fallthrough" (no underscores) in the meantime. To address the conflict, we temporarily switch to a simple comment instead of a macro. Related: commit f7a858bffcdd ("tools: Rename __fallthrough to fallthrough") Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program") Reported-by: Sven Schnelle Link: https://lore.kernel.org/all/yt9dttxlwal7.fsf@linux.ibm.com/ Reported-by: Thomas Richter Link: https://lore.kernel.org/bpf/20230412123636.2358949-1-tmricht@linux.ibm.com/ Suggested-by: Daniel Borkmann Signed-off-by: Quentin Monnet --- tools/bpf/bpftool/btf_dumper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c index 6c5e0e82da22..294de231db99 100644 --- a/tools/bpf/bpftool/btf_dumper.c +++ b/tools/bpf/bpftool/btf_dumper.c @@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s) case '|': case ' ': putchar('\\'); - __fallthrough; + /* fallthrough */ default: putchar(*s); }