From nobody Tue Apr 7 06:24:38 2026 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 99C80EEB3 for ; Sun, 15 Mar 2026 15:24:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773588294; cv=none; b=I8FB8wX2ISiYg9qu/dpiNtllcbmCe9zJoKVNIVJaoSe7/Ac8h875TmM3NQ9D4mf48z8IRn9XGgGG9Vqc1+9qdWSBKpB1N+EzKA5DCeEzNKycBqKfkjsytIsz3bRpHc1yzyCzAYYVR0/auaJKYkUkRn1OIBTcQZLLmq2iWq23cRU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773588294; c=relaxed/simple; bh=SNop8XUPK6Hgfe4O2UI2bOnOLb9LGUujLa9UjCVo5U0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=S7N98RjX6F+ukJ2ZV29DTc/3bMZzI6npls2PGTRie6znOL6H45I1/m6qQ4ziT6v6Zb73DgzIMhG4QMXRi4TnjoIuJRQ5OpSDDY+LBwvHfKTetr7w2pgya3nTtY1uPqfhlMKm6+81jkBoCrpmniP0PZ6BRXmBsk12B2bzvPQf6gw= 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=NSvUIvHD; arc=none smtp.client-ip=209.85.216.43 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="NSvUIvHD" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-35a094cc3e9so2458378a91.3 for ; Sun, 15 Mar 2026 08:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773588293; x=1774193093; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7MtjS8bH1E8z5wp3WLVz/oCa3p3s0LxEuaeiXaVAd1M=; b=NSvUIvHDqzfTk+oCQVaceLYpoKZhziLBl896nqzmLVm66IvEE21/jAqMl09VKV286i pkJYur8cnoqXbgqW49ID00ZDQj+aY5e8jlH7FOKFTp1wvWHZdwIqIRz0MFGCdNuST815 r226m0t9WSWQJ9jVDN0tq/qWnd4Y9ximyvpgEykZedGXbN6/xrhCi2oqxqmLSbgAGd32 2yZO7rUSHiJ7ezK9Yj/Likx7x6y2nUQKcbrcsgw/zydAOXCMzrwL3j5SoHHyWApV7Dc7 6ytV3TdETHy17gojagPbSos4sItpCkyM++caVE7BwNRn6vq57WW7ZAZ041h1p7PWFY/B jthw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773588293; x=1774193093; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7MtjS8bH1E8z5wp3WLVz/oCa3p3s0LxEuaeiXaVAd1M=; b=rYlMBEDstdx+7+P76/PZSr10qu2cfvK87q3Rv+4zNWOlLB5gvU3aU6ytsxvQ/YKo/i XiWiHEh5bNDh5WOL/RjCExRUWozKFS7ukWTEbvkO6wyHyncwybNi83LMsl8mQKX9hQ60 eHSZFydB8V+JNlnHCg/976KmHoBVzC4V0cYoGxctk0DDhvvziBBsHDq4CwMUvKrQbA0U GOoaI+T07Z/L5alLIYiHOnuF2qsZguYOJxZ2YCJSjRh+epzT2zCCsg62CAJEaD/BAq4x ROo49FLGcqHZ69SCoXlKZ0io9U6BDlDKrRekGlU3CpF6ZgPARekKuC/wj5joCldSOgZL TXgw== X-Forwarded-Encrypted: i=1; AJvYcCVOro1rSD/tkA0fdHKthJ38M3OOdIf83KPSnzi5lmRR3ta3rxOtM2hyrRw1C/1RtjW2PfB7R5+nZyKkNBk=@vger.kernel.org X-Gm-Message-State: AOJu0YzVC24bVDVI9jTAFZQLAZ29CeQK+OJwXDQ+tjcebIseMMO+nESK +ihGTCOcuSspTa+rMsd0KHPDPL6XcRvxSkJtEWMOzmnmZC0/pBr3vFJ2 X-Gm-Gg: ATEYQzzz2sunFHd8AWjXs4ZvXfUC0xjn1FoUD/8VLJH7c5HV8RjSmEKU/W9Mm7/wWjs M/2wSDLBnms/Vzq9HVRvxu011N/96dGafvgcWYjWGcdg+o+7fw6VbYLJVx0ULf1GXOfSjPht8EV VZaHhj8Tt4oI6l6PXkoPlE7X0IhF3H7+VaHe+E4j2CMZFqwzgMTsTnfV3L7oi/XJ332QX3Y9pJe SWkreWN3+3oDOiH6AcmRL6dyEPH+knW63xSII+oi/XhsXYlFC/1BQUReNlsoDViThlKGZgG3Fiq H89P6f9MTKII4QR+OeKwr9e3O4FufsEjrV+0AVhmjV3N8rnPaVFUUpgKKO5W5HWG5/3K1ClPkeZ 9ZTldsop2ciSOEFaa7/nodwGuqBhAF1rO1BRPSe8F8aRBGqtU4bB+n/E+EUuSqTpWXzMeoV/FmI auWhANcFXDhrg4pwsIM94Bje/ScGcQzA55kNNhslQCprNRcdw2DNy0r/7m2VE= X-Received: by 2002:a17:90b:3dc7:b0:35b:9ab6:1d4b with SMTP id 98e67ed59e1d1-35b9ab61eb1mr1172866a91.20.1773588292890; Sun, 15 Mar 2026 08:24:52 -0700 (PDT) Received: from pop-os.. (118-163-201-9.hinet-ip.hinet.net. [118.163.201.9]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35a22d0c854sm2932933a91.2.2026.03.15.08.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 08:24:52 -0700 (PDT) From: Shengwen Cheng To: mst@redhat.com, jasowang@redhat.com Cc: xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Shengwen Cheng Subject: [PATCH] virtio_ring: reject NULL recycle callback in reset/resize helpers Date: Sun, 15 Mar 2026 23:24:03 +0800 Message-Id: <20260315152403.127645-1-shengwen1997.tw@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" virtqueue_reset() and virtqueue_resize() rely on the recycle callback to release each detached unused buffer after disable_vq_and_reset(). As a defensive change, reject a NULL recycle callback explicitly to make this requirement clear. Update virtqueue_disable_and_recycle() to warn and return -EINVAL when @recycle is NULL, and update the descriptions for virtqueue_reset() and virtqueue_resize() to document that @recycle must not be %NULL. --- drivers/virtio/virtio_ring.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 335692d41617..563cee634426 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -2698,6 +2698,9 @@ static int virtqueue_disable_and_recycle(struct virtq= ueue *_vq, void *buf; int err; =20 + if (WARN_ON_ONCE(!recycle)) + return -EINVAL; + if (!vq->we_own_ring) return -EPERM; =20 @@ -3311,7 +3314,7 @@ EXPORT_SYMBOL_GPL(vring_create_virtqueue_map); * virtqueue_resize - resize the vring of vq * @_vq: the struct virtqueue we're talking about. * @num: new ring num - * @recycle: callback to recycle unused buffers + * @recycle: callback to recycle unused buffers, must not be %NULL * @recycle_done: callback to be invoked when recycle for all unused buffe= rs done * * When it is really necessary to create a new vring, it will set the curr= ent vq @@ -3367,7 +3370,7 @@ EXPORT_SYMBOL_GPL(virtqueue_resize); /** * virtqueue_reset - detach and recycle all unused buffers * @_vq: the struct virtqueue we're talking about. - * @recycle: callback to recycle unused buffers + * @recycle: callback to recycle unused buffers, must not be %NULL * @recycle_done: callback to be invoked when recycle for all unused buffe= rs done * * Caller must ensure we don't call this with other virtqueue operations --=20 2.34.1