From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.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 820A13E3C67 for ; Mon, 27 Apr 2026 17:32:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777311126; cv=none; b=mGAGFxhEJhFd94q8NKF5SdntHAiHihxstITQj/j1H2T6o9fAFbONFiM5algwYtko4U3oMC/XYw3rnvJ1lDzjiWZgjuVBp+zBJFIjWK94Y5eMMfkBcT+EIrqv6NXS5dDuzquvlMZ/XTJXcA5pdfRKrAJUw8etDxVsg2KmqzmNy2g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777311126; c=relaxed/simple; bh=ElyyymLN3BzEU2n3paseyXgS1oFdDA7FSr0KdZ24I/8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=d8hg422GqSpSewyLBlOD3i/2vH9EbQn7KgJWlC1z3dAc2x4d9XIZ+PV8S2xySWS3xviBpHQLLZn7QgHdRpc4mfFRUWZ5AKFsLM1GMCJycE6dQxXMpIK1yGb5p+oSKRmXAR08/ugPpFSb6pGw8yFm8swwuHvuV91CnqBZWHu0+UA= 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=SZQ+Nt95; arc=none smtp.client-ip=209.85.215.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="SZQ+Nt95" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-c76bde70ec9so4201225a12.2 for ; Mon, 27 Apr 2026 10:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777311125; x=1777915925; 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=SZQ+Nt95FIgu+FEZNhv2peqKJQh+YPQdf5ks/e64h5vI3ooPHl5TLSL/W4G32+UcnF A3tdQ3XJvZ2+5GuWjQmx5ZVD3x2I40vfTKLd90GoLDpaRv2MDlOz344k3qClNOhTQLbu 7vF5tFJbEkU9+jpTg+82wll00HUFa+L3SzddQQkzlr87QvmQ/YkBC+JoAGYSmWoBf/Nr Lwfl++8FH0dMm8tkohxZmY2F6+JwcRnpG6AhQVS7Y8TPGJ0dkmZEi9n/nWmIUPDN+pDY 9ex5eWGLTDPZIxZXCLAt7DCE9yefkRQvrtXd1lo3A7VKhWnrSUhoInOa7/9mRQvLsa7O oUUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777311125; x=1777915925; 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=WEAt9v7LV6jc1Ktw4WaRqghrGZ1Chc5UMmuSFz7HyVqploUI1Bi6liuy1/PoK6Tpoq I1RUd+mD6BiTZJ+pyt88MizzCwAZY7jzILSrpc95uVP1qR/8Uqt1XLVf3mT04kF0Is9p uFMSibCHa7HzUiCbZ/d6xHIxKjzbwjxkUNPTw5jDkhxV5ZaigvwLJQnCbvTudN8X3rKM 0wRjZRhWdePtqYdeO1Ro3ij23P30Q5gAU/7Q7HzUu3L1zXArlbD58o1L28f1Qj2AaXYZ wsZfME0LzQQJBOB+BDxskoz6a6qZUNd9QzMCJlBuNWFHuiQpPw+3aMlM7rGniKtjSdMA 9v7w== X-Forwarded-Encrypted: i=1; AFNElJ/14optIFcGqKzBDZ+da50dXtMCDarEyhTAOyYA8GbRwidl51Nv4NURsaF87IWxBiECwdF4xnlAkbppKzA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyy/lWDB3SgqXgT5/pI7L+qqEhHlSXIcyXlqpXsnTTv6Qwe6/pF j0I7jBw6A6/tGx3/gwiA3VL3dEGS+TkxdRJO5m9yZZ7Z5vZ2e53FNBx+ktlYl6ye X-Gm-Gg: AeBDievW9P0Sr1lpYO65Ffp0Zh8YnloHb6xTW2VSQEAMQDsJxslyVQRXuIYb9INFKyZ Dpo0hsER3xG6OI+IghgxZV+Fvmf8jRjJBlFUJYrYlMFZCmGEcKf4VyDp5XqME7gObi3tpSroUg0 heXlzjlikXEbSNpByz+kKKYMYsIy7yfpRF8+R+kv6exs4fLDLeMhQIu8fGcrURJi0T6z1GjmGUs teDJ+FzDyyqiuazcYGY4Fdw+6UHM1lABY4anyvrDZITih0HhPYvQ4aqC+GgCBtf5h/jxN1razPf d2sEvxo6MgeCh3HUnzoHRVG/Kgol2IzVzsYH7F5Apv/kU7ucxiO0PeMfDxu6j2ZdhVb5/TT9XS+ nR/N/AhqEXudMLHBuadZtXu463aFffbKy1x2LQr/kIwe8HEqbTzizPqxkgSSCKMKVGiIJTu5RQ3 bVtETSCEfL9CP2M/WhdR9aX0gnYA1sMKUfJxOMA8l3SYmC0XltcjdIMt/lF0Ubv+vGhPFEEmBt5 rus8jRHPk2qF3gxDglOBZ1XGlKBeZfgcqs3ug== X-Received: by 2002:a05:6300:2713:10b0:3a3:1f85:645f with SMTP id adf61e73a8af0-3a398c968f4mr251771637.18.1777311124796; Mon, 27 Apr 2026 10:32:04 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7977031729sm26246246a12.25.2026.04.27.10.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 10:32:04 -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 v6 1/4] virtio: separate PM restore and reset_done paths Date: Tue, 28 Apr 2026 02:30:42 +0900 Message-Id: <20260427173045.28652-2-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260427173045.28652-1-baver.bae@gmail.com> References: <20260427173045.28652-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