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 430CA43345 for ; Thu, 16 Nov 2023 14:24:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3CAAE402DD; Thu, 16 Nov 2023 14:24:33 +0100 (CET) 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 A4B21402C6 for ; Thu, 16 Nov 2023 14:24:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141071; 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=ykBoYc9VzhTnM4wqMoCg+f2YTUKt5YWXuKAS+RJfE5c=; b=KfNGDmUZYwBEjsYvPI5ZYOf3Wjetqy/bmpYccK2EbugFqth9TQfA33hw+HTbl2TIBMTru/ vW4BNsZIMtoOXZ5NTchFmsG94TGa3aPQ3bzDsaEYuzMDdwo1Yjh0bm7cDICXLV0CpVUP1t q0Oel7gjaeEZi9SBMiKvIppu61yC89k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-0-6mrA3FPRSjwzGiUobt5w-1; Thu, 16 Nov 2023 08:24:26 -0500 X-MC-Unique: 0-6mrA3FPRSjwzGiUobt5w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C6ABE887183; Thu, 16 Nov 2023 13:24:25 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADACF2166B27; Thu, 16 Nov 2023 13:24:24 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: Luca Boccassi , Ori Kam , Ferruh Yigit , dpdk stable Subject: patch 'ethdev: fix 32-bit build with GCC 13' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:02 +0000 Message-ID: <20231116132348.557257-20-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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.6 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/21/23. 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/6d69e0995437cd6c02ca65c2e186d430c26a4245 Thanks. Kevin --- >From 6d69e0995437cd6c02ca65c2e186d430c26a4245 Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Wed, 1 Nov 2023 15:15:54 +0800 Subject: [PATCH] ethdev: fix 32-bit build with GCC 13 [ upstream commit 3d67012ab70252190fcfea12c122567a4d010228 ] aarch32 build with gcc-13.0.1 generated following warning: In function 'memcpy', inlined from 'rte_memcpy' at .../eal/arm/include/rte_memcpy_32.h:296:9, inlined from 'rte_flow_conv_action_conf' at .../rte_flow.c:726:20, inlined from 'rte_flow_conv_actions' at .../ethdev/rte_flow.c:936:10: warning: '__builtin_memcpy' specified bound 4294967264 exceeds maximum object size 2147483647 [-Wstringop-overflow=] The issue is due to possible wrapping in unsigned arithmetic. The 'size' can be 0. 'off' is 32. When 'tmp' is equal to (unsigned)-32, the copy length is more than half the address space. Hence the warning. Cast variables to 64-bit to avoid wrapping. Fixes: 063911ee1df4 ("ethdev: add flow API object converter") Reported-by: Luca Boccassi Signed-off-by: Ruifeng Wang Acked-by: Ori Kam Acked-by: Ferruh Yigit --- lib/ethdev/rte_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index b311dd2a00..3a6b6db725 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -657,5 +657,5 @@ rte_flow_conv_action_conf(void *buf, const size_t size, off = RTE_ALIGN_CEIL(off, sizeof(*dst.rss->key)); tmp = sizeof(*src.rss->key) * src.rss->key_len; - if (size >= off + tmp) + if (size >= (uint64_t)off + (uint64_t)tmp) dst.rss->key = rte_memcpy ((void *)((uintptr_t)dst.rss + off), @@ -666,5 +666,5 @@ rte_flow_conv_action_conf(void *buf, const size_t size, off = RTE_ALIGN_CEIL(off, sizeof(*dst.rss->queue)); tmp = sizeof(*src.rss->queue) * src.rss->queue_num; - if (size >= off + tmp) + if (size >= (uint64_t)off + (uint64_t)tmp) dst.rss->queue = rte_memcpy ((void *)((uintptr_t)dst.rss + off), -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.049595422 +0000 +++ 0020-ethdev-fix-32-bit-build-with-GCC-13.patch 2023-11-16 13:21:52.438946340 +0000 @@ -1 +1 @@ -From 3d67012ab70252190fcfea12c122567a4d010228 Mon Sep 17 00:00:00 2001 +From 6d69e0995437cd6c02ca65c2e186d430c26a4245 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3d67012ab70252190fcfea12c122567a4d010228 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index 4d6c28ee0e..20ee8430ea 100644 +index b311dd2a00..3a6b6db725 100644 @@ -36 +37 @@ -@@ -725,5 +725,5 @@ rte_flow_conv_action_conf(void *buf, const size_t size, +@@ -657,5 +657,5 @@ rte_flow_conv_action_conf(void *buf, const size_t size, @@ -43 +44 @@ -@@ -734,5 +734,5 @@ rte_flow_conv_action_conf(void *buf, const size_t size, +@@ -666,5 +666,5 @@ rte_flow_conv_action_conf(void *buf, const size_t size,