Skip to contentSkip to conversation

staging: kpc2000: kpc_dma: Few clean up and Convert to pin_user_pages()

PATCH Superseded Souptick Joarder 2 participants 11 messages Jun 17, 2020 – Jun 27, 2020 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover staging: kpc2000: kpc_dma: Few clean up and Convert to pin_user_pages()

This series contains few clean up, minor bug fixes and Convert get_user_pages() to pin_user_pages().

I'm compile tested this, but unable to run-time test, so any testing help is much appriciated.

Souptick Joarder (4):
staging: kpc2000: Unpin partial pinned pages
staging: kpc2000: kpc_dma: Convert set_page_dirty() -->
set_page_dirty_lock()
staging: kpc2000: kpc_dma: Convert get_user_pages() -->
pin_user_pages()
staging: kpc2000: kpc_dma: Remove excess goto statement

 drivers/staging/kpc2000/kpc_dma/fileops.c | 33 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 18 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/4 staging: kpc2000: Unpin partial pinned pages

There is a bug, when get_user_pages() failed but partially pinned pages are not unpinned. Fixed it.

Also, int is more appropriate type for rv. Changed it.

Cc John Hubbard <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Dan Carpenter <[email protected]>
---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +5 -1
index 8975346..b136353 100644
@@ -35,7 +35,7 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 			    unsigned long iov_base, size_t iov_len)
 {
 	unsigned int i = 0;
-	long rv = 0;
+	int rv = 0;
 	struct kpc_dma_device *ldev;
 	struct aio_cb_data *acd;
 	DECLARE_COMPLETION_ONSTACK(done);
@@ -193,6 +193,10 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 		put_page(acd->user_pages[i]);
 
  err_get_user_pages:
+	if (rv > 0) {
+		for (i = 0; i < rv; i++)
+			put_pages(acd->user_pages[i])
+	}
 	kfree(acd->user_pages);
  err_alloc_userpages:
 	kfree(acd);
Signature · 1 line
1.9.1
#7 lore raw

PATCH 2/4 staging: kpc2000: kpc_dma: Convert set_page_dirty() --> set_page_dirty_lock()

In reply to Souptick Joarder

First, convert set_page_dirty() to set_page_dirty_lock()

Second, there is an interval in there after set_page_dirty() and before put_page(), in which the device could be running and setting pages dirty. Moving set_page_dirty_lock() after dma_unmap_sg().

---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +3 -3
index b136353..bcce86c 100644
@@ -214,13 +214,13 @@ void  transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
 	BUG_ON(!acd->ldev);
 	BUG_ON(!acd->ldev->pldev);
 
+	dma_unmap_sg(&acd->ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, acd->ldev->dir);
+
 	for (i = 0 ; i < acd->page_count ; i++) {
 		if (!PageReserved(acd->user_pages[i]))
-			set_page_dirty(acd->user_pages[i]);
+			set_page_dirty_lock(acd->user_pages[i]);
 	}
 
-	dma_unmap_sg(&acd->ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, acd->ldev->dir);
-
 	for (i = 0 ; i < acd->page_count ; i++)
 		put_page(acd->user_pages[i]);
 
Signature · 1 line
1.9.1
#9 lore raw

PATCH 3/4 staging: kpc2000: kpc_dma: Convert get_user_pages() --> pin_user_pages()

In reply to Souptick Joarder

In 2019, we introduced pin_user_pages*() and now we are converting get_user_pages*() to the new API as appropriate. [1] & [2] could be referred for more information.

[1] Documentation/core-api/pin_user_pages.rst

[2] "Explicit pinning of user-space pages":

        https://lwn.net/Articles/807108/
Cc John Hubbard <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Dan Carpenter <[email protected]>
---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +6 -10
index bcce86c..1f5ab81 100644
@@ -76,10 +76,10 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 
 	// Lock the user buffer pages in memory, and hold on to the page pointers (for the sglist)
 	mmap_read_lock(current->mm);      /*  get memory map semaphore */
-	rv = get_user_pages(iov_base, acd->page_count, FOLL_TOUCH | FOLL_WRITE | FOLL_GET, acd->user_pages, NULL);
+	rv = pin_user_pages(iov_base, acd->page_count, FOLL_TOUCH | FOLL_WRITE, acd->user_pages, NULL);
 	mmap_read_unlock(current->mm);        /*  release the semaphore */
 	if (rv != acd->page_count) {
-		dev_err(&priv->ldev->pldev->dev, "Couldn't get_user_pages (%ld)\n", rv);
+		dev_err(&priv->ldev->pldev->dev, "Couldn't pin_user_pages (%ld)\n", rv);
 		goto err_get_user_pages;
 	}
 
@@ -189,14 +189,11 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 	sg_free_table(&acd->sgt);
  err_dma_map_sg:
  err_alloc_sg_table:
-	for (i = 0 ; i < acd->page_count ; i++)
-		put_page(acd->user_pages[i]);
+	unpin_user_pages(acd->user_pages, acd->page_count);
 
  err_get_user_pages:
-	if (rv > 0) {
-		for (i = 0; i < rv; i++)
-			put_pages(acd->user_pages[i])
-	}
+	if (rv > 0)
+		unpin_user_pages(acd->user_pages, rv);
 	kfree(acd->user_pages);
  err_alloc_userpages:
 	kfree(acd);
@@ -221,8 +218,7 @@ void  transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
 			set_page_dirty_lock(acd->user_pages[i]);
 	}
 
