From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753542Ab3KXV2h (ORCPT ); Sun, 24 Nov 2013 16:28:37 -0500 Received: from mail-we0-f180.google.com ([74.125.82.180]:58415 "EHLO mail-we0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752817Ab3KXV2M (ORCPT ); Sun, 24 Nov 2013 16:28:12 -0500 Message-ID: <52926F6F.3050104@linaro.org> Date: Sun, 24 Nov 2013 22:28:15 +0100 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: =?UTF-8?B?VXdlIEtsZWluZS1Lw7ZuaWc=?= CC: Thierry Reding , Thomas Gleixner , Arnd Bergmann , Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, David Brown Subject: Re: [PATCH] clocksource: Do not drop unheld reference on device node References: <1382136588-15320-1-git-send-email-treding@nvidia.com> <20131122161607.GA5088@ulmo.nvidia.com> <528F86F2.40706@linaro.org> <20131122192257.GX28642@pengutronix.de> In-Reply-To: <20131122192257.GX28642@pengutronix.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/22/2013 08:22 PM, Uwe Kleine-König wrote: > On Fri, Nov 22, 2013 at 05:31:46PM +0100, Daniel Lezcano wrote: >> On 11/22/2013 05:16 PM, Thierry Reding wrote: >>> On Sat, Oct 19, 2013 at 12:49:48AM +0200, Thierry Reding wrote: >>>> When booting a recent kernel on ARM with OF_DYNAMIC enabled, the kernel >>>> warns about the following: >>>> >>>> [ 0.000000] ERROR: Bad of_node_put() on /timer@50004600 >>>> [ 0.000000] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.12.0-rc5-next-20131017-00077-gedfd827-dirty #406 >>>> [ 0.000000] [] (unwind_backtrace+0x0/0xf4) from [] (show_stack+0x10/0x14) >>>> [ 0.000000] [] (show_stack+0x10/0x14) from [] (dump_stack+0x9c/0xc8) >>>> [ 0.000000] [] (dump_stack+0x9c/0xc8) from [] (of_node_release+0x90/0x9c) >>>> [ 0.000000] [] (of_node_release+0x90/0x9c) from [] (of_find_matching_node_and_match+0x78/0xb4) >>>> [ 0.000000] [] (of_find_matching_node_and_match+0x78/0xb4) from [] (clocksource_of_init+0x60/0x70) >>>> [ 0.000000] [] (clocksource_of_init+0x60/0x70) from [] (start_kernel+0x1f4/0x33c) >>>> [ 0.000000] [] (start_kernel+0x1f4/0x33c) from [<80008074>] (0x80008074) >>>> >>>> This is caused by clocksource_of_init() dropping a reference on the >>>> device node that it never took. The reference taken by the loop is >>>> implicitly dropped on subsequent iterations. See the implementation of >>>> and the comment on top of the of_find_matching_node_and_match() >>>> function for reference (no pun intended). > I only saw the end of the comment saying: > > Returns a node pointer with refcount incremented, use > of_node_put() on it when done. > > Maybe that could be improved to something like: > > /** > * of_find_matching_node_and_match - Find a node based on an of_device_id > * match table > * @from: The node to start searching from or NULL, the node you pass > * will not be searched, only the next one will; typically, you > * pass what the previous call returned. > * @matches: ... > * @match: ... > * > * Reference counting: Puts a reference on @from and increases the > * reference count of the returned node. > */ > >>>> >>>> Signed-off-by: Thierry Reding >>>> --- >>>> drivers/clocksource/clksrc-of.c | 1 - >>>> 1 file changed, 1 deletion(-) >>> >>> Can someone look at this? >> >> Yes. Sounds like I missed it. >> >> This regression has been introduced by: >> >> commit 326e31eebe61dc838e031ea16968b2cfb43443e3 >> Author: Uwe Kleine-König >> Date: Tue Oct 1 11:00:53 2013 +0200 >> >> clocksource: Put nodes passed to CLOCKSOURCE_OF_DECLARE >> callbacks centrally >> >> Instead of letting each driver call of_node_put do it centrally in the >> loop that also calls the CLOCKSOURCE_OF_DECLARE callbacks. This is less >> prone to error and also moves getting and putting the references >> into the >> same function. >> >> Consequently all respective of_node_put calls in drivers are removed. >> >> Signed-off-by: Uwe Kleine-König >> Signed-off-by: Daniel Lezcano >> Acked-by: David Brown > Still all but the hook in clocksource_of_init of this commit was > correct, right? (Well, but this buggy hunk makes the commit log wrong.) I don't understand your comment, can you elaborate ? Thanks -- Daniel -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog