From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 59F244DA542 for ; Fri, 21 Aug 2026 14:25:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787322323; cv=none; b=KA2/wDyfzUNJ06wosjun4OWe0qRMYNkrIB5hoOT4OQDSMy+RPYv4FP96ni2RIM76GLnpgjjlr04QLXNP0JEowPppnB83fJOLaoe4nsKckK6MQOwVr/bJZYWrfqsHYdSgu2+Ky4nxK9kOoe2Lg5eZVDy3bhO7JBurHv5j5yWnIAQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787322323; c=relaxed/simple; bh=PpCFqoRTZpuvsvOZ0n6sLpsfDEkS0I7BJkxeNNLASWI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=azxiim3J/er2e4d0eKOrnL+0eW8+FF9RDwQfKQdFmdBsOvyuAuVk+FP2Y6qY2JxoHVMhrlo+90JXtk6+d5khJdD8TZbY6YhmkHBoAMKKi21CgaeqSu9GdzL9j0VDtKqvyeOW6sn4HPfJBbv30GTj+gsmg36pQx7BRYVijsi2u+g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=WqEAaP2K; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WqEAaP2K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787322321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DMrZ3k+8w7iHo+aJLNVhsbxB4A7X4+dEmXKkGn+Muu4=; b=WqEAaP2K4URjmwDXuzhZBvX5IrnaL9GPX2BocWx54ZffZOLAGGF2SBnTvfTzU6aORUbid+ 1z3uG93mx2wHvFFvf5QN4JhFdpTGbgiZzTA/XsNmETiNxY1b5N4asb6azBPOU7ZLX+Bow6 lCgpLrX9fZnNFfSQfJCaaRkFpDWMQEY= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-505-Ui0UpXs6OW60e-6v_nFLxg-1; Fri, 21 Aug 2026 10:25:02 -0400 X-MC-Unique: Ui0UpXs6OW60e-6v_nFLxg-1 X-Mimecast-MFC-AGG-ID: Ui0UpXs6OW60e-6v_nFLxg_1787322299 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0B5321955DE3; Fri, 21 Aug 2026 14:24:59 +0000 (UTC) Received: from djeffery-thinkpadp1gen3.redhat.corp (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 478731800346; Fri, 21 Aug 2026 14:24:56 +0000 (UTC) From: David Jeffery To: driver-core@lists.linux.dev, Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-scsi@vger.kernel.org, Tarun Sahu , Stuart Hayes , Laurence Oberman , Bjorn Helgaas , kexec@lists.infradead.org, David Jeffery Subject: [PATCH 5/9] driver core: do not always lock parent in shutdown Date: Fri, 21 Aug 2026 10:24:10 -0400 Message-ID: <20260821142414.150892-6-djeffery@redhat.com> In-Reply-To: <20260821142414.150892-1-djeffery@redhat.com> References: <20260821142414.150892-1-djeffery@redhat.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Don't lock a parent device unless it is needed in device_shutdown. This is in preparation for making device shutdown asynchronous, when it will be needed to allow children of a common parent to shut down simultaneously. And only acquire a reference to the parent device if the parent is to be locked. Signed-off-by: Stuart Hayes Signed-off-by: David Jeffery Signed-off-by: Tarun Sahu Tested-by: Laurence Oberman --- The sashiko patch analysis may complain about the parent locking and possible use of device_move. This issue cannot currently happen as devices with need_parent_lock do not use device_move. An earlier patch also adds a warning for this condition should some future code change violate the incompatibility between need_parent_lock and device_move. drivers/base/core.c | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index a94d24b30c30..cd725466c32d 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4910,12 +4910,10 @@ int device_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid) return error; } -static void shutdown_one_device(struct device *dev, struct device *parent) +static void __shutdown_one_device(struct device *dev) { - /* hold lock to avoid race with probe/release */ - if (parent) - device_lock(parent); - device_lock(dev); + if (!dev->p || dev->p->dead) + return; /* Don't allow any more runtime suspends */ pm_runtime_get_noresume(dev); @@ -4935,13 +4933,33 @@ static void shutdown_one_device(struct device *dev, struct device *parent) dev_info(dev, "shutdown\n"); dev->driver->shutdown(dev); } +} - device_unlock(dev); - if (parent) +static void shutdown_one_device(struct device *dev) +{ + struct device *parent; + + device_lock(dev); + + /* use parent lock if needed to avoid race with probe/release */ + if (dev->bus && dev->bus->need_parent_lock && dev->p && !dev->p->dead && + (parent = get_device(dev->parent))) { + /* the parent lock needs to be acquired first, so re-lock */ + device_unlock(dev); + + device_lock(parent); + device_lock(dev); + + __shutdown_one_device(dev); + device_unlock(dev); device_unlock(parent); + put_device(parent); + } else { + __shutdown_one_device(dev); + device_unlock(dev); + } put_device(dev); - put_device(parent); } /** @@ -4949,7 +4967,7 @@ static void shutdown_one_device(struct device *dev, struct device *parent) */ void device_shutdown(void) { - struct device *dev, *parent; + struct device *dev; wait_for_device_probe(); device_block_probing(); @@ -4966,12 +4984,6 @@ void device_shutdown(void) dev = list_entry(devices_kset->list.prev, struct device, kobj.entry); - /* - * hold reference count of device's parent to - * prevent it from being freed because parent's - * lock is to be held - */ - parent = get_device(dev->parent); get_device(dev); /* * Make sure the device is off the kset list, in the @@ -4980,7 +4992,7 @@ void device_shutdown(void) list_del_init(&dev->kobj.entry); spin_unlock(&devices_kset->list_lock); - shutdown_one_device(dev, parent); + shutdown_one_device(dev); spin_lock(&devices_kset->list_lock); } -- 2.55.0