From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 78E6E3E9F96 for ; Wed, 22 Apr 2026 13:11:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776863463; cv=none; b=gQUoyVR31DUvQCHxRfBaJmwycgV3Lgh4XI0rqDlYYmCabo32jSVdk6QUu2wEB4CMEW49t2bYCSSi+JyH4NGS1gkcUEtquunMUv8PDxXWW0QZtXUTj3CD9TyoyWHbnhdu4y85o85zyXiloHwo6+gW/2fWqbj4aV5eRaAialRKXYE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776863463; c=relaxed/simple; bh=ElyyymLN3BzEU2n3paseyXgS1oFdDA7FSr0KdZ24I/8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fJiLeaLHrarPcP7kza8d+JgMh4Jyxl1WR693LqK+a5CUkOy7czr2bVeqpRFSXYJZ5NSHiWAR+LP9a3SgU+YtsIfJvYOllTP3apvw1QnJqqfCM7vnWtn90K9ov6596Ko3geuJCuMUMJ/67zbUtBStk0GeLz4MdH+L1BGrZLnU+4c= 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=mBMolH2C; arc=none smtp.client-ip=209.85.216.49 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="mBMolH2C" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-35691a231a7so3695257a91.3 for ; Wed, 22 Apr 2026 06:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776863461; x=1777468261; 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=mBMolH2CAvdqXCLhzBxm0yZkgERl/qTHm4eChkOWqM1wwesmM3/YCgJ/teFK31fzHw nxMobuXXBNw4M3Coz80d6WK04NAmfjcMOyVJ0gLSPsNjP2TU2xem7afQf7SpcgZf/eB2 hFHK0UKLpJYr3IQb8VN/ewukAWMhBvgS8H2WMOEKkHMtuY1d+ky/j3jmEYo7Cox+EbXH HpHihg8wn0puYBHJS0jlsrUFnyEDCbaihbMQ0OgSBH2QzM5kIeXirh0N1JN8rd6LlCjY cGDMJppyAlNPeW0fMSM6Yk4JHB0vGHtguzQRFzPXNpP3Zk1AG/8A8BS3IxfN9+7sre2k YXlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776863461; x=1777468261; 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=NPGmqVK7bflcYpmdgEldFod0eOL3dUC71tCR/FxQQ/5I21LAdU5/3OmqIQaRhdkvKB qxdQZtLVx4V9lfZ86c3grsDbKf5s+JkljMBV4axitFdMqVZ0wZQyq1u+1KzlolfWTQam GNpGb67X8q+RDjy+EZ+WVGFoZpO4yJCHtC+Xu/j95s8W3Epnlez9YlWIFnfOn+1H3jtR j2EaK1EQzCO88T/uPKqedsbkwsGtveSA8AgIN3++aB809bxKNuz6c+mtSe3XXlhIYHTE eCUA5MmfoEafgtT3zrwCXL18ov8zIp/nWOh2QR41YNVwNukG7WYsoYMkUboL1/qdZcrS ZIXg== X-Forwarded-Encrypted: i=1; AFNElJ/O8X+EWFALOXIDle9+6amJTRy9bUDXoCkLE6bCviw8g/dgwJf+unm3VibsAF4XmGAXiPBteDPfXl5o7cY=@vger.kernel.org X-Gm-Message-State: AOJu0YxG061p0zabuEUZDIw+ThhVbh1a0A4id1tcPyQs1ebJlKvUrrXW vjk6sUn/N3BlOSWsMH3EHGiQnt4xRyxuTEsn91lgtMJMxHJc+7ZAXGwP X-Gm-Gg: AeBDieu1RtBF4qBR3c2o5LEfyzQD38UpoBi4so2bmwKh6hAL/HoGaWWiXw45X0dh/n0 XjB3ZnBcmgTGfeudYda+/9iMQZCF4+HMHVQRY397mYsokFuhglTZt1tx1vzKE1pQtWfxC5xulqA d+Q5GpQGqW58KeSziwe90FG7spc3puWsXlptegT3Aw3iR/B/22M/ehsxChKK6ilJcFE+NI++OGo N0RLsLgIpEkU8gVCIOPLYOio/5cnYURBLmKDefvXI1nygS8FD8RTeWo8MhT7HfjSGD+fqMcU4nx HNIPuGwBN+rDQl5IBMRF2UyXLV3vBC4/AtDRvhD6h/naYquETLS1AFFgmsHu5MRY+iCNUlM+7c1 LC7cTDGqmf/0C+8mFKfkbBw5xKVhYPj0AVmNjnn2PrvVuuIoa6WGOQUo4b6+kIcxFKamdfBsB79 SUinecRxvEniRHZNHF0Mlre4pFe0JucpIsJ620b5y4RMSNIHI5RJjGnM26c84LEEvc/omTZhNUD Ra3UTBb9SFtAULB4zVc3o6tbDCYRbxCT4tW4w== X-Received: by 2002:a17:903:3204:b0:2b7:895f:407b with SMTP id d9443c01a7336-2b7895f4214mr64124515ad.21.1776863460366; Wed, 22 Apr 2026 06:11:00 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b606ce9891sm127892235ad.83.2026.04.22.06.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2026 06:11:00 -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 v3 1/4] virtio: separate PM restore and reset_done paths Date: Wed, 22 Apr 2026 22:10:11 +0900 Message-Id: <20260422131014.956-2-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260422131014.956-1-baver.bae@gmail.com> References: <20260422131014.956-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