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 43A5943CAD for ; Thu, 14 Mar 2024 01:11:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 370BC42E40; Thu, 14 Mar 2024 01:11:27 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id DA9264021E for ; Thu, 14 Mar 2024 01:11:23 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-33e99915809so324308f8f.3 for ; Wed, 13 Mar 2024 17:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375083; x=1710979883; darn=dpdk.org; 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=hnuHCH5QJZk7+6fKyfFCi8dbnQiXvq5Rt3Rfemlg+cU=; b=Z7qqTfb5iJHTifEOQd/waGlv8RltD9TeHvLNddMgLCa0ryCxjGrVUOutS0+jplHDve Xk1JHGJG+ifSG5VUjQGnonp11kLUMBpona5XLN3EakQUTG+QrJPa+bq0M/me3rlT+5e1 G5a/i3u1BFTQ1oDfdl641lkvVUboKcmZMWbPNQtclGKQ1lwxfTNCfSgyflMK6LEUnGGn okqepw9waRiH0NM3y80CTQpY9P0x8M1hdIjCA6jWifClt2GejU+NRH+cWCDM3hT45p6o YGD6lxZDEI/ALWsuQ7GEl7luBdkRFbB54aFjBlyKT78oMh04sLXqyDQcBn/dtiYb8Jw0 ZX5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375083; x=1710979883; 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=hnuHCH5QJZk7+6fKyfFCi8dbnQiXvq5Rt3Rfemlg+cU=; b=ibfIAaMO0jFvdTIuI9J5qGr24rSy0VJXjy/GzT6IzeSItNjZJ0316cjovraPjVOoFa gYJGU6L1RXffVIhMNE+W8fNhIkdaarxX8UaD6SFKDS3iSPm+Ty5L3bOrvI5fS1yv1UrQ h52OImzeLfif0ygliZk/rXE4xzVgaLU0kSkJR21CUKk+j7s8RBiFI/f7pybjl0iLy6Ov k3Ajz+a3GVnCtVqF8j/W30kXVUiEHf6WMpP01eX2Y3indbb7pyWkDyrQ+Ovcqb3vwBXn VR5nxGbh8odCg1MvG5XTkgE8/GQoxIH+mn8uv92zCxGhFckzLAbnEPG07HG7MEmxoCUO osHA== X-Forwarded-Encrypted: i=1; AJvYcCWjXbCbqmtKaH+D30mx9ERfVMpVdLblyEE0mnRdy5J3aAwZBArvxjRnCzZk/id8xCqMa8ZeX2EhTpRGQKENm2A= X-Gm-Message-State: AOJu0YwDU29RmWjFWrgp0/VwfScbkF6GriFTKDOuSSkdfToAmVRmuK4x l/X5+0RLiz1QuWcBk+I+QERMuV0TjBzmOiW0bxQZUyorpqF1Zdo2H+YFlu39 X-Google-Smtp-Source: AGHT+IFVzltGte9K5zZDuV1OCSUaW4EwTBY2tJKMAXUuzOYvxvzpnFz71vdkNWI4kO3Q1jnx63sODQ== X-Received: by 2002:adf:9b84:0:b0:33e:1f4e:b7b0 with SMTP id d4-20020adf9b84000000b0033e1f4eb7b0mr85507wrc.61.1710375083496; Wed, 13 Mar 2024 17:11:23 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id i4-20020a5d55c4000000b0033e17341ebesm277154wrw.117.2024.03.13.17.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:22 -0700 (PDT) From: luca.boccassi@gmail.com To: =?UTF-8?q?Morten=20Br=C3=B8rup?= Cc: Devendra Singh Rawat , dpdk stable Subject: patch 'net/bnx2x: fix warnings about memcpy lengths' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:22 +0000 Message-Id: <20240314000957.2810803-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-1-luca.boccassi@gmail.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 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/16/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/fdc5c7c46a3d7d606a45b343b893b694d0423dc7 Thanks. Luca Boccassi --- >From fdc5c7c46a3d7d606a45b343b893b694d0423dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Br=C3=B8rup?= Date: Fri, 23 Feb 2024 15:00:56 +0100 Subject: [PATCH] net/bnx2x: fix warnings about memcpy lengths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit c50b86f7d60f757ea62fe14076be69bf114f1740 ] The vlan in the bulletin does not contain a VLAN header, only the VLAN ID, so only copy 2 byte, not 4. The target structure has padding after the field, so copying 2 byte too many is effectively harmless. Fix it by using generic memcpy version instead of specialized rte version as it not used in fast path. Also, Use RTE_PTR_ADD where copying arrays to the offset of a first field in a structure holding multiple fields, to avoid compiler warnings with decorated memcpy. Bugzilla ID: 1146 Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Morten Brørup Acked-by: Devendra Singh Rawat --- drivers/net/bnx2x/bnx2x_stats.c | 14 ++++++++------ drivers/net/bnx2x/bnx2x_vfpf.c | 14 +++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/bnx2x/bnx2x_stats.c index c07b01510a..69132c7c80 100644 --- a/drivers/net/bnx2x/bnx2x_stats.c +++ b/drivers/net/bnx2x/bnx2x_stats.c @@ -114,7 +114,7 @@ bnx2x_hw_stats_post(struct bnx2x_softc *sc) /* Update MCP's statistics if possible */ if (sc->func_stx) { - rte_memcpy(BNX2X_SP(sc, func_stats), &sc->func_stats, + memcpy(BNX2X_SP(sc, func_stats), &sc->func_stats, sizeof(sc->func_stats)); } @@ -817,10 +817,10 @@ bnx2x_hw_stats_update(struct bnx2x_softc *sc) etherstatspktsover1522octets); } - rte_memcpy(old, new, sizeof(struct nig_stats)); + memcpy(old, new, sizeof(struct nig_stats)); - rte_memcpy(&(estats->rx_stat_ifhcinbadoctets_hi), &(pstats->mac_stx[1]), - sizeof(struct mac_stx)); + memcpy(RTE_PTR_ADD(estats, offsetof(struct bnx2x_eth_stats, rx_stat_ifhcinbadoctets_hi)), + &pstats->mac_stx[1], sizeof(struct mac_stx)); estats->brb_drop_hi = pstats->brb_drop_hi; estats->brb_drop_lo = pstats->brb_drop_lo; @@ -1492,9 +1492,11 @@ bnx2x_stats_init(struct bnx2x_softc *sc) REG_RD(sc, NIG_REG_STAT0_BRB_TRUNCATE + port*0x38); if (!CHIP_IS_E3(sc)) { REG_RD_DMAE(sc, NIG_REG_STAT0_EGRESS_MAC_PKT0 + port*0x50, - &(sc->port.old_nig_stats.egress_mac_pkt0_lo), 2); + RTE_PTR_ADD(&sc->port.old_nig_stats, + offsetof(struct nig_stats, egress_mac_pkt0_lo)), 2); REG_RD_DMAE(sc, NIG_REG_STAT0_EGRESS_MAC_PKT1 + port*0x50, - &(sc->port.old_nig_stats.egress_mac_pkt1_lo), 2); + RTE_PTR_ADD(&sc->port.old_nig_stats, + offsetof(struct nig_stats, egress_mac_pkt1_lo)), 2); } /* function stats */ diff --git a/drivers/net/bnx2x/bnx2x_vfpf.c b/drivers/net/bnx2x/bnx2x_vfpf.c index 63953c2979..5411df3a38 100644 --- a/drivers/net/bnx2x/bnx2x_vfpf.c +++ b/drivers/net/bnx2x/bnx2x_vfpf.c @@ -52,9 +52,9 @@ bnx2x_check_bull(struct bnx2x_softc *sc) /* check the mac address and VLAN and allocate memory if valid */ if (valid_bitmap & (1 << MAC_ADDR_VALID) && memcmp(bull->mac, sc->old_bulletin.mac, ETH_ALEN)) - rte_memcpy(&sc->link_params.mac_addr, bull->mac, ETH_ALEN); + memcpy(&sc->link_params.mac_addr, bull->mac, ETH_ALEN); if (valid_bitmap & (1 << VLAN_VALID)) - rte_memcpy(&bull->vlan, &sc->old_bulletin.vlan, RTE_VLAN_HLEN); + memcpy(&bull->vlan, &sc->old_bulletin.vlan, sizeof(bull->vlan)); sc->old_bulletin = *bull; @@ -569,7 +569,7 @@ bnx2x_vf_set_mac(struct bnx2x_softc *sc, int set) bnx2x_check_bull(sc); - rte_memcpy(query->filters[0].mac, sc->link_params.mac_addr, ETH_ALEN); + memcpy(query->filters[0].mac, sc->link_params.mac_addr, ETH_ALEN); bnx2x_add_tlv(sc, query, query->first_tlv.tl.length, BNX2X_VF_TLV_LIST_END, @@ -583,9 +583,9 @@ bnx2x_vf_set_mac(struct bnx2x_softc *sc, int set) while (BNX2X_VF_STATUS_FAILURE == reply->status && bnx2x_check_bull(sc)) { /* A new mac was configured by PF for us */ - rte_memcpy(sc->link_params.mac_addr, sc->pf2vf_bulletin->mac, + memcpy(sc->link_params.mac_addr, sc->pf2vf_bulletin->mac, ETH_ALEN); - rte_memcpy(query->filters[0].mac, sc->pf2vf_bulletin->mac, + memcpy(query->filters[0].mac, sc->pf2vf_bulletin->mac, ETH_ALEN); rc = bnx2x_do_req4pf(sc, sc->vf2pf_mbox_mapping.paddr); @@ -622,10 +622,10 @@ bnx2x_vf_config_rss(struct bnx2x_softc *sc, BNX2X_VF_TLV_LIST_END, sizeof(struct channel_list_end_tlv)); - rte_memcpy(query->rss_key, params->rss_key, sizeof(params->rss_key)); + memcpy(query->rss_key, params->rss_key, sizeof(params->rss_key)); query->rss_key_size = T_ETH_RSS_KEY; - rte_memcpy(query->ind_table, params->ind_table, T_ETH_INDIRECTION_TABLE_SIZE); + memcpy(query->ind_table, params->ind_table, T_ETH_INDIRECTION_TABLE_SIZE); query->ind_table_size = T_ETH_INDIRECTION_TABLE_SIZE; query->rss_result_mask = params->rss_result_mask; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:21.934568781 +0000 +++ 0026-net-bnx2x-fix-warnings-about-memcpy-lengths.patch 2024-03-14 00:09:20.605615062 +0000 @@ -1 +1 @@ -From c50b86f7d60f757ea62fe14076be69bf114f1740 Mon Sep 17 00:00:00 2001 +From fdc5c7c46a3d7d606a45b343b893b694d0423dc7 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit c50b86f7d60f757ea62fe14076be69bf114f1740 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org