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 627B443E57 for ; Sat, 13 Apr 2024 14:53:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59F984068E; Sat, 13 Apr 2024 14:53:07 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2085.outbound.protection.outlook.com [40.107.236.85]) by mails.dpdk.org (Postfix) with ESMTP id 76C74400D6 for ; Sat, 13 Apr 2024 14:53:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WNvJEjflxp2zxyu3HGpkbCcsvuhQKb2rWGbJK0tIoCUVTGtmFa8s5LR27ltjeaF93yz7209cmPJ1wRTjpyEEEdONxRHkZyU9XlVpQY3/HulTgV1QymEH1FlqDUyr9NrS0PqbgpR3+Tbwa9YomGTNdsRFheOabobfYI3GZJEJ9StqZenIaR1zrSuxA6epa1UPZiclRVyHS66gLAwFRfQ+RZ6E27ExXb4BHgIJAqL8wY0jPG2r/Q02/32KmonOcVHxOd33A5A1J3/928SlhdSPj3YS+YADqT3S3Y3Z9t1ZrdPnoHO50HtKfHraBriJTpf4ufM0jarH/dqWM49kcn6dxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=M0MzGZmO7JYphH7wDRpOGZcdX2PF076qSXJl5vmVlhA=; b=GOz8Pt+jy+d92JOCk+1t5ibSuiT32lxwm3Gb8XT/0vadfSnklrKdMb7A8geZ2SXJwhIrrxkDVnNgrWqjtYA8HvBsXaEkmOvJQOTuwLONA3Ox4Zd3gWryz7/rWx2+QHFgEB0ARY8C0+4rY6Ct4jeoV17zV+bMDD/ETMwm6N6HD5XwczbWRqfe4G4Bfhxdi4id2CczgSno6PFtDskpJ6csQfnReVme+aYjomTicaHA44Rcpg2xZMDx3tar5145duoFsEzUfLDQVEQugZOQWxN8GtBMDjK2BYm90yPfG7nNNpbrMfypaFH6fNkGrO6Qt5SMMYd3ZVYY9+Ij5f9vcGcpUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=smartsharesystems.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M0MzGZmO7JYphH7wDRpOGZcdX2PF076qSXJl5vmVlhA=; b=oQOAcwVvwrqWc0cLHUJRDCntb+t+YZqgWIz+EX0IsednjnqpfcCP0CJhwI2vKrhn5sXCMMrB5rDm/5kmX2EOT91Wn31OpPQEVYXPxR+g04ho0EopQnxb9K2kJ6mTxnB2StB+QFNB/9/3EdN8hLOa5m49HMbSVmFbbda+jsgzfdeIdezjQIj5ixlllWdlEQeMwAs/TH4F7tIodoLVUGhWbpbrrmppbPBsscuLYMqsV1fGRAvUWo0hPCvxrFOs7N3wiSfnfgFmAOAi5xhhVEbiNE1jqss8PquU6E3/7KHrG2oEWJUm5M3O5uVBUeJAjj31aTQFxMaaigA7eZ8lCXGpgw== Received: from SJ2PR07CA0001.namprd07.prod.outlook.com (2603:10b6:a03:505::11) by SA0PR12MB4430.namprd12.prod.outlook.com (2603:10b6:806:70::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:53:02 +0000 Received: from SJ1PEPF00001CE2.namprd05.prod.outlook.com (2603:10b6:a03:505:cafe::91) by SJ2PR07CA0001.outlook.office365.com (2603:10b6:a03:505::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.30 via Frontend Transport; Sat, 13 Apr 2024 12:53:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00001CE2.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:53:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:52:46 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Sat, 13 Apr 2024 05:52:44 -0700 From: Xueming Li 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 23.11.1 Date: Sat, 13 Apr 2024 20:48:30 +0800 Message-ID: <20240413125005.725659-30-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE2:EE_|SA0PR12MB4430:EE_ X-MS-Office365-Filtering-Correlation-Id: a5d45b13-7da4-4a74-de81-08dc5bb8a725 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EnYPZTv3f/WsEy5+EivB0qmYgHRK0EvmG2Kzj3RzG14XCmUPb0OJ/52r7EAoEDNnPWLGoh6VFqAh+JNfgAiVvLN+sauRjlmkCIs/g732U77OdPKGlMnxKfy/DU6z/7aVUvqhSKM/jL2Kf34YeI48XPlHgndJ0dCmmTvwhnSnS7Xl3GJyHD0WkqruYjUdDAJd5TjBQBHt86oa75wJSKZPk+TO3kubTwDG/P+a1OAgVdP8KMtRoB4x3zLKINUZm2HWVuvBoN3aj1KGJZ/6KgPEG2mz2HbSmm9S3woa9/PLHWCdr0cfKo9bmPAKVLa4F3PcKZM0RRR9UrWCgLDYkk0TgGNd51FtP7l9rmLKZ2d6WSE3R03DKkbijczutbh9FHAlCfgNikUMoWMrdcXGdYJbncTOmjByIhSzSn0E1LPgEMJw/LXPekhDG3t1Cv331sTvv/DdpJ7MA2gYrZEZt38319T+zCnnQ1I2St4OCNwkEjNvKPsKG/nINwtPgbQj7ETSpvFKo3iQ9kjTb1G4joW0zAh+G/CCN0e5Qv2iRk4rHi5mdnGa2WT3zicELi72PjJCDxaaYqER7WKAa2GPW6DaBBX8d4KHMSNiArnd7WWsx5goLP+P8H5oHe4VHzdZfInhNl6XtIwe14dgGOJ+sM38lv8/YvthzspJTU8lTxvz0ydXinuaX2mCckhfVfnhqzNBEbx3EtLCPQr9gJGf8Zqd2yHu8byY6j8nqfB/F50sp0TtXZG8+VU9+17blKqiHHob X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(82310400014)(376005)(1800799015)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:53:01.5842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5d45b13-7da4-4a74-de81-08dc5bb8a725 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CE2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4430 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=b3ef799286fdab7c12d8b0a7f77a61aa45500f06 Thanks. Xueming Li --- >From b3ef799286fdab7c12d8b0a7f77a61aa45500f06 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 Cc: Xueming Li [ 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.035532376 +0800 +++ 0030-net-bnx2x-fix-warnings-about-memcpy-lengths.patch 2024-04-13 20:43:04.947753997 +0800 @@ -1 +1 @@ -From c50b86f7d60f757ea62fe14076be69bf114f1740 Mon Sep 17 00:00:00 2001 +From b3ef799286fdab7c12d8b0a7f77a61aa45500f06 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit c50b86f7d60f757ea62fe14076be69bf114f1740 ] @@ -21 +23,0 @@ -Cc: stable@dpdk.org