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 87D12A0540 for ; Thu, 7 Jul 2022 09:59:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 83294427F0; Thu, 7 Jul 2022 09:59:06 +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 3F34740A7B for ; Thu, 7 Jul 2022 09:59:05 +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 12A3E40AB0 for ; Thu, 7 Jul 2022 07:59:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180745; bh=wpO+naaxdIEoMVBdTX6M0ik5ClfDBQC3XpaSiUZ48hQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fyq0mFilgIUuadfzvZdJDDC1m36wC8mMYp1NTHTAfLeMtBYuH6PN1Fkk7XYbxiILv nDi63aJ13gA3V1sm9au4AaWqvEMRu/UKQwTp+7n7PRjqjC9N//fK4caM/c2u2TgyG9 71bPlN7cLzH62TYOIccNSQMOpajOd0kyBxUkfdz0xwnkfUpzgtrgJUtlRfhBBm3IxH EZx+2vcU7mUKpfASQbBTYLfJYdzxa8DuByjANDLtwslpONcUqX2RpbgrYqp5L/c/va 9vzPD8f/HhmuHNMmM2x+y1O3M/oM0bOjcfuPgWuZCeVtBUwNn4jf7bG3l+l1ZEsVAh t/hGRpKDBoX/g== Received: by mail-ej1-f70.google.com with SMTP id sb34-20020a1709076da200b00722f4a9865bso4424299ejc.1 for ; Thu, 07 Jul 2022 00:59:05 -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=wpO+naaxdIEoMVBdTX6M0ik5ClfDBQC3XpaSiUZ48hQ=; b=mqvxapmyHreEpt7BsIezbm+avQwwqyxEfWsoRGPdF+s4ruODN0QzUfErNkVLYqqLZQ 5irKC1sUhbdtTX1d781o+az2ttogC4QOGqkGr3AG+c28jRsJYOlato8TkbMusbRPYY+K YUUCIUo7VJHN9Cy3zuTSUPRTrK1/d+e/Qu4yHqRzxABv0xy8dGskB62VGP9MUB/rv648 tgwS/g7wNqInWWHuddGqx1pMZTQcD1LpfQZThhf40QCJumw/Jrvb6AgGPCkdWXdB/U50 tcAWrwmjBbAGCviai5Hf4E1dORwdF+ESL6U/Pb9mwrAvjI3t7p93YlooEUcXK1CFOWbs Npcg== X-Gm-Message-State: AJIora9P5dqyce5uO6tbUSyRSHLv4a0O7z+7CotOoY2nG4HcJ0E0LHqS HsD4RKzYSB3yItjXraTZLQiY88WbSU0Ha8687jyXqnDSR+T50xyA2CXXrssxWgetT0//Jw8A78Q Wbng76sou+EbQlyZjErc96X2Q X-Received: by 2002:a17:907:2d22:b0:726:34e6:52f6 with SMTP id gs34-20020a1709072d2200b0072634e652f6mr41378972ejc.371.1657180743803; Thu, 07 Jul 2022 00:59:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tCCpOWil+gRNSmhlkDXOXAYhLRoCWwED4eGTyDMrLJ/PU80lomPrBOcMGKJVoFSjpDqPwmOw== X-Received: by 2002:a17:907:2d22:b0:726:34e6:52f6 with SMTP id gs34-20020a1709072d2200b0072634e652f6mr41378958ejc.371.1657180743514; Thu, 07 Jul 2022 00:59:03 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id o13-20020a170906768d00b0072af6d20a9asm2217681ejm.75.2022.07.07.00.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:59:03 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/qede: fix build with GCC 12' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:55:06 +0200 Message-Id: <20220707075522.194223-71-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-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/ca638163716cacc167987ecd47eb0fbbdd46f092 Thanks. Christian Ehrhardt --- >From ca638163716cacc167987ecd47eb0fbbdd46f092 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 7 Jun 2022 10:17:40 -0700 Subject: [PATCH] net/qede: fix build with GCC 12 [ upstream commit 4200c4d62586985d70ad69ed7bee526a282b8777 ] The x86 version of rte_memcpy can cause warnings. The driver does not need to use rte_memcpy for everything. Standard memcpy is just as fast and safer; the compiler and static analysis tools treat memcpy specially. Signed-off-by: Stephen Hemminger --- drivers/net/qede/base/bcm_osal.h | 3 +-- drivers/net/qede/qede_ethdev.c | 2 +- drivers/net/qede/qede_filter.c | 16 ++++++---------- drivers/net/qede/qede_main.c | 13 ++++++------- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h index d9f507f233..1e4fe2db02 100644 --- a/drivers/net/qede/base/bcm_osal.h +++ b/drivers/net/qede/base/bcm_osal.h @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -98,7 +97,7 @@ typedef int bool; } while (0) #define OSAL_VFREE(dev, memory) OSAL_FREE(dev, memory) #define OSAL_MEM_ZERO(mem, size) bzero(mem, size) -#define OSAL_MEMCPY(dst, src, size) rte_memcpy(dst, src, size) +#define OSAL_MEMCPY(dst, src, size) memcpy(dst, src, size) #define OSAL_MEMCMP(s1, s2, size) memcmp(s1, s2, size) #define OSAL_MEMSET(dst, val, length) \ memset(dst, val, length) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index 0be9c5a211..0c50c61d97 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -270,7 +270,7 @@ qede_interrupt_handler(void *param) static void qede_alloc_etherdev(struct qede_dev *qdev, struct qed_dev_eth_info *info) { - rte_memcpy(&qdev->dev_info, info, sizeof(*info)); + qdev->dev_info = *info; qdev->ops = qed_ops; } diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c index b7ad59ad6d..0d50d38d52 100644 --- a/drivers/net/qede/qede_filter.c +++ b/drivers/net/qede/qede_filter.c @@ -519,10 +519,8 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev, ip6->vtc_flow = rte_cpu_to_be_32(QEDE_FDIR_IPV6_DEFAULT_VTC_FLOW); - rte_memcpy(&ip6->src_addr, arfs->tuple.src_ipv6, - IPV6_ADDR_LEN); - rte_memcpy(&ip6->dst_addr, arfs->tuple.dst_ipv6, - IPV6_ADDR_LEN); + memcpy(&ip6->src_addr, arfs->tuple.src_ipv6, IPV6_ADDR_LEN); + memcpy(&ip6->dst_addr, arfs->tuple.dst_ipv6, IPV6_ADDR_LEN); len += sizeof(struct rte_ipv6_hdr); params->ipv6 = true; @@ -1285,12 +1283,10 @@ qede_flow_parse_pattern(__attribute__((unused))struct rte_eth_dev *dev, const struct rte_flow_item_ipv6 *spec; spec = pattern->spec; - rte_memcpy(flow->entry.tuple.src_ipv6, - spec->hdr.src_addr, - IPV6_ADDR_LEN); - rte_memcpy(flow->entry.tuple.dst_ipv6, - spec->hdr.dst_addr, - IPV6_ADDR_LEN); + memcpy(flow->entry.tuple.src_ipv6, + spec->hdr.src_addr, IPV6_ADDR_LEN); + memcpy(flow->entry.tuple.dst_ipv6, + spec->hdr.dst_addr, IPV6_ADDR_LEN); flow->entry.tuple.eth_proto = RTE_ETHER_TYPE_IPV6; } diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c index 67392d6aa4..08677c8546 100644 --- a/drivers/net/qede/qede_main.c +++ b/drivers/net/qede/qede_main.c @@ -372,7 +372,7 @@ qed_fill_dev_info(struct ecore_dev *edev, struct qed_dev_info *dev_info) dev_info->mtu = ECORE_LEADING_HWFN(edev)->hw_info.mtu; dev_info->dev_type = edev->type; - rte_memcpy(&dev_info->hw_mac, &edev->hwfns[0].hw_info.hw_mac_addr, + memcpy(&dev_info->hw_mac, &edev->hwfns[0].hw_info.hw_mac_addr, RTE_ETHER_ADDR_LEN); dev_info->fw_major = FW_MAJOR_VERSION; @@ -437,7 +437,7 @@ qed_fill_eth_dev_info(struct ecore_dev *edev, struct qed_dev_eth_info *info) info->num_vlan_filters = RESC_NUM(&edev->hwfns[0], ECORE_VLAN) - max_vf_vlan_filters; - rte_memcpy(&info->port_mac, &edev->hwfns[0].hw_info.hw_mac_addr, + memcpy(&info->port_mac, &edev->hwfns[0].hw_info.hw_mac_addr, RTE_ETHER_ADDR_LEN); } else { ecore_vf_get_num_rxqs(ECORE_LEADING_HWFN(edev), @@ -468,7 +468,7 @@ static void qed_set_name(struct ecore_dev *edev, char name[NAME_SIZE]) { int i; - rte_memcpy(edev->name, name, NAME_SIZE); + memcpy(edev->name, name, NAME_SIZE); for_each_hwfn(edev, i) { snprintf(edev->hwfns[i].name, NAME_SIZE, "%s-%d", name, i); } @@ -510,10 +510,9 @@ static void qed_fill_link(struct ecore_hwfn *hwfn, /* Prepare source inputs */ if (IS_PF(hwfn->p_dev)) { - rte_memcpy(¶ms, ecore_mcp_get_link_params(hwfn), - sizeof(params)); - rte_memcpy(&link, ecore_mcp_get_link_state(hwfn), sizeof(link)); - rte_memcpy(&link_caps, ecore_mcp_get_link_capabilities(hwfn), + memcpy(¶ms, ecore_mcp_get_link_params(hwfn), sizeof(params)); + memcpy(&link, ecore_mcp_get_link_state(hwfn), sizeof(link)); + memcpy(&link_caps, ecore_mcp_get_link_capabilities(hwfn), sizeof(link_caps)); } else { ecore_vf_read_bulletin(hwfn, &change); -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:14.091244398 +0200 +++ 0071-net-qede-fix-build-with-GCC-12.patch 2022-07-07 09:54:10.989824765 +0200 @@ -1 +1 @@ -From 4200c4d62586985d70ad69ed7bee526a282b8777 Mon Sep 17 00:00:00 2001 +From ca638163716cacc167987ecd47eb0fbbdd46f092 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4200c4d62586985d70ad69ed7bee526a282b8777 ] + @@ -11,2 +12,0 @@ -Cc: stable@dpdk.org - @@ -19,2 +19 @@ - drivers/net/qede/qede_sriov.c | 6 +++--- - 5 files changed, 17 insertions(+), 23 deletions(-) + 4 files changed, 14 insertions(+), 20 deletions(-) @@ -23 +22 @@ -index c5b5399282..9ea579bfc8 100644 +index d9f507f233..1e4fe2db02 100644 @@ -26 +25 @@ -@@ -14,7 +14,6 @@ +@@ -11,7 +11,6 @@ @@ -34 +33 @@ -@@ -99,7 +98,7 @@ typedef intptr_t osal_int_ptr_t; +@@ -98,7 +97,7 @@ typedef int bool; @@ -44 +43 @@ -index ea6b71f093..a4923670d6 100644 +index 0be9c5a211..0c50c61d97 100644 @@ -47 +46 @@ -@@ -358,7 +358,7 @@ qede_assign_rxtx_handlers(struct rte_eth_dev *dev, bool is_dummy) +@@ -270,7 +270,7 @@ qede_interrupt_handler(void *param) @@ -57 +56 @@ -index 440440423a..ca3165d972 100644 +index b7ad59ad6d..0d50d38d52 100644 @@ -60 +59 @@ -@@ -388,10 +388,8 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev, +@@ -519,10 +519,8 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev, @@ -73 +72 @@ -@@ -821,12 +819,10 @@ qede_flow_parse_pattern(__rte_unused struct rte_eth_dev *dev, +@@ -1285,12 +1283,10 @@ qede_flow_parse_pattern(__attribute__((unused))struct rte_eth_dev *dev, @@ -91 +90 @@ -index ad101194d6..03039038ad 100644 +index 67392d6aa4..08677c8546 100644 @@ -103 +102 @@ -@@ -440,7 +440,7 @@ qed_fill_eth_dev_info(struct ecore_dev *edev, struct qed_dev_eth_info *info) +@@ -437,7 +437,7 @@ qed_fill_eth_dev_info(struct ecore_dev *edev, struct qed_dev_eth_info *info) @@ -112 +111 @@ -@@ -471,7 +471,7 @@ static void qed_set_name(struct ecore_dev *edev, char name[NAME_SIZE]) +@@ -468,7 +468,7 @@ static void qed_set_name(struct ecore_dev *edev, char name[NAME_SIZE]) @@ -121 +120 @@ -@@ -513,10 +513,9 @@ static void qed_fill_link(struct ecore_hwfn *hwfn, +@@ -510,10 +510,9 @@ static void qed_fill_link(struct ecore_hwfn *hwfn, @@ -135,18 +133,0 @@ -diff --git a/drivers/net/qede/qede_sriov.c b/drivers/net/qede/qede_sriov.c -index 0b99a8d6fe..937d339fb8 100644 ---- a/drivers/net/qede/qede_sriov.c -+++ b/drivers/net/qede/qede_sriov.c -@@ -203,10 +203,10 @@ void qed_inform_vf_link_state(struct ecore_hwfn *hwfn) - if (!hwfn->pf_iov_info) - return; - -- rte_memcpy(¶ms, ecore_mcp_get_link_params(lead_hwfn), -+ memcpy(¶ms, ecore_mcp_get_link_params(lead_hwfn), - sizeof(params)); -- rte_memcpy(&link, ecore_mcp_get_link_state(lead_hwfn), sizeof(link)); -- rte_memcpy(&caps, ecore_mcp_get_link_capabilities(lead_hwfn), -+ memcpy(&link, ecore_mcp_get_link_state(lead_hwfn), sizeof(link)); -+ memcpy(&caps, ecore_mcp_get_link_capabilities(lead_hwfn), - sizeof(caps)); - - /* Update bulletin of all future possible VFs with link configuration */