From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755609AbdJJHmb (ORCPT ); Tue, 10 Oct 2017 03:42:31 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:49532 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755556AbdJJHm2 (ORCPT ); Tue, 10 Oct 2017 03:42:28 -0400 X-Google-Smtp-Source: AOwi7QBqtOoDADpT10sqVeVbZ70rISM8RCm5VEGNLCP9QCJyVktxpTLwJlqX431e2E2Mh8fHarkZIw== Subject: Re: [PATCH] media: vb2: unify calling of set_page_dirty_lock To: Marek Szyprowski Cc: Stanimir Varbanov , Mauro Carvalho Chehab , Pawel Osciak , Kyungmin Park , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org References: <20170829112603.32732-1-stanimir.varbanov@linaro.org> From: Stanimir Varbanov Message-ID: Date: Tue, 10 Oct 2017 10:42:23 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20170829112603.32732-1-stanimir.varbanov@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Marek, Any comments? On 08/29/2017 02:26 PM, Stanimir Varbanov wrote: > Currently videobuf2-dma-sg checks for dma direction for > every single page and videobuf2-dc lacks any dma direction > checks and calls set_page_dirty_lock unconditionally. > > Thus unify and align the invocations of set_page_dirty_lock > for videobuf2-dc, videobuf2-sg memory allocators with > videobuf2-vmalloc, i.e. the pattern used in vmalloc has been > copied to dc and dma-sg. > > Suggested-by: Marek Szyprowski > Signed-off-by: Stanimir Varbanov > --- > drivers/media/v4l2-core/videobuf2-dma-contig.c | 6 ++++-- > drivers/media/v4l2-core/videobuf2-dma-sg.c | 7 +++---- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c > index 9f389f36566d..696e24f9128d 100644 > --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c > +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c > @@ -434,8 +434,10 @@ static void vb2_dc_put_userptr(void *buf_priv) > pages = frame_vector_pages(buf->vec); > /* sgt should exist only if vector contains pages... */ > BUG_ON(IS_ERR(pages)); > - for (i = 0; i < frame_vector_count(buf->vec); i++) > - set_page_dirty_lock(pages[i]); > + if (buf->dma_dir == DMA_FROM_DEVICE || > + buf->dma_dir == DMA_BIDIRECTIONAL) > + for (i = 0; i < frame_vector_count(buf->vec); i++) > + set_page_dirty_lock(pages[i]); > sg_free_table(sgt); > kfree(sgt); > } > diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c > index 6808231a6bdc..753ed3138dcc 100644 > --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c > +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c > @@ -292,11 +292,10 @@ static void vb2_dma_sg_put_userptr(void *buf_priv) > if (buf->vaddr) > vm_unmap_ram(buf->vaddr, buf->num_pages); > sg_free_table(buf->dma_sgt); > - while (--i >= 0) { > - if (buf->dma_dir == DMA_FROM_DEVICE || > - buf->dma_dir == DMA_BIDIRECTIONAL) > + if (buf->dma_dir == DMA_FROM_DEVICE || > + buf->dma_dir == DMA_BIDIRECTIONAL) > + while (--i >= 0) > set_page_dirty_lock(buf->pages[i]); > - } > vb2_destroy_framevec(buf->vec); > kfree(buf); > } > -- regards, Stan