Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 12 Jul 2019 11:45:57 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jason Gunthorpe <jgg@mellanox.com>
Cc:     Bernard Metzler <BMT@zurich.ibm.com>,
        Leon Romanovsky <leon@kernel.org>,
        Doug Ledford <dledford@redhat.com>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the net-next tree
Message-ID: <20190712114557.2b094876@canb.auug.org.au>
In-Reply-To: <20190711143302.GH25821@mellanox.com>
References: <20190711115235.GA25821@mellanox.com>
 <20190710175212.GM2887@mellanox.com>
 <20190709135636.4d36e19f@canb.auug.org.au>
 <20190709064346.GF7034@mtr-leonro.mtl.com>
 <OF360C0EBE.4A489B94-ON00258434.002B10B7-00258434.002C0536@notes.na.collabserv.com>
 <OF9A485648.9C7A28A3-ON00258434.00449B07-00258434.00449B14@notes.na.collabserv.com>
 <20190711143302.GH25821@mellanox.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/IUmAit71Bk+sk6PU6OW4=UR"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/IUmAit71Bk+sk6PU6OW4=UR
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jason,

On Thu, 11 Jul 2019 14:33:07 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> I've added this patch to the rdma tree to fix the missing locking.
>=20
> The merge resolution will be simply swapping
> for_ifa to in_dev_for_each_ifa_rtnl.

OK, I added the below merge resolution patch to the merge of the rdma
tree today (since Linus' has merged the net-next tree now).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 12 Jul 2019 11:28:30 +1000
Subject: [PATCH] RDMA: fix for removal of for_ifa()

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/infiniband/sw/siw/siw_cm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw=
/siw_cm.c
index 43f7f12e5f7f..cbea46ff6dd1 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -1951,6 +1951,7 @@ static void siw_drop_listeners(struct iw_cm_id *id)
 int siw_create_listen(struct iw_cm_id *id, int backlog)
 {
 	struct net_device *dev =3D to_siw_dev(id->device)->netdev;
+	const struct in_ifaddr *ifa;
 	int rv =3D 0, listeners =3D 0;
=20
 	siw_dbg(id->device, "id 0x%p: backlog %d\n", id, backlog);
@@ -1973,8 +1974,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlo=
g)
 			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
=20
 		rtnl_lock();
-		for_ifa(in_dev)
-		{
+		in_dev_for_each_ifa_rtnl(ifa, in_dev) {
 			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
 			    s_laddr.sin_addr.s_addr =3D=3D ifa->ifa_address) {
 				s_laddr.sin_addr.s_addr =3D ifa->ifa_address;
@@ -1986,7 +1986,6 @@ int siw_create_listen(struct iw_cm_id *id, int backlo=
g)
 					listeners++;
 			}
 		}
-		endfor_ifa(in_dev);
 		rtnl_unlock();
 		in_dev_put(in_dev);
 	} else if (id->local_addr.ss_family =3D=3D AF_INET6) {
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/IUmAit71Bk+sk6PU6OW4=UR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0n5lUACgkQAVBC80lX
0GzltQf/bL3tGcP1XbyYwX3AxXlwt2ZXDwgJZYBwSuZXTdaUOqA2zCcdiBUAurlt
sW+IecoiTghsCXQEidmQ0UbdgpW3vTOJ79tVHMGqgKKvullNW1IbcDIfDwnrOe1b
Tz5euSKYy+KchcCvZl7XpQfksI9seKhqon1PC0qXT6WmpaTRXQKNcPUuPTnyxfvh
9IO6CJyXWcscwc41KNYbbXrQYQbsaaJ88INcw2L9EZ77sFhHcqWJID8y0XFcIqVm
sfRWuWfJ7Jfuh5mFFtc3PPtQxoKhaTg9YrORNgLv06O+a6sQ+w4FDsYaZEFbINyu
4qsIzrZRU/ud4AI+bj/0UcK/7UoMZA==
=aAIK
-----END PGP SIGNATURE-----

--Sig_/IUmAit71Bk+sk6PU6OW4=UR--