From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 D41343A9DB1 for ; Thu, 23 Apr 2026 17:40:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776966059; cv=none; b=eS/9fyF03npzWMl4k6PGdE07mF+vCYaKjkxZ82+aW9i9N3a0XTq6LyZeRr1r/SHwi8GYxj30FRPkrf1lIqkbf6vJtArCgzXvD6+ed7wQPyTVSpkIfFRCwkNgGdcZcBG3XwM9ViTh1byUL8jJKSx3V71pQVOanwM9rVhPLWcxs0I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776966059; c=relaxed/simple; bh=Wp+rXTYV6cCR7GQckednAxBMcKVMT6SIRlSrHu1tg4E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AbDyUlWXyj2fiEEFgllRcGVn97TbLpS4uaCC/XfbFHqdpPypn3c8lTbZ0+LQ4bnqJTYlYxWn4CqF0h4s0Y7WJBn0aVdNEU5s5KT7uTcuwe3ax0Tb03gLHI+JnzYG4s1noyJwfUveoWYMs3VpErniRwmv2PxDMwPPhyKlY6GzgKI= 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=dmdfgOvQ; arc=none smtp.client-ip=209.85.210.180 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="dmdfgOvQ" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-82f4a53ae20so5136460b3a.3 for ; Thu, 23 Apr 2026 10:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776966057; x=1777570857; 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=zfrLDAY7+No90zlR6HffZqbGM74lFTvO1IbltHEt5HY=; b=dmdfgOvQIsyETR+//uYcHYtOHE9TZzX9XxGCBLhI55IHg3f3Mo0P1mW9u/vBwC0aGF pAyDLoQTAjt+8bKUvBjiSmcP9A6poKkakuD7dobZQRaJ9a253XAeK6HD3uKA9Aos6kxr FTFBk52f2OXVUejBrW2GOApjIcqvpuyJ0x5085Naw+VrTsEhd95ejr+YXdZQNOCMbbKq XMBk0M3Cl1TVKxYhSHmhPAHzb7oxA2qX3D2RWsP7jLy1yBYOSjFv1qa/zmB2Y22GmZwQ hiJ0gqi3hth9pc6e0esHCTLI8fn6eWFHYR6a6df08i2uRAXUpU+xZBdYkQsNkUpg0wtv k/Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776966057; x=1777570857; 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=zfrLDAY7+No90zlR6HffZqbGM74lFTvO1IbltHEt5HY=; b=pkOpVXc1yQl5ASGjpQIPCxirbJYHVQ2PMpvH5updm0aLjp3gISh09a/86a7bFtvCFw uAK6h6UTVrmw7mFVoXA40Lux19MmbWs6wIXsEAbY2DCgiRHO4282Ws5Iis5V0XjOCssN QYrTkkLarP4UgWSxw/LdUUEhO/C23lMPDatPcVO5Z5TZpVnyJex+aKdV0NkFWifC3t3L +M+P8/nQ2SzOgWZ9pv5IhHM/ngD7mJCwS07+02M4BObyOOoUs/MojU6TsI4nlirDKgVz kzVIbtd/UVrvtYIYye/hipXNO88HruH5ILPcGLSDIER2E6TxOtitl5ow2teABwCwKhHS WfnA== X-Forwarded-Encrypted: i=1; AFNElJ8Es//i/Tgqn7zt0rEPkvevJNepFRInEGCvD1uP/JglXvVtJfceXP3L8WCqxiA80zJXEQ2kLEjznyhfldE=@vger.kernel.org X-Gm-Message-State: AOJu0YwkCp9Ag0/m+sqs9wBYJHwwt6AjIqS1qGbQggCi75+LlnLi3soZ rYsQne47PONDLE26aj0BLW7iw3cZ7iud28J7nwLN1Uz3l4s+JdRR1I0T X-Gm-Gg: AeBDieu0y3Ixs8WwQyEsZIERKNfd3CaU+z0BJNbXHCmTJGJyHJ4ny0Qyp4+uqJuKahR 3E3gwtQdDy8ob3UqzRezIHoD+KhQOmKKj001sLDcznDCdZkGVqN6kNY21TLzZTUCeU8TdNruZOP V4/hdcPJ421T8Ulr9chNdoZs2iZ5nkEoi3X6/A53CllS5T/BtV6OA88NS3IrYQQLzOpBB0UwLrF 2dKynIWBRMhDXzN5ExDvYF2wrtphPGkNeZJyPpWWzoSqkb3z7dauEFmgBgZFIejhL7QUN+FhbOD 6tdrsWc5R3+ZRbNBoi0Ub9qk/gOlwIocMnr8LHUNTTrH1xvLBGTK3KcVl00n7NfsTlVP9nkQFtQ zAxdcjI+9sTLMEW3X2bD7cn3/35av+v5aOfQG4MqghTtBjBjebdoCBQVTfk7vR6qvnU6vQyG6/e RTLFkR6Llxo5FRRHFDGKuiPWAC1jdG+FWhCYC2mlQ654SOM8wPg6z5TXdZdjTyRUyjZPDkoqVOX u2TXjw8N+kRCB+9wIOpxBDQm/axrSxrNM2zyw== X-Received: by 2002:a05:6a00:e1a:b0:82f:7bec:2050 with SMTP id d2e1a72fcca58-82f8c90d174mr30741300b3a.39.1776966057112; Thu, 23 Apr 2026 10:40:57 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ebcc9easm27014498b3a.39.2026.04.23.10.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 10:40:56 -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 v4 2/4] virtio_ring: export virtqueue_reinit_vring() for noirq restore Date: Fri, 24 Apr 2026 02:40:37 +0900 Message-Id: <20260423174039.276-3-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260423174039.276-1-baver.bae@gmail.com> References: <20260423174039.276-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 After a device reset in noirq context the existing vrings must be re-initialized without any memory allocation, because GFP_KERNEL is not available. The internal helpers virtqueue_reset_split() and virtqueue_reset_packed() already reset vring indices and descriptor state in place. Add a thin exported wrapper, virtqueue_reinit_vring(), that dispatches to the appropriate helper based on the ring layout. This will be used by a subsequent patch that adds noirq system-sleep PM callbacks for virtio-mmio. Signed-off-by: Sungho Bae --- drivers/virtio/virtio_ring.c | 51 ++++++++++++++++++++++++++++++++++++ include/linux/virtio_ring.h | 3 +++ 2 files changed, 54 insertions(+) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index fbca7ce1c6bf..6631c30cb706 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -506,6 +506,15 @@ static void virtqueue_init(struct vring_virtqueue *vq, u32 num) vq->event_triggered = false; vq->num_added = 0; + /* + * Keep IN_ORDER state aligned with a freshly initialized/reset queue. + * For packed IN_ORDER, free_head is unused but harmlessly reset. + */ + if (virtqueue_is_in_order(vq)) { + vq->free_head = 0; + vq->batch_last.id = UINT_MAX; + } + #ifdef DEBUG vq->in_use = false; vq->last_add_time_valid = false; @@ -3936,5 +3945,47 @@ void virtqueue_map_sync_single_range_for_device(const struct virtqueue *_vq, } EXPORT_SYMBOL_GPL(virtqueue_map_sync_single_range_for_device); +/** + * virtqueue_reinit_vring - reinitialize vring state without reallocation + * @_vq: the virtqueue + * + * Reset the avail/used indices and descriptor state of an existing + * virtqueue so it can be reused after a device reset. No memory is + * allocated or freed, making this safe for use in noirq context. + * + * Preconditions for callers: + * 1) The vq must be fully quiesced (no concurrent add/get/kick/IRQ callback). + * 2) Transport/device side must already have stopped/reset this queue. + * 3) All in-flight buffers must already be completed or detached. + * + * If called with outstanding descriptors, free-list state can be corrupted: + * num_free is restored to full capacity while desc_extra next-chain/free_head + * may still represent a partially consumed list. + */ +void virtqueue_reinit_vring(struct virtqueue *_vq) +{ + struct vring_virtqueue *vq = to_vvq(_vq); + unsigned int num = virtqueue_is_packed(vq) ? + vq->packed.vring.num : vq->split.vring.num; + + /* All in-flight descriptors must be completed or detached */ + WARN_ON(vq->vq.num_free != num); + + if (virtqueue_is_packed(vq)) { + virtqueue_reset_packed(vq); + } else { + /* + * Split queue shadow index should match the visible avail + * index when the queue is fully quiesced. + */ + WARN_ON(vq->split.avail_idx_shadow != + virtio16_to_cpu(vq->vq.vdev, + vq->split.vring.avail->idx)); + + virtqueue_reset_split(vq); + } +} +EXPORT_SYMBOL_GPL(virtqueue_reinit_vring); + MODULE_DESCRIPTION("Virtio ring implementation"); MODULE_LICENSE("GPL"); diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h index c97a12c1cda3..26c7c9d0a151 100644 --- a/include/linux/virtio_ring.h +++ b/include/linux/virtio_ring.h @@ -118,6 +118,9 @@ void vring_del_virtqueue(struct virtqueue *vq); /* Filter out transport-specific feature bits. */ void vring_transport_features(struct virtio_device *vdev); +/* Reinitialize a virtqueue without reallocation (safe in noirq context) */ +void virtqueue_reinit_vring(struct virtqueue *_vq); + irqreturn_t vring_interrupt(int irq, void *_vq); u32 vring_notification_data(struct virtqueue *_vq); -- 2.43.0