* Re: [dpdk-dev] [DPDK] net/virtio: packed ring notification data feature support
2019-12-04 15:03 [dpdk-dev] [DPDK] net/virtio: packed ring notification data feature support Cheng Jiang
@ 2019-12-09 1:59 ` Liu, Yong
2019-12-12 9:08 ` Jiang, Cheng1
2019-12-18 8:17 ` [dpdk-dev] [PATCH v2] " Cheng Jiang
2020-01-09 7:29 ` [dpdk-dev] [DPDK] " Liu, Yong
2 siblings, 1 reply; 13+ messages in thread
From: Liu, Yong @ 2019-12-09 1:59 UTC (permalink / raw)
To: Jiang, Cheng1, dev
Cc: maxime.coquelin, Bie, Tiwei, Wang, Zhihong, Jiang, Cheng1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Cheng Jiang
> Sent: Wednesday, December 04, 2019 11:03 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Bie, Tiwei <tiwei.bie@intel.com>; Wang,
> Zhihong <zhihong.wang@intel.com>; Jiang, Cheng1 <cheng1.jiang@intel.com>
> Subject: [dpdk-dev] [DPDK] net/virtio: packed ring notification data
> feature support
>
> This patch supports the feature that the driver passes extra data
> (besides identifying the virtqueue) in its device notifications.
>
> Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> ---
> drivers/net/virtio/virtio_ethdev.h | 3 ++-
> drivers/net/virtio/virtio_pci.c | 15 ++++++++++++++-
> drivers/net/virtio/virtio_pci.h | 6 ++++++
> 3 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_ethdev.h
> b/drivers/net/virtio/virtio_ethdev.h
> index a10111758..cd8947656 100644
> --- a/drivers/net/virtio/virtio_ethdev.h
> +++ b/drivers/net/virtio/virtio_ethdev.h
> @@ -36,7 +36,8 @@
> 1ULL << VIRTIO_F_IN_ORDER | \
> 1ULL << VIRTIO_F_RING_PACKED | \
> 1ULL << VIRTIO_F_IOMMU_PLATFORM | \
> - 1ULL << VIRTIO_F_ORDER_PLATFORM)
> + 1ULL << VIRTIO_F_ORDER_PLATFORM | \
> + 1ULL << VIRTIO_F_NOTIFICATION_DATA)
>
> #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \
> (VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \
> diff --git a/drivers/net/virtio/virtio_pci.c
> b/drivers/net/virtio/virtio_pci.c
> index 4468e89cb..2462a7dab 100644
> --- a/drivers/net/virtio/virtio_pci.c
> +++ b/drivers/net/virtio/virtio_pci.c
> @@ -418,7 +418,20 @@ modern_del_queue(struct virtio_hw *hw, struct
> virtqueue *vq)
> static void
> modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue
> *vq)
> {
Hi Cheng,
hw pointer will be used in notify function, please remove rte_unused attribute.
Thanks,
Marvin
> - rte_write16(vq->vq_queue_index, vq->notify_addr);
> + uint32_t notify_data;
> +
> + if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
> + rte_write16(vq->vq_queue_index, vq->notify_addr);
> + return;
> + }
> +
> + if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED))
> + notify_data = ((((uint32_t)vq->vq_packed.used_wrap_counter <<
> 15) |
> + vq->vq_avail_idx) << 16) | vq->vq_queue_index;
> + else
> + notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
> + vq->vq_queue_index;
> + rte_write32(notify_data, vq->notify_addr);
> }
>
> const struct virtio_pci_ops modern_ops = {
> diff --git a/drivers/net/virtio/virtio_pci.h
> b/drivers/net/virtio/virtio_pci.h
> index a38cb45ad..7433d2f08 100644
> --- a/drivers/net/virtio/virtio_pci.h
> +++ b/drivers/net/virtio/virtio_pci.h
> @@ -135,6 +135,12 @@ struct virtnet_ctl;
> */
> #define VIRTIO_F_ORDER_PLATFORM 36
>
> +/*
> + * This feature indicates that the driver passes extra data (besides
> + * identifying the virtqueue) in its device notifications.
> + */
> +#define VIRTIO_F_NOTIFICATION_DATA 38
> +
> /* The Guest publishes the used index for which it expects an interrupt
> * at the end of the avail ring. Host should ignore the avail->flags
> field. */
> /* The Host publishes the avail index for which it expects a kick
> --
> 2.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-dev] [DPDK] net/virtio: packed ring notification data feature support
2019-12-09 1:59 ` Liu, Yong
@ 2019-12-12 9:08 ` Jiang, Cheng1
0 siblings, 0 replies; 13+ messages in thread
From: Jiang, Cheng1 @ 2019-12-12 9:08 UTC (permalink / raw)
To: Liu, Yong, dev; +Cc: maxime.coquelin, Bie, Tiwei, Wang, Zhihong
> -----Original Message-----
> From: Liu, Yong
> Sent: Monday, December 9, 2019 10:00 AM
> To: Jiang, Cheng1 <cheng1.jiang@intel.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Bie, Tiwei <tiwei.bie@intel.com>; Wang,
> Zhihong <zhihong.wang@intel.com>; Jiang, Cheng1
> <cheng1.jiang@intel.com>
> Subject: RE: [dpdk-dev] [DPDK] net/virtio: packed ring notification data
> feature support
>
>
>
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Cheng Jiang
> > Sent: Wednesday, December 04, 2019 11:03 PM
> > To: dev@dpdk.org
> > Cc: maxime.coquelin@redhat.com; Bie, Tiwei <tiwei.bie@intel.com>;
> > Wang, Zhihong <zhihong.wang@intel.com>; Jiang, Cheng1
> > <cheng1.jiang@intel.com>
> > Subject: [dpdk-dev] [DPDK] net/virtio: packed ring notification data
> > feature support
> >
> > This patch supports the feature that the driver passes extra data
> > (besides identifying the virtqueue) in its device notifications.
> >
> > Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> > ---
> > drivers/net/virtio/virtio_ethdev.h | 3 ++-
> > drivers/net/virtio/virtio_pci.c | 15 ++++++++++++++-
> > drivers/net/virtio/virtio_pci.h | 6 ++++++
> > 3 files changed, 22 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/virtio/virtio_ethdev.h
> > b/drivers/net/virtio/virtio_ethdev.h
> > index a10111758..cd8947656 100644
> > --- a/drivers/net/virtio/virtio_ethdev.h
> > +++ b/drivers/net/virtio/virtio_ethdev.h
> > @@ -36,7 +36,8 @@
> > 1ULL << VIRTIO_F_IN_ORDER | \
> > 1ULL << VIRTIO_F_RING_PACKED | \
> > 1ULL << VIRTIO_F_IOMMU_PLATFORM | \
> > - 1ULL << VIRTIO_F_ORDER_PLATFORM)
> > + 1ULL << VIRTIO_F_ORDER_PLATFORM | \
> > + 1ULL << VIRTIO_F_NOTIFICATION_DATA)
> >
> > #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \
> > (VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \
> > diff --git a/drivers/net/virtio/virtio_pci.c
> > b/drivers/net/virtio/virtio_pci.c index 4468e89cb..2462a7dab 100644
> > --- a/drivers/net/virtio/virtio_pci.c
> > +++ b/drivers/net/virtio/virtio_pci.c
> > @@ -418,7 +418,20 @@ modern_del_queue(struct virtio_hw *hw, struct
> > virtqueue *vq) static void modern_notify_queue(struct virtio_hw *hw
> > __rte_unused, struct virtqueue
> > *vq)
> > {
>
> Hi Cheng,
> hw pointer will be used in notify function, please remove rte_unused
> attribute.
>
> Thanks,
> Marvin
>
Sure, I'll remove it in the next version.
Thanks very much!
Cheng
> > - rte_write16(vq->vq_queue_index, vq->notify_addr);
> > + uint32_t notify_data;
> > +
> > + if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
> > + rte_write16(vq->vq_queue_index, vq->notify_addr);
> > + return;
> > + }
> > +
> > + if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED))
> > + notify_data = ((((uint32_t)vq-
> >vq_packed.used_wrap_counter <<
> > 15) |
> > + vq->vq_avail_idx) << 16) | vq-
> >vq_queue_index;
> > + else
> > + notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
> > + vq->vq_queue_index;
> > + rte_write32(notify_data, vq->notify_addr);
> > }
> >
> > const struct virtio_pci_ops modern_ops = { diff --git
> > a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
> > index a38cb45ad..7433d2f08 100644
> > --- a/drivers/net/virtio/virtio_pci.h
> > +++ b/drivers/net/virtio/virtio_pci.h
> > @@ -135,6 +135,12 @@ struct virtnet_ctl;
> > */
> > #define VIRTIO_F_ORDER_PLATFORM 36
> >
> > +/*
> > + * This feature indicates that the driver passes extra data (besides
> > + * identifying the virtqueue) in its device notifications.
> > + */
> > +#define VIRTIO_F_NOTIFICATION_DATA 38
> > +
> > /* The Guest publishes the used index for which it expects an interrupt
> > * at the end of the avail ring. Host should ignore the avail->flags
> > field. */
> > /* The Host publishes the avail index for which it expects a kick
> > --
> > 2.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH v2] net/virtio: packed ring notification data feature support
2019-12-04 15:03 [dpdk-dev] [DPDK] net/virtio: packed ring notification data feature support Cheng Jiang
2019-12-09 1:59 ` Liu, Yong
@ 2019-12-18 8:17 ` Cheng Jiang
2019-12-18 9:51 ` Gavin Hu
2019-12-23 5:15 ` [dpdk-dev] [PATCH v3] " Cheng Jiang
2020-01-09 7:29 ` [dpdk-dev] [DPDK] " Liu, Yong
2 siblings, 2 replies; 13+ messages in thread
From: Cheng Jiang @ 2019-12-18 8:17 UTC (permalink / raw)
To: maxime.coquelin, tiwei.bie, zhihong.wang, yong.liu; +Cc: dev, Cheng Jiang
This patch supports the feature that the driver passes extra data
(besides identifying the virtqueue) in its device notifications.
Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
---
v2:
* Removed rte_unused attribute in *hw.
* Added some comments on notify_data.
drivers/net/virtio/virtio_ethdev.h | 3 ++-
drivers/net/virtio/virtio_pci.c | 27 +++++++++++++++++++++++++--
drivers/net/virtio/virtio_pci.h | 6 ++++++
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index a10111758..cd8947656 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -36,7 +36,8 @@
1ULL << VIRTIO_F_IN_ORDER | \
1ULL << VIRTIO_F_RING_PACKED | \
1ULL << VIRTIO_F_IOMMU_PLATFORM | \
- 1ULL << VIRTIO_F_ORDER_PLATFORM)
+ 1ULL << VIRTIO_F_ORDER_PLATFORM | \
+ 1ULL << VIRTIO_F_NOTIFICATION_DATA)
#define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \
(VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 4468e89cb..8b4e001a1 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -416,9 +416,32 @@ modern_del_queue(struct virtio_hw *hw, struct virtqueue *vq)
}
static void
-modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue *vq)
+modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
{
- rte_write16(vq->vq_queue_index, vq->notify_addr);
+ uint32_t notify_data;
+
+ if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
+ rte_write16(vq->vq_queue_index, vq->notify_addr);
+ return;
+ }
+
+ if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED)) {
+ /*
+ * Bit[0:15]: vq queue index
+ * Bit[16:30]: avail index
+ * Bit[31]: avail wrap counter
+ */
+ notify_data = ((((uint32_t)vq->vq_packed.used_wrap_counter << 15) |
+ vq->vq_avail_idx) << 16) | vq->vq_queue_index;
+ } else {
+ /*
+ * Bit[0:15]: vq queue index
+ * Bit[16:31]: avail index
+ */
+ notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
+ vq->vq_queue_index;
+ }
+ rte_write32(notify_data, vq->notify_addr);
}
const struct virtio_pci_ops modern_ops = {
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index a38cb45ad..7433d2f08 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -135,6 +135,12 @@ struct virtnet_ctl;
*/
#define VIRTIO_F_ORDER_PLATFORM 36
+/*
+ * This feature indicates that the driver passes extra data (besides
+ * identifying the virtqueue) in its device notifications.
+ */
+#define VIRTIO_F_NOTIFICATION_DATA 38
+
/* The Guest publishes the used index for which it expects an interrupt
* at the end of the avail ring. Host should ignore the avail->flags field. */
/* The Host publishes the avail index for which it expects a kick
--
2.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-dev] [PATCH v2] net/virtio: packed ring notification data feature support
2019-12-18 8:17 ` [dpdk-dev] [PATCH v2] " Cheng Jiang
@ 2019-12-18 9:51 ` Gavin Hu
2019-12-23 2:34 ` Jiang, Cheng1
2019-12-23 5:15 ` [dpdk-dev] [PATCH v3] " Cheng Jiang
1 sibling, 1 reply; 13+ messages in thread
From: Gavin Hu @ 2019-12-18 9:51 UTC (permalink / raw)
To: Cheng Jiang, maxime.coquelin, tiwei.bie, zhihong.wang, yong.liu; +Cc: dev, nd
Hi Jiang,
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Cheng Jiang
> Sent: Wednesday, December 18, 2019 4:17 PM
> To: maxime.coquelin@redhat.com; tiwei.bie@intel.com;
> zhihong.wang@intel.com; yong.liu@intel.com
> Cc: dev@dpdk.org; Cheng Jiang <Cheng1.jiang@intel.com>
> Subject: [dpdk-dev] [PATCH v2] net/virtio: packed ring notification data
> feature support
>
> This patch supports the feature that the driver passes extra data
> (besides identifying the virtqueue) in its device notifications.
Can the commit log be more specific about the extra data? Something like "expand the notification to include the avail index and avail wrap counter, if any"?
>
> Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> ---
>
> v2:
> * Removed rte_unused attribute in *hw.
> * Added some comments on notify_data.
>
> drivers/net/virtio/virtio_ethdev.h | 3 ++-
> drivers/net/virtio/virtio_pci.c | 27 +++++++++++++++++++++++++--
> drivers/net/virtio/virtio_pci.h | 6 ++++++
> 3 files changed, 33 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_ethdev.h
> b/drivers/net/virtio/virtio_ethdev.h
> index a10111758..cd8947656 100644
> --- a/drivers/net/virtio/virtio_ethdev.h
> +++ b/drivers/net/virtio/virtio_ethdev.h
> @@ -36,7 +36,8 @@
> 1ULL << VIRTIO_F_IN_ORDER | \
> 1ULL << VIRTIO_F_RING_PACKED | \
> 1ULL << VIRTIO_F_IOMMU_PLATFORM | \
> - 1ULL << VIRTIO_F_ORDER_PLATFORM)
> + 1ULL << VIRTIO_F_ORDER_PLATFORM | \
> + 1ULL << VIRTIO_F_NOTIFICATION_DATA)
>
> #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \
> (VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \
> diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
> index 4468e89cb..8b4e001a1 100644
> --- a/drivers/net/virtio/virtio_pci.c
> +++ b/drivers/net/virtio/virtio_pci.c
> @@ -416,9 +416,32 @@ modern_del_queue(struct virtio_hw *hw, struct
> virtqueue *vq)
> }
>
> static void
> -modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue
> *vq)
> +modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
> {
> - rte_write16(vq->vq_queue_index, vq->notify_addr);
> + uint32_t notify_data;
> +
> + if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
> + rte_write16(vq->vq_queue_index, vq->notify_addr);
> + return;
> + }
> +
> + if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED)) {
> + /*
> + * Bit[0:15]: vq queue index
> + * Bit[16:30]: avail index
> + * Bit[31]: avail wrap counter
> + */
> + notify_data = ((((uint32_t)vq-
> >vq_packed.used_wrap_counter << 15) |
Why not do ' used_wrap_counter << 31' to be more straightforward and matches the above comment?
> + vq->vq_avail_idx) << 16) | vq-
> >vq_queue_index;
> + } else {
> + /*
> + * Bit[0:15]: vq queue index
> + * Bit[16:31]: avail index
> + */
> + notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
> + vq->vq_queue_index;
> + }
> + rte_write32(notify_data, vq->notify_addr);
> }
>
> const struct virtio_pci_ops modern_ops = {
> diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
> index a38cb45ad..7433d2f08 100644
> --- a/drivers/net/virtio/virtio_pci.h
> +++ b/drivers/net/virtio/virtio_pci.h
> @@ -135,6 +135,12 @@ struct virtnet_ctl;
> */
> #define VIRTIO_F_ORDER_PLATFORM 36
>
> +/*
> + * This feature indicates that the driver passes extra data (besides
> + * identifying the virtqueue) in its device notifications.
> + */
> +#define VIRTIO_F_NOTIFICATION_DATA 38
> +
> /* The Guest publishes the used index for which it expects an interrupt
> * at the end of the avail ring. Host should ignore the avail->flags field. */
> /* The Host publishes the avail index for which it expects a kick
> --
> 2.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-dev] [PATCH v2] net/virtio: packed ring notification data feature support
2019-12-18 9:51 ` Gavin Hu
@ 2019-12-23 2:34 ` Jiang, Cheng1
0 siblings, 0 replies; 13+ messages in thread
From: Jiang, Cheng1 @ 2019-12-23 2:34 UTC (permalink / raw)
To: Gavin Hu, maxime.coquelin, Bie, Tiwei, Wang, Zhihong, Liu, Yong; +Cc: dev, nd
Hi Gavin,
> -----Original Message-----
> From: Gavin Hu [mailto:Gavin.Hu@arm.com]
> Sent: Wednesday, December 18, 2019 5:52 PM
> To: Jiang, Cheng1 <cheng1.jiang@intel.com>; maxime.coquelin@redhat.com;
> Bie, Tiwei <tiwei.bie@intel.com>; Wang, Zhihong
> <zhihong.wang@intel.com>; Liu, Yong <yong.liu@intel.com>
> Cc: dev@dpdk.org; nd <nd@arm.com>
> Subject: RE: [dpdk-dev] [PATCH v2] net/virtio: packed ring notification data
> feature support
>
> Hi Jiang,
>
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Cheng Jiang
> > Sent: Wednesday, December 18, 2019 4:17 PM
> > To: maxime.coquelin@redhat.com; tiwei.bie@intel.com;
> > zhihong.wang@intel.com; yong.liu@intel.com
> > Cc: dev@dpdk.org; Cheng Jiang <Cheng1.jiang@intel.com>
> > Subject: [dpdk-dev] [PATCH v2] net/virtio: packed ring notification
> > data feature support
> >
> > This patch supports the feature that the driver passes extra data
> > (besides identifying the virtqueue) in its device notifications.
> Can the commit log be more specific about the extra data? Something like
> "expand the notification to include the avail index and avail wrap counter, if
> any"?
It makes more sense. I will add more specific commit log in the next version. Thank you.
> >
> > Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> > ---
> >
> > v2:
> > * Removed rte_unused attribute in *hw.
> > * Added some comments on notify_data.
> >
> > drivers/net/virtio/virtio_ethdev.h | 3 ++-
> > drivers/net/virtio/virtio_pci.c | 27 +++++++++++++++++++++++++--
> > drivers/net/virtio/virtio_pci.h | 6 ++++++
> > 3 files changed, 33 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/virtio/virtio_ethdev.h
> > b/drivers/net/virtio/virtio_ethdev.h
> > index a10111758..cd8947656 100644
> > --- a/drivers/net/virtio/virtio_ethdev.h
> > +++ b/drivers/net/virtio/virtio_ethdev.h
> > @@ -36,7 +36,8 @@
> > 1ULL << VIRTIO_F_IN_ORDER | \
> > 1ULL << VIRTIO_F_RING_PACKED | \
> > 1ULL << VIRTIO_F_IOMMU_PLATFORM | \
> > - 1ULL << VIRTIO_F_ORDER_PLATFORM)
> > + 1ULL << VIRTIO_F_ORDER_PLATFORM | \
> > + 1ULL << VIRTIO_F_NOTIFICATION_DATA)
> >
> > #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \
> > (VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \
> > diff --git a/drivers/net/virtio/virtio_pci.c
> > b/drivers/net/virtio/virtio_pci.c index 4468e89cb..8b4e001a1 100644
> > --- a/drivers/net/virtio/virtio_pci.c
> > +++ b/drivers/net/virtio/virtio_pci.c
> > @@ -416,9 +416,32 @@ modern_del_queue(struct virtio_hw *hw, struct
> > virtqueue *vq) }
> >
> > static void
> > -modern_notify_queue(struct virtio_hw *hw __rte_unused, struct
> > virtqueue
> > *vq)
> > +modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
> > {
> > - rte_write16(vq->vq_queue_index, vq->notify_addr);
> > + uint32_t notify_data;
> > +
> > + if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
> > + rte_write16(vq->vq_queue_index, vq->notify_addr);
> > + return;
> > + }
> > +
> > + if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED)) {
> > + /*
> > + * Bit[0:15]: vq queue index
> > + * Bit[16:30]: avail index
> > + * Bit[31]: avail wrap counter
> > + */
> > + notify_data = ((((uint32_t)vq-
> > >vq_packed.used_wrap_counter << 15) |
> Why not do ' used_wrap_counter << 31' to be more straightforward and
> matches the above comment?
Sure, you're right. I'll modify the patch in the next version.
Thanks again.
Cheng
> > + vq->vq_avail_idx) << 16) | vq-
> > >vq_queue_index;
>
> > + } else {
> > + /*
> > + * Bit[0:15]: vq queue index
> > + * Bit[16:31]: avail index
> > + */
> > + notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
> > + vq->vq_queue_index;
> > + }
> > + rte_write32(notify_data, vq->notify_addr);
> > }
> >
> > const struct virtio_pci_ops modern_ops = { diff --git
> > a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
> > index a38cb45ad..7433d2f08 100644
> > --- a/drivers/net/virtio/virtio_pci.h
> > +++ b/drivers/net/virtio/virtio_pci.h
> > @@ -135,6 +135,12 @@ struct virtnet_ctl;
> > */
> > #define VIRTIO_F_ORDER_PLATFORM 36
> >
> > +/*
> > + * This feature indicates that the driver passes extra data (besides
> > + * identifying the virtqueue) in its device notifications.
> > + */
> > +#define VIRTIO_F_NOTIFICATION_DATA 38
> > +
> > /* The Guest publishes the used index for which it expects an interrupt
> > * at the end of the avail ring. Host should ignore the avail->flags
> > field. */
> > /* The Host publishes the avail index for which it expects a kick
> > --
> > 2.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH v3] net/virtio: packed ring notification data feature support
2019-12-18 8:17 ` [dpdk-dev] [PATCH v2] " Cheng Jiang
2019-12-18 9:51 ` Gavin Hu
@ 2019-12-23 5:15 ` Cheng Jiang
2019-12-23 6:49 ` Gavin Hu
2020-01-13 3:31 ` [dpdk-dev] [PATCH v4] " Cheng Jiang
1 sibling, 2 replies; 13+ messages in thread
From: Cheng Jiang @ 2019-12-23 5:15 UTC (permalink / raw)
To: maxime.coquelin, tiwei.bie, zhihong.wang, yong.liu, gavin.Hu
Cc: dev, Cheng Jiang
This patch supports the feature that the driver passes extra data
(besides identifying the virtqueue) in its device notifications,
expanding the notifications to include the avail index and avail
wrap counter.
Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
---
v3:
* Modified the commit log to make it more detailed.
* Modified the shift mode of notify_data to make it more intuitive.
v2:
* Removed rte_unused attribute in *hw.
* Added some comments on notify_data.
drivers/net/virtio/virtio_ethdev.h | 3 ++-
drivers/net/virtio/virtio_pci.c | 28 ++++++++++++++++++++++++++--
drivers/net/virtio/virtio_pci.h | 6 ++++++
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index a10111758..cd8947656 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -36,7 +36,8 @@
1ULL << VIRTIO_F_IN_ORDER | \
1ULL << VIRTIO_F_RING_PACKED | \
1ULL << VIRTIO_F_IOMMU_PLATFORM | \
- 1ULL << VIRTIO_F_ORDER_PLATFORM)
+ 1ULL << VIRTIO_F_ORDER_PLATFORM | \
+ 1ULL << VIRTIO_F_NOTIFICATION_DATA)
#define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \
(VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 4468e89cb..dedd6bdda 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -416,9 +416,33 @@ modern_del_queue(struct virtio_hw *hw, struct virtqueue *vq)
}
static void
-modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue *vq)
+modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
{
- rte_write16(vq->vq_queue_index, vq->notify_addr);
+ uint32_t notify_data;
+
+ if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
+ rte_write16(vq->vq_queue_index, vq->notify_addr);
+ return;
+ }
+
+ if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED)) {
+ /*
+ * Bit[0:15]: vq queue index
+ * Bit[16:30]: avail index
+ * Bit[31]: avail wrap counter
+ */
+ notify_data = ((uint32_t)vq->vq_packed.used_wrap_counter << 31) |
+ ((uint32_t)vq->vq_avail_idx << 16) |
+ vq->vq_queue_index;
+ } else {
+ /*
+ * Bit[0:15]: vq queue index
+ * Bit[16:31]: avail index
+ */
+ notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
+ vq->vq_queue_index;
+ }
+ rte_write32(notify_data, vq->notify_addr);
}
const struct virtio_pci_ops modern_ops = {
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index a38cb45ad..7433d2f08 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -135,6 +135,12 @@ struct virtnet_ctl;
*/
#define VIRTIO_F_ORDER_PLATFORM 36
+/*
+ * This feature indicates that the driver passes extra data (besides
+ * identifying the virtqueue) in its device notifications.
+ */
+#define VIRTIO_F_NOTIFICATION_DATA 38
+
/* The Guest publishes the used index for which it expects an interrupt
* at the end of the avail ring. Host should ignore the avail->flags field. */
/* The Host publishes the avail index for which it expects a kick
--
2.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-dev] [PATCH v3] net/virtio: packed ring notification data feature support
2019-12-23 5:15 ` [dpdk-dev] [PATCH v3] " Cheng Jiang
@ 2019-12-23 6:49 ` Gavin Hu
2020-01-13 3:31 ` [dpdk-dev] [PATCH v4] " Cheng Jiang
1 sibling, 0 replies; 13+ messages in thread
From: Gavin Hu @ 2019-12-23 6:49 UTC (permalink / raw)
To: Cheng Jiang, maxime.coquelin, tiwei.bie, zhihong.wang, yong.liu; +Cc: dev, nd
Reviewed-by: Gavin Hu <gavin.hu@arm.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-dev] [PATCH v4] net/virtio: packed ring notification data feature support
2019-12-23 5:15 ` [dpdk-dev] [PATCH v3] " Cheng Jiang
2019-12-23 6:49 ` Gavin Hu
@ 2020-01-13 3:31 ` Cheng Jiang
2020-01-13 15:02 ` Maxime Coquelin
2020-01-15 11:18 ` Maxime Coquelin
1 sibling, 2 replies; 13+ messages in thread
From: Cheng Jiang @ 2020-01-13 3:31 UTC (permalink / raw)
To: maxime.coquelin, tiwei.bie, zhihong.wang, yong.liu; +Cc: dev, Cheng Jiang
This patch supports the feature that the driver passes extra data
(besides identifying the virtqueue) in its device notifications,
expanding the notifications to include the avail index and avail
wrap counter.
Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
---
v4:
* Replaced used_wrap_counter with avail_wrap_counter.
v3:
* Modified the commit log to make it more detailed.
* Modified the shift mode of notify_data to make it more intuitive.
v2:
* Removed rte_unused attribute in *hw.
* Added some comments on notify_data.
drivers/net/virtio/virtio_ethdev.h | 3 ++-
drivers/net/virtio/virtio_pci.c | 29 +++++++++++++++++++++++++++--
drivers/net/virtio/virtio_pci.h | 6 ++++++
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index a10111758..cd8947656 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -36,7 +36,8 @@
1ULL << VIRTIO_F_IN_ORDER | \
1ULL << VIRTIO_F_RING_PACKED | \
1ULL << VIRTIO_F_IOMMU_PLATFORM | \
- 1ULL << VIRTIO_F_ORDER_PLATFORM)
+ 1ULL << VIRTIO_F_ORDER_PLATFORM | \
+ 1ULL << VIRTIO_F_NOTIFICATION_DATA)
#define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \
(VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 4468e89cb..29a354bf7 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -416,9 +416,34 @@ modern_del_queue(struct virtio_hw *hw, struct virtqueue *vq)
}
static void
-modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue *vq)
+modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
{
- rte_write16(vq->vq_queue_index, vq->notify_addr);
+ uint32_t notify_data;
+
+ if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
+ rte_write16(vq->vq_queue_index, vq->notify_addr);
+ return;
+ }
+
+ if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED)) {
+ /*
+ * Bit[0:15]: vq queue index
+ * Bit[16:30]: avail index
+ * Bit[31]: avail wrap counter
+ */
+ notify_data = ((uint32_t)(!!(vq->vq_packed.cached_flags &
+ VRING_PACKED_DESC_F_AVAIL)) << 31) |
+ ((uint32_t)vq->vq_avail_idx << 16) |
+ vq->vq_queue_index;
+ } else {
+ /*
+ * Bit[0:15]: vq queue index
+ * Bit[16:31]: avail index
+ */
+ notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
+ vq->vq_queue_index;
+ }
+ rte_write32(notify_data, vq->notify_addr);
}
const struct virtio_pci_ops modern_ops = {
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index a38cb45ad..7433d2f08 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -135,6 +135,12 @@ struct virtnet_ctl;
*/
#define VIRTIO_F_ORDER_PLATFORM 36
+/*
+ * This feature indicates that the driver passes extra data (besides
+ * identifying the virtqueue) in its device notifications.
+ */
+#define VIRTIO_F_NOTIFICATION_DATA 38
+
/* The Guest publishes the used index for which it expects an interrupt
* at the end of the avail ring. Host should ignore the avail->flags field. */
/* The Host publishes the avail index for which it expects a kick
--
2.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-dev] [PATCH v4] net/virtio: packed ring notification data feature support
2020-01-13 3:31 ` [dpdk-dev] [PATCH v4] " Cheng Jiang
@ 2020-01-13 15:02 ` Maxime Coquelin
2020-01-15 11:18 ` Maxime Coquelin
1 sibling, 0 replies; 13+ messages in thread
From: Maxime Coquelin @ 2020-01-13 15:02 UTC (permalink / raw)
To: Cheng Jiang, tiwei.bie, zhihong.wang, yong.liu; +Cc: dev
On 1/13/20 4:31 AM, Cheng Jiang wrote:
> This patch supports the feature that the driver passes extra data
> (besides identifying the virtqueue) in its device notifications,
> expanding the notifications to include the avail index and avail
> wrap counter.
>
> Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> ---
>
> v4:
> * Replaced used_wrap_counter with avail_wrap_counter.
>
> v3:
> * Modified the commit log to make it more detailed.
> * Modified the shift mode of notify_data to make it more intuitive.
>
> v2:
> * Removed rte_unused attribute in *hw.
> * Added some comments on notify_data.
>
> drivers/net/virtio/virtio_ethdev.h | 3 ++-
> drivers/net/virtio/virtio_pci.c | 29 +++++++++++++++++++++++++++--
> drivers/net/virtio/virtio_pci.h | 6 ++++++
> 3 files changed, 35 insertions(+), 3 deletions(-)
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [dpdk-dev] [PATCH v4] net/virtio: packed ring notification data feature support
2020-01-13 3:31 ` [dpdk-dev] [PATCH v4] " Cheng Jiang
2020-01-13 15:02 ` Maxime Coquelin
@ 2020-01-15 11:18 ` Maxime Coquelin
1 sibling, 0 replies; 13+ messages in thread
From: Maxime Coquelin @ 2020-01-15 11:18 UTC (permalink / raw)
To: Cheng Jiang, tiwei.bie, zhihong.wang, yong.liu; +Cc: dev
On 1/13/20 4:31 AM, Cheng Jiang wrote:
> This patch supports the feature that the driver passes extra data
> (besides identifying the virtqueue) in its device notifications,
> expanding the notifications to include the avail index and avail
> wrap counter.
>
> Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> ---
>
> v4:
> * Replaced used_wrap_counter with avail_wrap_counter.
>
> v3:
> * Modified the commit log to make it more detailed.
> * Modified the shift mode of notify_data to make it more intuitive.
>
> v2:
> * Removed rte_unused attribute in *hw.
> * Added some comments on notify_data.
>
> drivers/net/virtio/virtio_ethdev.h | 3 ++-
> drivers/net/virtio/virtio_pci.c | 29 +++++++++++++++++++++++++++--
> drivers/net/virtio/virtio_pci.h | 6 ++++++
> 3 files changed, 35 insertions(+), 3 deletions(-)
Applied to dpdk-next-virtio/master
Thanks,
Maxime
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [dpdk-dev] [DPDK] net/virtio: packed ring notification data feature support
2019-12-04 15:03 [dpdk-dev] [DPDK] net/virtio: packed ring notification data feature support Cheng Jiang
2019-12-09 1:59 ` Liu, Yong
2019-12-18 8:17 ` [dpdk-dev] [PATCH v2] " Cheng Jiang
@ 2020-01-09 7:29 ` Liu, Yong
2020-01-13 2:57 ` Jiang, Cheng1
2 siblings, 1 reply; 13+ messages in thread
From: Liu, Yong @ 2020-01-09 7:29 UTC (permalink / raw)
To: Jiang, Cheng1, dev
Cc: maxime.coquelin, Bie, Tiwei, Wang, Zhihong, Jiang, Cheng1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Cheng Jiang
> Sent: Wednesday, December 04, 2019 11:03 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Bie, Tiwei <tiwei.bie@intel.com>; Wang,
> Zhihong <zhihong.wang@intel.com>; Jiang, Cheng1 <cheng1.jiang@intel.com>
> Subject: [dpdk-dev] [DPDK] net/virtio: packed ring notification data
> feature support
>
> This patch supports the feature that the driver passes extra data
> (besides identifying the virtqueue) in its device notifications.
>
> Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> ---
> drivers/net/virtio/virtio_ethdev.h | 3 ++-
> drivers/net/virtio/virtio_pci.c | 15 ++++++++++++++-
> drivers/net/virtio/virtio_pci.h | 6 ++++++
> 3 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_ethdev.h
> b/drivers/net/virtio/virtio_ethdev.h
> index a10111758..cd8947656 100644
> --- a/drivers/net/virtio/virtio_ethdev.h
> +++ b/drivers/net/virtio/virtio_ethdev.h
> + if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED))
> + notify_data = ((((uint32_t)vq->vq_packed.used_wrap_counter <<
> 15) |
> + vq->vq_avail_idx) << 16) | vq->vq_queue_index;
> + else
> + notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
> + vq->vq_queue_index;
Hi Cheng,
According to virtio1.1 spec, wrap counter should refer to next available descriptor.
So used_wrap_counter should be replaced with avail_wrap_counter. Sorry for late noticing.
Thanks,
Marvin
> + rte_write32(notify_data, vq->notify_addr);
> }
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [dpdk-dev] [DPDK] net/virtio: packed ring notification data feature support
2020-01-09 7:29 ` [dpdk-dev] [DPDK] " Liu, Yong
@ 2020-01-13 2:57 ` Jiang, Cheng1
0 siblings, 0 replies; 13+ messages in thread
From: Jiang, Cheng1 @ 2020-01-13 2:57 UTC (permalink / raw)
To: Liu, Yong, dev; +Cc: maxime.coquelin, Bie, Tiwei, Wang, Zhihong
Hi Marvin,
> -----Original Message-----
> From: Liu, Yong
> Sent: Thursday, January 9, 2020 3:29 PM
> To: Jiang, Cheng1 <cheng1.jiang@intel.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Bie, Tiwei <tiwei.bie@intel.com>; Wang,
> Zhihong <zhihong.wang@intel.com>; Jiang, Cheng1
> <cheng1.jiang@intel.com>
> Subject: RE: [dpdk-dev] [DPDK] net/virtio: packed ring notification data
> feature support
>
>
>
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Cheng Jiang
> > Sent: Wednesday, December 04, 2019 11:03 PM
> > To: dev@dpdk.org
> > Cc: maxime.coquelin@redhat.com; Bie, Tiwei <tiwei.bie@intel.com>;
> > Wang, Zhihong <zhihong.wang@intel.com>; Jiang, Cheng1
> > <cheng1.jiang@intel.com>
> > Subject: [dpdk-dev] [DPDK] net/virtio: packed ring notification data
> > feature support
> >
> > This patch supports the feature that the driver passes extra data
> > (besides identifying the virtqueue) in its device notifications.
> >
> > Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> > ---
> > drivers/net/virtio/virtio_ethdev.h | 3 ++-
> > drivers/net/virtio/virtio_pci.c | 15 ++++++++++++++-
> > drivers/net/virtio/virtio_pci.h | 6 ++++++
> > 3 files changed, 22 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/virtio/virtio_ethdev.h
> > b/drivers/net/virtio/virtio_ethdev.h
> > index a10111758..cd8947656 100644
> > --- a/drivers/net/virtio/virtio_ethdev.h
> > +++ b/drivers/net/virtio/virtio_ethdev.h
> > + if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED))
> > + notify_data = ((((uint32_t)vq-
> >vq_packed.used_wrap_counter <<
> > 15) |
> > + vq->vq_avail_idx) << 16) | vq-
> >vq_queue_index;
> > + else
> > + notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
> > + vq->vq_queue_index;
>
> Hi Cheng,
> According to virtio1.1 spec, wrap counter should refer to next available
> descriptor.
> So used_wrap_counter should be replaced with avail_wrap_counter. Sorry
> for late noticing.
>
> Thanks,
> Marvin
>
Sure, I'm going to modify it in the next version.
Thanks very much.
Cheng
> > + rte_write32(notify_data, vq->notify_addr);
> > }
> >
^ permalink raw reply [flat|nested] 13+ messages in thread