vhost/net: virtio 1.0 byte swap

[pandora-kernel.git] / drivers / vhost / net.c

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 8dae2f7..c218188 100644 (file)
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -48,15 +48,15 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;"
  * status internally; used for zerocopy tx only.
  */
 /* Lower device DMA failed */
-#define VHOST_DMA_FAILED_LEN   3
+#define VHOST_DMA_FAILED_LEN   ((__force __virtio32)3)
 /* Lower device DMA done */
-#define VHOST_DMA_DONE_LEN     2
+#define VHOST_DMA_DONE_LEN     ((__force __virtio32)2)
 /* Lower device DMA in progress */
-#define VHOST_DMA_IN_PROGRESS  1
+#define VHOST_DMA_IN_PROGRESS  ((__force __virtio32)1)
 /* Buffer unused */
-#define VHOST_DMA_CLEAR_LEN    0
+#define VHOST_DMA_CLEAR_LEN    ((__force __virtio32)0)
 
-#define VHOST_DMA_IS_DONE(len) ((len) >= VHOST_DMA_DONE_LEN)
+#define VHOST_DMA_IS_DONE(len) ((__force u32)(len) >= (__force u32)VHOST_DMA_DONE_LEN)
 
 enum {
        VHOST_NET_FEATURES = VHOST_FEATURES |
@@ -416,7 +416,7 @@ static void handle_tx(struct vhost_net *net)
                        struct ubuf_info *ubuf;
                        ubuf = nvq->ubuf_info + nvq->upend_idx;
 
-                       vq->heads[nvq->upend_idx].id = head;
+                       vq->heads[nvq->upend_idx].id = cpu_to_vhost32(vq, head);
                        vq->heads[nvq->upend_idx].len = VHOST_DMA_IN_PROGRESS;
                        ubuf->callback = vhost_zerocopy_callback;
                        ubuf->ctx = nvq->ubufs;
@@ -500,6 +500,10 @@ static int get_rx_bufs(struct vhost_virtqueue *vq,
        int headcount = 0;
        unsigned d;
        int r, nlogs = 0;
+       /* len is always initialized before use since we are always called with
+        * datalen > 0.
+        */
+       u32 uninitialized_var(len);
 
        while (datalen > 0 && headcount < quota) {
                if (unlikely(seg >= UIO_MAXIOV)) {
@@ -527,13 +531,14 @@ static int get_rx_bufs(struct vhost_virtqueue *vq,
                        nlogs += *log_num;
                        log += *log_num;
                }
-               heads[headcount].id = d;
-               heads[headcount].len = iov_length(vq->iov + seg, in);
-               datalen -= heads[headcount].len;
+               heads[headcount].id = cpu_to_vhost32(vq, d);
+               len = iov_length(vq->iov + seg, in);
+               heads[headcount].len = cpu_to_vhost32(vq, len);
+               datalen -= len;
                ++headcount;
                seg += in;
        }
-       heads[headcount - 1].len += datalen;
+       heads[headcount - 1].len = cpu_to_vhost32(vq, len - datalen);
        *iovcount = seg;
        if (unlikely(log))
                *log_num = nlogs;