| Message ID | 20201002175303.390363-1-daniel.vetter@ffwll.ch |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] mm/frame-vec: Drop gup_flags from get_vaddr_frames() | expand |
On Fri, Oct 2, 2020 at 7:53 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > FOLL_WRITE | FOLL_FORCE is really the only reasonable thing to do for > simple dma device that can't guarantee write protection. Which is also > what all the callers are using. > > So just simplify this. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Inki Dae <inki.dae@samsung.com> > Cc: Joonyoung Shim <jy0922.shim@samsung.com> > Cc: Seung-Woo Kim <sw0312.kim@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Kukjin Kim <kgene@kernel.org> > Cc: Krzysztof Kozlowski <krzk@kernel.org> > Cc: Pawel Osciak <pawel@osciak.com> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Tomasz Figa <tfiga@chromium.org> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Oded Gabbay <oded.gabbay@gmail.com> > Cc: Omer Shpigelman <oshpigelman@habana.ai> > Cc: Tomer Tayar <ttayar@habana.ai> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Pawel Piskorski <ppiskorski@habana.ai> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-samsung-soc@vger.kernel.org > Cc: linux-media@vger.kernel.org > Cc: linux-mm@kvack.org > --- > drivers/gpu/drm/exynos/exynos_drm_g2d.c | 3 +-- > drivers/media/common/videobuf2/videobuf2-memops.c | 3 +-- > drivers/misc/habanalabs/common/memory.c | 3 +-- > include/linux/mm.h | 2 +- > mm/frame_vector.c | 4 ++-- > 5 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c > index 967a5cdc120e..ac452842bab3 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c > @@ -480,8 +480,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d, > goto err_free; > } > > - ret = get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE, > - g2d_userptr->vec); > + ret = get_vaddr_frames(start, npages, g2d_userptr->vec); > if (ret != npages) { > DRM_DEV_ERROR(g2d->dev, > "failed to get user pages from userptr.\n"); > diff --git a/drivers/media/common/videobuf2/videobuf2-memops.c b/drivers/media/common/videobuf2/videobuf2-memops.c > index 6e9e05153f4e..9dd6c27162f4 100644 > --- a/drivers/media/common/videobuf2/videobuf2-memops.c > +++ b/drivers/media/common/videobuf2/videobuf2-memops.c > @@ -40,7 +40,6 @@ struct frame_vector *vb2_create_framevec(unsigned long start, > unsigned long first, last; > unsigned long nr; > struct frame_vector *vec; > - unsigned int flags = FOLL_FORCE | FOLL_WRITE; > > first = start >> PAGE_SHIFT; > last = (start + length - 1) >> PAGE_SHIFT; > @@ -48,7 +47,7 @@ struct frame_vector *vb2_create_framevec(unsigned long start, > vec = frame_vector_create(nr); > if (!vec) > return ERR_PTR(-ENOMEM); > - ret = get_vaddr_frames(start & PAGE_MASK, nr, flags, vec); > + ret = get_vaddr_frames(start & PAGE_MASK, nr, vec); > if (ret < 0) > goto out_destroy; > /* We accept only complete set of PFNs */ For drivers/media/common/videobuf2/: Acked-by: Tomasz Figa <tfiga@chromium.org> Best regards, Tomasz
On Fri, Oct 2, 2020 at 9:23 PM Tomasz Figa <tfiga@chromium.org> wrote: > > On Fri, Oct 2, 2020 at 7:53 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > > > FOLL_WRITE | FOLL_FORCE is really the only reasonable thing to do for > > simple dma device that can't guarantee write protection. Which is also > > what all the callers are using. > > > > So just simplify this. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Inki Dae <inki.dae@samsung.com> > > Cc: Joonyoung Shim <jy0922.shim@samsung.com> > > Cc: Seung-Woo Kim <sw0312.kim@samsung.com> > > Cc: Kyungmin Park <kyungmin.park@samsung.com> > > Cc: Kukjin Kim <kgene@kernel.org> > > Cc: Krzysztof Kozlowski <krzk@kernel.org> > > Cc: Pawel Osciak <pawel@osciak.com> > > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > > Cc: Tomasz Figa <tfiga@chromium.org> > > Cc: Andrew Morton <akpm@linux-foundation.org> > > Cc: Oded Gabbay <oded.gabbay@gmail.com> > > Cc: Omer Shpigelman <oshpigelman@habana.ai> > > Cc: Tomer Tayar <ttayar@habana.ai> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Cc: Pawel Piskorski <ppiskorski@habana.ai> > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-samsung-soc@vger.kernel.org > > Cc: linux-media@vger.kernel.org > > Cc: linux-mm@kvack.org > > --- > > drivers/gpu/drm/exynos/exynos_drm_g2d.c | 3 +-- > > drivers/media/common/videobuf2/videobuf2-memops.c | 3 +-- > > drivers/misc/habanalabs/common/memory.c | 3 +-- > > include/linux/mm.h | 2 +- > > mm/frame_vector.c | 4 ++-- > > 5 files changed, 6 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c > > index 967a5cdc120e..ac452842bab3 100644 > > --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c > > +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c > > @@ -480,8 +480,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d, > > goto err_free; > > } > > > > - ret = get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE, > > - g2d_userptr->vec); > > + ret = get_vaddr_frames(start, npages, g2d_userptr->vec); > > if (ret != npages) { > > DRM_DEV_ERROR(g2d->dev, > > "failed to get user pages from userptr.\n"); > > diff --git a/drivers/media/common/videobuf2/videobuf2-memops.c b/drivers/media/common/videobuf2/videobuf2-memops.c > > index 6e9e05153f4e..9dd6c27162f4 100644 > > --- a/drivers/media/common/videobuf2/videobuf2-memops.c > > +++ b/drivers/media/common/videobuf2/videobuf2-memops.c > > @@ -40,7 +40,6 @@ struct frame_vector *vb2_create_framevec(unsigned long start, > > unsigned long first, last; > > unsigned long nr; > > struct frame_vector *vec; > > - unsigned int flags = FOLL_FORCE | FOLL_WRITE; > > > > first = start >> PAGE_SHIFT; > > last = (start + length - 1) >> PAGE_SHIFT; > > @@ -48,7 +47,7 @@ struct frame_vector *vb2_create_framevec(unsigned long start, > > vec = frame_vector_create(nr); > > if (!vec) > > return ERR_PTR(-ENOMEM); > > - ret = get_vaddr_frames(start & PAGE_MASK, nr, flags, vec); > > + ret = get_vaddr_frames(start & PAGE_MASK, nr, vec); > > if (ret < 0) > > goto out_destroy; > > /* We accept only complete set of PFNs */ > > For drivers/media/common/videobuf2/: > > Acked-by: Tomasz Figa <tfiga@chromium.org> > > Best regards, > Tomasz For drivers/misc/habanalabs: Acked-by: Oded Gabbay <oded.gabbay@gmail.com> Thanks, Oded
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 967a5cdc120e..ac452842bab3 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -480,8 +480,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d, goto err_free; } - ret = get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE, - g2d_userptr->vec); + ret = get_vaddr_frames(start, npages, g2d_userptr->vec); if (ret != npages) { DRM_DEV_ERROR(g2d->dev, "failed to get user pages from userptr.\n"); diff --git a/drivers/media/common/videobuf2/videobuf2-memops.c b/drivers/media/common/videobuf2/videobuf2-memops.c index 6e9e05153f4e..9dd6c27162f4 100644 --- a/drivers/media/common/videobuf2/videobuf2-memops.c +++ b/drivers/media/common/videobuf2/videobuf2-memops.c @@ -40,7 +40,6 @@ struct frame_vector *vb2_create_framevec(unsigned long start, unsigned long first, last; unsigned long nr; struct frame_vector *vec; - unsigned int flags = FOLL_FORCE | FOLL_WRITE; first = start >> PAGE_SHIFT; last = (start + length - 1) >> PAGE_SHIFT; @@ -48,7 +47,7 @@ struct frame_vector *vb2_create_framevec(unsigned long start, vec = frame_vector_create(nr); if (!vec) return ERR_PTR(-ENOMEM); - ret = get_vaddr_frames(start & PAGE_MASK, nr, flags, vec); + ret = get_vaddr_frames(start & PAGE_MASK, nr, vec); if (ret < 0) goto out_destroy; /* We accept only complete set of PFNs */ diff --git a/drivers/misc/habanalabs/common/memory.c b/drivers/misc/habanalabs/common/memory.c index 5ff4688683fd..43b10aee8150 100644 --- a/drivers/misc/habanalabs/common/memory.c +++ b/drivers/misc/habanalabs/common/memory.c @@ -1287,8 +1287,7 @@ static int get_user_memory(struct hl_device *hdev, u64 addr, u64 size, return -ENOMEM; } - rc = get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE, - userptr->vec); + rc = get_vaddr_frames(start, npages, userptr->vec); if (rc != npages) { dev_err(hdev->dev, diff --git a/include/linux/mm.h b/include/linux/mm.h index 16b799a0522c..7d14aa2780d2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1757,7 +1757,7 @@ struct frame_vector { struct frame_vector *frame_vector_create(unsigned int nr_frames); void frame_vector_destroy(struct frame_vector *vec); int get_vaddr_frames(unsigned long start, unsigned int nr_pfns, - unsigned int gup_flags, struct frame_vector *vec); + struct frame_vector *vec); void put_vaddr_frames(struct frame_vector *vec); int frame_vector_to_pages(struct frame_vector *vec); void frame_vector_to_pfns(struct frame_vector *vec); diff --git a/mm/frame_vector.c b/mm/frame_vector.c index 10f82d5643b6..5d34c9047e9c 100644 --- a/mm/frame_vector.c +++ b/mm/frame_vector.c @@ -12,7 +12,6 @@ * get_vaddr_frames() - map virtual addresses to pfns * @start: starting user address * @nr_frames: number of pages / pfns from start to map - * @gup_flags: flags modifying lookup behaviour * @vec: structure which receives pages / pfns of the addresses mapped. * It should have space for at least nr_frames entries. * @@ -32,10 +31,11 @@ * This function takes care of grabbing mmap_lock as necessary. */ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, - unsigned int gup_flags, struct frame_vector *vec) + struct frame_vector *vec) { struct mm_struct *mm = current->mm; struct vm_area_struct *vma; + unsigned int gup_flags = FOLL_WRITE | FOLL_FORCE; int ret = 0; int err; int locked;
FOLL_WRITE | FOLL_FORCE is really the only reasonable thing to do for simple dma device that can't guarantee write protection. Which is also what all the callers are using. So just simplify this. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Kukjin Kim <kgene@kernel.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Pawel Osciak <pawel@osciak.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Tomasz Figa <tfiga@chromium.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Oded Gabbay <oded.gabbay@gmail.com> Cc: Omer Shpigelman <oshpigelman@habana.ai> Cc: Tomer Tayar <ttayar@habana.ai> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Pawel Piskorski <ppiskorski@habana.ai> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: linux-mm@kvack.org --- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 3 +-- drivers/media/common/videobuf2/videobuf2-memops.c | 3 +-- drivers/misc/habanalabs/common/memory.c | 3 +-- include/linux/mm.h | 2 +- mm/frame_vector.c | 4 ++-- 5 files changed, 6 insertions(+), 9 deletions(-)