[PATCH bpf-next] libbpf: Fix arm64 build

[PATCH bpf-next] libbpf: Fix arm64 build

[Jean-Philippe Brucker]

The macro for libbpf_smp_store_release() doesn't build on arm64, fix it.

Fixes: 60d0e5fdbdf6 ("libbpf, xsk: Add libbpf_smp_store_release libbpf_smp_load_acquire")
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
 tools/lib/bpf/libbpf_util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/bpf/libbpf_util.h b/tools/lib/bpf/libbpf_util.h
index 94a0d7bb6f3c..cfbcfc063c81 100644
--- a/tools/lib/bpf/libbpf_util.h
+++ b/tools/lib/bpf/libbpf_util.h
@@ -35,7 +35,7 @@ extern "C" {
 		typeof(*p) ___p1;					\
 		asm volatile ("ldar %w0, %1"				\
 			      : "=r" (___p1) : "Q" (*p) : "memory");	\
-		__p1;							\
+		___p1;							\
 	})
 #elif defined(__riscv)
 # define libbpf_smp_store_release(p, v)					\
-- 
2.30.1

Re: [PATCH bpf-next] libbpf: Fix arm64 build

[Andrii Nakryiko]

On Mon, Mar 8, 2021 at 10:26 AM Jean-Philippe Brucker
<jean-philippe@linaro.org> wrote:
>
> The macro for libbpf_smp_store_release() doesn't build on arm64, fix it.
>
> Fixes: 60d0e5fdbdf6 ("libbpf, xsk: Add libbpf_smp_store_release libbpf_smp_load_acquire")

I had to force-push bpf-next meanwhile, so the hash is wrong now. I
fixed it up (it's 291471dd1559 now) and pushed your fix to bpf-next.
Please re-pull bpf-master to get the correct branch.

Thanks!

> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> ---
>  tools/lib/bpf/libbpf_util.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/lib/bpf/libbpf_util.h b/tools/lib/bpf/libbpf_util.h
> index 94a0d7bb6f3c..cfbcfc063c81 100644
> --- a/tools/lib/bpf/libbpf_util.h
> +++ b/tools/lib/bpf/libbpf_util.h
> @@ -35,7 +35,7 @@ extern "C" {
>                 typeof(*p) ___p1;                                       \
>                 asm volatile ("ldar %w0, %1"                            \
>                               : "=r" (___p1) : "Q" (*p) : "memory");    \
> -               __p1;                                                   \
> +               ___p1;                                                  \
>         })
>  #elif defined(__riscv)
>  # define libbpf_smp_store_release(p, v)                                        \
> --
> 2.30.1
>

Re: [PATCH bpf-next] libbpf: Fix arm64 build

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (refs/heads/master):

On Mon,  8 Mar 2021 19:25:22 +0100 you wrote:
> The macro for libbpf_smp_store_release() doesn't build on arm64, fix it.
> 
> Fixes: 60d0e5fdbdf6 ("libbpf, xsk: Add libbpf_smp_store_release libbpf_smp_load_acquire")
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> ---
>  tools/lib/bpf/libbpf_util.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Here is the summary with links:
  - [bpf-next] libbpf: Fix arm64 build
    https://git.kernel.org/bpf/bpf-next/c/a6aac408c561

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html