From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 9536F3A960A for ; Thu, 23 Apr 2026 17:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776966057; cv=none; b=D1AmFov42RNdAnQrstfm0yNDrA1eq0h9RfcC1WrTIxihJDSg4tHlvL0hxy6DFFZkHIOc/WOKnXxBTfQJdakPEExuPwbkQuW1W44R6wzPMSnEAmZP506rw/AyXe+nMuBTuXaoqYwxXzRDWl9U2DiHUGt+K8TEx1wA2K+xhnWsOqo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776966057; c=relaxed/simple; bh=ElyyymLN3BzEU2n3paseyXgS1oFdDA7FSr0KdZ24I/8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZKDi4+mFeQSIVM2E9Yohn7HgXY9z4hBH4MrJGpo+FOO5AxNP3dvRo2264PGSSMCdJFtpWWrDohBUjGdNK04ChY8dXgQxeqYkKtcUmHXMExHnQMv0Etg5UJtLZ4lv9ULrurB2/z1kPaT3DVz+rioedl8pDpItFvciFLrPiXC+igM= 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=M5FLU98J; arc=none smtp.client-ip=209.85.210.170 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="M5FLU98J" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-82f1bfc9b8fso3217682b3a.1 for ; Thu, 23 Apr 2026 10:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776966055; x=1777570855; 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=M5FLU98JnBuSFRRrLhhSqXcGo6WZgWHe+5rZMWyClQx+HTj9UllxGOQJKnlyF0Owmt dFVZdBPH8RdDmVl9z3nEnJEUVE2ts9yE/wNYpNhAP4yn+Gupdi8QhudTylPK/w4eqqY4 kJoOLhOYGw7rW1hC5sK0pFfFA9x0FztoTwxYBxyec+q+FJ5oyanuamhpLexnEPt56KUl +vjQYrlrh4DTEVFI76V2pXXV6kbswr02VTEt+jplicyQpCb4G7yr+HreXJnkPEvOz9ow Z78XvXE5FPsVVBRB1QZNeVkdQ5nG6On+BseehDg9AXy7AiXiMwWhkCF5KFskS9Al2GFM OuoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776966055; x=1777570855; 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=dw4d/3v+S4c08p47f5wqU0oasOlj/APY6+TVzL483XJAHdQ+n8Pt+bX0NDViHwkvoB G541MkLo6Yur7oTQPuN+p7fAfLnLzTu3xMeWc5mSChVLHFtl355PnOU+0vPMh/ovJdzQ D1J6pG2/4KlHdWjJ2ZWU7xHKGFNAbbuO7uM9MMxAYspMLBh31m5cbWrPXIlg2w83asZd 6zzOTeVVevuT1ojWeWTBQOXEQd7DdJPT8wo05JjfzTutfBR7BfqgDrohJ4cUtA+oXreX Spwzp4ZAneA/A/tUzIbu4uIoCTx8aOYYDpCRB7TfxkonKAIoQG4w9jJQEUGkvroTfj8W LKTA== X-Forwarded-Encrypted: i=1; AFNElJ8tmcda3nmwgzs7VjbagCDVuo/dx43nPQEWgw6pFtmVODVX7hNmqkDuI9TYFxBJmN+4TN/F/F6tXmTHDc4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy179ZKDKdmQv3RTthDh/9ScupfPlyjTIj2FqjQhgdq2yn+XCSY PXBFxA+jTUCpkAuxbYOTLBH1TcAZWYRHsHva627lbqIkvlMht0tm4+3a X-Gm-Gg: AeBDieuhpFPOK/twuuKnhxXmmHtq0Og3svhZ4xkkMA/Xk3pi/Aj/QFGQau4Qy4F8RFd jVwlyL/CSy8nuN4OSITZQFtJaaJUFON6bszvSP+R5jAR9OJe4YNppnecbrDo7DIeUAQ+Lpgl2G9 oi9FMT0R6rilYOBKnGF9UA+EdzJn+ggNf53pUEAq/IK/mDBWtHJET9SzdfSxc5LWSZ6ttPPsXoK 24Fpmgud+EnNXIfASw7X/0rNq3M+Crfic8sd3vaWVHHtY8AoMzl8Q9HuuoMboW/p+WIqAFO6EuK h8tXT9YA7Exq3J54s8iTzRlL4SA00rPLqYclC4hR9Ly9EFEVsOWCG6j2no8FYkT/tUvQYMTDRTv tXHMio46IQhwHruJNHzkxytfU2x7ypmKL4w9aBXCOL9sbb96thLGBq5zk556fJRmin71zbmS57U x6BxTgeqkR/7eeNK1zYo/zjEOviPxNO/1M8joY/8MN4157AAG45jalxPpkpco5bp1waD+PBIdM2 8Vr9akURSOvDQunn0m7WVD4kihBQtD9XtdnvA== X-Received: by 2002:a05:6a00:1ac6:b0:829:8041:83f with SMTP id d2e1a72fcca58-82f8c7df387mr27720535b3a.7.1776966054769; Thu, 23 Apr 2026 10:40:54 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ebcc9easm27014498b3a.39.2026.04.23.10.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 10:40:54 -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 v4 1/4] virtio: separate PM restore and reset_done paths Date: Fri, 24 Apr 2026 02:40:36 +0900 Message-Id: <20260423174039.276-2-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260423174039.276-1-baver.bae@gmail.com> References: <20260423174039.276-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