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 621B2A0564 for ; Fri, 28 Feb 2020 05:33:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 22C6E1BFE1; Fri, 28 Feb 2020 05:33:13 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80044.outbound.protection.outlook.com [40.107.8.44]) by dpdk.org (Postfix) with ESMTP id DA5C81BFE1 for ; Fri, 28 Feb 2020 05:33:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bYvcFS9wfY5aX0MP0ei/tQUdXXGWYCqwHgG9vfJcMVoYe6CTKz7fI5Drved9rwubhE/xEBWVBzcSSTZGcpQCPGxPUUHpt9mVtN9bOdEiK9qIeAtl8grhLSndKNAshVXSgZwWiE8iMQTt+0sJ8KV5u2VG4mz1WcPudpQm69z/2zd3Z7r137JLU39wXtUr76C5Pk30FMCpuJbwXHhOmfq3PRNBpQfsbIZrc/nbvxhWYS5mb4DjgmBxVQugWuL5U5slXx2xDSjWt9jzLcH5W5JDvTOXly+Srp6Bc68i6F3wGU0wbcDUn8rclWJ4qK1GzdFgdCWkXIE4405wO1pza6Cj/A== 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=CB16bEEXfttvofTRDs5A8Na/wxr613ywOVc8FG+8SE0=; b=JvsyAVACgWf+RGSW5ac3wKyvXoQ/EYXIvB3ei0jeHyhSSJ0lKFaRb94FbFdf6WlUNOvDq/YSRpcBaSTfmKf3zsdQXZHDt976xL4qZJyijRFBO18+5LN+2ghxFC/WgjUVT3vURejGTTlJn328/bAIeJqfGG7n/o2/XZuQsCY6l0/shgvN27qcAQU+VH8tzPVQFRotUhhjPn/kk8QDv9aCTzdS3iik0KFjJ0fomdhTJqE/9N/mSqcfdXSXaOjwkte9NjzkUmh+ZH4nv0VtHNzcXIpNriXVBOsOs84OrSwvVSv4KjOWJa3vZdu64/ckop0Z3n86KnJvClGETHAHLAclWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CB16bEEXfttvofTRDs5A8Na/wxr613ywOVc8FG+8SE0=; b=QhxFZL+iWmfiO9Rj2YEb2iVFpOMHSICrrTthqKRSx5u1AaYmpuUA/xDq9XA6nu/eCLSaEZbVqoukrYZcKdpRUqKJBtCUpzLWZqY0S+M9VxlxeYat+WCS51K4bv0P8/YbLDfHfhze5SFX+uvda/Z0vKbR/cH7/k/6xbuQGtA+b8Y= Received: from DB8PR04MB6635.eurprd04.prod.outlook.com (20.179.251.20) by DB8PR04MB6779.eurprd04.prod.outlook.com (52.133.242.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.15; Fri, 28 Feb 2020 04:33:10 +0000 Received: from DB8PR04MB6635.eurprd04.prod.outlook.com ([fe80::4c59:1ca:3f5a:d0b8]) by DB8PR04MB6635.eurprd04.prod.outlook.com ([fe80::4c59:1ca:3f5a:d0b8%7]) with mapi id 15.20.2772.012; Fri, 28 Feb 2020 04:33:10 +0000 From: Akhil Goyal To: Anoob Joseph , "luca.boccassi@gmail.com" , Ankur Dwivedi CC: dpdk stable Thread-Topic: [EXT] patch 'examples/ipsec-secgw: extend inline session to non AES-GCM' has been queued to stable release 19.11.1 Thread-Index: AQHV7VES+A68TQUjpU6sMa1NZPBFD6gwA2gAgAABoiA= Date: Fri, 28 Feb 2020 04:33:10 +0000 Message-ID: References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> <20200227093402.17690-2-luca.boccassi@gmail.com> In-Reply-To: Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=akhil.goyal@nxp.com; x-originating-ip: [92.120.1.69] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 27ff9efc-18a0-46c9-1645-08d7bc0750eb x-ms-traffictypediagnostic: DB8PR04MB6779: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-forefront-prvs: 0327618309 x-forefront-antispam-report: SFV:NSPM; SFS:(10001)(10009020)(4636009)(39860400002)(366004)(396003)(346002)(376002)(136003)(199004)(189003)(55016002)(2906002)(186003)(9686003)(26005)(81166006)(81156014)(4326008)(86362001)(53546011)(8676002)(7696005)(8936002)(66476007)(66446008)(64756008)(71200400001)(5660300002)(66556008)(66946007)(76116006)(33656002)(45080400002)(6506007)(966005)(316002)(19627235002)(44832011)(478600001)(110136005)(52536014); DIR:OUT; SFP:1101; SCL:1; SRVR:DB8PR04MB6779; H:DB8PR04MB6635.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1Iv5mgkShj5nB49nSFz7DvKLTC7P3JqjGVICzaQ3RQRydLXFsmIDXdfnhORRL77WPJYDxTe51SIMn7VbPAb1EK74i84pnP7jdSZRTgxs7So5xZxefEO+8wlKQeZwGbn+aQzWnE123ND3IJHwPW+lA9ryiFpqbjxJt+yFCh4E6NaAoQ/L//wkf7cmJjwV6s9lnUcP0Ru85wUzTJLLQd25v8K4m3f98a9FT1RbPZAYykGWOZZGV5x3JDiOvLLW724Zr2MlpVMqOkYL/vjLAHwH5fRaivw2+Yy1wNe74SgMtHuT4RN1UQcOtegyZMstQJTSc2Gsj9i477VuHoAQyVKiDpwLVGJLevBmJc9Qu4uV3D1/YoePddy7ofewSZjLC7WedJHmhvLWYbqo/nugR405YDOupS1D18y9/+fCMglOuyQKRiOFdv63Mj3FW+2WO1rmvBYoLJ0/t1y1qM3diDvAwRM9fT4S3WwdB+2/GXzwkDODVzWCeXY4g59Dl/dNPGieajHf3AbyaBRuB4ndO4ojFhU9oyexntXLwhfOu+i9iddjXkalnKKSXAmbwMdirgwvXcPHWcETLOeRXqOcheAQcYq7WoB1+b91zXLGjXeXiyG59sSmDW/VRMn8wPs1m01q x-ms-exchange-antispam-messagedata: 0oH9VUe/5nRp7ryu1FI6NJymHJnEhrVj3BdNAhy7XaJJDVTj4Cf8+od9e0y6igpZgWmHgobWe09v6gjilnKH4v1kedkOTaYWl4eW4Yr6hWQB/4tqVEh/sXGq6T2NOZS8WvA8uJrItP/bws3XD+CqVg== x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27ff9efc-18a0-46c9-1645-08d7bc0750eb X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2020 04:33:10.3562 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4cUGvOeYoGrFVzfBJlrNnwUhixAfvo+eOMbm/U6CcRCXxJDtcdX6M5AZmBhk3uzpmYY+GFzES5A8Y33L5Gl/9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6779 Subject: Re: [dpdk-stable] [EXT] patch 'examples/ipsec-secgw: extend inline session to non AES-GCM' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" >=20 > Hi Luca, >=20 > The diff between upstream patch and dpdk-stable patch doesn't look right.= I > would say we can defer this change from merge to stable. >=20 > @Akhil, what's your take on this? Why do we need to defer this patch? I think the only thing is declaration of ips is missing. The compilation wi= ll be broken. Can you send the appropriate patch to stable? >=20 > Thanks, > Anoob >=20 > > -----Original Message----- > > From: luca.boccassi@gmail.com > > Sent: Thursday, February 27, 2020 3:03 PM > > To: Ankur Dwivedi > > Cc: Anoob Joseph ; Akhil Goyal > > ; dpdk stable > > Subject: [EXT] patch 'examples/ipsec-secgw: extend inline session to no= n > > AES-GCM' has been queued to stable release 19.11.1 > > > > External Email > > > > ---------------------------------------------------------------------- > > Hi, > > > > FYI, your patch has been queued to stable release 19.11.1 > > > > Note it hasn't been pushed to > > > https://eur01.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Furlde= fens > e.proofpoint.com%2Fv2%2Furl%3Fu%3Dhttp- > &data=3D02%7C01%7Cakhil.goyal%40nxp.com%7C0d2ac7af89ca48357a110 > 8d7bc062ce6%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C6371846 > 07019183710&sdata=3DtSi80Em79D5Nvv3YUVa5HlUfyStN5MOf5eCyOs2e2b > o%3D&reserved=3D0 > > 3A__dpdk.org_browse_dpdk- > > 2Dstable&d=3DDwIDAg&c=3DnKjWec2b6R0mOyPaz7xtfQ&r=3DjPfB8rwwviRSxyLWs > > 2n6B-WYLn1v9SyTMrT5EQqh2TU&m=3DuIvPnv- > > I27twfm1d6XD0AMFwcH8L4mBZAQxhhR9PzDw&s=3D- > > O8xzMfTZw5m9whfatE2Ma7_ub-QaoVc1uZWrbWRSKU&e=3D yet. > > It will be pushed if I get no objections before 02/29/20. So please sho= ut if > > anyone has objections. > > > > Also note that after the patch there's a diff of the upstream commit vs= the > > patch applied to the branch. This will indicate if there was any rebasi= ng > > needed to apply to the stable branch. If there were code changes for > > rebasing > > (ie: not only metadata diffs), please double check that the rebase was > > correctly done. > > > > Thanks. > > > > Luca Boccassi > > > > --- > > From 42b568622cf6345e311aee821d755963e786a704 Mon Sep 17 00:00:00 > > 2001 > > From: Ankur Dwivedi > > Date: Fri, 14 Feb 2020 12:08:18 +0530 > > Subject: [PATCH] examples/ipsec-secgw: extend inline session to non AES= - > > GCM > > > > [ upstream commit b685f931e1ce33d287e3891d4f19ab07f8d2aa79 ] > > > > This patch extends creation of inline session to all the algorithms. > > Previously the inline session was enabled only for AES-GCM cipher. > > > > Fixes: 3a690d5a65e2 ("examples/ipsec-secgw: fix first packet with inlin= e > > crypto") > > > > Signed-off-by: Ankur Dwivedi > > Acked-by: Anoob Joseph > > Acked-by: Akhil Goyal > > --- > > examples/ipsec-secgw/sa.c | 25 ++++++++++++------------- > > 1 file changed, 12 insertions(+), 13 deletions(-) > > > > diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c inde= x > > c75a5a15f5..04827d7e11 100644 > > --- a/examples/ipsec-secgw/sa.c > > +++ b/examples/ipsec-secgw/sa.c > > @@ -993,7 +993,6 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct > > ipsec_sa entries[], > > } > > > > if (sa->aead_algo =3D=3D RTE_CRYPTO_AEAD_AES_GCM) { > > - struct rte_ipsec_session *ips; > > iv_length =3D 12; > > > > sa_ctx->xf[idx].a.type =3D > > RTE_CRYPTO_SYM_XFORM_AEAD; @@ -1014,18 +1013,6 @@ > > sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[], > > > > sa->xforms =3D &sa_ctx->xf[idx].a; > > > > - ips =3D ipsec_get_primary_session(sa); > > - if (ips->type =3D=3D > > - > > RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL || > > - ips->type =3D=3D > > - > > RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO) { > > - rc =3D create_inline_session(skt_ctx, sa, ips); > > - if (rc !=3D 0) { > > - RTE_LOG(ERR, IPSEC_ESP, > > - "create_inline_session() > > failed\n"); > > - return -EINVAL; > > - } > > - } > > print_one_sa_rule(sa, inbound); > > } else { > > switch (sa->cipher_algo) { > > @@ -1094,6 +1081,18 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct > > ipsec_sa entries[], > > > > print_one_sa_rule(sa, inbound); > > } > > + > > + if (ips->type =3D=3D > > + RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL || > > + ips->type =3D=3D > > + RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO) { > > + rc =3D create_inline_session(skt_ctx, sa, ips); > > + if (rc !=3D 0) { > > + RTE_LOG(ERR, IPSEC_ESP, > > + "create_inline_session() failed\n"); > > + return -EINVAL; > > + } > > + } > > } > > > > return 0; > > -- > > 2.20.1 > > > > --- > > Diff of the applied patch vs upstream commit (please double-check if = non- > > empty: > > --- > > --- - 2020-02-27 09:31:55.915137861 +0000 > > +++ 0002-examples-ipsec-secgw-extend-inline-session-to-non-AE.patch > > 2020-02-27 09:31:55.631945112 +0000 > > @@ -1,26 +1,27 @@ > > -From b685f931e1ce33d287e3891d4f19ab07f8d2aa79 Mon Sep 17 00:00:00 > > 2001 > > +From 42b568622cf6345e311aee821d755963e786a704 Mon Sep 17 00:00:00 > > 2001 > > From: Ankur Dwivedi > > Date: Fri, 14 Feb 2020 12:08:18 +0530 > > Subject: [PATCH] examples/ipsec-secgw: extend inline session to non AE= S- > > GCM > > > > +[ upstream commit b685f931e1ce33d287e3891d4f19ab07f8d2aa79 ] > > + > > This patch extends creation of inline session to all the algorithms. > > Previously the inline session was enabled only for AES-GCM cipher. > > > > Fixes: 3a690d5a65e2 ("examples/ipsec-secgw: fix first packet with inli= ne > > crypto") > > -Cc: stable@dpdk.org > > > > Signed-off-by: Ankur Dwivedi > > Acked-by: Anoob Joseph > > Acked-by: Akhil Goyal > > --- > > - examples/ipsec-secgw/sa.c | 26 ++++++++++++-------------- > > - 1 file changed, 12 insertions(+), 14 deletions(-) > > + examples/ipsec-secgw/sa.c | 25 ++++++++++++------------- > > + 1 file changed, 12 insertions(+), 13 deletions(-) > > > > diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c -in= dex > > e75b687c46..4822d6bdaa 100644 > > +index c75a5a15f5..04827d7e11 100644 > > --- a/examples/ipsec-secgw/sa.c > > +++ b/examples/ipsec-secgw/sa.c > > -@@ -1057,7 +1057,6 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct > > ipsec_sa entries[], > > +@@ -993,7 +993,6 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct > > +ipsec_sa entries[], > > } > > > > if (sa->aead_algo =3D=3D RTE_CRYPTO_AEAD_AES_GCM) { @@ - > > 28,11 +29,10 @@ > > iv_length =3D 12; > > > > sa_ctx->xf[idx].a.type =3D > > RTE_CRYPTO_SYM_XFORM_AEAD; -@@ -1077,19 +1076,6 @@ > > sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[], > > - sa->digest_len; > > +@@ -1014,18 +1013,6 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struc= t > > +ipsec_sa entries[], > > > > sa->xforms =3D &sa_ctx->xf[idx].a; > > -- > > + > > - ips =3D ipsec_get_primary_session(sa); > > - if (ips->type =3D=3D > > - > > RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL || > > @@ -45,13 +45,14 @@ > > - return -EINVAL; > > - } > > - } > > + print_one_sa_rule(sa, inbound); > > } else { > > switch (sa->cipher_algo) { > > - case RTE_CRYPTO_CIPHER_NULL: > > -@@ -1156,6 +1142,18 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struc= t > > ipsec_sa entries[], > > - sa->xforms =3D &sa_ctx->xf[idx].a; > > - } > > +@@ -1094,6 +1081,18 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struc= t > > +ipsec_sa entries[], > > > > + print_one_sa_rule(sa, inbound); > > + } > > ++ > > + if (ips->type =3D=3D > > + RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL || > > + ips->type =3D=3D > > @@ -63,10 +64,9 @@ > > + return -EINVAL; > > + } > > + } > > -+ > > - print_one_sa_rule(sa, inbound); > > } > > > > + return 0; > > -- > > 2.20.1 > >