From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F31DFA318B for ; Fri, 18 Oct 2019 06:13:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6FEF729C6; Fri, 18 Oct 2019 06:13:15 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 99D34B62 for ; Fri, 18 Oct 2019 06:13:13 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x9I45JCa004861; Thu, 17 Oct 2019 21:13:09 -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=cW/3p/Waq32JeI6UrLLiUTJmLwsUZPEOBhxMAtRluoM=; b=GWQyM74yxE0cAURMNOH2eQh2be9vkKs++HTcTFPQO+HjI02ujDJCRE6mUP8DoZTIxt4h quIcxt//Km2zEvvxLFpvHgEIqn+WD6kQzmz4SXoXd8OCHy8zcxCuuixWEFz8Tz+wDLXy ThuX33cU4WjJWKc/Hm6AV3DEZgSDOHvlL1JeViA1BR8UUZHNeplSBVHkwGDJ5VaxAazD GuwMJinsdCpIPJCuAfFt+cnJjLF8ZvO2siHHlCT8rDfSu78sW63vDMqHKNvbR8B0TCFl LcnBuTyFc9gX4yWA1TWLiKXZe+Y1qaBvnJDd8mXGe5xrAhmFYrcUPWJeL0MfPqt7X/TL lw== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 2vpj9bv51p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2019 21:13:09 -0700 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 17 Oct 2019 21:13:07 -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; Thu, 17 Oct 2019 21:13:07 -0700 Received: from localhost.localdomain (unknown [10.28.34.15]) by maili.marvell.com (Postfix) with ESMTP id 2DED53F7045; Thu, 17 Oct 2019 21:13:03 -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: Fri, 18 Oct 2019 09:43:00 +0530 Message-ID: <20191018041300.22290-1-kirankumark@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017041550.4075-1-kirankumark@marvell.com> References: <20191017041550.4075-1-kirankumark@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,1.0.8 definitions=2019-10-18_01:2019-10-17,2019-10-18 signatures=0 Subject: [dpdk-dev] [PATCH v5] 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 --- 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/guides/prog_guide/rte_flow.rst | 8 ++ lib/librte_ethdev/rte_flow.c | 1 + lib/librte_ethdev/rte_flow.h | 7 ++ lib/librte_net/Makefile | 2 +- lib/librte_net/meson.build | 3 +- lib/librte_net/rte_higig.h | 138 +++++++++++++++++++++++++++++ 7 files changed, 190 insertions(+), 2 deletions(-) create mode 100644 lib/librte_net/rte_higig.h diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index b26b8bfe2..8d6c354fa 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, + 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, + ppt1.vid)), + }, /* Validate/create actions. */ [ACTIONS] = { .name = "actions", 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..79f160df0 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,6 +492,12 @@ 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, }; /** 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..7c0dec449 --- /dev/null +++ b/lib/librte_net/rte_higig.h @@ -0,0 +1,138 @@ + +/* 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 + +/** + * RTE_FLOW_ITEM_TYPE_HIGIG2 + * Matches higig2 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 +}; + +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 opcode:3; + uint32_t res1:2; + uint32_t src_t:1; + uint32_t pfm:2; + uint32_t res2:5; + uint32_t hdr_ext_len: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 pfm:2; + uint32_t src_t:1; + uint32_t res1:2; + uint32_t opcode:3; + uint32_t hdr_ext_len:3; + uint32_t res2:5; +#endif +}; + +struct rte_higig2_ppt_type1 { + uint16_t classification; + uint16_t resv; + uint16_t vid; +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN + uint16_t opcode:3; + uint16_t resv1:2; + uint16_t src_t:1; + uint16_t pfm:2; + uint16_t resv2:5; + uint16_t hdr_ext_len:3; +#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN + uint16_t pfm:2; + uint16_t src_t:1; + uint16_t resv1:2; + uint16_t opcode:3; + uint16_t hdr_ext_len:3; + uint16_t resv2:5; +#endif +}; + +RTE_STD_C11 +struct rte_flow_item_higig2_hdr { + struct rte_higig2_frc fcr; + union { + struct rte_higig2_ppt_type0 ppt0; + struct rte_higig2_ppt_type1 ppt1; + }; +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_HIGIG2. */ +#ifndef __cplusplus +static const struct rte_flow_item_higig2_hdr rte_flow_item_higig2_hdr_mask = { + .ppt1.classification = 0xffff, + .ppt1.vid = 0xfff, +}; +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* RTE_HIGIG_H_ */ -- 2.17.1