linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Khazhismel Kumykov <khazhy@google.com>
To: mst@redhat.com, jasowang@redhat.com, wei.w.wang@intel.com
Cc: linux-kernel@vger.kernel.org,
	virtualization@lists.linux-foundation.org,
	Khazhismel Kumykov <khazhy@google.com>
Subject: [PATCH 2/2] virtio_balloon: fix shrinker_scan return units
Date: Mon, 18 Nov 2019 13:38:11 -0800	[thread overview]
Message-ID: <20191118213811.22017-2-khazhy@google.com> (raw)
In-Reply-To: <20191118213811.22017-1-khazhy@google.com>

We were returning number of virtio balloon pages, which may not be the
same as number of system pages

Fixes: 86a559787e6f ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT")
Cc: Wei Wang <wei.w.wang@intel.com>
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
---
 drivers/virtio/virtio_balloon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 7cf9540a40b8..7951ece3fe24 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -802,11 +802,11 @@ static unsigned long virtio_balloon_shrinker_scan(struct shrinker *shrinker,
 		pages_freed = shrink_free_pages(vb, pages_to_free);
 
 	if (pages_freed >= pages_to_free)
-		return pages_freed;
+		return pages_freed / VIRTIO_BALLOON_PAGES_PER_PAGE;
 
 	pages_freed += shrink_balloon_pages(vb, pages_to_free - pages_freed);
 
-	return pages_freed;
+	return pages_freed / VIRTIO_BALLOON_PAGES_PER_PAGE;
 }
 
 static unsigned long virtio_balloon_shrinker_count(struct shrinker *shrinker,
-- 
2.24.0.432.g9d3f5f5b63-goog


  reply	other threads:[~2019-11-18 21:39 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-15 22:55 [PATCH] virtio_balloon: fix shrinker pages_to_free calculation Khazhismel Kumykov
2019-11-18  4:01 ` Wei Wang
2019-11-18  5:30   ` Michael S. Tsirkin
2019-11-18  7:42     ` Wei Wang
2019-11-18  8:26       ` Michael S. Tsirkin
2019-11-18 10:31         ` Wei Wang
2019-11-18  5:26 ` Michael S. Tsirkin
2019-11-18 21:30   ` Khazhismel Kumykov
2019-11-18 21:38     ` [PATCH 1/2] virtio_balloon: fix " Khazhismel Kumykov
2019-11-18 21:38       ` Khazhismel Kumykov [this message]
2019-11-18 22:56         ` [PATCH 2/2] virtio_balloon: fix shrinker_scan return units Michael S. Tsirkin
2019-11-18 22:52       ` [PATCH 1/2] virtio_balloon: fix pages_to_free calculation Michael S. Tsirkin
2019-11-18 23:08       ` Michael S. Tsirkin
2019-11-18 23:20         ` Khazhismel Kumykov
2019-11-19  5:38         ` Wei Wang
2019-11-19  9:37           ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191118213811.22017-2-khazhy@google.com \
    --to=khazhy@google.com \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=wei.w.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).