From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A303C33A9E9 for ; Fri, 17 Jul 2026 02:41:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784256109; cv=none; b=EJoYWt70whrZqprGELCnp81jdBz0F9VZxMZAX5ZADMpUBkdr0X6Nmxco7SWyoH6Vy7rkp7bH8mLiwtLzB3BlghpLDz+MZf2ezAGPxGiUPqy3AF4c9hrmX7JQ7CZRufJU7G06Y4LyGXAcw0yhFvhBx/2ei1w1ljInD22ZDlmGlLQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784256109; c=relaxed/simple; bh=84Dxy+IQXZ+Io/tsnEE56Nrw1ZiDroBdIIccATE0oog=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ePqYX6IQ1szerkkK75uOTBH3fe0mBl0lcbHeKVCHzMiRQ4sWZt9anJtGNef1XwBtgzclql5RsfVI6YcIo9GFL9PfPCEXrSxrLlofDwHwGtjvZw6JD991R6MuTd5uz8VUkgIzORAhDSlaMF2PKGmfPrGkSwXbWFk4IgiJnyBXjwk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tarunsahu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=aV0NDUUa; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tarunsahu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="aV0NDUUa" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-474170b59dfso4182359f8f.3 for ; Thu, 16 Jul 2026 19:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784256106; x=1784860906; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=v9ZzsR0v39hzEb6iXWVS0iiD5j1ThrMppOubfeQ9NoI=; b=aV0NDUUalJEVRuA4IO9jSbMXoB0AMDr5fprzU6ZVzx4b0dY+r1xs0R2RMJ3nK2BLYi /LNT3fkqTSK++WOOs1JSFn2RtDIq2rxcJDu+GJH0bfZTT/lBeaiCShtFuEKGKYLPhVkK mLeU+xBayM3jnah645b69Q1tO3LRPoCAY9UchHrPN8ZQWH7+uSj7+Mv7Jt4uSdZRzY9e k4lB3izQeu0KJ8QPRegQPmPvDN7AhSPzpZeiS84voDXN/PfS9SGu/vJ6eDc1hpHH3TGw l8vhDj+GzqJ1lWlj4GYjBPyT7IGP4Oi3FJ+CwMM1F5gMihaG+eUxF8nuzGKxTl1DeUR5 IIWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784256106; x=1784860906; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=v9ZzsR0v39hzEb6iXWVS0iiD5j1ThrMppOubfeQ9NoI=; b=e/AAodq/PJBE6YT8v4Yw+Q01SACiCAxgYiZTxpwzn3p++hEW7psGNTJWxXYzHkZUkM /ZEBWjWlyrCmzTnJSz2NLkGYoo2Yyo5bjpiQD5FvLcHjU2HQSHC8NPJqBNmaNQ5G3AcR 0F1Fb4MH1GlCtTFVcc3P7wXw32Uw06BI9jeZJFhlU6Qm4wrcrRVVHxPihqeFThpJmrI0 Wnpq20Jh9PibYwbFGf3V8+kibUdBVtSI4Ornj97sEoNbS9S2/Wl0mN1PfsILva//go9G VnfP0lEnxjKLWya6o470NsxfFeI3HCeQ+oM5u9uVrNTTIatrzUDtCaurvkhXHhLutKho MUJw== X-Forwarded-Encrypted: i=1; AHgh+RqIVnQoMTmLjIJJkUr77rLYwEHdhtrHBWY5myKB+/1cHrqN2siYnsaPHWYxei37DIp/x9GjVXmiHfU=@vger.kernel.org X-Gm-Message-State: AOJu0YxUZraf2BRZXTzYtsRyjwTk6ybPzLLgFAKASZd8JEMqj4DWNqMK mNHLyt0v2Ga8uLZmnSmkMMNZber5HnDG3yx76qzQ3JwoKdeW4psTy0Mtuafitid5sopDh08tpN0 hZZS0YGfxuYMyK8ffSw== X-Received: from wrmh8.prod.google.com ([2002:adf:e988:0:b0:463:dd19:ae30]) (user=tarunsahu job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5d12:0:b0:475:f0f0:9f04 with SMTP id ffacd0b85a97d-47f6235475bmr740733f8f.59.1784256105583; Thu, 16 Jul 2026 19:41:45 -0700 (PDT) Date: Thu, 16 Jul 2026 23:04:07 +0000 In-Reply-To: <20260716230411.2767394-1-tarunsahu@google.com> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260716230411.2767394-1-tarunsahu@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260716230411.2767394-4-tarunsahu@google.com> Subject: [PATCH v19 3/7] driver core: separate function to shutdown one device From: Tarun Sahu To: Shuah Khan , Danilo Krummrich , Bjorn Helgaas , Greg Kroah-Hartman , "Martin K. Petersen" , "James E.J. Bottomley" , Jonathan Corbet , "Rafael J. Wysocki" Cc: bvanassche@acm.org, john.g.garry@oracle.com, mlombard@redhat.com, loberman@redhat.com, mclapinski@google.com, dmatlack@google.com, driver-core@lists.linux.dev, linux-pci@vger.kernel.org, Pasha Tatashin , jordanrichards@google.com, souravsgl@google.com, stuart.w.hayes@gmail.com, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, emilne@redhat.com, jmeneghi@redhat.com, linux-scsi@vger.kernel.org, David Jeffery Content-Type: text/plain; charset="UTF-8" From: David Jeffery Make a separate function for the part of device_shutdown() that does the shutown for a single device. This is in preparation for making device shutdown asynchronous. Signed-off-by: Stuart Hayes Signed-off-by: David Jeffery Tested-by: Laurence Oberman Reviewed-by: Martin K. Petersen Reviewed-by: Pasha Tatashin --- drivers/base/core.c | 71 +++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 78b90326addb..82a7af1f3ba2 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4898,12 +4898,48 @@ 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 = dev->parent; + + /* hold lock to avoid race with probe/release */ + if (parent) + device_lock(parent); + device_lock(dev); + + /* Don't allow any more runtime suspends */ + pm_runtime_get_noresume(dev); + pm_runtime_barrier(dev); + + if (dev->class && dev->class->shutdown_pre) { + if (initcall_debug) + dev_info(dev, "shutdown_pre\n"); + dev->class->shutdown_pre(dev); + } + if (dev->bus && dev->bus->shutdown) { + if (initcall_debug) + dev_info(dev, "shutdown\n"); + dev->bus->shutdown(dev); + } else if (dev->driver && dev->driver->shutdown) { + if (initcall_debug) + dev_info(dev, "shutdown\n"); + dev->driver->shutdown(dev); + } + + device_unlock(dev); + if (parent) + device_unlock(parent); + + put_device(parent); + put_device(dev); +} + /** * device_shutdown - call ->shutdown() on each device to shutdown. */ void device_shutdown(void) { - struct device *dev, *parent; + struct device *dev; wait_for_device_probe(); device_block_probing(); @@ -4925,7 +4961,7 @@ void device_shutdown(void) * prevent it from being freed because parent's * lock is to be held */ - parent = get_device(dev->parent); + get_device(dev->parent); get_device(dev); /* * Make sure the device is off the kset list, in the @@ -4934,36 +4970,7 @@ void device_shutdown(void) list_del_init(&dev->kobj.entry); spin_unlock(&devices_kset->list_lock); - /* hold lock to avoid race with probe/release */ - if (parent) - device_lock(parent); - device_lock(dev); - - /* Don't allow any more runtime suspends */ - pm_runtime_get_noresume(dev); - pm_runtime_barrier(dev); - - if (dev->class && dev->class->shutdown_pre) { - if (initcall_debug) - dev_info(dev, "shutdown_pre\n"); - dev->class->shutdown_pre(dev); - } - if (dev->bus && dev->bus->shutdown) { - if (initcall_debug) - dev_info(dev, "shutdown\n"); - dev->bus->shutdown(dev); - } else if (dev->driver && dev->driver->shutdown) { - if (initcall_debug) - dev_info(dev, "shutdown\n"); - dev->driver->shutdown(dev); - } - - device_unlock(dev); - if (parent) - device_unlock(parent); - - put_device(dev); - put_device(parent); + shutdown_one_device(dev); spin_lock(&devices_kset->list_lock); } -- 2.55.0.229.g6434b31f56-goog