fpga: dfl: afu: convert get_user_pages() --> pin_user_pages()
Subsystems (2)
PATCH v3 1/1 fpga: dfl: afu: convert get_user_pages() --> pin_user_pages()
This code was using get_user_pages_fast(), in a "Case 2" scenario (DMA/RDMA), using the categorization from [1]. That means that it's time to convert the get_user_pages_fast() + put_page() calls to pin_user_pages_fast() + unpin_user_pages() calls.
There is some helpful background in [2]: basically, this is a small part of fixing a long-standing disconnect between pinning pages, and file systems' use of those pages.
[1] Documentation/core-api/pin_user_pages.rst
[2] "Explicit pinning of user-space pages":
https://lwn.net/Articles/807108/
---
Hi,
This is the same logical change as in v2, but it is applied to char-misc-next, in order to avoid a merge problem with Souptick's
commit c9d7e3da1f3c ("fpga: dfl: afu: Corrected error handling levels <Souptick Joarder>")
thanks,
John Hubbard
NVIDIA
drivers/fpga/dfl-afu-dma-region.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/fpga/dfl-afu-dma-region.c +5 -14
@@ -16,15 +16,6 @@#include "dfl-afu.h" -static void put_all_pages (struct page **pages,int npages) -{ -int i; - -for (i =0 ; i < npages; i++) -if (pages[i]) -put_page (pages[i]); -} -void afu_dma_region_init (struct dfl_feature_platform_data *pdata) {struct dfl_afu *afu =dfl_fpga_pdata_get_private (pdata);
@@ -57,22 +48,22 @@ static int afu_dma_pin_pages(struct dfl_feature_platform_data *pdata, goto unlock_vm; } - pinned =get_user_pages_fast (region->user_addr, npages,FOLL_WRITE , + pinned =pin_user_pages_fast (region->user_addr, npages,FOLL_WRITE , region->pages);if (pinned <0 ) { ret = pinned; goto free_pages; }else if (pinned != npages) { ret = -EFAULT ; - goto put_pages; + goto unpin_pages; }dev_dbg (dev,"%d pages pinned\n" , pinned);return 0 ; -put_pages: -put_all_pages (region->pages, pinned); +unpin_pages: +unpin_user_pages (region->pages, pinned); free_pages:kfree (region->pages); unlock_vm:
@@ -94,7 +85,7 @@ static void afu_dma_unpin_pages(struct dfl_feature_platform_data *pdata,long npages = region->length >>PAGE_SHIFT ;struct device *dev = &pdata->dev->dev; -put_all_pages (region->pages, npages); +unpin_user_pages (region->pages, npages);kfree (region->pages);account_locked_vm (current->mm, npages, false);
Signature · 1 line
2.26.2
Quoted 29 lines
-----Original Message-----
From: John Hubbard <[email protected]>
Sent: Tuesday, May 26, 2020 6:18 AM
To: LKML <[email protected]>
Cc: John Hubbard <[email protected]>; Xu, Yilun <[email protected]>; Wu, Hao <[email protected]>; Moritz Fischer <[email protected]>; linux- [email protected]
Subject: [PATCH v3] fpga: dfl: afu: convertget_user_pages()-->pin_user_pages()This code was using
get_user_pages_fast(), in a "Case 2" scenario (DMA/RDMA), using the categorization from [1]. That means that it's time to convert theget_user_pages_fast()+put_page()calls topin_user_pages_fast()+unpin_user_pages()calls.There is some helpful background in [2]: basically, this is a small part of fixing a long-standing disconnect between pinning pages, and file systems' use of those pages.
[1]
Documentation/core-api/pin_user_pages.rst[2] "Explicit pinning of user-space pages":
https://lwn.net/Articles/807108/Cc Xu Yilun <[email protected]>Cc Wu Hao <[email protected]>Cc Moritz Fischer <[email protected]>Signed-off-by John Hubbard <[email protected]>
Quoted 8 lines
---
Hi,
This is the same logical change as in v2, but it is applied to char-misc-next, in order to avoid a merge problem with Souptick's commit
c9d7e3da1f3c("fpga: dfl: afu: Corrected error handling levels <Souptick Joarder>")
Thanks a lot!
Thanks
Hao
Quoted 72 lines
thanks,
John Hubbard
NVIDIAdrivers/fpga/dfl-afu-dma-region.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)drivers/fpga/dfl-afu-dma- renamed from drivers/fpga/dfl-afu-dma-region.c +0
-0
region.c
index5942343a5d6e..0b817b722920100644drivers/fpga/dfl-afu-dma-region.c +4
-13@@ -16,15 +16,6 @@#include "dfl-afu.h" -static void put_all_pages (struct page **pages,int npages) -{ -int i; - -for (i =0 ; i < npages; i++) -if (pages[i]) -put_page (pages[i]); -} -void afu_dma_region_init (struct dfl_feature_platform_data *pdata) {struct dfl_afu *afu =dfl_fpga_pdata_get_private (pdata);@@ -57,22 +48,22 @@ static int afu_dma_pin_pages(structdfl_feature_platform_data *pdata, goto unlock_vm; } - pinned =get_user_pages_fast (region->user_addr, npages,FOLL_WRITE , + pinned =pin_user_pages_fast (region->user_addr, npages,FOLL_WRITE , region->pages);if (pinned <0 ) { ret = pinned; goto free_pages; }else if (pinned != npages) { ret = -EFAULT ; - goto put_pages; + goto unpin_pages; }dev_dbg (dev,"%d pages pinned\n" , pinned);return 0 ; -put_pages: -put_all_pages (region->pages, pinned); +unpin_pages: +unpin_user_pages (region->pages, pinned);
free_pages:drivers/fpga/dfl-afu-dma-region.c +1
-2kfree (region->pages); unlock_vm:@@ -94,7 +85,7 @@ static void afu_dma_unpin_pages(structdfl_feature_platform_data *pdata, long npages = region->length >> PAGE_SHIFT;struct device *dev = &pdata->dev->dev; -put_all_pages (region->pages, npages); +unpin_user_pages (region->pages, npages);kfree (region->pages);account_locked_vm (current->mm, npages, false); --2.26.2
Quoted 110 lines · Hao
Quoted 29 lines
-----Original Message-----
From: John Hubbard <[email protected]>
Sent: Tuesday, May 26, 2020 6:18 AM
To: LKML <[email protected]>
Cc: John Hubbard <[email protected]>; Xu, Yilun <[email protected]>; Wu, Hao <[email protected]>; Moritz Fischer <[email protected]>; linux- [email protected]
Subject: [PATCH v3] fpga: dfl: afu: convertget_user_pages()-->pin_user_pages()This code was using
get_user_pages_fast(), in a "Case 2" scenario (DMA/RDMA), using the categorization from [1]. That means that it's time to convert theget_user_pages_fast()+put_page()calls topin_user_pages_fast()+unpin_user_pages()calls.There is some helpful background in [2]: basically, this is a small part of fixing a long-standing disconnect between pinning pages, and file systems' use of those pages.
[1]
Documentation/core-api/pin_user_pages.rst[2] "Explicit pinning of user-space pages":
https://lwn.net/Articles/807108/Cc Xu Yilun <[email protected]>Cc Wu Hao <[email protected]>Cc Moritz Fischer <[email protected]>Signed-off-by John Hubbard <[email protected]>Quoted 8 lines
---
Hi,
This is the same logical change as in v2, but it is applied to char-misc-next, in order to avoid a merge problem with Souptick's commit
c9d7e3da1f3c("fpga: dfl: afu: Corrected error handling levels <Souptick Joarder>")Thanks a lot!
Acked-by Wu Hao <[email protected]>Thanks
HaoQuoted 65 lines
thanks,
John Hubbard
NVIDIAdrivers/fpga/dfl-afu-dma-region.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)drivers/fpga/dfl-afu-dma- renamed from drivers/fpga/dfl-afu-dma-region.c +0
-0
region.c
index5942343a5d6e..0b817b722920100644drivers/fpga/dfl-afu-dma-region.c +4
-13@@ -16,15 +16,6 @@#include "dfl-afu.h" -static void put_all_pages (struct page **pages,int npages) -{ -int i; - -for (i =0 ; i < npages; i++) -if (pages[i]) -put_page (pages[i]); -} -void afu_dma_region_init (struct dfl_feature_platform_data *pdata) {struct dfl_afu *afu =dfl_fpga_pdata_get_private (pdata);@@ -57,22 +48,22 @@ static int afu_dma_pin_pages(structdfl_feature_platform_data *pdata, goto unlock_vm; } - pinned =get_user_pages_fast (region->user_addr, npages,FOLL_WRITE , + pinned =pin_user_pages_fast (region->user_addr, npages,FOLL_WRITE , region->pages);if (pinned <0 ) { ret = pinned; goto free_pages; }else if (pinned != npages) { ret = -EFAULT ; - goto put_pages; + goto unpin_pages; }dev_dbg (dev,"%d pages pinned\n" , pinned);return 0 ; -put_pages: -put_all_pages (region->pages, pinned); +unpin_pages: +unpin_user_pages (region->pages, pinned);
free_pages:drivers/fpga/dfl-afu-dma-region.c +0
-0kfree (region->pages); unlock_vm:@@ -94,7 +85,7 @@ static void afu_dma_unpin_pages(structdfl_feature_platform_data *pdata, long npages = region->length >> PAGE_SHIFT;struct device *dev = &pdata->dev->dev;
Quoted 8 lines
Quoted 7 lines
drivers/fpga/dfl-afu-dma-region.c +1
-2-put_all_pages (region->pages, npages); +unpin_user_pages (region->pages, npages);kfree (region->pages);account_locked_vm (current->mm, npages, false); --2.26.2
Applied to for-next.
Thanks,
Moritz