projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16fc7bf
)
IB/mlx4: Adjust delayed work when a dup is observed
author
Håkon Bugge
<haakon.bugge@oracle.com>
Mon, 3 Aug 2020 06:19:41 +0000
(08:19 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 08:05:37 +0000
(09:05 +0100)
[ Upstream commit
785167a114855c5aa75efca97000e405c2cc85bf
]
When scheduling delayed work to clean up the cache, if the entry already
has been scheduled for deletion, we adjust the delay.
Fixes:
3cf69cc8dbeb
("IB/mlx4: Add CM paravirtualization")
Link:
https://lore.kernel.org/r/20200803061941.1139994-7-haakon.bugge@oracle.com
Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/hw/mlx4/cm.c
patch
|
blob
|
history
diff --git
a/drivers/infiniband/hw/mlx4/cm.c
b/drivers/infiniband/hw/mlx4/cm.c
index
5dc920f
..
c8c586c
100644
(file)
--- a/
drivers/infiniband/hw/mlx4/cm.c
+++ b/
drivers/infiniband/hw/mlx4/cm.c
@@
-309,6
+309,9
@@
static void schedule_delayed(struct ib_device *ibdev, struct id_map_entry *id)
if (!sriov->is_going_down) {
id->scheduled_delete = 1;
schedule_delayed_work(&id->timeout, CM_CLEANUP_CACHE_TIMEOUT);
+ } else if (id->scheduled_delete) {
+ /* Adjust timeout if already scheduled */
+ mod_delayed_work(system_wq, &id->timeout, CM_CLEANUP_CACHE_TIMEOUT);
}
spin_unlock_irqrestore(&sriov->going_down_lock, flags);
spin_unlock(&sriov->id_map_lock);