Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 49791,
    "url": "https://patches.dpdk.org/api/patches/49791/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190114102310.25596-1-nemanja.marjanovic@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": "<20190114102310.25596-1-nemanja.marjanovic@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190114102310.25596-1-nemanja.marjanovic@intel.com",
    "date": "2019-01-14T10:23:10",
    "name": "[v2] ip_pipeline: add QinQ PPPoE encapsulation action",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "37138037bb1159ee2160712701f93b46d9eb5a42",
    "submitter": {
        "id": 1207,
        "url": "https://patches.dpdk.org/api/people/1207/?format=api",
        "name": "Nemanja Marjanovic",
        "email": "nemanja.marjanovic@intel.com"
    },
    "delegate": {
        "id": 10018,
        "url": "https://patches.dpdk.org/api/users/10018/?format=api",
        "username": "cristian_dumitrescu",
        "first_name": "Cristian",
        "last_name": "Dumitrescu",
        "email": "cristian.dumitrescu@intel.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190114102310.25596-1-nemanja.marjanovic@intel.com/mbox/",
    "series": [
        {
            "id": 3162,
            "url": "https://patches.dpdk.org/api/series/3162/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=3162",
            "date": "2019-01-14T10:23:10",
            "name": "[v2] ip_pipeline: add QinQ PPPoE encapsulation action",
            "version": 2,
            "mbox": "https://patches.dpdk.org/series/3162/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/49791/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/49791/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 2FC7A1B295;\n\tMon, 14 Jan 2019 11:23:10 +0100 (CET)",
            "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id D1F971B20A\n\tfor <dev@dpdk.org>; Mon, 14 Jan 2019 11:23:07 +0100 (CET)",
            "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 Jan 2019 02:23:06 -0800",
            "from silpixa00391954.ir.intel.com (HELO\n\tsilpixa00391954.ger.corp.intel.com) ([10.237.223.32])\n\tby orsmga007.jf.intel.com with ESMTP; 14 Jan 2019 02:23:04 -0800"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.56,477,1539673200\"; d=\"scan'208\";a=\"106427846\"",
        "From": "\"Marjanovic,Nemanja\" <nemanja.marjanovic@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "jasvinder.singh@intel.com, cristian.dumitrescu@intel.com,\n\t\"Marjanovic,Nemanja\" <nemanja.marjanovic@intel.com>",
        "Date": "Mon, 14 Jan 2019 10:23:10 +0000",
        "Message-Id": "<20190114102310.25596-1-nemanja.marjanovic@intel.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20190114100259.23822-1-nemanja.marjanovic@intel.com>",
        "References": "<20190114100259.23822-1-nemanja.marjanovic@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v2] ip_pipeline: add QinQ PPPoE encapsulation\n\taction",
        "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": "Add implementation of QinQ PPPoE packet encapsulation action.\n\nSigned-off-by: Nemanja Marjanovic <nemanja.marjanovic@intel.com>\n---\nv2:Fix changes from check patch\n---\n examples/ip_pipeline/cli.c             | 43 +++++++++++++++++-\n lib/librte_net/rte_ether.h             |  1 +\n lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++\n lib/librte_pipeline/rte_table_action.h | 16 +++++++\n 4 files changed, 119 insertions(+), 2 deletions(-)",
    "diff": "diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c\nindex 910386282..dcc98ee65 100644\n--- a/examples/ip_pipeline/cli.c\n+++ b/examples/ip_pipeline/cli.c\n@@ -1290,11 +1290,13 @@ cmd_table_action_profile(char **tokens,\n \n \t\t\tp.encap.encap_mask = 1LLU << RTE_TABLE_ACTION_ENCAP_VXLAN;\n \t\t\tn_extra_tokens = 5;\n-\t\t} else {\n+\t\t} else if (strcmp(tokens[t0 + 1], \"qinq_pppoe\") == 0)\n+\t\t\tp.encap.encap_mask =\n+\t\t\t\t1LLU << RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE;\n+\t\telse {\n \t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH, \"encap\");\n \t\t\treturn;\n \t\t}\n-\n \t\tp.action_mask |= 1LLU << RTE_TABLE_ACTION_ENCAP;\n \t\tt0 += 2 + n_extra_tokens;\n \t} /* encap */\n@@ -3391,6 +3393,43 @@ parse_table_action_encap(char **tokens,\n \t\treturn 1 + 9;\n \t}\n \n+\t/* qinq_pppoe */\n+\t\tif (n_tokens && (strcmp(tokens[0], \"qinq_pppoe\") == 0)) {\n+\t\t\tuint32_t svlan_pcp, svlan_dei, svlan_vid;\n+\t\t\tuint32_t cvlan_pcp, cvlan_dei, cvlan_vid;\n+\n+\t\tif ((n_tokens < 10) ||\n+\t\t\tparse_mac_addr(tokens[1],\n+\t\t\t\t&a->encap.qinq_pppoe.ether.da) ||\n+\t\t\tparse_mac_addr(tokens[2],\n+\t\t\t\t&a->encap.qinq_pppoe.ether.sa) ||\n+\t\t\tparser_read_uint32(&svlan_pcp, tokens[3]) ||\n+\t\t\t(svlan_pcp > 0x7) ||\n+\t\t\tparser_read_uint32(&svlan_dei, tokens[4]) ||\n+\t\t\t(svlan_dei > 0x1) ||\n+\t\t\tparser_read_uint32(&svlan_vid, tokens[5]) ||\n+\t\t\t(svlan_vid > 0xFFF) ||\n+\t\t\tparser_read_uint32(&cvlan_pcp, tokens[6]) ||\n+\t\t\t(cvlan_pcp > 0x7) ||\n+\t\t\tparser_read_uint32(&cvlan_dei, tokens[7]) ||\n+\t\t\t(cvlan_dei > 0x1) ||\n+\t\t\tparser_read_uint32(&cvlan_vid, tokens[8]) ||\n+\t\t\t(cvlan_vid > 0xFFF) ||\n+\t\t\tparser_read_uint16(&a->encap.qinq_pppoe.pppoe.session_id,\n+\t\t\t\ttokens[9]))\n+\t\t\treturn 0;\n+\n+\t\ta->encap.qinq_pppoe.svlan.pcp = svlan_pcp & 0x7;\n+\t\ta->encap.qinq_pppoe.svlan.dei = svlan_dei & 0x1;\n+\t\ta->encap.qinq_pppoe.svlan.vid = svlan_vid & 0xFFF;\n+\t\ta->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp & 0x7;\n+\t\ta->encap.qinq_pppoe.cvlan.dei = cvlan_dei & 0x1;\n+\t\ta->encap.qinq_pppoe.cvlan.vid = cvlan_vid & 0xFFF;\n+\t\ta->encap.type = RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE;\n+\t\ta->action_mask |= 1 << RTE_TABLE_ACTION_ENCAP;\n+\t\treturn 1 + 10;\n+\t\t}\n+\n \t/* mpls */\n \tif (n_tokens && (strcmp(tokens[0], \"mpls\") == 0)) {\n \t\tuint32_t label, tc, ttl;\ndiff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h\nindex c2c5e249f..212ead64a 100644\n--- a/lib/librte_net/rte_ether.h\n+++ b/lib/librte_net/rte_ether.h\n@@ -300,6 +300,7 @@ struct vxlan_hdr {\n #define ETHER_TYPE_ARP  0x0806 /**< Arp Protocol. */\n #define ETHER_TYPE_RARP 0x8035 /**< Reverse Arp Protocol. */\n #define ETHER_TYPE_VLAN 0x8100 /**< IEEE 802.1Q VLAN tagging. */\n+#define ETHER_TYPE_PPPoE 0x8864 /**< PPPoE Session Stage */\n #define ETHER_TYPE_QINQ 0x88A8 /**< IEEE 802.1ad QinQ tagging. */\n #define ETHER_TYPE_ETAG 0x893F /**< IEEE 802.1BR E-Tag. */\n #define ETHER_TYPE_1588 0x88F7 /**< IEEE 802.1AS 1588 Precise Time Protocol. */\ndiff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/rte_table_action.c\nindex 7c7c8dd82..78cc7a7a2 100644\n--- a/lib/librte_pipeline/rte_table_action.c\n+++ b/lib/librte_pipeline/rte_table_action.c\n@@ -432,6 +432,7 @@ encap_valid(enum rte_table_action_encap_type encap)\n \tcase RTE_TABLE_ACTION_ENCAP_MPLS:\n \tcase RTE_TABLE_ACTION_ENCAP_PPPOE:\n \tcase RTE_TABLE_ACTION_ENCAP_VXLAN:\n+\tcase RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:\n \t\treturn 1;\n \tdefault:\n \t\treturn 0;\n@@ -532,6 +533,13 @@ struct encap_vxlan_ipv6_vlan_data {\n \tstruct vxlan_hdr vxlan;\n } __attribute__((__packed__));\n \n+struct encap_qinq_pppoe_data {\n+\tstruct ether_hdr ether;\n+\tstruct vlan_hdr svlan;\n+\tstruct vlan_hdr cvlan;\n+\tstruct pppoe_ppp_hdr pppoe_ppp;\n+} __attribute__((__packed__));\n+\n static size_t\n encap_data_size(struct rte_table_action_encap_config *encap)\n {\n@@ -563,6 +571,9 @@ encap_data_size(struct rte_table_action_encap_config *encap)\n \t\t\telse\n \t\t\t\treturn sizeof(struct encap_vxlan_ipv6_data);\n \n+\tcase 1LLU << RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:\n+\t\t\treturn sizeof(struct encap_qinq_pppoe_data);\n+\n \tdefault:\n \t\treturn 0;\n \t}\n@@ -599,6 +610,9 @@ encap_apply_check(struct rte_table_action_encap_params *p,\n \tcase RTE_TABLE_ACTION_ENCAP_VXLAN:\n \t\treturn 0;\n \n+\tcase RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:\n+\t\treturn 0;\n+\n \tdefault:\n \t\treturn -EINVAL;\n \t}\n@@ -676,6 +690,38 @@ encap_qinq_apply(void *data,\n \treturn 0;\n }\n \n+static int\n+encap_qinq_pppoe_apply(void *data,\n+\tstruct rte_table_action_encap_params *p)\n+{\n+\tstruct encap_qinq_pppoe_data *d = data;\n+\n+\t/* Ethernet */\n+\tether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);\n+\tether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr);\n+\td->ether.ether_type = rte_htons(ETHER_TYPE_VLAN);\n+\n+\t/* SVLAN */\n+\td->svlan.vlan_tci = rte_htons(VLAN(p->qinq.svlan.pcp,\n+\t\tp->qinq.svlan.dei,\n+\t\tp->qinq.svlan.vid));\n+\td->svlan.eth_proto = rte_htons(ETHER_TYPE_VLAN);\n+\n+\t/* CVLAN */\n+\td->cvlan.vlan_tci = rte_htons(VLAN(p->qinq.cvlan.pcp,\n+\t\tp->qinq.cvlan.dei,\n+\t\tp->qinq.cvlan.vid));\n+\td->cvlan.eth_proto = rte_htons(ETHER_TYPE_PPPoE);\n+\n+\t/* PPPoE and PPP*/\n+\td->pppoe_ppp.ver_type_code = rte_htons(0x1100);\n+\td->pppoe_ppp.session_id = rte_htons(p->qinq_pppoe.pppoe.session_id);\n+\td->pppoe_ppp.length = 0; /* not pre-computed */\n+\td->pppoe_ppp.protocol = rte_htons(PPP_PROTOCOL_IP);\n+\n+\treturn 0;\n+}\n+\n static int\n encap_mpls_apply(void *data,\n \tstruct rte_table_action_encap_params *p)\n@@ -921,6 +967,9 @@ encap_apply(void *data,\n \tcase RTE_TABLE_ACTION_ENCAP_VXLAN:\n \t\treturn encap_vxlan_apply(data, p, cfg);\n \n+\tcase RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:\n+\t\treturn encap_qinq_pppoe_apply(data, p);\n+\n \tdefault:\n \t\treturn -EINVAL;\n \t}\n@@ -1119,6 +1168,18 @@ pkt_work_encap(struct rte_mbuf *mbuf,\n \t\tbreak;\n \t}\n \n+\tcase 1LLU << RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:\n+\t{\n+\t\tstruct encap_qinq_pppoe_data *qinq_pppoe =\n+\t\t\tencap(ip, data, sizeof(struct encap_qinq_pppoe_data));\n+\t\tqinq_pppoe->pppoe_ppp.length = rte_htons(total_length + 2);\n+\t\tmbuf->data_off = ip_offset - (sizeof(struct rte_mbuf) +\n+\t\t\tsizeof(struct encap_qinq_pppoe_data));\n+\t\tmbuf->pkt_len = mbuf->data_len = total_length +\n+\t\t\tsizeof(struct encap_qinq_pppoe_data);\n+\t\tbreak;\n+\t}\n+\n \tcase 1LLU << RTE_TABLE_ACTION_ENCAP_VXLAN:\n \t{\n \t\tif (cfg->vxlan.ip_version)\ndiff --git a/lib/librte_pipeline/rte_table_action.h b/lib/librte_pipeline/rte_table_action.h\nindex c96061291..53d16af8a 100644\n--- a/lib/librte_pipeline/rte_table_action.h\n+++ b/lib/librte_pipeline/rte_table_action.h\n@@ -380,6 +380,9 @@ enum rte_table_action_encap_type {\n \t * Ether -> { Ether | VLAN | IP | UDP | VXLAN | Ether }\n \t */\n \tRTE_TABLE_ACTION_ENCAP_VXLAN,\n+\n+\t/** IP -> { Ether | S-VLAN | C-VLAN | PPPoE | PPP | IP } */\n+\tRTE_TABLE_ACTION_ENCAP_QINQ_PPPOE,\n };\n \n /** Pre-computed Ethernet header fields for encapsulation action. */\n@@ -529,6 +532,16 @@ struct rte_table_action_encap_config {\n \t};\n };\n \n+/** QinQ_PPPoE encap paramaeters. */\n+struct rte_table_encap_ether_qinq_pppoe {\n+\n+\t/** Only valid when *type* is set to QinQ. */\n+\tstruct rte_table_action_ether_hdr ether;\n+\tstruct rte_table_action_vlan_hdr svlan; /**< Service VLAN header. */\n+\tstruct rte_table_action_vlan_hdr cvlan; /**< Customer VLAN header. */\n+\tstruct rte_table_action_pppoe_hdr pppoe; /**< PPPoE/PPP headers. */\n+};\n+\n /** Encap action parameters (per table rule). */\n struct rte_table_action_encap_params {\n \t/** Encapsulation type. */\n@@ -553,6 +566,9 @@ struct rte_table_action_encap_params {\n \n \t\t/** Only valid when *type* is set to VXLAN. */\n \t\tstruct rte_table_action_encap_vxlan_params vxlan;\n+\n+\t\t/** Only valid when *type* is set to QinQ_PPPoE. */\n+\t\tstruct rte_table_encap_ether_qinq_pppoe qinq_pppoe;\n \t};\n };\n \n",
    "prefixes": [
        "v2"
    ]
}