From: Tiwei Bie <tiwei.bie@intel.com>
To: Jens Freimann <jfreimann@redhat.com>
Cc: dev@dpdk.org, maxime.coquelin@redhat.com, Gavin.Hu@arm.com,
zhihong.wang@intel.com
Subject: Re: [dpdk-dev] [PATCH v6 09/11] net/virtio: add virtio send command packed queue support
Date: Fri, 21 Sep 2018 20:37:15 +0800 [thread overview]
Message-ID: <20180921123715.GB25292@debian> (raw)
In-Reply-To: <20180921103308.16357-10-jfreimann@redhat.com>
On Fri, Sep 21, 2018 at 12:33:06PM +0200, Jens Freimann wrote:
> Use packed virtqueue format when reading and writing descriptors
> to/from the ring.
>
> Signed-off-by: Jens Freimann <jfreimann@redhat.com>
> ---
> drivers/net/virtio/virtio_ethdev.c | 90 ++++++++++++++++++++++++++++++
> 1 file changed, 90 insertions(+)
>
> diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
> index c4ef095ed..c1d95141d 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
The support for virtio-user is missing. And virtio-user will
break when packed ring is enabled. FYI, below is the relvelant
code in virtio-user:
https://github.com/DPDK/dpdk/blob/55d6bb67c9b3/drivers/net/virtio/virtio_user/virtio_user_dev.c#L584-L606
> @@ -141,6 +141,90 @@ static const struct rte_virtio_xstats_name_off rte_virtio_txq_stat_strings[] = {
>
> struct virtio_hw_internal virtio_hw_internal[RTE_MAX_ETHPORTS];
>
> +static struct virtio_pmd_ctrl *
> +virtio_pq_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,
> + int *dlen, int pkt_num)
> +{
> + struct virtqueue *vq = cvq->vq;
> + int head;
> + struct vring_desc_packed *desc = vq->vq_ring.desc_packed;
> + struct virtio_pmd_ctrl *result;
> + int wrap_counter;
> + int sum = 0;
> + int k;
> +
> + /*
> + * Format is enforced in qemu code:
> + * One TX packet for header;
> + * At least one TX packet per argument;
> + * One RX packet for ACK.
> + */
> + head = vq->vq_avail_idx;
> + wrap_counter = vq->vq_ring.avail_wrap_counter;
> + desc[head].flags = VRING_DESC_F_NEXT;
> + desc[head].addr = cvq->virtio_net_hdr_mem;
> + desc[head].len = sizeof(struct virtio_net_ctrl_hdr);
> + vq->vq_free_cnt--;
> + if (++vq->vq_avail_idx >= vq->vq_nentries) {
> + vq->vq_avail_idx -= vq->vq_nentries;
> + vq->vq_ring.avail_wrap_counter ^= 1;
> + }
> +
> + for (k = 0; k < pkt_num; k++) {
> + desc[vq->vq_avail_idx].addr = cvq->virtio_net_hdr_mem
> + + sizeof(struct virtio_net_ctrl_hdr)
> + + sizeof(ctrl->status) + sizeof(uint8_t) * sum;
> + desc[vq->vq_avail_idx].len = dlen[k];
> + desc[vq->vq_avail_idx].flags = VRING_DESC_F_NEXT;
> + sum += dlen[k];
> + vq->vq_free_cnt--;
> + _set_desc_avail(&desc[vq->vq_avail_idx],
> + vq->vq_ring.avail_wrap_counter);
> + rte_smp_wmb();
> + vq->vq_free_cnt--;
> + if (++vq->vq_avail_idx >= vq->vq_nentries) {
> + vq->vq_avail_idx -= vq->vq_nentries;
> + vq->vq_ring.avail_wrap_counter ^= 1;
> + }
> + }
> +
> +
> + desc[vq->vq_avail_idx].addr = cvq->virtio_net_hdr_mem
> + + sizeof(struct virtio_net_ctrl_hdr);
> + desc[vq->vq_avail_idx].len = sizeof(ctrl->status);
> + desc[vq->vq_avail_idx].flags = VRING_DESC_F_WRITE;
> + _set_desc_avail(&desc[vq->vq_avail_idx],
> + vq->vq_ring.avail_wrap_counter);
> + _set_desc_avail(&desc[head], wrap_counter);
> + rte_smp_wmb();
> +
> + vq->vq_free_cnt--;
> + if (++vq->vq_avail_idx >= vq->vq_nentries) {
> + vq->vq_avail_idx -= vq->vq_nentries;
> + vq->vq_ring.avail_wrap_counter ^= 1;
> + }
> +
> + virtqueue_notify(vq);
> +
> + /* wait for used descriptors in virtqueue */
> + do {
> + rte_rmb();
> + usleep(100);
> + } while (!_desc_is_used(&desc[head]));
> +
> + /* now get used descriptors */
> + while(desc_is_used(&desc[vq->vq_used_cons_idx], &vq->vq_ring)) {
> + vq->vq_free_cnt++;
> + if (++vq->vq_used_cons_idx >= vq->vq_nentries) {
> + vq->vq_used_cons_idx -= vq->vq_nentries;
> + vq->vq_ring.used_wrap_counter ^= 1;
> + }
> + }
> +
> + result = cvq->virtio_net_hdr_mz->addr;
> + return result;
> +}
> +
> static int
> virtio_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,
> int *dlen, int pkt_num)
> @@ -174,6 +258,11 @@ virtio_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,
> memcpy(cvq->virtio_net_hdr_mz->addr, ctrl,
> sizeof(struct virtio_pmd_ctrl));
>
> + if (vtpci_packed_queue(vq->hw)) {
> + result = virtio_pq_send_command(cvq, ctrl, dlen, pkt_num);
> + goto out_unlock;
> + }
> +
> /*
> * Format is enforced in qemu code:
> * One TX packet for header;
> @@ -245,6 +334,7 @@ virtio_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,
>
> result = cvq->virtio_net_hdr_mz->addr;
>
> +out_unlock:
> rte_spinlock_unlock(&cvq->lock);
> return result->status;
> }
> --
> 2.17.1
>
next prev parent reply other threads:[~2018-09-21 12:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 10:32 [dpdk-dev] [PATCH v6 00/11] implement packed virtqueues Jens Freimann
2018-09-21 10:32 ` [dpdk-dev] [PATCH v6 01/11] net/virtio: vring init for packed queues Jens Freimann
2018-09-21 10:32 ` [dpdk-dev] [PATCH v6 02/11] net/virtio: add packed virtqueue defines Jens Freimann
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 03/11] net/virtio: add packed virtqueue helpers Jens Freimann
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 04/11] net/virtio: flush packed receive virtqueues Jens Freimann
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 05/11] net/virtio: dump packed virtqueue data Jens Freimann
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 06/11] net/virtio: implement transmit path for packed queues Jens Freimann
2018-09-21 12:26 ` Tiwei Bie
2018-09-21 12:37 ` Jens Freimann
2018-09-21 12:49 ` Tiwei Bie
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 07/11] net/virtio: implement receive " Jens Freimann
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 08/11] net/virtio: add support for mergeable buffers with packed virtqueues Jens Freimann
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 09/11] net/virtio: add virtio send command packed queue support Jens Freimann
2018-09-21 12:37 ` Tiwei Bie [this message]
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 10/11] net/virtio-user: add option to use packed queues Jens Freimann
2018-09-21 10:33 ` [dpdk-dev] [PATCH v6 11/11] net/virtio: enable packed virtqueues by default Jens Freimann
2018-09-21 12:32 ` [dpdk-dev] [PATCH v6 00/11] implement packed virtqueues Tiwei Bie
2018-09-21 14:06 ` Jens Freimann
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=20180921123715.GB25292@debian \
--to=tiwei.bie@intel.com \
--cc=Gavin.Hu@arm.com \
--cc=dev@dpdk.org \
--cc=jfreimann@redhat.com \
--cc=maxime.coquelin@redhat.com \
--cc=zhihong.wang@intel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).