From: Johan Hovold <johan+linaro@kernel.org> To: Georgi Djakov <djakov@kernel.org> Cc: "Shawn Guo" <shawnguo@kernel.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Fabio Estevam" <festevam@gmail.com>, "NXP Linux Team" <linux-imx@nxp.com>, "Andy Gross" <agross@kernel.org>, "Bjorn Andersson" <andersson@kernel.org>, "Konrad Dybcio" <konrad.dybcio@linaro.org>, "Sylwester Nawrocki" <s.nawrocki@samsung.com>, "Artur Świgoń" <a.swigon@samsung.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>, "Alim Akhtar" <alim.akhtar@samsung.com>, "Thierry Reding" <thierry.reding@gmail.com>, "Jonathan Hunter" <jonathanh@nvidia.com>, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, "Johan Hovold" <johan+linaro@kernel.org>, stable@vger.kernel.org, "Jun Nie" <jun.nie@linaro.org> Subject: [PATCH v2 08/23] interconnect: qcom: rpm: fix registration race Date: Mon, 6 Mar 2023 08:56:36 +0100 [thread overview] Message-ID: <20230306075651.2449-9-johan+linaro@kernel.org> (raw) In-Reply-To: <20230306075651.2449-1-johan+linaro@kernel.org> The current interconnect provider registration interface is inherently racy as nodes are not added until the after adding the provider. This can specifically cause racing DT lookups to fail. Switch to using the new API where the provider is not registered until after it has been fully initialised. Fixes: 62feb14ee8a3 ("interconnect: qcom: Consolidate interconnect RPM support") Fixes: 30c8fa3ec61a ("interconnect: qcom: Add MSM8916 interconnect provider driver") Cc: stable@vger.kernel.org # 5.7 Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Reviewed-by: Jun Nie <jun.nie@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/interconnect/qcom/icc-rpm.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index da595059cafd..4d0997b210f7 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -502,7 +502,6 @@ int qnoc_probe(struct platform_device *pdev) } provider = &qp->provider; - INIT_LIST_HEAD(&provider->nodes); provider->dev = dev; provider->set = qcom_icc_set; provider->pre_aggregate = qcom_icc_pre_bw_aggregate; @@ -510,11 +509,7 @@ int qnoc_probe(struct platform_device *pdev) provider->xlate_extended = qcom_icc_xlate_extended; provider->data = data; - ret = icc_provider_add(provider); - if (ret) { - dev_err(dev, "error adding interconnect provider: %d\n", ret); - goto err_disable_clks; - } + icc_provider_init(provider); for (i = 0; i < num_nodes; i++) { size_t j; @@ -522,7 +517,7 @@ int qnoc_probe(struct platform_device *pdev) node = icc_node_create(qnodes[i]->id); if (IS_ERR(node)) { ret = PTR_ERR(node); - goto err; + goto err_remove_nodes; } node->name = qnodes[i]->name; @@ -536,19 +531,25 @@ int qnoc_probe(struct platform_device *pdev) } data->num_nodes = num_nodes; + ret = icc_provider_register(provider); + if (ret) + goto err_remove_nodes; + platform_set_drvdata(pdev, qp); /* Populate child NoC devices if any */ if (of_get_child_count(dev->of_node) > 0) { ret = of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) - goto err; + goto err_deregister_provider; } return 0; -err: + +err_deregister_provider: + icc_provider_deregister(provider); +err_remove_nodes: icc_nodes_remove(provider); - icc_provider_del(provider); err_disable_clks: clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); @@ -560,9 +561,9 @@ int qnoc_remove(struct platform_device *pdev) { struct qcom_icc_provider *qp = platform_get_drvdata(pdev); + icc_provider_deregister(&qp->provider); icc_nodes_remove(&qp->provider); clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); - icc_provider_del(&qp->provider); return 0; } -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Johan Hovold <johan+linaro@kernel.org> To: Georgi Djakov <djakov@kernel.org> Cc: "Shawn Guo" <shawnguo@kernel.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Fabio Estevam" <festevam@gmail.com>, "NXP Linux Team" <linux-imx@nxp.com>, "Andy Gross" <agross@kernel.org>, "Bjorn Andersson" <andersson@kernel.org>, "Konrad Dybcio" <konrad.dybcio@linaro.org>, "Sylwester Nawrocki" <s.nawrocki@samsung.com>, "Artur Świgoń" <a.swigon@samsung.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>, "Alim Akhtar" <alim.akhtar@samsung.com>, "Thierry Reding" <thierry.reding@gmail.com>, "Jonathan Hunter" <jonathanh@nvidia.com>, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, "Johan Hovold" <johan+linaro@kernel.org>, stable@vger.kernel.org, "Jun Nie" <jun.nie@linaro.org> Subject: [PATCH v2 08/23] interconnect: qcom: rpm: fix registration race Date: Mon, 6 Mar 2023 08:56:36 +0100 [thread overview] Message-ID: <20230306075651.2449-9-johan+linaro@kernel.org> (raw) In-Reply-To: <20230306075651.2449-1-johan+linaro@kernel.org> The current interconnect provider registration interface is inherently racy as nodes are not added until the after adding the provider. This can specifically cause racing DT lookups to fail. Switch to using the new API where the provider is not registered until after it has been fully initialised. Fixes: 62feb14ee8a3 ("interconnect: qcom: Consolidate interconnect RPM support") Fixes: 30c8fa3ec61a ("interconnect: qcom: Add MSM8916 interconnect provider driver") Cc: stable@vger.kernel.org # 5.7 Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Reviewed-by: Jun Nie <jun.nie@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/interconnect/qcom/icc-rpm.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index da595059cafd..4d0997b210f7 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -502,7 +502,6 @@ int qnoc_probe(struct platform_device *pdev) } provider = &qp->provider; - INIT_LIST_HEAD(&provider->nodes); provider->dev = dev; provider->set = qcom_icc_set; provider->pre_aggregate = qcom_icc_pre_bw_aggregate; @@ -510,11 +509,7 @@ int qnoc_probe(struct platform_device *pdev) provider->xlate_extended = qcom_icc_xlate_extended; provider->data = data; - ret = icc_provider_add(provider); - if (ret) { - dev_err(dev, "error adding interconnect provider: %d\n", ret); - goto err_disable_clks; - } + icc_provider_init(provider); for (i = 0; i < num_nodes; i++) { size_t j; @@ -522,7 +517,7 @@ int qnoc_probe(struct platform_device *pdev) node = icc_node_create(qnodes[i]->id); if (IS_ERR(node)) { ret = PTR_ERR(node); - goto err; + goto err_remove_nodes; } node->name = qnodes[i]->name; @@ -536,19 +531,25 @@ int qnoc_probe(struct platform_device *pdev) } data->num_nodes = num_nodes; + ret = icc_provider_register(provider); + if (ret) + goto err_remove_nodes; + platform_set_drvdata(pdev, qp); /* Populate child NoC devices if any */ if (of_get_child_count(dev->of_node) > 0) { ret = of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) - goto err; + goto err_deregister_provider; } return 0; -err: + +err_deregister_provider: + icc_provider_deregister(provider); +err_remove_nodes: icc_nodes_remove(provider); - icc_provider_del(provider); err_disable_clks: clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); @@ -560,9 +561,9 @@ int qnoc_remove(struct platform_device *pdev) { struct qcom_icc_provider *qp = platform_get_drvdata(pdev); + icc_provider_deregister(&qp->provider); icc_nodes_remove(&qp->provider); clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); - icc_provider_del(&qp->provider); return 0; } -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-03-06 7:57 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-06 7:56 [PATCH v2 00/23] interconnect: fix racy provider registration Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 01/23] interconnect: fix mem leak when freeing nodes Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-07 9:42 ` Luca Ceresoli 2023-03-07 9:42 ` Luca Ceresoli 2023-03-06 7:56 ` [PATCH v2 02/23] interconnect: fix icc_provider_del() error handling Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-07 9:43 ` Luca Ceresoli 2023-03-07 9:43 ` Luca Ceresoli 2023-03-06 7:56 ` [PATCH v2 03/23] interconnect: fix provider registration API Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-07 9:43 ` Luca Ceresoli 2023-03-07 9:43 ` Luca Ceresoli 2023-03-06 7:56 ` [PATCH v2 04/23] interconnect: imx: fix registration race Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-07 9:43 ` Luca Ceresoli 2023-03-07 9:43 ` Luca Ceresoli 2023-03-07 10:25 ` Johan Hovold 2023-03-07 10:25 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 05/23] interconnect: qcom: osm-l3: " Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 06/23] interconnect: qcom: rpm: fix probe child-node error handling Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 07/23] interconnect: qcom: rpm: fix probe PM domain " Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` Johan Hovold [this message] 2023-03-06 7:56 ` [PATCH v2 08/23] interconnect: qcom: rpm: fix registration race Johan Hovold 2023-03-06 7:56 ` [PATCH v2 09/23] interconnect: qcom: rpmh: fix probe child-node error handling Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 10/23] interconnect: qcom: rpmh: fix registration race Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 11/23] interconnect: qcom: msm8974: " Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 12/23] interconnect: qcom: sm8450: " Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 13/23] interconnect: qcom: sm8550: " Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 9:03 ` Abel Vesa 2023-03-06 9:03 ` Abel Vesa 2023-03-06 9:34 ` Johan Hovold 2023-03-06 9:34 ` Johan Hovold 2023-03-06 9:39 ` Abel Vesa 2023-03-06 9:39 ` Abel Vesa 2023-03-06 10:04 ` Johan Hovold 2023-03-06 10:04 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 14/23] interconnect: exynos: fix node leak in probe PM QoS error path Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 15/23] interconnect: exynos: fix registration race Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 16/23] interconnect: exynos: drop redundant link destroy Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 17/23] memory: tegra: fix interconnect registration race Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 18/23] memory: tegra124-emc: " Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 19/23] memory: tegra20-emc: " Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 20/23] memory: tegra30-emc: " Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 21/23] interconnect: drop racy registration API Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 22/23] interconnect: drop unused icc_get() interface Johan Hovold 2023-03-06 7:56 ` Johan Hovold 2023-03-06 7:56 ` [PATCH v2 23/23] interconnect: drop unused icc_link_destroy() interface Johan Hovold 2023-03-06 7:56 ` Johan Hovold
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230306075651.2449-9-johan+linaro@kernel.org \ --to=johan+linaro@kernel.org \ --cc=a.swigon@samsung.com \ --cc=agross@kernel.org \ --cc=alim.akhtar@samsung.com \ --cc=andersson@kernel.org \ --cc=djakov@kernel.org \ --cc=festevam@gmail.com \ --cc=jonathanh@nvidia.com \ --cc=jun.nie@linaro.org \ --cc=kernel@pengutronix.de \ --cc=konrad.dybcio@linaro.org \ --cc=krzysztof.kozlowski@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=s.nawrocki@samsung.com \ --cc=shawnguo@kernel.org \ --cc=stable@vger.kernel.org \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.