From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Lezcano Date: Thu, 07 Jan 2021 17:01:03 +0000 Subject: Re: [PATCH 2/3] powercap/drivers/dtpm: Fix some missing unlock bugs Message-Id: <8fe7e742-56dd-f4b9-e857-7e27b8b734cc@linaro.org> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable To: Dan Carpenter , "Rafael J. Wysocki" Cc: Lukasz Luba , linux-pm@vger.kernel.org, kernel-janitors@vger.kernel.org On 06/01/2021 09:41, Dan Carpenter wrote: > We need to unlock on these paths before returning. >=20 > Fixes: a20d0ef97abf ("powercap/drivers/dtpm: Add API for dynamic thermal = power management") > Signed-off-by: Dan Carpenter Acked-by: Daniel Lezcano > --- > drivers/powercap/dtpm.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c > index d49df0569cd4..470a1182b868 100644 > --- a/drivers/powercap/dtpm.c > +++ b/drivers/powercap/dtpm.c > @@ -147,13 +147,17 @@ static void __dtpm_add_power(struct dtpm *dtpm) > */ > int dtpm_update_power(struct dtpm *dtpm, u64 power_min, u64 power_max) > { > + int ret =3D 0; > + > mutex_lock(&dtpm_lock); > =20 > if (power_min =3D dtpm->power_min && power_max =3D dtpm->power_max) > - return 0; > + goto unlock; > =20 > - if (power_max < power_min) > - return -EINVAL; > + if (power_max < power_min) { > + ret =3D -EINVAL; > + goto unlock; > + } > =20 > __dtpm_sub_power(dtpm); > =20 > @@ -164,9 +168,10 @@ int dtpm_update_power(struct dtpm *dtpm, u64 power_m= in, u64 power_max) > =20 > __dtpm_add_power(dtpm); > =20 > +unlock: > mutex_unlock(&dtpm_lock); > =20 > - return 0; > + return ret; > } > =20 > /** > @@ -187,8 +192,10 @@ int dtpm_release_zone(struct powercap_zone *pcz) > =20 > mutex_lock(&dtpm_lock); > =20 > - if (!list_empty(&dtpm->children)) > + if (!list_empty(&dtpm->children)) { > + mutex_unlock(&dtpm_lock); > return -EBUSY; > + } > =20 > if (parent) > list_del(&dtpm->sibling); >=20 --=20 Linaro.org =E2=94=82 Open source software for ARM = SoCs Follow Linaro: Facebook | Twitter | Blog 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=-17.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, 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 36430C433DB for ; Thu, 7 Jan 2021 17:01:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF7A62342C for ; Thu, 7 Jan 2021 17:01:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727874AbhAGRBr (ORCPT ); Thu, 7 Jan 2021 12:01:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726650AbhAGRBq (ORCPT ); Thu, 7 Jan 2021 12:01:46 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3082BC0612F4 for ; Thu, 7 Jan 2021 09:01:06 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id r3so6359731wrt.2 for ; Thu, 07 Jan 2021 09:01:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Vttw+Zkl+9Ah7Xh5FObZhnPUhdIHiql1qR6Q3zLfcl8=; b=wjNejtZWix8AIq/WCJKlNl0O71DrWwUsS4GXR73oPvL1cGstP4euxFcPgOOzvfeEhw aLypN2b+UGPJAkpIrLbQzhNRBMeYBPGNIYHXZNbK2pGePIpRzZZlouuwvl/DBK/MQQZk jqZf90ubxY+9MBvyrB4rkguSWPBRt2E/gi8yGYOt99iDL6FvtJd7fqZL+EPShdiVoBYQ p9UDsGzu371tfablQV1D4XdRnSvWe0KuhIzUhNy2i4jN7jRDFKK7qG+dZW+Grt1jBPmD eT/gDwwVdwJcxvE5VM6tc3jaDJ5Dhw8eda7gaNmrT3387kIcv+F0vSdReo8y7bK1Ql77 r+5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Vttw+Zkl+9Ah7Xh5FObZhnPUhdIHiql1qR6Q3zLfcl8=; b=r8E5xhRCpon3JlednU6BYdRpOmffxeTp6VCfgRlzzYfoXuxXTqPT+jHky4YQGBu6hf LD+ABdHRERLI5SxVk2gaKLaNI89cv+M20efXoeYnIcmwU5F87DIsOMkdqUtECMOscUiU wgjwiAaKxpavh1Or+vpF42p9lqHg4T/0rV4wrSAc4Kg+WxDVaKKJ+UmYBKbbqyEbICTp FqduN3lSl6E9p3Z37paCU046R0cjQr3CKE90nwhKtuSXzihTOgUr/BHnuxq1iUE6/ZZB NDBCQjUnxcHN3QScvOdf0J8J9aKTMyPWkcTp6eLYIgZxiSqiOkC6NQhH7O173jfoqkMt HrAw== X-Gm-Message-State: AOAM530yoiQiSRQ9yNDOFfAT59K0rwgL0DRd5HTOUjxCiMrhtF/RHf+Z RbTYx6DFx9jgc4KcUwulEk/jTA== X-Google-Smtp-Source: ABdhPJwqXrnz9hTfu/rPz6op+5RLzAXutbdfAGEVgyFO9eXWyv0MwrXKSeaXyIh/gSQjkFdcC3lNcw== X-Received: by 2002:adf:c40e:: with SMTP id v14mr9810801wrf.163.1610038864835; Thu, 07 Jan 2021 09:01:04 -0800 (PST) Received: from [192.168.0.41] (lns-bzn-59-82-252-152-224.adsl.proxad.net. [82.252.152.224]) by smtp.googlemail.com with ESMTPSA id v20sm9740333wra.19.2021.01.07.09.01.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 Jan 2021 09:01:04 -0800 (PST) Subject: Re: [PATCH 2/3] powercap/drivers/dtpm: Fix some missing unlock bugs To: Dan Carpenter , "Rafael J. Wysocki" Cc: Lukasz Luba , linux-pm@vger.kernel.org, kernel-janitors@vger.kernel.org References: From: Daniel Lezcano Message-ID: <8fe7e742-56dd-f4b9-e857-7e27b8b734cc@linaro.org> Date: Thu, 7 Jan 2021 18:01:03 +0100 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: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On 06/01/2021 09:41, Dan Carpenter wrote: > We need to unlock on these paths before returning. > > Fixes: a20d0ef97abf ("powercap/drivers/dtpm: Add API for dynamic thermal power management") > Signed-off-by: Dan Carpenter Acked-by: Daniel Lezcano > --- > drivers/powercap/dtpm.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c > index d49df0569cd4..470a1182b868 100644 > --- a/drivers/powercap/dtpm.c > +++ b/drivers/powercap/dtpm.c > @@ -147,13 +147,17 @@ static void __dtpm_add_power(struct dtpm *dtpm) > */ > int dtpm_update_power(struct dtpm *dtpm, u64 power_min, u64 power_max) > { > + int ret = 0; > + > mutex_lock(&dtpm_lock); > > if (power_min == dtpm->power_min && power_max == dtpm->power_max) > - return 0; > + goto unlock; > > - if (power_max < power_min) > - return -EINVAL; > + if (power_max < power_min) { > + ret = -EINVAL; > + goto unlock; > + } > > __dtpm_sub_power(dtpm); > > @@ -164,9 +168,10 @@ int dtpm_update_power(struct dtpm *dtpm, u64 power_min, u64 power_max) > > __dtpm_add_power(dtpm); > > +unlock: > mutex_unlock(&dtpm_lock); > > - return 0; > + return ret; > } > > /** > @@ -187,8 +192,10 @@ int dtpm_release_zone(struct powercap_zone *pcz) > > mutex_lock(&dtpm_lock); > > - if (!list_empty(&dtpm->children)) > + if (!list_empty(&dtpm->children)) { > + mutex_unlock(&dtpm_lock); > return -EBUSY; > + } > > if (parent) > list_del(&dtpm->sibling); > -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog