From patchwork Fri May 3 17:52:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 13653170 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 35D7DC10F16 for ; Fri, 3 May 2024 17:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4X2FiPVmWEjmHGEeTNnIJtAPMFB1+fWvgSH9zieRL2g=; b=MKB0H9XbJGLckS rAGMHxW29a/vUzckINzX8TKA/+dNaNsb9ybkhA5ftU0iPehUItqqVPVNmVmKz/Y3sMtfHWagfW65p mZYIPtfLdBYukFwRYm+TIk8s0XPVN1S/spRexdIYl++Vh5Tw7sPcxuSJRxGhreQ1FDeK1Nw4veVUL 3R1kLseMYg8HJjp0ujBH9cEJ0eqsHqvFPf4vEeAfK+HIaKVsa2hqfeBR4RnH8nJcx/4ThOL5oltvV RuXgIdig+M2n98+IBkii+6ktD6p8xXwjLB4c9vHrGbs4t8j3N4VA1CoqRQG/ES8FfINgQrMHwgnLp ajYkgO7/NHpGVxUJki9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2x5P-0000000HRuk-1nn0; Fri, 03 May 2024 17:52:43 +0000 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2x5M-0000000HRsx-3QP5 for linux-arm-kernel@lists.infradead.org; Fri, 03 May 2024 17:52:42 +0000 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a59a0e4b773so34755766b.2 for ; Fri, 03 May 2024 10:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714758758; x=1715363558; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=hv8U88MGPjGVlknzKUx2MPXN0ijTnWvKrGGtFBeWuHY=; b=bsyUpHZNAdtn16yuK/cKjUc40RUd6SFeYNjyqsCzPoY12LKJJ+STSq0pw28Dak+Rw1 D+dXuBt8QjiC3AODAPskimW6Fhazwl249JOr0hzHVPNOzIXkNLEmxGa+mllfRlcM0Wpj +KNxHEoMqUO853/Y4q8Ijkh59+CE/LLtMFJpoFo2blBaru04JEjTOE83QdkmV9fBsHp9 JLdRsyEbhX2ZJ/XyYlTQoqv5TF6emvOLIpZeYflFsIWoi1je80DtfFMTpQ0cHv2kEz6Q n8by7Q/iGy8tAtKtWdffUot+4C35SGaTxwJy1qc2rBC1xLn32RKsL/q6UOXBBP8ewx9v qSrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714758758; x=1715363558; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hv8U88MGPjGVlknzKUx2MPXN0ijTnWvKrGGtFBeWuHY=; b=KNIb0UM6U+qyF8kLzWlJQtmZJj1hUop/79ipBFZt/rDoy96QTEtMXe6WqB7pHVwVSs jpi/1Uw64wxFM6eGnYPb6MWy6zeCATQv9NpARDLN2lCzOpzK44YpTUVkdzgOw9Gj9X2a yGEfA9y7J+RrglV1zLO7gaNeKqWsrSluXMZdqY1+g0PXX3IAYwYtaCUPCfZZNshC0CGj sf/X29d2wTzmEmGsKnBu+r17dvzFkVvdVjhgY5FQ1YY978teQ2ZzWwX10KZItUQSde+w 2SfZRM/QWJ1TERw+bnSQZGgHcF9jJxC3GVHmSvNHGFS8465Xluvm0T6EHefwfSDKCiO/ uWBA== X-Forwarded-Encrypted: i=1; AJvYcCUU8CupLQXLDWFRETkYhygA/t5M8XRwxTrm14+BnMsuloSSMsNmI0kb26zCcqWUE6rc/JDQm0ZdTR/0uauWcy8imUyW+tyKMxC40F+g9ISZepiUUQo= X-Gm-Message-State: AOJu0YzAmF6fDU9LUFQ3Bipoybfxczv5uabGHnkBluqZ8C4AySX+febp 4AbDykhLntEukm9ecUraV9FU6TaMAN3QMbPwcUZthtpVnMU0qUSd X-Google-Smtp-Source: AGHT+IFda4IBg1SIoYzq/bSKmyVZMSDW+3JXaIB3rFnqcRC9ICD1D1DRaJaPNDAiCVlEqa/qxNFdkg== X-Received: by 2002:a50:9fa8:0:b0:56e:2b31:b111 with SMTP id c37-20020a509fa8000000b0056e2b31b111mr2253828edf.7.1714758758304; Fri, 03 May 2024 10:52:38 -0700 (PDT) Received: from [127.0.1.1] (84-115-213-47.cable.dynamic.surfer.at. [84.115.213.47]) by smtp.gmail.com with ESMTPSA id q28-20020a50aa9c000000b00572469a7948sm1968368edc.45.2024.05.03.10.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 May 2024 10:52:37 -0700 (PDT) From: Javier Carrasco Date: Fri, 03 May 2024 19:52:32 +0200 Subject: [PATCH 1/2] cpufreq: sun50i: fix memory leak in dt_has_supported_hw() MIME-Version: 1.0 Message-Id: <20240503-sun50i-cpufreq-nvmem-cleanup-v1-1-0a2352cac46b@gmail.com> References: <20240503-sun50i-cpufreq-nvmem-cleanup-v1-0-0a2352cac46b@gmail.com> In-Reply-To: <20240503-sun50i-cpufreq-nvmem-cleanup-v1-0-0a2352cac46b@gmail.com> To: Yangtao Li , "Rafael J. Wysocki" , Viresh Kumar , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Andre Przywara , Jonathan Cameron Cc: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Javier Carrasco X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1714758755; l=1326; i=javier.carrasco.cruz@gmail.com; s=20240312; h=from:subject:message-id; bh=Mri5fTd2blYcQR3oWWDwHWSCOTzmuxEMWx67fmd/ZzI=; b=udeaJHPt5rHhF46vbOWjAj99SPixn91bwWQoY9RNNRD/rc/kOQ3iLjl9RVmcNade0FxgOeYLv Xx9Nip+KoJxDW65l/77GOlzgmH9ZN45UEINZI5sCgACTRCbPC02afj6 X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=lzSIvIzMz0JhJrzLXI0HAdPwsNPSSmEn6RbS+PTS9aQ= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240503_105240_896985_992F4449 X-CRM114-Status: GOOD ( 14.50 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The for_each_child_of_node() loop does not decrement the child node refcount before the break instruction, even though the node is no longer required. This can be avoided with the new for_each_child_of_node_scoped() macro that removes the need for any of_node_put(). Fixes: fa5aec9561cf ("cpufreq: sun50i: Add support for opp_supported_hw") Signed-off-by: Javier Carrasco Reviewed-by: Andre Przywara --- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c index 0b882765cd66..ef83e4bf2639 100644 --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c @@ -131,7 +131,7 @@ static const struct of_device_id cpu_opp_match_list[] = { static bool dt_has_supported_hw(void) { bool has_opp_supported_hw = false; - struct device_node *np, *opp; + struct device_node *np; struct device *cpu_dev; cpu_dev = get_cpu_device(0); @@ -142,7 +142,7 @@ static bool dt_has_supported_hw(void) if (!np) return false; - for_each_child_of_node(np, opp) { + for_each_child_of_node_scoped(np, opp) { if (of_find_property(opp, "opp-supported-hw", NULL)) { has_opp_supported_hw = true; break; From patchwork Fri May 3 17:52:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 13653168 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49697C4345F for ; Fri, 3 May 2024 17:52:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sTm7JsXCOBWUJHjkFnDkilyUiocf4hyA/MT8SwhqbAE=; b=PqbRM6gSltJtFX lqSmxzqKcicoA18i7BkPrCuKp/cKFFDyDT5E/HP7fCvAVbPQyjnC6iY7PlXGY3NRlH371yWdWCRnC 0ej0Lns/J0a1doM5lWQ9BckL+s5wHXKSV/z8f/p2ocanoso+1PNHPm1HXDxVVEydBxWMEHS4X+VKl D9QkjZM7WWFDY74WlucuCpRONQB1o7xhHkC1Mg0IgR81wybZAkPA5/fIL+1N7EjtnasTc/aTviEdO qBX7hOCylLgQX8D4BIdmr0frYQO670dI5JFRUkKm4/j8esgZiHVi/kb2oqB93GmLTp1ONz4bMgv3b xvJ4BuRETdQtvztVFPJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2x5Q-0000000HRv7-0TrC; Fri, 03 May 2024 17:52:44 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2x5N-0000000HRtM-0kgT for linux-arm-kernel@lists.infradead.org; Fri, 03 May 2024 17:52:42 +0000 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a597c192246so182776266b.0 for ; Fri, 03 May 2024 10:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714758760; x=1715363560; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nDa0e4iujX0ACKE4cFSjYtiiXZ+21EvsOzvNajBTvcI=; b=cR73UhE59Ub36L3k/IT145vwP0tRMiGTLy6aDy7rUP1eg9VXZ3VWA4Ms9V0w/g0LUt em1KOu6x+4CZBrCHDHm2oEaD5O/DaiURBuqJxqV19eFGLdh1vqzdHukjwr6KRL+14anZ 6zs9VpPxgVrB2Bw3yChORuXT234Ei5gTBER8ewFdJWEZoPS+z9v28HK1KMXWmoSxrGfk xVW7Wh598ULaUJeoPSSeX4W74b7Td2DpK3WhuD7sJ7el8+VgEnDGlmhKWBcQ0Daq2bud pwCC88ShTODbdcLZpWjgJNNfhG1d9eHOW4u3QU57T7/Q5Y0C3ILk8QaqyaoDkYDmMcjE UmuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714758760; x=1715363560; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nDa0e4iujX0ACKE4cFSjYtiiXZ+21EvsOzvNajBTvcI=; b=jcbC5qX+WMw9enVdhmayQPIh7No/i6ZmX4lbMHT2DXXkVzb2kd0Y7dlO8QIAYIvPx/ Aso+ZEZ3YuxAm5CgdOdLsDHzQ8vgajrnIKlxASpuXnFaMgyqtblPRzsssd6wSNFYvKYy Qwd+BW1bNrEIMb7oTqlmlDopgNW/ozRR7D0Kj+rmdQaiLnIy2XTEd+Y3VZLuziXdmWYL /yI7Y2wY4Ej58hRhsLlSbJTJJTw3fP9jQnPzUyBgTlezD754aGZbLvZ9BUEebc697KUX rv1hl+i223qnLNXEbwKoCgKGc3IfqUKD3nagODU1lyhw6Zg65xhGu6Kp73hAY9pJCq/m t3Ig== X-Forwarded-Encrypted: i=1; AJvYcCVXkMbDuazUp0As9MY4Z6DCR7/OvCjMhW8Q9yLWXWLBlZQw6+oGavP6uHJSB9Cs8VKXIa99naF7MT6NMHS1cb6bOvwhrAReYIaBxrqY60EOnax5MOo= X-Gm-Message-State: AOJu0Yw/YC3O3NCY8Izm+S5L1NWEwHGdHdB/32msmN6HC5qg/k9ycPN5 Ispk0Xkgl5pM+xiPJbwEIPmjwRyM+N4SMLOhzVn/nC9R4TuqhDJn X-Google-Smtp-Source: AGHT+IFONK2j7f1Ty9XVR60wDESk+CJEsa1zFEF6TM1ALYU3+/t6lQ5A3HkIW/azPODD5tAnbepFfw== X-Received: by 2002:a50:9549:0:b0:572:3483:8a27 with SMTP id v9-20020a509549000000b0057234838a27mr2688603eda.33.1714758759958; Fri, 03 May 2024 10:52:39 -0700 (PDT) Received: from [127.0.1.1] (84-115-213-47.cable.dynamic.surfer.at. [84.115.213.47]) by smtp.gmail.com with ESMTPSA id q28-20020a50aa9c000000b00572469a7948sm1968368edc.45.2024.05.03.10.52.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 May 2024 10:52:39 -0700 (PDT) From: Javier Carrasco Date: Fri, 03 May 2024 19:52:33 +0200 Subject: [PATCH 2/2] cpufreq: sun50i: replace of_node_put() with automatic cleanup handler MIME-Version: 1.0 Message-Id: <20240503-sun50i-cpufreq-nvmem-cleanup-v1-2-0a2352cac46b@gmail.com> References: <20240503-sun50i-cpufreq-nvmem-cleanup-v1-0-0a2352cac46b@gmail.com> In-Reply-To: <20240503-sun50i-cpufreq-nvmem-cleanup-v1-0-0a2352cac46b@gmail.com> To: Yangtao Li , "Rafael J. Wysocki" , Viresh Kumar , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Andre Przywara , Jonathan Cameron Cc: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Javier Carrasco X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1714758755; l=2545; i=javier.carrasco.cruz@gmail.com; s=20240312; h=from:subject:message-id; bh=lzVnrSjci3YdZbJDcigjVDnutqYD0vEbfrujcq5AHHs=; b=EOd+5S8zrky1F+pf72NRCJOPHcqlppmlIu7H4SxMTuZa8DO0mns86VbChhQoq1UQhqm1esOuH iDf9qDV2t7qDx8DC46feRuLOrY1zGZIHAzv0ufxTYPAlC0XNm2P0FzB X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=lzSIvIzMz0JhJrzLXI0HAdPwsNPSSmEn6RbS+PTS9aQ= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240503_105241_280120_84ED3113 X-CRM114-Status: GOOD ( 13.54 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Make use of the __free() cleanup handler to automatically free nodes when they get out of scope. Signed-off-by: Javier Carrasco Reviewed-by: Andre Przywara --- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c index ef83e4bf2639..eb47c193269c 100644 --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c @@ -131,14 +131,14 @@ static const struct of_device_id cpu_opp_match_list[] = { static bool dt_has_supported_hw(void) { bool has_opp_supported_hw = false; - struct device_node *np; struct device *cpu_dev; cpu_dev = get_cpu_device(0); if (!cpu_dev) return false; - np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); + struct device_node *np __free(device_node) = + dev_pm_opp_of_get_opp_desc_node(cpu_dev); if (!np) return false; @@ -149,8 +149,6 @@ static bool dt_has_supported_hw(void) } } - of_node_put(np); - return has_opp_supported_hw; } @@ -165,7 +163,6 @@ static int sun50i_cpufreq_get_efuse(void) const struct sunxi_cpufreq_data *opp_data; struct nvmem_cell *speedbin_nvmem; const struct of_device_id *match; - struct device_node *np; struct device *cpu_dev; u32 *speedbin; int ret; @@ -174,19 +171,18 @@ static int sun50i_cpufreq_get_efuse(void) if (!cpu_dev) return -ENODEV; - np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); + struct device_node *np __free(device_node) = + dev_pm_opp_of_get_opp_desc_node(cpu_dev); if (!np) return -ENOENT; match = of_match_node(cpu_opp_match_list, np); - if (!match) { - of_node_put(np); + if (!match) return -ENOENT; - } + opp_data = match->data; speedbin_nvmem = of_nvmem_cell_get(np, NULL); - of_node_put(np); if (IS_ERR(speedbin_nvmem)) return dev_err_probe(cpu_dev, PTR_ERR(speedbin_nvmem), "Could not get nvmem cell\n"); @@ -301,14 +297,9 @@ MODULE_DEVICE_TABLE(of, sun50i_cpufreq_match_list); static const struct of_device_id *sun50i_cpufreq_match_node(void) { - const struct of_device_id *match; - struct device_node *np; - - np = of_find_node_by_path("/"); - match = of_match_node(sun50i_cpufreq_match_list, np); - of_node_put(np); + struct device_node *np __free(device_node) = of_find_node_by_path("/"); - return match; + return of_match_node(sun50i_cpufreq_match_list, np); } /*