Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 10:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dm-delay: remove timer_lock

Browse Source 
Instead of manually checking the timer details in queue_timeout(), call
timer_reduce() to start the timer or reduce the expiration time. This
avoids needing a lock.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
This commit is contained in:
Benjamin Marzinski 2024-05-07 17:16:25 -04:00 committed by Mike Snitzer
parent c542ee1492
commit 8b21ac87d5
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/md/dm-delay.c
View File

@ -28,7 +28,6 @@ struct delay_class {
struct delay_c { struct delay_c {
struct timer_list delay_timer; struct timer_list delay_timer;
struct mutex timer_lock;
struct mutex process_bios_lock; /* hold while removing bios to be processed from list */ struct mutex process_bios_lock; /* hold while removing bios to be processed from list */
spinlock_t delayed_bios_lock; /* hold on all accesses to delayed_bios list */ spinlock_t delayed_bios_lock; /* hold on all accesses to delayed_bios list */
struct workqueue_struct *kdelayd_wq; struct workqueue_struct *kdelayd_wq;
@ -60,12 +59,7 @@ static void handle_delayed_timer(struct timer_list *t)
static void queue_timeout(struct delay_c *dc, unsigned long expires) static void queue_timeout(struct delay_c *dc, unsigned long expires)
{ {
mutex_lock(&dc->timer_lock); timer_reduce(&dc->delay_timer, expires);
if (!timer_pending(&dc->delay_timer) || expires < dc->delay_timer.expires)
mod_timer(&dc->delay_timer, expires);
mutex_unlock(&dc->timer_lock);
} }
static inline bool delay_is_fast(struct delay_c *dc) static inline bool delay_is_fast(struct delay_c *dc)
@ -176,7 +170,6 @@ static void delay_dtr(struct dm_target *ti)
kthread_stop(dc->worker); kthread_stop(dc->worker);
mutex_destroy(&dc->process_bios_lock); mutex_destroy(&dc->process_bios_lock);
mutex_destroy(&dc->timer_lock);
kfree(dc); kfree(dc);
} }
@ -234,7 +227,6 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
ti->private = dc; ti->private = dc;
INIT_LIST_HEAD(&dc->delayed_bios); INIT_LIST_HEAD(&dc->delayed_bios);
mutex_init(&dc->timer_lock);
mutex_init(&dc->process_bios_lock); mutex_init(&dc->process_bios_lock);
spin_lock_init(&dc->delayed_bios_lock); spin_lock_init(&dc->delayed_bios_lock);
dc->may_delay = true; dc->may_delay = true;