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 E0C30A0487 for ; Wed, 3 Jul 2019 08:30:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C2B652C23; Wed, 3 Jul 2019 08:30:07 +0200 (CEST) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00071.outbound.protection.outlook.com [40.107.0.71]) by dpdk.org (Postfix) with ESMTP id D3BA928EE for ; Wed, 3 Jul 2019 08:30:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RUBjVujqJsJYZTFd2QCNYA+suTm4g2zNmA8uGAINvps=; b=iEhvMjI3GzoNbEnFhk0B9/3/BQBNHMQWGOAupAdauQueKDs3h8oVdKyrbgV6xYZ65GY4FON9r5FVNXbQ2lOwoG+A1OUVyZi0Ie0X7en+f38cLMbCpjcTWbxvTjtmlje8Ucy1s7mfBgPwIpy5tG3YUiYllFYgglsEjWMo6A2IRyQ= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (10.171.188.154) by AM4PR05MB3220.eurprd05.prod.outlook.com (10.171.188.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.16; Wed, 3 Jul 2019 06:30:03 +0000 Received: from AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::1442:fc4d:41ad:29d2]) by AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::1442:fc4d:41ad:29d2%5]) with mapi id 15.20.2032.019; Wed, 3 Jul 2019 06:30:03 +0000 From: Slava Ovsiienko To: Dekel Peled , Adrien Mazarguil , "wenzhuo.lu@intel.com" , "jingjing.wu@intel.com" , "bernard.iremonger@intel.com" , Yongseok Koh , Shahaf Shuler , "arybchenko@solarflare.com" , Raslan Darawsheh CC: "dev@dpdk.org" , Ori Kam Thread-Topic: [PATCH v10 2/3] app/testpmd: add actions to modify TCP header fields Thread-Index: AQHVMOTxQIYaC3ewskiHfD0iJzb336a4b5AA Date: Wed, 3 Jul 2019 06:30:03 +0000 Message-ID: References: <1553177917-43297-1-git-send-email-dekelp@mellanox.com> <76bcf79d2722e7d26099708bd507a1f9a392e8f3.1562078184.git.dekelp@mellanox.com> In-Reply-To: <76bcf79d2722e7d26099708bd507a1f9a392e8f3.1562078184.git.dekelp@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=viacheslavo@mellanox.com; x-originating-ip: [95.67.35.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: dc154225-d63f-4899-a1cf-08d6ff7fe1be x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM4PR05MB3220; x-ms-traffictypediagnostic: AM4PR05MB3220: x-ms-exchange-purlcount: 1 x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1284; x-forefront-prvs: 00872B689F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(366004)(346002)(376002)(396003)(136003)(199004)(189003)(13464003)(53936002)(52536014)(71200400001)(71190400001)(186003)(54906003)(76176011)(7696005)(6506007)(6116002)(3846002)(2201001)(110136005)(6306002)(2501003)(86362001)(53546011)(9686003)(99286004)(6636002)(316002)(966005)(55016002)(25786009)(256004)(8936002)(11346002)(26005)(446003)(478600001)(7736002)(81166006)(66066001)(81156014)(14454004)(68736007)(8676002)(5660300002)(486006)(64756008)(66556008)(66476007)(66946007)(2906002)(73956011)(66446008)(107886003)(76116006)(6246003)(476003)(33656002)(305945005)(4326008)(102836004)(74316002)(229853002)(6436002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3220; H:AM4PR05MB3265.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: BUYtM5IQr5aa/dtXirnfhIWDL3SEYPDi1XE8b43oTfaullhIzgGr4YjwPYWvszjn5fjLkXbUHQgy7UHqpyVNSIE6Qkrf2IuvbLtshOJELxcMboH+roPJh8FY8/Zx6iLbviAJJZV80fS8yLhWPdxLzbyvLLcC0tKHO9pJ2nxc5ddOJA7YEKfIO/WmvgGm6gNLaLWBTk+uGloYDwkoh9t298bZRRt74BCRwFy3zuCQfN0WyWPphqaIRzM2d6hQLcOdkmIRGLIiZUj8OvXmsmIZlDCnu++lAC6PVP+4u01gHq9vHNv7/mZy2HNq0NX36LFB75N356SwBIV9Scc2Lh8PaPnR/pLeqTVb5RVlhdhh/vVY9AyH0RKutJbC1edrzGLpMVl1W4+8IZsmtSE7Juf45RkyNr0CE9PZEbp0xNjkhQE= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc154225-d63f-4899-a1cf-08d6ff7fe1be X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Jul 2019 06:30:03.1031 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: viacheslavo@mellanox.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3220 Subject: Re: [dpdk-dev] [PATCH v10 2/3] app/testpmd: add actions to modify TCP header 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" > -----Original Message----- > From: Dekel Peled > Sent: Tuesday, July 2, 2019 17:44 > To: Adrien Mazarguil ; > wenzhuo.lu@intel.com; jingjing.wu@intel.com; > bernard.iremonger@intel.com; Yongseok Koh ; > Shahaf Shuler ; Slava Ovsiienko > ; arybchenko@solarflare.com > Cc: dev@dpdk.org; Ori Kam > Subject: [PATCH v10 2/3] app/testpmd: add actions to modify TCP header > fields >=20 > Add actions: > - INC_TCP_SEQ - Increase sequence number in the outermost TCP header. > - DEC_TCP_SEQ - Decrease sequence number in the outermost TCP header. > - INC_TCP_ACK - Increase acknowledgment number in the outermost TCP > header. > - DEC_TCP_ACK - Decrease acknowledgment number in the outermost TCP > header. >=20 > Original work by Xiaoyu Min. >=20 > This patch uses the new approach introduced by [1], using a new macro > ARG_ENTRY_HTON to pass a single integer argument to each of the new > actions. >=20 > [1] http://patches.dpdk.org/patch/55882/ >=20 > Signed-off-by: Dekel Peled Acked-by: Viacheslav Ovsiienko > --- > app/test-pmd/cmdline_flow.c | 100 > ++++++++++++++++++++++++++++ > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 16 +++++ > 2 files changed, 116 insertions(+) >=20 > diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c > index 201bd9d..e644efa 100644 > --- a/app/test-pmd/cmdline_flow.c > +++ b/app/test-pmd/cmdline_flow.c > @@ -272,6 +272,14 @@ enum index { > ACTION_SET_MAC_SRC_MAC_SRC, > ACTION_SET_MAC_DST, > ACTION_SET_MAC_DST_MAC_DST, > + ACTION_INC_TCP_SEQ, > + ACTION_INC_TCP_SEQ_VALUE, > + ACTION_DEC_TCP_SEQ, > + ACTION_DEC_TCP_SEQ_VALUE, > + ACTION_INC_TCP_ACK, > + ACTION_INC_TCP_ACK_VALUE, > + ACTION_DEC_TCP_ACK, > + ACTION_DEC_TCP_ACK_VALUE, > }; >=20 > /** Maximum size for pattern in struct rte_flow_item_raw. */ @@ -485,6 > +493,14 @@ struct token { > .size =3D sizeof(((s *)0)->f), \ > }) >=20 > +/** Same as ARGS_ENTRY_HTON() for a single argument, without structure. > +*/ #define ARG_ENTRY_HTON(s) \ > + (&(const struct arg){ \ > + .hton =3D 1, \ > + .offset =3D 0, \ > + .size =3D sizeof(s), \ > + }) > + > /** Parser output buffer layout expected by cmd_flow_parsed(). */ struc= t > buffer { > enum index command; /**< Flow command. */ @@ -885,6 +901,10 > @@ struct parse_action_priv { > ACTION_SET_TTL, > ACTION_SET_MAC_SRC, > ACTION_SET_MAC_DST, > + ACTION_INC_TCP_SEQ, > + ACTION_DEC_TCP_SEQ, > + ACTION_INC_TCP_ACK, > + ACTION_DEC_TCP_ACK, > ZERO, > }; >=20 > @@ -1047,6 +1067,30 @@ struct parse_action_priv { > ZERO, > }; >=20 > +static const enum index action_inc_tcp_seq[] =3D { > + ACTION_INC_TCP_SEQ_VALUE, > + ACTION_NEXT, > + ZERO, > +}; > + > +static const enum index action_dec_tcp_seq[] =3D { > + ACTION_DEC_TCP_SEQ_VALUE, > + ACTION_NEXT, > + ZERO, > +}; > + > +static const enum index action_inc_tcp_ack[] =3D { > + ACTION_INC_TCP_ACK_VALUE, > + ACTION_NEXT, > + ZERO, > +}; > + > +static const enum index action_dec_tcp_ack[] =3D { > + ACTION_DEC_TCP_ACK_VALUE, > + ACTION_NEXT, > + ZERO, > +}; > + > static int parse_init(struct context *, const struct token *, > const char *, unsigned int, > void *, unsigned int); > @@ -2854,6 +2898,62 @@ static int comp_vc_action_rss_queue(struct > context *, const struct token *, > (struct rte_flow_action_set_mac, mac_addr)), > .call =3D parse_vc_conf, > }, > + [ACTION_INC_TCP_SEQ] =3D { > + .name =3D "inc_tcp_seq", > + .help =3D "increase TCP sequence number", > + .priv =3D PRIV_ACTION(INC_TCP_SEQ, sizeof(rte_be32_t)), > + .next =3D NEXT(action_inc_tcp_seq), > + .call =3D parse_vc, > + }, > + [ACTION_INC_TCP_SEQ_VALUE] =3D { > + .name =3D "value", > + .help =3D "the value to increase TCP sequence number by", > + .next =3D NEXT(action_inc_tcp_seq, NEXT_ENTRY(UNSIGNED)), > + .args =3D ARGS(ARG_ENTRY_HTON(rte_be32_t)), > + .call =3D parse_vc_conf, > + }, > + [ACTION_DEC_TCP_SEQ] =3D { > + .name =3D "dec_tcp_seq", > + .help =3D "decrease TCP sequence number", > + .priv =3D PRIV_ACTION(DEC_TCP_SEQ, sizeof(rte_be32_t)), > + .next =3D NEXT(action_dec_tcp_seq), > + .call =3D parse_vc, > + }, > + [ACTION_DEC_TCP_SEQ_VALUE] =3D { > + .name =3D "value", > + .help =3D "the value to decrease TCP sequence number by", > + .next =3D NEXT(action_dec_tcp_seq, > NEXT_ENTRY(UNSIGNED)), > + .args =3D ARGS(ARG_ENTRY_HTON(rte_be32_t)), > + .call =3D parse_vc_conf, > + }, > + [ACTION_INC_TCP_ACK] =3D { > + .name =3D "inc_tcp_ack", > + .help =3D "increase TCP acknowledgment number", > + .priv =3D PRIV_ACTION(INC_TCP_ACK, sizeof(rte_be32_t)), > + .next =3D NEXT(action_inc_tcp_ack), > + .call =3D parse_vc, > + }, > + [ACTION_INC_TCP_ACK_VALUE] =3D { > + .name =3D "value", > + .help =3D "the value to increase TCP acknowledgment number > by", > + .next =3D NEXT(action_inc_tcp_ack, NEXT_ENTRY(UNSIGNED)), > + .args =3D ARGS(ARG_ENTRY_HTON(rte_be32_t)), > + .call =3D parse_vc_conf, > + }, > + [ACTION_DEC_TCP_ACK] =3D { > + .name =3D "dec_tcp_ack", > + .help =3D "decrease TCP acknowledgment number", > + .priv =3D PRIV_ACTION(DEC_TCP_ACK, sizeof(rte_be32_t)), > + .next =3D NEXT(action_dec_tcp_ack), > + .call =3D parse_vc, > + }, > + [ACTION_DEC_TCP_ACK_VALUE] =3D { > + .name =3D "value", > + .help =3D "the value to decrease TCP acknowledgment number > by", > + .next =3D NEXT(action_dec_tcp_ack, > NEXT_ENTRY(UNSIGNED)), > + .args =3D ARGS(ARG_ENTRY_HTON(rte_be32_t)), > + .call =3D parse_vc_conf, > + }, > }; >=20 > /** Remove and return last entry from argument stack. */ diff --git > a/doc/guides/testpmd_app_ug/testpmd_funcs.rst > b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > index cb83a3c..49a9e15 100644 > --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst > +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > @@ -4106,6 +4106,22 @@ This section lists supported actions and their > attributes, if any. >=20 > - ``mac_addr {MAC-48}``: new destination MAC address >=20 > +- ``inc_tcp_seq``: Increase sequence number in the outermost TCP header. > + > + - ``value {unsigned}``: Value to increase TCP sequence number by. > + > +- ``dec_tcp_seq``: Decrease sequence number in the outermost TCP header. > + > + - ``value {unsigned}``: Value to decrease TCP sequence number by. > + > +- ``inc_tcp_ack``: Increase acknowledgment number in the outermost TCP > header. > + > + - ``value {unsigned}``: Value to increase TCP acknowledgment number by= . > + > +- ``dec_tcp_ack``: Decrease acknowledgment number in the outermost TCP > header. > + > + - ``value {unsigned}``: Value to decrease TCP acknowledgment number by= . > + > Destroying flow rules > ~~~~~~~~~~~~~~~~~~~~~ >=20 > -- > 1.8.3.1