From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8790B6D1A0; Tue, 14 May 2024 11:33:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686433; cv=none; b=cVmSFriO8eGeiXEs5uQermWnomf6ruGQy2GXNTSvMe3/dWUpx1+pLylKN/xN6fnHbnXzy/lvEYMYlcv0y5XEFywjJb8AiUBGof5I56GmqzlRRDckSLN+yvp/F6BZiB/UQgTtX+/eM8OSRgybXZ8oegBkQco7+oz97KQEV4mtKRE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686433; c=relaxed/simple; bh=NOY/PVExWXPvhqaPWw0VjQyrLU09yVu0RmJNfyUMrlU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AtNdKjG/dvtSRtFKLMUx6+N96nzftmgZYpppZfOYvyPK+4RwDaihrxgZF+3GW+Egvm9iw4hDCoLc8mgkv2rlPbWhP+EDHGFHFmmTj9pggAWgMY/UjUVBaRCrFxOHByqS8/iLcB7y24AKBX3XnbjYRUiMgnJxQkjw5/oZMqKiKq4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=n/2G8+Ep; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="n/2G8+Ep" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04076C2BD10; Tue, 14 May 2024 11:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715686433; bh=NOY/PVExWXPvhqaPWw0VjQyrLU09yVu0RmJNfyUMrlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/2G8+EpaXAMcvUNVP9CfZGl97YFmwJyLo7mIgdUjyuBuDBeWjo62XhoYzAug5DBR 96g7ZjqTNRjgIqk5SpV+DuadJ3qAFq6rEZzKddiD8DQZ3XMdI5jEPwGdUOERQn8BS2 +4JcIrgaE1DqBa+GD5Z6u4jQlSctwghylrRjDZFc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Douglas Anderson , Stephen Boyd , Sasha Levin Subject: [PATCH 6.1 136/236] clk: Dont hold prepare_lock when calling kref_put() Date: Tue, 14 May 2024 12:18:18 +0200 Message-ID: <20240514101025.531978864@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101020.320785513@linuxfoundation.org> References: <20240514101020.320785513@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stephen Boyd [ Upstream commit 6f63af7511e7058f3fa4ad5b8102210741c9f947 ] We don't need to hold the prepare_lock when dropping a ref on a struct clk_core. The release function is only freeing memory and any code with a pointer reference has already unlinked anything pointing to the clk_core. This reduces the holding area of the prepare_lock a bit. Note that we also don't call free_clk() with the prepare_lock held. There isn't any reason to do that. Reviewed-by: Douglas Anderson Signed-off-by: Stephen Boyd Link: https://lore.kernel.org/r/20240325184204.745706-3-sboyd@kernel.org Signed-off-by: Sasha Levin --- drivers/clk/clk.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index fe1d45eac837c..8ecbb8f494655 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -4435,7 +4435,8 @@ void clk_unregister(struct clk *clk) if (ops == &clk_nodrv_ops) { pr_err("%s: unregistered clock: %s\n", __func__, clk->core->name); - goto unlock; + clk_prepare_unlock(); + return; } /* * Assign empty clock ops for consumers that might still hold @@ -4469,11 +4470,10 @@ void clk_unregister(struct clk *clk) if (clk->core->protect_count) pr_warn("%s: unregistering protected clock: %s\n", __func__, clk->core->name); + clk_prepare_unlock(); kref_put(&clk->core->ref, __clk_release); free_clk(clk); -unlock: - clk_prepare_unlock(); } EXPORT_SYMBOL_GPL(clk_unregister); @@ -4632,13 +4632,11 @@ void __clk_put(struct clk *clk) if (clk->min_rate > 0 || clk->max_rate < ULONG_MAX) clk_set_rate_range_nolock(clk, 0, ULONG_MAX); - owner = clk->core->owner; - kref_put(&clk->core->ref, __clk_release); - clk_prepare_unlock(); + owner = clk->core->owner; + kref_put(&clk->core->ref, __clk_release); module_put(owner); - free_clk(clk); } -- 2.43.0