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 C44BAA00C2 for ; Thu, 3 Nov 2022 10:29:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE77240694; Thu, 3 Nov 2022 10:29:37 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id F206A40693 for ; Thu, 3 Nov 2022 10:29:36 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id 5so698040wmo.1 for ; Thu, 03 Nov 2022 02:29:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gYigeXJGZ/XP/i2C5XuVIs4fE322a+uGkZ0J+NG5vnI=; b=H0aX70tIa+iRafKN6QGNTw+z5fzTeF33g4hq2P3okHXzZkvq8KmWMCkxlTrzMY/aIp ZF93hwuEprx9h8WmzmY74FRXjKBa3tpz/NNnUZxa7Qy056uFH5JHZubDZGKrU8223qAH ZWiznm1yi8UTtdYYM0XAYWQZAe0D/8l6z7utPtXL8cF1OmtvvLUE4ybpKOKfA9VRQ0Z8 u1qyEZ1y+S7ghwGIAmyGUV3sTzK7CwiysySKoR7f8vqse6/+k7yTu0+n/jnIigSPO3Ad RB/yvQppwBfYVal/ERMcGrmLObbCSPXJMnRGTde52Q5b13ys3/OYJeyQ2WrKekgheoJr lPlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gYigeXJGZ/XP/i2C5XuVIs4fE322a+uGkZ0J+NG5vnI=; b=h40zfJt6cH63OahyrBJJX4gIeAgp79ucmON+lyxR2r16cHWE7fOemb5SZTnbE2+zLC auGY9JnXE+aeV4NUV+l473IWOh9iA72Nxz2V99spFjo4kqrYuG54lkSmzISeeJpaEcM/ Tex1fXQ++T3rbNBRAcTg/1U7D+xcoKcGZ3CH6tHfCxj1olRgEWFa3EJb3v4XxiiKI4tI jAt7tljlW4ZP7SRLJ4moX4yDZIUypGXJDaAuInLg4YDNmxRR8HIRH8fTHCdcEgt4CjJh MOJEMjKT622b7l4w+FrVsmEkqgqxdO/vwbhDpabhS3O7RojTKSORHE8zKflC8+Q7g8fF vJ0Q== X-Gm-Message-State: ACrzQf2+UkS+Jha7xTjVPUFwqXJSfFZ/hrJrZSLTXFd7tYsagf+GMPvY UynSLhHcE+QfllxwLrFsRi8= X-Google-Smtp-Source: AMsMyM53G65JUhmzMZi+WhuXSfjStyklCFvXshBmVxk/i+Sf4R++xlKKbXV0uEiqfz1lNkunED4/Gg== X-Received: by 2002:a05:600c:468a:b0:3c6:f84a:1fae with SMTP id p10-20020a05600c468a00b003c6f84a1faemr28156980wmo.148.1667467776680; Thu, 03 Nov 2022 02:29:36 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id q7-20020a056000136700b002356c051b9csm333724wrz.66.2022.11.03.02.29.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:29:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Amit Prakash Shukla Cc: Konstantin Ananyev , dpdk stable Subject: patch 'ipsec: fix build with GCC 12' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:44 +0000 Message-Id: <20221103092758.1099402-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/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/eb01aeac7081ff4b6af0c5b397d11803fa0ffa78 Thanks. Luca Boccassi --- >From eb01aeac7081ff4b6af0c5b397d11803fa0ffa78 Mon Sep 17 00:00:00 2001 From: Amit Prakash Shukla Date: Thu, 4 Aug 2022 19:10:54 +0530 Subject: [PATCH] ipsec: fix build with GCC 12 [ upstream commit 2be383423e433b5d42324cb450589b46d057c2ed ] GCC 12 raises the following warning: In function '_mm_loadu_si128', inlined from 'rte_mov16' at ../lib/eal/x86/include/rte_memcpy.h:507:9, inlined from 'rte_mov128' at ../lib/eal/x86/include/rte_memcpy.h:549:2, inlined from 'rte_memcpy_generic' at ../lib/eal/x86/include/rte_memcpy.h:732:4, inlined from 'rte_memcpy' at ../lib/eal/x86/include/rte_memcpy.h:882:10, inlined from 'outb_tun_pkt_prepare' at ../lib/ipsec/esp_outb.c:224:2: /usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/include/emmintrin.h:703:10: error: array subscript '__m128i_u[15]' is partly outside array bounds of 'const uint8_t[255]' {aka 'const unsigned char[255]'} [-Werror=array-bounds] 703 | return *__P; | ^~~~ In file included from ../lib/ipsec/esp_outb.c:17: ../lib/ipsec/pad.h: In function 'outb_tun_pkt_prepare': ../lib/ipsec/pad.h:10:22: note: at offset 240 into object 'esp_pad_bytes' of size 255 10 | static const uint8_t esp_pad_bytes[IPSEC_MAX_PAD_SIZE] = { | ^~~~~~~~~~~~~ This patch restrict copy to minimum size. Bugzilla ID: 1060 Fixes: 6015e6a13398 ("ipsec: move inbound and outbound code") Signed-off-by: Amit Prakash Shukla Acked-by: Konstantin Ananyev --- lib/librte_ipsec/esp_outb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/librte_ipsec/esp_outb.c b/lib/librte_ipsec/esp_outb.c index 0bf3cd6bd4..d2c15aeb43 100644 --- a/lib/librte_ipsec/esp_outb.c +++ b/lib/librte_ipsec/esp_outb.c @@ -172,8 +172,10 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, /* pad length */ pdlen -= sizeof(*espt); + RTE_ASSERT(pdlen <= sizeof(esp_pad_bytes)); + /* copy padding data */ - rte_memcpy(pt, esp_pad_bytes, pdlen); + rte_memcpy(pt, esp_pad_bytes, RTE_MIN(pdlen, sizeof(esp_pad_bytes))); /* update esp trailer */ espt = (struct rte_esp_tail *)(pt + pdlen); @@ -339,8 +341,10 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, /* pad length */ pdlen -= sizeof(*espt); + RTE_ASSERT(pdlen <= sizeof(esp_pad_bytes)); + /* copy padding data */ - rte_memcpy(pt, esp_pad_bytes, pdlen); + rte_memcpy(pt, esp_pad_bytes, RTE_MIN(pdlen, sizeof(esp_pad_bytes))); /* update esp trailer */ espt = (struct rte_esp_tail *)(pt + pdlen); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:27.017183991 +0000 +++ 0026-ipsec-fix-build-with-GCC-12.patch 2022-11-03 09:27:25.361422208 +0000 @@ -1 +1 @@ -From 2be383423e433b5d42324cb450589b46d057c2ed Mon Sep 17 00:00:00 2001 +From eb01aeac7081ff4b6af0c5b397d11803fa0ffa78 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2be383423e433b5d42324cb450589b46d057c2ed ] + @@ -36 +37,0 @@ -Cc: stable@dpdk.org @@ -41 +42 @@ - lib/ipsec/esp_outb.c | 8 ++++++-- + lib/librte_ipsec/esp_outb.c | 8 ++++++-- @@ -44,5 +45,5 @@ -diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c -index 5a5429a12b..9cbd9202f6 100644 ---- a/lib/ipsec/esp_outb.c -+++ b/lib/ipsec/esp_outb.c -@@ -219,8 +219,10 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, +diff --git a/lib/librte_ipsec/esp_outb.c b/lib/librte_ipsec/esp_outb.c +index 0bf3cd6bd4..d2c15aeb43 100644 +--- a/lib/librte_ipsec/esp_outb.c ++++ b/lib/librte_ipsec/esp_outb.c +@@ -172,8 +172,10 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, @@ -60 +61 @@ -@@ -416,8 +418,10 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, +@@ -339,8 +341,10 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,