Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp3850375yba; Mon, 29 Apr 2019 09:30:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqx22LtV34S8l3hYgeEy+7Wrf1E1d9c1EqaeMTG1hCDnjTDm2JFsv92o4mBdRoLGeZpbCGCN X-Received: by 2002:a63:f64f:: with SMTP id u15mr51930344pgj.192.1556555455067; Mon, 29 Apr 2019 09:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556555455; cv=none; d=google.com; s=arc-20160816; b=wUwYWuXo5CdRHoR9B+DhLZS+7aNbBc2EPyc91MFI1RVhE9yskxjPY1J+Ju4jhJrvbT hW38wmmzGysRMAmp5FFSRVIKiO9JtzamCKsgkhtpEASWr14n6QWttDpeTm1NF15XxDQU DW6/peAUtOWtzCtNnGBUHJVwNIml0XUKB5mkDU47c0hvSkyDWQ9nCUX158jGnTdhP7aj 1BrD4SiFpogWFDNn6E9w9sjoo/bIfLRx8wVVlOJChRmfk0QoJM8Ge5/LN0kA3nJTh5/3 EZP5/nh7PQzKld2jNJu1CLjRi0QACUyPB5hArSb+JiyANarLvpW7kTqDvve7ZDa66wRo WiFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:organization :references:in-reply-to:date:cc:to:from:subject:message-id; bh=iXYRvaYCRpkgqq1nbcuY82VPBA4QTXRYx0huw8O4Yoo=; b=aMallgwwe7MLvrEyey5+clL9hrx/KxdTt3s9eD4h7VfS8u5g0ISd1BpRpgN3B8MFuy IfPwui577GUuZ04JJjWYD5JXrOetHv/NFU9N91xsGP/ytAIl6skntv5m+lJWZ5upK6z1 njrHw8Ca8hVrSgknR53VrG6NRqjMYIykE961KkFmjQM5hZaWU6GF91ZfJgI1mUdzNZZc zAfLLZf2dYrTywueFuJSTNIAGZudshWjt5zqar6lg2w/DzxhF3NgBHhPAeOaNg2om79f mgICeQaH4/shkPKuXr14pkzRyYvvwYo0rpxW6eQQns+MMWRsKlnSMwZr1XTh4L1KSpyw gMMQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 30si33669201plb.235.2019.04.29.09.30.38; Mon, 29 Apr 2019 09:30:55 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728767AbfD2Q3P (ORCPT + 99 others); Mon, 29 Apr 2019 12:29:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46908 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728518AbfD2Q3O (ORCPT ); Mon, 29 Apr 2019 12:29:14 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2FEF53086225; Mon, 29 Apr 2019 16:29:14 +0000 (UTC) Received: from haswell-e.nc.xsintricity.com (ovpn-112-9.rdu2.redhat.com [10.10.112.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19B045D75D; Mon, 29 Apr 2019 16:29:12 +0000 (UTC) Message-ID: Subject: Re: [GIT PULL] Please pull RDMA subsystem changes From: Doug Ledford To: Jason Gunthorpe , Heiko Carstens Cc: Linus Torvalds , "linux-rdma@vger.kernel.org" , "linux-kernel@vger.kernel.org" Date: Mon, 29 Apr 2019 12:29:10 -0400 In-Reply-To: <00c2666a46b22f004429abc9c4530bbf21fe6e43.camel@redhat.com> References: <20190428115207.GA11924@ziepe.ca> <20190429060947.GB3665@osiris> <20190429084030.GA4275@mellanox.com> <00c2666a46b22f004429abc9c4530bbf21fe6e43.camel@redhat.com> Organization: Red Hat, Inc. Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-GOYXXzF9KHU36Ho3xOiV" User-Agent: Evolution 3.30.5 (3.30.5-1.fc29) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 29 Apr 2019 16:29:14 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-GOYXXzF9KHU36Ho3xOiV Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2019-04-29 at 11:42 -0400, Doug Ledford wrote: > 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/infiniba= nd/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? >=20 > Yep. >=20 Done. --=20 Doug Ledford GPG KeyID: B826A3330E572FDD Key fingerprint =3D AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD --=-GOYXXzF9KHU36Ho3xOiV Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEErmsb2hIrI7QmWxJ0uCajMw5XL90FAlzHJlYACgkQuCajMw5X L91yvw//Ys2rV6w8YAjYEgeCwgJYzp6rraX9/ElJrYwnobStfgcjEddCY4QiO69g yO9vMgHqcqmgp/WAKgDKu35vthZE6zgmuS6f80ZJ0eKYLcGfGDeeVREZfZEmjx+a /EG/UA5Vb5N12ek8Y3Yy5Qk2uzoVjgOmKenPMxh+1SG1STNVwcp6st3TX6J35KkJ Af3w8etl1t2nEueESciJt6DiOXf7Gxrg2MF1un2hhPgHLiicu24GC4RRTyyuNUCj 6rcYKqXh5Fr/NyiIjrQo9uGmfVkeZYoE5ZQQ4cf6MteP3/KEXF6SxmGAw4NOsVVv 0FEMmWt0JiN6R7jmRHNqnX5qFy0bB5AlzPowtkobVax9jOGP+DkGyfwa5nnn2JbW c6cQWXJ8ez6+e4/h+C/wad7bkbNFwwgQwazdsuPg88gqT+fasQx3wg9Pt6XgNW3M LkvWY3c6AYfReXJuXQCDAgXWZcxkU81IqhfXhKr7GuQl3o3M9XEQH24LJxZkqQfQ VWOo0C+hPkDLfa2klxwGMDwhRZU3mfCxWxJ6Kqe1hftrHHHB0KMTx1OCb6zemfmd /SBv4Mh1PivvWkbqPg55AEdiH1wroIDXgvbXybxVePWC7Nf7DB5hkdJ2YIm1Ht11 rAYhHUwbcBOS27A2WQ3WfCWAokPOW1LeslqMyi9XFdsusQaUftU= =QDZ6 -----END PGP SIGNATURE----- --=-GOYXXzF9KHU36Ho3xOiV--