Commit c9a6820f authored Nov 19, 2019 by Wei Wang Committed by Michael S. Tsirkin Nov 20, 2019

virtio_balloon: fix shrinker count



Instead of multiplying by page order, virtio balloon divided by page
order. The result is that it can return 0 if there are a bit less
than MAX_ORDER - 1 pages in use, and then shrinker scan won't be called.

Cc: stable@vger.kernel.org
Fixes: 71994620 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>

parent 60bd04f2

drivers/virtio/virtio_balloon.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -826,7 +826,7 @@ static unsigned long virtio_balloon_shrinker_count(struct shrinker *shrinker,
		unsigned long count;

		count = vb->num_pages / VIRTIO_BALLOON_PAGES_PER_PAGE;
		count += vb->num_free_page_blocks >> VIRTIO_BALLOON_FREE_PAGE_ORDER;
		count += vb->num_free_page_blocks << VIRTIO_BALLOON_FREE_PAGE_ORDER;

		return count;
		}

Admin message