From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5647EA0032 for ; Fri, 24 Jun 2022 17:02:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 513D84069D; Fri, 24 Jun 2022 17:02:18 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 52B56427F1 for ; Fri, 24 Jun 2022 17:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f+hc7uNLd/WOUuAC/ff5jrS8KhqjVUBpmNwS/2OUgRE=; b=b32lmPW/uJGop8tNsJbwaZs2srP8MYrSFnrHhuPOmDHv0gC3INMCQpQ0sR1FZOJKfTC93D uS9w43DgsO9OMtyLAJGhEAJ6QFRrxfG0f3iya7+ViqSDOBfo47uT8NpckiTnTKDFU0UsrN itHytM/RAq+RgcGmQQ1M5hollHtPuiA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-179-4hm3pEyaPv6ZDm16eT5leg-1; Fri, 24 Jun 2022 11:02:13 -0400 X-MC-Unique: 4hm3pEyaPv6ZDm16eT5leg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4AE4F18A01BB; Fri, 24 Jun 2022 15:02:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 908F61730C; Fri, 24 Jun 2022 15:02:12 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Fan Zhang , dpdk stable Subject: patch 'examples/ipsec-secgw: fix ESN setting' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:18 +0100 Message-Id: <20220624150148.1855580-10-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a9485fd00b862d031c46480126fb80dc579c229d Thanks. Kevin --- >From a9485fd00b862d031c46480126fb80dc579c229d Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Tue, 14 Jun 2022 13:43:13 +0100 Subject: [PATCH] examples/ipsec-secgw: fix ESN setting [ upstream commit 3e534bc81a5479e90b76471ebe1ba4de80a68374 ] Fix ESN option flag and initial value for the rte_ipsec library path. Fixes: 560029d5cfc9 ("examples/ipsec-secgw: define initial ESN value") Signed-off-by: Radu Nicolau Acked-by: Fan Zhang --- examples/ipsec-secgw/sa.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c index 45509c5c68..89131f71e5 100644 --- a/examples/ipsec-secgw/sa.c +++ b/examples/ipsec-secgw/sa.c @@ -1464,4 +1464,9 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.options.copy_dscp = 1; + if (ss->esn > 0) { + prm->ipsec_xform.options.esn = 1; + prm->ipsec_xform.esn.value = ss->esn; + } + if (IS_IP4_TUNNEL(ss->flags)) { prm->ipsec_xform.tunnel.type = RTE_SECURITY_IPSEC_TUNNEL_IPV4; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:09.278071808 +0100 +++ 0010-examples-ipsec-secgw-fix-ESN-setting.patch 2022-06-24 15:51:08.851984028 +0100 @@ -1 +1 @@ -From 3e534bc81a5479e90b76471ebe1ba4de80a68374 Mon Sep 17 00:00:00 2001 +From a9485fd00b862d031c46480126fb80dc579c229d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3e534bc81a5479e90b76471ebe1ba4de80a68374 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index fde263ca33..5d9cec97db 100644 +index 45509c5c68..89131f71e5 100644 @@ -21 +22 @@ -@@ -1491,4 +1491,9 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, +@@ -1464,4 +1464,9 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss,