From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1988A43DC8;
Tue, 2 Apr 2024 23:58:52 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id CF78440F35;
Tue, 2 Apr 2024 23:56:18 +0200 (CEST)
Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com
[209.85.214.176])
by mails.dpdk.org (Postfix) with ESMTP id 4017E40DCE
for <dev@dpdk.org>; Tue, 2 Apr 2024 23:56:03 +0200 (CEST)
Received: by mail-pl1-f176.google.com with SMTP id
d9443c01a7336-1e223025ccbso25047595ad.3
for <dev@dpdk.org>; Tue, 02 Apr 2024 14:56:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1712094962;
x=1712699762; 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=6vyZnwMQ85VNmiZ7SeoROosshHH4iQ1mXI8UQAr+eIc=;
b=IkOtgInE6RSBMr/6pUwO9k83XmQ/3CZdJmsKzRqg7euEg8wP90qXKHKtq8y2BmjcVS
hW4OizHSmNhQVkKbQ1BK57RNqc/nU7GA6jrLSwlF+KfgX93LCPpdV0HdhDc2k5wLQ3lY
S1XFU/DtbEKwUhvTBJ3xreTiCKuMfSBfnxWEpx9xShNvTzHWBDrICbrR+qKpQhKwGmyB
e5o6N32CX4Ec/vSWaXUEFtHl+Mb2Pn0wX4sGHT7el6/c7hs/7nDi7GPDGxTVQRehM3LV
xOo+DEeDyaKFgPTuWzpqASLJD2hcoRU+BTmWkVsRpBRS5OdENG51MN8PdGLyWzaXUSEr
bmww==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1712094962; x=1712699762;
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=6vyZnwMQ85VNmiZ7SeoROosshHH4iQ1mXI8UQAr+eIc=;
b=Ds5qLWFvg66E5BqlKZLJBoMMN1liN0nVwKWpGlqhdSQzFp9P1ZESB6P6tB+2fH4LxU
yoAS68j/nKMHFpI/3VEQdDAZwuGjytgGOf8cFR5cbyExbOFJw2lq0D1DN+vLBPMcMTEj
D90uHyRVUiZEnZn1618JuRtZL5uDEcIYVWqIUZfMcy96eCSkSjSmd2dC6SXpF/x5+hV9
haAxI9HHW9wRL+Fynrs5pcTJXmt5Pp5yCAAMgNyykADjeS1PL7tzERpvNP5YtbUFpNXT
9TFKjr4b4xuh+RsIRuqntT1vv2+rtPoWP5cLf1w2vvR4tTXp8JYJ5fQdoi3sNPFlagLO
RMEw==
X-Gm-Message-State: AOJu0YysS7Q/rOl24CLe6zlvm/ICz2wKgCx30OqcEpTWvWRxBvLSznQV
GHTwJh9kdM1NBixYdl488IPUCc2fNUyvxuI5LK5TXFOMr5F9Aif6iv6KAwWAc51D6g+X8elkPA7
zL0o=
X-Google-Smtp-Source: AGHT+IE4BPFR5J7q+ePK9EVUeOhCREzYPp7sg+oFrUt/+YWa238A1zyRUob67DSiaGBLOPK6RQ2f3A==
X-Received: by 2002:a17:903:2ac7:b0:1e2:893:1fa3 with SMTP id
lw7-20020a1709032ac700b001e208931fa3mr14632536plb.32.1712094962449;
Tue, 02 Apr 2024 14:56:02 -0700 (PDT)
Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])
by smtp.gmail.com with ESMTPSA id
x15-20020a170902820f00b001dddf29b6e8sm11609381pln.299.2024.04.02.14.56.01
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 02 Apr 2024 14:56:02 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Aman Singh <aman.deep.singh@intel.com>,
Yuying Zhang <yuying.zhang@intel.com>, Ori Kam <orika@nvidia.com>
Subject: [PATCH v3 24/30] app/test-pmd: replace use of fixed size rte_memcpy
Date: Tue, 2 Apr 2024 14:50:40 -0700
Message-ID: <20240402215502.278838-25-stephen@networkplumber.org>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240402215502.278838-1-stephen@networkplumber.org>
References: <20240229225936.483472-1-stephen@networkplumber.org>
<20240402215502.278838-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Automatically generated by devtools/cocci/rte_memcpy.cocci
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
app/test-pmd/cmdline.c | 48 ++++++++++++++++++-------------------
app/test-pmd/cmdline_flow.c | 24 +++++++++----------
app/test-pmd/config.c | 8 +++----
app/test-pmd/csumonly.c | 1 -
app/test-pmd/flowgen.c | 1 -
app/test-pmd/iofwd.c | 1 -
app/test-pmd/macfwd.c | 1 -
app/test-pmd/macswap.c | 1 -
app/test-pmd/noisy_vnf.c | 1 -
app/test-pmd/rxonly.c | 1 -
app/test-pmd/testpmd.c | 1 -
11 files changed, 40 insertions(+), 48 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b7759e38a8..5e0740348a 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -9534,7 +9534,7 @@ static void cmd_set_vxlan_parsed(void *parsed_result,
vxlan_encap_conf.select_ipv4 = 0;
else
return;
- rte_memcpy(vxlan_encap_conf.vni, &id.vni[1], 3);
+ memcpy(vxlan_encap_conf.vni, &id.vni[1], 3);
vxlan_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
vxlan_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
vxlan_encap_conf.ip_tos = res->tos;
@@ -9548,10 +9548,10 @@ static void cmd_set_vxlan_parsed(void *parsed_result,
}
if (vxlan_encap_conf.select_vlan)
vxlan_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
- rte_memcpy(vxlan_encap_conf.eth_src, res->eth_src.addr_bytes,
- RTE_ETHER_ADDR_LEN);
- rte_memcpy(vxlan_encap_conf.eth_dst, res->eth_dst.addr_bytes,
- RTE_ETHER_ADDR_LEN);
+ memcpy(vxlan_encap_conf.eth_src, res->eth_src.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
+ memcpy(vxlan_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
}
static cmdline_parse_inst_t cmd_set_vxlan = {
@@ -9729,7 +9729,7 @@ static void cmd_set_nvgre_parsed(void *parsed_result,
nvgre_encap_conf.select_ipv4 = 0;
else
return;
- rte_memcpy(nvgre_encap_conf.tni, &id.tni[1], 3);
+ memcpy(nvgre_encap_conf.tni, &id.tni[1], 3);
if (nvgre_encap_conf.select_ipv4) {
IPV4_ADDR_TO_UINT(res->ip_src, nvgre_encap_conf.ipv4_src);
IPV4_ADDR_TO_UINT(res->ip_dst, nvgre_encap_conf.ipv4_dst);
@@ -9739,10 +9739,10 @@ static void cmd_set_nvgre_parsed(void *parsed_result,
}
if (nvgre_encap_conf.select_vlan)
nvgre_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
- rte_memcpy(nvgre_encap_conf.eth_src, res->eth_src.addr_bytes,
- RTE_ETHER_ADDR_LEN);
- rte_memcpy(nvgre_encap_conf.eth_dst, res->eth_dst.addr_bytes,
- RTE_ETHER_ADDR_LEN);
+ memcpy(nvgre_encap_conf.eth_src, res->eth_src.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
+ memcpy(nvgre_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
}
static cmdline_parse_inst_t cmd_set_nvgre = {
@@ -9856,10 +9856,10 @@ static void cmd_set_l2_encap_parsed(void *parsed_result,
return;
if (l2_encap_conf.select_vlan)
l2_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
- rte_memcpy(l2_encap_conf.eth_src, res->eth_src.addr_bytes,
- RTE_ETHER_ADDR_LEN);
- rte_memcpy(l2_encap_conf.eth_dst, res->eth_dst.addr_bytes,
- RTE_ETHER_ADDR_LEN);
+ memcpy(l2_encap_conf.eth_src, res->eth_src.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
+ memcpy(l2_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
}
static cmdline_parse_inst_t cmd_set_l2_encap = {
@@ -10038,7 +10038,7 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
mplsogre_encap_conf.select_ipv4 = 0;
else
return;
- rte_memcpy(mplsogre_encap_conf.label, &id.label, 3);
+ memcpy(mplsogre_encap_conf.label, &id.label, 3);
if (mplsogre_encap_conf.select_ipv4) {
IPV4_ADDR_TO_UINT(res->ip_src, mplsogre_encap_conf.ipv4_src);
IPV4_ADDR_TO_UINT(res->ip_dst, mplsogre_encap_conf.ipv4_dst);
@@ -10048,10 +10048,10 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
}
if (mplsogre_encap_conf.select_vlan)
mplsogre_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
- rte_memcpy(mplsogre_encap_conf.eth_src, res->eth_src.addr_bytes,
- RTE_ETHER_ADDR_LEN);
- rte_memcpy(mplsogre_encap_conf.eth_dst, res->eth_dst.addr_bytes,
- RTE_ETHER_ADDR_LEN);
+ memcpy(mplsogre_encap_conf.eth_src, res->eth_src.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
+ memcpy(mplsogre_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
}
static cmdline_parse_inst_t cmd_set_mplsogre_encap = {
@@ -10274,7 +10274,7 @@ static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
mplsoudp_encap_conf.select_ipv4 = 0;
else
return;
- rte_memcpy(mplsoudp_encap_conf.label, &id.label, 3);
+ memcpy(mplsoudp_encap_conf.label, &id.label, 3);
mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
if (mplsoudp_encap_conf.select_ipv4) {
@@ -10286,10 +10286,10 @@ static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
}
if (mplsoudp_encap_conf.select_vlan)
mplsoudp_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
- rte_memcpy(mplsoudp_encap_conf.eth_src, res->eth_src.addr_bytes,
- RTE_ETHER_ADDR_LEN);
- rte_memcpy(mplsoudp_encap_conf.eth_dst, res->eth_dst.addr_bytes,
- RTE_ETHER_ADDR_LEN);
+ memcpy(mplsoudp_encap_conf.eth_src, res->eth_src.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
+ memcpy(mplsoudp_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+ RTE_ETHER_ADDR_LEN);
}
static cmdline_parse_inst_t cmd_set_mplsoudp_encap = {
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 60ee9337cf..95d9133ecb 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -13768,7 +13768,7 @@ cmd_set_raw_parsed_sample(const struct buffer *in)
fprintf(stderr, "Error - Not supported action\n");
return;
}
- rte_memcpy(data, action, sizeof(struct rte_flow_action));
+ memcpy(data, action, sizeof(struct rte_flow_action));
data++;
}
}
@@ -13929,8 +13929,8 @@ cmd_set_raw_parsed(const struct buffer *in)
/* We have to add GTP header extra word. */
*total_size += sizeof(ext_word);
- rte_memcpy(data_tail - (*total_size),
- &ext_word, sizeof(ext_word));
+ memcpy(data_tail - (*total_size), &ext_word,
+ sizeof(ext_word));
}
size = sizeof(struct rte_gtp_hdr);
break;
@@ -13975,21 +13975,21 @@ cmd_set_raw_parsed(const struct buffer *in)
if (opt->checksum_rsvd.checksum) {
*total_size +=
sizeof(opt->checksum_rsvd);
- rte_memcpy(data_tail - (*total_size),
- &opt->checksum_rsvd,
- sizeof(opt->checksum_rsvd));
+ memcpy(data_tail - (*total_size),
+ &opt->checksum_rsvd,
+ sizeof(opt->checksum_rsvd));
}
if (opt->key.key) {
*total_size += sizeof(opt->key.key);
- rte_memcpy(data_tail - (*total_size),
- &opt->key.key,
- sizeof(opt->key.key));
+ memcpy(data_tail - (*total_size),
+ &opt->key.key,
+ sizeof(opt->key.key));
}
if (opt->sequence.sequence) {
*total_size += sizeof(opt->sequence.sequence);
- rte_memcpy(data_tail - (*total_size),
- &opt->sequence.sequence,
- sizeof(opt->sequence.sequence));
+ memcpy(data_tail - (*total_size),
+ &opt->sequence.sequence,
+ sizeof(opt->sequence.sequence));
}
}
proto = 0x2F;
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index ba1007ace6..8b201f2104 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2639,8 +2639,8 @@ port_flow_template_table_create(portid_t port_id, uint32_t id,
}
pt->nb_pattern_templates = nb_pattern_templates;
pt->nb_actions_templates = nb_actions_templates;
- rte_memcpy(&pt->flow_attr, &table_attr->flow_attr,
- sizeof(struct rte_flow_attr));
+ memcpy(&pt->flow_attr, &table_attr->flow_attr,
+ sizeof(struct rte_flow_attr));
printf("Template table #%u created\n", pt->id);
return 0;
}
@@ -3259,8 +3259,8 @@ port_queue_action_handle_update(portid_t port_id,
update = action->conf;
break;
case RTE_FLOW_ACTION_TYPE_METER_MARK:
- rte_memcpy(&mtr_update.meter_mark, action->conf,
- sizeof(struct rte_flow_action_meter_mark));
+ memcpy(&mtr_update.meter_mark, action->conf,
+ sizeof(struct rte_flow_action_meter_mark));
if (mtr_update.meter_mark.profile)
mtr_update.profile_valid = 1;
if (mtr_update.meter_mark.policy)
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 6711dda42e..0db26902a1 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -19,7 +19,6 @@
#include <rte_debug.h>
#include <rte_cycles.h>
#include <rte_memory.h>
-#include <rte_memcpy.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index 53b5f24f11..d9454a4d22 100644
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -19,7 +19,6 @@
#include <rte_debug.h>
#include <rte_cycles.h>
#include <rte_memory.h>
-#include <rte_memcpy.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
diff --git a/app/test-pmd/iofwd.c b/app/test-pmd/iofwd.c
index ba06fae4a6..c9727d2856 100644
--- a/app/test-pmd/iofwd.c
+++ b/app/test-pmd/iofwd.c
@@ -24,7 +24,6 @@
#include <rte_per_lcore.h>
#include <rte_lcore.h>
#include <rte_branch_prediction.h>
-#include <rte_memcpy.h>
#include <rte_mempool.h>
#include <rte_mbuf.h>
#include <rte_interrupts.h>
diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c
index d19ace7395..ba63aedd79 100644
--- a/app/test-pmd/macfwd.c
+++ b/app/test-pmd/macfwd.c
@@ -19,7 +19,6 @@
#include <rte_debug.h>
#include <rte_cycles.h>
#include <rte_memory.h>
-#include <rte_memcpy.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
index 57f77003fe..e1f9be4901 100644
--- a/app/test-pmd/macswap.c
+++ b/app/test-pmd/macswap.c
@@ -19,7 +19,6 @@
#include <rte_debug.h>
#include <rte_cycles.h>
#include <rte_memory.h>
-#include <rte_memcpy.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
diff --git a/app/test-pmd/noisy_vnf.c b/app/test-pmd/noisy_vnf.c
index 81d1187cfe..cf951e9532 100644
--- a/app/test-pmd/noisy_vnf.c
+++ b/app/test-pmd/noisy_vnf.c
@@ -24,7 +24,6 @@
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_lcore.h>
-#include <rte_memcpy.h>
#include <rte_mempool.h>
#include <rte_mbuf.h>
#include <rte_ethdev.h>
diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
index 315f9286cd..cc73cf4ebf 100644
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -19,7 +19,6 @@
#include <rte_debug.h>
#include <rte_cycles.h>
#include <rte_memory.h>
-#include <rte_memcpy.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 70ea257fda..9dd3ffa850 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -30,7 +30,6 @@
#include <rte_debug.h>
#include <rte_cycles.h>
#include <rte_memory.h>
-#include <rte_memcpy.h>
#include <rte_launch.h>
#include <rte_bus.h>
#include <rte_eal.h>
--
2.43.0