From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 09DC9274B28 for ; Sat, 16 May 2026 01:59:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778896750; cv=none; b=LfCKpBTPkxtfrPEC3rD5OB208+p9xELbD8F5//tG9BM2eUFXFSbrkwWojCsV2nYt0rwZ0optLKzJLOT1OSX/2Q4LPxetXmliyzLyFcdGq1inQLTmbXBFTy75WsIqFDxhZLMeqfgQC8AfPcAnGxxBfa0aSjN5II0gCaNuhiPyH7g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778896750; c=relaxed/simple; bh=ulMWHrhAYz3XNtX+i0GVY0P4shlVGl/ceK8i2vNkHzc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FOJAta8YnACkIHHPwE5POEQkmOqu1rjyTHKYd9po9DBarPUjGd2k5D3o/ALYKTf0BmF0zv84gSqwjkmXG660IRBsZq5e7z++/R+tA3fKjqAj0JUvxqx6CEBYl4hZe4FGihhKrvi0A98HIU39RJulVYxEHZ1kvdOwOlzFx5kWCWY= 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=g8eC6Fff; arc=none smtp.client-ip=209.85.215.172 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="g8eC6Fff" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-c798fc1a28cso145950a12.3 for ; Fri, 15 May 2026 18:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778896748; x=1779501548; 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=xmq5Cc6TQnVHvbEbh+VotFn9s+ga18ZxyIwreXpUesE=; b=g8eC6FffWXHuWVEqj677tUVbIbBybkVlfmufNVW/+VjAXDQf0dm4YTj8vNgdBnUG4E gx+6iuSYUBXm4/3WCi6jqbPZil8TCw5OiQcfaZOKpk7Hy0Q1LwsnbqK2gcRXODfEmYQY KVX34SN7PxuuQ9xQaSqftWgcKXddEPju6xTCWa2S9Ej+iTjVHbKK3Xbe72haVJO4cEfN La1vGovE3tut12m+kCbB38bTOvmZI5BaruLvsO2W8kbujyh1m3mklN9LiX9YM9tMAP7r E7BxJUA7bDdv2JjpqE0RvZJOd7aohnVy0QiGQJG4rb+6MRO6II2ngvCRPvFgpIDGW0Kx SGBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778896748; x=1779501548; 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=xmq5Cc6TQnVHvbEbh+VotFn9s+ga18ZxyIwreXpUesE=; b=Yv9nze5XNVGAq9GkzFqhhnZAXJRe4zrmpF9xiysp0Ig5j/fdPcEpf/hJ7k/Wm+IWpc acvpS2g7CkfObeno3hzaK6s5Kf32Bf4IiCg1cthjWOZ9Vo3JhApVy6NrrfJM8aCUxohe ut79lY/iskiPDUaltBaUAKo2/McIqOJmo1pK89HiPzFxe8k5aEph3sgO7VKnq8Nlue6s FEwf5hjcp/vpWoKUdO3uSCZ7lMBk0FI6Wr79gk5ujA94Gqb+uemGjoa/XVhW07aoyULO yuIZ42LBzN12IvdAdURn+Ad2iIXSb3ujfJSvQZ4kHS/ggxz0uc8mHiW6nTHiiK61Wg8m fBVQ== X-Forwarded-Encrypted: i=1; AFNElJ/xvagDnPsyD4jbAFNLY3TYsGtA8OuvbS01UAlyNvlhwr31O1IRO71HRRLRHR1s9nN/2yt6y+rTmM7DwPw=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8BcnjsGPVUYzFW1kM/5cBQz/MrK7D9aDbNmhHzAVvWty3xr29 IxHByeLc1sdovx80ywi3f7fCD3SJ1OXv8rFUEIt1Nwt3wuxW74WT6mqW X-Gm-Gg: Acq92OEsbzFGS6g7j07vjLxcE+nN5rHg0LdPko6K0zUfpL9g9MOJgs4BjSBRMQ5qXuC pWGDQLbMytIf25EG0xorrNpfnCCiPSJnOTi0NAb8CoqjzIDMRVVZL154NwzRzW+w+8iKsosSGzL EBgx9IEzGZ2OQiCDW93LjkACbJ4b6McTsDSrhyFmcyfnNFrrHQ/kdnkvc1oof+b1LjJWUH53/Zy 10xI69lDzLgUH6EUNTu5jPeCpJRE57CQvv3LI2ft3PYrhLG6j4kQdNS0Zm8UZxuessszEkbC10m +FClsf8rmcEko3vMQmUMKUPhZQIJ4lYWgyDgurth6OV6B+64Cdz9hMmyWikjzuyu3z2NoCYMh29 xEIiUtvsvl5zKWDI1gmeiOr6qm6JjqRhBuSr2dXExqqyuoIWd05r3yvGgMVsLIcnOIQQlNpg7ly VImCoQanV8RPzfTEi9BMDbkqMP6rKyiiDKYJmqxjTyxtNshBz9R+Dt3THGlgAGXi6xvvVaqUP8B 683kCkj/lL5zjM5hh6xgrBBFn25jMjPjYLzIQ== X-Received: by 2002:a05:6a20:6a04:b0:3ae:b670:6d35 with SMTP id adf61e73a8af0-3b22ecab6f5mr7688061637.24.1778896748145; Fri, 15 May 2026 18:59:08 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c82bb07b007sm6605080a12.11.2026.05.15.18.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 18:59:07 -0700 (PDT) From: Sungho Bae To: mst@redhat.com, jasowang@redhat.com Cc: xuanzhuo@linux.alibaba.com, eperezma@redhat.com, stephan.gerhold@kernkonzept.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Sungho Bae Subject: [RFC PATCH v9 2/5] virtio: separate PM restore and reset_done paths Date: Sat, 16 May 2026 10:57:53 +0900 Message-Id: <20260516015756.20948-3-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260516015756.20948-1-baver.bae@gmail.com> References: <20260516015756.20948-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 | 81 +++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 5bdc6b82b30b..98f1875f8df1 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,33 @@ 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) + return 0; + + if (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 +698,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.34.1