From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E32EC32771 for ; Wed, 15 Jan 2020 17:44:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 46E552077B for ; Wed, 15 Jan 2020 17:44:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Lydwo7gZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728946AbgAORof (ORCPT ); Wed, 15 Jan 2020 12:44:35 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:42857 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbgAORoe (ORCPT ); Wed, 15 Jan 2020 12:44:34 -0500 Received: by mail-qk1-f196.google.com with SMTP id z14so16438752qkg.9; Wed, 15 Jan 2020 09:44:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=m6xoPR2neNY7jGKcJU1Zrb+VdDyMT3eChB1zKABN77U=; b=Lydwo7gZw7DHX1UX8PkZjddlzWtbrHgVeBQKfmcbrQQ2zg8nr/TdBbQ0YxU/giO6aR 0TtxdBx4nVycooprexn/hDVNpFgiO3kl/AZtSSRBWfN8PJBDtoAaGV8NXDjphuCPPBxp sZ3t/cssjIigtX52RPxYRbfFD/41u4kxFdKs3hbXB5G3TAUn1bWfkWEXLxEMmvxxZtHH +hOLJto3HpzQxG8aOR1mIKwluA8te3ndO6L3iXF0XJAVtm/APh5WX5pLxsKq8VzJ9HmM x43V4757USzVgJFMzq0KU3H6VMStTxObsDnscBV90st+SHjNON+mpEBnSv8/WF2CaojS 7vbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=m6xoPR2neNY7jGKcJU1Zrb+VdDyMT3eChB1zKABN77U=; b=o/xVT8Tj9vMo44AepvlwbW84JKFRXKlHle20cu1RGpjPqxwSSxmhTGIVDbBmmPAE8M YqLnr50OQ8+15ahAVFyuesLbYDEgyGod7qDtKlXMx3FcPWOs3vr01pEhRtlHw97abq+2 3dWcRG5BM70GeIn/zEdwinSsQD4uc0a4pkkdpdSxIW3+Aiif5pK+0ySfeojeIBdkV6xg +NbQxNKxYbvtFFX3nuXnhyHtIVlCAuxI0i8K6peI+9OSvHfdcLNRCEnJKC8X4WP01oXI GUJakXeasojiyDHmv7+E9HLrW1vGAthEWpSOyix9vnZLfwLsc2CCBce18tqPmFQrGY6S oqSA== X-Gm-Message-State: APjAAAVko4lL37oIC5cdyysbTEBK6RFFd1Ue3ij6jRvLC1baA/TtEc2d L1dgd2u5l2LEDtGH8gRUrw1VSvgjtmDRqW08MDA= X-Google-Smtp-Source: APXvYqzVE7hG98oGxZ/GsYNMIScGI3tkchCjPm5Bw57HzNx39uCyOLh6ur5DFPK7G8zjO1kCh1N9vis1zB3NdNxq8Vw= X-Received: by 2002:a05:620a:14a2:: with SMTP id x2mr28882285qkj.36.1579110273560; Wed, 15 Jan 2020 09:44:33 -0800 (PST) MIME-Version: 1.0 References: <157909756858.1192265.6657542187065456112.stgit@toke.dk> <157909757421.1192265.7677168164515639742.stgit@toke.dk> In-Reply-To: <157909757421.1192265.7677168164515639742.stgit@toke.dk> From: Andrii Nakryiko Date: Wed, 15 Jan 2020 09:44:22 -0800 Message-ID: Subject: Re: [PATCH bpf-next v2 05/10] bpftool: Use consistent include paths for libbpf To: =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Cc: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , Doug Ledford , Jason Gunthorpe , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Shuah Khan , Networking , bpf , open list , linux-rdma@vger.kernel.org, "open list:KERNEL SELFTEST FRAMEWORK" , clang-built-linux@googlegroups.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org On Wed, Jan 15, 2020 at 6:14 AM Toke H=C3=B8iland-J=C3=B8rgensen wrote: > > From: Toke H=C3=B8iland-J=C3=B8rgensen > > Fix bpftool to include libbpf header files with the bpf/ prefix, to be > consistent with external users of the library. Also ensure that all > includes of exported libbpf header files (those that are exported on 'mak= e > install' of the library) use bracketed includes instead of quoted. > > To make sure no new files are introduced that doesn't include the bpf/ > prefix in its include, remove tools/lib/bpf from the include path entirel= y, > and use tools/lib instead. > > Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken f= rom selftests dir") > Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen > --- > tools/bpf/bpftool/Documentation/bpftool-gen.rst | 2 +- > tools/bpf/bpftool/Makefile | 2 +- > tools/bpf/bpftool/btf.c | 8 ++++---- > tools/bpf/bpftool/btf_dumper.c | 2 +- > tools/bpf/bpftool/cgroup.c | 2 +- > tools/bpf/bpftool/common.c | 4 ++-- > tools/bpf/bpftool/feature.c | 4 ++-- > tools/bpf/bpftool/gen.c | 10 +++++----- > tools/bpf/bpftool/jit_disasm.c | 2 +- > tools/bpf/bpftool/main.c | 4 ++-- > tools/bpf/bpftool/map.c | 4 ++-- > tools/bpf/bpftool/map_perf_ring.c | 4 ++-- > tools/bpf/bpftool/net.c | 8 ++++---- > tools/bpf/bpftool/netlink_dumper.c | 4 ++-- > tools/bpf/bpftool/perf.c | 2 +- > tools/bpf/bpftool/prog.c | 6 +++--- > tools/bpf/bpftool/xlated_dumper.c | 2 +- > 17 files changed, 35 insertions(+), 35 deletions(-) > [...] > diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c > index 7ce09a9a6999..b0695aa543d2 100644 > --- a/tools/bpf/bpftool/gen.c > +++ b/tools/bpf/bpftool/gen.c > @@ -12,15 +12,15 @@ > #include > #include > #include > -#include > -#include > +#include > +#include > #include > #include > #include > #include > +#include > > -#include "btf.h" > -#include "libbpf_internal.h" > +#include "bpf/libbpf_internal.h" > #include "json_writer.h" > #include "main.h" > > @@ -333,7 +333,7 @@ static int do_skeleton(int argc, char **argv) > #define %2$s = \n\ > = \n\ > #include = \n\ > - #include = \n\ > + #include \n\ please fix \n\ alignment > = \n\ > struct %1$s { = \n\ > struct bpf_object_skeleton *skeleton; = \n\ [...]