xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio_balloon: name cleanups

Browse Source 
free_page_order is a confusing name. It's not a page order
actually, it's the order of the block of memory we are hinting.
Rename to hint_block_order. Also, rename SIZE to BYTES
to make it clear it's the block size in bytes.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
This commit is contained in:
Michael S. Tsirkin
2019-11-19 05:21:47 -05:00
parent 63341ab037
commit 2a946fa1c8
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/virtio/virtio_balloon.c
View File

@@ -32,10 +32,10 @@
#define VIRTIO_BALLOON_FREE_PAGE_ALLOC_FLAG (__GFP_NORETRY | __GFP_NOWARN | \ #define VIRTIO_BALLOON_FREE_PAGE_ALLOC_FLAG (__GFP_NORETRY | __GFP_NOWARN | \
__GFP_NOMEMALLOC) __GFP_NOMEMALLOC)
/* The order of free page blocks to report to host */ /* The order of free page blocks to report to host */
#define VIRTIO_BALLOON_FREE_PAGE_ORDER (MAX_ORDER - 1) #define VIRTIO_BALLOON_HINT_BLOCK_ORDER (MAX_ORDER - 1)
/* The size of a free page block in bytes */ /* The size of a free page block in bytes */
#define VIRTIO_BALLOON_FREE_PAGE_SIZE \ #define VIRTIO_BALLOON_HINT_BLOCK_BYTES \
(1 << (VIRTIO_BALLOON_FREE_PAGE_ORDER + PAGE_SHIFT)) (1 << (VIRTIO_BALLOON_HINT_BLOCK_ORDER + PAGE_SHIFT))
#ifdef CONFIG_BALLOON_COMPACTION #ifdef CONFIG_BALLOON_COMPACTION
static struct vfsmount *balloon_mnt; static struct vfsmount *balloon_mnt;
@@ -380,7 +380,7 @@ static unsigned long return_free_pages_to_mm(struct virtio_balloon *vb,
if (!page) if (!page)
break; break;
free_pages((unsigned long)page_address(page), free_pages((unsigned long)page_address(page),
VIRTIO_BALLOON_FREE_PAGE_ORDER); VIRTIO_BALLOON_HINT_BLOCK_ORDER);
} }
vb->num_free_page_blocks -= num_returned; vb->num_free_page_blocks -= num_returned;
spin_unlock_irq(&vb->free_page_list_lock); spin_unlock_irq(&vb->free_page_list_lock);
@@ -582,7 +582,7 @@ static int get_free_page_and_send(struct virtio_balloon *vb)
; ;
page = alloc_pages(VIRTIO_BALLOON_FREE_PAGE_ALLOC_FLAG, page = alloc_pages(VIRTIO_BALLOON_FREE_PAGE_ALLOC_FLAG,
VIRTIO_BALLOON_FREE_PAGE_ORDER); VIRTIO_BALLOON_HINT_BLOCK_ORDER);
/* /*
* When the allocation returns NULL, it indicates that we have got all * When the allocation returns NULL, it indicates that we have got all
* the possible free pages, so return -EINTR to stop. * the possible free pages, so return -EINTR to stop.
@@ -591,13 +591,13 @@ static int get_free_page_and_send(struct virtio_balloon *vb)
return -EINTR; return -EINTR;
p = page_address(page); p = page_address(page);
sg_init_one(&sg, p, VIRTIO_BALLOON_FREE_PAGE_SIZE); sg_init_one(&sg, p, VIRTIO_BALLOON_HINT_BLOCK_BYTES);
/* There is always 1 entry reserved for the cmd id to use. */ /* There is always 1 entry reserved for the cmd id to use. */
if (vq->num_free > 1) { if (vq->num_free > 1) {
err = virtqueue_add_inbuf(vq, &sg, 1, p, GFP_KERNEL); err = virtqueue_add_inbuf(vq, &sg, 1, p, GFP_KERNEL);
if (unlikely(err)) { if (unlikely(err)) {
free_pages((unsigned long)p, free_pages((unsigned long)p,
VIRTIO_BALLOON_FREE_PAGE_ORDER); VIRTIO_BALLOON_HINT_BLOCK_ORDER);
return err; return err;
} }
virtqueue_kick(vq); virtqueue_kick(vq);
@@ -610,7 +610,7 @@ static int get_free_page_and_send(struct virtio_balloon *vb)
* The vq has no available entry to add this page block, so * The vq has no available entry to add this page block, so
* just free it. * just free it.
*/ */
free_pages((unsigned long)p, VIRTIO_BALLOON_FREE_PAGE_ORDER); free_pages((unsigned long)p, VIRTIO_BALLOON_HINT_BLOCK_ORDER);
} }
return 0; return 0;
@@ -776,11 +776,11 @@ static unsigned long shrink_free_pages(struct virtio_balloon *vb,
unsigned long blocks_to_free, blocks_freed; unsigned long blocks_to_free, blocks_freed;
pages_to_free = round_up(pages_to_free, pages_to_free = round_up(pages_to_free,
1 << VIRTIO_BALLOON_FREE_PAGE_ORDER); 1 << VIRTIO_BALLOON_HINT_BLOCK_ORDER);
blocks_to_free = pages_to_free >> VIRTIO_BALLOON_FREE_PAGE_ORDER; blocks_to_free = pages_to_free >> VIRTIO_BALLOON_HINT_BLOCK_ORDER;
blocks_freed = return_free_pages_to_mm(vb, blocks_to_free); blocks_freed = return_free_pages_to_mm(vb, blocks_to_free);
return blocks_freed << VIRTIO_BALLOON_FREE_PAGE_ORDER; return blocks_freed << VIRTIO_BALLOON_HINT_BLOCK_ORDER;
} }
static unsigned long leak_balloon_pages(struct virtio_balloon *vb, static unsigned long leak_balloon_pages(struct virtio_balloon *vb,
@@ -837,7 +837,7 @@ static unsigned long virtio_balloon_shrinker_count(struct shrinker *shrinker,
unsigned long count; unsigned long count;
count = vb->num_pages / VIRTIO_BALLOON_PAGES_PER_PAGE; 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_HINT_BLOCK_ORDER;
return count; return count;
} }