From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 7268C1B4244 for ; Fri, 24 Apr 2026 12:30:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777033822; cv=none; b=BV7B+1baLTUeLuli6XAJKWOS5pSjsiaJTkeEpV6MGzgM9FGLkx8es4nE6LljQ8uwMgetwDn9HFFOlC5CoLdNiU74Sqdo7sp7s7RyHzqQTsROciUjhYpCsXD4f7QPQlf2QFDVt2s5KZa7gyf239Z8gWUhNDOXSmqOciburNaZRfo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777033822; c=relaxed/simple; bh=Wp+rXTYV6cCR7GQckednAxBMcKVMT6SIRlSrHu1tg4E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=J431ZPi+GRW60bfaHS3O52xGXw84grgghDB6I9k9sD7+KghoEbsBTmQbuY5SyKgHJMihYW5jRKIKc8xxLy4dMufZlxj+/4IYMoVSXPgCIEWeCLGUNqPnWJzCc+rc/15/UmDj95p7OexJTP+dDJuq0eGXDJXYje2ql9AqBfhgZ9Y= 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=ByerhANY; arc=none smtp.client-ip=209.85.214.177 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="ByerhANY" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2ad9516a653so39622275ad.0 for ; Fri, 24 Apr 2026 05:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777033821; x=1777638621; 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=ByerhANY1Qi3USY/+lZi1d47rmLBbDWV1G55/DxlVAl9mC8Ns4rOlO/noDlKoPTob0 EZ6Bz+Z+etIcWZngT59GdMfT4mDiln6Cca/XRlK82CzuSPbuR1liW7P7lxiK+E4XpGcx qS6nIfup/FDdTYkNmn05T/0L80x/eh8CFD6VshuqaUv72J6WTG/u7uGBHwKLeEzk5asj GgBTgqmccrLO2EROEh6ollyXz+vCOb+7b7rolpDLT0a0OnwwEvvO1zQsDfyc/x9mYgc9 Gwt11gKzE6uywNlIY7hGpMAWTXf5KtQE8DhQUoGb/8pgZKRyvMtiXcsFdPCgZhM0HkqD KeNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777033821; x=1777638621; 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=Ceufn6FcWE3Mkhbnf+nzmpUX0IGX1xOToVJAHBBMLXapFCdFH6EFiWy5uNzo8dZRkG z/J//tX1agT6+6FQvFQZT6DI2M1wEP89iPu8Z8lT/UO2F59t6mqAiRzTBNuU4S6u96tB rU/8d8hci982iAVouf49HL9j49XPtE48ENC7ePNyrBAaJjwleB/q40HUcohG/ui5QGAc Qa+B2nlvQEEF24bOul16UWvdhp+MBMKD4MkWwN2EcxjWSWR29TDex9f2WjhNyqim7DoH XqrlTElNyEZpgtsZxh262VNab5kAgKfrv3Se8ZzEjNpTp+r7jSr//mz060HitFBa8Vzj IWLA== X-Forwarded-Encrypted: i=1; AFNElJ/+NJogdus/tmMYJvNskZlf/MgF4WDgTaXztDJQwbOyxwsWM+kQFS8dZB9XaNDr8Bx1cLYnbpCDEtlu2y8=@vger.kernel.org X-Gm-Message-State: AOJu0Yxnml6PTvHImYQmzRPkV0+V2VeLDd/MqUXH3PouFgyQZF2cXyhZ 6CyuqlDq/UHqCv2FlvUryFBrJVmp/8TouofImguezRVvfPbiUDC6KWTy X-Gm-Gg: AeBDieuU23e61dJbDQiX2rdy/HXgNX6w1HUCea2+dFf9gnnqenp8TXKm/EjDfDBoU9f gXEcg8195/kzd0vvcLZmIkus3SsUuLdzWqTxUEMO6ehE3pMGQ7AoVCFmqTOwc5W78jSngWrggje 0ZsI0Nm0qNDdmstwIqgxeg8BQI9/7xM53xDZjpqE7JLgr+wqXa+8kqnbu/4mbILLFkv92lsGjhX yaiQErs9cnV1YOb1nB8pm6Kxq0uL7RqbHZ/yCILBv8yFfjWIiSO7pTUxUr9sVCYlvQZTIzQKl0n 81t5bAgYlZS3N9eRSI1DPk8wQaDEvggb+D3ICae4WPECDiWFKL9j49Uq81LCxKXSNgWzjt2AtcQ cSfLsi2QJH2QAgcEheiensca6RoOnK5BL9Uwda+3nL7NqfRC90wWH5BRKauMJm00KysHvPGZaE6 AKM9QNVumUkqrqoi5LCzHxXFdY7zAXI2o4nhjWUdRq0E4mTBrAEe5MvXS5gcpPTi8+kkqwxTCNA LlYbI3kv7INdS3qwnDrPWyRTOQGPXaqcJIQvfN4Nv/iNInC X-Received: by 2002:a17:902:8f90:b0:2b4:5f96:184d with SMTP id d9443c01a7336-2b5f9e5da53mr238303975ad.5.1777033820417; Fri, 24 Apr 2026 05:30:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 05:30:19 -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 2/4] virtio_ring: export virtqueue_reinit_vring() for noirq restore Date: Fri, 24 Apr 2026 21:29:52 +0900 Message-Id: <20260424122954.273-3-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 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