search for: vring_packed

...t; virtio_mb(vq->weak_barriers); > > > > > + old = vq->next_avail_idx - vq->num_added; > > > > > + new = vq->next_avail_idx; > > > > > + vq->num_added = 0; > > > > > + > > > > > snapshot = *(u32 *)vq->vring_packed.device; > > > > > + off_wrap = virtio16_to_cpu(_vq->vdev, snapshot & 0xffff); > > > > > flags = cpu_to_virtio16(_vq->vdev, snapshot >> 16) & 0x3; > > > > > #ifdef DEBUG > > > > > @@ -1006,7 +1011,10 @@ static bool...

...t; virtio_mb(vq->weak_barriers); > > > > > + old = vq->next_avail_idx - vq->num_added; > > > > > + new = vq->next_avail_idx; > > > > > + vq->num_added = 0; > > > > > + > > > > > snapshot = *(u32 *)vq->vring_packed.device; > > > > > + off_wrap = virtio16_to_cpu(_vq->vdev, snapshot & 0xffff); > > > > > flags = cpu_to_virtio16(_vq->vdev, snapshot >> 16) & 0x3; > > > > > #ifdef DEBUG > > > > > @@ -1006,7 +1011,10 @@ static bool...

...> 1 && vq->vq.num_free) + if (virtqueue_use_indirect(_vq, total_sg)) desc = alloc_indirect_split(_vq, total_sg, gfp); else { desc = NULL; @@ -741,6 +753,63 @@ static inline unsigned vring_size_packed(unsigned int num, unsigned long align) & ~(align - 1)) + sizeof(struct vring_packed_desc_event) * 2; } +static void vring_unmap_one_packed(const struct vring_virtqueue *vq, + struct vring_packed_desc *desc) +{ + u16 flags; + + if (!vring_use_dma_api(vq->vq.vdev)) + return; + + flags = virtio16_to_cpu(vq->vq.vdev, desc->flags); + + if (flags & VRING_DESC_F_IN...

...> > > * suppressions. */ > > > virtio_mb(vq->weak_barriers); > > > + old = vq->next_avail_idx - vq->num_added; > > > + new = vq->next_avail_idx; > > > + vq->num_added = 0; > > > + > > > snapshot = *(u32 *)vq->vring_packed.device; > > > + off_wrap = virtio16_to_cpu(_vq->vdev, snapshot & 0xffff); > > > flags = cpu_to_virtio16(_vq->vdev, snapshot >> 16) & 0x3; > > > #ifdef DEBUG > > > @@ -1006,7 +1011,10 @@ static bool virtqueue_kick_prepare_packed(struct vir...

...> > > * suppressions. */ > > > virtio_mb(vq->weak_barriers); > > > + old = vq->next_avail_idx - vq->num_added; > > > + new = vq->next_avail_idx; > > > + vq->num_added = 0; > > > + > > > snapshot = *(u32 *)vq->vring_packed.device; > > > + off_wrap = virtio16_to_cpu(_vq->vdev, snapshot & 0xffff); > > > flags = cpu_to_virtio16(_vq->vdev, snapshot >> 16) & 0x3; > > > #ifdef DEBUG > > > @@ -1006,7 +1011,10 @@ static bool virtqueue_kick_prepare_packed(struct vir...

...tic bool virtqueue_kick_prepare_packed(struct virtqueue *_vq) > * suppressions. */ > virtio_mb(vq->weak_barriers); > > + old = vq->next_avail_idx - vq->num_added; > + new = vq->next_avail_idx; > + vq->num_added = 0; > + > snapshot = *(u32 *)vq->vring_packed.device; > + off_wrap = virtio16_to_cpu(_vq->vdev, snapshot & 0xffff); > flags = cpu_to_virtio16(_vq->vdev, snapshot >> 16) & 0x3; > > #ifdef DEBUG > @@ -1006,7 +1011,10 @@ static bool virtqueue_kick_prepare_packed(struct virtqueue *_vq) > vq->last...

...tic bool virtqueue_kick_prepare_packed(struct virtqueue *_vq) > * suppressions. */ > virtio_mb(vq->weak_barriers); > > + old = vq->next_avail_idx - vq->num_added; > + new = vq->next_avail_idx; > + vq->num_added = 0; > + > snapshot = *(u32 *)vq->vring_packed.device; > + off_wrap = virtio16_to_cpu(_vq->vdev, snapshot & 0xffff); > flags = cpu_to_virtio16(_vq->vdev, snapshot >> 16) & 0x3; > > #ifdef DEBUG > @@ -1006,7 +1011,10 @@ static bool virtqueue_kick_prepare_packed(struct virtqueue *_vq) > vq->last...

...ee) > + if (virtqueue_use_indirect(_vq, total_sg)) > desc = alloc_indirect_split(_vq, total_sg, gfp); > else { > desc = NULL; > @@ -741,6 +753,63 @@ static inline unsigned vring_size_packed(unsigned int num, unsigned long align) > & ~(align - 1)) + sizeof(struct vring_packed_desc_event) * 2; > } > > +static void vring_unmap_one_packed(const struct vring_virtqueue *vq, > + struct vring_packed_desc *desc) > +{ > + u16 flags; > + > + if (!vring_use_dma_api(vq->vq.vdev)) > + return; > + > + flags = virtio16_to_cpu(vq->vq.v...

...ee) > + if (virtqueue_use_indirect(_vq, total_sg)) > desc = alloc_indirect_split(_vq, total_sg, gfp); > else { > desc = NULL; > @@ -741,6 +753,63 @@ static inline unsigned vring_size_packed(unsigned int num, unsigned long align) > & ~(align - 1)) + sizeof(struct vring_packed_desc_event) * 2; > } > > +static void vring_unmap_one_packed(const struct vring_virtqueue *vq, > + struct vring_packed_desc *desc) > +{ > + u16 flags; > + > + if (!vring_use_dma_api(vq->vq.vdev)) > + return; > + > + flags = virtio16_to_cpu(vq->vq.v...

...> 1 && vq->vq.num_free) + if (virtqueue_use_indirect(_vq, total_sg)) desc = alloc_indirect_split(_vq, total_sg, gfp); else { desc = NULL; @@ -741,6 +750,49 @@ static inline unsigned vring_size_packed(unsigned int num, unsigned long align) & ~(align - 1)) + sizeof(struct vring_packed_desc_event) * 2; } +static void vring_unmap_one_packed(const struct vring_virtqueue *vq, + struct vring_packed_desc *desc) +{ + u16 flags; + + if (!vring_use_dma_api(vq->vq.vdev)) + return; + + flags = virtio16_to_cpu(vq->vq.vdev, desc->flags); + + if (flags & VRING_DESC_F_IN...

...gt; > > > > + old = vq->next_avail_idx - vq->num_added; > > > > > > > + new = vq->next_avail_idx; > > > > > > > + vq->num_added = 0; > > > > > > > + > > > > > > > snapshot = *(u32 *)vq->vring_packed.device; > > > > > > > + off_wrap = virtio16_to_cpu(_vq->vdev, snapshot & 0xffff); > > > > > > > flags = cpu_to_virtio16(_vq->vdev, snapshot >> 16) & 0x3; > > > > > > > #ifdef DEBUG > > > > > >...

...gt; > > > > + old = vq->next_avail_idx - vq->num_added; > > > > > > > + new = vq->next_avail_idx; > > > > > > > + vq->num_added = 0; > > > > > > > + > > > > > > > snapshot = *(u32 *)vq->vring_packed.device; > > > > > > > + off_wrap = virtio16_to_cpu(_vq->vdev, snapshot & 0xffff); > > > > > > > flags = cpu_to_virtio16(_vq->vdev, snapshot >> 16) & 0x3; > > > > > > > #ifdef DEBUG > > > > > >...

...XXX_split/packed and wrappers (MST); - Fix the comments and API in uapi (MST); - Remove the BUG_ON() for indirect (Jason); - Some other refinements and bug fixes; RFC v1 -> RFC v2: - Add indirect descriptor support - compile test only; - Add event suppression supprt - compile test only; - Move vring_packed_init() out of uapi (Jason, MST); - Merge two loops into one in virtqueue_add_packed() (Jason); - Split vring_unmap_one() for packed ring and split ring (Jason); - Avoid using '%' operator (Jason); - Rename free_head -> next_avail_idx (Jason); - Add comments for virtio_wmb() in virtqueue_...

...tten value to avail->idx in >>> + * guest byte order */ >>> + u16 avail_idx_shadow; >>> + }; >>> + >>> + /* Available for packed ring */ >>> + struct { >>> + /* Actual memory layout for this queue */ >>> + struct vring_packed vring_packed; >>> + u8 wrap_counter : 1; >>> + bool chaining; >>> + }; >>> + }; >>> /* How to notify other side. FIXME: commonalize hcalls! */ >>> bool (*notify)(struct virtqueue *vq); >>> @@ -201,26 +218,37 @@ static dma_a...

