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 512F8A0613 for ; Tue, 27 Aug 2019 11:31:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4848754AE; Tue, 27 Aug 2019 11:31:26 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B49B61C0D7 for ; Tue, 27 Aug 2019 11:31:24 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 353DC3084242; Tue, 27 Aug 2019 09:31:24 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D3385C1B2; Tue, 27 Aug 2019 09:31:22 +0000 (UTC) From: Kevin Traynor To: Mariusz Drost Cc: Konstantin Ananyev , dpdk stable Date: Tue, 27 Aug 2019 10:30:06 +0100 Message-Id: <20190827093032.20423-29-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 27 Aug 2019 09:31:24 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ixgbe: fix IP type for crypto session' has been queued to LTS release 18.11.3 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" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. So please shout 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 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c58d548e43d1ff774b6ace3fdf8ebcf99e4eb9db Thanks. Kevin Traynor --- >From c58d548e43d1ff774b6ace3fdf8ebcf99e4eb9db Mon Sep 17 00:00:00 2001 From: Mariusz Drost Date: Wed, 26 Jun 2019 15:26:16 +0200 Subject: [PATCH] net/ixgbe: fix IP type for crypto session [ upstream commit 655df688f8faa448c152c12139e336a3471b174a ] When ixgbe_crypto_add_sa() is called, it checks whether the ip type is IPv6 or IPv4 to write correct addresses to the registers. Type itself is never specified, and act as IPv4, which is the default value. It causes lack of support for IPv6. To fix that, ip type needs to be stored in device private data, based on crypto session ip type field, before the checking is done. Fixes: ec17993a145a ("examples/ipsec-secgw: support security offload") Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec") Signed-off-by: Mariusz Drost Acked-by: Konstantin Ananyev Tested-by: Konstantin Ananyev --- drivers/net/ixgbe/ixgbe_ipsec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_ipsec.c b/drivers/net/ixgbe/ixgbe_ipsec.c index 5a416885f..1eea70716 100644 --- a/drivers/net/ixgbe/ixgbe_ipsec.c +++ b/drivers/net/ixgbe/ixgbe_ipsec.c @@ -155,6 +155,10 @@ ixgbe_crypto_add_sa(struct ixgbe_crypto_session *ic_session) priv->rx_sa_tbl[sa_index].mode |= (IPSRXMOD_PROTO | IPSRXMOD_DECRYPT); - if (ic_session->dst_ip.type == IPv6) + if (ic_session->dst_ip.type == IPv6) { priv->rx_sa_tbl[sa_index].mode |= IPSRXMOD_IPV6; + priv->rx_ip_tbl[ip_index].ip.type = IPv6; + } else if (ic_session->dst_ip.type == IPv4) + priv->rx_ip_tbl[ip_index].ip.type = IPv4; + priv->rx_sa_tbl[sa_index].used = 1; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:12.493208998 +0100 +++ 0029-net-ixgbe-fix-IP-type-for-crypto-session.patch 2019-08-27 09:40:10.912144582 +0100 @@ -1 +1 @@ -From 655df688f8faa448c152c12139e336a3471b174a Mon Sep 17 00:00:00 2001 +From c58d548e43d1ff774b6ace3fdf8ebcf99e4eb9db Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 655df688f8faa448c152c12139e336a3471b174a ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org