From mboxrd@z Thu Jan 1 00:00:00 1970 From: Doug Ledford Subject: Re: [GIT PULL] Please pull RDMA subsystem changes Date: Mon, 29 Apr 2019 11:42:59 -0400 Message-ID: <00c2666a46b22f004429abc9c4530bbf21fe6e43.camel@redhat.com> References: <20190428115207.GA11924@ziepe.ca> <20190429060947.GB3665@osiris> <20190429084030.GA4275@mellanox.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-mzcW/QoMlvpvSjLBBkEq" Return-path: In-Reply-To: <20190429084030.GA4275@mellanox.com> Sender: linux-kernel-owner@vger.kernel.org To: Jason Gunthorpe , Heiko Carstens Cc: Linus Torvalds , "linux-rdma@vger.kernel.org" , "linux-kernel@vger.kernel.org" List-Id: linux-rdma@vger.kernel.org --=-mzcW/QoMlvpvSjLBBkEq Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2019-04-29 at 08:40 +0000, Jason Gunthorpe wrote: > On Mon, Apr 29, 2019 at 08:09:47AM +0200, Heiko Carstens wrote: > > On Sun, Apr 28, 2019 at 11:52:12AM +0000, Jason Gunthorpe wrote: > > > Hi Linus, > > >=20 > > > Third rc pull request > > >=20 > > > Nothing particularly special here. There is a small merge conflict > > > with Adrea's mm_still_valid patches which is resolved as below: > > ... > > > Jason Gunthorpe (3): > > > RDMA/mlx5: Do not allow the user to write to the clock page > > > RDMA/mlx5: Use rdma_user_map_io for mapping BAR pages > > > RDMA/ucontext: Fix regression with disassociate > >=20 > > This doesn't compile. The patch below would fix it, but not sure if > > this is what is intended: > >=20 > > drivers/infiniband/core/uverbs_main.c: In function 'rdma_umap_fault': > > drivers/infiniband/core/uverbs_main.c:898:28: error: 'struct vm_fault' = has no member named 'vm_start' > > vmf->page =3D ZERO_PAGE(vmf->vm_start); > > ^~ > > diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband= /core/uverbs_main.c > > index 7843e89235c3..65fe89b3fa2d 100644 > > +++ b/drivers/infiniband/core/uverbs_main.c > > @@ -895,7 +895,7 @@ static vm_fault_t rdma_umap_fault(struct vm_fault *= vmf) > > =20 > > /* Read only pages can just use the system zero page. */ > > if (!(vmf->vma->vm_flags & (VM_WRITE | VM_MAYWRITE))) { > > - vmf->page =3D ZERO_PAGE(vmf->vm_start); > > + vmf->page =3D ZERO_PAGE(vmf->vma->vm_start); > > get_page(vmf->page); > > return 0; > > } > >=20 >=20 > Thanks Heiko, this looks right to me.=20 >=20 > I'm surprised to be seeing this at this point, these patches should > have been seen by 0 day for several days now, and they were in > linux-next already too.. >=20 > Doug, can you send this to Linus today? Yep. --=20 Doug Ledford GPG KeyID: B826A3330E572FDD Key fingerprint =3D AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD --=-mzcW/QoMlvpvSjLBBkEq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEErmsb2hIrI7QmWxJ0uCajMw5XL90FAlzHG4MACgkQuCajMw5X L91tQhAAta0q1pZ9kNDLRR7iMYU1dTbBuzlfyv6/bwsyY8C8SQt7TY2Q3vyNBHAp AOuQcDMTAg7FT2EqIATXrSlPOA+mt132MO0HvgPydt/iBNW6LGQCvwW/Kevn5NMk /G6P8SpV58YMJKotRTdD0dd2t8uQgx6Cqlq+d/Us88ioHFMvztDvJ4ztfaAdvhdV 1reQwGmItiu1LSZZXqKrjC2oQ01jZNopWkiywZ/NLW5FXIBgnTgKXe2D8XcbeE/I /mEgc5V7wmncHLQaL+WvikRhzf10uz4nqXX4IchNHgX0ic/+ps/jhVYPAsko4Chn p6nGvr9Jv9Zc/I0wOzlJjiROqtGgjGsz+ZvYfozDQCFK4f0Ui1j6z9UO7LRpjkue MBksv0aYZSEX0Y8i6rVu4VBPs+oHStPtFn04W5IS0Emxb/W/+f02uRNm6PkzeNTQ PdCbepECCnqduhSmUWYLMNmma8+tkmzYUneDxacVfX5RZg5q4M0jPBNV8sCHoqyQ lmjrd17h33ddNtdy4Ai0o05IrPowdk+byc/cVuusGyCs4UUEyVJBuf9r+aoN3yp5 PaBphMczFQQtnhZgHsZoMe7yATmTyrHPwCXAsxsrtSaCJ6ivDbzdoERgn+QK971F 0X4i6SL94TSGR0yOLSJfbcTlRVq0aYmUvN6FbjjoFt+b880eg74= =zkfn -----END PGP SIGNATURE----- --=-mzcW/QoMlvpvSjLBBkEq--