...tten value to avail->idx in >>> + * guest byte order */ >>> + u16 avail_idx_shadow; >>> + }; >>> + >>> + /* Available for packed ring */ >>> + struct { >>> + /* Actual memory layout for this queue */ >>> + struct vring_packed vring_packed; >>> + u8 wrap_counter : 1; >>> + bool chaining; >>> + }; >>> + }; >>> /* How to notify other side. FIXME: commonalize hcalls! */ >>> bool (*notify)(struct virtqueue *vq); >>> @@ -201,26 +218,37 @@ static dma_a...

...rs/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index f5ef5f42a7cf..eb9fd5207a68 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -62,6 +62,12 @@ struct vring_desc_state { }; struct vring_desc_state_packed { + void *data; /* Data for callback. */ + struct vring_packed_desc *indir_desc; /* Indirect descriptor, if any. */ + int num; /* Descriptor list length. */ + dma_addr_t addr; /* Buffer DMA addr. */ + u32 len; /* Buffer length. */ + u16 flags; /* Descriptor flags. */ int next; /* The next desc state. */ }; @@ -758,6 +764,72 @@ static inline unsig...

...ol virtqueue_kick_prepare_packed(struct virtqueue *_vq) > * suppressions. */ > virtio_mb(vq->weak_barriers); > > + old = vq->next_avail_idx - vq->num_added; > + new = vq->next_avail_idx; > + vq->num_added = 0; > + > snapshot = READ_ONCE(*(u32 *)vq->vring_packed.device); > + off_wrap = virtio16_to_cpu(_vq->vdev, (__virtio16)(snapshot & 0xffff)); > flags = virtio16_to_cpu(_vq->vdev, (__virtio16)(snapshot >> 16)) & 0x3; some kind of struct union would be helpful to make this readable. > > + wrap_counter = off_wrap >&...

