Commit 3298de2c authored by David Hildenbrand's avatar David Hildenbrand Committed by Andrew Morton

media: videobuf-dma-sg: remove FOLL_FORCE usage

GUP now supports reliable R/O long-term pinning in COW mappings, such
that we break COW early. MAP_SHARED VMAs only use the shared zeropage so
far in one corner case (DAXFS file with holes), which can be ignored
because GUP does not support long-term pinning in fsdax (see
check_vma_flags()).

Consequently, FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM is no longer required
for reliable R/O long-term pinning: FOLL_LONGTERM is sufficient. So stop
using FOLL_FORCE, which is really only for ptrace access.

Link: https://lkml.kernel.org/r/20221116102659.70287-14-david@redhat.comSigned-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 129e636f
...@@ -151,17 +151,16 @@ static void videobuf_dma_init(struct videobuf_dmabuf *dma) ...@@ -151,17 +151,16 @@ static void videobuf_dma_init(struct videobuf_dmabuf *dma)
static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma, static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma,
int direction, unsigned long data, unsigned long size) int direction, unsigned long data, unsigned long size)
{ {
unsigned int gup_flags = FOLL_LONGTERM;
unsigned long first, last; unsigned long first, last;
int err, rw = 0; int err;
unsigned int flags = FOLL_FORCE;
dma->direction = direction; dma->direction = direction;
switch (dma->direction) { switch (dma->direction) {
case DMA_FROM_DEVICE: case DMA_FROM_DEVICE:
rw = READ; gup_flags |= FOLL_WRITE;
break; break;
case DMA_TO_DEVICE: case DMA_TO_DEVICE:
rw = WRITE;
break; break;
default: default:
BUG(); BUG();
...@@ -177,14 +176,11 @@ static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma, ...@@ -177,14 +176,11 @@ static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma,
if (NULL == dma->pages) if (NULL == dma->pages)
return -ENOMEM; return -ENOMEM;
if (rw == READ)
flags |= FOLL_WRITE;
dprintk(1, "init user [0x%lx+0x%lx => %lu pages]\n", dprintk(1, "init user [0x%lx+0x%lx => %lu pages]\n",
data, size, dma->nr_pages); data, size, dma->nr_pages);
err = pin_user_pages(data & PAGE_MASK, dma->nr_pages, err = pin_user_pages(data & PAGE_MASK, dma->nr_pages, gup_flags,
flags | FOLL_LONGTERM, dma->pages, NULL); dma->pages, NULL);
if (err != dma->nr_pages) { if (err != dma->nr_pages) {
dma->nr_pages = (err >= 0) ? err : 0; dma->nr_pages = (err >= 0) ? err : 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment