Skip to contentSkip to conversation

FAILED: patch "[PATCH] virtio_balloon: fix shrinker count" failed to apply to 4.19-stable tree

PATCH [email protected] 3 participants 3 messages Nov 25, 2019 – Nov 27, 2019

Subsystems (3)
Stable branch virtio core virtio balloon
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From c9a6820fc0da2603be3054ee7590eb9f350508a7 Mon Sep 17 00:00:00 2001
From: Wei Wang <[email protected]>
Date: Tue, 19 Nov 2019 05:02:33 -0500
Subject: [PATCH] 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 [email protected]
Fixes 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by Wei Wang <[email protected]>
Signed-off-by Michael S. Tsirkin <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
drivers/virtio/virtio_balloon.c +1 -1
index 51134f9a3ee7..e05679c478e2 100644
@@ -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;
 }
maintainer
#1 lore raw
Quoted 21 lines · On Mon, Nov 25, 2019 at 06:44:42PM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From c9a6820fc0da2603be3054ee7590eb9f350508a7 Mon Sep 17 00:00:00 2001
From: Wei Wang <[email protected]>
Date: Tue, 19 Nov 2019 05:02:33 -0500
Subject: [PATCH] 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.

Quoted 5 lines
Cc [email protected]
Fixes 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by Wei Wang <[email protected]>
Signed-off-by Michael S. Tsirkin <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>

I think that the fixes tag should be pointing to 86a559787e6f ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT"), and this commit isn't needed on 4.19.

Signature · 2 lines
Thanks,
Sasha
maintainer
#2 lore raw
Quoted 28 lines · Sasha Levin
Quoted 21 lines · On Mon, Nov 25, 2019 at 06:44:42PM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From c9a6820fc0da2603be3054ee7590eb9f350508a7 Mon Sep 17 00:00:00 2001
From: Wei Wang <[email protected]>
Date: Tue, 19 Nov 2019 05:02:33 -0500
Subject: [PATCH] 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.

Quoted 5 lines
Cc [email protected]
Fixes 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by Wei Wang <[email protected]>
Signed-off-by Michael S. Tsirkin <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Quoted 3 lines

I think that the fixes tag should be pointing to 86a559787e6f ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT"), and this commit isn't needed on 4.19.

I believe you are right but don't see a way to fix that as the patch is upstream.

Quoted 3 lines
Signature · 2 lines
Thanks,
Sasha