From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 988DDC433DF for ; Mon, 17 Aug 2020 21:47:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F7E920758 for ; Mon, 17 Aug 2020 21:47:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728724AbgHQVrY (ORCPT ); Mon, 17 Aug 2020 17:47:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728689AbgHQVrU (ORCPT ); Mon, 17 Aug 2020 17:47:20 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78D18C061389 for ; Mon, 17 Aug 2020 14:47:20 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 746E9298610 Subject: Re: [PATCH v2 05/14] media: staging: rkisp1: params: upon stream stop, iterate a local list to return the buffers To: Dafna Hirschfeld , linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org, tfiga@chromium.org References: <20200815103734.31153-1-dafna.hirschfeld@collabora.com> <20200815103734.31153-6-dafna.hirschfeld@collabora.com> From: Helen Koike Message-ID: <695451da-c7af-a12c-f308-c45675b8f3aa@collabora.com> Date: Mon, 17 Aug 2020 18:47:11 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200815103734.31153-6-dafna.hirschfeld@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Dafna, On 8/15/20 7:37 AM, Dafna Hirschfeld wrote: > The code in '.stop_streaming' callback releases and acquire the lock > at each iteration when returning the buffers. > Holding the lock disables interrupts so it should be minimized. > To make the code cleaner and still minimize holding the lock, > the buffer list is first moved to a local list and > then can be iterated without the lock. > > Signed-off-by: Dafna Hirschfeld lgtm Helen Koike Thanks Helen > --- > drivers/staging/media/rkisp1/rkisp1-params.c | 31 +++++++------------- > 1 file changed, 11 insertions(+), 20 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c > index 0c2bb2eefb22..6a76c586e916 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-params.c > +++ b/drivers/staging/media/rkisp1/rkisp1-params.c > @@ -1477,32 +1477,23 @@ static void rkisp1_params_vb2_stop_streaming(struct vb2_queue *vq) > { > struct rkisp1_params *params = vq->drv_priv; > struct rkisp1_buffer *buf; > + struct list_head tmp_list; > unsigned long flags; > - unsigned int i; > > - /* stop params input firstly */ > + INIT_LIST_HEAD(&tmp_list); > + > + /* > + * we first move the buffers into a local list 'tmp_list' > + * and then we can iterate it and call vb2_buffer_done > + * without holding the lock > + */ > spin_lock_irqsave(¶ms->config_lock, flags); > params->is_streaming = false; > + list_cut_position(&tmp_list, ¶ms->params, params->params.prev); > spin_unlock_irqrestore(¶ms->config_lock, flags); > > - for (i = 0; i < RKISP1_ISP_PARAMS_REQ_BUFS_MAX; i++) { > - spin_lock_irqsave(¶ms->config_lock, flags); > - if (!list_empty(¶ms->params)) { > - buf = list_first_entry(¶ms->params, > - struct rkisp1_buffer, queue); > - list_del(&buf->queue); > - spin_unlock_irqrestore(¶ms->config_lock, > - flags); > - } else { > - spin_unlock_irqrestore(¶ms->config_lock, > - flags); > - break; > - } > - > - if (buf) > - vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR); > - buf = NULL; > - } > + list_for_each_entry(buf, &tmp_list, queue) > + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR); > } > > static int > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95AA3C433DF for ; Mon, 17 Aug 2020 21:47:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FC0F2072E for ; Mon, 17 Aug 2020 21:47:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="R4C+TFWf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FC0F2072E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=83cTg0eQSTRZSZ6fKn1aHqFReGEp5G8y8uuvJzlfLMs=; b=R4C+TFWfx40XCVGKR6ocEutDk Gv3Pvyb9vxZ8XpK+UEcni/BtuCHlUHF8ixSsc+N3dGKrHOP4Em8AEROJn+P+dQJmuDY9wWwsWIqgn Bwmdt+zA6MKMFg6QyHzxiXMI8HCGTDJtt+W0JWpIW0Ql7nTKjDIHTnVqsuALuSLe5kaJwbtJMPnfC A4GuLel3U3M5UfsSjRbBAuGkbtf5j4ehBncMq3qSQ9kWP9v01vddkDuaTaLktBoEi1mXkW9Zn4M5a tA3qpCFD2KG2zwKlz1XvFdyeEKmTHzTDVb9PgsL3DNnoJAlIDsCRYZm9obPce7CRHcGh33sX0zRl3 02KRIgpgg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7myQ-0001YU-Km; Mon, 17 Aug 2020 21:47:22 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7myO-0001Ww-Cl for linux-rockchip@lists.infradead.org; Mon, 17 Aug 2020 21:47:21 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 746E9298610 Subject: Re: [PATCH v2 05/14] media: staging: rkisp1: params: upon stream stop, iterate a local list to return the buffers To: Dafna Hirschfeld , linux-media@vger.kernel.org References: <20200815103734.31153-1-dafna.hirschfeld@collabora.com> <20200815103734.31153-6-dafna.hirschfeld@collabora.com> From: Helen Koike Message-ID: <695451da-c7af-a12c-f308-c45675b8f3aa@collabora.com> Date: Mon, 17 Aug 2020 18:47:11 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200815103734.31153-6-dafna.hirschfeld@collabora.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200817_174720_530807_2C05F87D X-CRM114-Status: GOOD ( 23.19 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, dafna3@gmail.com, tfiga@chromium.org, hverkuil@xs4all.nl, linux-rockchip@lists.infradead.org, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, kernel@collabora.com, ezequiel@collabora.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Hi Dafna, On 8/15/20 7:37 AM, Dafna Hirschfeld wrote: > The code in '.stop_streaming' callback releases and acquire the lock > at each iteration when returning the buffers. > Holding the lock disables interrupts so it should be minimized. > To make the code cleaner and still minimize holding the lock, > the buffer list is first moved to a local list and > then can be iterated without the lock. > > Signed-off-by: Dafna Hirschfeld lgtm Helen Koike Thanks Helen > --- > drivers/staging/media/rkisp1/rkisp1-params.c | 31 +++++++------------- > 1 file changed, 11 insertions(+), 20 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c > index 0c2bb2eefb22..6a76c586e916 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-params.c > +++ b/drivers/staging/media/rkisp1/rkisp1-params.c > @@ -1477,32 +1477,23 @@ static void rkisp1_params_vb2_stop_streaming(struct vb2_queue *vq) > { > struct rkisp1_params *params = vq->drv_priv; > struct rkisp1_buffer *buf; > + struct list_head tmp_list; > unsigned long flags; > - unsigned int i; > > - /* stop params input firstly */ > + INIT_LIST_HEAD(&tmp_list); > + > + /* > + * we first move the buffers into a local list 'tmp_list' > + * and then we can iterate it and call vb2_buffer_done > + * without holding the lock > + */ > spin_lock_irqsave(¶ms->config_lock, flags); > params->is_streaming = false; > + list_cut_position(&tmp_list, ¶ms->params, params->params.prev); > spin_unlock_irqrestore(¶ms->config_lock, flags); > > - for (i = 0; i < RKISP1_ISP_PARAMS_REQ_BUFS_MAX; i++) { > - spin_lock_irqsave(¶ms->config_lock, flags); > - if (!list_empty(¶ms->params)) { > - buf = list_first_entry(¶ms->params, > - struct rkisp1_buffer, queue); > - list_del(&buf->queue); > - spin_unlock_irqrestore(¶ms->config_lock, > - flags); > - } else { > - spin_unlock_irqrestore(¶ms->config_lock, > - flags); > - break; > - } > - > - if (buf) > - vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR); > - buf = NULL; > - } > + list_for_each_entry(buf, &tmp_list, queue) > + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR); > } > > static int > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip