From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795034185; b=ih+UvYEzYptJ29vmpQFsGosHLWVtPHXRmUnGuDEMoSApEocxFgC/iyl/zzecgEB5K5Qu 7qu7mxs4I02mfhWC8BiXokTfYEDKKVxYWBO15qe0Kv7k9CpnRsg3QLNz8a+bjR4FszJha kB+JxM7C9uEYhv1DEq5GtPq/UlxkYdxQLIvBxG3NCHZ+Op9EBWg3QkHEl3tyKEUZ4lDuQ umi/3sdSt8ybxcF/AcBSGXniujqMzaL/eVvjS3dT5IIRdlk4t4LicgY+OEvp1+Y3aGMmD DW1uGQ84IxkCvG1fq9cRQQ4lvI0HFNq6pWJO1nqOelIBucvqka1aAJJxVGfgwc9GD3A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795034185; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=ulpDKPoOWKaPQ2dI2JpXCo7EfC5q3fntIgb9++b11As=; b=RylCnqI/bclHMuWE2WJ8Fg59JnakCtabSTcu/49C/uAp5mLEKydcIwUPZwSRYLRrjjjM s2Q5TP8KcR8z3pqIG2CKuoqOTDM5W1+J+uNZyQlVGX4biv4MFqlqUkTrN7Mv0H3vR/vCO nj+l6QI0/554sBJyraEB1HmlCkXKwF3KREZf2eXLLCXeIDJ7OsF/hgxv7rCCC+QrtLGLb tXkW9BmEHRK0+Z1ogPQ9m1lOQngQzSZK9GvEgBg2AtCihQA9q214jMrN9iTAoL9S85Jda cjzuzx3J6E59N9DxnFRDqZvBrqYd6aLaJUXeCMX9rAZo3Ba48n3Jp+bDyIdTWXkOa4w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NVzJP6dH; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61F7A606A320; Wed, 18 Nov 2026 20:36:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NVzJP6dH Received: by smtp.kernel.org (Postfix) with ESMTPSA id B647B1F000C6; Wed, 18 Nov 2026 20:36:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795034185; bh=ulpDKPoOWKaPQ2dI2JpXCo7EfC5q3fntIgb9++b11As=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NVzJP6dH/hkktbAwlYIVVpabO8+4Shm4JuHKdxLjicXKkK41IxOk/SiKZEZZ6a9yx EJDG4P829UTP199m4blzKT7bKpjsYBjvLzoopfXUXSNZTlUOT0dbiaIjWEtnmOAMMh hINRqiO+4/yvlN/qWpPEETUEhySJQVBrFKFfAFuk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+06f9b2a53ba4a5a47644@syzkaller.appspotmail.com, Anuj Bolewar , Dmitry Osipenko , Sasha Levin Subject: [PATCH 6.6 0279/3318] drm/virtio: reclaim pending vbufs before tearing down vqs Date: Wed, 18 Nov 2026 15:15:01 +0100 Message-ID: <20261118150323.881597154@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150313.527275416@linuxfoundation.org> References: <20261118150313.527275416@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Anuj Bolewar [ Upstream commit 61d85f99b5a55d4f717c4bb2f4c4acabf22ee3fc ] virtio_gpu_free_vbufs() destroys the vbufs kmem_cache after the virtqueues have already been released. Commands that were queued but never completed by the device leave their vbuffers stranded in the virtqueue, so the cache still holds live objects when virtio_gpu_deinit() tears everything down. This triggers a WARNING in virtio_gpu_free_vbufs: BUG virtio-gpu-vbufs (Not tainted): Objects remaining in cache on __kmem_cache_shutdown() Drain any buffers still sitting in the control and cursor virtqueues in virtio_gpu_deinit() after the device has been reset and before the virtqueues are deleted, following the same pattern used by virtio_console's remove_vqs(). Each reclaimed buffer is released with free_vbuf(), dropping the reference on any GEM objects it holds. Pending RESOURCE_UNREF commands are handled as well: their resp_cb_data still references a GEM object, so it is cleaned up with virtio_gpu_cleanup_object() to avoid leaking it on teardown. Reported-by: syzbot+06f9b2a53ba4a5a47644@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=06f9b2a53ba4a5a47644 Signed-off-by: Anuj Bolewar Signed-off-by: Dmitry Osipenko Link: https://patch.msgid.link/20260802-virtio-gpu-reclaim-vbufs-v2-1-5767fb860691@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + drivers/gpu/drm/virtio/virtgpu_vq.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index de36af56df863..a1142f5630541 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -345,6 +345,7 @@ void virtio_gpu_array_put_free_work(struct work_struct *work); /* virtgpu_vq.c */ int virtio_gpu_alloc_vbufs(struct virtio_gpu_device *vgdev); void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev); +void virtio_gpu_reclaim_vbufs(struct virtio_gpu_device *vgdev); void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo, struct virtio_gpu_object_params *params, diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c index c88456bc9fcc0..db120316b47c2 100644 --- a/drivers/gpu/drm/virtio/virtgpu_kms.c +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c @@ -290,6 +290,7 @@ void virtio_gpu_deinit(struct drm_device *dev) flush_work(&vgdev->cursorq.dequeue_work); flush_work(&vgdev->config_changed_work); virtio_reset_device(vgdev->vdev); + virtio_gpu_reclaim_vbufs(vgdev); vgdev->vdev->config->del_vqs(vgdev->vdev); } diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index d2c83f3e74b99..d44eabad06744 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -179,6 +179,21 @@ static void free_vbuf(struct virtio_gpu_device *vgdev, kmem_cache_free(vgdev->vbufs, vbuf); } +void virtio_gpu_reclaim_vbufs(struct virtio_gpu_device *vgdev) +{ + struct virtio_gpu_vbuffer *vbuf; + + while ((vbuf = virtqueue_detach_unused_buf(vgdev->ctrlq.vq))) { + if (vbuf->objs) + virtio_gpu_array_put_free(vbuf->objs); + if (vbuf->resp_cb_data) + virtio_gpu_cleanup_object(vbuf->resp_cb_data); + free_vbuf(vgdev, vbuf); + } + while ((vbuf = virtqueue_detach_unused_buf(vgdev->cursorq.vq))) + free_vbuf(vgdev, vbuf); +} + static void reclaim_vbufs(struct virtqueue *vq, struct list_head *reclaim_list) { struct virtio_gpu_vbuffer *vbuf; -- 2.53.0