bpf: Cleanup unused func args in rqspinlock implementation
PATCH 1/1 bpf: Cleanup unused func args in rqspinlock implementation
cleanup unused function args in check_deadlock* functions.
Fixes 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery")
Signed-off-by Siddharth Chintamaneni <[email protected]>
--- kernel/bpf/rqspinlock.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
kernel/bpf/rqspinlock.c +8 -11
@@ -89,15 +89,14 @@ struct rqspinlock_timeout { DEFINE_PER_CPU_ALIGNED(struct rqspinlock_held, rqspinlock_held_locks);EXPORT_SYMBOL_GPL (rqspinlock_held_locks); -static bool is_lock_released (rqspinlock_t *lock,u32 mask,struct rqspinlock_timeout *ts) +static bool is_lock_released (rqspinlock_t *lock,u32 mask) {if (!(atomic_read_acquire (&lock->val) & (mask)))return true;return false; } -static noinline int check_deadlock_AA(rqspinlock_t *lock, u32 mask, -struct rqspinlock_timeout *ts) +static noinline int check_deadlock_AA(rqspinlock_t *lock) {struct rqspinlock_held *rqh =this_cpu_ptr (&rqspinlock_held_locks);int cnt =min (RES_NR_HELD , rqh->cnt);
@@ -118,8 +117,7 @@ static noinline int check_deadlock_AA(rqspinlock_t *lock, u32 mask,* more locks, which reduce to ABBA). This is not exhaustive, and we rely on * timeouts as the final line of defense. */ -static noinline int check_deadlock_ABBA(rqspinlock_t *lock, u32 mask, -struct rqspinlock_timeout *ts) +static noinline int check_deadlock_ABBA(rqspinlock_t *lock, u32 mask) {struct rqspinlock_held *rqh =this_cpu_ptr (&rqspinlock_held_locks);int rqh_cnt =min (RES_NR_HELD , rqh->cnt);
@@ -142,7 +140,7 @@ static noinline int check_deadlock_ABBA(rqspinlock_t *lock, u32 mask,* Let's ensure to break out of this loop if the lock is available for * us to potentially acquire. */ -if (is_lock_released (lock, mask, ts)) +if (is_lock_released (lock, mask))return 0 ;/*
@@ -198,15 +196,14 @@ static noinline int check_deadlock_ABBA(rqspinlock_t *lock, u32 mask,return 0 ; } -static noinline int check_deadlock(rqspinlock_t *lock, u32 mask, -struct rqspinlock_timeout *ts) +static noinline int check_deadlock(rqspinlock_t *lock, u32 mask) {int ret; - ret =check_deadlock_AA (lock, mask, ts); + ret =check_deadlock_AA (lock);if (ret)return ret; - ret =check_deadlock_ABBA (lock, mask, ts); + ret =check_deadlock_ABBA (lock, mask);if (ret)return ret;
@@ -234,7 +231,7 @@ static noinline int check_timeout(rqspinlock_t *lock, u32 mask,*/ if (prev +NSEC_PER_MSEC < time) { ts->cur = time; -return check_deadlock (lock, mask, ts); +return check_deadlock (lock, mask); }return 0 ;
Signature · 1 line
2.43.0
Quoted 5 lines · Siddharth Chintamaneni
cleanup unused function args in check_deadlock* functions.
Fixes 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery")Signed-off-by Siddharth Chintamaneni <[email protected]>---
Surprisingly, the parameters are unused indeed (and I don't see conditional compilation paths that use these parameters).
Reviewed-by Eduard Zingerman <[email protected]>
[...]
Quoted 6 lines · Siddharth Chintamaneni
cleanup unused function args in check_deadlock* functions.
Fixes 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery")Signed-off-by Siddharth Chintamaneni <[email protected]>---
Quoted 1 line
[...]
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 7 lines · On Wed, 1 Oct 2025 17:27:02 +0000 you wrote:
cleanup unused function args in check_deadlock* functions.
Fixes 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery")Signed-off-by Siddharth Chintamaneni <[email protected]>--- kernel/bpf/rqspinlock.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
Here is the summary with links:
- [bpf-next] bpf: Cleanup unused func args in rqspinlock implementation
https://git.kernel.org/bpf/bpf-next/c/56b4d162392d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html