Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2535/?format=api
{ "id": 2535, "url": "https://patches.dpdk.org/api/patches/2535/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1422326164-13697-21-git-send-email-changchun.ouyang@intel.com/", "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": "<1422326164-13697-21-git-send-email-changchun.ouyang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1422326164-13697-21-git-send-email-changchun.ouyang@intel.com", "date": "2015-01-27T02:36:00", "name": "[dpdk-dev,v2,20/24] example/vhost: Avoid inserting vlan twice", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "5382b1632cf151d78f95eea09a86b04d9b09e5e5", "submitter": { "id": 31, "url": "https://patches.dpdk.org/api/people/31/?format=api", "name": "Ouyang Changchun", "email": "changchun.ouyang@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1422326164-13697-21-git-send-email-changchun.ouyang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/2535/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/2535/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 1AD975AA3;\n\tTue, 27 Jan 2015 03:47:01 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 7470F591A\n\tfor <dev@dpdk.org>; Tue, 27 Jan 2015 03:37:00 +0100 (CET)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga101.jf.intel.com with ESMTP; 26 Jan 2015 18:36:59 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga002.fm.intel.com with ESMTP; 26 Jan 2015 18:36:58 -0800", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t0R2at47016014;\n\tTue, 27 Jan 2015 10:36:55 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t0R2arro013870; Tue, 27 Jan 2015 10:36:55 +0800", "(from couyang@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t0R2aqWU013866; \n\tTue, 27 Jan 2015 10:36:52 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.09,471,1418112000\"; d=\"scan'208\";a=\"667998909\"", "From": "Ouyang Changchun <changchun.ouyang@intel.com>", "To": "dev@dpdk.org", "Date": "Tue, 27 Jan 2015 10:36:00 +0800", "Message-Id": "<1422326164-13697-21-git-send-email-changchun.ouyang@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "In-Reply-To": "<1422326164-13697-1-git-send-email-changchun.ouyang@intel.com>", "References": "<1421298930-15210-1-git-send-email-changchun.ouyang@intel.com>\n\t<1422326164-13697-1-git-send-email-changchun.ouyang@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 20/24] example/vhost: Avoid inserting vlan\n\ttwice", "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": "Check if it has already been vlan-tagged packet, if true, avoid inserting a\nduplicated vlan tag into it.\n\nThis is a possible case when guest has the capability of inserting vlan tag.\n\nSigned-off-by: Changchun Ouyang <changchun.ouyang@intel.com>\n---\n examples/vhost/main.c | 14 ++++++++++++--\n 1 file changed, 12 insertions(+), 2 deletions(-)", "diff": "diff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex 04f0118..1d31520 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -1115,6 +1115,7 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag)\n \tunsigned len, ret, offset = 0;\n \tconst uint16_t lcore_id = rte_lcore_id();\n \tstruct virtio_net *dev = vdev->dev;\n+\tstruct ether_hdr *nh;\n \n \t/*check if destination is local VM*/\n \tif ((vm2vm_mode == VM2VM_SOFTWARE) && (virtio_tx_local(vdev, m) == 0)) {\n@@ -1135,7 +1136,15 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag)\n \ttx_q = &lcore_tx_queue[lcore_id];\n \tlen = tx_q->len;\n \n-\tm->ol_flags = PKT_TX_VLAN_PKT;\n+\tnh = rte_pktmbuf_mtod(m, struct ether_hdr *);\n+\tif (unlikely(nh->ether_type == rte_cpu_to_be_16(ETHER_TYPE_VLAN))) {\n+\t\t/* Guest has inserted the vlan tag. */\n+\t\tstruct vlan_hdr *vh = (struct vlan_hdr *) (nh + 1);\n+\t\tuint16_t vlan_tag_be = rte_cpu_to_be_16(vlan_tag);\n+\t\tif (vh->vlan_tci != vlan_tag_be)\n+\t\t\tvh->vlan_tci = vlan_tag_be;\n+\t} else {\n+\t\tm->ol_flags = PKT_TX_VLAN_PKT;\n \n \t/*\n \t * Find the right seg to adjust the data len when offset is\n@@ -1156,7 +1165,8 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag)\n \t\tm->pkt_len += offset;\n \t}\n \n-\tm->vlan_tci = vlan_tag;\n+\t\tm->vlan_tci = vlan_tag;\n+\t}\n \n \ttx_q->m_table[len] = m;\n \tlen++;\n", "prefixes": [ "dpdk-dev", "v2", "20/24" ] }