From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 4E90520A5F3 for ; Fri, 24 Apr 2026 12:30:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777033824; cv=none; b=G7EbF/mlprTowakp6KHy5FGJx+lS/0arKEYhdsU/vm/J6nSKvxilvJQIOppLnCd1cneaUwC4rRqNJNHOaGAqiSZkdDJSBEqwLJq10m+FlJNj5H3fdqap6u5JTpIGxFbumb9gaclIeK0YzS/Bg/TnhVaLyg4sxnDX98YU/4AU4Q4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777033824; c=relaxed/simple; bh=ElyyymLN3BzEU2n3paseyXgS1oFdDA7FSr0KdZ24I/8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oVLMeIEUlRKnJSGHiUq2UFFR7whGTnq3aBNEFVUbfqsHm8C2zh7SMCSv5M5RwbknXe8z0z4GyIMzgPo3KieOo+ozwZhTlCWx73fznhquQVJkexR2MOOly4Zln9Yt4x+u5neF92CFAPby7i0D/Tl7a9kpjiX1ODlAEMZMXUhtFTo= 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=ODpg/rZn; arc=none smtp.client-ip=209.85.214.176 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="ODpg/rZn" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2b24fdac394so75542135ad.3 for ; Fri, 24 Apr 2026 05:30:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777033823; x=1777638623; 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=ODpg/rZnA2eB1B8v9lbUf6fBPCcngxYkXHRgd92LHENxk0lvHL3gSQY3CnbJqLCwjs VSLrD2hkliMMookq+xb70o1JqliHpjLku1LVAGEAbSDtIY9Ww3e8FP2KSpu1dNFcpKnR 1l2CmAYhw4bKlElwvN6qziXsHHxvYkLxAZ/9tu5FVeLS9SIcaJ8XJXRP9irX8MfrYKTm fL10r3U80N+ghQnvPsRs8ULqbsFSW4bRNfiYp9ynHYnsKn1WyL773C9n8hqB0EATmaQj fbVsnC57pQYCQY5H3aKj3BJQdKuOH/aANYag9+l+lUrpwQZMRhPAUeVCvddKq4SqfTkI hqCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777033823; x=1777638623; 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=jDcCaF5+N3ivMu2/8uygyZpej3sYJ13HqoMuNLNdmPlgKDg28iZMi6wL8qMrOZ7Obx smsnAuNWvd73w/HW/15CcXowMC9RzRvhZdQZZSOow3IGgMEbMfI4+6+fTPqexuiAcP+c u13aYEfI4l4w5dr0orht4F/es76Eg2/IzOOni1wOdav0gj/OMl+imwOAn6Qt1JSzFFZp 4eN4eF3FpnP0U2eMr/PT/l9KWa5niZxqwLT5GX4oLf4kG6N+TeVuVJTFh+c2SNHdBtqM WyeppOqnpon9Gy9X+w93wfA58c6bIANwc5fa8L52LP3nVB6muX/+fQBAxEQKTy3+I9PG 4zTA== X-Forwarded-Encrypted: i=1; AFNElJ99+es/l88L1U/WvbwFINbFcN+zh8dF5oYY7rmqVtpLmt99OF/VlLk6GFJ/lfotG4q2EU1lo26VelpexM0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw33TOHUL02gu0nGmoU+3NJ0eoO6cD610c2EOZCeAEU6X8rSTRu twnev24UoOajFnerbSTKCbxYxCvjWJXJ6ekIoz7iND4M+1XrSNn2uBOv X-Gm-Gg: AeBDiettLq1vCNcoRsKqdV6Hh53NFToO97EffGiZWcXK3xfYBbTIMfLTg+M8MulpNy7 KebyKF3zCo7omnFt5OOPAwCexqd7p7cK2ItH7BNbiYmJizwY2hPvAYlqIwGCBszkxasyNmfN3GZ ENbi6wC+xexiKGzG64hC3ZPUYVUmKksAIyNgT6BYrA7JstZJBEBQ/Wsg0/KSl4SZ7+riR9nQakT +sQkzNTyvso82y4z9QAokJLJbjDU8YLmPPZYYBQHle+Fmj3rk8svS7dz5unMZp2A7aBk3Zutgaq VkjIl91l9tN8WqSgwC3O7qyf12tPSLABAVh7khXojWfZESZGiRmB4fU3n/CMolSNAlE24ByI91y Nv82et2kFA9N29+gqpceMQxf6V4otSEKdci1PqRJRQY3DHOUR9/tqzl81LxyPcNdhOvB7u8sqmf ooXjTjk7G1QZnV9xN8TS8x2UkpU1xkGVrkOz3aFBhhNlJmHZWdrjgroRPmxtZZNED4HSXeC5RG/ GuNwGdUG4nHmwk5XZxdd2qjik02BKxV50LcgA== X-Received: by 2002:a17:903:3c24:b0:2b7:a3bf:b2a0 with SMTP id d9443c01a7336-2b7a3bfb415mr82719095ad.5.1777033817771; Fri, 24 Apr 2026 05:30:17 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fa9ff734sm218006415ad.10.2026.04.24.05.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 05:30:17 -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 v5 1/4] virtio: separate PM restore and reset_done paths Date: Fri, 24 Apr 2026 21:29:51 +0900 Message-Id: <20260424122954.273-2-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260424122954.273-1-baver.bae@gmail.com> References: <20260424122954.273-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