Skip to content

rqspinlock: Annotate rqspinlock lock acquiring functions with __must_check #6409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: bpf-next_base
Choose a base branch
from
+34 −22
Open

rqspinlock: Annotate rqspinlock lock acquiring functions with __must_check #6409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cdb26d
rqspinlock: Annotate rqspinlock lock acquiring functions with __must_…
ameryhung Nov 21, 2025
ebb10cf
rqspinlock: Handle return of raw_res_spin_lock{_irqsave} in locktorture
ameryhung Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions include/asm-generic/rqspinlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static __always_inline void release_held_lock_entry(void)
* * -EDEADLK - Lock acquisition failed because of AA/ABBA deadlock.
* * -ETIMEDOUT - Lock acquisition failed because of timeout.
*/
static __always_inline int res_spin_lock(rqspinlock_t *lock)
static __always_inline __must_check int res_spin_lock(rqspinlock_t *lock)
{
int val = 0;

Expand Down Expand Up @@ -223,27 +223,36 @@ static __always_inline void res_spin_unlock(rqspinlock_t *lock)
#define raw_res_spin_lock_init(lock) ({ *(lock) = (rqspinlock_t){0}; })
#endif

#define raw_res_spin_lock(lock) \
({ \
int __ret; \
preempt_disable(); \
__ret = res_spin_lock(lock); \
if (__ret) \
preempt_enable(); \
__ret; \
})
static __always_inline __must_check int raw_res_spin_lock(rqspinlock_t *lock)
{
int ret;

preempt_disable();
ret = res_spin_lock(lock);
if (ret)
preempt_enable();

return ret;
}

#define raw_res_spin_unlock(lock) ({ res_spin_unlock(lock); preempt_enable(); })

#define raw_res_spin_lock_irqsave(lock, flags) \
({ \
int __ret; \
local_irq_save(flags); \
__ret = raw_res_spin_lock(lock); \
if (__ret) \
local_irq_restore(flags); \
__ret; \
})
static __always_inline __must_check int
__raw_res_spin_lock_irqsave(rqspinlock_t *lock, unsigned long *flags)
{
unsigned long __flags;
int ret;

local_irq_save(__flags);
ret = raw_res_spin_lock(lock);
if (ret)
local_irq_restore(__flags);

*flags = __flags;
return ret;
}

#define raw_res_spin_lock_irqsave(lock, flags) __raw_res_spin_lock_irqsave(lock, &flags)

#define raw_res_spin_unlock_irqrestore(lock, flags) ({ raw_res_spin_unlock(lock); local_irq_restore(flags); })

Expand Down
9 changes: 6 additions & 3 deletions kernel/locking/locktorture.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,7 @@ static rqspinlock_t rqspinlock;

static int torture_raw_res_spin_write_lock(int tid __maybe_unused)
{
raw_res_spin_lock(&rqspinlock);
return 0;
return raw_res_spin_lock(&rqspinlock);
}

static void torture_raw_res_spin_write_unlock(int tid __maybe_unused)
Expand All @@ -392,8 +391,12 @@ static struct lock_torture_ops raw_res_spin_lock_ops = {
static int torture_raw_res_spin_write_lock_irq(int tid __maybe_unused)
{
unsigned long flags;
int err;

err = raw_res_spin_lock_irqsave(&rqspinlock, flags);
if (err)
return err;

raw_res_spin_lock_irqsave(&rqspinlock, flags);
cxt.cur_ops->flags = flags;
return 0;
}
Expand Down
Loading