Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Thu, 28 Sep 2023 11:38:51 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@mellanox.com>
Cc:     Leon Romanovsky <leon@kernel.org>,
        Leon Romanovsky <leonro@nvidia.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michael Guralnik <michaelgur@nvidia.com>,
        Shay Drory <shayd@nvidia.com>
Subject: linux-next: manual merge of the rdma tree with the rdma-fixes tree
Message-ID: <20230928113851.5197a1ec@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/=fDGhJ7S8ak69Dru.Q2TNgK";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/=fDGhJ7S8ak69Dru.Q2TNgK
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the rdma tree got a conflict in:

  drivers/infiniband/hw/mlx5/mr.c

between commit:

  374012b00457 ("RDMA/mlx5: Fix mkey cache possible deadlock on cleanup")

from the rdma-fixes tree and commit:

  57e7071683ef ("RDMA/mlx5: Implement mkeys management via LIFO queue")

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/infiniband/hw/mlx5/mr.c
index 433f96459246,b0fa2d644973..000000000000
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@@ -1025,21 -998,15 +999,21 @@@ void mlx5_mkey_cache_cleanup(struct mlx
  	if (!dev->cache.wq)
  		return;
 =20
 -	cancel_delayed_work_sync(&dev->cache.remove_ent_dwork);
  	mutex_lock(&dev->cache.rb_lock);
 +	dev->cache.disable =3D true;
  	for (node =3D rb_first(root); node; node =3D rb_next(node)) {
  		ent =3D rb_entry(node, struct mlx5_cache_ent, node);
- 		xa_lock_irq(&ent->mkeys);
+ 		spin_lock_irq(&ent->mkeys_queue.lock);
  		ent->disabled =3D true;
- 		xa_unlock_irq(&ent->mkeys);
+ 		spin_unlock_irq(&ent->mkeys_queue.lock);
 -		cancel_delayed_work_sync(&ent->dwork);
  	}
 +	mutex_unlock(&dev->cache.rb_lock);
 +
 +	/*
 +	 * After all entries are disabled and will not reschedule on WQ,
 +	 * flush it and all async commands.
 +	 */
 +	flush_workqueue(dev->cache.wq);
 =20
  	mlx5_mkey_cache_debugfs_cleanup(dev);
  	mlx5_cmd_cleanup_async_ctx(&dev->async_ctx);

--Sig_/=fDGhJ7S8ak69Dru.Q2TNgK
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUU2SsACgkQAVBC80lX
0GxlKwf9GOM0/j7jLDM6oRP7xmR/7OTwq3Wqe0DCfc7my605pzw8TcAzxKmWECeG
3GQJ4+1DZ+ynWMONgTwLdJFdPadtlGzKkZK1augN6YunUtgddawRUUXNy/JTW70z
LwUTGrPbsLZGJC33UjehR4OymRspKENPisxT6klEgZ+ZWdZSNO7NTqCm3uhx5uiv
0pzVof94F44jxorl8ED0K8T3Gmui9y16vWQHDJo1/JiX+jpKl7WQERe7s+mMH89I
kaTQz/gR8Vmr2GfGCMFDhFdVdWK2ZtbZSkFYRyDCFQT2gUghzGAT2lpgEr+M7qTb
UKO+WbEwo1YkiuAYqrp/3Wc//OAWVA==
=7EBH
-----END PGP SIGNATURE-----

--Sig_/=fDGhJ7S8ak69Dru.Q2TNgK--