| Message ID | 20221116102659.70287-17-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | mm/gup: remove FOLL_FORCE usage from drivers (reliable R/O long-term pinning) | expand |
Hi David, Tomasz, On 16/11/2022 11:26, David Hildenbrand wrote: > FOLL_FORCE is really only for ptrace access. According to commit > 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always > writable"), get_vaddr_frames() currently pins all pages writable as a > workaround for issues with read-only buffers. I've decided to revert 707947247e95: I have not been able to reproduce the problem described in that commit, and Tomasz reported that it caused problems with a specific use-case they encountered. I'll post that patch soon and I expect it to land in 6.2. It will cause a conflict with this patch, though. If the problem described in that patch occurs again, then I will revisit it and hopefully do a better job than I did before. That commit was not my finest moment. Regards, Hans > > FOLL_FORCE, however, seems to be a legacy leftover as it predates > commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are > always writable"). Let's just remove it. > > Once the read-only buffer issue has been resolved, FOLL_WRITE could > again be set depending on the DMA direction. > > Cc: Hans Verkuil <hverkuil@xs4all.nl> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Tomasz Figa <tfiga@chromium.org> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > drivers/media/common/videobuf2/frame_vector.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c > index 542dde9d2609..062e98148c53 100644 > --- a/drivers/media/common/videobuf2/frame_vector.c > +++ b/drivers/media/common/videobuf2/frame_vector.c > @@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, > start = untagged_addr(start); > > ret = pin_user_pages_fast(start, nr_frames, > - FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM, > + FOLL_WRITE | FOLL_LONGTERM, > (struct page **)(vec->ptrs)); > if (ret > 0) { > vec->got_ref = true;
On 23/11/2022 14:26, Hans Verkuil wrote: > Hi David, Tomasz, > > On 16/11/2022 11:26, David Hildenbrand wrote: >> FOLL_FORCE is really only for ptrace access. According to commit >> 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always >> writable"), get_vaddr_frames() currently pins all pages writable as a >> workaround for issues with read-only buffers. > > I've decided to revert 707947247e95: I have not been able to reproduce the problem > described in that commit, and Tomasz reported that it caused problems with a > specific use-case they encountered. I'll post that patch soon and I expect it > to land in 6.2. It will cause a conflict with this patch, though. > > If the problem described in that patch occurs again, then I will revisit it > and hopefully do a better job than I did before. That commit was not my > finest moment. In any case, for this patch: Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Regards, Hans > > Regards, > > Hans > >> >> FOLL_FORCE, however, seems to be a legacy leftover as it predates >> commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are >> always writable"). Let's just remove it. >> >> Once the read-only buffer issue has been resolved, FOLL_WRITE could >> again be set depending on the DMA direction. >> >> Cc: Hans Verkuil <hverkuil@xs4all.nl> >> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >> Cc: Tomasz Figa <tfiga@chromium.org> >> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> drivers/media/common/videobuf2/frame_vector.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c >> index 542dde9d2609..062e98148c53 100644 >> --- a/drivers/media/common/videobuf2/frame_vector.c >> +++ b/drivers/media/common/videobuf2/frame_vector.c >> @@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, >> start = untagged_addr(start); >> >> ret = pin_user_pages_fast(start, nr_frames, >> - FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM, >> + FOLL_WRITE | FOLL_LONGTERM, >> (struct page **)(vec->ptrs)); >> if (ret > 0) { >> vec->got_ref = true; >
On 16.11.22 11:26, David Hildenbrand wrote: > FOLL_FORCE is really only for ptrace access. According to commit > 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always > writable"), get_vaddr_frames() currently pins all pages writable as a > workaround for issues with read-only buffers. > > FOLL_FORCE, however, seems to be a legacy leftover as it predates > commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are > always writable"). Let's just remove it. > > Once the read-only buffer issue has been resolved, FOLL_WRITE could > again be set depending on the DMA direction. > > Cc: Hans Verkuil <hverkuil@xs4all.nl> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Tomasz Figa <tfiga@chromium.org> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > drivers/media/common/videobuf2/frame_vector.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c > index 542dde9d2609..062e98148c53 100644 > --- a/drivers/media/common/videobuf2/frame_vector.c > +++ b/drivers/media/common/videobuf2/frame_vector.c > @@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, > start = untagged_addr(start); > > ret = pin_user_pages_fast(start, nr_frames, > - FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM, > + FOLL_WRITE | FOLL_LONGTERM, > (struct page **)(vec->ptrs)); > if (ret > 0) { > vec->got_ref = true; Hi Andrew, see the discussion at [1] regarding a conflict and how to proceed with upstreaming. The conflict would be easy to resolve, however, also the patch description doesn't make sense anymore with [1]. On top of mm-unstable, reverting this patch and applying [1] gives me an updated patch: From 1e66c25f1467c1f1e5f275312f2c6df29308d4df Mon Sep 17 00:00:00 2001 From: David Hildenbrand <david@redhat.com> Date: Wed, 16 Nov 2022 11:26:55 +0100 Subject: [PATCH] mm/frame-vector: 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. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Cc: Hans Verkuil <hverkuil@xs4all.nl> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Tomasz Figa <tfiga@chromium.org> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: David Hildenbrand <david@redhat.com> --- drivers/media/common/videobuf2/frame_vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c index aad72640f055..8606fdacf5b8 100644 --- a/drivers/media/common/videobuf2/frame_vector.c +++ b/drivers/media/common/videobuf2/frame_vector.c @@ -41,7 +41,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, bool write, int ret_pin_user_pages_fast = 0; int ret = 0; int err; - unsigned int gup_flags = FOLL_FORCE | FOLL_LONGTERM; + unsigned int gup_flags = FOLL_LONGTERM; if (nr_frames == 0) return 0;
Hi David, On 27/11/2022 11:35, David Hildenbrand wrote: > On 16.11.22 11:26, David Hildenbrand wrote: >> FOLL_FORCE is really only for ptrace access. According to commit >> 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always >> writable"), get_vaddr_frames() currently pins all pages writable as a >> workaround for issues with read-only buffers. >> >> FOLL_FORCE, however, seems to be a legacy leftover as it predates >> commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are >> always writable"). Let's just remove it. >> >> Once the read-only buffer issue has been resolved, FOLL_WRITE could >> again be set depending on the DMA direction. >> >> Cc: Hans Verkuil <hverkuil@xs4all.nl> >> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >> Cc: Tomasz Figa <tfiga@chromium.org> >> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> drivers/media/common/videobuf2/frame_vector.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c >> index 542dde9d2609..062e98148c53 100644 >> --- a/drivers/media/common/videobuf2/frame_vector.c >> +++ b/drivers/media/common/videobuf2/frame_vector.c >> @@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, >> start = untagged_addr(start); >> ret = pin_user_pages_fast(start, nr_frames, >> - FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM, >> + FOLL_WRITE | FOLL_LONGTERM, >> (struct page **)(vec->ptrs)); >> if (ret > 0) { >> vec->got_ref = true; > > > Hi Andrew, > > see the discussion at [1] regarding a conflict and how to proceed with > upstreaming. The conflict would be easy to resolve, however, also > the patch description doesn't make sense anymore with [1]. Might it be easier and less confusing if you post a v2 of this series with my patch first? That way it is clear that 1) my patch has to come first, and 2) that it is part of a single series and should be merged by the mm subsystem. Less chances of things going wrong that way. Just mention in the v2 cover letter that the first patch was added to make it easy to backport that fix without being hampered by merge conflicts if it was added after your frame_vector.c patch. Regards, Hans > > > On top of mm-unstable, reverting this patch and applying [1] gives me > an updated patch: > > > From 1e66c25f1467c1f1e5f275312f2c6df29308d4df Mon Sep 17 00:00:00 2001 > From: David Hildenbrand <david@redhat.com> > Date: Wed, 16 Nov 2022 11:26:55 +0100 > Subject: [PATCH] mm/frame-vector: 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. > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > Cc: Hans Verkuil <hverkuil@xs4all.nl> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Tomasz Figa <tfiga@chromium.org> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > drivers/media/common/videobuf2/frame_vector.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c > index aad72640f055..8606fdacf5b8 100644 > --- a/drivers/media/common/videobuf2/frame_vector.c > +++ b/drivers/media/common/videobuf2/frame_vector.c > @@ -41,7 +41,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, bool write, > int ret_pin_user_pages_fast = 0; > int ret = 0; > int err; > - unsigned int gup_flags = FOLL_FORCE | FOLL_LONGTERM; > + unsigned int gup_flags = FOLL_LONGTERM; > > if (nr_frames == 0) > return 0;
On 28.11.22 09:17, Hans Verkuil wrote: > Hi David, > > On 27/11/2022 11:35, David Hildenbrand wrote: >> On 16.11.22 11:26, David Hildenbrand wrote: >>> FOLL_FORCE is really only for ptrace access. According to commit >>> 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always >>> writable"), get_vaddr_frames() currently pins all pages writable as a >>> workaround for issues with read-only buffers. >>> >>> FOLL_FORCE, however, seems to be a legacy leftover as it predates >>> commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are >>> always writable"). Let's just remove it. >>> >>> Once the read-only buffer issue has been resolved, FOLL_WRITE could >>> again be set depending on the DMA direction. >>> >>> Cc: Hans Verkuil <hverkuil@xs4all.nl> >>> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >>> Cc: Tomasz Figa <tfiga@chromium.org> >>> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >>> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> >>> Signed-off-by: David Hildenbrand <david@redhat.com> >>> --- >>> drivers/media/common/videobuf2/frame_vector.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c >>> index 542dde9d2609..062e98148c53 100644 >>> --- a/drivers/media/common/videobuf2/frame_vector.c >>> +++ b/drivers/media/common/videobuf2/frame_vector.c >>> @@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, >>> start = untagged_addr(start); >>> ret = pin_user_pages_fast(start, nr_frames, >>> - FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM, >>> + FOLL_WRITE | FOLL_LONGTERM, >>> (struct page **)(vec->ptrs)); >>> if (ret > 0) { >>> vec->got_ref = true; >> >> >> Hi Andrew, >> >> see the discussion at [1] regarding a conflict and how to proceed with >> upstreaming. The conflict would be easy to resolve, however, also >> the patch description doesn't make sense anymore with [1]. > > Might it be easier and less confusing if you post a v2 of this series > with my patch first? That way it is clear that 1) my patch has to come > first, and 2) that it is part of a single series and should be merged > by the mm subsystem. > > Less chances of things going wrong that way. > > Just mention in the v2 cover letter that the first patch was added to > make it easy to backport that fix without being hampered by merge > conflicts if it was added after your frame_vector.c patch. Yes, that's the way I would naturally do, it, however, Andrew prefers delta updates for minor changes. @Andrew, whatever you prefer! Thanks!
On 28/11/2022 09:18, David Hildenbrand wrote: > On 28.11.22 09:17, Hans Verkuil wrote: >> Hi David, >> >> On 27/11/2022 11:35, David Hildenbrand wrote: >>> On 16.11.22 11:26, David Hildenbrand wrote: >>>> FOLL_FORCE is really only for ptrace access. According to commit >>>> 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always >>>> writable"), get_vaddr_frames() currently pins all pages writable as a >>>> workaround for issues with read-only buffers. >>>> >>>> FOLL_FORCE, however, seems to be a legacy leftover as it predates >>>> commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are >>>> always writable"). Let's just remove it. >>>> >>>> Once the read-only buffer issue has been resolved, FOLL_WRITE could >>>> again be set depending on the DMA direction. >>>> >>>> Cc: Hans Verkuil <hverkuil@xs4all.nl> >>>> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >>>> Cc: Tomasz Figa <tfiga@chromium.org> >>>> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >>>> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> >>>> Signed-off-by: David Hildenbrand <david@redhat.com> >>>> --- >>>> drivers/media/common/videobuf2/frame_vector.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c >>>> index 542dde9d2609..062e98148c53 100644 >>>> --- a/drivers/media/common/videobuf2/frame_vector.c >>>> +++ b/drivers/media/common/videobuf2/frame_vector.c >>>> @@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, >>>> start = untagged_addr(start); >>>> ret = pin_user_pages_fast(start, nr_frames, >>>> - FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM, >>>> + FOLL_WRITE | FOLL_LONGTERM, >>>> (struct page **)(vec->ptrs)); >>>> if (ret > 0) { >>>> vec->got_ref = true; >>> >>> >>> Hi Andrew, >>> >>> see the discussion at [1] regarding a conflict and how to proceed with >>> upstreaming. The conflict would be easy to resolve, however, also >>> the patch description doesn't make sense anymore with [1]. >> >> Might it be easier and less confusing if you post a v2 of this series >> with my patch first? That way it is clear that 1) my patch has to come >> first, and 2) that it is part of a single series and should be merged >> by the mm subsystem. >> >> Less chances of things going wrong that way. >> >> Just mention in the v2 cover letter that the first patch was added to >> make it easy to backport that fix without being hampered by merge >> conflicts if it was added after your frame_vector.c patch. > > Yes, that's the way I would naturally do, it, however, Andrew prefers delta updates for minor changes. > > @Andrew, whatever you prefer! Andrew, I've resent my patch, this time with you CCed as well. Regards, Hans > > Thanks! >
On Mon, Nov 28, 2022 at 5:19 PM David Hildenbrand <david@redhat.com> wrote: > > On 28.11.22 09:17, Hans Verkuil wrote: > > Hi David, > > > > On 27/11/2022 11:35, David Hildenbrand wrote: > >> On 16.11.22 11:26, David Hildenbrand wrote: > >>> FOLL_FORCE is really only for ptrace access. According to commit > >>> 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always > >>> writable"), get_vaddr_frames() currently pins all pages writable as a > >>> workaround for issues with read-only buffers. > >>> > >>> FOLL_FORCE, however, seems to be a legacy leftover as it predates > >>> commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are > >>> always writable"). Let's just remove it. > >>> > >>> Once the read-only buffer issue has been resolved, FOLL_WRITE could > >>> again be set depending on the DMA direction. > >>> > >>> Cc: Hans Verkuil <hverkuil@xs4all.nl> > >>> Cc: Marek Szyprowski <m.szyprowski@samsung.com> > >>> Cc: Tomasz Figa <tfiga@chromium.org> > >>> Cc: Marek Szyprowski <m.szyprowski@samsung.com> > >>> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > >>> Signed-off-by: David Hildenbrand <david@redhat.com> > >>> --- > >>> drivers/media/common/videobuf2/frame_vector.c | 2 +- > >>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>> diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c > >>> index 542dde9d2609..062e98148c53 100644 > >>> --- a/drivers/media/common/videobuf2/frame_vector.c > >>> +++ b/drivers/media/common/videobuf2/frame_vector.c > >>> @@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, > >>> start = untagged_addr(start); > >>> ret = pin_user_pages_fast(start, nr_frames, > >>> - FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM, > >>> + FOLL_WRITE | FOLL_LONGTERM, > >>> (struct page **)(vec->ptrs)); > >>> if (ret > 0) { > >>> vec->got_ref = true; > >> > >> > >> Hi Andrew, > >> > >> see the discussion at [1] regarding a conflict and how to proceed with > >> upstreaming. The conflict would be easy to resolve, however, also > >> the patch description doesn't make sense anymore with [1]. > > > > Might it be easier and less confusing if you post a v2 of this series > > with my patch first? That way it is clear that 1) my patch has to come > > first, and 2) that it is part of a single series and should be merged > > by the mm subsystem. > > > > Less chances of things going wrong that way. > > > > Just mention in the v2 cover letter that the first patch was added to > > make it easy to backport that fix without being hampered by merge > > conflicts if it was added after your frame_vector.c patch. > > Yes, that's the way I would naturally do, it, however, Andrew prefers > delta updates for minor changes. > > @Andrew, whatever you prefer! > > Thanks! > However you folks proceed with taking this patch, feel free to add my Acked-by. Thanks! Best regards, Tomasz > -- > Thanks, > > David / dhildenb >
On Mon, 28 Nov 2022 09:18:47 +0100 David Hildenbrand <david@redhat.com> wrote: > > Less chances of things going wrong that way. > > > > Just mention in the v2 cover letter that the first patch was added to > > make it easy to backport that fix without being hampered by merge > > conflicts if it was added after your frame_vector.c patch. > > Yes, that's the way I would naturally do, it, however, Andrew prefers > delta updates for minor changes. > > @Andrew, whatever you prefer! I'm inclined to let things sit as they are. Cross-tree conflicts happen, and Linus handles them. I'll flag this (very simple) conflict in the pull request, if MM merges second. If v4l merges second then hopefully they will do the same. But this one is so simple that Linus hardly needs our help. But Linus won't be editing changelogs so that the changelog makes more sense after both trees are joined. I'm inclined to let the changelog sit as it is as well.
On 28.11.22 23:59, Andrew Morton wrote: > On Mon, 28 Nov 2022 09:18:47 +0100 David Hildenbrand <david@redhat.com> wrote: > >>> Less chances of things going wrong that way. >>> >>> Just mention in the v2 cover letter that the first patch was added to >>> make it easy to backport that fix without being hampered by merge >>> conflicts if it was added after your frame_vector.c patch. >> >> Yes, that's the way I would naturally do, it, however, Andrew prefers >> delta updates for minor changes. >> >> @Andrew, whatever you prefer! > > I'm inclined to let things sit as they are. Cross-tree conflicts > happen, and Linus handles them. I'll flag this (very simple) conflict > in the pull request, if MM merges second. If v4l merges second then > hopefully they will do the same. But this one is so simple that Linus > hardly needs our help. > > But Linus won't be editing changelogs so that the changelog makes more > sense after both trees are joined. I'm inclined to let the changelog > sit as it is as well. Works for me. Thanks Andrew!
On 29/11/2022 09:48, David Hildenbrand wrote: > On 28.11.22 23:59, Andrew Morton wrote: >> On Mon, 28 Nov 2022 09:18:47 +0100 David Hildenbrand <david@redhat.com> wrote: >> >>>> Less chances of things going wrong that way. >>>> >>>> Just mention in the v2 cover letter that the first patch was added to >>>> make it easy to backport that fix without being hampered by merge >>>> conflicts if it was added after your frame_vector.c patch. >>> >>> Yes, that's the way I would naturally do, it, however, Andrew prefers >>> delta updates for minor changes. >>> >>> @Andrew, whatever you prefer! >> >> I'm inclined to let things sit as they are. Cross-tree conflicts >> happen, and Linus handles them. I'll flag this (very simple) conflict >> in the pull request, if MM merges second. If v4l merges second then >> hopefully they will do the same. But this one is so simple that Linus >> hardly needs our help. It's not about cross-tree conflicts, it's about the fact that my patch is a fix that needs to be backported to older kernels. It should apply cleanly to those older kernels if my patch goes in first, but if it is the other way around I would have to make a new patch for the stable kernels. Also, the updated changelog in David's patch that sits on top of mine makes a lot more sense. If you really don't want to take my patch as part of this, then let me know and I'll take it through the media subsystem and hope for the best :-) Regards, Hans >> >> But Linus won't be editing changelogs so that the changelog makes more >> sense after both trees are joined. I'm inclined to let the changelog >> sit as it is as well. > > Works for me. Thanks Andrew! >
On 29.11.22 10:08, Hans Verkuil wrote: > On 29/11/2022 09:48, David Hildenbrand wrote: >> On 28.11.22 23:59, Andrew Morton wrote: >>> On Mon, 28 Nov 2022 09:18:47 +0100 David Hildenbrand <david@redhat.com> wrote: >>> >>>>> Less chances of things going wrong that way. >>>>> >>>>> Just mention in the v2 cover letter that the first patch was added to >>>>> make it easy to backport that fix without being hampered by merge >>>>> conflicts if it was added after your frame_vector.c patch. >>>> >>>> Yes, that's the way I would naturally do, it, however, Andrew prefers >>>> delta updates for minor changes. >>>> >>>> @Andrew, whatever you prefer! >>> >>> I'm inclined to let things sit as they are. Cross-tree conflicts >>> happen, and Linus handles them. I'll flag this (very simple) conflict >>> in the pull request, if MM merges second. If v4l merges second then >>> hopefully they will do the same. But this one is so simple that Linus >>> hardly needs our help. > > It's not about cross-tree conflicts, it's about the fact that my patch is > a fix that needs to be backported to older kernels. It should apply cleanly > to those older kernels if my patch goes in first, but if it is the other way > around I would have to make a new patch for the stable kernels. IIUC, the conflict will be resolved at merge time and the merge resolution will be part of the merge commit. It doesn't matter in which order the patches go upstream, the merge commit resolves the problematic overlap. So your patch will be upstream as intended, where it can be cleanly backported. Hope I am not twisting reality ;)
diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c index 542dde9d2609..062e98148c53 100644 --- a/drivers/media/common/videobuf2/frame_vector.c +++ b/drivers/media/common/videobuf2/frame_vector.c @@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, start = untagged_addr(start); ret = pin_user_pages_fast(start, nr_frames, - FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM, + FOLL_WRITE | FOLL_LONGTERM, (struct page **)(vec->ptrs)); if (ret > 0) { vec->got_ref = true;
FOLL_FORCE is really only for ptrace access. According to commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always writable"), get_vaddr_frames() currently pins all pages writable as a workaround for issues with read-only buffers. FOLL_FORCE, however, seems to be a legacy leftover as it predates commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always writable"). Let's just remove it. Once the read-only buffer issue has been resolved, FOLL_WRITE could again be set depending on the DMA direction. Cc: Hans Verkuil <hverkuil@xs4all.nl> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Tomasz Figa <tfiga@chromium.org> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: David Hildenbrand <david@redhat.com> --- drivers/media/common/videobuf2/frame_vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)