From patchwork Mon Oct 21 09:16:17 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: 61566 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 E27B04C8D; Mon, 21 Oct 2019 11:16:30 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id AD61CA69 for ; Mon, 21 Oct 2019 11:16:28 +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 x9L9EV0f002781; Mon, 21 Oct 2019 02:16:26 -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=SNTBItWMIU9hE/PoBYBt/ygC2cQQl+GhTDkskhF0kvs=; b=QVtZXG0Q9bOx73MMkeVS34iBOH9jB/rYUi9bAAzt+D7uVBmkZpo8M+BT6tRVgKgG0KdP Wajj/Xbyc1Mu8iU+r9wb0czmCulwUV9tTqUCEWoon/ePDNfNnGxYzoe2I7JCft7TfIyw 46lNCzFPOVZhJO0bDMZYXQKNoDn7mHo2+AL+gC3GntRzvgcR2V+Eumvcim4AzVAC0gbt RV7pCHdU8UJg4iYonEzGSTQ29u2I3ynHBTgj4HvlzvAh9cpHCHHV7jEuK8GDunJHLTXM 5xwESMYXTtmXqBCv+UpyM3edqoMBsseANQcYjEpli52jnOxHgvX3HcKVqI0DTLdE2CrU 0A== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 2vqyuqe26r-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 21 Oct 2019 02:16:26 -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; Mon, 21 Oct 2019 02:16:25 -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; Mon, 21 Oct 2019 02:16:25 -0700 Received: from localhost.localdomain (unknown [10.28.34.15]) by maili.marvell.com (Postfix) with ESMTP id AAD5C3F7050; Mon, 21 Oct 2019 02:16:21 -0700 (PDT) From: To: Adrien Mazarguil , Wenzhuo Lu , Jingjing Wu , "Bernard Iremonger" , John McNamara , Marko Kovacevic , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko , Olivier Matz CC: , , Kiran Kumar K Date: Mon, 21 Oct 2019 14:46:17 +0530 Message-ID: <20191021091617.11290-1-kirankumark@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191021035213.9675-1-kirankumark@marvell.com> References: <20191021035213.9675-1-kirankumark@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,1.0.8 definitions=2019-10-21_03:2019-10-18,2019-10-21 signatures=0 Subject: [dpdk-dev] [PATCH v9] ethdev: add HIGIG2 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_higig2_hdr in order to match higig2 header. It is a layer 2.5 protocol and used in Broadcom switches. Header format is based on the following document. http://read.pudn.com/downloads558/doc/comm/2301468/HiGig_protocol.pdf Signed-off-by: Kiran Kumar K Acked-by: Andrew Rybchenko Acked-by: Olivier Matz --- V9 Changes: * Fix gcc 4.8 compile issue V8 Changes: * Fixed gcc 4.8 compile issue V7 changes: * Added doxygen comments * Moved rte_flow specific code to rte_flow.h V6 changes: * Updated doxy-api V5 changes: * Changed broadcom to Broadcom * Changed RTE_HIGIG2_H to RTE_HIGIG_H * Fixed meson build V4 Changes: * Removed packed attribute V3 Changes: * Fixed Copyright header * Fixed version info in the subject V2 Changes: * Added support in testpmd to parse the higig2 item * Moved the higig2 header to new file * Added indentation in doc app/test-pmd/cmdline_flow.c | 33 +++++++ doc/api/doxy-api-index.md | 3 +- doc/guides/prog_guide/rte_flow.rst | 8 ++ lib/librte_ethdev/rte_flow.c | 1 + lib/librte_ethdev/rte_flow.h | 29 ++++++ lib/librte_net/Makefile | 2 +- lib/librte_net/meson.build | 3 +- lib/librte_net/rte_higig.h | 144 +++++++++++++++++++++++++++++ 8 files changed, 220 insertions(+), 3 deletions(-) create mode 100644 lib/librte_net/rte_higig.h -- 2.17.1 diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index b26b8bfe2..970bdef1d 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -203,6 +203,9 @@ enum index { ITEM_PPPOED, ITEM_PPPOE_SEID, ITEM_PPPOE_PROTO_ID, + ITEM_HIGIG2, + ITEM_HIGIG2_CLASSIFICATION, + ITEM_HIGIG2_VID, /* Validate/create actions. */ ACTIONS, @@ -675,6 +678,7 @@ static const enum index next_item[] = { ITEM_PPPOES, ITEM_PPPOED, ITEM_PPPOE_PROTO_ID, + ITEM_HIGIG2, END_SET, ZERO, }; @@ -939,6 +943,13 @@ static const enum index item_pppoe_proto_id[] = { ZERO, }; +static const enum index item_higig2[] = { + ITEM_HIGIG2_CLASSIFICATION, + ITEM_HIGIG2_VID, + ITEM_NEXT, + ZERO, +}; + static const enum index next_action[] = { ACTION_END, ACTION_VOID, @@ -2419,6 +2430,28 @@ static const struct token token_list[] = { .next = NEXT(item_pppoe_proto_id), .call = parse_vc, }, + [ITEM_HIGIG2] = { + .name = "higig2", + .help = "matches higig2 header", + .priv = PRIV_ITEM(HIGIG2, + sizeof(struct rte_flow_item_higig2_hdr)), + .next = NEXT(item_higig2), + .call = parse_vc, + }, + [ITEM_HIGIG2_CLASSIFICATION] = { + .name = "classification", + .help = "matches classification of higig2 header", + .next = NEXT(item_higig2, NEXT_ENTRY(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_higig2_hdr, + hdr.ppt1.classification)), + }, + [ITEM_HIGIG2_VID] = { + .name = "vid", + .help = "matches vid of higig2 header", + .next = NEXT(item_higig2, NEXT_ENTRY(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_higig2_hdr, + hdr.ppt1.vid)), + }, /* Validate/create actions. */ [ACTIONS] = { .name = "actions", diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index 6c2d888ee..c52b54e55 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -101,7 +101,8 @@ The public API headers are grouped by topics: [GSO] (@ref rte_gso.h), [frag/reass] (@ref rte_ip_frag.h), [LPM IPv4 route] (@ref rte_lpm.h), - [LPM IPv6 route] (@ref rte_lpm6.h) + [LPM IPv6 route] (@ref rte_lpm6.h), + [HIGIG] (@ref rte_higig.h) - **QoS**: [metering] (@ref rte_meter.h), diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 1c837ff13..6e6d44df2 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1289,6 +1289,14 @@ Matches a IP Authentication Header (RFC 4302). - ``seq_num``: counter value increased by 1 on each packet sent. - Default ``mask`` matches spi. +Item: ``HIGIG2`` +^^^^^^^^^^^^^^^^^ + +Matches a HIGIG2 header field. It is layer 2.5 protocol and used in +Broadcom switches. + +- Default ``mask`` matches classification and vlan. + Actions ~~~~~~~ diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 81a85b995..ca0f68016 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -83,6 +83,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { 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)), + MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)), }; /** Generate flow_action[] entry. */ diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index bcfc06cdc..4fee10559 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { @@ -491,8 +492,36 @@ enum rte_flow_item_type { * */ RTE_FLOW_ITEM_TYPE_AH, + + /** + * Matches a HIGIG header. + * see struct rte_flow_item_higig2_hdr. + */ + RTE_FLOW_ITEM_TYPE_HIGIG2, }; +/** + * + * RTE_FLOW_ITEM_TYPE_HIGIG2 + * Matches higig2 header + */ +RTE_STD_C11 +struct rte_flow_item_higig2_hdr { + struct rte_higig2_hdr hdr; +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_HIGIG2. */ +#ifndef __cplusplus +static const struct rte_flow_item_higig2_hdr rte_flow_item_higig2_hdr_mask = { + .hdr = { + .ppt1 = { + .classification = 0xffff, + .vid = 0xfff, + }, + }, +}; +#endif + /** * RTE_FLOW_ITEM_TYPE_ANY * diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile index 1244c9fd5..62735a5f9 100644 --- a/lib/librte_net/Makefile +++ b/lib/librte_net/Makefile @@ -21,6 +21,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h rte_esp.h SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_sctp.h rte_icmp.h rte_arp.h SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ether.h rte_gre.h rte_net.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_net_crc.h rte_mpls.h +SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_net_crc.h rte_mpls.h rte_higig.h include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_net/meson.build b/lib/librte_net/meson.build index 868a93fd6..c52c34592 100644 --- a/lib/librte_net/meson.build +++ b/lib/librte_net/meson.build @@ -14,7 +14,8 @@ headers = files('rte_ip.h', 'rte_gre.h', 'rte_net.h', 'rte_net_crc.h', - 'rte_mpls.h') + 'rte_mpls.h', + 'rte_higig.h') sources = files('rte_arp.c', 'rte_ether.c', 'rte_net.c', 'rte_net_crc.c') deps += ['mbuf'] diff --git a/lib/librte_net/rte_higig.h b/lib/librte_net/rte_higig.h new file mode 100644 index 000000000..4847448df --- /dev/null +++ b/lib/librte_net/rte_higig.h @@ -0,0 +1,144 @@ + +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2019 Marvell International Ltd. + */ + +#ifndef _RTE_HIGIG_H_ +#define _RTE_HIGIG_H_ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * + * higig2 frc header. + */ +struct rte_higig2_frc { +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN + uint32_t ksop:8; + uint32_t tc:4; + uint32_t mcst:1; + uint32_t resv:3; + uint32_t dst_modid:8; + uint32_t dst_pid:8; + uint32_t src_modid:8; + uint32_t src_pid:8; + uint32_t lbid:8; + uint32_t ppd_type:3; + uint32_t resv1:3; + uint32_t dp:2; +#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN + uint32_t ksop:8; + uint32_t resv:3; + uint32_t mcst:1; + uint32_t tc:4; + uint32_t dst_modid:8; + uint32_t dst_pid:8; + uint32_t src_modid:8; + uint32_t src_pid:8; + uint32_t lbid:8; + uint32_t dp:2; + uint32_t resv1:3; + uint32_t ppd_type:3; +#endif +}; + + +/** + * + * higig2 ppt type0 header + */ +struct rte_higig2_ppt_type0 { +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN + uint32_t mirror:1; + uint32_t mirror_done:1; + uint32_t mirror_only:1; + uint32_t ingress_tagged:1; + uint32_t dst_tgid:3; + uint32_t dst_t:1; + uint32_t vc_label2:4; + uint32_t label_present:1; + uint32_t l3:1; + uint32_t res:2; + uint32_t vc_label1:8; + uint32_t vc_label0:8; + uint32_t vid_high:8; + uint32_t vid_low:8; + uint32_t opc:3; + uint32_t res1:2; + uint32_t srce_t:1; + uint32_t pf:2; + uint32_t res2:5; + uint32_t hdr_ext_length:3; +#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN + uint32_t dst_t:1; + uint32_t dst_tgid:3; + uint32_t ingress_tagged:1; + uint32_t mirror_only:1; + uint32_t mirror_done:1; + uint32_t mirror:1; + uint32_t res:2; + uint32_t l3:1; + uint32_t label_present:1; + uint32_t vc_label2:4; + uint32_t vc_label1:8; + uint32_t vc_label0:8; + uint32_t vid_high:8; + uint32_t vid_low:8; + uint32_t pf:2; + uint32_t srce_t:1; + uint32_t res1:2; + uint32_t opc:3; + uint32_t hdr_ext_length:3; + uint32_t res2:5; +#endif +}; + + +/** + * + * higig2 ppt type1 header. + */ +struct rte_higig2_ppt_type1 { + uint16_t classification; + uint16_t resv; + uint16_t vid; +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN + uint32_t opcode:3; + uint32_t resv1:2; + uint32_t src_t:1; + uint32_t pfm:2; + uint32_t resv2:5; + uint32_t hdr_ext_len:3; +#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN + uint32_t pfm:2; + uint32_t src_t:1; + uint32_t resv1:2; + uint32_t opcode:3; + uint32_t hdr_ext_len:3; + uint32_t resv2:5; +#endif +}; + +/** + * + * higig2 header + */ +RTE_STD_C11 +struct rte_higig2_hdr { + struct rte_higig2_frc fcr; + union { + struct rte_higig2_ppt_type0 ppt0; + struct rte_higig2_ppt_type1 ppt1; + }; +}; + +#ifdef __cplusplus +} +#endif + +#endif /* RTE_HIGIG_H_ */