From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 98D2139099A for ; Wed, 15 Apr 2026 17:40:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776274842; cv=none; b=OW56p8dWzo1IoowdidzMuJIopVb18FGYAV95kGFkw0wB7HdHxEk5YgyGykGqosQcrFB75SIv5bFwQsw+AySAjEPC9jDxKT0eolLk80HGKYz/YBSaiZCdRY9j5IPW+FH5eYXeVD8HN+zuf2GMgOIGysbjzv2xQRE8EJAwRRgoVew= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776274842; c=relaxed/simple; bh=+pHt1PdX1ZX2M9ksmMWjbdl6LSzaUGO1nZKoaNMIRv4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m7PMB2fvi7Vxjye8XfnI2X0UgesZebKPpy06aJ05k9nIjwZMPOXVPyhUPbV+qHCbRPQ0SFm9IwUDqa+pgS4shJdikFFUYXrGyH9XetpmU2/+iHH+ZSt7galP02I2O8yTsCnrkoUwgxhRXX0n1kzb3EOBAUNLMgCOVlVzOQ9NhRw= 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=eEY372HJ; arc=none smtp.client-ip=209.85.216.51 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="eEY372HJ" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-35e576110adso2598690a91.0 for ; Wed, 15 Apr 2026 10:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776274841; x=1776879641; 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=qk8GKpbjud7iZDAxYS6mtLV1J/SUvTNFEIEfpQruf8s=; b=eEY372HJdQdUCYXg9m1mpMmTzulu43dOgQzV8Dn2Njp0YffsjpZRuQM98tD7JXqytX 4ddHjzsfUef2gXnDEpqHNZBhf+cTWCCjYe+5h5zPaGZ0oRAwnEMfq6JFLtUYaNeBEnur c1wJ5jpDTObRTul0g5Le/oSoimhEwUL+9VbCM6kIrLz5l6AA/9UZaTOCtxFsTUIGr5xr DlPFyF3VaKbwbt9MBHWZZVFBily0n/TxXb0pYRHVNApNCGQxrOiM8NJ5F9jaEWpwfF6l bBFE6jD52KL4WcMcL+ausMXiHBEE4RucE9hMYOzg+1eKDycyuxT8LCmgThoSv7Bp4nz3 d1Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776274841; x=1776879641; 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=qk8GKpbjud7iZDAxYS6mtLV1J/SUvTNFEIEfpQruf8s=; b=f+lXTv64r1yPcc+j1uBSws+mRrRzNkRgxExZs5au87ipgaftWVH/b09gK/c7dB3m/u aHKEY3RPKZ5g4/3vQdi7yP6C3ijqrWXmMqyxCj3SixAPoXkiXPfz+SOv7HmlzOzFWjDS I0dYIQisR9Gd2+gLd0zxub9C/5mRlTK6NUF0Obx5cTT4383kvmawxMsiptFkie992uJx LBPGvqkfRk3pZCOdo4I5wUFL8V8fKxkEmGqu4vohenBlV/9HklapQPLsYr1Cf3JlQ4uj QhMXVWRmY7UA6qpvCtH5cd3Vpg6cVV1DEh6xfvk/B1nY5qEcK1dPaK5z/dnuhuwNU6co AGLw== X-Forwarded-Encrypted: i=1; AFNElJ9zfWhBHYJlGlsjQuJA3CEp6wEO6HOsFUE21SbTO/PRxDST8JhwL1wZyP48BtV/VHok0eAO49ebrIbhXL0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2mt519hZgo+4SbHdnZzt/E+DErB8/OTJiA2QGcBiyZnKYw0xE ZT7YZKAEday78/VB5jX0b4d1c63uD10b5oMfLX3EgFtouUbS9s0gzx2l X-Gm-Gg: AeBDievMtWy11XVk7VpdFQit0pf8hBJtmTBKB3XC6Nr0lenPn2oX2xbyeZvmmSm86wJ yXMBbc720s/lejV4kJBzglZQqVcT+ZtuYE2PW9hsM980Gra1hB/KB89yo9r5yWvJptrNAwnSj/z yDLvf0KjuRaC4TwmIPYKfa6FbG+dC1BX9MskLRBdNPqI2V90SdfcbIvQe3wASksMhaCOdEgdpLm HrHXBPfD/XQVwGhyvZoplgddHUfPyiru9+YuCiOU2CUxFvB708beK2e25rNb0THzYMg5xo4deFh adXFN9DxKeqvbgpmzhwfzBMccrwqTXQzM2riuKRB2wtQXPC4u3NW9k9PJsRxV/usJeoaKb8IpQK ZRCd6T6dgbkYK5BE4G3wFUkWugGZ+H5CUw82HRs7V2zYrF1B7lC0uAwqKBaxYPV2xwJHvaAIisZ onoFyCb3sEynUjPEpv2nfUX50Yo4LNiy9ZhYF1euyGCAWYvLQv+tPo8bxVW+2B7LpkQxE0JYOgE BpiNhkWEig69VuIZGr/MoxLO4EStKB6xLNC7Q== X-Received: by 2002:a17:90b:4e86:b0:35b:952c:43ab with SMTP id 98e67ed59e1d1-3612f2ab68cmr375051a91.4.1776274840928; Wed, 15 Apr 2026 10:40:40 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35fd1fe9b50sm2891026a91.3.2026.04.15.10.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 10:40:40 -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 v1 1/4] virtio: separate PM restore and reset_done paths Date: Thu, 16 Apr 2026 02:38:30 +0900 Message-Id: <20260415173833.6319-2-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260415173833.6319-1-baver.bae@gmail.com> References: <20260415173833.6319-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 | 78 +++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 5bdc6b82b30b..b0668434ac21 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,30 @@ 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 && 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 +695,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.34.1