* [PATCH v8 29/50] vhost: make features 64 bit [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> @ 2014-12-01 16:05 ` Michael S. Tsirkin 2014-12-01 16:05 ` [PATCH v8 30/50] vhost: add memory access wrappers Michael S. Tsirkin ` (7 subsequent siblings) 8 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:05 UTC (permalink / raw) To: linux-kernel Cc: David Miller, cornelia.huck, rusty, nab, pbonzini, thuth, dahi, Sergei Shtylyov, Ben Hutchings, Jason Wang, kvm, virtualization, netdev We need to use bit 32 for virtio 1.0. Make vhost_has_feature bool to avoid discarding high bits. Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Cc: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Jason Wang <jasowang@redhat.com> --- drivers/vhost/vhost.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 3eda654..55a95c9 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -106,7 +106,7 @@ struct vhost_virtqueue { /* Protected by virtqueue mutex. */ struct vhost_memory *memory; void *private_data; - unsigned acked_features; + u64 acked_features; /* Log write descriptors */ void __user *log_base; struct vhost_log *log; @@ -172,8 +172,8 @@ enum { (1ULL << VHOST_F_LOG_ALL), }; -static inline int vhost_has_feature(struct vhost_virtqueue *vq, int bit) +static inline bool vhost_has_feature(struct vhost_virtqueue *vq, int bit) { - return vq->acked_features & (1 << bit); + return vq->acked_features & (1ULL << bit); } #endif -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 30/50] vhost: add memory access wrappers [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> 2014-12-01 16:05 ` [PATCH v8 29/50] vhost: make features 64 bit Michael S. Tsirkin @ 2014-12-01 16:05 ` Michael S. Tsirkin 2014-12-01 16:05 ` [PATCH v8 31/50] vhost/net: force len for TX to host endian Michael S. Tsirkin ` (6 subsequent siblings) 8 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:05 UTC (permalink / raw) To: linux-kernel Cc: thuth, kvm, rusty, netdev, virtualization, dahi, pbonzini, David Miller Add guest memory access wrappers to handle virtio endianness conversions. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> --- drivers/vhost/vhost.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 55a95c9..a0a6c98 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -176,4 +176,35 @@ static inline bool vhost_has_feature(struct vhost_virtqueue *vq, int bit) { return vq->acked_features & (1ULL << bit); } + +/* Memory accessors */ +static inline u16 vhost16_to_cpu(struct vhost_virtqueue *vq, __virtio16 val) +{ + return __virtio16_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val); +} + +static inline __virtio16 cpu_to_vhost16(struct vhost_virtqueue *vq, u16 val) +{ + return __cpu_to_virtio16(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val); +} + +static inline u32 vhost32_to_cpu(struct vhost_virtqueue *vq, __virtio32 val) +{ + return __virtio32_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val); +} + +static inline __virtio32 cpu_to_vhost32(struct vhost_virtqueue *vq, u32 val) +{ + return __cpu_to_virtio32(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val); +} + +static inline u64 vhost64_to_cpu(struct vhost_virtqueue *vq, __virtio64 val) +{ + return __virtio64_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val); +} + +static inline __virtio64 cpu_to_vhost64(struct vhost_virtqueue *vq, u64 val) +{ + return __cpu_to_virtio64(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val); +} #endif -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 31/50] vhost/net: force len for TX to host endian [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> 2014-12-01 16:05 ` [PATCH v8 29/50] vhost: make features 64 bit Michael S. Tsirkin 2014-12-01 16:05 ` [PATCH v8 30/50] vhost: add memory access wrappers Michael S. Tsirkin @ 2014-12-01 16:05 ` Michael S. Tsirkin 2014-12-01 16:05 ` [PATCH v8 32/50] vhost: switch to __get/__put_user exclusively Michael S. Tsirkin ` (5 subsequent siblings) 8 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:05 UTC (permalink / raw) To: linux-kernel Cc: thuth, kvm, rusty, netdev, virtualization, dahi, pbonzini, David Miller vhost/net keeps a copy of the used ring in host memory but (ab)uses the length field for internal house-keeping. This works because the length in the used ring for tx is always 0. In order to suppress sparse warnings, we force native endianness here. Note that these values are never exposed to guests. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Jason Wang <jasowang@redhat.com> --- drivers/vhost/net.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 8dae2f7..dce5c58 100644 --- 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 | -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 32/50] vhost: switch to __get/__put_user exclusively [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> ` (2 preceding siblings ...) 2014-12-01 16:05 ` [PATCH v8 31/50] vhost/net: force len for TX to host endian Michael S. Tsirkin @ 2014-12-01 16:05 ` Michael S. Tsirkin 2014-12-01 16:05 ` [PATCH v8 33/50] vhost: virtio 1.0 endian-ness support Michael S. Tsirkin ` (4 subsequent siblings) 8 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:05 UTC (permalink / raw) To: linux-kernel Cc: David Miller, cornelia.huck, rusty, nab, pbonzini, thuth, dahi, kvm, virtualization, netdev Most places in vhost can use __get/__put_user rather than get/put_user since addresses are pre-validated. This should be good for performance, but this also will help make code sparse-clean: get/put_user macros don't play well with __virtioXX bitwise tags. Switch to get/put_user to __ variants everywhere in vhost. There's one exception - for consistency switch that as well, and add an explicit access_ok check. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- drivers/vhost/vhost.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index c90f437..6a40837 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1038,6 +1038,7 @@ static int vhost_update_avail_event(struct vhost_virtqueue *vq, u16 avail_event) int vhost_init_used(struct vhost_virtqueue *vq) { + u16 last_used_idx; int r; if (!vq->private_data) return 0; @@ -1046,7 +1047,13 @@ int vhost_init_used(struct vhost_virtqueue *vq) if (r) return r; vq->signalled_used_valid = false; - return get_user(vq->last_used_idx, &vq->used->idx); + if (!access_ok(VERIFY_READ, &vq->used->idx, sizeof vq->used->idx)) + return -EFAULT; + r = __get_user(last_used_idx, &vq->used->idx); + if (r) + return r; + vq->last_used_idx = last_used_idx; + return 0; } EXPORT_SYMBOL_GPL(vhost_init_used); @@ -1404,7 +1411,7 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads, /* Make sure buffer is written before we update index. */ smp_wmb(); - if (put_user(vq->last_used_idx, &vq->used->idx)) { + if (__put_user(vq->last_used_idx, &vq->used->idx)) { vq_err(vq, "Failed to increment used idx"); return -EFAULT; } @@ -1449,7 +1456,7 @@ static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq) if (unlikely(!v)) return true; - if (get_user(event, vhost_used_event(vq))) { + if (__get_user(event, vhost_used_event(vq))) { vq_err(vq, "Failed to get used event idx"); return true; } -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 33/50] vhost: virtio 1.0 endian-ness support [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> ` (3 preceding siblings ...) 2014-12-01 16:05 ` [PATCH v8 32/50] vhost: switch to __get/__put_user exclusively Michael S. Tsirkin @ 2014-12-01 16:05 ` Michael S. Tsirkin 2014-12-01 16:05 ` [PATCH v8 34/50] vhost/net: virtio 1.0 byte swap Michael S. Tsirkin ` (3 subsequent siblings) 8 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:05 UTC (permalink / raw) To: linux-kernel Cc: thuth, kvm, rusty, netdev, virtualization, dahi, pbonzini, David Miller Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- drivers/vhost/vhost.c | 86 +++++++++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 37 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 6a40837..ed71b53 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -33,8 +33,8 @@ enum { VHOST_MEMORY_F_LOG = 0x1, }; -#define vhost_used_event(vq) ((u16 __user *)&vq->avail->ring[vq->num]) -#define vhost_avail_event(vq) ((u16 __user *)&vq->used->ring[vq->num]) +#define vhost_used_event(vq) ((__virtio16 __user *)&vq->avail->ring[vq->num]) +#define vhost_avail_event(vq) ((__virtio16 __user *)&vq->used->ring[vq->num]) static void vhost_poll_func(struct file *file, wait_queue_head_t *wqh, poll_table *pt) @@ -1001,7 +1001,7 @@ EXPORT_SYMBOL_GPL(vhost_log_write); static int vhost_update_used_flags(struct vhost_virtqueue *vq) { void __user *used; - if (__put_user(vq->used_flags, &vq->used->flags) < 0) + if (__put_user(cpu_to_vhost16(vq, vq->used_flags), &vq->used->flags) < 0) return -EFAULT; if (unlikely(vq->log_used)) { /* Make sure the flag is seen before log. */ @@ -1019,7 +1019,7 @@ static int vhost_update_used_flags(struct vhost_virtqueue *vq) static int vhost_update_avail_event(struct vhost_virtqueue *vq, u16 avail_event) { - if (__put_user(vq->avail_idx, vhost_avail_event(vq))) + if (__put_user(cpu_to_vhost16(vq, vq->avail_idx), vhost_avail_event(vq))) return -EFAULT; if (unlikely(vq->log_used)) { void __user *used; @@ -1038,7 +1038,7 @@ static int vhost_update_avail_event(struct vhost_virtqueue *vq, u16 avail_event) int vhost_init_used(struct vhost_virtqueue *vq) { - u16 last_used_idx; + __virtio16 last_used_idx; int r; if (!vq->private_data) return 0; @@ -1052,7 +1052,7 @@ int vhost_init_used(struct vhost_virtqueue *vq) r = __get_user(last_used_idx, &vq->used->idx); if (r) return r; - vq->last_used_idx = last_used_idx; + vq->last_used_idx = vhost16_to_cpu(vq, last_used_idx); return 0; } EXPORT_SYMBOL_GPL(vhost_init_used); @@ -1094,16 +1094,16 @@ static int translate_desc(struct vhost_virtqueue *vq, u64 addr, u32 len, /* Each buffer in the virtqueues is actually a chain of descriptors. This * function returns the next descriptor in the chain, * or -1U if we're at the end. */ -static unsigned next_desc(struct vring_desc *desc) +static unsigned next_desc(struct vhost_virtqueue *vq, struct vring_desc *desc) { unsigned int next; /* If this descriptor says it doesn't chain, we're done. */ - if (!(desc->flags & VRING_DESC_F_NEXT)) + if (!(desc->flags & cpu_to_vhost16(vq, VRING_DESC_F_NEXT))) return -1U; /* Check they're not leading us off end of descriptors. */ - next = desc->next; + next = vhost16_to_cpu(vq, desc->next); /* Make sure compiler knows to grab that: we don't want it changing! */ /* We will use the result as an index in an array, so most * architectures only need a compiler barrier here. */ @@ -1120,18 +1120,19 @@ static int get_indirect(struct vhost_virtqueue *vq, { struct vring_desc desc; unsigned int i = 0, count, found = 0; + u32 len = vhost32_to_cpu(vq, indirect->len); int ret; /* Sanity check */ - if (unlikely(indirect->len % sizeof desc)) { + if (unlikely(len % sizeof desc)) { vq_err(vq, "Invalid length in indirect descriptor: " "len 0x%llx not multiple of 0x%zx\n", - (unsigned long long)indirect->len, + (unsigned long long)len, sizeof desc); return -EINVAL; } - ret = translate_desc(vq, indirect->addr, indirect->len, vq->indirect, + ret = translate_desc(vq, vhost64_to_cpu(vq, indirect->addr), len, vq->indirect, UIO_MAXIOV); if (unlikely(ret < 0)) { vq_err(vq, "Translation failure %d in indirect.\n", ret); @@ -1142,7 +1143,7 @@ static int get_indirect(struct vhost_virtqueue *vq, * architectures only need a compiler barrier here. */ read_barrier_depends(); - count = indirect->len / sizeof desc; + count = len / sizeof desc; /* Buffers are chained via a 16 bit next field, so * we can have at most 2^16 of these. */ if (unlikely(count > USHRT_MAX + 1)) { @@ -1162,16 +1163,17 @@ static int get_indirect(struct vhost_virtqueue *vq, if (unlikely(memcpy_fromiovec((unsigned char *)&desc, vq->indirect, sizeof desc))) { vq_err(vq, "Failed indirect descriptor: idx %d, %zx\n", - i, (size_t)indirect->addr + i * sizeof desc); + i, (size_t)vhost64_to_cpu(vq, indirect->addr) + i * sizeof desc); return -EINVAL; } - if (unlikely(desc.flags & VRING_DESC_F_INDIRECT)) { + if (unlikely(desc.flags & cpu_to_vhost16(vq, VRING_DESC_F_INDIRECT))) { vq_err(vq, "Nested indirect descriptor: idx %d, %zx\n", - i, (size_t)indirect->addr + i * sizeof desc); + i, (size_t)vhost64_to_cpu(vq, indirect->addr) + i * sizeof desc); return -EINVAL; } - ret = translate_desc(vq, desc.addr, desc.len, iov + iov_count, + ret = translate_desc(vq, vhost64_to_cpu(vq, desc.addr), + vhost32_to_cpu(vq, desc.len), iov + iov_count, iov_size - iov_count); if (unlikely(ret < 0)) { vq_err(vq, "Translation failure %d indirect idx %d\n", @@ -1179,11 +1181,11 @@ static int get_indirect(struct vhost_virtqueue *vq, return ret; } /* If this is an input descriptor, increment that count. */ - if (desc.flags & VRING_DESC_F_WRITE) { + if (desc.flags & cpu_to_vhost16(vq, VRING_DESC_F_WRITE)) { *in_num += ret; if (unlikely(log)) { - log[*log_num].addr = desc.addr; - log[*log_num].len = desc.len; + log[*log_num].addr = vhost64_to_cpu(vq, desc.addr); + log[*log_num].len = vhost32_to_cpu(vq, desc.len); ++*log_num; } } else { @@ -1196,7 +1198,7 @@ static int get_indirect(struct vhost_virtqueue *vq, } *out_num += ret; } - } while ((i = next_desc(&desc)) != -1); + } while ((i = next_desc(vq, &desc)) != -1); return 0; } @@ -1216,15 +1218,18 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, struct vring_desc desc; unsigned int i, head, found = 0; u16 last_avail_idx; + __virtio16 avail_idx; + __virtio16 ring_head; int ret; /* Check it isn't doing very strange things with descriptor numbers. */ last_avail_idx = vq->last_avail_idx; - if (unlikely(__get_user(vq->avail_idx, &vq->avail->idx))) { + if (unlikely(__get_user(avail_idx, &vq->avail->idx))) { vq_err(vq, "Failed to access avail idx at %p\n", &vq->avail->idx); return -EFAULT; } + vq->avail_idx = vhost16_to_cpu(vq, avail_idx); if (unlikely((u16)(vq->avail_idx - last_avail_idx) > vq->num)) { vq_err(vq, "Guest moved used index from %u to %u", @@ -1241,7 +1246,7 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, /* Grab the next descriptor number they're advertising, and increment * the index we've seen. */ - if (unlikely(__get_user(head, + if (unlikely(__get_user(ring_head, &vq->avail->ring[last_avail_idx % vq->num]))) { vq_err(vq, "Failed to read head: idx %d address %p\n", last_avail_idx, @@ -1249,6 +1254,8 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, return -EFAULT; } + head = vhost16_to_cpu(vq, ring_head); + /* If their number is silly, that's an error. */ if (unlikely(head >= vq->num)) { vq_err(vq, "Guest says index %u > %u is available", @@ -1281,7 +1288,7 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, i, vq->desc + i); return -EFAULT; } - if (desc.flags & VRING_DESC_F_INDIRECT) { + if (desc.flags & cpu_to_vhost16(vq, VRING_DESC_F_INDIRECT)) { ret = get_indirect(vq, iov, iov_size, out_num, in_num, log, log_num, &desc); @@ -1293,20 +1300,21 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, continue; } - ret = translate_desc(vq, desc.addr, desc.len, iov + iov_count, + ret = translate_desc(vq, vhost64_to_cpu(vq, desc.addr), + vhost32_to_cpu(vq, desc.len), iov + iov_count, iov_size - iov_count); if (unlikely(ret < 0)) { vq_err(vq, "Translation failure %d descriptor idx %d\n", ret, i); return ret; } - if (desc.flags & VRING_DESC_F_WRITE) { + if (desc.flags & cpu_to_vhost16(vq, VRING_DESC_F_WRITE)) { /* If this is an input descriptor, * increment that count. */ *in_num += ret; if (unlikely(log)) { - log[*log_num].addr = desc.addr; - log[*log_num].len = desc.len; + log[*log_num].addr = vhost64_to_cpu(vq, desc.addr); + log[*log_num].len = vhost32_to_cpu(vq, desc.len); ++*log_num; } } else { @@ -1319,7 +1327,7 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, } *out_num += ret; } - } while ((i = next_desc(&desc)) != -1); + } while ((i = next_desc(vq, &desc)) != -1); /* On success, increment avail index. */ vq->last_avail_idx++; @@ -1342,7 +1350,10 @@ EXPORT_SYMBOL_GPL(vhost_discard_vq_desc); * want to notify the guest, using eventfd. */ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len) { - struct vring_used_elem heads = { head, len }; + struct vring_used_elem heads = { + cpu_to_vhost32(vq, head), + cpu_to_vhost32(vq, len) + }; return vhost_add_used_n(vq, &heads, 1); } @@ -1411,7 +1422,7 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads, /* Make sure buffer is written before we update index. */ smp_wmb(); - if (__put_user(vq->last_used_idx, &vq->used->idx)) { + if (__put_user(cpu_to_vhost16(vq, vq->last_used_idx), &vq->used->idx)) { vq_err(vq, "Failed to increment used idx"); return -EFAULT; } @@ -1429,7 +1440,8 @@ EXPORT_SYMBOL_GPL(vhost_add_used_n); static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq) { - __u16 old, new, event; + __u16 old, new; + __virtio16 event; bool v; /* Flush out used index updates. This is paired * with the barrier that the Guest executes when enabling @@ -1441,12 +1453,12 @@ static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq) return true; if (!vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX)) { - __u16 flags; + __virtio16 flags; if (__get_user(flags, &vq->avail->flags)) { vq_err(vq, "Failed to get flags"); return true; } - return !(flags & VRING_AVAIL_F_NO_INTERRUPT); + return !(flags & cpu_to_vhost16(vq, VRING_AVAIL_F_NO_INTERRUPT)); } old = vq->signalled_used; v = vq->signalled_used_valid; @@ -1460,7 +1472,7 @@ static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq) vq_err(vq, "Failed to get used event idx"); return true; } - return vring_need_event(event, new, old); + return vring_need_event(vhost16_to_cpu(vq, event), new, old); } /* This actually signals the guest, using eventfd. */ @@ -1495,7 +1507,7 @@ EXPORT_SYMBOL_GPL(vhost_add_used_and_signal_n); /* OK, now we need to know about added descriptors. */ bool vhost_enable_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq) { - u16 avail_idx; + __virtio16 avail_idx; int r; if (!(vq->used_flags & VRING_USED_F_NO_NOTIFY)) @@ -1526,7 +1538,7 @@ bool vhost_enable_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq) return false; } - return avail_idx != vq->avail_idx; + return vhost16_to_cpu(vq, avail_idx) != vq->avail_idx; } EXPORT_SYMBOL_GPL(vhost_enable_notify); -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 34/50] vhost/net: virtio 1.0 byte swap [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> ` (4 preceding siblings ...) 2014-12-01 16:05 ` [PATCH v8 33/50] vhost: virtio 1.0 endian-ness support Michael S. Tsirkin @ 2014-12-01 16:05 ` Michael S. Tsirkin 2015-01-06 23:55 ` Alex Williamson 2014-12-01 16:05 ` [PATCH v8 35/50] vhost/net: larger header for virtio 1.0 Michael S. Tsirkin ` (2 subsequent siblings) 8 siblings, 1 reply; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:05 UTC (permalink / raw) To: linux-kernel Cc: thuth, kvm, rusty, netdev, virtualization, dahi, pbonzini, David Miller I had to add an explicit tag to suppress compiler warning: gcc isn't smart enough to notice that len is always initialized since function is called with size > 0. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> --- drivers/vhost/net.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index dce5c58..c218188 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -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; -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v8 34/50] vhost/net: virtio 1.0 byte swap 2014-12-01 16:05 ` [PATCH v8 34/50] vhost/net: virtio 1.0 byte swap Michael S. Tsirkin @ 2015-01-06 23:55 ` Alex Williamson 2015-01-07 8:31 ` Greg Kurz 0 siblings, 1 reply; 12+ messages in thread From: Alex Williamson @ 2015-01-06 23:55 UTC (permalink / raw) To: Michael S. Tsirkin Cc: linux-kernel, David Miller, cornelia.huck, rusty, nab, pbonzini, thuth, dahi, kvm, virtualization, netdev On Mon, 2014-12-01 at 18:05 +0200, Michael S. Tsirkin wrote: > I had to add an explicit tag to suppress compiler warning: > gcc isn't smart enough to notice that > len is always initialized since function is called with size > 0. I'm getting a panic inside a guest when this change is applied on the host. I identified this patch via bisect and confirmed by reverting it from v3.19-rc2. Guest is centos6. Thanks, Alex commit 8b38694a2dc8b18374310df50174f1e4376d6824 Author: Michael S. Tsirkin <mst@redhat.com> Date: Fri Oct 24 14:19:48 2014 +0300 vhost/net: virtio 1.0 byte swap I had to add an explicit tag to suppress compiler warning: gcc isn't smart enough to notice that len is always initialized since function is called with size > 0. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> XML chunk: <interface type='direct'> <mac address='52:54:00:64:f3:34'/> <source dev='iscsinet0' mode='bridge'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Panic log: <1>BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 <1>IP: [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] <4>PGD 1aa2f4067 PUD 1aa2f5067 PMD 0 <4>Oops: 0000 [#1] SMP <4>last sysfs file: /sys/devices/pci0000:00/0000:00:03.0/virtio0/net/eth9/ifindex <4>CPU 0 <4>Modules linked in: 8021q garp stp llc ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables ipv6 uinput microcode snd_hda_codec_realtek snd_hda_intel snd_hda_codec snd_hwdep snd_seq snd_seq_device snd_pcm snd_timer snd soundcore snd_page_alloc igbvf nvidia(P)(U) i2c_core tg3 ptp pps_core virtio_balloon virtio_net virtio_console ext4 jbd2 mbcache virtio_blk virtio_pci virtio_ring virtio pata_acpi ata_generic ata_piix dm_mirror dm_region_hash dm_log dm_mod [last unloaded: speedstep_lib] <4> <4>Pid: 1374, comm: NetworkManager Tainted: P --------------- 2.6.32-431.23.3.el6.centos.plus.x86_64 #1 QEMU Standard PC (i440FX + PIIX, 1996) <4>RIP: 0010:[<ffffffffa0079469>] [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] <4>RSP: 0018:ffff880028203e48 EFLAGS: 00010246 <4>RAX: ffff8801a3383d00 RBX: ffff8801a6aaf480 RCX: ffff8801aa20b6e0 <4>RDX: 00000000000000c0 RSI: ffff8801a3383c00 RDI: ffff8801a3383cc0 <4>RBP: ffff880028203ed8 R08: 000000000000009e R09: ffff8801aa1d800c <4>R10: 0000000000000218 R11: 0000000000000000 R12: ffff8801aa20b6e0 <4>R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 <4>FS: 00007febf114d800(0000) GS:ffff880028200000(0000) knlGS:0000000000000000 <4>CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 <4>CR2: 0000000000000010 CR3: 00000001aa793000 CR4: 00000000000006f0 <4>DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 <4>DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 <4>Process NetworkManager (pid: 1374, threadinfo ffff8801a74ba000, task ffff8801a8d56040) <4>Stack: <4> ffff8801aa1d8000 000000000000009e ffff8801aa20b6e0 ffff8801aa20b718 <4><d> ffff8801aa20b780 ffff8801aa1d800c ffff8801a6aaf4b8 ffff8801aa20b020 <4><d> 0000000000000080 ffff8801aa20b708 0000000000000001 00001f5981a830c8 <4>Call Trace: <4> <IRQ> <4> [<ffffffff8146ae33>] net_rx_action+0x103/0x2f0 <4> [<ffffffff8107a5f1>] __do_softirq+0xc1/0x1e0 <4> [<ffffffff8100c30c>] ? call_softirq+0x1c/0x30 <4> [<ffffffff8100c30c>] call_softirq+0x1c/0x30 <4> <EOI> <4> [<ffffffff8100fa75>] ? do_softirq+0x65/0xa0 <4> [<ffffffff8107b2ea>] local_bh_enable+0x9a/0xb0 <4> [<ffffffffa007813a>] virtnet_napi_enable+0x4a/0x60 [virtio_net] <4> [<ffffffffa0078ebf>] virtnet_open+0x4f/0x60 [virtio_net] <4> [<ffffffff81467691>] dev_open+0xa1/0x100 <4> [<ffffffff81466751>] dev_change_flags+0xa1/0x1d0 <4> [<ffffffff81474a59>] do_setlink+0x169/0x8b0 <4> [<ffffffff814770b6>] ? rtnl_fill_ifinfo+0x946/0xcb0 <4> [<ffffffff812a3d24>] ? nla_parse+0x34/0x110 <4> [<ffffffff8147659e>] rtnl_setlink+0xee/0x130 <4> [<ffffffff81475b67>] rtnetlink_rcv_msg+0x2d7/0x340 <4> [<ffffffff81231e14>] ? socket_has_perm+0x74/0x90 <4> [<ffffffff81475890>] ? rtnetlink_rcv_msg+0x0/0x340 <4> [<ffffffff814910a9>] netlink_rcv_skb+0xa9/0xd0 <4> [<ffffffff81475875>] rtnetlink_rcv+0x25/0x40 <4> [<ffffffff81490cdb>] netlink_unicast+0x2db/0x320 <4> [<ffffffff81491750>] netlink_sendmsg+0x2c0/0x3d0 <4> [<ffffffff814520c3>] sock_sendmsg+0x123/0x150 <4> [<ffffffff81453d73>] ? sock_recvmsg+0x133/0x160 <4> [<ffffffff8109afa0>] ? autoremove_wake_function+0x0/0x40 <4> [<ffffffff81136941>] ? lru_cache_add_lru+0x21/0x40 <4> [<ffffffff8115522d>] ? page_add_new_anon_rmap+0x9d/0xf0 <4> [<ffffffff8114aeef>] ? handle_pte_fault+0x4af/0xb00 <4> [<ffffffff81451f14>] ? move_addr_to_kernel+0x64/0x70 <4> [<ffffffff814538b6>] __sys_sendmsg+0x406/0x420 <4> [<ffffffff8104a98c>] ? __do_page_fault+0x1ec/0x480 <4> [<ffffffff814523d9>] ? sys_sendto+0x139/0x190 <4> [<ffffffff8103ea6c>] ? kvm_clock_read+0x1c/0x20 <4> [<ffffffff81453ad9>] sys_sendmsg+0x49/0x90 <4> [<ffffffff8100b072>] system_call_fastpath+0x16/0x1b <4>Code: 83 e0 00 00 00 00 10 00 00 48 03 93 d0 00 00 00 66 83 42 04 01 8b 93 cc 00 00 00 48 8b b3 d0 00 00 00 80 4c 16 10 20 44 2b 68 0c <4d> 8b 76 10 75 89 e9 d1 fd ff ff 0f 1f 40 00 a8 02 74 0d 0f b6 <1>RIP [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] <4> RSP <ffff880028203e48> <4>CR2: 0000000000000010 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v8 34/50] vhost/net: virtio 1.0 byte swap 2015-01-06 23:55 ` Alex Williamson @ 2015-01-07 8:31 ` Greg Kurz 2015-01-07 8:57 ` Michael S. Tsirkin 0 siblings, 1 reply; 12+ messages in thread From: Greg Kurz @ 2015-01-07 8:31 UTC (permalink / raw) To: Alex Williamson Cc: thuth, kvm, Michael S. Tsirkin, rusty, netdev, linux-kernel, virtualization, dahi, pbonzini, David Miller On Tue, 06 Jan 2015 16:55:30 -0700 Alex Williamson <alex.williamson@redhat.com> wrote: > On Mon, 2014-12-01 at 18:05 +0200, Michael S. Tsirkin wrote: > > I had to add an explicit tag to suppress compiler warning: > > gcc isn't smart enough to notice that > > len is always initialized since function is called with size > 0. > > I'm getting a panic inside a guest when this change is applied on the > host. I identified this patch via bisect and confirmed by reverting it > from v3.19-rc2. Guest is centos6. Thanks, > > Alex > > commit 8b38694a2dc8b18374310df50174f1e4376d6824 > Author: Michael S. Tsirkin <mst@redhat.com> > Date: Fri Oct 24 14:19:48 2014 +0300 > > vhost/net: virtio 1.0 byte swap > > I had to add an explicit tag to suppress compiler warning: > gcc isn't smart enough to notice that > len is always initialized since function is called with size > 0. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> > This chunk looks suspicious: - heads[headcount - 1].len += datalen; + heads[headcount - 1].len = cpu_to_vhost32(vq, len - datalen); s/len - datalen/len + datalen/ ? > XML chunk: > > <interface type='direct'> > <mac address='52:54:00:64:f3:34'/> > <source dev='iscsinet0' mode='bridge'/> > <model type='virtio'/> > <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> > </interface> > > Panic log: > > <1>BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 > <1>IP: [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] > <4>PGD 1aa2f4067 PUD 1aa2f5067 PMD 0 > <4>Oops: 0000 [#1] SMP > <4>last sysfs file: /sys/devices/pci0000:00/0000:00:03.0/virtio0/net/eth9/ifindex > <4>CPU 0 > <4>Modules linked in: 8021q garp stp llc ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables ipv6 uinput microcode snd_hda_codec_realtek snd_hda_intel snd_hda_codec snd_hwdep snd_seq snd_seq_device snd_pcm snd_timer snd soundcore snd_page_alloc igbvf nvidia(P)(U) i2c_core tg3 ptp pps_core virtio_balloon virtio_net virtio_console ext4 jbd2 mbcache virtio_blk virtio_pci virtio_ring virtio pata_acpi ata_generic ata_piix dm_mirror dm_region_hash dm_log dm_mod [last unloaded: speedstep_lib] > <4> > <4>Pid: 1374, comm: NetworkManager Tainted: P --------------- 2.6.32-431.23.3.el6.centos.plus.x86_64 #1 QEMU Standard PC (i440FX + PIIX, 1996) > <4>RIP: 0010:[<ffffffffa0079469>] [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] > <4>RSP: 0018:ffff880028203e48 EFLAGS: 00010246 > <4>RAX: ffff8801a3383d00 RBX: ffff8801a6aaf480 RCX: ffff8801aa20b6e0 > <4>RDX: 00000000000000c0 RSI: ffff8801a3383c00 RDI: ffff8801a3383cc0 > <4>RBP: ffff880028203ed8 R08: 000000000000009e R09: ffff8801aa1d800c > <4>R10: 0000000000000218 R11: 0000000000000000 R12: ffff8801aa20b6e0 > <4>R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 > <4>FS: 00007febf114d800(0000) GS:ffff880028200000(0000) knlGS:0000000000000000 > <4>CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > <4>CR2: 0000000000000010 CR3: 00000001aa793000 CR4: 00000000000006f0 > <4>DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > <4>DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 > <4>Process NetworkManager (pid: 1374, threadinfo ffff8801a74ba000, task ffff8801a8d56040) > <4>Stack: > <4> ffff8801aa1d8000 000000000000009e ffff8801aa20b6e0 ffff8801aa20b718 > <4><d> ffff8801aa20b780 ffff8801aa1d800c ffff8801a6aaf4b8 ffff8801aa20b020 > <4><d> 0000000000000080 ffff8801aa20b708 0000000000000001 00001f5981a830c8 > <4>Call Trace: > <4> <IRQ> > <4> [<ffffffff8146ae33>] net_rx_action+0x103/0x2f0 > <4> [<ffffffff8107a5f1>] __do_softirq+0xc1/0x1e0 > <4> [<ffffffff8100c30c>] ? call_softirq+0x1c/0x30 > <4> [<ffffffff8100c30c>] call_softirq+0x1c/0x30 > <4> <EOI> > <4> [<ffffffff8100fa75>] ? do_softirq+0x65/0xa0 > <4> [<ffffffff8107b2ea>] local_bh_enable+0x9a/0xb0 > <4> [<ffffffffa007813a>] virtnet_napi_enable+0x4a/0x60 [virtio_net] > <4> [<ffffffffa0078ebf>] virtnet_open+0x4f/0x60 [virtio_net] > <4> [<ffffffff81467691>] dev_open+0xa1/0x100 > <4> [<ffffffff81466751>] dev_change_flags+0xa1/0x1d0 > <4> [<ffffffff81474a59>] do_setlink+0x169/0x8b0 > <4> [<ffffffff814770b6>] ? rtnl_fill_ifinfo+0x946/0xcb0 > <4> [<ffffffff812a3d24>] ? nla_parse+0x34/0x110 > <4> [<ffffffff8147659e>] rtnl_setlink+0xee/0x130 > <4> [<ffffffff81475b67>] rtnetlink_rcv_msg+0x2d7/0x340 > <4> [<ffffffff81231e14>] ? socket_has_perm+0x74/0x90 > <4> [<ffffffff81475890>] ? rtnetlink_rcv_msg+0x0/0x340 > <4> [<ffffffff814910a9>] netlink_rcv_skb+0xa9/0xd0 > <4> [<ffffffff81475875>] rtnetlink_rcv+0x25/0x40 > <4> [<ffffffff81490cdb>] netlink_unicast+0x2db/0x320 > <4> [<ffffffff81491750>] netlink_sendmsg+0x2c0/0x3d0 > <4> [<ffffffff814520c3>] sock_sendmsg+0x123/0x150 > <4> [<ffffffff81453d73>] ? sock_recvmsg+0x133/0x160 > <4> [<ffffffff8109afa0>] ? autoremove_wake_function+0x0/0x40 > <4> [<ffffffff81136941>] ? lru_cache_add_lru+0x21/0x40 > <4> [<ffffffff8115522d>] ? page_add_new_anon_rmap+0x9d/0xf0 > <4> [<ffffffff8114aeef>] ? handle_pte_fault+0x4af/0xb00 > <4> [<ffffffff81451f14>] ? move_addr_to_kernel+0x64/0x70 > <4> [<ffffffff814538b6>] __sys_sendmsg+0x406/0x420 > <4> [<ffffffff8104a98c>] ? __do_page_fault+0x1ec/0x480 > <4> [<ffffffff814523d9>] ? sys_sendto+0x139/0x190 > <4> [<ffffffff8103ea6c>] ? kvm_clock_read+0x1c/0x20 > <4> [<ffffffff81453ad9>] sys_sendmsg+0x49/0x90 > <4> [<ffffffff8100b072>] system_call_fastpath+0x16/0x1b > <4>Code: 83 e0 00 00 00 00 10 00 00 48 03 93 d0 00 00 00 66 83 42 04 01 8b 93 cc 00 00 00 48 8b b3 d0 00 00 00 80 4c 16 10 20 44 2b 68 0c <4d> 8b 76 10 75 89 e9 d1 fd ff ff 0f 1f 40 00 a8 02 74 0d 0f b6 > <1>RIP [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] > <4> RSP <ffff880028203e48> > <4>CR2: 0000000000000010 > > > _______________________________________________ > Virtualization mailing list > Virtualization@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/virtualization > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v8 34/50] vhost/net: virtio 1.0 byte swap 2015-01-07 8:31 ` Greg Kurz @ 2015-01-07 8:57 ` Michael S. Tsirkin 0 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2015-01-07 8:57 UTC (permalink / raw) To: Greg Kurz Cc: Alex Williamson, thuth, kvm, rusty, netdev, linux-kernel, virtualization, dahi, pbonzini, David Miller On Wed, Jan 07, 2015 at 09:31:05AM +0100, Greg Kurz wrote: > On Tue, 06 Jan 2015 16:55:30 -0700 > Alex Williamson <alex.williamson@redhat.com> wrote: > > > On Mon, 2014-12-01 at 18:05 +0200, Michael S. Tsirkin wrote: > > > I had to add an explicit tag to suppress compiler warning: > > > gcc isn't smart enough to notice that > > > len is always initialized since function is called with size > 0. > > > > I'm getting a panic inside a guest when this change is applied on the > > host. I identified this patch via bisect and confirmed by reverting it > > from v3.19-rc2. Guest is centos6. Thanks, > > > > Alex > > > > commit 8b38694a2dc8b18374310df50174f1e4376d6824 > > Author: Michael S. Tsirkin <mst@redhat.com> > > Date: Fri Oct 24 14:19:48 2014 +0300 > > > > vhost/net: virtio 1.0 byte swap > > > > I had to add an explicit tag to suppress compiler warning: > > gcc isn't smart enough to notice that > > len is always initialized since function is called with size > 0. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> > > > > This chunk looks suspicious: > > - heads[headcount - 1].len += datalen; > + heads[headcount - 1].len = cpu_to_vhost32(vq, len - datalen); > > s/len - datalen/len + datalen/ ? Indeed! I just sent a patch fixing this, thanks a lot. > > XML chunk: > > > > <interface type='direct'> > > <mac address='52:54:00:64:f3:34'/> > > <source dev='iscsinet0' mode='bridge'/> > > <model type='virtio'/> > > <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> > > </interface> > > > > Panic log: > > > > <1>BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 > > <1>IP: [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] > > <4>PGD 1aa2f4067 PUD 1aa2f5067 PMD 0 > > <4>Oops: 0000 [#1] SMP > > <4>last sysfs file: /sys/devices/pci0000:00/0000:00:03.0/virtio0/net/eth9/ifindex > > <4>CPU 0 > > <4>Modules linked in: 8021q garp stp llc ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables ipv6 uinput microcode snd_hda_codec_realtek snd_hda_intel snd_hda_codec snd_hwdep snd_seq snd_seq_device snd_pcm snd_timer snd soundcore snd_page_alloc igbvf nvidia(P)(U) i2c_core tg3 ptp pps_core virtio_balloon virtio_net virtio_console ext4 jbd2 mbcache virtio_blk virtio_pci virtio_ring virtio pata_acpi ata_generic ata_piix dm_mirror dm_region_hash dm_log dm_mod [last unloaded: speedstep_lib] > > <4> > > <4>Pid: 1374, comm: NetworkManager Tainted: P --------------- 2.6.32-431.23.3.el6.centos.plus.x86_64 #1 QEMU Standard PC (i440FX + PIIX, 1996) > > <4>RIP: 0010:[<ffffffffa0079469>] [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] > > <4>RSP: 0018:ffff880028203e48 EFLAGS: 00010246 > > <4>RAX: ffff8801a3383d00 RBX: ffff8801a6aaf480 RCX: ffff8801aa20b6e0 > > <4>RDX: 00000000000000c0 RSI: ffff8801a3383c00 RDI: ffff8801a3383cc0 > > <4>RBP: ffff880028203ed8 R08: 000000000000009e R09: ffff8801aa1d800c > > <4>R10: 0000000000000218 R11: 0000000000000000 R12: ffff8801aa20b6e0 > > <4>R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 > > <4>FS: 00007febf114d800(0000) GS:ffff880028200000(0000) knlGS:0000000000000000 > > <4>CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > > <4>CR2: 0000000000000010 CR3: 00000001aa793000 CR4: 00000000000006f0 > > <4>DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > > <4>DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 > > <4>Process NetworkManager (pid: 1374, threadinfo ffff8801a74ba000, task ffff8801a8d56040) > > <4>Stack: > > <4> ffff8801aa1d8000 000000000000009e ffff8801aa20b6e0 ffff8801aa20b718 > > <4><d> ffff8801aa20b780 ffff8801aa1d800c ffff8801a6aaf4b8 ffff8801aa20b020 > > <4><d> 0000000000000080 ffff8801aa20b708 0000000000000001 00001f5981a830c8 > > <4>Call Trace: > > <4> <IRQ> > > <4> [<ffffffff8146ae33>] net_rx_action+0x103/0x2f0 > > <4> [<ffffffff8107a5f1>] __do_softirq+0xc1/0x1e0 > > <4> [<ffffffff8100c30c>] ? call_softirq+0x1c/0x30 > > <4> [<ffffffff8100c30c>] call_softirq+0x1c/0x30 > > <4> <EOI> > > <4> [<ffffffff8100fa75>] ? do_softirq+0x65/0xa0 > > <4> [<ffffffff8107b2ea>] local_bh_enable+0x9a/0xb0 > > <4> [<ffffffffa007813a>] virtnet_napi_enable+0x4a/0x60 [virtio_net] > > <4> [<ffffffffa0078ebf>] virtnet_open+0x4f/0x60 [virtio_net] > > <4> [<ffffffff81467691>] dev_open+0xa1/0x100 > > <4> [<ffffffff81466751>] dev_change_flags+0xa1/0x1d0 > > <4> [<ffffffff81474a59>] do_setlink+0x169/0x8b0 > > <4> [<ffffffff814770b6>] ? rtnl_fill_ifinfo+0x946/0xcb0 > > <4> [<ffffffff812a3d24>] ? nla_parse+0x34/0x110 > > <4> [<ffffffff8147659e>] rtnl_setlink+0xee/0x130 > > <4> [<ffffffff81475b67>] rtnetlink_rcv_msg+0x2d7/0x340 > > <4> [<ffffffff81231e14>] ? socket_has_perm+0x74/0x90 > > <4> [<ffffffff81475890>] ? rtnetlink_rcv_msg+0x0/0x340 > > <4> [<ffffffff814910a9>] netlink_rcv_skb+0xa9/0xd0 > > <4> [<ffffffff81475875>] rtnetlink_rcv+0x25/0x40 > > <4> [<ffffffff81490cdb>] netlink_unicast+0x2db/0x320 > > <4> [<ffffffff81491750>] netlink_sendmsg+0x2c0/0x3d0 > > <4> [<ffffffff814520c3>] sock_sendmsg+0x123/0x150 > > <4> [<ffffffff81453d73>] ? sock_recvmsg+0x133/0x160 > > <4> [<ffffffff8109afa0>] ? autoremove_wake_function+0x0/0x40 > > <4> [<ffffffff81136941>] ? lru_cache_add_lru+0x21/0x40 > > <4> [<ffffffff8115522d>] ? page_add_new_anon_rmap+0x9d/0xf0 > > <4> [<ffffffff8114aeef>] ? handle_pte_fault+0x4af/0xb00 > > <4> [<ffffffff81451f14>] ? move_addr_to_kernel+0x64/0x70 > > <4> [<ffffffff814538b6>] __sys_sendmsg+0x406/0x420 > > <4> [<ffffffff8104a98c>] ? __do_page_fault+0x1ec/0x480 > > <4> [<ffffffff814523d9>] ? sys_sendto+0x139/0x190 > > <4> [<ffffffff8103ea6c>] ? kvm_clock_read+0x1c/0x20 > > <4> [<ffffffff81453ad9>] sys_sendmsg+0x49/0x90 > > <4> [<ffffffff8100b072>] system_call_fastpath+0x16/0x1b > > <4>Code: 83 e0 00 00 00 00 10 00 00 48 03 93 d0 00 00 00 66 83 42 04 01 8b 93 cc 00 00 00 48 8b b3 d0 00 00 00 80 4c 16 10 20 44 2b 68 0c <4d> 8b 76 10 75 89 e9 d1 fd ff ff 0f 1f 40 00 a8 02 74 0d 0f b6 > > <1>RIP [<ffffffffa0079469>] virtnet_poll+0x4f9/0x910 [virtio_net] > > <4> RSP <ffff880028203e48> > > <4>CR2: 0000000000000010 > > > > > > _______________________________________________ > > Virtualization mailing list > > Virtualization@lists.linux-foundation.org > > https://lists.linuxfoundation.org/mailman/listinfo/virtualization > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v8 35/50] vhost/net: larger header for virtio 1.0 [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> ` (5 preceding siblings ...) 2014-12-01 16:05 ` [PATCH v8 34/50] vhost/net: virtio 1.0 byte swap Michael S. Tsirkin @ 2014-12-01 16:05 ` Michael S. Tsirkin 2014-12-01 16:05 ` [PATCH v8 36/50] vhost/net: enable " Michael S. Tsirkin 2014-12-01 16:06 ` [PATCH v8 45/50] vhost/scsi: partial virtio 1.0 support Michael S. Tsirkin 8 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:05 UTC (permalink / raw) To: linux-kernel Cc: thuth, kvm, rusty, netdev, virtualization, dahi, pbonzini, David Miller Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> --- 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 c218188..8ff4a6d 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1030,7 +1030,8 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features) size_t vhost_hlen, sock_hlen, hdr_len; int i; - hdr_len = (features & (1 << VIRTIO_NET_F_MRG_RXBUF)) ? + hdr_len = (features & ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | + (1ULL << VIRTIO_F_VERSION_1))) ? sizeof(struct virtio_net_hdr_mrg_rxbuf) : sizeof(struct virtio_net_hdr); if (features & (1 << VHOST_NET_F_VIRTIO_NET_HDR)) { -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 36/50] vhost/net: enable virtio 1.0 [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> ` (6 preceding siblings ...) 2014-12-01 16:05 ` [PATCH v8 35/50] vhost/net: larger header for virtio 1.0 Michael S. Tsirkin @ 2014-12-01 16:05 ` Michael S. Tsirkin 2014-12-01 16:06 ` [PATCH v8 45/50] vhost/scsi: partial virtio 1.0 support Michael S. Tsirkin 8 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:05 UTC (permalink / raw) To: linux-kernel Cc: thuth, kvm, rusty, netdev, virtualization, dahi, pbonzini, David Miller Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- 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 8ff4a6d..a935c25 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -61,7 +61,8 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;" enum { VHOST_NET_FEATURES = VHOST_FEATURES | (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) | - (1ULL << VIRTIO_NET_F_MRG_RXBUF), + (1ULL << VIRTIO_NET_F_MRG_RXBUF) | + (1ULL << VIRTIO_F_VERSION_1), }; enum { -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 45/50] vhost/scsi: partial virtio 1.0 support [not found] <1417449619-24896-1-git-send-email-mst@redhat.com> ` (7 preceding siblings ...) 2014-12-01 16:05 ` [PATCH v8 36/50] vhost/net: enable " Michael S. Tsirkin @ 2014-12-01 16:06 ` Michael S. Tsirkin 8 siblings, 0 replies; 12+ messages in thread From: Michael S. Tsirkin @ 2014-12-01 16:06 UTC (permalink / raw) To: linux-kernel Cc: David Miller, cornelia.huck, rusty, nab, pbonzini, thuth, dahi, kvm, virtualization, netdev Include all endian conversions as required by virtio 1.0. Don't set virtio 1.0 yet, since that requires ANY_LAYOUT which we don't yet support. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> --- drivers/vhost/scsi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index a17f118..01c01cb 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -168,6 +168,7 @@ enum { VHOST_SCSI_VQ_IO = 2, }; +/* Note: can't set VIRTIO_F_VERSION_1 yet, since that implies ANY_LAYOUT. */ enum { VHOST_SCSI_FEATURES = VHOST_FEATURES | (1ULL << VIRTIO_SCSI_F_HOTPLUG) | (1ULL << VIRTIO_SCSI_F_T10_PI) @@ -577,8 +578,8 @@ tcm_vhost_allocate_evt(struct vhost_scsi *vs, return NULL; } - evt->event.event = event; - evt->event.reason = reason; + evt->event.event = cpu_to_vhost32(vq, event); + evt->event.reason = cpu_to_vhost32(vq, reason); vs->vs_events_nr++; return evt; @@ -636,7 +637,7 @@ again: } if (vs->vs_events_missed) { - event->event |= VIRTIO_SCSI_T_EVENTS_MISSED; + event->event |= cpu_to_vhost32(vq, VIRTIO_SCSI_T_EVENTS_MISSED); vs->vs_events_missed = false; } @@ -695,12 +696,13 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work) cmd, se_cmd->residual_count, se_cmd->scsi_status); memset(&v_rsp, 0, sizeof(v_rsp)); - v_rsp.resid = se_cmd->residual_count; + v_rsp.resid = cpu_to_vhost32(cmd->tvc_vq, se_cmd->residual_count); /* TODO is status_qualifier field needed? */ v_rsp.status = se_cmd->scsi_status; - v_rsp.sense_len = se_cmd->scsi_sense_length; + v_rsp.sense_len = cpu_to_vhost32(cmd->tvc_vq, + se_cmd->scsi_sense_length); memcpy(v_rsp.sense, cmd->tvc_sense_buf, - v_rsp.sense_len); + se_cmd->scsi_sense_length); ret = copy_to_user(cmd->tvc_resp, &v_rsp, sizeof(v_rsp)); if (likely(ret == 0)) { struct vhost_scsi_virtqueue *q; @@ -1095,14 +1097,14 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) ", but wrong data_direction\n"); goto err_cmd; } - prot_bytes = v_req_pi.pi_bytesout; + prot_bytes = vhost32_to_cpu(vq, v_req_pi.pi_bytesout); } else if (v_req_pi.pi_bytesin) { if (data_direction != DMA_FROM_DEVICE) { vq_err(vq, "Received non zero di_pi_niov" ", but wrong data_direction\n"); goto err_cmd; } - prot_bytes = v_req_pi.pi_bytesin; + prot_bytes = vhost32_to_cpu(vq, v_req_pi.pi_bytesin); } if (prot_bytes) { int tmp = 0; @@ -1117,12 +1119,12 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) data_first += prot_niov; data_niov = data_num - prot_niov; } - tag = v_req_pi.tag; + tag = vhost64_to_cpu(vq, v_req_pi.tag); task_attr = v_req_pi.task_attr; cdb = &v_req_pi.cdb[0]; lun = ((v_req_pi.lun[2] << 8) | v_req_pi.lun[3]) & 0x3FFF; } else { - tag = v_req.tag; + tag = vhost64_to_cpu(vq, v_req.tag); task_attr = v_req.task_attr; cdb = &v_req.cdb[0]; lun = ((v_req.lun[2] << 8) | v_req.lun[3]) & 0x3FFF; -- MST ^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2015-01-07 8:57 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1417449619-24896-1-git-send-email-mst@redhat.com>
2014-12-01 16:05 ` [PATCH v8 29/50] vhost: make features 64 bit Michael S. Tsirkin
2014-12-01 16:05 ` [PATCH v8 30/50] vhost: add memory access wrappers Michael S. Tsirkin
2014-12-01 16:05 ` [PATCH v8 31/50] vhost/net: force len for TX to host endian Michael S. Tsirkin
2014-12-01 16:05 ` [PATCH v8 32/50] vhost: switch to __get/__put_user exclusively Michael S. Tsirkin
2014-12-01 16:05 ` [PATCH v8 33/50] vhost: virtio 1.0 endian-ness support Michael S. Tsirkin
2014-12-01 16:05 ` [PATCH v8 34/50] vhost/net: virtio 1.0 byte swap Michael S. Tsirkin
2015-01-06 23:55 ` Alex Williamson
2015-01-07 8:31 ` Greg Kurz
2015-01-07 8:57 ` Michael S. Tsirkin
2014-12-01 16:05 ` [PATCH v8 35/50] vhost/net: larger header for virtio 1.0 Michael S. Tsirkin
2014-12-01 16:05 ` [PATCH v8 36/50] vhost/net: enable " Michael S. Tsirkin
2014-12-01 16:06 ` [PATCH v8 45/50] vhost/scsi: partial virtio 1.0 support Michael S. Tsirkin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox