From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 54DF3A0564
	for <public@inbox.dpdk.org>; Fri, 28 Feb 2020 05:25:00 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 1DE4F1BFE2;
	Fri, 28 Feb 2020 05:25:00 +0100 (CET)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
 [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id EF2501BFE2
 for <stable@dpdk.org>; Fri, 28 Feb 2020 05:24:57 +0100 (CET)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
 by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
 01S4LZQ8005676; Thu, 27 Feb 2020 20:24:57 -0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
 h=from : to : cc :
 subject : date : message-id : references : in-reply-to : content-type :
 content-transfer-encoding : mime-version; s=pfpt0818;
 bh=+5t8YiW3SH3qEPHe2zvA4uY6bGSNfc6dHb1gGAdB1Sk=;
 b=HQrHM6CGe2UH8rNAjoMEp5gFq/zX5anBkMyIs28Ab7RIaYg7Pea6DtzG54GAniOl7Kx+
 nNunJdp0pTAdtOnFHOgsY7o/McbYkOQopLk307xKxvy6QpjevRfsz6+NDGj67Oz+gCJQ
 awEBML6lgqALDWEGU5NVsxRt1MpRy3DGtoPnuNsl7PVo2Q9JPM7bYyd2gBt0+cxZapaW
 sHTWvEE+5RhU6CildBvh23tU2/RSRW/vxLmQ2ctbUjC/ipMluYiR/xvKFLUzNNioAEhJ
 7ZyauqfsEv1hGmo9A0JPhH5oxS5jrfyziX/WBfbWFOGpTP+21f2VTPstbB973jKGsvgo Eg== 
Received: from sc-exch04.marvell.com ([199.233.58.184])
 by mx0a-0016f401.pphosted.com with ESMTP id 2yepv1hqs2-1
 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
 Thu, 27 Feb 2020 20:24:56 -0800
Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH04.marvell.com
 (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
 Thu, 27 Feb 2020 20:24:55 -0800
Received: from SC-EXCH04.marvell.com (10.93.176.84) by DC5-EXCH01.marvell.com
 (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
 Thu, 27 Feb 2020 20:24:55 -0800
Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.103)
 by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id
 15.0.1497.2 via Frontend Transport; Thu, 27 Feb 2020 20:24:54 -0800
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=iq4Ey/BJ+mh9sPqhzObhOMBjA13jBlOFaHgXDFDGrkDukq3/h69L3fyhruj5L8SOLsr2QbrVesUsne7E4fq1xel58sw8gy01yg18mn8AmJkmIrhQ9VcgVDf9cBKdcYUHskIAh0gOf4fmtJ+C0573XDYrS8pzM2n1sDyN5pzAhruuVYDUkjNT/jhulfoWFDA+KRJMDfkQaA+nXqg0EOuojENo8kR8/jKcQX7B1E98v8lXdAGIaeSw3eQnpmbfr8gyk1uceBOC4d2dG7zczww3/uXRlHHb5yt0xBBsiLOyJTESp62VZDsySJgplGP33SqBo/eq9h3IooZfq6ZG86AT3w==
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=+5t8YiW3SH3qEPHe2zvA4uY6bGSNfc6dHb1gGAdB1Sk=;
 b=AUBjL8Lb6GG4/rf5WL3UAUlAWnfZGPpMYm7r04Z/Dnm/xhBbsiUdOtVSe8ulMT4tul8p0ot28/47EME6fw/97sX8E+CRv2ccG586KIwpSoM3AWIVaa3xCoCeh5CQLJc/DE6xmxF9iudT5LEoQyl3e7OdNDHWQNRVm2ZvDS5E0RGQBHiYANSgX2aspCNo9PgTzfFZAJIQtE8XbG0pAVYZYQ+1u9dt/b5mx4kHxZDUImsCuIok6lgvi2BIxjXcixqyX6XxcBncoWt8FrqdFq5+xPY67bbr5mJ0X/oL7kGCYMZzLToiZUMiBw09gz18gr1SFGvPj91nXDO/hWFvTNDbTQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com;
 dkim=pass header.d=marvell.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=+5t8YiW3SH3qEPHe2zvA4uY6bGSNfc6dHb1gGAdB1Sk=;
 b=gKZMY/bkPc0uGy5S/3wK1aB+RIcy0zMD56ro2QSncleMsN8ZjAKMKLrC+9jVoVsR5L2WRAUFneUEGFzwQmRnp3RpBYh3lWEZgyvi25QOsVAZ7yp0AewTLtdOLMMZQNSNqwMqYwuPgCPMBrIpbk62ICouUiGqWh/FKSuu7LKmuiQ=
Received: from MN2PR18MB2877.namprd18.prod.outlook.com (2603:10b6:208:3b::26)
 by MN2PR18MB3005.namprd18.prod.outlook.com (2603:10b6:208:103::22)
 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:24:52 +0000
Received: from MN2PR18MB2877.namprd18.prod.outlook.com
 ([fe80::648f:e7fa:f95e:191b]) by MN2PR18MB2877.namprd18.prod.outlook.com
 ([fe80::648f:e7fa:f95e:191b%2]) with mapi id 15.20.2772.012; Fri, 28 Feb 2020
 04:24:52 +0000
From: Anoob Joseph <anoobj@marvell.com>
To: "luca.boccassi@gmail.com" <luca.boccassi@gmail.com>, Ankur Dwivedi
 <adwivedi@marvell.com>
CC: Akhil Goyal <akhil.goyal@nxp.com>, dpdk stable <stable@dpdk.org>
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: AQHV7VEkBoNHSRTrBUmmC6m1+sQc7KgwAs+Q
Date: Fri, 28 Feb 2020 04:24:52 +0000
Message-ID: <MN2PR18MB28771AEF225C09303804CBCBDFE80@MN2PR18MB2877.namprd18.prod.outlook.com>
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: <20200227093402.17690-2-luca.boccassi@gmail.com>
Accept-Language: en-IN, en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-originating-ip: [14.140.231.66]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 43c4d14e-6140-40f6-d07e-08d7bc0627f7
x-ms-traffictypediagnostic: MN2PR18MB3005:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <MN2PR18MB3005474D3BA2800D9B7F6893DFE80@MN2PR18MB3005.namprd18.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:9508;
x-forefront-prvs: 0327618309
x-forefront-antispam-report: SFV:NSPM;
 SFS:(10009020)(4636009)(376002)(346002)(136003)(396003)(366004)(39860400002)(199004)(189003)(66946007)(33656002)(76116006)(54906003)(71200400001)(66476007)(4326008)(110136005)(66556008)(7696005)(64756008)(86362001)(19627235002)(316002)(66446008)(186003)(8936002)(478600001)(6506007)(53546011)(55016002)(55236004)(8676002)(81166006)(966005)(5660300002)(6636002)(81156014)(2906002)(9686003)(26005)(52536014);
 DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR18MB3005;
 H:MN2PR18MB2877.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en;
 PTR:InfoNoRecords; A:1; MX:1; 
received-spf: None (protection.outlook.com: marvell.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: Ifx9QKHbNlGdinui2rdGANv5POo5vA1LFySRLHlHOabqZqeaH0IeIRMRy6fBGe8FmR8EnVcw5fGN8a82cQQndDo8cj4VFtncSZl404WoF+6NeNPeM6pKqjZFe3kH2UvX+PeVUoQYZ1XbpaMNcYXBHhfdAl/TvbBRjNmH9KdI7zdSdF9vOvYRbYQriAPLvQ1Sc6+kuQMx09s+KfA4+bUNlKRTu5GrkyOXErA06kWNYo9zBSMKGAvaRRGCrnZ72fNxKOp6YZ9SnVs/GLTR+bcxZDWo4LAlFE1OMaIshJSveabcZVPn+L3pZtfmge1yCLvmqCCnRJVFAKFAdMEMRsAS0waUoOVy3Y0qsdSSG7uB0aUXPbBRU71knhFiPuWrh/bejWwbA1UgO2S8ePLxYdgM0sBa11i2QTkD8ozxZEwd59GRafLwduZQNYLVYeJd+bRo5lxQ3K8tNvz1VmFZhLduvzYPBbkMKI45o+wnuG72YhTpBuRsFwNM7IAcl+0BP+gohEaZW3aakP3JG//HlnsQMg==
x-ms-exchange-antispam-messagedata: NoPc+QN964efQjI3pxrre2kwEf5eovHHX29auJexO95KlqM9Tr7pmalmY1ParHnE9kWPwtiOv4IN8JETY079eADv+pu1cIkGeo8gDzgwKLqSmGfoxiRMwHlALJWmlfBSD8+BzMVSoFSW2HhVgpRmXg==
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 43c4d14e-6140-40f6-d07e-08d7bc0627f7
X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2020 04:24:52.1752 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: jgZdIhW8LaQkKaxvpTgSnwkm1venaS7IDVXqUWuw+Y6P8KhLERq8Nn2Rz/OrUlNEWhPBZNxN0eW6NZ+bHYffIA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB3005
X-OriginatorOrg: marvell.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572
 definitions=2020-02-27_08:2020-02-26,
 2020-02-27 signatures=0
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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>

Hi Luca,

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.

@Akhil, what's your take on this?

Thanks,
Anoob

> -----Original Message-----
> From: luca.boccassi@gmail.com <luca.boccassi@gmail.com>
> Sent: Thursday, February 27, 2020 3:03 PM
> To: Ankur Dwivedi <adwivedi@marvell.com>
> Cc: Anoob Joseph <anoobj@marvell.com>; Akhil Goyal
> <akhil.goyal@nxp.com>; dpdk stable <stable@dpdk.org>
> Subject: [EXT] patch 'examples/ipsec-secgw: extend inline session to non
> AES-GCM' has been queued to stable release 19.11.1
>=20
> External Email
>=20
> ----------------------------------------------------------------------
> Hi,
>=20
> FYI, your patch has been queued to stable release 19.11.1
>=20
> Note it hasn't been pushed to
> https://urldefense.proofpoint.com/v2/url?u=3Dhttp-
> 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 shout=
 if
> anyone has objections.
>=20
> Also note that after the patch there's a diff of the upstream commit vs t=
he
> patch applied to the branch. This will indicate if there was any rebasing
> 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.
>=20
> Thanks.
>=20
> Luca Boccassi
>=20
> ---
> From 42b568622cf6345e311aee821d755963e786a704 Mon Sep 17 00:00:00
> 2001
> From: Ankur Dwivedi <adwivedi@marvell.com>
> Date: Fri, 14 Feb 2020 12:08:18 +0530
> Subject: [PATCH] examples/ipsec-secgw: extend inline session to non AES-
> GCM
>=20
> [ upstream commit b685f931e1ce33d287e3891d4f19ab07f8d2aa79 ]
>=20
> This patch extends creation of inline session to all the algorithms.
> Previously the inline session was enabled only for AES-GCM cipher.
>=20
> Fixes: 3a690d5a65e2 ("examples/ipsec-secgw: fix first packet with inline
> crypto")
>=20
> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
> Acked-by: Anoob Joseph <anoobj@marvell.com>
> Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
> ---
>  examples/ipsec-secgw/sa.c | 25 ++++++++++++-------------
>  1 file changed, 12 insertions(+), 13 deletions(-)
>=20
> diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c index
> 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[],
>  		}
>=20
>  		if (sa->aead_algo =3D=3D RTE_CRYPTO_AEAD_AES_GCM) {
> -			struct rte_ipsec_session *ips;
>  			iv_length =3D 12;
>=20
>  			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[],
>=20
>  			sa->xforms =3D &sa_ctx->xf[idx].a;
>=20
> -			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[],
>=20
>  			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;
> +			}
> +		}
>  	}
>=20
>  	return 0;
> --
> 2.20.1
>=20
> ---
>   Diff of the applied patch vs upstream commit (please double-check if no=
n-
> 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 <adwivedi@marvell.com>
>  Date: Fri, 14 Feb 2020 12:08:18 +0530
>  Subject: [PATCH] examples/ipsec-secgw: extend inline session to non AES-
> GCM
>=20
> +[ 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.
>=20
>  Fixes: 3a690d5a65e2 ("examples/ipsec-secgw: fix first packet with inline
> crypto")
> -Cc: stable@dpdk.org
>=20
>  Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
>  Acked-by: Anoob Joseph <anoobj@marvell.com>
>  Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
>  ---
> - 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(-)
>=20
>  diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c -inde=
x
> 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[],
>   		}
>=20
>   		if (sa->aead_algo =3D=3D RTE_CRYPTO_AEAD_AES_GCM) { @@ -
> 28,11 +29,10 @@
>   			iv_length =3D 12;
>=20
>   			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 struct
> +ipsec_sa entries[],
>=20
>   			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 struct
> ipsec_sa entries[],
> - 			sa->xforms =3D &sa_ctx->xf[idx].a;
> - 		}
> +@@ -1094,6 +1081,18 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct
> +ipsec_sa entries[],
>=20
> + 			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);
>   	}
>=20
> + 	return 0;
>  --
>  2.20.1
>=20