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 6580341F35E; Sat, 12 Sep 2026 11:18:58 +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=1789211939; cv=none; b=CxchmM5ERzHGtzAtFhr75WW8RZPhX24zCWUZdiN8mPG4ujno77cAiVGSh0PDHM2JZXU93Q7Rfrzj7hfTTS3DRUMiD4ODyEhG3fJBHjvLD8w+3dpDjWdJz1UglIOv+gbEVz8O3J4JO+UpK2dL4l78cuNuP6+UBcHzcz52NVXTef8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789211939; c=relaxed/simple; bh=M0gdb8doUbrM7PowDWc0zdgbdtBJjr+6YRgzgN3YTX0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VVwQfQHbKQuevGveyAnS1t52UHunktPlGb99Lr03kSuTQUXrTziG4xDd3jBVQuzUhV6fKhU3keHTSzkSXsFDrWANYSwbRVbhemSBnokOLkg5nkskgIM25XB6sSS7/kyvF82albKbMK6J7QHyIitC+3m2keW1iJugVKcJhmLqWDE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eYCQS7hg; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eYCQS7hg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05DEA1F000FF; Sat, 12 Sep 2026 11:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789211938; bh=rTcVj+8bJXUVMIWjKA5w2m8HBRCWNp+QR6ZVy7qRzd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eYCQS7hgoFOH0371KI7/qHyUw5IHHAPsB0CrgSmMwIE9sI90M4A7sQy7QXPl/H6Kj hZodXk7PKbGAq2m46zAtwwgvKYNtA/1UWauxKkiNuBak7RLnw4dBbLhdk79sWdQGQ1 evreV/l0RPpLQsF/kr0kEwwEF9tCGciJnKmpuVf0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "David Hildenbrand (Arm)" , "Michael S. Tsirkin" , Sasha Levin Subject: [PATCH 6.18 1291/1518] virtio_balloon: disable indirect descriptors Date: Sat, 12 Sep 2026 08:57:40 +0200 Message-ID: <20260912065652.720874160@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael S. Tsirkin [ Upstream commit 281eb4732aae5473141b84e106fe906c69b2ff3d ] The page reporting callback submits an sg list to the reporting virtqueue. With VIRTIO_RING_F_INDIRECT_DESC negotiated and total_sg > 1 (which it typically is), virtqueue_add reports it to the host by allocating an indirect descriptor via kmalloc(GFP_KERNEL). This is not pretty: the reporting worker isolates potentially hundreds of MB of free pages from the buddy allocator (reported pages are at least pageblock_order, and the sg can contain up to PAGE_REPORTING_CAPACITY entries of varying orders). As the result, very theoretically, the kmalloc might trigger OOM when we have in fact a ton of free memory. Clear VIRTIO_RING_F_INDIRECT_DESC, to avoid using indirect descriptors. Fixes: b0c504f15471 ("virtio-balloon: add support for providing free page reports to host") Assisted-by: Claude:claude-opus-4-6 Acked-by: David Hildenbrand (Arm) Signed-off-by: Michael S. Tsirkin Message-ID: <73fac8a629fd9aca7bb3265ac243a769c28af25d.1783232420.git.mst@redhat.com> Signed-off-by: Sasha Levin --- drivers/virtio/virtio_balloon.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 1b93d8c643612..04c9b601ae4da 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -1185,6 +1186,11 @@ static int virtballoon_validate(struct virtio_device *vdev) else if (!virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON)) __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_REPORTING); + /* + * Disable indirect descriptors to avoid memory allocation in + * virtqueue_add during page reporting. + */ + __virtio_clear_bit(vdev, VIRTIO_RING_F_INDIRECT_DESC); __virtio_clear_bit(vdev, VIRTIO_F_ACCESS_PLATFORM); return 0; } -- 2.53.0