From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752853AbbDMB3b (ORCPT ); Sun, 12 Apr 2015 21:29:31 -0400 Received: from [119.145.14.65] ([119.145.14.65]:32774 "EHLO szxga02-in.huawei.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752454AbbDMB32 (ORCPT ); Sun, 12 Apr 2015 21:29:28 -0400 Message-ID: <552B1BD3.7050706@huawei.com> Date: Mon, 13 Apr 2015 09:28:51 +0800 From: Xie XiuQi User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: "Rafael J. Wysocki" , CC: , , , Toshi Kani Subject: Re: [PATCH] ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline() References: <1428397392-26200-1-git-send-email-xiexiuqi@huawei.com> <5219717.RxvSXtBaZ8@vostro.rjw.lan> <12760195.2odgqTkKju@vostro.rjw.lan> <2181841.0nPiIAbDNm@vostro.rjw.lan> In-Reply-To: <2181841.0nPiIAbDNm@vostro.rjw.lan> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.17.191] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2015/4/11 7:31, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > acpi_scan_is_offline() may be called under the physical_node_lock > of the given device object's parent, so prevent lockdep from > complaining about that by annotating that instance with > SINGLE_DEPTH_NESTING. > > Reported-by: Xie XiuQi > Signed-off-by: Rafael J. Wysocki Thank you for your patch, I'll test soon. Thanks, Xie XiuQi > --- > drivers/acpi/scan.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > Index: linux-pm/drivers/acpi/scan.c > =================================================================== > --- linux-pm.orig/drivers/acpi/scan.c > +++ linux-pm/drivers/acpi/scan.c > @@ -298,7 +298,11 @@ bool acpi_scan_is_offline(struct acpi_de > struct acpi_device_physical_node *pn; > bool offline = true; > > - mutex_lock(&adev->physical_node_lock); > + /* > + * acpi_container_offline() calls this for all of the container's > + * children under the container's physical_node_lock lock. > + */ > + mutex_lock_nested(&adev->physical_node_lock, SINGLE_DEPTH_NESTING); > > list_for_each_entry(pn, &adev->physical_node_list, node) > if (device_supports_offline(pn->dev) && !pn->dev->offline) { > > > . >