From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Ian Rogers <irogers@google.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] lib/bpf hashmap: increase portability
Date: Wed, 6 May 2020 14:33:37 -0700 [thread overview]
Message-ID: <CAEf4BzZRmiEds_8R8g4vaAeWvJzPb4xYLnpF0X2VNY8oTzkphQ@mail.gmail.com> (raw)
In-Reply-To: <20200506205257.8964-2-irogers@google.com>
On Wed, May 6, 2020 at 1:54 PM Ian Rogers <irogers@google.com> wrote:
>
> Don't include libbpf_internal.h as it is unused and has conflicting
> definitions, for example, with tools/perf/util/debug.h.
> Fix a non-glibc include path.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/lib/bpf/hashmap.h | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/lib/bpf/hashmap.h b/tools/lib/bpf/hashmap.h
> index bae8879cdf58..d5ef212a55ba 100644
> --- a/tools/lib/bpf/hashmap.h
> +++ b/tools/lib/bpf/hashmap.h
> @@ -13,9 +13,8 @@
> #ifdef __GLIBC__
> #include <bits/wordsize.h>
> #else
> -#include <bits/reg.h>
> +#include <linux/bitops.h>
why this change? It might be ok for libbpf built from kernel source,
but it will break Github libbpf.
> #endif
> -#include "libbpf_internal.h"
Dropping this seems ok, don't remember why I had it here in the first place.
>
> static inline size_t hash_bits(size_t h, int bits)
> {
> --
> 2.26.2.526.g744177e7f7-goog
>
next prev parent reply other threads:[~2020-05-06 21:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 20:52 [PATCH 0/2] lib/bpf hashmap portability and fix Ian Rogers
2020-05-06 20:52 ` [PATCH 1/2] lib/bpf hashmap: increase portability Ian Rogers
2020-05-06 21:33 ` Andrii Nakryiko [this message]
2020-05-06 21:47 ` Ian Rogers
2020-05-06 21:56 ` Andrii Nakryiko
2020-05-06 22:13 ` Ian Rogers
2020-05-06 20:52 ` [PATCH 2/2] lib/bpf hashmap: fixes to hashmap__clear Ian Rogers
2020-05-06 21:36 ` Andrii Nakryiko
2020-05-06 21:53 ` Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAEf4BzZRmiEds_8R8g4vaAeWvJzPb4xYLnpF0X2VNY8oTzkphQ@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=irogers@google.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).