| Message ID | 20190802022005.5117-17-jhubbard@nvidia.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | put_user_pages(): miscellaneous call sites | expand |
On Fri, Aug 2, 2019 at 4:20 AM <john.hubbard@gmail.com> wrote: > > From: John Hubbard <jhubbard@nvidia.com> > > For pages that were retained via get_user_pages*(), release those pages > via the new put_user_page*() routines, instead of via put_page() or > release_pages(). > > This is part a tree-wide conversion, as described in commit fc1d8e7cca2d > ("mm: introduce put_user_page*(), placeholder versions"). > > Cc: Jens Wiklander <jens.wiklander@linaro.org> > Signed-off-by: John Hubbard <jhubbard@nvidia.com> > --- > drivers/tee/tee_shm.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) Acked-by: Jens Wiklander <jens.wiklander@linaro.org> I suppose you're taking this via your own tree or such. Thanks, Jens > > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c > index 2da026fd12c9..c967d0420b67 100644 > --- a/drivers/tee/tee_shm.c > +++ b/drivers/tee/tee_shm.c > @@ -31,16 +31,13 @@ static void tee_shm_release(struct tee_shm *shm) > > poolm->ops->free(poolm, shm); > } else if (shm->flags & TEE_SHM_REGISTER) { > - size_t n; > int rc = teedev->desc->ops->shm_unregister(shm->ctx, shm); > > if (rc) > dev_err(teedev->dev.parent, > "unregister shm %p failed: %d", shm, rc); > > - for (n = 0; n < shm->num_pages; n++) > - put_page(shm->pages[n]); > - > + put_user_pages(shm->pages, shm->num_pages); > kfree(shm->pages); > } > > @@ -313,16 +310,13 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, > return shm; > err: > if (shm) { > - size_t n; > - > if (shm->id >= 0) { > mutex_lock(&teedev->mutex); > idr_remove(&teedev->idr, shm->id); > mutex_unlock(&teedev->mutex); > } > if (shm->pages) { > - for (n = 0; n < shm->num_pages; n++) > - put_page(shm->pages[n]); > + put_user_pages(shm->pages, shm->num_pages); > kfree(shm->pages); > } > } > -- > 2.22.0 >
On 8/1/19 11:29 PM, Jens Wiklander wrote: > On Fri, Aug 2, 2019 at 4:20 AM <john.hubbard@gmail.com> wrote: >> >> From: John Hubbard <jhubbard@nvidia.com> >> >> For pages that were retained via get_user_pages*(), release those pages >> via the new put_user_page*() routines, instead of via put_page() or >> release_pages(). >> >> This is part a tree-wide conversion, as described in commit fc1d8e7cca2d >> ("mm: introduce put_user_page*(), placeholder versions"). >> >> Cc: Jens Wiklander <jens.wiklander@linaro.org> >> Signed-off-by: John Hubbard <jhubbard@nvidia.com> >> --- >> drivers/tee/tee_shm.c | 10 ++-------- >> 1 file changed, 2 insertions(+), 8 deletions(-) > > Acked-by: Jens Wiklander <jens.wiklander@linaro.org> > > I suppose you're taking this via your own tree or such. > Hi Jens, Thanks for the ACK! I'm expecting that Andrew will take this through his -mm tree, unless he pops up and says otherwise. thanks,
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 2da026fd12c9..c967d0420b67 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -31,16 +31,13 @@ static void tee_shm_release(struct tee_shm *shm) poolm->ops->free(poolm, shm); } else if (shm->flags & TEE_SHM_REGISTER) { - size_t n; int rc = teedev->desc->ops->shm_unregister(shm->ctx, shm); if (rc) dev_err(teedev->dev.parent, "unregister shm %p failed: %d", shm, rc); - for (n = 0; n < shm->num_pages; n++) - put_page(shm->pages[n]); - + put_user_pages(shm->pages, shm->num_pages); kfree(shm->pages); } @@ -313,16 +310,13 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, return shm; err: if (shm) { - size_t n; - if (shm->id >= 0) { mutex_lock(&teedev->mutex); idr_remove(&teedev->idr, shm->id); mutex_unlock(&teedev->mutex); } if (shm->pages) { - for (n = 0; n < shm->num_pages; n++) - put_page(shm->pages[n]); + put_user_pages(shm->pages, shm->num_pages); kfree(shm->pages); } }