mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 06:01:57 +00:00
e2fc6edd37
Commit707947247e("media: videobuf2-vmalloc: get_userptr: buffers are always writable") caused problems in a corner case (passing read-only shmem memory as a userptr). So revert this patch. The original problem for which that commit was originally made is something that I could not reproduce after reverting it. So just go back to the way it was for many years, and if problems arise in the future, then another approach should be taken to resolve it. This patch is based on a patch from Hirokazu. Fixes:707947247e("media: videobuf2-vmalloc: get_userptr: buffers are always writable") Signed-off-by: Hirokazu Honda <hiroh@chromium.org> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Acked-by: Tomasz Figa <tfiga@chromium.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
48 lines
1.4 KiB
C
48 lines
1.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef _MEDIA_FRAME_VECTOR_H
|
|
#define _MEDIA_FRAME_VECTOR_H
|
|
|
|
/* Container for pinned pfns / pages in frame_vector.c */
|
|
struct frame_vector {
|
|
unsigned int nr_allocated; /* Number of frames we have space for */
|
|
unsigned int nr_frames; /* Number of frames stored in ptrs array */
|
|
bool got_ref; /* Did we pin pages by getting page ref? */
|
|
bool is_pfns; /* Does array contain pages or pfns? */
|
|
void *ptrs[]; /* Array of pinned pfns / pages. Use
|
|
* pfns_vector_pages() or pfns_vector_pfns()
|
|
* for access */
|
|
};
|
|
|
|
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,
|
|
bool write, 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);
|
|
|
|
static inline unsigned int frame_vector_count(struct frame_vector *vec)
|
|
{
|
|
return vec->nr_frames;
|
|
}
|
|
|
|
static inline struct page **frame_vector_pages(struct frame_vector *vec)
|
|
{
|
|
if (vec->is_pfns) {
|
|
int err = frame_vector_to_pages(vec);
|
|
|
|
if (err)
|
|
return ERR_PTR(err);
|
|
}
|
|
return (struct page **)(vec->ptrs);
|
|
}
|
|
|
|
static inline unsigned long *frame_vector_pfns(struct frame_vector *vec)
|
|
{
|
|
if (!vec->is_pfns)
|
|
frame_vector_to_pfns(vec);
|
|
return (unsigned long *)(vec->ptrs);
|
|
}
|
|
|
|
#endif /* _MEDIA_FRAME_VECTOR_H */
|