| From 4ffda7421bd532d73ac381202ed17677619de430 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 Aug 2020 08:19:41 +0200 |
| Subject: IB/mlx4: Adjust delayed work when a dup is observed |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Håkon Bugge <haakon.bugge@oracle.com> |
| |
| [ 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 | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c |
| index 5dc920fe13269..c8c586c78d071 100644 |
| --- 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); |
| -- |
| 2.25.1 |
| |
