Message ID | 20190123190224.5788-1-ira.weiny@intel.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | ff0244bb5924e4b94145df177976d4ed17fe5f29 |
Delegated to: | Jason Gunthorpe |
Headers | show |
Series | RDMA/qib: Use GUP longterm for PSM page pining | expand |
On Wed, Jan 23, 2019 at 02:02:24PM -0500, ira.weiny@intel.com wrote: > From: Ira Weiny <ira.weiny@intel.com> > > Similar to the core change: > > 5f1d43de5416 ("IB/core: disable memory registration of filesystem-dax vmas") > > PSM should be prevented from using filesystem DAX pages. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > --- > drivers/infiniband/hw/qib/qib_user_pages.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Applied to for-next Thanks, Jason
diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c index 16543d5e80c3..075f09fb7ce3 100644 --- a/drivers/infiniband/hw/qib/qib_user_pages.c +++ b/drivers/infiniband/hw/qib/qib_user_pages.c @@ -67,10 +67,10 @@ static int __qib_get_user_pages(unsigned long start_page, size_t num_pages, } for (got = 0; got < num_pages; got += ret) { - ret = get_user_pages(start_page + got * PAGE_SIZE, - num_pages - got, - FOLL_WRITE | FOLL_FORCE, - p + got, NULL); + ret = get_user_pages_longterm(start_page + got * PAGE_SIZE, + num_pages - got, + FOLL_WRITE | FOLL_FORCE, + p + got, NULL); if (ret < 0) goto bail_release; }