Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/7732/?format=api
{ "id": 7732, "url": "https://patches.dpdk.org/api/patches/7732/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1445231772-17467-5-git-send-email-stephen@networkplumber.org/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1445231772-17467-5-git-send-email-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/1445231772-17467-5-git-send-email-stephen@networkplumber.org", "date": "2015-10-19T05:16:11", "name": "[dpdk-dev,4/5] virtio: use any layout on transmit", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "8d8a52b4475792ed7c4148302e675632c7951090", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1445231772-17467-5-git-send-email-stephen@networkplumber.org/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/7732/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/7732/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id F39E28E96;\n\tMon, 19 Oct 2015 07:16:13 +0200 (CEST)", "from mail-pa0-f47.google.com (mail-pa0-f47.google.com\n\t[209.85.220.47]) by dpdk.org (Postfix) with ESMTP id 346968E82\n\tfor <dev@dpdk.org>; Mon, 19 Oct 2015 07:16:09 +0200 (CEST)", "by padhk11 with SMTP id hk11so18235026pad.1\n\tfor <dev@dpdk.org>; Sun, 18 Oct 2015 22:16:08 -0700 (PDT)", "from xeon-e3.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net.\n\t[50.53.82.155]) by smtp.gmail.com with ESMTPSA id\n\tk10sm33681035pbq.78.2015.10.18.22.16.07\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tSun, 18 Oct 2015 22:16:08 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=5axCljtJgA3kHvdtoMy+ErMvQfsTgdpnowzej/uZ5Ig=;\n\tb=P6/d5NGzMJ4vsgvwW0dXxiEGjqKlnFBKSSoCD7/0gShinO0/CuWj+nNeqrDnPMtnnY\n\tq10PWj9isnZ8zOWZ7XleSHouucdv+GrJ2JsMUY58kYSsTsXrjSJS1K1x1uj+ugUL1CMe\n\tWaYW4Hg9iG4Mozb23CSZSE3Gy+0UqQaGs2GUTwQK7AHRzgchf4nVpD3SX5uhF9a4/R8F\n\tJOk11GbYDTq0orokO8lQRlUD/uBizSltGb22AZZcbvxSfd3450/vg4I5DHo1xW2y9uj/\n\tiPF7jp8+k5QBFv4qCO6hBpzqspOoHSmx+TlH6C3FfA4HM9bmpAbCZBtOXh5wR+wanPlj\n\tassw==", "X-Gm-Message-State": "ALoCoQlSDu9/g0gtVBQ494MxMVoT7C4sJRF/QNTijSQjKF0sDCe+oYaF8JL8tMidk9uRg5HC/Qh3", "X-Received": "by 10.68.197.97 with SMTP id it1mr32535783pbc.4.1445231768615;\n\tSun, 18 Oct 2015 22:16:08 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "huawei.xie@intel.com,\n\tchangchun.ouyang@intel.com", "Date": "Sun, 18 Oct 2015 22:16:11 -0700", "Message-Id": "<1445231772-17467-5-git-send-email-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1445231772-17467-1-git-send-email-stephen@networkplumber.org>", "References": "<1445231772-17467-1-git-send-email-stephen@networkplumber.org>", "Cc": "dev@dpdk.org", "Subject": "[dpdk-dev] [PATCH 4/5] virtio: use any layout on transmit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Virtio supports a feature that allows sender to put transmit\nheader prepended to data. It requires that the mbuf be writeable, correct\nalignment, and the feature has been negotiatied. If all this works out,\nthen it will be the optimum way to transmit a single segment packet.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/virtio/virtio_ethdev.h | 3 +-\n drivers/net/virtio/virtio_rxtx.c | 66 +++++++++++++++++++++++---------------\n 2 files changed, 42 insertions(+), 27 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h\nindex 07a9265..f260fbb 100644\n--- a/drivers/net/virtio/virtio_ethdev.h\n+++ b/drivers/net/virtio/virtio_ethdev.h\n@@ -65,7 +65,8 @@\n \t 1u << VIRTIO_NET_F_CTRL_RX\t |\t\\\n \t 1u << VIRTIO_NET_F_CTRL_VLAN\t |\t\\\n \t 1u << VIRTIO_NET_F_MRG_RXBUF |\t\\\n-\t 1u << VIRTIO_RING_F_INDIRECT_DESC)\n+\t 1u << VIRTIO_RING_F_INDIRECT_DESC|\t\\\n+\t 1u << VIRTIO_F_ANY_LAYOUT)\n \n /*\n * CQ function prototype\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex f68ab8f..dbedcc3 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -200,13 +200,13 @@ virtqueue_enqueue_recv_refill(struct virtqueue *vq, struct rte_mbuf *cookie)\n \n static int\n virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie,\n-\t\t int use_indirect)\n+\t\t uint16_t needed, int use_indirect, int can_push)\n {\n \tstruct vq_desc_extra *dxp;\n \tstruct vring_desc *start_dp;\n \tuint16_t seg_num = cookie->nb_segs;\n-\tuint16_t needed = use_indirect ? 1 : 1 + seg_num;\n \tuint16_t head_idx, idx;\n+\tuint16_t head_size = txvq->hw->vtnet_hdr_size;\n \tunsigned long offs;\n \n \tif (unlikely(txvq->vq_free_cnt == 0))\n@@ -223,7 +223,12 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie,\n \tdxp->ndescs = needed;\n \tstart_dp = txvq->vq_ring.desc;\n \n-\tif (use_indirect) {\n+\tif (can_push) {\n+\t\t/* put on zero'd transmit header (no offloads) */\n+\t\tvoid *hdr = rte_pktmbuf_prepend(cookie, head_size);\n+\n+\t\tmemset(hdr, 0, head_size);\n+\t} else if (use_indirect) {\n \t\tstruct virtio_tx_region *txr\n \t\t\t= txvq->virtio_net_hdr_mz->addr;\n \n@@ -235,7 +240,7 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie,\n \t\tstart_dp[idx].flags = VRING_DESC_F_INDIRECT;\n \n \t\tstart_dp = txr[idx].tx_indir;\n-\t\tidx = 0;\n+\t\tidx = 1;\n \t} else {\n \t\toffs = idx * sizeof(struct virtio_tx_region)\n \t\t\t+ offsetof(struct virtio_tx_region, tx_hdr);\n@@ -243,22 +248,19 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie,\n \t\tstart_dp[idx].addr = txvq->virtio_net_hdr_mem + offs;\n \t\tstart_dp[idx].len = txvq->hw->vtnet_hdr_size;\n \t\tstart_dp[idx].flags = VRING_DESC_F_NEXT;\n+\t\tidx = start_dp[idx].next;\n \t}\n \n-\tfor (; ((seg_num > 0) && (cookie != NULL)); seg_num--) {\n-\t\tidx = start_dp[idx].next;\n+\twhile (cookie != NULL) {\n \t\tstart_dp[idx].addr = RTE_MBUF_DATA_DMA_ADDR(cookie);\n \t\tstart_dp[idx].len = cookie->data_len;\n-\t\tstart_dp[idx].flags = VRING_DESC_F_NEXT;\n+\t\tstart_dp[idx].flags = cookie->next ? VRING_DESC_F_NEXT : 0;\n \t\tcookie = cookie->next;\n+\t\tidx = start_dp[idx].next;\n \t}\n \n-\tstart_dp[idx].flags &= ~VRING_DESC_F_NEXT;\n-\n \tif (use_indirect)\n \t\tidx = txvq->vq_ring.desc[head_idx].next;\n-\telse\n-\t\tidx = start_dp[idx].next;\n \n \ttxvq->vq_desc_head_idx = idx;\n \tif (txvq->vq_desc_head_idx == VQ_RING_DESC_CHAIN_END)\n@@ -761,10 +763,13 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \treturn nb_rx;\n }\n \n+\n uint16_t\n virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n {\n \tstruct virtqueue *txvq = tx_queue;\n+\tstruct virtio_hw *hw = txvq->hw;\n+\tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint16_t nb_used, nb_tx;\n \tint error;\n \n@@ -780,14 +785,31 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \n \tfor (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) {\n \t\tstruct rte_mbuf *txm = tx_pkts[nb_tx];\n-\t\tint use_indirect, slots, need;\n+\t\tint can_push = 0, use_indirect = 0, slots, need;\n+\n+\t\t/* Do VLAN tag insertion */\n+\t\tif (txm->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\t\terror = rte_vlan_insert(&txm);\n+\t\t\tif (unlikely(error)) {\n+\t\t\t\trte_pktmbuf_free(txm);\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t}\n \n-\t\tuse_indirect = vtpci_with_feature(txvq->hw,\n-\t\t\t\t\t\t VIRTIO_RING_F_INDIRECT_DESC)\n-\t\t\t&& (txm->nb_segs < VIRTIO_MAX_TX_INDIRECT);\n+\t\t/* optimize ring usage */\n+\t\tif (vtpci_with_feature(hw, VIRTIO_F_ANY_LAYOUT) &&\n+\t\t rte_mbuf_refcnt_read(txm) == 1 &&\n+\t\t txm->nb_segs == 1 &&\n+\t\t rte_pktmbuf_headroom(txm) >= hdr_size &&\n+\t\t rte_is_aligned(rte_pktmbuf_mtod(txm, char *),\n+\t\t\t\t __alignof__(struct virtio_net_hdr_mrg_rxbuf)))\n+\t\t\tcan_push = 1;\n+\t\telse if (vtpci_with_feature(hw, VIRTIO_RING_F_INDIRECT_DESC) &&\n+\t\t\t txm->nb_segs < VIRTIO_MAX_TX_INDIRECT)\n+\t\t\tuse_indirect = 1;\n \n \t\t/* How many ring entries are needed to this Tx? */\n-\t\tslots = use_indirect ? 1 : 1 + txm->nb_segs;\n+\t\tslots = use_indirect ? 1 : !can_push + txm->nb_segs;\n \t\tneed = slots - txvq->vq_free_cnt;\n \n \t\t/* Positive value indicates it need free vring descriptors */\n@@ -805,17 +827,9 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t\t}\n \t\t}\n \n-\t\t/* Do VLAN tag insertion */\n-\t\tif (txm->ol_flags & PKT_TX_VLAN_PKT) {\n-\t\t\terror = rte_vlan_insert(&txm);\n-\t\t\tif (unlikely(error)) {\n-\t\t\t\trte_pktmbuf_free(txm);\n-\t\t\t\tcontinue;\n-\t\t\t}\n-\t\t}\n-\n \t\t/* Enqueue Packet buffers */\n-\t\terror = virtqueue_enqueue_xmit(txvq, txm, use_indirect);\n+\t\terror = virtqueue_enqueue_xmit(txvq, txm, slots,\n+\t\t\t\t\t use_indirect, can_push);\n \t\tif (unlikely(error)) {\n \t\t\tif (error == ENOSPC)\n \t\t\t\tPMD_TX_LOG(ERR, \"virtqueue_enqueue Free count = 0\");\n", "prefixes": [ "dpdk-dev", "4/5" ] }