From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 39D3547ECE3 for ; Wed, 6 May 2026 16:24:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778084656; cv=none; b=uymS9Jg4/1OQfBWTRTsWKAw+qOhqDkye31r5HD8cO3lJj7pF8yWdOGNImB6u9O8gJFP/mSGs2+K1nl4XpG0CtBW+7PtOaMvo6fQA31o/joAaOzsWump7rTJfKmrELGC1iWYrL/S8Cnp1Zi4mGdjqYlDiJIBdGiNUrJZPT8+oraA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778084656; c=relaxed/simple; bh=ElyyymLN3BzEU2n3paseyXgS1oFdDA7FSr0KdZ24I/8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LDYiLSy9rnbhRUuGiXM4gUGtUb7XKLV+yvMrGzFAnkxW0L2X7of3WtsT7I2IFKa36POZfMtreX0o2lqJjBe2ILgHgZdPKU39kHNcSFbbobKWtOIi8W/JvoQGoTnX0UlenZ9nR25JggxHOvEXzuc0YCtMs9wxhHM+2dJp9HyBuJs= 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=KG4ZVS6M; arc=none smtp.client-ip=209.85.210.172 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="KG4ZVS6M" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-836ebdeb969so1693966b3a.3 for ; Wed, 06 May 2026 09:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778084654; x=1778689454; 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=KG4ZVS6MZbPlAza67aao799w0L7npBwOUwVFWlepZ9pnBRARkec/izSQBx76Q+lOhv B+BxahZs4moJOGLVxHmbBO+UuXMGgy7ibE/np56FURnvml9Mg2L8u4cHmlTzXRgEZmLE mV0MDWJinjHorLRcLvZCW0mXgql1hylSWJwOl92Z7TNf5wvHQJPTtxMHYqXV2rh4cJ97 CMNmgH4KEcFl3Ki2h5+V+RCokFlz+lRR4DfFsh4cG2Icgida7E8Ft2eWZ+TmfSogj791 H0BH04/dINgNlIoopy7TSFWaQ/LO1b8BBivpOTXNF+giorG+Y99u8TqQuvWpNf/oy9tH shww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778084654; x=1778689454; 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=cucgMb2Ham5yvV6M8Sz0GZWO8CfMHTanWALFkO24itKnakpgKePYljPX8lhRRzz/8b ttcBYtnvPBvTB76dOdp8OZZsYCs4Zgb7BrqmMBDxjCZUvQxPScREOZJ5H5qGJa34JVKy hCRWq+T5+wyFBASRXU3sZpk8S3hOGT3ZXZIemYz0qKXT575hwnFHimtF2PG4MA4ueRQs vGanYgH5qR3NBy/TllZK27fIZo7Lrx3kBX7s8B+liRox8hunCeeMENjY2RP2srlv9Gdw hDfAj8TUpt4E7Li8xD47NhjS4S/8tLc2UVElVYR8CJ4CNMHgS5Va9/+S57rHKgqXqD3I vhQg== X-Forwarded-Encrypted: i=1; AFNElJ8mVesrhrRD0rmLPWdoR2U/Nw2WX+eI57e0Mtch3Yr5GOjEecChHrQOpGJKkZBAnj9ZGA9VDW/bDCY0c9s=@vger.kernel.org X-Gm-Message-State: AOJu0YyAa5DNt64uBvAGVeXaftdhPzSj4FmjjboH929PVDpSaAnO/obg A6vKPCFv9ElxPVFkC0qJbM8T1/DRLPazmljxEH8D14/2FXjS9zLhUg8x X-Gm-Gg: AeBDievY459ET6uHYAZaZnX90B6g1OoFK/SQ2V7z0y9I7NgSXAKnVXdq3ClvmzgpGra cBM7ipdmv2B4HTxKpV1/hOK86ckZjoq0HiBFpiRHGTqBBNrAqfCilhFGtaFOYRLC5iBEs7kVy1q 733DstmQ8HDCxIATGr5E+3ZPyTmv5d0oLUUA0d74GTc6FD8hce+MBV8mTu7ni/u3A3jKYr6Cqc8 6s6dSkP87tSDJ8e08bPr+/4pw8mch9b8aKrwHMPw1FQmE3l3euCTLKqgDXv0r9HAk0yLkYbHWfo UWqAZHO+0BHIqMtMha3NIG+3+1mn/v2OMgGAI7Ta2OYXqZPR3TA/ZQ+m2WRMiSTC1HtozfTjNY8 H8Jvsf1VjZsgi03aqJXTAgS8ueq4qNiolqoJ/kCd+1w1BDYdQOyAt53AZJxVXNVeWi+Z3Sqk4E5 yP4wm/+wJ+2dE0HKz9XFULI4D+lb/XVSfcQk+v60rM9TmBrzrBd+9PKju9DOrlq0W1abjm2PLWm PqObYh3A7ftPnwqj0UH/8/trXvy0uHa1bKw1Q== X-Received: by 2002:a05:6a00:4616:b0:824:3bd9:aac6 with SMTP id d2e1a72fcca58-83a5b9d824bmr3948577b3a.16.1778084654372; Wed, 06 May 2026 09:24:14 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-839679c8629sm5980337b3a.36.2026.05.06.09.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 09:24:14 -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 v8 1/4] virtio: separate PM restore and reset_done paths Date: Thu, 7 May 2026 01:22:51 +0900 Message-Id: <20260506162254.25576-2-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260506162254.25576-1-baver.bae@gmail.com> References: <20260506162254.25576-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