From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755779AbdJJIBn (ORCPT ); Tue, 10 Oct 2017 04:01:43 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:42182 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754585AbdJJIBl (ORCPT ); Tue, 10 Oct 2017 04:01:41 -0400 X-AuditID: cbfec7f5-f79d06d0000031c7-4f-59dc7e611e1f Subject: Re: [PATCH] media: vb2: unify calling of set_page_dirty_lock To: Stanimir Varbanov Cc: Mauro Carvalho Chehab , Pawel Osciak , Kyungmin Park , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org From: Marek Szyprowski Message-id: <8c775a5d-e42a-761b-e5ef-6dee93d7f476@samsung.com> Date: Tue, 10 Oct 2017 10:01:36 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-version: 1.0 In-reply-to: Content-type: text/plain; charset="utf-8"; format="flowed" Content-transfer-encoding: 7bit Content-language: en-US X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGKsWRmVeSWpSXmKPExsWy7djP87qJdXciDS73GlucbXrDbnF51xw2 i54NW1ktlm36w2Qx5e1PdouWtiNMDmwem1Z1snncubaHzePxr5dsHn1bVjF6fN4kF8AaxWWT kpqTWZZapG+XwJWxe+dPtoKlohUb7y1ib2A8J9jFyMkhIWAi0bJ1DwuELSZx4d56ti5GLg4h gaWMEmuf72eGcD4zSuzY3c8C07Hw1hmoxDJGiQMX90E5zxklWk5cZe9i5OAQFnCVuPlMFKRB BKjh9qLdLCA1zAI7GSVOzu8Fm8QmYCjR9baLDaSeV8BO4kxnOUiYRUBV4vj6hUwgtqhAjET7 oZvMIDavgKDEj8n3WEDKOYHKr87UAwkzC1hJPPvXygphy0tsXvOWGcIWl2huvQm2VkLgDJvE /0ctUA+4SExYfowNwhaWeHV8CzuELSNxeXI3VE0/o0RTqzaEPYNR4txbXgjbWuLw8YtQy/gk Jm2bzgxyj4QAr0RHmxCE6SEx40IpRLWjROe310yQ0DkJNHHGEZYJjPKzkHwzC8kLs5C8MAvJ CwsYWVYxiqSWFuempxab6hUn5haX5qXrJefnbmIEppbT/45/3cG49JjVIUYBDkYlHt4FJXci hVgTy4orcw8xSnAwK4nwhigDhXhTEiurUovy44tKc1KLDzFKc7AoifPaRrVFCgmkJ5akZqem FqQWwWSZODilGhgnJj55ahU6s1Nj0v+Gxfs4nq2a+YzD1mw76+/Ds74emnBSPq3oKvd1wamz K9UP2jRX2cvctGmqnhWkKBm4bq6/E990Z8P9bbtmO0V77Nf2t9vWGSY0N+C8ltkpTm/mLRMy LljP9u1e8LPvz9vFE8sCPr1JOb5cNfnN+y1Wy27KaZb/cbv7rGCeEktxRqKhFnNRcSIAJP5u zikDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRmVeSWpSXmKPExsVy+t/xa7qJdXciDeafErA42/SG3eLyrjls Fj0btrJaLNv0h8liytuf7BYtbUeYHNg8Nq3qZPO4c20Pm8fjXy/ZPPq2rGL0+LxJLoA1issm JTUnsyy1SN8ugStj986fbAVLRSs23lvE3sB4TrCLkZNDQsBEYuGtM8wQtpjEhXvr2boYuTiE BJYwSuw9M4URwnnOKLGg7xJrFyMHh7CAq8TNZ6IgDSJAzbcX7WYBqWEW2Mko8XD3dHaIhpOM EveWvAMbyyZgKNH1tosNpJlXwE7iTGc5SJhFQFXi+PqFTCC2qECMxM9Lj1hAbF4BQYkfk++x gJRzApVfnakHEmYWMJP48vIwK4QtL7F5zVtmCFtcorn1JssERsFZSLpnIWmZhaRlFpKWBYws qxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQIjYduxn1t2MHa9Cz7EKMDBqMTDeyH4TqQQa2JZ cWXuIUYJDmYlEd4QZaAQb0piZVVqUX58UWlOavEhRmkOFiVx3t49qyOFBNITS1KzU1MLUotg skwcnFINjEfbljtv/ln4Q9Dk8yyVuQlvHBoC+WZc2WASdCODMVzV0SBLZL3XrN7Ds84cXC8p pPZZOMJCRpL5Vlvhz1bdyIp/aSHWq96yFph/Cyuu4JJbEfz178Ylcb6bm9zFRH3tGWXil8eJ fphy6qDo8VUpB2b0yD9ZNsczsv0ph3FIX2dO6d9TzKW5SizFGYmGWsxFxYkAGZwb0IACAAA= X-CMS-MailID: 20171010080137eucas1p17e177f31fe1aed900a83aa365f7cc4b6 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-CMS-RootMailID: 20171010074231epcas5p3c2f9109c62b9e84af7f6905bb34a6ef4 X-RootMTR: 20171010074231epcas5p3c2f9109c62b9e84af7f6905bb34a6ef4 References: <20170829112603.32732-1-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stanimir, On 2017-10-10 09:42, Stanimir Varbanov wrote: > Marek, > > Any comments? Oh, I thought that this one has been already merged. If not (yet), here is my ack. > 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 Acked-by: Marek Szyprowski >> --- >> 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); >> } >> Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland