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 F2E21A0540 for ; Thu, 7 Jul 2022 09:58:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE4AF40A7B; Thu, 7 Jul 2022 09:58:07 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 7E5F440A7B for ; Thu, 7 Jul 2022 09:58:07 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 83769402B9 for ; Thu, 7 Jul 2022 07:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180685; bh=3yl9TPVBhL9TOQUusiMKf5fYjEervN4wIHklB4E+uOA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=rnFzp2xn4a4wc2uz4ACUcnO8erCZektUcdXfUSMkV+3cuJrStHKXF15X+cX5WoFwz ois5UhrbTj+3bE7gq3Jol8MbTy0Vx5YpngnK4/GL0faK1aLCMrvMpJdsrhfCXPZy2f G1mlQWQsuvZcdhfhpfH7VBE7CFkBpp4u4saeWYI+b8yPY5cukoNAbzL3gjRDbeQxKA K1IX7mZFhOX27krXiK8h1dmKEWEnxM9Di+tmnuU8e9+cOi6u+507e4kVkdBw2nuRm2 4T33BJVeP75cB8jY+UMKoiEu5VxW3lCKsKgJEq8fzKVI4fU2PPSuJBIjcZNmDipIas QFXSXFihKj77Q== Received: by mail-ej1-f70.google.com with SMTP id sh39-20020a1709076ea700b0072aa3156a68so3252562ejc.19 for ; Thu, 07 Jul 2022 00:58:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3yl9TPVBhL9TOQUusiMKf5fYjEervN4wIHklB4E+uOA=; b=xP28fwZSOYgrht0zfpXOxg/xwWt0iso9RL2M+d6m9uQWPOGZ++Wub7a5PgXWeH9qq4 0bHzB7Fx879OVlAYEkXZNWwAbuGLpOlb7sAihz1Ga6m7lhRMMFiKU0UYcmsF1xxB45Ng 29bA6q1U08gNVPJ3g2oxZYl+9xnHeuaolRcPdptPorgd5dM3itsS3F8WxeHk+qpYUPOK JN5UXuoDAqNhVOQZfvuzrDnywE/7K5UYVaqQDn9z8iOwHAzbR+GY6J/gAmdh7GJd99qX yMRZFXoUcRPizQegPIEvVIqlcPJQIQ7AQrU4qWyu9km/FRD4Qf9whyEebLEhEBtIXRj9 KWug== X-Gm-Message-State: AJIora+9LiYbvEk9WNzcI1+NeTAF/uIcXOwLlW0ajxWoHIZrg9PEa01j dzxqm0aYBU65Pj+2vPAaA8ZaVU5XN2Zle1Sb1bejr3K/YHUsKvyWodjlh+dQc+iEXNK9qP682HW gnXcg8J0GQNu5RwtpQ+ZLxYq0 X-Received: by 2002:a17:907:7395:b0:72a:e292:c5c5 with SMTP id er21-20020a170907739500b0072ae292c5c5mr12516159ejc.735.1657180684533; Thu, 07 Jul 2022 00:58:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ubUxqGhBAqX0UZjJgFpMNyaT/EYh9e8jWPSgPk7Qf9/d8VUsqTkzKUt7lEAALx/hN/LF5gbw== X-Received: by 2002:a17:907:7395:b0:72a:e292:c5c5 with SMTP id er21-20020a170907739500b0072ae292c5c5mr12516145ejc.735.1657180684307; Thu, 07 Jul 2022 00:58:04 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id q21-20020aa7cc15000000b0042617ba638esm27392052edt.24.2022.07.07.00.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:03 -0700 (PDT) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/ice: fix build with GCC 12' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:48 +0200 Message-Id: <20220707075522.194223-53-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/b4c2dfe34bff5c973d38a96c18199ac549313b65 Thanks. Christian Ehrhardt --- >From b4c2dfe34bff5c973d38a96c18199ac549313b65 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 f665a89f9c..5d40f359b9 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2544,7 +2544,8 @@ static int ice_init_rss(struct ice_pf *pf) RTE_MIN(rss_conf->rss_key_len, 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) goto out; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.409094988 +0200 +++ 0053-net-ice-fix-build-with-GCC-12.patch 2022-07-07 09:54:10.945824494 +0200 @@ -1 +1 @@ -From 20d6a017e148cc1944d85d4c80a0151a5b4c6436 Mon Sep 17 00:00:00 2001 +From b4c2dfe34bff5c973d38a96c18199ac549313b65 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 f665a89f9c..5d40f359b9 100644 @@ -43 +44 @@ -@@ -3282,7 +3282,8 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -2544,7 +2544,8 @@ static int ice_init_rss(struct ice_pf *pf)