-	for (i = 0 ; i < acd->page_count ; i++)
-		put_page(acd->user_pages[i]);
+	unpin_user_pages(acd->user_pages, acd->page_count);
 
 	sg_free_table(&acd->sgt);
 
Signature · 1 line
1.9.1
#10 lore raw

PATCH 4/4 staging: kpc2000: kpc_dma: Remove excess goto statement

In reply to Souptick Joarder

As 3 goto level referring to same common code, those can be accomodated with a single goto level and renameing it to unpin_user_pages.

Cc Dan Carpenter <[email protected]>
Cc John Hubbard <[email protected]>
---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +9 -12
index 1f5ab81..b0fcde5 100644
@@ -35,7 +35,7 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 			    unsigned long iov_base, size_t iov_len)
 {
 	unsigned int i = 0;
-	int rv = 0;
+	int rv = 0, nr_pages = 0;
 	struct kpc_dma_device *ldev;
 	struct aio_cb_data *acd;
 	DECLARE_COMPLETION_ONSTACK(done);
@@ -79,22 +79,23 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 	rv = pin_user_pages(iov_base, acd->page_count, FOLL_TOUCH | FOLL_WRITE, acd->user_pages, NULL);
 	mmap_read_unlock(current->mm);        /*  release the semaphore */
 	if (rv != acd->page_count) {
+		nr_pages = rv;
 		dev_err(&priv->ldev->pldev->dev, "Couldn't pin_user_pages (%ld)\n", rv);
-		goto err_get_user_pages;
+		goto unpin_user_pages;
 	}
-
+	nr_pages = acd->page_count;
 	// Allocate and setup the sg_table (scatterlist entries)
 	rv = sg_alloc_table_from_pages(&acd->sgt, acd->user_pages, acd->page_count, iov_base & (PAGE_SIZE - 1), iov_len, GFP_KERNEL);
 	if (rv) {
 		dev_err(&priv->ldev->pldev->dev, "Couldn't alloc sg_table (%ld)\n", rv);
-		goto err_alloc_sg_table;
+		goto unpin_user_pages;
 	}
 
 	// Setup the DMA mapping for all the sg entries
 	acd->mapped_entry_count = dma_map_sg(&ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, ldev->dir);
 	if (acd->mapped_entry_count <= 0) {
 		dev_err(&priv->ldev->pldev->dev, "Couldn't dma_map_sg (%d)\n", acd->mapped_entry_count);
-		goto err_dma_map_sg;
+		goto unpin_user_pages;
 	}
 
 	// Calculate how many descriptors are actually needed for this transfer.
@@ -187,13 +188,9 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 	unlock_engine(ldev);
 	dma_unmap_sg(&ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, ldev->dir);
 	sg_free_table(&acd->sgt);
- err_dma_map_sg:
- err_alloc_sg_table:
-	unpin_user_pages(acd->user_pages, acd->page_count);
-
- err_get_user_pages:
-	if (rv > 0)
-		unpin_user_pages(acd->user_pages, rv);
+ unpin_user_pages:
+	if (nr_pages > 0)
+		unpin_user_pages(acd->user_pages, nr_pages);
 	kfree(acd->user_pages);
  err_alloc_userpages:
 	kfree(acd);
Signature · 1 line
1.9.1
#2 lore raw

Re: [PATCH 1/4] staging: kpc2000: Unpin partial pinned pages

In reply to Souptick Joarder
Quoted 27 lines · Souptick Joarder

There is a bug, when get_user_pages() failed but partially pinned pages are not unpinned. Fixed it.

Also, int is more appropriate type for rv. Changed it.

Cc John Hubbard <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Dan Carpenter <[email protected]>
---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -1
index 8975346..b136353 100644
@@ -35,7 +35,7 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 			    unsigned long iov_base, size_t iov_len)
 {
 	unsigned int i = 0;
-	long rv = 0;
+	int rv = 0;
 	struct kpc_dma_device *ldev;
 	struct aio_cb_data *acd;
 	DECLARE_COMPLETION_ONSTACK(done);

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 193

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +0 -0
@@ -193,6 +193,10 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
 		put_page(acd->user_pages[i]);
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 198

Quoted 5 lines
drivers/staging/kpc2000/kpc_dma/fileops.c +3 -0
  err_get_user_pages:
+	if (rv > 0) {
+		for (i = 0; i < rv; i++)
+			put_pages(acd->user_pages[i])
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 199

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -0
+	}

This isn't a complete fix. "rv" is the negative error code but here we are returning a positive value on this path. Also it's ugly to have same put_page() loop repeated twice.

It would be better to write it like this:

	rv = get_user_pages(iov_base, acd->page_count, FOLL_TOUCH | FOLL_WRITE | FOLL_GET, acd->user_pages, NULL);
	mmap_read_unlock(current->mm);        /*  release the semaphore */
	if (rv < 0)
		goto free_pages;
	if (rv != acd->page_count) {
		acd->page_count = rv;
		rv = -EFAULT;
		goto put_pages;
	}

	...

put_pages:

	for (i = 0 ; i < acd->page_count ; i++)
		put_pages(acd->user_pages[i]);
free_pages:
	kfree(acd->user_pages);

regards,
dan carpenter

#3 lore raw

Re: [PATCH 1/4] staging: kpc2000: Unpin partial pinned pages

Quoted 36 lines · Dan Carpenter
Quoted 27 lines · Souptick Joarder

There is a bug, when get_user_pages() failed but partially pinned pages are not unpinned. Fixed it.

Also, int is more appropriate type for rv. Changed it.

Cc John Hubbard <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Dan Carpenter <[email protected]>
---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -1
index 8975346..b136353 100644
@@ -35,7 +35,7 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
                          unsigned long iov_base, size_t iov_len)
 {
      unsigned int i = 0;
-     long rv = 0;
+     int rv = 0;
      struct kpc_dma_device *ldev;
      struct aio_cb_data *acd;
      DECLARE_COMPLETION_ONSTACK(done);

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 193

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +0 -0
@@ -193,6 +193,10 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
              put_page(acd->user_pages[i]);
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 198

Quoted 5 lines
drivers/staging/kpc2000/kpc_dma/fileops.c +3 -0
  err_get_user_pages:
+     if (rv > 0) {
+             for (i = 0; i < rv; i++)
+                     put_pages(acd->user_pages[i])
Quoted 6 lines
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 199

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -0
+     }

This isn't a complete fix. "rv" is the negative error code but here we are returning a positive value on this path.

In case of error of get_user_pages(), it will return -errno, 0 and 3rd one is (rv > 0 && rv != acd->page_count). When rv is -errno or 0 there is no need to call put_pages() in error path. But for 3rd case partially mapped pages need to unpin.

Correct me if I am missing anything.

Quoted 2 lines

Also it's ugly to have
same put_page() loop repeated twice.

Yes, I agree, but these are intermediate steps. Patch [4/4] of this series finally did the same.

Quoted 24 lines

It would be better to write it like this:

        rv = get_user_pages(iov_base, acd->page_count, FOLL_TOUCH | FOLL_WRITE | FOLL_GET, acd->user_pages, NULL);
        mmap_read_unlock(current->mm);        /*  release the semaphore */
        if (rv < 0)
                goto free_pages;
        if (rv != acd->page_count) {
                acd->page_count = rv;
                rv = -EFAULT;
                goto put_pages;
        }

        ...

put_pages:

        for (i = 0 ; i < acd->page_count ; i++)
                put_pages(acd->user_pages[i]);
free_pages:
        kfree(acd->user_pages);

regards,
dan carpenter

#4 lore raw

Re: [PATCH 1/4] staging: kpc2000: Unpin partial pinned pages

Quoted 44 lines · Souptick Joarder
Quoted 36 lines · Dan Carpenter
Quoted 27 lines · Souptick Joarder

There is a bug, when get_user_pages() failed but partially pinned pages are not unpinned. Fixed it.

Also, int is more appropriate type for rv. Changed it.

Cc John Hubbard <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Dan Carpenter <[email protected]>
---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -1
index 8975346..b136353 100644
@@ -35,7 +35,7 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
                          unsigned long iov_base, size_t iov_len)
 {
      unsigned int i = 0;
-     long rv = 0;
+     int rv = 0;
      struct kpc_dma_device *ldev;
      struct aio_cb_data *acd;
      DECLARE_COMPLETION_ONSTACK(done);

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 193

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +0 -0
@@ -193,6 +193,10 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
              put_page(acd->user_pages[i]);
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 198

Quoted 5 lines
drivers/staging/kpc2000/kpc_dma/fileops.c +3 -0
  err_get_user_pages:
+     if (rv > 0) {
+             for (i = 0; i < rv; i++)
+                     put_pages(acd->user_pages[i])
Quoted 6 lines
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 199

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -0
+     }

This isn't a complete fix. "rv" is the negative error code but here we are returning a positive value on this path.

Quoted 7 lines

In case of error of get_user_pages(), it will return -errno, 0 and 3rd one is (rv > 0 && rv != acd->page_count). When rv is -errno or 0 there is no need to call put_pages() in error path. But for 3rd case partially mapped pages need to unpin.

Correct me if I am missing anything.

182 kfree(acd);
183 }
184 return rv;
185
186 err_descr_too_many:

   187          unlock_engine(ldev);
   188          dma_unmap_sg(&ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, ldev->dir);
   189          sg_free_table(&acd->sgt);
   190   err_dma_map_sg:
   191   err_alloc_sg_table:
   192          for (i = 0 ; i < acd->page_count ; i++)
   193                  put_page(acd->user_pages[i]);
   194  
   195   err_get_user_pages:
   196          if (rv > 0) {
                    ^^^^^^

"rv" is positive.

197 for (i = 0; i < rv; i++)
198 put_pages(acd->user_pages[i])
199 }
200 kfree(acd->user_pages);
201 err_alloc_userpages:

   202          kfree(acd);
   203          dev_dbg(&priv->ldev->pldev->dev, "%s returning with error %ld\n", __func__, rv);
   204          return rv;
                       ^^

