From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 133EF3845AB for ; Fri, 17 Apr 2026 13:35:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776432942; cv=none; b=hNcTPeCIZGRlkSfHKEyBE8eRgxCCgfQ3r4eXxE/63WcL6l9j42SAC6P0+i8QNwdLiwJjN9B3rs0eRkzMa9OAkm60bUuXbrcttomqZc/udln/TdZcRssT/rZUESQ0B9B19dDu4H4/cZAHPvc+xsrJTdaqlTExQEikcntvcPqhJsE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776432942; c=relaxed/simple; bh=Lc9ZuZRMssPJ6LdhNV62mIiuc51WiGNvfhGCMgaLY2A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=E1Y8c+IbvUfUIy09aTkBqH1ikJSoczZ60nAIrNCACXzwVK5AxTOtCPdDf96kOJjSMvWT4QHYL1RDlpJ7T1z90y4AfKpVCapJp+W0JVPrBCRWVnBqsEZ8G7ZYfA0AFD5FMvJzrBubt8JWeVqEItVpeJDToHK7PU7PMH1NfyLwyy4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QNim93E6; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QNim93E6" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-82f37c09352so1229983b3a.0 for ; Fri, 17 Apr 2026 06:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776432940; x=1777037740; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fdDAtCg/5gWiORhKSpZnqdKkvEwJP2sVvd/SKqDyQdQ=; b=QNim93E6udF0iJMiXaQCZj3mZgLmsIKMYRGfEyMzLEe8Du+dDQZ6Hljshnhd7SWznx GhT4s2zTW1MWdUAm92/pAASsMl0vF1KRXsfZbSEnn2Ax8/Ste2nYt+SB4b9eJDGtqgvu b0zI48J2UIvOiTWNxRRjCVQ+7AGxF1BYdw6FJV53DbjKAFen9mSp1f1uS+C8hvpN/RNy owCgAIg6JEtPksVjYJXAEl41MmPG6XKM01BVLr0Jh623iXhgr3dQ4RV6kBsHLlsWxMYe XF+K8cboG90wMPrC8oIchjweZgaznOPoCsisA/r3RFHob9ur9n0tHZxExG/CtNe4y4cV d/AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776432940; x=1777037740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fdDAtCg/5gWiORhKSpZnqdKkvEwJP2sVvd/SKqDyQdQ=; b=pOYpANAwG53oX+LtyrwneJoo9UiPXBnlFbMOaX4UVVQwrxtAzgIyNfCvF2rtiW1p7G 0XAYueZbRYVUWyqQ9+5awJwInCn79V1kQU+r9M0/QtuMlwHC3Rr78mYuh+/NFa+TxTnJ 9x85AtImMLXQeVpeAvQqn3BZQASJq5ZnSZwC/69SPaYjLx60ai+GyQLeYh4RbNyLTTEp v1Orr4AgBCPjZrSfX09Z2d2xpgpIg8U/BF6VBatHHmwjfpbEqn06G0jAfKbgCJloa9nA cGGGXRK3mEGqhM+mZBrSnQ8iVedsMxz4wNZlB8RZ3UDFqg98rNgt0BLXegWGhY0H96dx KzEw== X-Forwarded-Encrypted: i=1; AFNElJ+NkOAvMjfrDs5AIgBquyL0bYXhTF1lxaR4vVQ5gTtKqNQrZZsg4VY3KPEVasBvv+tEj4WsRqqtX0hUuhg=@vger.kernel.org X-Gm-Message-State: AOJu0YwsXTOPwS0gKzuzHmOCd7DTUEvuTONkN9o8q0uoLJvWy+ciQQPj OkbHYSgLDy6zdswuwMbuYaVBP1aAyFOUqmqeEd8KEMV5lnlxGX7ULLXG X-Gm-Gg: AeBDievw9xhwYETtNkv1PfbW1fJr2pvVxYzOosuhlqyMyG/8ywPdtE3azPAaMt5eAbe j2p4Z4ZrBPji1cqu3RQg9/5Gs9ZG1xK4aJbpvMVHxmpynep7VcHx2iL+1qdAO7Z0u1dXFSPwIGP TJFGu+UNwondAh1UrBcXXTXs8EQzKY3Zx0o/8YKjeHVCA9v3FpPUBjZSKRHMlkFNxi2VaiGYlqb ZsPL2hAw5s2/nn8KSPGeouOT0H80aaN3JVbEEXEgt1Ka/Bs/FxwPkMt3lBxDxkEJekvY+x9oIGs 9i9qzKUs6T79YJv+UZzbPTsJySGmoD/JcNWN8vRs+pSYUSMC7oBPSMT87zH+JUTdmQp6zh5VSSx iiD/JX3MTh2KeiHUWW0mhYvn+3nbhYSU2QtShEjj1F/h/L+8fMRRLzetAdkeo2BXn/97JgvgHkr sFnPb6UvS1OmPRSJ8PL8qZibLnd1myu1TbBIv81a/FJZApjgQdQcU0qHC5+eUA4yaV3iGIgTidj ko+AoP8l/agqO3hTHoiP9q2eEupKRij9Po0rQ== X-Received: by 2002:a05:6a20:729c:b0:39f:582c:aa8a with SMTP id adf61e73a8af0-3a08ca73cf4mr2590496637.19.1776432940119; Fri, 17 Apr 2026 06:35:40 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7976fa3604sm1421272a12.14.2026.04.17.06.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 06:35:39 -0700 (PDT) From: Sungho Bae To: mst@redhat.com, jasowang@redhat.com Cc: xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Sungho Bae Subject: [RFC PATCH v2 1/4] virtio: separate PM restore and reset_done paths Date: Fri, 17 Apr 2026 22:34:27 +0900 Message-Id: <20260417133430.507-2-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260417133430.507-1-baver.bae@gmail.com> References: <20260417133430.507-1-baver.bae@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sungho Bae Refactor virtio_device_restore_priv() by extracting the common device re-initialization sequence into virtio_device_reinit(). This helper performs the full bring-up sequence: reset, status acknowledgment, feature finalization, and feature negotiation. virtio_device_restore() and virtio_device_reset_done() now each call virtio_device_reinit() directly instead of going through a boolean- dispatched wrapper. This makes each path independently readable and extensible without further complicating the dispatch logic. A follow-up series will add noirq PM callbacks that only affect the restore path; having the two paths separated avoids adding more conditionals to a shared function. No functional change. Signed-off-by: Sungho Bae --- drivers/virtio/virtio.c | 78 +++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 5bdc6b82b30b..b0668434ac21 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -588,7 +588,7 @@ void unregister_virtio_device(struct virtio_device *dev) } EXPORT_SYMBOL_GPL(unregister_virtio_device); -static int virtio_device_restore_priv(struct virtio_device *dev, bool restore) +static int virtio_device_reinit(struct virtio_device *dev) { struct virtio_driver *drv = drv_to_virtio(dev->dev.driver); int ret; @@ -613,35 +613,9 @@ static int virtio_device_restore_priv(struct virtio_device *dev, bool restore) ret = dev->config->finalize_features(dev); if (ret) - goto err; - - ret = virtio_features_ok(dev); - if (ret) - goto err; - - if (restore) { - if (drv->restore) { - ret = drv->restore(dev); - if (ret) - goto err; - } - } else { - ret = drv->reset_done(dev); - if (ret) - goto err; - } - - /* If restore didn't do it, mark device DRIVER_OK ourselves. */ - if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK)) - virtio_device_ready(dev); - - virtio_config_core_enable(dev); - - return 0; + return ret; -err: - virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); - return ret; + return virtio_features_ok(dev); } #ifdef CONFIG_PM_SLEEP @@ -668,7 +642,30 @@ EXPORT_SYMBOL_GPL(virtio_device_freeze); int virtio_device_restore(struct virtio_device *dev) { - return virtio_device_restore_priv(dev, true); + struct virtio_driver *drv = drv_to_virtio(dev->dev.driver); + int ret; + + ret = virtio_device_reinit(dev); + if (ret) + goto err; + + if (drv && drv->restore) { + ret = drv->restore(dev); + if (ret) + goto err; + } + + /* If restore didn't do it, mark device DRIVER_OK ourselves. */ + if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK)) + virtio_device_ready(dev); + + virtio_config_core_enable(dev); + + return 0; + +err: + virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); + return ret; } EXPORT_SYMBOL_GPL(virtio_device_restore); #endif @@ -698,11 +695,30 @@ EXPORT_SYMBOL_GPL(virtio_device_reset_prepare); int virtio_device_reset_done(struct virtio_device *dev) { struct virtio_driver *drv = drv_to_virtio(dev->dev.driver); + int ret; if (!drv || !drv->reset_done) return -EOPNOTSUPP; - return virtio_device_restore_priv(dev, false); + ret = virtio_device_reinit(dev); + if (ret) + goto err; + + ret = drv->reset_done(dev); + if (ret) + goto err; + + /* If reset_done didn't do it, mark device DRIVER_OK ourselves. */ + if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK)) + virtio_device_ready(dev); + + virtio_config_core_enable(dev); + + return 0; + +err: + virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); + return ret; } EXPORT_SYMBOL_GPL(virtio_device_reset_done); -- 2.43.0