Patchwork [3.5.yuz,extended,stable] Patch "vhost: fix mergeable bufs on BE hosts" has been added to staging queue

mail settings
Submitter Herton Ronaldo Krzesinski
Date Nov. 22, 2012, 4:49 a.m.
Message ID <>
Download mbox | patch
Permalink /patch/200993/
State New
Headers show


Herton Ronaldo Krzesinski - Nov. 22, 2012, 4:49 a.m.
This is a note to let you know that I have just added a patch titled

    vhost: fix mergeable bufs on BE hosts

to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree 
which can be found at:;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.yuz tree, see



From 4344317c81c2f4de4afad535ddf6c214fdfd47b9 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <>
Date: Wed, 24 Oct 2012 20:37:51 +0200
Subject: [PATCH] vhost: fix mergeable bufs on BE hosts

commit 910a578f7e9400a78a3b13aba0b4d2df16a2cb05 upstream.

We copy head count to a 16 bit field, this works by chance on LE but on
BE guest gets 0. Fix it up.

Signed-off-by: Michael S. Tsirkin <>
Tested-by: Alexander Graf <>
Signed-off-by: David S. Miller <>
Signed-off-by: Herton Ronaldo Krzesinski <>
 drivers/vhost/net.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index f82a739..3c4dcc3d9 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -379,7 +379,8 @@  static void handle_rx(struct vhost_net *net)
 		.hdr.gso_type = VIRTIO_NET_HDR_GSO_NONE
 	size_t total_len = 0;
-	int err, headcount, mergeable;
+	int err, mergeable;
+	s16 headcount;
 	size_t vhost_hlen, sock_hlen;
 	size_t vhost_len, sock_len;
 	/* TODO: check that we are running from vhost_worker? */