From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D9241A0542; Mon, 29 Aug 2022 07:23:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B385640DDA; Mon, 29 Aug 2022 07:23:16 +0200 (CEST) Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by mails.dpdk.org (Postfix) with ESMTP id A4A8B4069F for ; Mon, 29 Aug 2022 07:23:15 +0200 (CEST) Received: by mail-qv1-f47.google.com with SMTP id d1so5579529qvs.0 for ; Sun, 28 Aug 2022 22:23:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=0dsrg4w1IC/PG2dBZN60i0MeePkwJKrzoTdE/ulgajY=; b=UzWQcmwoXkwUp02jqTZSRbDnQeB/28Kcn4SnNQCp49NfzgzvgJuegSaEMrI+e8Cxv8 x5wyHtqe/wEN9GkqCIFwkoUbTlGJI52MHUWJT7U4+KwRELNqZaZ+hymGpA70EhBo2TaI mqE4IRADvGIK2HSXig1PxMG0eRtTVnVzeskmtTWkNMKVV4njnjxcLos55YaDA+mrojTK tGtaMxLmh0LpcNhm8EwjpUy8x2tS67D+Gz9xDcwP8zZGMXes0Uq4o/tqouONgeQ3LkZf Y4SS8lkYSHOnkSO85nE3O0JfOMfGV9H3lDiX8YMOWmpIBqPC8M6A68eF7vP8d7FenS4G 298g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=0dsrg4w1IC/PG2dBZN60i0MeePkwJKrzoTdE/ulgajY=; b=3ux92UEXW0FnKavsQ4bIFsJFgxVeCNEiQITpCAaOd3GBo5WO7Z9SM03x02E9/C5XmF HJmBrJIavn/aokGzSzsYVT7JrqN/Gc71Iee2sklpzutVcUnI6Yxs2PY46sQBZ5m1/J09 SpT3fASOhvkpVf/cf9BMhccKpmwNkAPry55VfsG8VMloXMcPwmpSf8c9WgkerePw/y5h gFaz7cZS99efWCrtPrA214FliH7+4f4YTMvSLUkq6H5zFxzYNQ9pWMPu4KplVlVEryo4 ihnD2kNXCay6Xnz2W7WTGyGv3ixvbSJPx/JlUXpmc8iFuU+3/wS/zLlivYYhR1mtSLAo PI7w== X-Gm-Message-State: ACgBeo0enBJysb4gkB1bNYM8vOZxDEhx/C/tedfY03dIkwlioPbmsI8P 87g5jYAVJMoBBSwXNd4VqkdOcx0o0+eE6DH9+ddX/JQsaYQ= X-Google-Smtp-Source: AA6agR7+a0kNDSocv/sNiKmtvTfWhdS1LcRDH4USUaWL7FlCjhCVETMRTOLYKzsQyrDAT8BVyuEsnIZ0IHe814IUU8k= X-Received: by 2002:a05:6214:2aa2:b0:477:1882:3dc with SMTP id js2-20020a0562142aa200b00477188203dcmr8958238qvb.11.1661750594953; Sun, 28 Aug 2022 22:23:14 -0700 (PDT) MIME-Version: 1.0 References: <20220801061629.1862969-1-psatheesh@marvell.com> <20220801061629.1862969-3-psatheesh@marvell.com> In-Reply-To: <20220801061629.1862969-3-psatheesh@marvell.com> From: Jerin Jacob Date: Mon, 29 Aug 2022 10:52:48 +0530 Message-ID: Subject: Re: [dpdk-dev] [PATCH 3/3] common/cnxk: update MKEX capability flags To: Satheesh Paul Cc: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , dpdk-dev Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Mon, Aug 1, 2022 at 11:47 AM wrote: > > From: Satheesh Paul > > Update MKEX capability flags to enable parsing > VLAN PCP, DSCP and GTPv1 TEID. > > Signed-off-by: Satheesh Paul > Reviewed-by: Kiran Kumar K > --- > drivers/common/cnxk/roc_npc_mcam.c | 86 ++++++++++++------------------ > drivers/common/cnxk/roc_npc_priv.h | 12 +++-- > 2 files changed, 44 insertions(+), 54 deletions(-) Build issues clang [792/3405] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_npc_mcam.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_npc_mcam.c.o ccache clang -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -I . -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common -Ilib/eal -I../lib/eal -Ilib/kvargs -I ../lib/kvargs -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secur ity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -O2 -g -include rte_config.h -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-securit y -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-address-of-packed-member -Wno-missing-field-initializers -D_GNU_SOURCE -fP IC -march=native -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_npc_mcam.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_npc_mcam .c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_npc_mcam.c.o -c ../drivers/common/cnxk/roc_npc_mcam.c ../drivers/common/cnxk/roc_npc_mcam.c:251:24: error: use of bitwise '&' with boolean operands [-Werror,-Wbitwise-instead-of-logical] kex_cap.bit.ip_dscp = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 1 * 8, 1 * 8) & ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ && ../drivers/common/cnxk/roc_npc_mcam.c:251:24: note: cast one or both operands to int to silence this warning 1 error generated. [793/3405] Compiling C > > diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c > index 245eeb0107..a71f0c8b8a 100644 > --- a/drivers/common/cnxk/roc_npc_mcam.c > +++ b/drivers/common/cnxk/roc_npc_mcam.c > @@ -232,80 +232,64 @@ npc_get_kex_capability(struct npc *npc) > memset(&kex_cap, 0, sizeof(kex_cap)); > > /* Ethtype: Offset 12B, len 2B */ > - kex_cap.bit.ethtype_0 = npc_is_kex_enabled( > - npc, NPC_LID_LA, NPC_LT_LA_ETHER, 12 * 8, 2 * 8); > + kex_cap.bit.ethtype_0 = npc_is_kex_enabled(npc, NPC_LID_LA, NPC_LT_LA_ETHER, 12 * 8, 2 * 8); > /* QINQ VLAN Ethtype: offset 8B, len 2B */ > - kex_cap.bit.ethtype_x = npc_is_kex_enabled( > - npc, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 8 * 8, 2 * 8); > + kex_cap.bit.ethtype_x = > + npc_is_kex_enabled(npc, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 8 * 8, 2 * 8); > /* VLAN ID0 : Outer VLAN: Offset 2B, len 2B */ > - kex_cap.bit.vlan_id_0 = npc_is_kex_enabled( > - npc, NPC_LID_LB, NPC_LT_LB_CTAG, 2 * 8, 2 * 8); > - /* VLAN ID0 : Inner VLAN: offset 6B, len 2B */ > - kex_cap.bit.vlan_id_x = npc_is_kex_enabled( > - npc, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 6 * 8, 2 * 8); > + kex_cap.bit.vlan_id_0 = npc_is_kex_enabled(npc, NPC_LID_LB, NPC_LT_LB_CTAG, 2 * 8, 2 * 8); > + /* VLAN PCP0 : Outer VLAN: Offset 2B, len 1B */ > + kex_cap.bit.vlan_pcp_0 = npc_is_kex_enabled(npc, NPC_LID_LB, NPC_LT_LB_CTAG, 2 * 8, 2 * 1); > + /* VLAN IDX : Inner VLAN: offset 6B, len 2B */ > + kex_cap.bit.vlan_id_x = > + npc_is_kex_enabled(npc, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 6 * 8, 2 * 8); > /* DMCA: offset 0B, len 6B */ > - kex_cap.bit.dmac = npc_is_kex_enabled(npc, NPC_LID_LA, NPC_LT_LA_ETHER, > - 0 * 8, 6 * 8); > + kex_cap.bit.dmac = npc_is_kex_enabled(npc, NPC_LID_LA, NPC_LT_LA_ETHER, 0 * 8, 6 * 8); > /* IP proto: offset 9B, len 1B */ > - kex_cap.bit.ip_proto = > - npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 9 * 8, 1 * 8); > + kex_cap.bit.ip_proto = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 9 * 8, 1 * 8); > + /* IPv4 dscp: offset 1B, len 1B, IPv6 dscp: offset 0B, len 2B */ > + kex_cap.bit.ip_dscp = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 1 * 8, 1 * 8) & > + npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6, 0, 2 * 8); > /* UDP dport: offset 2B, len 2B */ > - kex_cap.bit.udp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, > - NPC_LT_LD_UDP, 2 * 8, 2 * 8); > + kex_cap.bit.udp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_UDP, 2 * 8, 2 * 8); > /* UDP sport: offset 0B, len 2B */ > - kex_cap.bit.udp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, > - NPC_LT_LD_UDP, 0 * 8, 2 * 8); > + kex_cap.bit.udp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_UDP, 0 * 8, 2 * 8); > /* TCP dport: offset 2B, len 2B */ > - kex_cap.bit.tcp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, > - NPC_LT_LD_TCP, 2 * 8, 2 * 8); > + kex_cap.bit.tcp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_TCP, 2 * 8, 2 * 8); > /* TCP sport: offset 0B, len 2B */ > - kex_cap.bit.tcp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, > - NPC_LT_LD_TCP, 0 * 8, 2 * 8); > + kex_cap.bit.tcp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_TCP, 0 * 8, 2 * 8); > /* IP SIP: offset 12B, len 4B */ > - kex_cap.bit.sip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, > - 12 * 8, 4 * 8); > + kex_cap.bit.sip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 12 * 8, 4 * 8); > /* IP DIP: offset 14B, len 4B */ > - kex_cap.bit.dip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, > - 14 * 8, 4 * 8); > + kex_cap.bit.dip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 14 * 8, 4 * 8); > /* IP6 SIP: offset 8B, len 16B */ > - kex_cap.bit.sip6_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6, > - 8 * 8, 16 * 8); > + kex_cap.bit.sip6_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6, 8 * 8, 16 * 8); > /* IP6 DIP: offset 24B, len 16B */ > - kex_cap.bit.dip6_addr = npc_is_kex_enabled( > - npc, NPC_LID_LC, NPC_LT_LC_IP6, 24 * 8, 16 * 8); > + kex_cap.bit.dip6_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6, 24 * 8, 16 * 8); > /* ESP SPI: offset 0B, len 4B */ > - kex_cap.bit.ipsec_spi = npc_is_kex_enabled(npc, NPC_LID_LE, > - NPC_LT_LE_ESP, 0 * 8, 4 * 8); > + kex_cap.bit.ipsec_spi = npc_is_kex_enabled(npc, NPC_LID_LE, NPC_LT_LE_ESP, 0 * 8, 4 * 8); > /* VXLAN VNI: offset 4B, len 3B */ > - kex_cap.bit.ld_vni = npc_is_kex_enabled(npc, NPC_LID_LE, > - NPC_LT_LE_VXLAN, 0 * 8, 3 * 8); > + kex_cap.bit.ld_vni = npc_is_kex_enabled(npc, NPC_LID_LE, NPC_LT_LE_VXLAN, 0 * 8, 3 * 8); > > /* Custom L3 frame: varied offset and lengths */ > - kex_cap.bit.custom_l3 = > - npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM0, 0, 0); > - kex_cap.bit.custom_l3 |= (uint64_t)npc_is_kex_enabled(npc, NPC_LID_LC, > - NPC_LT_LC_CUSTOM1, 0, 0); > + kex_cap.bit.custom_l3 = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM0, 0, 0); > + kex_cap.bit.custom_l3 |= > + (uint64_t)npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM1, 0, 0); > /* SCTP sport : offset 0B, len 2B */ > - kex_cap.bit.sctp_sport = npc_is_kex_enabled( > - npc, NPC_LID_LD, NPC_LT_LD_SCTP, 0 * 8, 2 * 8); > + kex_cap.bit.sctp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_SCTP, 0 * 8, 2 * 8); > /* SCTP dport : offset 2B, len 2B */ > - kex_cap.bit.sctp_dport = npc_is_kex_enabled( > - npc, NPC_LID_LD, NPC_LT_LD_SCTP, 2 * 8, 2 * 8); > + kex_cap.bit.sctp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_SCTP, 2 * 8, 2 * 8); > /* ICMP type : offset 0B, len 1B */ > - kex_cap.bit.icmp_type = npc_is_kex_enabled( > - npc, NPC_LID_LD, NPC_LT_LD_ICMP, 0 * 8, 1 * 8); > + kex_cap.bit.icmp_type = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_ICMP, 0 * 8, 1 * 8); > /* ICMP code : offset 1B, len 1B */ > - kex_cap.bit.icmp_code = npc_is_kex_enabled( > - npc, NPC_LID_LD, NPC_LT_LD_ICMP, 1 * 8, 1 * 8); > + kex_cap.bit.icmp_code = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_ICMP, 1 * 8, 1 * 8); > /* ICMP id : offset 4B, len 2B */ > - kex_cap.bit.icmp_id = npc_is_kex_enabled(npc, NPC_LID_LD, > - NPC_LT_LD_ICMP, 4 * 8, 2 * 8); > + kex_cap.bit.icmp_id = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_ICMP, 4 * 8, 2 * 8); > /* IGMP grp_addr : offset 4B, len 4B */ > - kex_cap.bit.igmp_grp_addr = npc_is_kex_enabled( > - npc, NPC_LID_LD, NPC_LT_LD_IGMP, 4 * 8, 4 * 8); > + kex_cap.bit.igmp_grp_addr = > + npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_IGMP, 4 * 8, 4 * 8); > /* GTPU teid : offset 4B, len 4B */ > - kex_cap.bit.gtpu_teid = npc_is_kex_enabled( > - npc, NPC_LID_LE, NPC_LT_LE_GTPU, 4 * 8, 4 * 8); > + kex_cap.bit.gtpv1_teid = npc_is_kex_enabled(npc, NPC_LID_LE, NPC_LT_LE_GTPU, 4 * 8, 4 * 8); > return kex_cap.all_bits; > } > > diff --git a/drivers/common/cnxk/roc_npc_priv.h b/drivers/common/cnxk/roc_npc_priv.h > index b08539d8f8..1a597280d1 100644 > --- a/drivers/common/cnxk/roc_npc_priv.h > +++ b/drivers/common/cnxk/roc_npc_priv.h > @@ -100,6 +100,7 @@ enum npc_err_status { > enum npc_mcam_intf { NPC_MCAM_RX, NPC_MCAM_TX }; > > typedef union npc_kex_cap_terms_t { > + /** Packet Matching Rule term fields */ > struct { > /** Total length of received packet */ > uint64_t len : 1; > @@ -111,10 +112,14 @@ typedef union npc_kex_cap_terms_t { > uint64_t vlan_id_0 : 1; > /** Last VLAN ID (inner) */ > uint64_t vlan_id_x : 1; > + /** PCP in the first VLAN header */ > + uint64_t vlan_pcp_0 : 1; > /** destination MAC address */ > uint64_t dmac : 1; > /** IP Protocol or IPv6 Next Header */ > uint64_t ip_proto : 1; > + /** DSCP in IP header */ > + uint64_t ip_dscp : 1; > /** Destination UDP port, implies IPPROTO=17 */ > uint64_t udp_dport : 1; > /** Destination TCP port implies IPPROTO=6 */ > @@ -155,12 +160,13 @@ typedef union npc_kex_cap_terms_t { > uint64_t sctp_sport : 1; > /** Destination SCTP port */ > uint64_t sctp_dport : 1; > - /** GTPU Tunnel endpoint identifier */ > - uint64_t gtpu_teid : 1; > - > + /** GTPv1 tunnel endpoint identifier */ > + uint64_t gtpv1_teid : 1; > } bit; > + > /** All bits of the bit field structure */ > uint64_t all_bits; > + > } npc_kex_cap_terms_t; > > struct npc_parse_item_info { > -- > 2.35.3 >