...> > > > Signed-off-by: Tiwei Bie <tiwei.bie at intel.com> > > [...] > > > + > > > +/* > > > + * The layout for the packed ring is a continuous chunk of memory > > > + * which looks like this. > > > + * > > > + * struct vring_packed { > > > + * // The actual descriptors (16 bytes each) > > > + * struct vring_packed_desc desc[num]; > > > + * > > > + * // Padding to the next align boundary. > > > + * char pad[]; > > > + * > > > + * // Driver Event Suppression > &g...

...XXX_split/packed and wrappers (MST); - Fix the comments and API in uapi (MST); - Remove the BUG_ON() for indirect (Jason); - Some other refinements and bug fixes; RFC v1 -> RFC v2: - Add indirect descriptor support - compile test only; - Add event suppression supprt - compile test only; - Move vring_packed_init() out of uapi (Jason, MST); - Merge two loops into one in virtqueue_add_packed() (Jason); - Split vring_unmap_one() for packed ring and split ring (Jason); - Avoid using '%' operator (Jason); - Rename free_head -> next_avail_idx (Jason); - Add comments for virtio_wmb() in virtqueue_...

...(b) << 7) +#define _VRING_DESC_F_USED(b) ((__u16)(b) << 15) + struct vring_desc_state { void *data; /* Data for callback. */ struct vring_desc *indir_desc; /* Indirect descriptor, if any. */ }; struct vring_desc_state_packed { + void *data; /* Data for callback. */ + struct vring_packed_desc *indir_desc; /* Indirect descriptor, if any. */ + int num; /* Descriptor list length. */ + dma_addr_t addr; /* Buffer DMA addr. */ + u32 len; /* Buffer length. */ + u16 flags; /* Descriptor flags. */ int next; /* The next desc state. */ }; @@ -660,7 +669,6 @@ static bool virtqueu...