From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5571C4DAF8C for ; Wed, 16 Sep 2026 17:35:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789580118; cv=none; b=vCBVyk7vh26uGCq+7Jp0sp4INFFNPIzScKAjOEjwM5iq+jHN1t5s2BtLvlZAWypiX0aMGAGIghIjrTlI/8TC0Fod3aBeq/gZHUnhZIqK0cndIjYJog8wK63MaWR9+Pb2JZuJGQb7Z0tZYBpg7j4jcb10uNpLo/gXBnkFO1b8SdE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789580118; c=relaxed/simple; bh=MA9GW/LgBQ3ohblS6sXwfyb1YpPkIg32IZa+6xR5J8k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fFMHmM7MItNV7cGgB2vpgcOYxEbCzTlL6u9WkljUUdL6UN8y0N5GHKzFjRSIOojfhkrl50OPGLlb3/i+TtXd867X5i1Qb5d19gLr3DdsF1iT+1w9622L80oFwRhAjJtZXTgf1I7WoVmNB122/9EzHuUMy/uTEKMOYTwqhhmWEQc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ITlFHUHc; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ITlFHUHc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F7401F00898; Wed, 16 Sep 2026 17:35:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789580103; bh=L3tCJjHEKqTVLEEt7U+eDeWaiZOjPMOQbrezvncNh7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ITlFHUHcZPfv3DmRDAxvWl0njFoBOy/9c28EZ8dZ/PmiokVchYENs4SmT3nN9VW0s /dFqbLMmBotqSh0vVNBNc7vbGjDvqG8TClNYx1Pg6bLn8sB2oEEISpmNUcJrEtPVgl frGxvObOvdjag5Telx1SPzvsMl1S1LHuz+72/Xx05EaEvfmpnzagUo0qxLzd8kwG1q WdPfRks5a66Unuj0Pvg0t/zEKaAFq8siEM7c8IyYD9jQXZvMIhN8J1aoeUS1KlB1QH bTElNJtV5UrPLNBeY1hRaBzMOwEwSh8i6aL/2sp3uzh1JUpuk0DQM/bqSWSPYNDQyo hQ/R054zW+0tQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Viresh Kumar , "Michael S. Tsirkin" , Jason Wang , Sasha Levin Subject: [PATCH 6.1.y 1/2] virtio-mmio: Remove virtqueue list from mmio device Date: Wed, 16 Sep 2026 13:34:59 -0400 Message-ID: <20260916173500.1132874-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026091638-remorse-obliged-6c4a@gregkh> References: <2026091638-remorse-obliged-6c4a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Viresh Kumar [ Upstream commit 564a69ad90d15c782176e1a8c9e1c95661e1aed0 ] The MMIO transport implementation creates a list of virtqueues for a virtio device, while the same is already available in the struct virtio_device. Don't create a duplicate list, and use the other one instead. While at it, fix the virtio_device_for_each_vq() macro to accept an argument like "&vm_dev->vdev" (which currently fails to build). Signed-off-by: Viresh Kumar Message-Id: <3e56c6f74002987e22f364d883cbad177cd9ad9c.1747827066.git.viresh.kumar@linaro.org> Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang [Backport to 6.1: remove the obsolete queue-info declaration without introducing the notify function pointer from the newer notification-data support. Keep vm_notify and the existing find_vqs interface. This leaves the device layout ready for d14d693adb055e98ca705822ba6daebc18602d9a.] Stable-dep-of: d14d693adb05 ("virtio_mmio: disable IRQ wake before free_irq") Signed-off-by: Sasha Levin --- drivers/virtio/virtio_mmio.c | 52 +++--------------------------------- include/linux/virtio.h | 2 +- 2 files changed, 4 insertions(+), 50 deletions(-) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 7651940aafd24..7909d4aec8a6e 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -64,7 +64,6 @@ #include #include #include -#include #include #include #include @@ -87,22 +86,8 @@ struct virtio_mmio_device { void __iomem *base; unsigned long version; - - /* a list of queues so we can dispatch IRQs */ - spinlock_t lock; - struct list_head virtqueues; -}; - -struct virtio_mmio_vq_info { - /* the actual virtqueue */ - struct virtqueue *vq; - - /* the list node for the virtqueues list */ - struct list_head node; }; - - /* Configuration interface */ static u64 vm_get_features(struct virtio_device *vdev) @@ -289,9 +274,8 @@ static bool vm_notify(struct virtqueue *vq) static irqreturn_t vm_interrupt(int irq, void *opaque) { struct virtio_mmio_device *vm_dev = opaque; - struct virtio_mmio_vq_info *info; + struct virtqueue *vq; unsigned long status; - unsigned long flags; irqreturn_t ret = IRQ_NONE; /* Read and acknowledge interrupts */ @@ -304,10 +288,8 @@ static irqreturn_t vm_interrupt(int irq, void *opaque) } if (likely(status & VIRTIO_MMIO_INT_VRING)) { - spin_lock_irqsave(&vm_dev->lock, flags); - list_for_each_entry(info, &vm_dev->virtqueues, node) - ret |= vring_interrupt(irq, info->vq); - spin_unlock_irqrestore(&vm_dev->lock, flags); + virtio_device_for_each_vq(&vm_dev->vdev, vq) + ret |= vring_interrupt(irq, vq); } return ret; @@ -318,14 +300,8 @@ static irqreturn_t vm_interrupt(int irq, void *opaque) static void vm_del_vq(struct virtqueue *vq) { struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vq->vdev); - struct virtio_mmio_vq_info *info = vq->priv; - unsigned long flags; unsigned int index = vq->index; - spin_lock_irqsave(&vm_dev->lock, flags); - list_del(&info->node); - spin_unlock_irqrestore(&vm_dev->lock, flags); - /* Select and deactivate the queue */ writel(index, vm_dev->base + VIRTIO_MMIO_QUEUE_SEL); if (vm_dev->version == 1) { @@ -336,8 +312,6 @@ static void vm_del_vq(struct virtqueue *vq) } vring_del_virtqueue(vq); - - kfree(info); } static void vm_del_vqs(struct virtio_device *vdev) @@ -363,9 +337,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in const char *name, bool ctx) { struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev); - struct virtio_mmio_vq_info *info; struct virtqueue *vq; - unsigned long flags; unsigned int num; int err; @@ -382,13 +354,6 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in goto error_available; } - /* Allocate and fill out our active queue description */ - info = kmalloc(sizeof(*info), GFP_KERNEL); - if (!info) { - err = -ENOMEM; - goto error_kmalloc; - } - num = readl(vm_dev->base + VIRTIO_MMIO_QUEUE_NUM_MAX); if (num == 0) { err = -ENOENT; @@ -446,13 +411,6 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in writel(1, vm_dev->base + VIRTIO_MMIO_QUEUE_READY); } - vq->priv = info; - info->vq = vq; - - spin_lock_irqsave(&vm_dev->lock, flags); - list_add(&info->node, &vm_dev->virtqueues); - spin_unlock_irqrestore(&vm_dev->lock, flags); - return vq; error_bad_pfn: @@ -464,8 +422,6 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in writel(0, vm_dev->base + VIRTIO_MMIO_QUEUE_READY); WARN_ON(readl(vm_dev->base + VIRTIO_MMIO_QUEUE_READY)); } - kfree(info); -error_kmalloc: error_available: return ERR_PTR(err); } @@ -610,8 +566,6 @@ static int virtio_mmio_probe(struct platform_device *pdev) vm_dev->vdev.dev.release = virtio_mmio_release_dev; vm_dev->vdev.config = &virtio_mmio_config_ops; vm_dev->pdev = pdev; - INIT_LIST_HEAD(&vm_dev->virtqueues); - spin_lock_init(&vm_dev->lock); vm_dev->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(vm_dev->base)) { diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 82a29db54e7d1..8982611799e0b 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -156,7 +156,7 @@ void virtio_reset_device(struct virtio_device *dev); size_t virtio_max_dma_size(struct virtio_device *vdev); #define virtio_device_for_each_vq(vdev, vq) \ - list_for_each_entry(vq, &vdev->vqs, list) + list_for_each_entry(vq, &(vdev)->vqs, list) /** * struct virtio_driver - operations for a virtio I/O driver -- 2.53.0