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 DBB6DA0545 for ; Mon, 20 Jun 2022 11:48:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3DC840150; Mon, 20 Jun 2022 11:48:21 +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 724CD40150 for ; Mon, 20 Jun 2022 11:48:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718499; 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=rVmnxzBAbft44zq1W/EoIrceU+voMeUmOUEhoE0HyRM=; b=dWIfLKB6dIITnKy7UsGZfxEmYxsQ0t4ZSB0XchbFFZMvpowBeH9hLaleP7TKxCj47UFu7m 5LPATYJO0wQ18NsuTfafvHJRoWX1cY9SyS8Fpjz5KqUYrQxy6lgEdu0YlQ5lRLKdY8lYAw M48VOGQJCzdBKpd2xMxgt/Mp2/yIErQ= 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-258-Gz8-vji6OOmroDNR4LqKBQ-1; Mon, 20 Jun 2022 05:48:18 -0400 X-MC-Unique: Gz8-vji6OOmroDNR4LqKBQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 81347185A79C; Mon, 20 Jun 2022 09:48:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78A9E400F3FF; Mon, 20 Jun 2022 09:48:17 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/ice: fix build with GCC 12' has been queued to stable release 21.11.2 Date: Mon, 20 Jun 2022 10:47:48 +0100 Message-Id: <20220620094752.1027299-15-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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-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 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/23/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/ec6a2fa05c425c42071d164c82d46d0f62ff2e1c Thanks. Kevin --- >From ec6a2fa05c425c42071d164c82d46d0f62ff2e1c Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 18 May 2022 12:16:51 +0200 Subject: [PATCH] net/ice: fix build with GCC 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 20d6a017e148cc1944d85d4c80a0151a5b4c6436 ] GCC 12 raises the following warning: In file included from ../lib/mempool/rte_mempool.h:46, from ../lib/mbuf/rte_mbuf.h:38, from ../lib/net/rte_ether.h:22, from ../lib/ethdev/rte_ethdev.h:172, from ../lib/ethdev/ethdev_driver.h:22, from ../lib/ethdev/ethdev_pci.h:17, from ../drivers/net/ice/ice_ethdev.c:6: ../drivers/net/ice/ice_ethdev.c: In function ‘ice_dev_configure’: ../lib/eal/x86/include/rte_memcpy.h:370:9: warning: array subscript 64 is outside array bounds of ‘struct ice_aqc_get_set_rss_keys[1]’ [-Warray-bounds] 370 | rte_mov32((uint8_t *)dst + 2 * 32, (const uint8_t *)src + 2 * 32); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/net/ice/ice_ethdev.c:3202:41: note: while referencing ‘key’ 3202 | struct ice_aqc_get_set_rss_keys key; | ^~~ Restrict copy to minimum size. Bugzilla ID: 850 Signed-off-by: David Marchand Acked-by: Stephen Hemminger --- drivers/net/ice/ice_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index ab3976a319..7df1b4ec19 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3236,5 +3236,6 @@ static int ice_init_rss(struct ice_pf *pf) vsi->rss_key_size)); - rte_memcpy(key.standard_rss_key, vsi->rss_key, vsi->rss_key_size); + rte_memcpy(key.standard_rss_key, vsi->rss_key, + RTE_MIN(sizeof(key.standard_rss_key), vsi->rss_key_size)); ret = ice_aq_set_rss_key(hw, vsi->idx, &key); if (ret) -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-20 10:46:28.106624872 +0100 +++ 0015-net-ice-fix-build-with-GCC-12.patch 2022-06-20 10:46:27.794146852 +0100 @@ -1 +1 @@ -From 20d6a017e148cc1944d85d4c80a0151a5b4c6436 Mon Sep 17 00:00:00 2001 +From ec6a2fa05c425c42071d164c82d46d0f62ff2e1c Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 20d6a017e148cc1944d85d4c80a0151a5b4c6436 ] + @@ -31 +32,0 @@ -Cc: stable@dpdk.org @@ -40 +41 @@ -index 35ab542e61..4c658ce3dc 100644 +index ab3976a319..7df1b4ec19 100644 @@ -43 +44 @@ -@@ -3283,5 +3283,6 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -3236,5 +3236,6 @@ static int ice_init_rss(struct ice_pf *pf)