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 423E3A04B5; Wed, 30 Sep 2020 16:46:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 667991D583; Wed, 30 Sep 2020 16:46:38 +0200 (CEST) Received: from nat-hk.nvidia.com (nat-hk.nvidia.com [203.18.50.4]) by dpdk.org (Postfix) with ESMTP id E71FB1D57F for ; Wed, 30 Sep 2020 16:46:34 +0200 (CEST) Received: from HKMAIL104.nvidia.com (Not Verified[10.18.92.77]) by nat-hk.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Wed, 30 Sep 2020 22:46:32 +0800 Received: from HKMAIL102.nvidia.com (10.18.16.11) by HKMAIL104.nvidia.com (10.18.16.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 30 Sep 2020 14:46:32 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.107) by HKMAIL102.nvidia.com (10.18.16.11) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 30 Sep 2020 14:46:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=caI9xj1X6DNJ9k+6PnR9dREJ1wz6Avs/AekM8IlrR17NqINFYH9LZTjv4v5T0AqiqAb1GZL74pbJPGhDoeywlggASnlK/uuN8zbUXTU27TDwbeVkX2qvcT7U1D2xwcpo7knrRSEB+JnIAzmvmKyS5FevHh2XuQI2wMFpRtuiwoXPBsiDAYmIweYdO6XvEkqsGmn+RQ0AbzHfTBWmtMEX4eOYpdFwkPwvfkSOztTPjtrHcp21gjppTweOM/ucZ+gOpS1Jl7KCUZ/TZTF7SUvRtmLLcRZsqCqlggIvpULPnN8Di1Hb+PNcGj7Rj/298R0LNfFZYTNfn3w9p6h4SpXKyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iQas6eYdrW23ji4GtlIrT2jIkTLO8kk91qbjdI0lol0=; b=CCPbThUNADc55BkCk5U5CrIA+jUn1hOUNtg2zcW9HaKSKBtqlDHmG41YvJvSGvZFq03HVRPTxEpjZTlks10crU4A6wwvVI/34c3y7qDu73za5I72vGXceQVWSVPLDXc/WMXIN5W/gXHxOCRP+/5AyxCFQymdNK2+c30Qm7gG98JFWAsCJCvcQKt6jNd/LVrf8UZBcV8xXqYwi58CQ82o1trwwie9nMB2S3koLm1e1hsvveteJR/w+YkgLzHcFAZwXZFusDObnOKfiYf8pBC8+pvZcr7zodMnE2a+cAbJNPLxSSlOj1zt4SG6DBOUEqOXjNMWH3UXXynCUD+YLx2DgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none Received: from MN2PR12MB4286.namprd12.prod.outlook.com (2603:10b6:208:199::22) by BL0PR12MB4994.namprd12.prod.outlook.com (2603:10b6:208:1ca::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.35; Wed, 30 Sep 2020 14:46:29 +0000 Received: from MN2PR12MB4286.namprd12.prod.outlook.com ([fe80::61fd:a36e:cf4f:2d3f]) by MN2PR12MB4286.namprd12.prod.outlook.com ([fe80::61fd:a36e:cf4f:2d3f%8]) with mapi id 15.20.3433.035; Wed, 30 Sep 2020 14:46:29 +0000 From: Ori Kam To: Li Zhang , Dekel Peled , "Slava Ovsiienko" , Matan Azrad CC: "dev@dpdk.org" , NBU-Contact-Thomas Monjalon , Raslan Darawsheh Thread-Topic: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields Thread-Index: AQHWlUjWhs4WcyaHEUCExA7zgUYPJKmBN0Qw Date: Wed, 30 Sep 2020 14:46:29 +0000 Message-ID: References: <20200923023522.21135-1-lizh@nvidia.com> <20200928033813.22112-1-lizh@nvidia.com> In-Reply-To: <20200928033813.22112-1-lizh@nvidia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: nvidia.com; dkim=none (message not signed) header.d=none;nvidia.com; dmarc=none action=none header.from=nvidia.com; x-originating-ip: [147.236.152.129] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9caff229-fc76-45a2-da30-08d8654f9dd1 x-ms-traffictypediagnostic: BL0PR12MB4994: x-ld-processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: tqx4nnTB59c9tVWGHTax3NKbxHmCA2c3tPtB79tKSct3wt9MuBDN0dOSDR7JuePJlOm7JlqguRaz40oL/yIucjqhFKTTr8usD8R3DfZaW+jVQduEP8pX5QyeIjm+aMGo5qKXy43rYlheybqpZHkaUoEZyeZH3PBdAF1BuO6yV3GmpX28NSSpi9WGCiepZKTq3lt8iGbYN85wGJ3EhDNj9Omf6k0nrnYKEWYDwCCQ8aM0IFYDCLaJAm3UW4Rw6R32jGMG1YCKK7s3mDMfhP+oi9FUgYnpFClR/EwTnasjpA8cScqi5lB2WhDL4S0k053C x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR12MB4286.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(136003)(39860400002)(396003)(366004)(26005)(2906002)(52536014)(76116006)(66946007)(4326008)(66556008)(66476007)(186003)(66446008)(64756008)(8676002)(6506007)(7696005)(6636002)(53546011)(5660300002)(55016002)(8936002)(9686003)(316002)(83380400001)(107886003)(86362001)(54906003)(71200400001)(478600001)(110136005)(33656002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: VHXjFSJ/2/AXMYPNAHkkZgOoSCLI501lSGnzLXH4lLRk0gxQ2/faQuo2Q3j+KXTpHg8qlayQt1p4ccS37tdEqOk+Qdf5B236NV6gXGmAyUipBir5ghJpbcreGIyLe0XpQvNmKRWiwv6D+Xm4ZAd92UEs5i3voMfNnn7deilmCyyE1defm7CK3g+YQtIvha4xJPErgEPjiIJcdvs604wD2K2lHCJjW5qk6wzjMQm6BNLnE12SlMpWX+9qSlVK6HKZ7et2UiHo+kVF2cQz6Uq63jVwtcRgGsGm7prmEIlW0yn4xgPMKGG46mlejJok3YKPrR6YEtc01HE9qsDNUhmuEfaFa0fI0KLG7R8XenzMR6SHrLFghaYNjpYOBVz1iAaZBIJyt9pmAVW2+LbH0BFkfiTHA4PckB0ecA0eK5Lw+XnbgP+dZX2gGV4XO/nIaUaPekIESzf+bZjdv0RCa7nBE/mKBnhVxCzsMM8J+k6BhX88/cgOr05PLKyknDsmSsWlhIvc+0aBDZSL3XPQJ2h8TKZqMOboWiXI6ubuzjQo/6Sj/UcdlC9U3MDb/dK2bje8zrq766hbbBCOTqXcDwOP8UWzeY65ZroLGhzBJIHUAJIJWXyiqGp2Yjt4weQUMXXPM/wbmmP2Zj+8gqTR1x2Svw== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB4286.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9caff229-fc76-45a2-da30-08d8654f9dd1 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Sep 2020 14:46:29.5511 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: XppeHLSrH02D0PqTzaS6NsRgMOUX6yyWXWE2Rks9s9HnJky4YA1Im+1IdgiVxJS8om49+OT0izu895CoHPgWvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4994 X-OriginatorOrg: Nvidia.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1601477192; bh=iQas6eYdrW23ji4GtlIrT2jIkTLO8kk91qbjdI0lol0=; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To: CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References: In-Reply-To:Accept-Language:Content-Language:X-MS-Has-Attach: X-MS-TNEF-Correlator:authentication-results:x-originating-ip: x-ms-publictraffictype:x-ms-office365-filtering-correlation-id: x-ms-traffictypediagnostic:x-ld-processed: x-ms-exchange-transport-forked:x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers:x-ms-exchange-senderadcheck: x-microsoft-antispam:x-microsoft-antispam-message-info: x-forefront-antispam-report:x-ms-exchange-antispam-messagedata: Content-Type:Content-Transfer-Encoding:MIME-Version: X-MS-Exchange-CrossTenant-AuthAs: X-MS-Exchange-CrossTenant-AuthSource: X-MS-Exchange-CrossTenant-Network-Message-Id: X-MS-Exchange-CrossTenant-originalarrivaltime: X-MS-Exchange-CrossTenant-fromentityheader: X-MS-Exchange-CrossTenant-id:X-MS-Exchange-CrossTenant-mailboxtype: X-MS-Exchange-CrossTenant-userprincipalname: X-MS-Exchange-Transport-CrossTenantHeadersStamped:X-OriginatorOrg; b=hEUXpEInLRBk1pyg6v+uTzZH6CrtD+LhnxFbT/I8gG6Qf8vUs8TbVTmwqHotVpElp +cILLKrA4YMUhPqH1X+lS6JmdFU4IhQ3k59fk39m/3wrTsHn/OC/OjafbVkUOFzI9x w63EmPmkfpvmSrys+Z2hZiC+jDNwVs7ytLN54WoNZBtU9yCXZ3eQ+giAjtyNMuG+ny mK6F8nQw1u8ZOPxnZpKZtefeqshYCTuR4F8C/FH2M4Uy+bgK0hEbGavnuFFmYO1bcz mciZtQwI5vofHFE4DCRSSDa49Ohp8C5cg3ULpa7rAPLOtz7uB3PfCc6xsn/JOkQ8rr C1V0CeKwEHVCA== Subject: Re: [dpdk-dev] [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields 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" Hi Li, PSB, Thanks, Ori > -----Original Message----- > From: Li Zhang > Sent: Monday, September 28, 2020 6:38 AM > Subject: [PATCH v2 1/1] net/mlx5: support match ICMP identifier fields >=20 > PRM expose fields "Icmp_header_data" in ICMP. > Update ICMP mask parameter with ICMP identifier and sequence number > fields. > ICMP sequence number spec with mask, Icmp_header_data low 16 bits are set= . > ICMP identifier spec with mask, Icmp_header_data high 16 bits are set. >=20 Is it relevant only for ipv4 ICMP? > Signed-off-by: Li Zhang > --- > doc/guides/nics/mlx5.rst | 4 ++-- > doc/guides/rel_notes/release_20_11.rst | 2 +- > drivers/net/mlx5/mlx5_flow.c | 9 +++++++-- > drivers/net/mlx5/mlx5_flow_dv.c | 16 +++++++++++++++- > 4 files changed, 25 insertions(+), 6 deletions(-) >=20 > diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst > index 211c0c5a6c..576dbe5efd 100644 > --- a/doc/guides/nics/mlx5.rst > +++ b/doc/guides/nics/mlx5.rst > @@ -288,7 +288,7 @@ Limitations > - The input buffer, providing the removal size, is not validated. > - The buffer size must match the length of the headers to be removed. >=20 > -- ICMP/ICMP6 code/type matching, IP-in-IP and MPLS flow matching are all > +- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) matching= , > IP-in-IP and MPLS flow matching are all > mutually exclusive features which cannot be supported together > (see :ref:`mlx5_firmware_config`). >=20 > @@ -1009,7 +1009,7 @@ Below are some firmware configurations listed. >=20 > FLEX_PARSER_PROFILE_ENABLE=3D1 >=20 > -- enable ICMP/ICMP6 code/type fields matching:: > +- enable ICMP(code/type/identifier/sequence number) / ICMP6(code/type) > fields matching:: >=20 > FLEX_PARSER_PROFILE_ENABLE=3D2 >=20 > diff --git a/doc/guides/rel_notes/release_20_11.rst > b/doc/guides/rel_notes/release_20_11.rst > index c6642f5f94..791f133d8f 100644 > --- a/doc/guides/rel_notes/release_20_11.rst > +++ b/doc/guides/rel_notes/release_20_11.rst > @@ -73,7 +73,7 @@ New Features > * Added flag action. > * Added raw encap/decap actions. > * Added VXLAN encap/decap actions. > - * Added ICMP and ICMP6 matching items. > + * Added ICMP(code/type/identifier/sequence number) and > ICMP6(code/type) matching items. > * Added option to set port mask for insertion/deletion: > ``--portmask=3DN`` > where N represents the hexadecimal bitmask of ports used. > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 416505f1c8..7bd5c5da94 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -1303,6 +1303,7 @@ mlx5_flow_validate_item_icmp(const struct > rte_flow_item *item, > struct rte_flow_error *error) This function is shared between the dv and the verbs. I think we can support this only in dv, so we need to split this function. > { > const struct rte_flow_item_icmp *mask =3D item->mask; > + struct rte_flow_item_icmp default_mask; I think the correct name is nic_mask. > const int tunnel =3D !!(item_flags & MLX5_FLOW_LAYER_TUNNEL); > const uint64_t l3m =3D tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 : > MLX5_FLOW_LAYER_OUTER_L3_IPV4; > @@ -1324,11 +1325,15 @@ mlx5_flow_validate_item_icmp(const struct > rte_flow_item *item, > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ITEM, > item, > "multiple L4 layers not supported"); > + memcpy(&default_mask, &rte_flow_item_icmp_mask, > + sizeof(struct rte_flow_item_icmp)); > + default_mask.hdr.icmp_ident =3D RTE_BE16(0xFFFF); > + default_mask.hdr.icmp_seq_nb =3D RTE_BE16(0xFFFF); You don't need to mem copy just init this structure when you declare it. > if (!mask) > - mask =3D &rte_flow_item_icmp_mask; > + mask =3D &default_mask; > ret =3D mlx5_flow_item_acceptable > (item, (const uint8_t *)mask, > - (const uint8_t *)&rte_flow_item_icmp_mask, > + (const uint8_t *)&default_mask, > sizeof(struct rte_flow_item_icmp), error); > if (ret < 0) > return ret; > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c > index 3819cdb266..b5d6455067 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -7378,6 +7378,8 @@ flow_dv_translate_item_icmp(void *matcher, void > *key, > { > const struct rte_flow_item_icmp *icmp_m =3D item->mask; > const struct rte_flow_item_icmp *icmp_v =3D item->spec; > + uint32_t icmp_header_data_m =3D 0; > + uint32_t icmp_header_data_v =3D 0; > void *headers_m; > void *headers_v; > void *misc3_m =3D MLX5_ADDR_OF(fte_match_param, matcher, > @@ -7396,8 +7398,14 @@ flow_dv_translate_item_icmp(void *matcher, void > *key, > MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, > IPPROTO_ICMP); > if (!icmp_v) > return; > - if (!icmp_m) > + if (!icmp_m) { > icmp_m =3D &rte_flow_item_icmp_mask; > + icmp_header_data_m =3D RTE_BE32(UINT32_MAX); Why are you setting the data as default mask? > + } else { > + icmp_header_data_m =3D rte_cpu_to_be_16(icmp_m- > >hdr.icmp_seq_nb); Isn't the icmp_seq_nb already in BE? > + icmp_header_data_m |=3D > + rte_cpu_to_be_16(icmp_m->hdr.icmp_ident) << 16; Again the icmp_ident is already in BE > + } > /* > * Force flow only to match the non-fragmented IPv4 ICMP packets. > * If only the protocol is specified, no need to match the frag. > @@ -7412,6 +7420,12 @@ flow_dv_translate_item_icmp(void *matcher, void > *key, > icmp_m->hdr.icmp_code); > MLX5_SET(fte_match_set_misc3, misc3_v, icmp_code, > icmp_v->hdr.icmp_code & icmp_m->hdr.icmp_code); > + icmp_header_data_v =3D rte_cpu_to_be_16(icmp_v->hdr.icmp_seq_nb); > + icmp_header_data_v |=3D rte_cpu_to_be_16(icmp_v->hdr.icmp_ident) > << 16; The BE issue again,=20 > + MLX5_SET(fte_match_set_misc3, misc3_m, icmp_header_data, > + icmp_header_data_m); > + MLX5_SET(fte_match_set_misc3, misc3_v, icmp_header_data, > + icmp_header_data_v & icmp_header_data_m); > } >=20 > /** > -- > 2.21.0