From patchwork Tue Jul 23 08:30:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran Kumar Kokkilagadda X-Patchwork-Id: 56956 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 939F61BFC3; Tue, 23 Jul 2019 10:31:08 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 6AE811BFAD for ; Tue, 23 Jul 2019 10:31:06 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x6N8RFjE030400 for ; Tue, 23 Jul 2019 01:31:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0818; bh=AphlJZFSSplyLHPSuUWdC0d3EwpLxZNftj+FE/jW55g=; b=Wq7NCtXtuS6gfqyXI28fOv0TMK0T8U9ryZFB52bfNLSIszwCI9CDIiMEjpEpJlIViNOW 86mLX2Fl9l/9TuvKfMPqDDenAwGMJ2NKNL+MRMeQJHysNT9rUX41/4DCFP5ihZaU5lWS vd5cmvtzdmsbkYVMJ+LxaQh4/qbiBGclfCf5ARdSBqr/JWXyMYB4aNSRggcxAFxfCswD g8/n3GNX1brToLEPZNYtU2yOC0uFUQiHMamAnXgVC7SVezNzZBtdSZ3O08ReDeCekvvv 0jYIkh/Nimbt9iXjfil+DdQR8+AqD63j0pMDSb6ZGIoBU8KG6WaXAs5eW5g5isk7s1iK Dg== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 2tv0ap2w7s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 23 Jul 2019 01:31:05 -0700 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 23 Jul 2019 01:31:04 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Tue, 23 Jul 2019 01:31:04 -0700 Received: from localhost.localdomain (unknown [10.28.34.15]) by maili.marvell.com (Postfix) with ESMTP id 46CE43F7041; Tue, 23 Jul 2019 01:31:03 -0700 (PDT) From: To: CC: Kiran Kumar K Date: Tue, 23 Jul 2019 14:00:50 +0530 Message-ID: <20190723083052.32049-1-kirankumark@marvell.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:5.22.84,1.0.8 definitions=2019-07-23_04:2019-07-23,2019-07-23 signatures=0 Subject: [dpdk-dev] [PATCH 1/3] ethdev: add NSH key field to flow API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Kiran Kumar K Add new rte_flow_item_nsh in order to match the network service header based on RFC 8300. Signed-off-by: Kiran Kumar K --- lib/librte_ethdev/rte_flow.c | 1 + lib/librte_ethdev/rte_flow.h | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 18fcb018e..39646167c 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -75,6 +75,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(MARK, sizeof(struct rte_flow_item_mark)), MK_FLOW_ITEM(META, sizeof(struct rte_flow_item_meta)), MK_FLOW_ITEM(GRE_KEY, sizeof(rte_be32_t)), + MK_FLOW_ITEM(NSH, sizeof(struct rte_flow_item_nsh)), }; /** Generate flow_action[] entry. */ diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index b66bf1495..f0e99fa3e 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -434,6 +434,13 @@ enum rte_flow_item_type { * @code rte_be32_t * @endcode */ RTE_FLOW_ITEM_TYPE_GRE_KEY, + + /** + * Matches Network service header (NSH). + * See struct rte_flow_item_nsh. + * + */ + RTE_FLOW_ITEM_TYPE_NSH, }; /** @@ -1214,6 +1221,38 @@ struct rte_flow_item_mark { uint32_t id; /**< Integer value to match against. */ }; +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * RTE_FLOW_ITEM_TYPE_NSH + * + * Match network service header (NSH), RFC 8300 + * + */ +struct rte_flow_item_nsh { + uint32_t version:2; + uint32_t oam_pkt:1; + uint32_t reserved:1; + uint32_t ttl:6; + uint32_t length:6; + uint32_t reserved1:4; + uint32_t mdtype:4; + uint32_t next_proto:8; + uint32_t spi:24; + uint32_t sindex:8; +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_NSH. */ +#ifndef __cplusplus +static const struct rte_flow_item_nsh rte_flow_item_nsh_mask = { + .mdtype = 0xf, + .next_proto = 0xff, + .spi = 0xffffff, + .sindex = 0xff, +}; +#endif + /** * Matching pattern item definition. * From patchwork Tue Jul 23 08:30:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran Kumar Kokkilagadda X-Patchwork-Id: 56957 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A8C501BFCF; Tue, 23 Jul 2019 10:31:14 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 378CA1BFAD for ; Tue, 23 Jul 2019 10:31:07 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x6N8Pmjq029182 for ; Tue, 23 Jul 2019 01:31:06 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=k4rpt/39gtTKR+LL16Lb68I3qv3yQHOpmVKseLGvCzQ=; b=GNSafpNOXaWont7INr79TRsD4cV/ujDeWZif5YjPuO7lZeJT1jPBE7NFrCyD05ytql++ tYPFg2fgYlvHA0ttlITx7cy4kgnuA0S1qPmcGoEU+UR+qSkD7DEH0W8HFU+vbxf3MW2I PQ2Ak2kZdvk5xuCXUUBkpdMu4uDqfX5ukHgCh2X7hoT/fDXRT8uHXjG5+LTuIkcUHX3z j8ExxU1ViIPVh9HNg9wjM0RMRCVSogw0Duuidx5876tt3dek2OlkYGp2Mbj8UJ0oRLki PFk85sixihIv5J977IGUNvPVd2Hg2aHeb+IESuXIBTpa26DwA0oHTfQRNWcbxeplP+Wf IA== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0a-0016f401.pphosted.com with ESMTP id 2tv0ap2w7u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 23 Jul 2019 01:31:06 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 23 Jul 2019 01:31:05 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Tue, 23 Jul 2019 01:31:05 -0700 Received: from localhost.localdomain (unknown [10.28.34.15]) by maili.marvell.com (Postfix) with ESMTP id 750173F703F; Tue, 23 Jul 2019 01:31:04 -0700 (PDT) From: To: CC: Kiran Kumar K Date: Tue, 23 Jul 2019 14:00:51 +0530 Message-ID: <20190723083052.32049-2-kirankumark@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190723083052.32049-1-kirankumark@marvell.com> References: <20190723083052.32049-1-kirankumark@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:5.22.84,1.0.8 definitions=2019-07-23_04:2019-07-23,2019-07-23 signatures=0 Subject: [dpdk-dev] [PATCH 2/3] ethdev: add IGMP key field to flow API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Kiran Kumar K Add new rte_flow_item_igmp in order to match the Internet Group Management Protocol based on RFC 2236. Signed-off-by: Kiran Kumar K --- lib/librte_ethdev/rte_flow.c | 1 + lib/librte_ethdev/rte_flow.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 39646167c..4dee4f9c2 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -76,6 +76,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(META, sizeof(struct rte_flow_item_meta)), MK_FLOW_ITEM(GRE_KEY, sizeof(rte_be32_t)), MK_FLOW_ITEM(NSH, sizeof(struct rte_flow_item_nsh)), + MK_FLOW_ITEM(IGMP, sizeof(struct rte_flow_item_igmp)), }; /** Generate flow_action[] entry. */ diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index f0e99fa3e..ce8072613 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -441,6 +441,14 @@ enum rte_flow_item_type { * */ RTE_FLOW_ITEM_TYPE_NSH, + + /** + * Matches Internet Group Management Protocol (IGMP). + * See struct rte_flow_item_igmp. + * + */ + RTE_FLOW_ITEM_TYPE_IGMP, + }; /** @@ -1253,6 +1261,29 @@ static const struct rte_flow_item_nsh rte_flow_item_nsh_mask = { }; #endif +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * RTE_FLOW_ITEM_TYPE_IGMP + * + * Match Internet Group Management Protocol (IGMP), RFC 2236 + * + */ +struct rte_flow_item_igmp { + uint32_t type:8; + uint32_t max_resp_time:8; + uint32_t checksum:16; + uint32_t group_addr; +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_IGMP. */ +#ifndef __cplusplus +static const struct rte_flow_item_igmp rte_flow_item_igmp_mask = { + .group_addr = 0xffffffff, +}; +#endif + /** * Matching pattern item definition. * From patchwork Tue Jul 23 08:30:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran Kumar Kokkilagadda X-Patchwork-Id: 56958 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 423651BFD5; Tue, 23 Jul 2019 10:31:16 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 40E881BFAD for ; Tue, 23 Jul 2019 10:31:08 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x6N8Pc97029172 for ; Tue, 23 Jul 2019 01:31:07 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=zzwM6/2FC3QNSISOMXYJvRoC8mOr4zuw/zP8mx+lGIM=; b=BM/bNRpDZL+qToIW1mWZYNtelI19R/WSuaYbjIDvD5lre83GtI0U3tIOft8gyw6MvkWk t10VEyBFqSPToDtU+ONiMa9J9Y1GT6K3aej0r/D2W3sbNaqJPO3pOrkow6kP/LZMl1sU TmgBYi+nQm8XskBfcDuyA3dkgUArRUJ50hiS+yJaZ35ZI7GeG/eIZxaAT3w2AF4s6wmI AgBatqeHtbexjrRhBjBYsos5Wjzgx4UvwWuSV1HQWzRWOTXMQ/H9nrFt22uEMpmiyAnu WRLgj5p1t211ggwPX/rQa6X2O4rnC1jxYT1bT2gvc5+kn03cdkTuSSRwZvljbS3ksdbx XA== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 2tv0ap2w7v-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 23 Jul 2019 01:31:07 -0700 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 23 Jul 2019 01:31:06 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Tue, 23 Jul 2019 01:31:06 -0700 Received: from localhost.localdomain (unknown [10.28.34.15]) by maili.marvell.com (Postfix) with ESMTP id A57913F7040; Tue, 23 Jul 2019 01:31:05 -0700 (PDT) From: To: CC: Kiran Kumar K Date: Tue, 23 Jul 2019 14:00:52 +0530 Message-ID: <20190723083052.32049-3-kirankumark@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190723083052.32049-1-kirankumark@marvell.com> References: <20190723083052.32049-1-kirankumark@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:5.22.84,1.0.8 definitions=2019-07-23_04:2019-07-23,2019-07-23 signatures=0 Subject: [dpdk-dev] [PATCH 3/3] ethdev: add AH key field to flow API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Kiran Kumar K Add new rte_flow_item_ah in order to match the Authentication Header based on RFC 2402. Signed-off-by: Kiran Kumar K --- lib/librte_ethdev/rte_flow.c | 1 + lib/librte_ethdev/rte_flow.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 4dee4f9c2..44aa9f973 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -77,6 +77,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(GRE_KEY, sizeof(rte_be32_t)), MK_FLOW_ITEM(NSH, sizeof(struct rte_flow_item_nsh)), MK_FLOW_ITEM(IGMP, sizeof(struct rte_flow_item_igmp)), + MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)), }; /** Generate flow_action[] entry. */ diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index ce8072613..4c137708e 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -449,6 +449,13 @@ enum rte_flow_item_type { */ RTE_FLOW_ITEM_TYPE_IGMP, + /** + * Matches IP Authentication Header (AH). + * See struct rte_flow_item_ah. + * + */ + RTE_FLOW_ITEM_TYPE_AH, + }; /** @@ -1284,6 +1291,30 @@ static const struct rte_flow_item_igmp rte_flow_item_igmp_mask = { }; #endif +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * RTE_FLOW_ITEM_TYPE_AH + * + * Match IP Authentication Header (AH), RFC 2402 + * + */ +struct rte_flow_item_ah { + uint32_t next_hdr:8; + uint32_t payload_len:8; + uint32_t reserved:16; + uint32_t spi; + uint32_t seq_num; +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_AH. */ +#ifndef __cplusplus +static const struct rte_flow_item_ah rte_flow_item_ah_mask = { + .spi = 0xffffffff, +}; +#endif + /** * Matching pattern item definition. *