[PATCH] bpf: fix build error with clang

[PATCH] bpf: fix build error with clang

[Stefan Agner]

Building the newly introduced BPF_PROG_TYPE_SK_REUSEPORT leads to
a compile time error when building with clang:
net/core/filter.o: In function `sk_reuseport_convert_ctx_access':
  ../net/core/filter.c:7284: undefined reference to `__compiletime_assert_7284'

It seems that clang has issues resolving hweight_long at compile
time. Since SK_FL_PROTO_MASK is a constant, we can use the interface
for known constant arguments which works fine with clang.

Fixes: 2dbb9b9e6df6 ("bpf: Introduce BPF_PROG_TYPE_SK_REUSEPORT")
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 net/core/filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index c25eb36f1320..7a2430945c71 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -7281,7 +7281,7 @@ static u32 sk_reuseport_convert_ctx_access(enum bpf_access_type type,
 		break;
 
 	case offsetof(struct sk_reuseport_md, ip_protocol):
-		BUILD_BUG_ON(hweight_long(SK_FL_PROTO_MASK) != BITS_PER_BYTE);
+		BUILD_BUG_ON(HWEIGHT32(SK_FL_PROTO_MASK) != BITS_PER_BYTE);
 		SK_REUSEPORT_LOAD_SK_FIELD_SIZE_OFF(__sk_flags_offset,
 						    BPF_W, 0);
 		*insn++ = BPF_ALU32_IMM(BPF_AND, si->dst_reg, SK_FL_PROTO_MASK);
-- 
2.18.0

Re: [PATCH] bpf: fix build error with clang

[Alexei Starovoitov]

On Mon, Aug 27, 2018 at 09:30:42PM +0200, Stefan Agner wrote:
> Building the newly introduced BPF_PROG_TYPE_SK_REUSEPORT leads to
> a compile time error when building with clang:
> net/core/filter.o: In function `sk_reuseport_convert_ctx_access':
>   ../net/core/filter.c:7284: undefined reference to `__compiletime_assert_7284'
> 
> It seems that clang has issues resolving hweight_long at compile
> time. Since SK_FL_PROTO_MASK is a constant, we can use the interface
> for known constant arguments which works fine with clang.
> 
> Fixes: 2dbb9b9e6df6 ("bpf: Introduce BPF_PROG_TYPE_SK_REUSEPORT")
> Signed-off-by: Stefan Agner <stefan@agner.ch>

Applied, Thanks