From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 3B0133C9ECF for ; Tue, 28 Apr 2026 15:08:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777388892; cv=none; b=i5GEpV9Lz/x2A8lLyIuDsMJJ+6Qx7Y6WmlG6J2ZHunt+OGJplX9ooYyL9+cuFCPfaK1dTp5DS7yOyb/nlR1+WLnL5dsDsv/CK56iS2VYKb6Okygazgy+SK4Q6Sn2zatYlv1xj2a4MR9MYik/d7HhWA+8tomtKebDVRjFQcAXMd0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777388892; c=relaxed/simple; bh=ElyyymLN3BzEU2n3paseyXgS1oFdDA7FSr0KdZ24I/8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bfwEtcfFwY9FGbuRjWbrmluvEJhB/f0LdOhaqLbFeHRwyQ+zhBt/BpJPsWxT+qWi2rgB+YYihLmetlMnszL7UcPfQSme1Dh/nAUNGxV+b19ERgAKlWpnxpxEFcJjbZDBUTAfOy+ySwP4ryMeiEUhYEqIbN01RBX2tnagjGYXX4U= 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=C7Ys/wOh; arc=none smtp.client-ip=209.85.216.51 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="C7Ys/wOh" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-35da9692ec3so9715342a91.1 for ; Tue, 28 Apr 2026 08:08:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777388890; x=1777993690; 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=lmg393/U6YNbXTTx1LhzYWJYt4NvUfYyO+r0SFXM9Jg=; b=C7Ys/wOhA3XXdikR7lrjjTgInVnwbkeaFp1kEdSgNNq1YEFIHqLCYHcsMxQvFPYD5M bAFJsqt9QvP+fnDWuFtMG8sQyCy5bTKecE7IZ9vI3diGVQ+Zap3tow/9QbLpkVG7xdx8 SclOuPyrBOOEaJkehUhcLZPLDBM/fTnn04O9ILh3ElzW9SeyFrejYE1/9E4flsxbXhdT jmS9cFvh5t0qAbQVmlAaKCBrO4dBoAqvSAf3JXv0heOnbBHWeekwhySXVQbwLcRhKjlM nvmKb5j8SAAzu0mjs2Dd+rGDB3s2ZPtgg9/8OXTDEajDSkHtLiK9cc0NgwCWwCEsalon xIkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777388890; x=1777993690; 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=lmg393/U6YNbXTTx1LhzYWJYt4NvUfYyO+r0SFXM9Jg=; b=BE5dsWls3COARAQcxp4OOpUxCUpr/u73apAULKjHLSkIgnbeLSSl5ymtVctA2TE7Oj sghpzsYzPdhjlGaPkhvpwfDsXwnpsMnesvtahZDQGSx0uFWlqQeCXCKb+h6YoVOQCJrP VGbd38nMge38pnNFTXgrFoBbffW5uVShkmyWAfr1vhcggyxs4vS98YJORpjuS5xGsV3i R7JVIc6l/Nhv8MVv2fuzBZvDdqJVEVTHmZ62qGuPd0bbYXogP35neeJQgsiC3SVeua/4 N5SNBqII9N8KhqxX5ZAJT2U5cwCBKK734IQzz2MVgtoiQYNFLV5ZZVApEYVm42FE2Fie +ogA== X-Forwarded-Encrypted: i=1; AFNElJ/8pjICaOOhnEsDS3dezW6xCIXxw5bcy0uEbdgt2gti7tlOnEDqp02NcMcCtkIJd6MbsASQ6IXgiq5rIi0=@vger.kernel.org X-Gm-Message-State: AOJu0Yzyic3qaryuQg6xPgTiUSCKqN/6Dfccx4jZioyrkmRq7NiX15Gj dgYTjubGPoeJaO5CzSy+xAJvPUeuZf2xjmxGD5+bY5ICUZwAcnMOSUno X-Gm-Gg: AeBDievikKA7+twDFzo4UAr4UUn1vV6lFIoh6Xm8+k6Xwop1S1ezAtUqo4i7u9x95Ir +7zcZFSKKq1o5mSDid3UCpRVTphl+/s9wa8GcyfuKiqwuCVXfEDzGJJ5qi8lLU//SVW7SlOCHI1 Nzl7jrdYqJbA28Qjjfj4T/tbz4uaM0U4TsAq4FKY8gQRsUjvjQ+46d0+BmwvR8b+0NJJ2j43Lwp LpxQ75fGFJsalCYNHrAWHygk8iA6iEqnSX+sRGUOO0M1OeTQ+9bxFDdIR9HIfrTiXp3sdweqlLh gZbmX+akbsFyKRI7UH3Wf9hBFXg3SazH0m17ShZ3lVbuua3POAG2j1SrocVDJwwEFiDSQ/pyJFU ytLkXMh/TQKIfzk6jKOZNkohK6Vlr617TvRSh1rDU7hb6QiXB2XZ9HnTku+lZmvgswTv82DD9CJ Xy3l4x0k5ozK5GbBAQGDam9s8YV27xUVTrv8eL0NwVRc8fjMxr8o9aQsIbkAiaFBvuO2Eptz79W qIvteMVEOFcCrIEw/XtVE6aom3wlLBn2cNLfQ== X-Received: by 2002:a17:90b:5148:b0:359:fe72:3559 with SMTP id 98e67ed59e1d1-3649202b5aemr4084196a91.21.1777388890159; Tue, 28 Apr 2026 08:08:10 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36490bd66f6sm1606127a91.3.2026.04.28.08.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 08:08:09 -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 v7 1/4] virtio: separate PM restore and reset_done paths Date: Wed, 29 Apr 2026 00:07:39 +0900 Message-Id: <20260428150742.23999-2-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260428150742.23999-1-baver.bae@gmail.com> References: <20260428150742.23999-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.43.0