From: Tiwei Bie <tiwei.bie@intel.com> To: mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: wexu@redhat.com, jfreimann@redhat.com, tiwei.bie@intel.com Subject: [RFC v4 1/5] virtio: add packed ring definitions Date: Wed, 16 May 2018 16:37:33 +0800 [thread overview] Message-ID: <20180516083737.26504-2-tiwei.bie@intel.com> (raw) In-Reply-To: <20180516083737.26504-1-tiwei.bie@intel.com> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com> --- include/uapi/linux/virtio_config.h | 12 +++++++++- include/uapi/linux/virtio_ring.h | 36 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index 308e2096291f..a6e392325e3a 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -49,7 +49,7 @@ * transport being used (eg. virtio_ring), the rest are per-device feature * bits. */ #define VIRTIO_TRANSPORT_F_START 28 -#define VIRTIO_TRANSPORT_F_END 34 +#define VIRTIO_TRANSPORT_F_END 36 #ifndef VIRTIO_CONFIG_NO_LEGACY /* Do we get callbacks when the ring is completely used, even if we've @@ -71,4 +71,14 @@ * this is for compatibility with legacy systems. */ #define VIRTIO_F_IOMMU_PLATFORM 33 + +/* This feature indicates support for the packed virtqueue layout. */ +#define VIRTIO_F_RING_PACKED 34 + +/* + * This feature indicates that all buffers are used by the device + * in the same order in which they have been made available. + */ +#define VIRTIO_F_IN_ORDER 35 + #endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */ diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index 6d5d5faa989b..3932cb80c347 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -44,6 +44,9 @@ /* This means the buffer contains a list of buffer descriptors. */ #define VRING_DESC_F_INDIRECT 4 +#define VRING_DESC_F_AVAIL(b) ((b) << 7) +#define VRING_DESC_F_USED(b) ((b) << 15) + /* The Host uses this in used->flags to advise the Guest: don't kick me when * you add a buffer. It's unreliable, so it's simply an optimization. Guest * will still kick if it's out of buffers. */ @@ -53,6 +56,10 @@ * optimization. */ #define VRING_AVAIL_F_NO_INTERRUPT 1 +#define VRING_EVENT_F_ENABLE 0x0 +#define VRING_EVENT_F_DISABLE 0x1 +#define VRING_EVENT_F_DESC 0x2 + /* We support indirect buffer descriptors */ #define VIRTIO_RING_F_INDIRECT_DESC 28 @@ -171,4 +178,33 @@ static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old) return (__u16)(new_idx - event_idx - 1) < (__u16)(new_idx - old); } +struct vring_packed_desc_event { + /* __virtio16 off : 15; // Descriptor Event Offset + * __virtio16 wrap : 1; // Descriptor Event Wrap Counter */ + __virtio16 off_wrap; + /* __virtio16 flags : 2; // Descriptor Event Flags */ + __virtio16 flags; +}; + +struct vring_packed_desc { + /* Buffer Address. */ + __virtio64 addr; + /* Buffer Length. */ + __virtio32 len; + /* Buffer ID. */ + __virtio16 id; + /* The flags depending on descriptor type. */ + __virtio16 flags; +}; + +struct vring_packed { + unsigned int num; + + struct vring_packed_desc *desc; + + struct vring_packed_desc_event *driver; + + struct vring_packed_desc_event *device; +}; + #endif /* _UAPI_LINUX_VIRTIO_RING_H */ -- 2.17.0
WARNING: multiple messages have this Message-ID (diff)
From: Tiwei Bie <tiwei.bie@intel.com> To: mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: wexu@redhat.com Subject: [RFC v4 1/5] virtio: add packed ring definitions Date: Wed, 16 May 2018 16:37:33 +0800 [thread overview] Message-ID: <20180516083737.26504-2-tiwei.bie@intel.com> (raw) In-Reply-To: <20180516083737.26504-1-tiwei.bie@intel.com> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com> --- include/uapi/linux/virtio_config.h | 12 +++++++++- include/uapi/linux/virtio_ring.h | 36 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index 308e2096291f..a6e392325e3a 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -49,7 +49,7 @@ * transport being used (eg. virtio_ring), the rest are per-device feature * bits. */ #define VIRTIO_TRANSPORT_F_START 28 -#define VIRTIO_TRANSPORT_F_END 34 +#define VIRTIO_TRANSPORT_F_END 36 #ifndef VIRTIO_CONFIG_NO_LEGACY /* Do we get callbacks when the ring is completely used, even if we've @@ -71,4 +71,14 @@ * this is for compatibility with legacy systems. */ #define VIRTIO_F_IOMMU_PLATFORM 33 + +/* This feature indicates support for the packed virtqueue layout. */ +#define VIRTIO_F_RING_PACKED 34 + +/* + * This feature indicates that all buffers are used by the device + * in the same order in which they have been made available. + */ +#define VIRTIO_F_IN_ORDER 35 + #endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */ diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index 6d5d5faa989b..3932cb80c347 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -44,6 +44,9 @@ /* This means the buffer contains a list of buffer descriptors. */ #define VRING_DESC_F_INDIRECT 4 +#define VRING_DESC_F_AVAIL(b) ((b) << 7) +#define VRING_DESC_F_USED(b) ((b) << 15) + /* The Host uses this in used->flags to advise the Guest: don't kick me when * you add a buffer. It's unreliable, so it's simply an optimization. Guest * will still kick if it's out of buffers. */ @@ -53,6 +56,10 @@ * optimization. */ #define VRING_AVAIL_F_NO_INTERRUPT 1 +#define VRING_EVENT_F_ENABLE 0x0 +#define VRING_EVENT_F_DISABLE 0x1 +#define VRING_EVENT_F_DESC 0x2 + /* We support indirect buffer descriptors */ #define VIRTIO_RING_F_INDIRECT_DESC 28 @@ -171,4 +178,33 @@ static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old) return (__u16)(new_idx - event_idx - 1) < (__u16)(new_idx - old); } +struct vring_packed_desc_event { + /* __virtio16 off : 15; // Descriptor Event Offset + * __virtio16 wrap : 1; // Descriptor Event Wrap Counter */ + __virtio16 off_wrap; + /* __virtio16 flags : 2; // Descriptor Event Flags */ + __virtio16 flags; +}; + +struct vring_packed_desc { + /* Buffer Address. */ + __virtio64 addr; + /* Buffer Length. */ + __virtio32 len; + /* Buffer ID. */ + __virtio16 id; + /* The flags depending on descriptor type. */ + __virtio16 flags; +}; + +struct vring_packed { + unsigned int num; + + struct vring_packed_desc *desc; + + struct vring_packed_desc_event *driver; + + struct vring_packed_desc_event *device; +}; + #endif /* _UAPI_LINUX_VIRTIO_RING_H */ -- 2.17.0
next prev parent reply other threads:[~2018-05-16 8:40 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-16 8:37 [RFC v4 0/5] virtio: support packed ring Tiwei Bie 2018-05-16 8:37 ` Tiwei Bie [this message] 2018-05-16 8:37 ` [RFC v4 1/5] virtio: add packed ring definitions Tiwei Bie 2018-05-16 8:37 ` [RFC v4 2/5] virtio_ring: support creating packed ring Tiwei Bie 2018-05-16 8:37 ` Tiwei Bie 2018-05-16 8:37 ` [RFC v4 3/5] virtio_ring: add packed ring support Tiwei Bie 2018-05-16 8:37 ` Tiwei Bie 2018-05-16 11:50 ` Jason Wang 2018-05-16 12:39 ` Tiwei Bie 2018-05-16 12:51 ` Jason Wang 2018-05-16 13:45 ` Tiwei Bie 2018-05-16 13:45 ` Tiwei Bie 2018-05-16 14:05 ` Jason Wang 2018-05-16 14:05 ` Jason Wang 2018-05-16 14:33 ` Tiwei Bie 2018-05-17 12:01 ` Jason Wang 2018-05-17 12:01 ` Jason Wang 2018-05-18 11:29 ` Tiwei Bie 2018-05-18 13:17 ` Jason Wang 2018-05-18 13:17 ` Jason Wang 2018-05-18 14:33 ` Tiwei Bie 2018-05-19 1:12 ` Jason Wang 2018-05-19 2:29 ` Tiwei Bie 2018-05-21 2:30 ` Jason Wang 2018-05-21 2:39 ` Tiwei Bie 2018-05-21 2:39 ` Tiwei Bie 2018-05-21 2:30 ` Jason Wang 2018-05-19 2:29 ` Tiwei Bie 2018-05-19 1:12 ` Jason Wang 2018-05-18 14:33 ` Tiwei Bie 2018-05-18 11:29 ` Tiwei Bie 2018-05-16 14:33 ` Tiwei Bie 2018-05-16 12:51 ` Jason Wang 2018-05-16 12:39 ` Tiwei Bie 2018-05-16 11:50 ` Jason Wang 2018-05-16 8:37 ` [RFC v4 4/5] virtio_ring: add event idx support in packed ring Tiwei Bie 2018-05-16 8:37 ` Tiwei Bie 2018-05-16 12:17 ` Jason Wang 2018-05-16 12:58 ` Tiwei Bie 2018-05-16 13:31 ` Jason Wang 2018-05-16 13:31 ` Jason Wang 2018-05-16 12:58 ` Tiwei Bie 2018-05-16 12:17 ` Jason Wang 2018-05-16 8:37 ` [RFC v4 5/5] virtio_ring: enable " Tiwei Bie 2018-05-16 8:37 ` Tiwei Bie 2018-05-16 10:15 ` Sergei Shtylyov 2018-05-16 10:15 ` Sergei Shtylyov 2018-05-16 10:21 ` Tiwei Bie 2018-05-16 11:42 ` Sergei Shtylyov 2018-05-16 11:42 ` Sergei Shtylyov 2018-05-16 12:26 ` Tiwei Bie 2018-05-16 12:26 ` Tiwei Bie 2018-05-16 10:21 ` Tiwei Bie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180516083737.26504-2-tiwei.bie@intel.com \ --to=tiwei.bie@intel.com \ --cc=jasowang@redhat.com \ --cc=jfreimann@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.org \ --cc=wexu@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.