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 04A974586B for ; Mon, 26 Aug 2024 13:06:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB5D6402A7; Mon, 26 Aug 2024 13:06:26 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 0D6E440272 for ; Mon, 26 Aug 2024 13:06:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724670384; 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:autocrypt:autocrypt; bh=TEQqUcb5ECXlC4nus5pjbV7yb7MJl+aF7KCU5oN+sDg=; b=gjOfR758kvnP4DN43V4Mk19XTxyhI390bI7gNj4tpPH/O30KFy1uXpm+qeFrGbrCMCv1q6 DunKi+3ce0Bn6dZGsTuZfT/SV2JyQNc5nnyrH4RKGGDJy4zFJ65Jje+ecuzx16ru1ADGO7 LtK9+3qHacQmJrSOUxGqgmTNmG4w2sI= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-570-3xfIOsBIPRWP8EVa1Im2yQ-1; Mon, 26 Aug 2024 07:06:23 -0400 X-MC-Unique: 3xfIOsBIPRWP8EVa1Im2yQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a867d92ec4bso169521366b.1 for ; Mon, 26 Aug 2024 04:06:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724670382; x=1725275182; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TEQqUcb5ECXlC4nus5pjbV7yb7MJl+aF7KCU5oN+sDg=; b=tUjGtYQeb2cMyCf1W+wa1/bYlBghXL7qnJPnKBKMII4HkZ6nB5FSSk9UaFF5Oz23yv +UN1YSzKO4wCw6DGDqQu8xDR5zTkl6eHi1GGRQr0XJt8c9sxok3Ove9UaRj8CDAQ1lPe N/1VOrCm9AYgOgDTxVi7DyS/WEZrD4AKDWswjTMBVa1WYrc/nJpwvAtXpnZVcG7Fc9tX xQ2SvQOq1LI94H8aX5+lyXLogNXKY7+kaohb82YvGthkx11nWEqGuEQR29utYDNW8qHS HuS5mwr9B+wolKMfgvog8Ti6O4Aj5N7qH123cS8+9MJFTH0OsaInp4r4x3QOnyTnjNep WmLg== X-Forwarded-Encrypted: i=1; AJvYcCWAdlMT0z2Px60NhlYrUw/XpCDv1DX9jJIeSAGOSiUQrE7dwi3Mpss0ZB54Eap5IeW7Fc79nWM=@dpdk.org X-Gm-Message-State: AOJu0Yx03FpYYD/UW2Q/7hEZroIMLC0tUxLNOGYGl88m5rfqlheolEqW Jg+JUYWjl4OsHVViaY2DuzoAPcKehJ0SAG2zlEWtJyKzkyOfhayWT7pQRC1RBGKlZltOns8Q4NC dkYB1FWccX0vWJr3yoRRdlS+Tb2CfKqc5h9IKcu3AvkLd X-Received: by 2002:a05:6402:4312:b0:5a2:c1b1:4d3 with SMTP id 4fb4d7f45d1cf-5c0891a8227mr9453772a12.28.1724670381908; Mon, 26 Aug 2024 04:06:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqvmpsTdend2ea6AOk9Od2gr1s04fzoOWrbfDOmV7X+mTkr3m53d3+dJsubqyyU3cHyWvhGw== X-Received: by 2002:a05:6402:4312:b0:5a2:c1b1:4d3 with SMTP id 4fb4d7f45d1cf-5c0891a8227mr9453728a12.28.1724670381253; Mon, 26 Aug 2024 04:06:21 -0700 (PDT) Received: from [192.168.0.36] ([78.19.103.36]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c044ddc6afsm5377624a12.14.2024.08.26.04.06.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 26 Aug 2024 04:06:20 -0700 (PDT) Message-ID: <5b832556-5c23-4a98-bb5c-4bb654a93e70@redhat.com> Date: Mon, 26 Aug 2024 12:06:19 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [EXTERNAL] patch 'examples/ipsec-secgw: fix SA salt endianness' has been queued to stable release 21.11.8 To: Akhil Goyal , Shihong Wang Cc: Chaoyong He , dpdk stable References: <20240823161929.1004778-1-ktraynor@redhat.com> <20240823161929.1004778-69-ktraynor@redhat.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 On 26/08/2024 09:07, Akhil Goyal wrote: > Hi Kevin, > This patch was reverted on main branch. So better not backport. > ok, thank you Akhil. I will drop this. Kevin. > Regards, > Akhil > > From: Kevin Traynor > Sent: Friday, August 23, 2024 9:48 PM > To: Shihong Wang > Cc: Chaoyong He ; Akhil Goyal ; dpdk stable > Subject: [EXTERNAL] patch 'examples/ipsec-secgw: fix SA salt endianness' has been queued to stable release 21.11.8 > > Hi, FYI, your patch has been queued to stable release 21. 11. 8 Note it hasn't been pushed to https: //urldefense. proofpoint. com/v2/url?u=http-3A__dpdk. org_browse_dpdk-2Dstable&d=DwIDaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=DnL7Si2wl_PRwpZ9TWey3eu68gBzn7DkPwuqhd6WNyo&m=jxMUmPULUFoI7N1IfPQX3iPunuqaFfvUiMvebss7a8oZ3g5cSkmT3owuWcRrmop6&s=Gl4YJ1gzyH5_C1fAntP5oV3-o7HB3pTE70HU-jtKq10&e= > > > Hi, > > > > FYI, your patch has been queued to stable release 21.11.8 > > > > Note it hasn't been pushed to https://urldefense.proofpoint.com/v2/url?u=http-3A__dpdk.org_browse_dpdk-2Dstable&d=DwIDaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=DnL7Si2wl_PRwpZ9TWey3eu68gBzn7DkPwuqhd6WNyo&m=jxMUmPULUFoI7N1IfPQX3iPunuqaFfvUiMvebss7a8oZ3g5cSkmT3owuWcRrmop6&s=Gl4YJ1gzyH5_C1fAntP5oV3-o7HB3pTE70HU-jtKq10&e= yet. > > It will be pushed if I get no objections before 08/28/24. 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://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_kevintraynor_dpdk-2Dstable&d=DwIDaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=DnL7Si2wl_PRwpZ9TWey3eu68gBzn7DkPwuqhd6WNyo&m=jxMUmPULUFoI7N1IfPQX3iPunuqaFfvUiMvebss7a8oZ3g5cSkmT3owuWcRrmop6&s=ORkIdcswiYk9iiTtV7ZmbP_zV54GLLsyvnBU72T8PbY&e= > > > > This queued commit can be viewed at: > > https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_kevintraynor_dpdk-2Dstable_commit_db8d7d17a9e8b79c8b6bae2044a6fcb819b33700&d=DwIDaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=DnL7Si2wl_PRwpZ9TWey3eu68gBzn7DkPwuqhd6WNyo&m=jxMUmPULUFoI7N1IfPQX3iPunuqaFfvUiMvebss7a8oZ3g5cSkmT3owuWcRrmop6&s=OxADViB5_6ttYifYrSuk4n9QR-FrrZjMHn69AGIDLwg&e= > > > > Thanks. > > > > Kevin > > > > --- > > From db8d7d17a9e8b79c8b6bae2044a6fcb819b33700 Mon Sep 17 00:00:00 2001 > > From: Shihong Wang > > > Date: Thu, 14 Mar 2024 10:00:52 +0800 > > Subject: [PATCH] examples/ipsec-secgw: fix SA salt endianness > > MIME-Version: 1.0 > > Content-Type: text/plain; charset=UTF-8 > > Content-Transfer-Encoding: 8bit > > > > [ upstream commit e6bfd9676109f904b4f263402e77105fdca8e67c ] > > > > The SA salt of struct ipsec_sa is a CPU-endian u32 variable, but it’s > > value is stored in an array of encryption or authentication keys > > according to big-endian. So it maybe need to convert the endianness > > order to ensure that the value assigned to the SA salt is CPU-endian. > > > > Fixes: 50d75cae2a2c ("examples/ipsec-secgw: initialize SA salt") > > Fixes: 9413c3901f31 ("examples/ipsec-secgw: support additional algorithms") > > Fixes: 501e9c226adf ("examples/ipsec-secgw: add AEAD parameters") > > > > Signed-off-by: Shihong Wang > > > Reviewed-by: Chaoyong He > > > Acked-by: Akhil Goyal > > > --- > > examples/ipsec-secgw/sa.c | 13 +++++++------ > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c > > index 49d16f055b..af3a92f53e 100644 > > --- a/examples/ipsec-secgw/sa.c > > +++ b/examples/ipsec-secgw/sa.c > > @@ -366,4 +366,5 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > uint32_t *ri /*rule index*/; > > struct ipsec_sa_cnt *sa_cnt; > > + rte_be32_t salt; /*big-endian salt*/ > > uint32_t cipher_algo_p = 0; > > uint32_t auth_algo_p = 0; > > @@ -500,6 +501,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > key_len -= 4; > > rule->cipher_key_len = key_len; > > - memcpy(&rule->salt, > > - &rule->cipher_key[key_len], 4); > > + memcpy(&salt, &rule->cipher_key[key_len], 4); > > + rule->salt = rte_be_to_cpu_32(salt); > > } > > > > @@ -565,6 +566,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > rule->auth_key_len = key_len; > > rule->iv_len = algo->iv_len; > > - memcpy(&rule->salt, > > - &rule->auth_key[key_len], 4); > > + memcpy(&salt, &rule->auth_key[key_len], 4); > > + rule->salt = rte_be_to_cpu_32(salt); > > } > > > > @@ -624,6 +625,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > key_len -= 4; > > rule->cipher_key_len = key_len; > > - memcpy(&rule->salt, > > - &rule->cipher_key[key_len], 4); > > + memcpy(&salt, &rule->cipher_key[key_len], 4); > > + rule->salt = rte_be_to_cpu_32(salt); > > > > aead_algo_p = 1; > > -- > > 2.46.0 > > > > --- > > Diff of the applied patch vs upstream commit (please double-check if non-empty: > > --- > > --- - 2024-08-23 17:18:11.871795930 +0100 > > +++ 0069-examples-ipsec-secgw-fix-SA-salt-endianness.patch 2024-08-23 17:18:09.746430196 +0100 > > @@ -1 +1 @@ > > -From e6bfd9676109f904b4f263402e77105fdca8e67c Mon Sep 17 00:00:00 2001 > > +From db8d7d17a9e8b79c8b6bae2044a6fcb819b33700 Mon Sep 17 00:00:00 2001 > > @@ -8,0 +9,2 @@ > > +[ upstream commit e6bfd9676109f904b4f263402e77105fdca8e67c ] > > + > > @@ -17 +18,0 @@ > > -Cc: stable@dpdk.org > > @@ -27 +28 @@ > > -index c4bac17cd7..8aa9aca739 100644 > > +index 49d16f055b..af3a92f53e 100644 > > @@ -30 +31 @@ > > -@@ -375,4 +375,5 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > +@@ -366,4 +366,5 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > @@ -36 +37 @@ > > -@@ -509,6 +510,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > +@@ -500,6 +501,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > @@ -45 +46 @@ > > -@@ -574,6 +575,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > +@@ -565,6 +566,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > @@ -54 +55 @@ > > -@@ -633,6 +634,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > +@@ -624,6 +625,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > >