two little cleanups for the for-6.4/splice branch

two little cleanups for the for-6.4/splice branch

[Christoph Hellwig]

Hi Jens,

this series removes two now unused functions.

[PATCH 1/3] iov_iter: remove iov_iter_get_pages

[Christoph Hellwig]

All previous users have been converted to the FOLL_PIN based interfaces.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/linux/uio.h |  3 ---
 lib/iov_iter.c      | 14 +++-----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/include/linux/uio.h b/include/linux/uio.h
index 74598426edb405..37f93a613f3dc7 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -238,9 +238,6 @@ void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struct bio_
 void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count);
 void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray *xarray,
 		     loff_t start, size_t count);
-ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages,
-		size_t maxsize, unsigned maxpages, size_t *start,
-		iov_iter_extraction_t extraction_flags);
 ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
 			size_t maxsize, unsigned maxpages, size_t *start);
 ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index fad95e4cf372a2..07872e30ee82e3 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1081,23 +1081,15 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i,
 	return -EFAULT;
 }
 
-ssize_t iov_iter_get_pages(struct iov_iter *i,
-		   struct page **pages, size_t maxsize, unsigned maxpages,
-		   size_t *start, iov_iter_extraction_t extraction_flags)
+ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
+		size_t maxsize, unsigned maxpages, size_t *start)
 {
 	if (!maxpages)
 		return 0;
 	BUG_ON(!pages);
 
 	return __iov_iter_get_pages_alloc(i, &pages, maxsize, maxpages,
-					  start, extraction_flags);
-}
-EXPORT_SYMBOL_GPL(iov_iter_get_pages);
-
-ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
-		size_t maxsize, unsigned maxpages, size_t *start)
-{
-	return iov_iter_get_pages(i, pages, maxsize, maxpages, start, 0);
+					  start, 0);
 }
 EXPORT_SYMBOL(iov_iter_get_pages2);
 
-- 
2.39.2

Re: [PATCH 1/3] iov_iter: remove iov_iter_get_pages

[Jens Axboe]

On Mon, 03 Apr 2023 16:25:41 +0200, Christoph Hellwig wrote:
> All previous users have been converted to the FOLL_PIN based interfaces.
> 
> 

Applied, thanks!

[1/3] iov_iter: remove iov_iter_get_pages
      commit: b6eaf73268c819c170266ba1b83e4d08f973aea5
[2/3] iov_iter: remove iov_iter_get_pages_alloc
      commit: ce6b98c2d64bcb9bf4844800ec4e0ebf130ce3df
[3/3] iov_iter: remove the extraction_flags argument to __iov_iter_get_pages_alloc
      commit: 1b8d72fb6bea91d2fbfa487891d2ddbcb85f7eda

Best regards,
-- 
Jens Axboe

[PATCH 2/3] iov_iter: remove iov_iter_get_pages_alloc

[Christoph Hellwig]

AFAICS this never had any callers except for the
iov_iter_get_pages_alloc2 wrapper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/linux/uio.h |  3 ---
 lib/iov_iter.c      | 17 ++++-------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/include/linux/uio.h b/include/linux/uio.h
index 37f93a613f3dc7..c84787a20721b1 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -240,9 +240,6 @@ void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray *
 		     loff_t start, size_t count);
 ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
 			size_t maxsize, unsigned maxpages, size_t *start);
-ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
-		struct page ***pages, size_t maxsize, size_t *start,
-		iov_iter_extraction_t extraction_flags);
 ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, struct page ***pages,
 			size_t maxsize, size_t *start);
 int iov_iter_npages(const struct iov_iter *i, int maxpages);
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 07872e30ee82e3..764ddebfb9779c 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1093,30 +1093,21 @@ ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
 }
 EXPORT_SYMBOL(iov_iter_get_pages2);
 
-ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
-		   struct page ***pages, size_t maxsize,
-		   size_t *start, iov_iter_extraction_t extraction_flags)
+ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i,
+		struct page ***pages, size_t maxsize, size_t *start)
 {
 	ssize_t len;
 
 	*pages = NULL;
 
-	len = __iov_iter_get_pages_alloc(i, pages, maxsize, ~0U, start,
-					 extraction_flags);
+	len = __iov_iter_get_pages_alloc(i, pages, maxsize, ~0U, start, 0);
 	if (len <= 0) {
 		kvfree(*pages);
 		*pages = NULL;
 	}
 	return len;
 }
-EXPORT_SYMBOL_GPL(iov_iter_get_pages_alloc);
-
-ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i,
-		struct page ***pages, size_t maxsize, size_t *start)
-{
-	return iov_iter_get_pages_alloc(i, pages, maxsize, start, 0);
-}
-EXPORT_SYMBOL(iov_iter_get_pages_alloc2);
+EXPORT_SYMBOL_GPL(iov_iter_get_pages_alloc2);
 
 size_t csum_and_copy_from_iter(void *addr, size_t bytes, __wsum *csum,
 			       struct iov_iter *i)
-- 
2.39.2

Re: [PATCH 2/3] iov_iter: remove iov_iter_get_pages_alloc

[David Howells]

Christoph Hellwig <hch@lst.de> wrote:

> -EXPORT_SYMBOL(iov_iter_get_pages_alloc2);
> +EXPORT_SYMBOL_GPL(iov_iter_get_pages_alloc2);

This is not within the description of the patch and should probably be a
separate patch.

David

[PATCH 3/3] iov_iter: remove the extraction_flags argument to __iov_iter_get_pages_alloc

[Christoph Hellwig]

extraction_flags is always 0 now, so remove it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 lib/iov_iter.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 764ddebfb9779c..c836cea6b3e432 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1019,8 +1019,7 @@ static struct page *first_bvec_segment(const struct iov_iter *i,
 
 static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i,
 		   struct page ***pages, size_t maxsize,
-		   unsigned int maxpages, size_t *start,
-		   iov_iter_extraction_t extraction_flags)
+		   unsigned int maxpages, size_t *start)
 {
 	unsigned int n, gup_flags = 0;
 
@@ -1030,8 +1029,6 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i,
 		return 0;
 	if (maxsize > MAX_RW_COUNT)
 		maxsize = MAX_RW_COUNT;
-	if (extraction_flags & ITER_ALLOW_P2PDMA)
-		gup_flags |= FOLL_PCI_P2PDMA;
 
 	if (likely(user_backed_iter(i))) {
 		unsigned long addr;
@@ -1088,8 +1085,7 @@ ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,
 		return 0;
 	BUG_ON(!pages);
 
-	return __iov_iter_get_pages_alloc(i, &pages, maxsize, maxpages,
-					  start, 0);
+	return __iov_iter_get_pages_alloc(i, &pages, maxsize, maxpages, start);
 }
 EXPORT_SYMBOL(iov_iter_get_pages2);
 
@@ -1100,7 +1096,7 @@ ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i,
 
 	*pages = NULL;
 
-	len = __iov_iter_get_pages_alloc(i, pages, maxsize, ~0U, start, 0);
+	len = __iov_iter_get_pages_alloc(i, pages, maxsize, ~0U, start);
 	if (len <= 0) {
 		kvfree(*pages);
 		*pages = NULL;
-- 
2.39.2

Re: two little cleanups for the for-6.4/splice branch

[Jens Axboe]

On 4/3/23 8:25 AM, Christoph Hellwig wrote:
> Hi Jens,
> 
> this series removes two now unused functions.

Looks good to me. David? I'll add them to the splice branch.

-- 
Jens Axboe