"rv" is still positive but it should be -EFAULT.

205 }

regards,
dan carpenter

#5 lore raw

Re: [PATCH 1/4] staging: kpc2000: Unpin partial pinned pages

Quoted 81 lines · Dan Carpenter
Quoted 44 lines · Souptick Joarder
Quoted 36 lines · Dan Carpenter
Quoted 27 lines · Souptick Joarder

There is a bug, when get_user_pages() failed but partially pinned pages are not unpinned. Fixed it.

Also, int is more appropriate type for rv. Changed it.

Cc John Hubbard <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Dan Carpenter <[email protected]>
---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -1
index 8975346..b136353 100644
@@ -35,7 +35,7 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
                          unsigned long iov_base, size_t iov_len)
 {
      unsigned int i = 0;
-     long rv = 0;
+     int rv = 0;
      struct kpc_dma_device *ldev;
      struct aio_cb_data *acd;
      DECLARE_COMPLETION_ONSTACK(done);

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 193

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +0 -0
@@ -193,6 +193,10 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
              put_page(acd->user_pages[i]);
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 198

Quoted 5 lines
drivers/staging/kpc2000/kpc_dma/fileops.c +3 -0
  err_get_user_pages:
+     if (rv > 0) {
+             for (i = 0; i < rv; i++)
+                     put_pages(acd->user_pages[i])
Quoted 6 lines
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 199

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -0
+     }

This isn't a complete fix. "rv" is the negative error code but here we are returning a positive value on this path.

Quoted 7 lines

In case of error of get_user_pages(), it will return -errno, 0 and 3rd one is (rv > 0 && rv != acd->page_count). When rv is -errno or 0 there is no need to call put_pages() in error path. But for 3rd case partially mapped pages need to unpin.

Correct me if I am missing anything.

   182                  kfree(acd);
   183          }
   184          return rv;
   185
   186   err_descr_too_many:
   187          unlock_engine(ldev);
   188          dma_unmap_sg(&ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, ldev->dir);
   189          sg_free_table(&acd->sgt);
   190   err_dma_map_sg:
   191   err_alloc_sg_table:
   192          for (i = 0 ; i < acd->page_count ; i++)
   193                  put_page(acd->user_pages[i]);
   194
   195   err_get_user_pages:
   196          if (rv > 0) {
                    ^^^^^^

"rv" is positive.

   197                  for (i = 0; i < rv; i++)
   198                          put_pages(acd->user_pages[i])
   199          }
   200          kfree(acd->user_pages);
   201   err_alloc_userpages:
   202          kfree(acd);
   203          dev_dbg(&priv->ldev->pldev->dev, "%s returning with error %ld\n", __func__, rv);
   204          return rv;
                       ^^
