On Wed, Oct 25, 2023 at 08:49:59PM +0300, Leon Romanovsky wrote: > From: Moshe Shemesh <moshe@xxxxxxxxxx> > > The cited patch tries to ensure no pending works on the mkey cache > workqueue by disabling adding new works and call flush_workqueue(). > But this workqueue also has delayed works which might still be pending > the delay time to be queued. > > Add cancel_delayed_work() for the delayed works which waits to be queued > and then the flush_workqueue() will flush all works which are already > queued and running. > > Fixes: 374012b00457 ("RDMA/mlx5: Fix mkey cache possible deadlock on cleanup") > Signed-off-by: Moshe Shemesh <moshe@xxxxxxxxxx> > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx> > --- > drivers/infiniband/hw/mlx5/mr.c | 2 ++ > 1 file changed, 2 insertions(+) Applied to for-next, thanks Jason