* [PATCH] virtio_balloon: fix PFN format for virtio-1
@ 2016-05-18 12:38 Michael S. Tsirkin
2016-05-18 13:27 ` Cornelia Huck
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2016-05-18 12:38 UTC (permalink / raw)
To: linux-kernel; +Cc: Cornelia Huck, virtualization
Everything should be LE when using virtio-1, but
the linux balloon driver does not seem to care about that.
Cc: stable@vger.kernel.org
Reported-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/virtio/virtio_balloon.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 7b6d74f..476c0e3 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -75,7 +75,7 @@ struct virtio_balloon {
/* The array of pfns we tell the Host about. */
unsigned int num_pfns;
- u32 pfns[VIRTIO_BALLOON_ARRAY_PFNS_MAX];
+ __virtio32 pfns[VIRTIO_BALLOON_ARRAY_PFNS_MAX];
/* Memory statistics */
struct virtio_balloon_stat stats[VIRTIO_BALLOON_S_NR];
@@ -127,14 +127,16 @@ static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq)
}
-static void set_page_pfns(u32 pfns[], struct page *page)
+static void set_page_pfns(struct virtio_balloon *vb,
+ __virtio32 pfns[], struct page *page)
{
unsigned int i;
/* Set balloon pfns pointing at this page.
* Note that the first pfn points at start of the page. */
for (i = 0; i < VIRTIO_BALLOON_PAGES_PER_PAGE; i++)
- pfns[i] = page_to_balloon_pfn(page) + i;
+ pfns[i] = cpu_to_virtio32(vb->vdev,
+ page_to_balloon_pfn(page) + i);
}
static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)
@@ -158,7 +160,7 @@ static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)
msleep(200);
break;
}
- set_page_pfns(vb->pfns + vb->num_pfns, page);
+ set_page_pfns(vb, vb->pfns + vb->num_pfns, page);
vb->num_pages += VIRTIO_BALLOON_PAGES_PER_PAGE;
if (!virtio_has_feature(vb->vdev,
VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
@@ -177,10 +179,12 @@ static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)
static void release_pages_balloon(struct virtio_balloon *vb)
{
unsigned int i;
+ struct page *page;
/* Find pfns pointing at start of each page, get pages and free them. */
for (i = 0; i < vb->num_pfns; i += VIRTIO_BALLOON_PAGES_PER_PAGE) {
- struct page *page = balloon_pfn_to_page(vb->pfns[i]);
+ page = balloon_pfn_to_page(virtio32_to_cpu(vb->vdev,
+ vb->pfns[i]));
if (!virtio_has_feature(vb->vdev,
VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
adjust_managed_page_count(page, 1);
@@ -203,7 +207,7 @@ static unsigned leak_balloon(struct virtio_balloon *vb, size_t num)
page = balloon_page_dequeue(vb_dev_info);
if (!page)
break;
- set_page_pfns(vb->pfns + vb->num_pfns, page);
+ set_page_pfns(vb, vb->pfns + vb->num_pfns, page);
vb->num_pages -= VIRTIO_BALLOON_PAGES_PER_PAGE;
}
@@ -471,13 +475,13 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info,
__count_vm_event(BALLOON_MIGRATE);
spin_unlock_irqrestore(&vb_dev_info->pages_lock, flags);
vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE;
- set_page_pfns(vb->pfns, newpage);
+ set_page_pfns(vb, vb->pfns, newpage);
tell_host(vb, vb->inflate_vq);
/* balloon's page migration 2nd step -- deflate "page" */
balloon_page_delete(page);
vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE;
- set_page_pfns(vb->pfns, page);
+ set_page_pfns(vb, vb->pfns, page);
tell_host(vb, vb->deflate_vq);
mutex_unlock(&vb->balloon_lock);
--
MST
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] virtio_balloon: fix PFN format for virtio-1
2016-05-18 12:38 [PATCH] virtio_balloon: fix PFN format for virtio-1 Michael S. Tsirkin
@ 2016-05-18 13:27 ` Cornelia Huck
2016-06-13 7:15 ` Christian Borntraeger
2016-06-13 18:08 ` Michael S. Tsirkin
2 siblings, 0 replies; 6+ messages in thread
From: Cornelia Huck @ 2016-05-18 13:27 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: linux-kernel, virtualization, Christian Borntraeger
On Wed, 18 May 2016 15:38:53 +0300
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> Everything should be LE when using virtio-1, but
> the linux balloon driver does not seem to care about that.
>
> Cc: stable@vger.kernel.org
> Reported-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/virtio/virtio_balloon.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
Keeping the pfns in proper byte order seems less hacky than my
approach, and it fixes the crash for my setup as well.
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] virtio_balloon: fix PFN format for virtio-1
2016-05-18 12:38 [PATCH] virtio_balloon: fix PFN format for virtio-1 Michael S. Tsirkin
2016-05-18 13:27 ` Cornelia Huck
@ 2016-06-13 7:15 ` Christian Borntraeger
2016-06-13 18:08 ` Michael S. Tsirkin
2 siblings, 0 replies; 6+ messages in thread
From: Christian Borntraeger @ 2016-06-13 7:15 UTC (permalink / raw)
To: Michael S. Tsirkin, linux-kernel; +Cc: Cornelia Huck, virtualization, stable
On 05/18/2016 02:38 PM, Michael S. Tsirkin wrote:
> Everything should be LE when using virtio-1, but
> the linux balloon driver does not seem to care about that.
>
> Cc: stable@vger.kernel.org
> Reported-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
The final commit in Linus tree does not contain cc stable
see
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=87c9403b0d1de4676b0bd273eea68fcf6de68e68
But it is certainly table material.
Christian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] virtio_balloon: fix PFN format for virtio-1
2016-05-18 12:38 [PATCH] virtio_balloon: fix PFN format for virtio-1 Michael S. Tsirkin
2016-05-18 13:27 ` Cornelia Huck
2016-06-13 7:15 ` Christian Borntraeger
@ 2016-06-13 18:08 ` Michael S. Tsirkin
2016-06-13 18:35 ` Greg KH
2 siblings, 1 reply; 6+ messages in thread
From: Michael S. Tsirkin @ 2016-06-13 18:08 UTC (permalink / raw)
To: linux-kernel; +Cc: Cornelia Huck, virtualization, stable
On Wed, May 18, 2016 at 03:38:53PM +0300, Michael S. Tsirkin wrote:
> Everything should be LE when using virtio-1, but
> the linux balloon driver does not seem to care about that.
>
> Cc: stable@vger.kernel.org
> Reported-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Forgot to CC stable.
Please consider this patch for inclusion in the next stable Linux.
> ---
> drivers/virtio/virtio_balloon.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
> index 7b6d74f..476c0e3 100644
> --- a/drivers/virtio/virtio_balloon.c
> +++ b/drivers/virtio/virtio_balloon.c
> @@ -75,7 +75,7 @@ struct virtio_balloon {
>
> /* The array of pfns we tell the Host about. */
> unsigned int num_pfns;
> - u32 pfns[VIRTIO_BALLOON_ARRAY_PFNS_MAX];
> + __virtio32 pfns[VIRTIO_BALLOON_ARRAY_PFNS_MAX];
>
> /* Memory statistics */
> struct virtio_balloon_stat stats[VIRTIO_BALLOON_S_NR];
> @@ -127,14 +127,16 @@ static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq)
>
> }
>
> -static void set_page_pfns(u32 pfns[], struct page *page)
> +static void set_page_pfns(struct virtio_balloon *vb,
> + __virtio32 pfns[], struct page *page)
> {
> unsigned int i;
>
> /* Set balloon pfns pointing at this page.
> * Note that the first pfn points at start of the page. */
> for (i = 0; i < VIRTIO_BALLOON_PAGES_PER_PAGE; i++)
> - pfns[i] = page_to_balloon_pfn(page) + i;
> + pfns[i] = cpu_to_virtio32(vb->vdev,
> + page_to_balloon_pfn(page) + i);
> }
>
> static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)
> @@ -158,7 +160,7 @@ static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)
> msleep(200);
> break;
> }
> - set_page_pfns(vb->pfns + vb->num_pfns, page);
> + set_page_pfns(vb, vb->pfns + vb->num_pfns, page);
> vb->num_pages += VIRTIO_BALLOON_PAGES_PER_PAGE;
> if (!virtio_has_feature(vb->vdev,
> VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
> @@ -177,10 +179,12 @@ static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)
> static void release_pages_balloon(struct virtio_balloon *vb)
> {
> unsigned int i;
> + struct page *page;
>
> /* Find pfns pointing at start of each page, get pages and free them. */
> for (i = 0; i < vb->num_pfns; i += VIRTIO_BALLOON_PAGES_PER_PAGE) {
> - struct page *page = balloon_pfn_to_page(vb->pfns[i]);
> + page = balloon_pfn_to_page(virtio32_to_cpu(vb->vdev,
> + vb->pfns[i]));
> if (!virtio_has_feature(vb->vdev,
> VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
> adjust_managed_page_count(page, 1);
> @@ -203,7 +207,7 @@ static unsigned leak_balloon(struct virtio_balloon *vb, size_t num)
> page = balloon_page_dequeue(vb_dev_info);
> if (!page)
> break;
> - set_page_pfns(vb->pfns + vb->num_pfns, page);
> + set_page_pfns(vb, vb->pfns + vb->num_pfns, page);
> vb->num_pages -= VIRTIO_BALLOON_PAGES_PER_PAGE;
> }
>
> @@ -471,13 +475,13 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info,
> __count_vm_event(BALLOON_MIGRATE);
> spin_unlock_irqrestore(&vb_dev_info->pages_lock, flags);
> vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE;
> - set_page_pfns(vb->pfns, newpage);
> + set_page_pfns(vb, vb->pfns, newpage);
> tell_host(vb, vb->inflate_vq);
>
> /* balloon's page migration 2nd step -- deflate "page" */
> balloon_page_delete(page);
> vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE;
> - set_page_pfns(vb->pfns, page);
> + set_page_pfns(vb, vb->pfns, page);
> tell_host(vb, vb->deflate_vq);
>
> mutex_unlock(&vb->balloon_lock);
> --
> MST
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] virtio_balloon: fix PFN format for virtio-1
2016-06-13 18:08 ` Michael S. Tsirkin
@ 2016-06-13 18:35 ` Greg KH
2016-06-13 18:50 ` Christian Borntraeger
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2016-06-13 18:35 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: linux-kernel, Cornelia Huck, virtualization, stable
On Mon, Jun 13, 2016 at 09:08:44PM +0300, Michael S. Tsirkin wrote:
> On Wed, May 18, 2016 at 03:38:53PM +0300, Michael S. Tsirkin wrote:
> > Everything should be LE when using virtio-1, but
> > the linux balloon driver does not seem to care about that.
> >
> > Cc: stable@vger.kernel.org
> > Reported-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> Forgot to CC stable.
> Please consider this patch for inclusion in the next stable Linux.
Someone needs to tell stable@ the git comit id of the patch when it hits
Linus's tree...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] virtio_balloon: fix PFN format for virtio-1
2016-06-13 18:35 ` Greg KH
@ 2016-06-13 18:50 ` Christian Borntraeger
0 siblings, 0 replies; 6+ messages in thread
From: Christian Borntraeger @ 2016-06-13 18:50 UTC (permalink / raw)
To: Greg KH, Michael S. Tsirkin
Cc: linux-kernel, Cornelia Huck, virtualization, stable
On 06/13/2016 08:35 PM, Greg KH wrote:
> On Mon, Jun 13, 2016 at 09:08:44PM +0300, Michael S. Tsirkin wrote:
>> On Wed, May 18, 2016 at 03:38:53PM +0300, Michael S. Tsirkin wrote:
>>> Everything should be LE when using virtio-1, but
>>> the linux balloon driver does not seem to care about that.
>>>
>>> Cc: stable@vger.kernel.org
>>> Reported-by: Cornelia Huck <cornelia.huck@de.ibm.com>
>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>
>> Forgot to CC stable.
>> Please consider this patch for inclusion in the next stable Linux.
>
> Someone needs to tell stable@ the git comit id of the patch when it hits
> Linus's tree...
>
> thanks,
>
> greg k-h
>
See my mail,
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=87c9403b0d1de4676b0bd273eea68fcf6de68e68
commit 87c9403b0d1de4676b0bd273eea
virtio_balloon: fix PFN format for virtio-1
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-13 18:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-18 12:38 [PATCH] virtio_balloon: fix PFN format for virtio-1 Michael S. Tsirkin
2016-05-18 13:27 ` Cornelia Huck
2016-06-13 7:15 ` Christian Borntraeger
2016-06-13 18:08 ` Michael S. Tsirkin
2016-06-13 18:35 ` Greg KH
2016-06-13 18:50 ` Christian Borntraeger
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).