Quoted 2 lines

"rv" is still positive but it should be -EFAULT.

Ahh, my mistake. Will correct it in v2.
Do other patches in the series looks good ?

#6 lore raw

Re: [PATCH 1/4] staging: kpc2000: Unpin partial pinned pages

Quoted 85 lines · Souptick Joarder
Quoted 81 lines · Dan Carpenter
Quoted 44 lines · Souptick Joarder
Quoted 36 lines · Dan Carpenter
Quoted 27 lines · Souptick Joarder

There is a bug, when get_user_pages() failed but partially pinned pages are not unpinned. Fixed it.

Also, int is more appropriate type for rv. Changed it.

Cc John Hubbard <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Dan Carpenter <[email protected]>
---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -1
index 8975346..b136353 100644
@@ -35,7 +35,7 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
                          unsigned long iov_base, size_t iov_len)
 {
      unsigned int i = 0;
-     long rv = 0;
+     int rv = 0;
      struct kpc_dma_device *ldev;
      struct aio_cb_data *acd;
      DECLARE_COMPLETION_ONSTACK(done);

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 193

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +0 -0
@@ -193,6 +193,10 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
              put_page(acd->user_pages[i]);
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 198

Quoted 5 lines
drivers/staging/kpc2000/kpc_dma/fileops.c +3 -0
  err_get_user_pages:
+     if (rv > 0) {
+             for (i = 0; i < rv; i++)
+                     put_pages(acd->user_pages[i])
Quoted 6 lines
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/staging/kpc2000/kpc_dma/fileops.c static int kpc_dma_transfer(struct dev_private_data *priv, · line 199

Quoted 1 line
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -0
+     }

This isn't a complete fix. "rv" is the negative error code but here we are returning a positive value on this path.

Quoted 7 lines

In case of error of get_user_pages(), it will return -errno, 0 and 3rd one is (rv > 0 && rv != acd->page_count). When rv is -errno or 0 there is no need to call put_pages() in error path. But for 3rd case partially mapped pages need to unpin.

Correct me if I am missing anything.

   182                  kfree(acd);
   183          }
   184          return rv;
   185
   186   err_descr_too_many:
   187          unlock_engine(ldev);
   188          dma_unmap_sg(&ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, ldev->dir);
   189          sg_free_table(&acd->sgt);
   190   err_dma_map_sg:
   191   err_alloc_sg_table:
   192          for (i = 0 ; i < acd->page_count ; i++)
   193                  put_page(acd->user_pages[i]);
   194
   195   err_get_user_pages:
   196          if (rv > 0) {
                    ^^^^^^

"rv" is positive.

   197                  for (i = 0; i < rv; i++)
   198                          put_pages(acd->user_pages[i])
   199          }
   200          kfree(acd->user_pages);
   201   err_alloc_userpages:
   202          kfree(acd);
   203          dev_dbg(&priv->ldev->pldev->dev, "%s returning with error %ld\n", __func__, rv);
   204          return rv;
                       ^^
Quoted 2 lines

"rv" is still positive but it should be -EFAULT.

Quoted 2 lines

Ahh, my mistake. Will correct it in v2.
Do other patches in the series looks good ?

The others will have to be re-worked if you change patch 1/4, especially patch 4/4. But otherwise it seems okay with me.

regards,
dan carpenter

#8 lore raw

Re: [PATCH 2/4] staging: kpc2000: kpc_dma: Convert set_page_dirty() --> set_page_dirty_lock()

In reply to Souptick Joarder
Quoted 20 lines · Souptick Joarder

First, convert set_page_dirty() to set_page_dirty_lock()

Second, there is an interval in there after set_page_dirty() and before put_page(), in which the device could be running and setting pages dirty. Moving set_page_dirty_lock() after dma_unmap_sg().

---
 drivers/staging/kpc2000/kpc_dma/fileops.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/kpc2000/kpc_dma/fileops.c +0 -0
index b136353..bcce86c 100644

drivers/staging/kpc2000/kpc_dma/fileops.c void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags) · line 220

Quoted 7 lines
drivers/staging/kpc2000/kpc_dma/fileops.c +2 -0
@@ -214,13 +214,13 @@ void  transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
        BUG_ON(!acd->ldev);
        BUG_ON(!acd->ldev->pldev);
 
+       dma_unmap_sg(&acd->ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, acd->ldev->dir);
+
        for (i = 0 ; i < acd->page_count ; i++) {
                if (!PageReserved(acd->user_pages[i]))

Question -> is PageReserved() used with specific purpose not PageDirty() ??

Quoted 12 lines
drivers/staging/kpc2000/kpc_dma/fileops.c +1 -4
-                       set_page_dirty(acd->user_pages[i]);
+                       set_page_dirty_lock(acd->user_pages[i]);
        }
 
-       dma_unmap_sg(&acd->ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, acd->ldev->dir);
-
        for (i = 0 ; i < acd->page_count ; i++)
                put_page(acd->user_pages[i]);
 
--

1.9.1