Message ID | 20221217223509.88254-3-changbin.du@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1701839wrn; Sat, 17 Dec 2022 14:56:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXtwrwhzc8nwwQw9wcC2JZKPoKpYdn/3OSg8opf8Pm4v/pJES5ohpXDdVwiWqCLS7KIJcToX X-Received: by 2002:a17:906:c0d3:b0:7fc:4242:fa1d with SMTP id bn19-20020a170906c0d300b007fc4242fa1dmr3386087ejb.54.1671317771280; Sat, 17 Dec 2022 14:56:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671317771; cv=none; d=google.com; s=arc-20160816; b=GqDYVyWvFSN5ApxbccOhe1TF6XuF/INUf7uOlMNl0ySB/mTwlrkW7No0wG8OAngkTs gtQ2OUh4DtVRxMqBeCGHrt8o9wXZT6x+84DeWfi4nWy4Ozv+Q9l/tqIbDttbJip1FiQ/ RhLvBHSVaLUukqLXNxEcAHZGkjluNx5KWM0MiXYPeSSm4CU0m9KJ2ZamwUGsoxKUWATF Hv4alaT2wnoVmiyhXF0m7H4XuUfVRPRUVxf2FxvJ91rBTi15BCPm1zx2slG9HOy7qF6d FpRkgGUBQU7k7eAd5bmh5TQ/5Y3jg31Td+jnTwGF33lu+WX9ixy8Hzj6lNakHbZzx1N3 xPvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j/x+afgh1ISBbPnqbY131/KLKQLBCqSdbqqjGYkdUb0=; b=0+tu6TBdxS0uhZNxd8+dy9lS/Mljn4N07RDQYqEKsgIG8UVoJzZ20YrK6uUmWrZ2QY ZayUWJOv4DgRQbn3mn4mvIA0GMF8TtaBpoepfXzpm98Z6cpx2QNDgsNTj6Gl8YOo6auD JM5omI1pCMg3Vyt3WYVUt7HUKX9TBjKa9AVkhzhLbpeEzOZ9EeJ9bWo2e264tgoe4DGr mBwMkp5v5nNDhCpMM6S2RBWN5+CK8NPoE7VUW45Djhkd728mH4GRw0TPQebUVjhmeon9 6dC/Pkd1WvHtog6hLHr6R5TDC/rrZsyPSyFsxZeEM+tyxpFoLL0BSwwffnFc09kk4rBF IkiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IW1S7Jyf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cs18-20020a170906dc9200b007c172bd367fsi3080289ejc.193.2022.12.17.14.55.40; Sat, 17 Dec 2022 14:56:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IW1S7Jyf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230122AbiLQWg1 (ORCPT <rfc822;markus.c.watson@gmail.com> + 99 others); Sat, 17 Dec 2022 17:36:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229991AbiLQWgV (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 17 Dec 2022 17:36:21 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3AA7DF9B; Sat, 17 Dec 2022 14:36:18 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id z8-20020a17090abd8800b00219ed30ce47so9512089pjr.3; Sat, 17 Dec 2022 14:36:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j/x+afgh1ISBbPnqbY131/KLKQLBCqSdbqqjGYkdUb0=; b=IW1S7JyfXFSmWvxk6gMhZug6pfeHdNdgY37zEjjD/JmrXVaXgi/KXE1+TN3SKiHx1F O4TszTlAt5kynelThdmi2Wjec9cipMeCcKI4Gii8kJbsIAtzaOpZ+N06xoKZ3UKoE1+n APXw7UtHDHpyYqdvfSGFKzaRadZ0MxG2+9FoMrdzETpVf8sd+i+HAjT36llOcvvBgP0f mVK3dLD9POmL8TXVpe+wlLLIWYEYMajUXK4rZ9Gtbd8tL5umXAgCpaBmcFx8mOTNG4Oa hwTjQANXReCYaMC3qfaw/T15+PouA1L/aZMhiptHxkxHN1QZFKvJjyl5zYtQkR/pgrJG rPQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j/x+afgh1ISBbPnqbY131/KLKQLBCqSdbqqjGYkdUb0=; b=vP7jPszf8qtGZl7t5dVtbDrYXyXi8VIGcF27EcmsLInanb+xerOj4JXmgX96NqKydI je9BWFW+00pwAH7BkxK79mm9S3XldcLWVVIzbXrL5brkIqJsVrlT4jYHJgogW9cbkaPu yrUQAGVoPr/ZU2kMn1EigJYgVFVcbGhxVts+nlOzYQpu/zswVlbWmXEOSZJSS+SzVhZG JpHAlQq3aOKAA1vRbtmmRhkZpnPv9eOwHEwahjBOeg0IBMgvmmpePQhreF1+AB5qJAUm qPquBF/+TAI1HCMEt6u1DxQBQVSGPoArhF8oaUVl/C803ZdE2wA9qPpbvliDedp7rDRv B3sg== X-Gm-Message-State: AFqh2kpBxk9/Dcpc9CCeUqy+4xgHvAsFD1YHmNKL+vmSAZZkVfRDgWuc 2axeyVHcDpZb7trWSM3yBqY= X-Received: by 2002:a17:902:e212:b0:189:30cd:8fa2 with SMTP id u18-20020a170902e21200b0018930cd8fa2mr3027852plb.50.1671316578407; Sat, 17 Dec 2022 14:36:18 -0800 (PST) Received: from WRT-WX9.. ([103.135.102.144]) by smtp.gmail.com with ESMTPSA id u9-20020a17090341c900b001801aec1f6bsm4031660ple.141.2022.12.17.14.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 14:36:17 -0800 (PST) From: Changbin Du <changbin.du@gmail.com> To: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Andrii Nakryiko <andrii@kernel.org>, Quentin Monnet <quentin@isovalent.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Shuah Khan <shuah@kernel.org> Cc: Martin KaFai Lau <martin.lau@linux.dev>, Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>, John Fastabend <john.fastabend@gmail.com>, KP Singh <kpsingh@kernel.org>, Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Namhyung Kim <namhyung@kernel.org>, Mykola Lysenko <mykolal@fb.com>, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, Changbin Du <changbin.du@gmail.com> Subject: [PATCH v3 2/2] bpf: makefiles: do not generate empty vmlinux.h Date: Sun, 18 Dec 2022 06:35:09 +0800 Message-Id: <20221217223509.88254-3-changbin.du@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221217223509.88254-1-changbin.du@gmail.com> References: <20221217223509.88254-1-changbin.du@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752503703020737420?= X-GMAIL-MSGID: =?utf-8?q?1752503703020737420?= |
Series |
bpftool: improve error handing for missing .BTF section
|
|
Commit Message
Changbin Du
Dec. 17, 2022, 10:35 p.m. UTC
Remove the empty vmlinux.h if bpftool failed to dump btf info.
The empty vmlinux.h can hide real error when reading output
of make.
This is done by adding .DELETE_ON_ERROR special target in related
makefiles.
Signed-off-by: Changbin Du <changbin.du@gmail.com>
---
tools/bpf/bpftool/Makefile | 3 +++
tools/testing/selftests/bpf/Makefile | 3 +++
2 files changed, 6 insertions(+)
Comments
On Sun, Dec 18, 2022 at 06:35:09AM +0800, Changbin Du wrote: > Remove the empty vmlinux.h if bpftool failed to dump btf info. > The empty vmlinux.h can hide real error when reading output > of make. > > This is done by adding .DELETE_ON_ERROR special target in related > makefiles. We need to handle the same case for perf building, its makefile linux/tools/perf/Makefile.perf also uses bpftool to generate vmlinux.h, see: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/Makefile.perf#n1067 Please consider to use a separate patch to add the same change in Makefile.perf? Thanks, Leo > Signed-off-by: Changbin Du <changbin.du@gmail.com> > --- > tools/bpf/bpftool/Makefile | 3 +++ > tools/testing/selftests/bpf/Makefile | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile > index 787b857d3fb5..313fd1b09189 100644 > --- a/tools/bpf/bpftool/Makefile > +++ b/tools/bpf/bpftool/Makefile > @@ -289,3 +289,6 @@ FORCE: > .PHONY: all FORCE bootstrap clean install-bin install uninstall > .PHONY: doc doc-clean doc-install doc-uninstall > .DEFAULT_GOAL := all > + > +# Delete partially updated (corrupted) files on error > +.DELETE_ON_ERROR: > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index c22c43bbee19..205e8c3c346a 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -626,3 +626,6 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ > liburandom_read.so) > > .PHONY: docs docs-clean > + > +# Delete partially updated (corrupted) files on error > +.DELETE_ON_ERROR: > -- > 2.37.2 >
On Mon, Dec 19, 2022 at 11:59:38AM +0800, Leo Yan wrote: > On Sun, Dec 18, 2022 at 06:35:09AM +0800, Changbin Du wrote: > > Remove the empty vmlinux.h if bpftool failed to dump btf info. > > The empty vmlinux.h can hide real error when reading output > > of make. > > > > This is done by adding .DELETE_ON_ERROR special target in related > > makefiles. > > We need to handle the same case for perf building, its makefile > linux/tools/perf/Makefile.perf also uses bpftool to generate > vmlinux.h, see: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/Makefile.perf#n1067 > > Please consider to use a separate patch to add the same change in > Makefile.perf? > It's alreay there. https://lore.kernel.org/lkml/20221217225151.90387-1-changbin.du@gmail.com/T/ > Thanks, > Leo > > > Signed-off-by: Changbin Du <changbin.du@gmail.com> > > --- > > tools/bpf/bpftool/Makefile | 3 +++ > > tools/testing/selftests/bpf/Makefile | 3 +++ > > 2 files changed, 6 insertions(+) > > > > diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile > > index 787b857d3fb5..313fd1b09189 100644 > > --- a/tools/bpf/bpftool/Makefile > > +++ b/tools/bpf/bpftool/Makefile > > @@ -289,3 +289,6 @@ FORCE: > > .PHONY: all FORCE bootstrap clean install-bin install uninstall > > .PHONY: doc doc-clean doc-install doc-uninstall > > .DEFAULT_GOAL := all > > + > > +# Delete partially updated (corrupted) files on error > > +.DELETE_ON_ERROR: > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > > index c22c43bbee19..205e8c3c346a 100644 > > --- a/tools/testing/selftests/bpf/Makefile > > +++ b/tools/testing/selftests/bpf/Makefile > > @@ -626,3 +626,6 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ > > liburandom_read.so) > > > > .PHONY: docs docs-clean > > + > > +# Delete partially updated (corrupted) files on error > > +.DELETE_ON_ERROR: > > -- > > 2.37.2 > >
2022-12-18 06:35 UTC+0800 ~ Changbin Du <changbin.du@gmail.com> > Remove the empty vmlinux.h if bpftool failed to dump btf info. > The empty vmlinux.h can hide real error when reading output > of make. > > This is done by adding .DELETE_ON_ERROR special target in related > makefiles. > > Signed-off-by: Changbin Du <changbin.du@gmail.com> > --- > tools/bpf/bpftool/Makefile | 3 +++ > tools/testing/selftests/bpf/Makefile | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile > index 787b857d3fb5..313fd1b09189 100644 > --- a/tools/bpf/bpftool/Makefile > +++ b/tools/bpf/bpftool/Makefile > @@ -289,3 +289,6 @@ FORCE: > .PHONY: all FORCE bootstrap clean install-bin install uninstall > .PHONY: doc doc-clean doc-install doc-uninstall > .DEFAULT_GOAL := all > + > +# Delete partially updated (corrupted) files on error > +.DELETE_ON_ERROR: Acked-by: Quentin Monnet <quentin@isovalent.com> Thanks!
diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 787b857d3fb5..313fd1b09189 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -289,3 +289,6 @@ FORCE: .PHONY: all FORCE bootstrap clean install-bin install uninstall .PHONY: doc doc-clean doc-install doc-uninstall .DEFAULT_GOAL := all + +# Delete partially updated (corrupted) files on error +.DELETE_ON_ERROR: diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index c22c43bbee19..205e8c3c346a 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -626,3 +626,6 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ liburandom_read.so) .PHONY: docs docs-clean + +# Delete partially updated (corrupted) files on error +.DELETE_ON_ERROR: