Commit 92b90f78 authored by Kumar Kartikeya Dwivedi's avatar Kumar Kartikeya Dwivedi Committed by Alexei Starovoitov
Browse files

bpf: Use architecture provided res_smp_cond_load_acquire 

In v2 of rqspinlock [0], we fixed potential problems with WFE usage in
arm64 to fallback to a version copied from Ankur's series [1]. This
logic was moved into arch-specific headers in v3 [2].

However, we missed using the arch-provided res_smp_cond_load_acquire
in commit ebababcd ("rqspinlock: Hardcode cond_acquire loops for arm64")
due to a rebasing mistake between v2 and v3 of the rqspinlock series.
Fix the typo to fallback to the arm64 definition as we did in v2.

  [0]: https://lore.kernel.org/bpf/20250206105435.2159977-18-memxor@gmail.com
  [1]: https://lore.kernel.org/lkml/20250203214911.898276-1-ankur.a.arora@oracle.com
  [2]: https://lore.kernel.org/bpf/20250303152305.3195648-9-memxor@gmail.com



Fixes: ebababcd ("rqspinlock: Hardcode cond_acquire loops for arm64")
Signed-off-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20250410145512.1876745-1-memxor@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 1ddb9ad2

arch/arm64/include/asm/rqspinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 


#endif



#define res_smp_cond_load_acquire_timewait(v, c) smp_cond_load_acquire_timewait(v, c, 0, 1)

#define res_smp_cond_load_acquire(v, c) smp_cond_load_acquire_timewait(v, c, 0, 1)



#include <asm-generic/rqspinlock.h>

kernel/bpf/rqspinlock.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static noinline int check_timeout(rqspinlock_t *lock, u32 mask, 
	})

#else

#define RES_CHECK_TIMEOUT(ts, ret, mask)			      \

	({ (ret) = check_timeout(&(ts)); })

	({ (ret) = check_timeout((lock), (mask), &(ts)); })

#endif



/*