Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH 1/2] virtio_balloon: name cleanups
To:     "Michael S. Tsirkin" <mst@redhat.com>, linux-kernel@vger.kernel.org
Cc:     Wei Wang <wei.w.wang@intel.com>,
        Khazhismel Kumykov <khazhy@google.com>,
        Jason Wang <jasowang@redhat.com>,
        virtualization@lists.linux-foundation.org
References: <20191119102838.39380-1-mst@redhat.com>
From:   David Hildenbrand <david@redhat.com>
Organization: Red Hat GmbH
Message-ID: <adb64e36-777a-c63d-7de2-9b53dabc334c@redhat.com>
Date:   Tue, 19 Nov 2019 12:37:20 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.1.1
MIME-Version: 1.0
In-Reply-To: <20191119102838.39380-1-mst@redhat.com>
Content-Language: en-US
Content-Type: text/plain; charset=WINDOWS-1252; format=flowed
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 19.11.19 11:29, Michael S. Tsirkin wrote:
> 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.
>=20
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>   drivers/virtio/virtio_balloon.c | 24 ++++++++++++------------
>   1 file changed, 12 insertions(+), 12 deletions(-)
>=20
> diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_ball=
oon.c
> index 65df40f261ab..b6a95cd28d9f 100644
> --- a/drivers/virtio/virtio_balloon.c
> +++ b/drivers/virtio/virtio_balloon.c
> @@ -32,10 +32,10 @@
>   #define VIRTIO_BALLOON_FREE_PAGE_ALLOC_FLAG (__GFP_NORETRY | __GFP_NOWA=
RN | \
>   =09=09=09=09=09     __GFP_NOMEMALLOC)
>   /* 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 */
> -#define VIRTIO_BALLOON_FREE_PAGE_SIZE \
> -=09(1 << (VIRTIO_BALLOON_FREE_PAGE_ORDER + PAGE_SHIFT))
> +#define VIRTIO_BALLOON_HINT_BLOCK_BYTES \
> +=09(1 << (VIRTIO_BALLOON_HINT_BLOCK_ORDER + PAGE_SHIFT))
>  =20
>   #ifdef CONFIG_BALLOON_COMPACTION
>   static struct vfsmount *balloon_mnt;
> @@ -380,7 +380,7 @@ static unsigned long return_free_pages_to_mm(struct v=
irtio_balloon *vb,
>   =09=09if (!page)
>   =09=09=09break;
>   =09=09free_pages((unsigned long)page_address(page),
> -=09=09=09   VIRTIO_BALLOON_FREE_PAGE_ORDER);
> +=09=09=09   VIRTIO_BALLOON_HINT_BLOCK_ORDER);
>   =09}
>   =09vb->num_free_page_blocks -=3D num_returned;
>   =09spin_unlock_irq(&vb->free_page_list_lock);
> @@ -582,7 +582,7 @@ static int get_free_page_and_send(struct virtio_ballo=
on *vb)
>   =09=09;
>  =20
>   =09page =3D alloc_pages(VIRTIO_BALLOON_FREE_PAGE_ALLOC_FLAG,
> -=09=09=09   VIRTIO_BALLOON_FREE_PAGE_ORDER);
> +=09=09=09   VIRTIO_BALLOON_HINT_BLOCK_ORDER);
>   =09/*
>   =09 * When the allocation returns NULL, it indicates that we have got a=
ll
>   =09 * the possible free pages, so return -EINTR to stop.
> @@ -591,13 +591,13 @@ static int get_free_page_and_send(struct virtio_bal=
loon *vb)
>   =09=09return -EINTR;
>  =20
>   =09p =3D page_address(page);
> -=09sg_init_one(&sg, p, VIRTIO_BALLOON_FREE_PAGE_SIZE);
> +=09sg_init_one(&sg, p, VIRTIO_BALLOON_HINT_BLOCK_BYTES);
>   =09/* There is always 1 entry reserved for the cmd id to use. */
>   =09if (vq->num_free > 1) {
>   =09=09err =3D virtqueue_add_inbuf(vq, &sg, 1, p, GFP_KERNEL);
>   =09=09if (unlikely(err)) {
>   =09=09=09free_pages((unsigned long)p,
> -=09=09=09=09   VIRTIO_BALLOON_FREE_PAGE_ORDER);
> +=09=09=09=09   VIRTIO_BALLOON_HINT_BLOCK_ORDER);
>   =09=09=09return err;
>   =09=09}
>   =09=09virtqueue_kick(vq);
> @@ -610,7 +610,7 @@ static int get_free_page_and_send(struct virtio_ballo=
on *vb)
>   =09=09 * The vq has no available entry to add this page block, so
>   =09=09 * just free it.
>   =09=09 */
> -=09=09free_pages((unsigned long)p, VIRTIO_BALLOON_FREE_PAGE_ORDER);
> +=09=09free_pages((unsigned long)p, VIRTIO_BALLOON_HINT_BLOCK_ORDER);
>   =09}
>  =20
>   =09return 0;
> @@ -765,11 +765,11 @@ static unsigned long shrink_free_pages(struct virti=
o_balloon *vb,
>   =09unsigned long blocks_to_free, blocks_freed;
>  =20
>   =09pages_to_free =3D round_up(pages_to_free,
> -=09=09=09=09 1 << VIRTIO_BALLOON_FREE_PAGE_ORDER);
> -=09blocks_to_free =3D pages_to_free >> VIRTIO_BALLOON_FREE_PAGE_ORDER;
> +=09=09=09=09 1 << VIRTIO_BALLOON_HINT_BLOCK_ORDER);
> +=09blocks_to_free =3D pages_to_free >> VIRTIO_BALLOON_HINT_BLOCK_ORDER;
>   =09blocks_freed =3D return_free_pages_to_mm(vb, blocks_to_free);
>  =20
> -=09return blocks_freed << VIRTIO_BALLOON_FREE_PAGE_ORDER;
> +=09return blocks_freed << VIRTIO_BALLOON_HINT_BLOCK_ORDER;
>   }
>  =20
>   static unsigned long leak_balloon_pages(struct virtio_balloon *vb,
> @@ -825,7 +825,7 @@ static unsigned long virtio_balloon_shrinker_count(st=
ruct shrinker *shrinker,
>   =09unsigned long count;
>  =20
>   =09count =3D vb->num_pages / VIRTIO_BALLOON_PAGES_PER_PAGE;
> -=09count +=3D vb->num_free_page_blocks << VIRTIO_BALLOON_FREE_PAGE_ORDER=
;
> +=09count +=3D vb->num_free_page_blocks << VIRTIO_BALLOON_HINT_BLOCK_ORDE=
R;
>  =20
>   =09return count;
>   }
>=20

Reviewed-by: David Hildenbrand <david@redhat.com>

--=20

Thanks,

David / dhildenb