From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3299372 for ; Wed, 5 May 2021 13:56:44 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id a4so1964098wrr.2 for ; Wed, 05 May 2021 06:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:content-transfer-encoding:date:message-id:to:cc :subject:from:references:in-reply-to; bh=w5NxWLLzhgPNs7hgKxObXSucJQTrVLPMT6JRaxXmMGg=; b=rHQPvxjAuK2Pff3yz8wDRSkCbFh7jdBrno1hGfOSliik/K37WXholSfq5fnbl5g4tD D9vY7q3tQDIx7X7eAU4HPA9exN2PxY47yjtGnDFc9DcUbUjdKD/t1jVq9lghDvpLXU+R pCYRfvxuY+DKcNtzYOhoMg8+knE65iw6S2qZ7W9zNn0KBSIhCg/9aJpu4iI6Rh4VXDEm foteZEQ9xZRj2agkDMGY4k/OtG/fii1KtIPHqcJhYbE1uCP7M2IJr1FY1eE6FKN3bOn4 JP7mDe8VW2XdfAOOiKruStlKFvdgDN38R/D4KsTpR33qet0a19AEiNmLGQGlj1+SlbUP zS7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:content-transfer-encoding:date :message-id:to:cc:subject:from:references:in-reply-to; bh=w5NxWLLzhgPNs7hgKxObXSucJQTrVLPMT6JRaxXmMGg=; b=hEAwvU4RwuY/ijJhHuln+HEWcT9rmSZS0NvDIYC6DcSxja7gxbzoocgood2YEPOzkM FF2sjM7702nUQzQ1geA3s2F4AP2JaKycP+EUEFtJjHfJcZqWeORsnUer/9jCKK2sVTk3 cZCxoJkMuCQ+R+FwfAZmKtUvD0EaKzlHiC7akGtGXZ5DFCIQ9AZvjX4y0UJWTqFBjsxd YV3HHVGiCY6ppZuo8slUw1IQPjqkffe+U7z7sI88Gq48YwqHtX7/TaSiwUAu9xoO/Sw5 olodfUqp4qW7E32CTDHEP9qdV4pMIZ1z8RxR3rDrSNW4YoVm2il5RyD/G/4OBN7LKu/o LH8w== X-Gm-Message-State: AOAM533H3acy1DneLqK60JZc9SmssfuiOFDBQ/zy/E5vSCsc2tcwByFL IMQscajG7hT8hAqIdXO1TjQ= X-Google-Smtp-Source: ABdhPJyV2UBegtSOrw2Zpi3F53Lq+71q6vd8Wp3vO3VMu7mlOM4kKYHZucbGpdf2r8Tyhuih4H/9fg== X-Received: by 2002:adf:fc11:: with SMTP id i17mr34684916wrr.368.1620223002719; Wed, 05 May 2021 06:56:42 -0700 (PDT) Received: from localhost (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id s5sm6062841wmh.37.2021.05.05.06.56.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 06:56:41 -0700 (PDT) X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 05 May 2021 14:56:40 +0100 Message-Id: To: "Jonathan Cameron" , "Mauro Carvalho Chehab" Cc: , , "Fabio Estevam" , "Greg Kroah-Hartman" , "Mauro Carvalho Chehab" , "NXP Linux Team" , "Pengutronix Kernel Team" , "Philipp Zabel" , "Sascha Hauer" , "Shawn Guo" , "Steve Longerbeam" , , , , Subject: Re: [PATCH 02/25] staging: media: imx7-mipi-csis: fix pm_runtime_get_sync() usage count From: "Rui Miguel Silva" References: <793a5806a63b6313606fd1c344b9eec41e61a440.1620207353.git.mchehab+huawei@kernel.org> <20210505120652.00001236@Huawei.com> In-Reply-To: <20210505120652.00001236@Huawei.com> Hi, On Wed May 5, 2021 at 12:06 PM WEST, Jonathan Cameron wrote: > On Wed, 5 May 2021 11:41:52 +0200 > Mauro Carvalho Chehab wrote: > > > The pm_runtime_get_sync() internally increments the > > dev->power.usage_count without decrementing it, even on errors. > > Replace it by the new pm_runtime_resume_and_get(), introduced by: > > commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to dea= l with usage counter") > > in order to properly decrement the usage counter, avoiding > > a potential PM usage counter leak. > >=20 > > Acked-by: Rui Miguel Silva > > Signed-off-by: Mauro Carvalho Chehab > > Not a fix as far as I can see, just a cleanup - so perhaps not this set? yes, the original changelog of this patch, that I acked, made it clear it was a cleanup: " Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") = = =20 added pm_runtime_resume_and_get() in order to automatically handle=20 dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. " This one above is new, but I saw Mauro is going change it. ------ Cheers, Rui > > Jonathan > > > > --- > > drivers/staging/media/imx/imx7-mipi-csis.c | 7 +++---- > > 1 file changed, 3 insertions(+), 4 deletions(-) > >=20 > > diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/stagi= ng/media/imx/imx7-mipi-csis.c > > index 025fdc488bd6..1dc680d94a46 100644 > > --- a/drivers/staging/media/imx/imx7-mipi-csis.c > > +++ b/drivers/staging/media/imx/imx7-mipi-csis.c > > @@ -695,11 +695,10 @@ static int mipi_csis_s_stream(struct v4l2_subdev = *mipi_sd, int enable) > > =20 > > mipi_csis_clear_counters(state); > > =20 > > - ret =3D pm_runtime_get_sync(&state->pdev->dev); > > - if (ret < 0) { > > - pm_runtime_put_noidle(&state->pdev->dev); > > + ret =3D pm_runtime_resume_and_get(&state->pdev->dev); > > + if (ret < 0) > > return ret; > > - } > > + > > ret =3D v4l2_subdev_call(state->src_sd, core, s_power, 1); > > if (ret < 0 && ret !=3D -ENOIOCTLCMD) > > goto done; 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=-9.8 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 7088FC433B4 for ; Wed, 5 May 2021 13:59:15 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 BFFE261182 for ; Wed, 5 May 2021 13:59:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BFFE261182 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:References:From:Subject:Cc:To:Message-Id :Date:Mime-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NcX6ThzIcE93f42AaOS1+MyhHk6kYCDmpaC430/u1eY=; b=JEAU443kwghsY3S80D11s+Kmw 5wpv+uu/ahfjBO0Gs1aqRknOVoMiLQve5FQZRCde3CBUCloXI+XiXHyNTSDpDRts9CbhlJ8q6fD5V VAeUnwJiNIpey8vVQDI1OuxlVEc7TmgT0car/Z6/Rk+pMnbBr8o0jlM4wFXfbbeM5OPSZ5wMOYD1L k4Z06ozHe2xMREf80gPRFGm1P2mdmUo/8GCfNQf8Swfc6nnrhpV8VwKFTp30Ft7AOtTmEB05nJPdV DOiqgA1HEwL/VZxIuGMgtc06WYITF+OlGf+9ArgZwVb0b2XjoJPgZvOrBdpyBHJLWrBgcW65JVeKv /SU9UZGaA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leI1C-001MQB-Rv; Wed, 05 May 2021 13:56:51 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leI19-001MPr-Dl for linux-arm-kernel@desiato.infradead.org; Wed, 05 May 2021 13:56:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:References:From:Subject: Cc:To:Message-Id:Date:Content-Type:Content-Transfer-Encoding:Mime-Version: Sender:Reply-To:Content-ID:Content-Description; bh=w5NxWLLzhgPNs7hgKxObXSucJQTrVLPMT6JRaxXmMGg=; b=Fm3+FY/Y+kjr8uAuCoisL4kwir UtQg6wS+/VRBKA/xoRet/2uRe2eInnMqqTC150X2zEh9aK6UYabIPbz6NujtwZ4fQuzQBV0q7IE57 AVMnkytYNhi2pDGTDFiIZZ/Hjr91l8IriCpT8Qn5VZkcKukvGtopImSdhwUA72ySrPBfpSUHA34rR fQ817BXnr0gnP02AFZpR5R1S0ZxwYI+ygWMuJPunb9+IMu+34YFB1OlD0K+DSj53nhIu40ZSjqYYn svW5SHCA7zN5rsRlQTDXLxVb+S1AbcNhM5NaMfALDUMywwb0QbhmzCgkBKzbtqFE6BHOdescvhJgG 5+N3fZ4Q==; Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leI16-004nOt-Re for linux-arm-kernel@lists.infradead.org; Wed, 05 May 2021 13:56:46 +0000 Received: by mail-wr1-x434.google.com with SMTP id z6so1959587wrm.4 for ; Wed, 05 May 2021 06:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:content-transfer-encoding:date:message-id:to:cc :subject:from:references:in-reply-to; bh=w5NxWLLzhgPNs7hgKxObXSucJQTrVLPMT6JRaxXmMGg=; b=rHQPvxjAuK2Pff3yz8wDRSkCbFh7jdBrno1hGfOSliik/K37WXholSfq5fnbl5g4tD D9vY7q3tQDIx7X7eAU4HPA9exN2PxY47yjtGnDFc9DcUbUjdKD/t1jVq9lghDvpLXU+R pCYRfvxuY+DKcNtzYOhoMg8+knE65iw6S2qZ7W9zNn0KBSIhCg/9aJpu4iI6Rh4VXDEm foteZEQ9xZRj2agkDMGY4k/OtG/fii1KtIPHqcJhYbE1uCP7M2IJr1FY1eE6FKN3bOn4 JP7mDe8VW2XdfAOOiKruStlKFvdgDN38R/D4KsTpR33qet0a19AEiNmLGQGlj1+SlbUP zS7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:content-transfer-encoding:date :message-id:to:cc:subject:from:references:in-reply-to; bh=w5NxWLLzhgPNs7hgKxObXSucJQTrVLPMT6JRaxXmMGg=; b=lF17R/7yfNQX/Z17LTpJgKI2Z2ZA3kSnx4egcza5xcC06Kj8S9Ug2hPTscOCwvDKS9 hl0OUfQdZRUMJAddcrtUvqptz7//rLGmDHS85AXBANQLaI1UXT2mcknEPdSb3fAzeXfM SYZZPx/cGXciPT0oKf54ZCGW9p54b8F2d+0nnvCMMFhJMwygQpokkiSA8VmaJ6HsU8gn IVQEqhV6TLRM6ERuL2UKvprQ3JA0YdRv8PvfqYdqFhSNsfiEijRtNNrIs8MfONeN+9d3 F8vVEtzPpxOtej9oDdCDAu9EhDuoq86LMCg/+1/dHNRrnwEbHdjn+VI9LcvjWweNoedE YdjA== X-Gm-Message-State: AOAM530PDtJJTUBzjbZ5/qpxegzKIG0eircVzI8+3TRQU8t6IVcGs85q MZvaW8TDmfFnyFhh14WrDCs= X-Google-Smtp-Source: ABdhPJyV2UBegtSOrw2Zpi3F53Lq+71q6vd8Wp3vO3VMu7mlOM4kKYHZucbGpdf2r8Tyhuih4H/9fg== X-Received: by 2002:adf:fc11:: with SMTP id i17mr34684916wrr.368.1620223002719; Wed, 05 May 2021 06:56:42 -0700 (PDT) Received: from localhost (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id s5sm6062841wmh.37.2021.05.05.06.56.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 06:56:41 -0700 (PDT) Mime-Version: 1.0 Date: Wed, 05 May 2021 14:56:40 +0100 Message-Id: To: "Jonathan Cameron" , "Mauro Carvalho Chehab" Cc: , , "Fabio Estevam" , "Greg Kroah-Hartman" , "Mauro Carvalho Chehab" , "NXP Linux Team" , "Pengutronix Kernel Team" , "Philipp Zabel" , "Sascha Hauer" , "Shawn Guo" , "Steve Longerbeam" , , , , Subject: Re: [PATCH 02/25] staging: media: imx7-mipi-csis: fix pm_runtime_get_sync() usage count From: "Rui Miguel Silva" References: <793a5806a63b6313606fd1c344b9eec41e61a440.1620207353.git.mchehab+huawei@kernel.org> <20210505120652.00001236@Huawei.com> In-Reply-To: <20210505120652.00001236@Huawei.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210505_065644_918070_48CFFC1E X-CRM114-Status: GOOD ( 22.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On Wed May 5, 2021 at 12:06 PM WEST, Jonathan Cameron wrote: > On Wed, 5 May 2021 11:41:52 +0200 > Mauro Carvalho Chehab wrote: > > > The pm_runtime_get_sync() internally increments the > > dev->power.usage_count without decrementing it, even on errors. > > Replace it by the new pm_runtime_resume_and_get(), introduced by: > > commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") > > in order to properly decrement the usage counter, avoiding > > a potential PM usage counter leak. > > > > Acked-by: Rui Miguel Silva > > Signed-off-by: Mauro Carvalho Chehab > > Not a fix as far as I can see, just a cleanup - so perhaps not this set? yes, the original changelog of this patch, that I acked, made it clear it was a cleanup: " Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. " This one above is new, but I saw Mauro is going change it. ------ Cheers, Rui > > Jonathan > > > > --- > > drivers/staging/media/imx/imx7-mipi-csis.c | 7 +++---- > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c > > index 025fdc488bd6..1dc680d94a46 100644 > > --- a/drivers/staging/media/imx/imx7-mipi-csis.c > > +++ b/drivers/staging/media/imx/imx7-mipi-csis.c > > @@ -695,11 +695,10 @@ static int mipi_csis_s_stream(struct v4l2_subdev *mipi_sd, int enable) > > > > mipi_csis_clear_counters(state); > > > > - ret = pm_runtime_get_sync(&state->pdev->dev); > > - if (ret < 0) { > > - pm_runtime_put_noidle(&state->pdev->dev); > > + ret = pm_runtime_resume_and_get(&state->pdev->dev); > > + if (ret < 0) > > return ret; > > - } > > + > > ret = v4l2_subdev_call(state->src_sd, core, s_power, 1); > > if (ret < 0 && ret != -ENOIOCTLCMD) > > goto done; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel