* [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page() to put_user_page*()
@ 2019-07-30 15:47 ` Bharath Vedartham
0 siblings, 0 replies; 13+ messages in thread
From: linux.bhar @ 2019-07-30 15:47 UTC (permalink / raw)
[Forwarding patch to Linux-kernel-mentees mailing lists.]
For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").
Cc: Ira Weiny <ira.weiny at intel.com>
Cc: John Hubbard <jhubbard at nvidia.com>
Cc: J?r?me Glisse <jglisse at redhat.com>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Cc: Matt Sickler <Matt.Sickler at daktronics.com>
Cc: devel at driverdev.osuosl.org
Cc: linux-kernel at vger.kernel.org
Cc: linux-mm at kvack.org
Reviewed-by: John Hubbard <jhubbard at nvidia.com>
Signed-off-by: Bharath Vedartham <linux.bhar at gmail.com>
---
I had forgotten to cc the linux-kernel-mentees mailing lists.
This is an attempt to forward the patch to the linux-kernel-mentees
mailing lists.
This patch has already been accepted to staging-testing.
Changes since v1
- Improved changelog by John's suggestion.
- Moved logic to dirty pages below sg_dma_unmap
and removed PageReserved check.
Changes since v2
- Added back PageResevered check as
suggested by John Hubbard.
Changes since v3
- Changed the changelog as suggested by John.
- Added John's Reviewed-By tag.
Changes since v4
- Rebased the patch on the staging tree.
- Improved commit log by fixing a line wrap.
---
drivers/staging/kpc2000/kpc_dma/fileops.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c
index 48ca88b..f15e292 100644
--- a/drivers/staging/kpc2000/kpc_dma/fileops.c
+++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
@@ -190,9 +190,7 @@ 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]);
- }
+ put_user_pages(acd->user_pages, acd->page_count);
err_get_user_pages:
kfree(acd->user_pages);
err_alloc_userpages:
@@ -211,16 +209,13 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
BUG_ON(acd->ldev == NULL);
BUG_ON(acd->ldev->pldev == NULL);
- for (i = 0 ; i < acd->page_count ; i++) {
- if (!PageReserved(acd->user_pages[i])) {
- set_page_dirty(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]);
+ for (i = 0; i < acd->page_count; i++) {
+ if (!PageReserved(acd->user_pages[i]))
+ put_user_pages_dirty(&acd->user_pages[i], 1);
+ else
+ put_user_page(acd->user_pages[i]);
}
sg_free_table(&acd->sgt);
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page() to put_user_page*()
@ 2019-07-30 15:47 ` Bharath Vedartham
0 siblings, 0 replies; 13+ messages in thread
From: Bharath Vedartham @ 2019-07-30 15:47 UTC (permalink / raw)
[Forwarding patch to Linux-kernel-mentees mailing lists.]
For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page().
This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").
Cc: Ira Weiny <ira.weiny at intel.com>
Cc: John Hubbard <jhubbard at nvidia.com>
Cc: J?r?me Glisse <jglisse at redhat.com>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Cc: Matt Sickler <Matt.Sickler at daktronics.com>
Cc: devel at driverdev.osuosl.org
Cc: linux-kernel at vger.kernel.org
Cc: linux-mm at kvack.org
Reviewed-by: John Hubbard <jhubbard at nvidia.com>
Signed-off-by: Bharath Vedartham <linux.bhar at gmail.com>
---
I had forgotten to cc the linux-kernel-mentees mailing lists.
This is an attempt to forward the patch to the linux-kernel-mentees
mailing lists.
This patch has already been accepted to staging-testing.
Changes since v1
- Improved changelog by John's suggestion.
- Moved logic to dirty pages below sg_dma_unmap
and removed PageReserved check.
Changes since v2
- Added back PageResevered check as
suggested by John Hubbard.
Changes since v3
- Changed the changelog as suggested by John.
- Added John's Reviewed-By tag.
Changes since v4
- Rebased the patch on the staging tree.
- Improved commit log by fixing a line wrap.
---
drivers/staging/kpc2000/kpc_dma/fileops.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c
index 48ca88b..f15e292 100644
--- a/drivers/staging/kpc2000/kpc_dma/fileops.c
+++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
@@ -190,9 +190,7 @@ 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]);
- }
+ put_user_pages(acd->user_pages, acd->page_count);
err_get_user_pages:
kfree(acd->user_pages);
err_alloc_userpages:
@@ -211,16 +209,13 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
BUG_ON(acd->ldev == NULL);
BUG_ON(acd->ldev->pldev == NULL);
- for (i = 0 ; i < acd->page_count ; i++) {
- if (!PageReserved(acd->user_pages[i])) {
- set_page_dirty(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]);
+ for (i = 0; i < acd->page_count; i++) {
+ if (!PageReserved(acd->user_pages[i]))
+ put_user_pages_dirty(&acd->user_pages[i], 1);
+ else
+ put_user_page(acd->user_pages[i]);
}
sg_free_table(&acd->sgt);
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Linux-kernel-mentees][PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
2019-07-30 9:36 ` [Linux-kernel-mentees][PATCH " Greg KH
(?)
@ 2019-07-30 10:24 ` linux.bhar
-1 siblings, 0 replies; 13+ messages in thread
From: Bharath Vedartham @ 2019-07-30 10:24 UTC (permalink / raw)
To: Greg KH
Cc: Matt.Sickler, devel, John Hubbard, linux-kernel, linux-mm,
Jérôme Glisse, linux-kernel-mentees
On Tue, Jul 30, 2019 at 11:36:06AM +0200, Greg KH wrote:
> On Tue, Jul 30, 2019 at 02:58:44PM +0530, Bharath Vedartham wrote:
> > put_page() to put_user_page*()
>
> What does this mean?
That must have been a mistake! I just wanted to forward this patch to
the Linux-kernel-mentees mailing list. THis patch has already been taken
by for staging-testing. I ll forward another patch just cc'ing the
mentees mailing lists and won't disturb the other devs.
Thank you
Bharath
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 10:24 ` linux.bhar
0 siblings, 0 replies; 13+ messages in thread
From: linux.bhar @ 2019-07-30 10:24 UTC (permalink / raw)
On Tue, Jul 30, 2019 at 11:36:06AM +0200, Greg KH wrote:
> On Tue, Jul 30, 2019 at 02:58:44PM +0530, Bharath Vedartham wrote:
> > put_page() to put_user_page*()
>
> What does this mean?
That must have been a mistake! I just wanted to forward this patch to
the Linux-kernel-mentees mailing list. THis patch has already been taken
by for staging-testing. I ll forward another patch just cc'ing the
mentees mailing lists and won't disturb the other devs.
Thank you
Bharath
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 10:24 ` linux.bhar
0 siblings, 0 replies; 13+ messages in thread
From: Bharath Vedartham @ 2019-07-30 10:24 UTC (permalink / raw)
On Tue, Jul 30, 2019 at 11:36:06AM +0200, Greg KH wrote:
> On Tue, Jul 30, 2019 at 02:58:44PM +0530, Bharath Vedartham wrote:
> > put_page() to put_user_page*()
>
> What does this mean?
That must have been a mistake! I just wanted to forward this patch to
the Linux-kernel-mentees mailing list. THis patch has already been taken
by for staging-testing. I ll forward another patch just cc'ing the
mentees mailing lists and won't disturb the other devs.
Thank you
Bharath
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Linux-kernel-mentees][PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
2019-07-30 9:28 ` linux.bhar
(?)
(?)
@ 2019-07-30 9:36 ` Greg KH
-1 siblings, 0 replies; 13+ messages in thread
From: Greg KH @ 2019-07-30 9:36 UTC (permalink / raw)
To: Bharath Vedartham
Cc: Matt.Sickler, devel, John Hubbard, linux-kernel, linux-mm,
Jérôme Glisse, linux-kernel-mentees
On Tue, Jul 30, 2019 at 02:58:44PM +0530, Bharath Vedartham wrote:
> put_page() to put_user_page*()
What does this mean?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Linux-kernel-mentees][PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 9:36 ` Greg KH
0 siblings, 0 replies; 13+ messages in thread
From: Greg KH @ 2019-07-30 9:36 UTC (permalink / raw)
To: Bharath Vedartham
Cc: devel, John Hubbard, linux-kernel, linux-mm,
Jérôme Glisse, linux-kernel-mentees
On Tue, Jul 30, 2019 at 02:58:44PM +0530, Bharath Vedartham wrote:
> put_page() to put_user_page*()
What does this mean?
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 9:36 ` Greg KH
0 siblings, 0 replies; 13+ messages in thread
From: gregkh @ 2019-07-30 9:36 UTC (permalink / raw)
On Tue, Jul 30, 2019 at 02:58:44PM +0530, Bharath Vedartham wrote:
> put_page() to put_user_page*()
What does this mean?
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 9:36 ` Greg KH
0 siblings, 0 replies; 13+ messages in thread
From: Greg KH @ 2019-07-30 9:36 UTC (permalink / raw)
On Tue, Jul 30, 2019 at 02:58:44PM +0530, Bharath Vedartham wrote:
> put_page() to put_user_page*()
What does this mean?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Linux-kernel-mentees][PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 9:28 ` linux.bhar
0 siblings, 0 replies; 13+ messages in thread
From: Bharath Vedartham @ 2019-07-30 9:28 UTC (permalink / raw)
To: gregkh, Matt.Sickler
Cc: Ira Weiny, John Hubbard, Jérôme Glisse, devel,
linux-kernel, linux-mm, linux-kernel-mentees
put_page() to put_user_page*()
Reply-To:
In-Reply-To: <1564058658-3551-1-git-send-email-linux.bhar@gmail.com>
On Thu, Jul 25, 2019 at 06:14:18PM +0530, Bharath Vedartham wrote:
[Forwarding patch to linux-kernel-mentees mailing list]
> For pages that were retained via get_user_pages*(), release those pages
> via the new put_user_page*() routines, instead of via put_page().
>
> This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
> ("mm: introduce put_user_page*(), placeholder versions").
>
> Cc: Ira Weiny <ira.weiny@intel.com>
> Cc: John Hubbard <jhubbard@nvidia.com>
> Cc: Jérôme Glisse <jglisse@redhat.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Matt Sickler <Matt.Sickler@daktronics.com>
> Cc: devel@driverdev.osuosl.org
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-mm@kvack.org
> Reviewed-by: John Hubbard <jhubbard@nvidia.com>
> Signed-off-by: Bharath Vedartham <linux.bhar@gmail.com>
> ---
> Changes since v1
> - Improved changelog by John's suggestion.
> - Moved logic to dirty pages below sg_dma_unmap
> and removed PageReserved check.
> Changes since v2
> - Added back PageResevered check as
> suggested by John Hubbard.
> Changes since v3
> - Changed the changelog as suggested by John.
> - Added John's Reviewed-By tag.
> Changes since v4
> - Rebased the patch on the staging tree.
> - Improved commit log by fixing a line wrap.
> ---
> drivers/staging/kpc2000/kpc_dma/fileops.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c
> index 48ca88b..f15e292 100644
> --- a/drivers/staging/kpc2000/kpc_dma/fileops.c
> +++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
> @@ -190,9 +190,7 @@ 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]);
> - }
> + put_user_pages(acd->user_pages, acd->page_count);
> err_get_user_pages:
> kfree(acd->user_pages);
> err_alloc_userpages:
> @@ -211,16 +209,13 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
> BUG_ON(acd->ldev == NULL);
> BUG_ON(acd->ldev->pldev == NULL);
>
> - for (i = 0 ; i < acd->page_count ; i++) {
> - if (!PageReserved(acd->user_pages[i])) {
> - set_page_dirty(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]);
> + for (i = 0; i < acd->page_count; i++) {
> + if (!PageReserved(acd->user_pages[i]))
> + put_user_pages_dirty(&acd->user_pages[i], 1);
> + else
> + put_user_page(acd->user_pages[i]);
> }
>
> sg_free_table(&acd->sgt);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Linux-kernel-mentees][PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 9:28 Bharath Vedartham
0 siblings, 0 replies; 13+ messages in thread
From: Bharath Vedartham @ 2019-07-30 9:28 UTC (permalink / raw)
To: gregkh, Matt.Sickler
Cc: devel, John Hubbard, linux-kernel, linux-mm,
Jérôme Glisse, linux-kernel-mentees
put_page() to put_user_page*()
Reply-To:
In-Reply-To: <1564058658-3551-1-git-send-email-linux.bhar@gmail.com>
On Thu, Jul 25, 2019 at 06:14:18PM +0530, Bharath Vedartham wrote:
[Forwarding patch to linux-kernel-mentees mailing list]
> For pages that were retained via get_user_pages*(), release those pages
> via the new put_user_page*() routines, instead of via put_page().
>
> This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
> ("mm: introduce put_user_page*(), placeholder versions").
>
> Cc: Ira Weiny <ira.weiny@intel.com>
> Cc: John Hubbard <jhubbard@nvidia.com>
> Cc: Jérôme Glisse <jglisse@redhat.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Matt Sickler <Matt.Sickler@daktronics.com>
> Cc: devel@driverdev.osuosl.org
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-mm@kvack.org
> Reviewed-by: John Hubbard <jhubbard@nvidia.com>
> Signed-off-by: Bharath Vedartham <linux.bhar@gmail.com>
> ---
> Changes since v1
> - Improved changelog by John's suggestion.
> - Moved logic to dirty pages below sg_dma_unmap
> and removed PageReserved check.
> Changes since v2
> - Added back PageResevered check as
> suggested by John Hubbard.
> Changes since v3
> - Changed the changelog as suggested by John.
> - Added John's Reviewed-By tag.
> Changes since v4
> - Rebased the patch on the staging tree.
> - Improved commit log by fixing a line wrap.
> ---
> drivers/staging/kpc2000/kpc_dma/fileops.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c
> index 48ca88b..f15e292 100644
> --- a/drivers/staging/kpc2000/kpc_dma/fileops.c
> +++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
> @@ -190,9 +190,7 @@ 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]);
> - }
> + put_user_pages(acd->user_pages, acd->page_count);
> err_get_user_pages:
> kfree(acd->user_pages);
> err_alloc_userpages:
> @@ -211,16 +209,13 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
> BUG_ON(acd->ldev == NULL);
> BUG_ON(acd->ldev->pldev == NULL);
>
> - for (i = 0 ; i < acd->page_count ; i++) {
> - if (!PageReserved(acd->user_pages[i])) {
> - set_page_dirty(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]);
> + for (i = 0; i < acd->page_count; i++) {
> + if (!PageReserved(acd->user_pages[i]))
> + put_user_pages_dirty(&acd->user_pages[i], 1);
> + else
> + put_user_page(acd->user_pages[i]);
> }
>
> sg_free_table(&acd->sgt);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 9:28 ` linux.bhar
0 siblings, 0 replies; 13+ messages in thread
From: linux.bhar @ 2019-07-30 9:28 UTC (permalink / raw)
put_page() to put_user_page*()
Reply-To:
In-Reply-To: <1564058658-3551-1-git-send-email-linux.bhar at gmail.com>
On Thu, Jul 25, 2019 at 06:14:18PM +0530, Bharath Vedartham wrote:
[Forwarding patch to linux-kernel-mentees mailing list]
> For pages that were retained via get_user_pages*(), release those pages
> via the new put_user_page*() routines, instead of via put_page().
>
> This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
> ("mm: introduce put_user_page*(), placeholder versions").
>
> Cc: Ira Weiny <ira.weiny at intel.com>
> Cc: John Hubbard <jhubbard at nvidia.com>
> Cc: J?r?me Glisse <jglisse at redhat.com>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Matt Sickler <Matt.Sickler at daktronics.com>
> Cc: devel at driverdev.osuosl.org
> Cc: linux-kernel at vger.kernel.org
> Cc: linux-mm at kvack.org
> Reviewed-by: John Hubbard <jhubbard at nvidia.com>
> Signed-off-by: Bharath Vedartham <linux.bhar at gmail.com>
> ---
> Changes since v1
> - Improved changelog by John's suggestion.
> - Moved logic to dirty pages below sg_dma_unmap
> and removed PageReserved check.
> Changes since v2
> - Added back PageResevered check as
> suggested by John Hubbard.
> Changes since v3
> - Changed the changelog as suggested by John.
> - Added John's Reviewed-By tag.
> Changes since v4
> - Rebased the patch on the staging tree.
> - Improved commit log by fixing a line wrap.
> ---
> drivers/staging/kpc2000/kpc_dma/fileops.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c
> index 48ca88b..f15e292 100644
> --- a/drivers/staging/kpc2000/kpc_dma/fileops.c
> +++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
> @@ -190,9 +190,7 @@ 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]);
> - }
> + put_user_pages(acd->user_pages, acd->page_count);
> err_get_user_pages:
> kfree(acd->user_pages);
> err_alloc_userpages:
> @@ -211,16 +209,13 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
> BUG_ON(acd->ldev == NULL);
> BUG_ON(acd->ldev->pldev == NULL);
>
> - for (i = 0 ; i < acd->page_count ; i++) {
> - if (!PageReserved(acd->user_pages[i])) {
> - set_page_dirty(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]);
> + for (i = 0; i < acd->page_count; i++) {
> + if (!PageReserved(acd->user_pages[i]))
> + put_user_pages_dirty(&acd->user_pages[i], 1);
> + else
> + put_user_page(acd->user_pages[i]);
> }
>
> sg_free_table(&acd->sgt);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page to put_user_page*()
@ 2019-07-30 9:28 ` linux.bhar
0 siblings, 0 replies; 13+ messages in thread
From: Bharath Vedartham @ 2019-07-30 9:28 UTC (permalink / raw)
put_page() to put_user_page*()
Reply-To:
In-Reply-To: <1564058658-3551-1-git-send-email-linux.bhar at gmail.com>
On Thu, Jul 25, 2019 at 06:14:18PM +0530, Bharath Vedartham wrote:
[Forwarding patch to linux-kernel-mentees mailing list]
> For pages that were retained via get_user_pages*(), release those pages
> via the new put_user_page*() routines, instead of via put_page().
>
> This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
> ("mm: introduce put_user_page*(), placeholder versions").
>
> Cc: Ira Weiny <ira.weiny at intel.com>
> Cc: John Hubbard <jhubbard at nvidia.com>
> Cc: J?r?me Glisse <jglisse at redhat.com>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Matt Sickler <Matt.Sickler at daktronics.com>
> Cc: devel at driverdev.osuosl.org
> Cc: linux-kernel at vger.kernel.org
> Cc: linux-mm at kvack.org
> Reviewed-by: John Hubbard <jhubbard at nvidia.com>
> Signed-off-by: Bharath Vedartham <linux.bhar at gmail.com>
> ---
> Changes since v1
> - Improved changelog by John's suggestion.
> - Moved logic to dirty pages below sg_dma_unmap
> and removed PageReserved check.
> Changes since v2
> - Added back PageResevered check as
> suggested by John Hubbard.
> Changes since v3
> - Changed the changelog as suggested by John.
> - Added John's Reviewed-By tag.
> Changes since v4
> - Rebased the patch on the staging tree.
> - Improved commit log by fixing a line wrap.
> ---
> drivers/staging/kpc2000/kpc_dma/fileops.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c
> index 48ca88b..f15e292 100644
> --- a/drivers/staging/kpc2000/kpc_dma/fileops.c
> +++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
> @@ -190,9 +190,7 @@ 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]);
> - }
> + put_user_pages(acd->user_pages, acd->page_count);
> err_get_user_pages:
> kfree(acd->user_pages);
> err_alloc_userpages:
> @@ -211,16 +209,13 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
> BUG_ON(acd->ldev == NULL);
> BUG_ON(acd->ldev->pldev == NULL);
>
> - for (i = 0 ; i < acd->page_count ; i++) {
> - if (!PageReserved(acd->user_pages[i])) {
> - set_page_dirty(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]);
> + for (i = 0; i < acd->page_count; i++) {
> + if (!PageReserved(acd->user_pages[i]))
> + put_user_pages_dirty(&acd->user_pages[i], 1);
> + else
> + put_user_page(acd->user_pages[i]);
> }
>
> sg_free_table(&acd->sgt);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-07-30 15:47 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-30 15:47 [Linux-kernel-mentees] [PATCH v4] staging: kpc2000: Convert put_page() to put_user_page*() linux.bhar
2019-07-30 15:47 ` Bharath Vedartham
-- strict thread matches above, loose matches on Subject: below --
2019-07-30 9:28 [Linux-kernel-mentees][PATCH v4] staging: kpc2000: Convert put_page " Bharath Vedartham
2019-07-30 9:28 ` [Linux-kernel-mentees] [PATCH " Bharath Vedartham
2019-07-30 9:28 ` linux.bhar
2019-07-30 9:36 ` [Linux-kernel-mentees][PATCH " Greg KH
2019-07-30 9:36 ` [Linux-kernel-mentees] [PATCH " Greg KH
2019-07-30 9:36 ` gregkh
2019-07-30 9:36 ` [Linux-kernel-mentees][PATCH " Greg KH
2019-07-30 10:24 ` Bharath Vedartham
2019-07-30 10:24 ` [Linux-kernel-mentees] [PATCH " Bharath Vedartham
2019-07-30 10:24 ` linux.bhar
2019-07-30 9:28 [Linux-kernel-mentees][PATCH " Bharath Vedartham
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.