Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54832/?format=api
{ "id": 54832, "url": "http://patchwork.dpdk.org/api/patches/54832/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1560680229-8166-2-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "http://patchwork.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": "<1560680229-8166-2-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1560680229-8166-2-git-send-email-arybchenko@solarflare.com", "date": "2019-06-16T10:17:09", "name": "[v3,2/2] net/virtio: move VLAN tag insertion to Tx prepare", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "769a8c3100c6ba77195e19a9d286fdd8797c66c5", "submitter": { "id": 607, "url": "http://patchwork.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 2642, "url": "http://patchwork.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1560680229-8166-2-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 5025, "url": "http://patchwork.dpdk.org/api/series/5025/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=5025", "date": "2019-06-16T10:17:08", "name": "[v3,1/2] net/virtio: add Tx preparation", "version": 3, "mbox": "http://patchwork.dpdk.org/series/5025/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/54832/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/54832/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 831F01BF0D;\n\tSun, 16 Jun 2019 12:17:38 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 9E2D31BE97;\n\tSun, 16 Jun 2019 12:17:35 +0200 (CEST)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us5.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n\t23A724C0051; Sun, 16 Jun 2019 10:17:29 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Sun, 16 Jun 2019 03:17:26 -0700", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1395.4 via Frontend Transport; Sun, 16 Jun 2019 03:17:25 -0700", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx5GAHOeo025365; Sun, 16 Jun 2019 11:17:24 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\tE76A51627D8; Sun, 16 Jun 2019 11:17:23 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "Maxime Coquelin <maxime.coquelin@redhat.com>, Tiwei Bie\n\t<tiwei.bie@intel.com>, Zhihong Wang <zhihong.wang@intel.com>", "CC": "<dev@dpdk.org>, Dilshod Urazov <Dilshod.Urazov@oktetlabs.ru>,\n\t<stable@dpdk.org>", "Date": "Sun, 16 Jun 2019 11:17:09 +0100", "Message-ID": "<1560680229-8166-2-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1560680229-8166-1-git-send-email-arybchenko@solarflare.com>", "References": "<1559587805-1637-1-git-send-email-arybchenko@solarflare.com>\n\t<1560680229-8166-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.5.1010-24682.005", "X-TM-AS-Result": "No-5.612000-4.000000-10", "X-TMASE-MatchedRID": "DsrYVh2fgU2RpSeUCslIgm6HurDH4PpPeouvej40T4gd0WOKRkwsh0Ac\n\t6DyoS2rI8DRYXhYkzdl0ubG+UxX6DcIV1bw4H0838VqfAfqY2iwCn5QffvZFlUbtou1PeiP7oWe\n\tJtGVrYAh5pr4z5BsqFftEAjVuRcjjSYQ3EV2VFMZl1tleYYUuJxJSx+7Qm/dK/NpLPdn/hponsP\n\tw8ZXR/4eLzNWBegCW2wgn7iDBesS15zdAzex5xZjhZwkXdM9VxfsDDP4+KDhJu8lpPFOjCGG9dv\n\t0opO6LIlwwjx64D3SqUTGVAhB5EbQ==", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--5.612000-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24682.005", "X-MDID": "1560680249-9MCrAr5JpNp8", "Subject": "[dpdk-dev] [PATCH v3 2/2] net/virtio: move VLAN tag insertion to Tx\n\tprepare", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Dilshod Urazov <Dilshod.Urazov@oktetlabs.ru>\n\nVLAN tag insertion should be in Tx prepare, not in Tx burst functions.\n\nFixes: 4fb7e803eb1a (\"ethdev: add Tx preparation\")\nCc: stable@dpdk.org\n\nSigned-off-by: Dilshod Urazov <Dilshod.Urazov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/virtio/virtio_rxtx.c | 50 +++++++++-----------------------\n 1 file changed, 14 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex 07f8f47de..dcce39e8c 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -1966,6 +1966,20 @@ virtio_xmit_pkts_prepare(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts,\n \t\t}\n #endif\n \n+\t\t/* Do VLAN tag insertion */\n+\t\tif (unlikely(m->ol_flags & PKT_TX_VLAN_PKT)) {\n+\t\t\terror = rte_vlan_insert(&m);\n+\t\t\t/* rte_vlan_insert() may change pointer\n+\t\t\t * even in the case of failure\n+\t\t\t */\n+\t\t\ttx_pkts[nb_tx] = m;\n+\n+\t\t\tif (unlikely(error)) {\n+\t\t\t\trte_errno = -error;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n \t\terror = rte_net_intel_cksum_prepare(m);\n \t\tif (unlikely(error)) {\n \t\t\trte_errno = -error;\n@@ -1989,7 +2003,6 @@ virtio_xmit_pkts_packed(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint16_t nb_tx = 0;\n \tbool in_order = hw->use_inorder_tx;\n-\tint error;\n \n \tif (unlikely(hw->started == 0 && tx_pkts != hw->inject_pkts))\n \t\treturn nb_tx;\n@@ -2007,17 +2020,6 @@ virtio_xmit_pkts_packed(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\tstruct rte_mbuf *txm = tx_pkts[nb_tx];\n \t\tint can_push = 0, slots, need;\n \n-\t\t/* Do VLAN tag insertion */\n-\t\tif (unlikely(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\t/* vlan_insert may add a header mbuf */\n-\t\t\ttx_pkts[nb_tx] = txm;\n-\t\t}\n-\n \t\t/* optimize ring usage */\n \t\tif ((vtpci_with_feature(hw, VIRTIO_F_ANY_LAYOUT) ||\n \t\t vtpci_with_feature(hw, VIRTIO_F_VERSION_1)) &&\n@@ -2077,7 +2079,6 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint16_t nb_used, nb_tx = 0;\n-\tint error;\n \n \tif (unlikely(hw->started == 0 && tx_pkts != hw->inject_pkts))\n \t\treturn nb_tx;\n@@ -2096,17 +2097,6 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\tstruct rte_mbuf *txm = tx_pkts[nb_tx];\n \t\tint can_push = 0, use_indirect = 0, slots, need;\n \n-\t\t/* Do VLAN tag insertion */\n-\t\tif (unlikely(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\t/* vlan_insert may add a header mbuf */\n-\t\t\ttx_pkts[nb_tx] = txm;\n-\t\t}\n-\n \t\t/* optimize ring usage */\n \t\tif ((vtpci_with_feature(hw, VIRTIO_F_ANY_LAYOUT) ||\n \t\t vtpci_with_feature(hw, VIRTIO_F_VERSION_1)) &&\n@@ -2176,7 +2166,6 @@ virtio_xmit_pkts_inorder(void *tx_queue,\n \tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint16_t nb_used, nb_avail, nb_tx = 0, nb_inorder_pkts = 0;\n \tstruct rte_mbuf *inorder_pkts[nb_pkts];\n-\tint error;\n \n \tif (unlikely(hw->started == 0 && tx_pkts != hw->inject_pkts))\n \t\treturn nb_tx;\n@@ -2201,17 +2190,6 @@ virtio_xmit_pkts_inorder(void *tx_queue,\n \t\tstruct rte_mbuf *txm = tx_pkts[nb_tx];\n \t\tint slots, need;\n \n-\t\t/* Do VLAN tag insertion */\n-\t\tif (unlikely(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\t/* vlan_insert may add a header mbuf */\n-\t\t\ttx_pkts[nb_tx] = txm;\n-\t\t}\n-\n \t\t/* optimize ring usage */\n \t\tif ((vtpci_with_feature(hw, VIRTIO_F_ANY_LAYOUT) ||\n \t\t vtpci_with_feature(hw, VIRTIO_F_VERSION_1)) &&\n", "prefixes": [ "v3", "2/2" ] }