diff options
author | Håkon Bugge <haakon.bugge@oracle.com> | 2020-08-03 08:19:41 +0200 |
---|---|---|
committer | Jason Gunthorpe <jgg@nvidia.com> | 2020-08-24 11:31:22 -0300 |
commit | 785167a114855c5aa75efca97000e405c2cc85bf (patch) | |
tree | c203e448f2a4bce2c02ee2f879669e8815b1708a /drivers/infiniband/hw/mlx4 | |
parent | IB/mlx4: Add support for REJ due to timeout (diff) | |
download | linux-dev-785167a114855c5aa75efca97000e405c2cc85bf.tar.xz linux-dev-785167a114855c5aa75efca97000e405c2cc85bf.zip |
IB/mlx4: Adjust delayed work when a dup is observed
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>
Diffstat (limited to 'drivers/infiniband/hw/mlx4')
-rw-r--r-- | drivers/infiniband/hw/mlx4/cm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c index b10737f74449..0ce4b5a3ffa7 100644 --- a/drivers/infiniband/hw/mlx4/cm.c +++ b/drivers/infiniband/hw/mlx4/cm.c @@ -291,6 +291,9 @@ static void schedule_delayed(struct ib_device *ibdev, struct id_map_entry *id) if (!sriov->is_going_down && !id->scheduled_delete) { 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); |