Automatically generated by devtools/cocci/rte_memcpy.cocci Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- drivers/net/iavf/iavf_fdir.c | 93 +++++++++++++--------------- drivers/net/iavf/iavf_fsub.c | 50 +++++++-------- drivers/net/iavf/iavf_generic_flow.c | 2 +- drivers/net/iavf/iavf_tm.c | 11 ++-- drivers/net/iavf/iavf_vchnl.c | 9 ++- 5 files changed, 77 insertions(+), 88 deletions(-)
diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c index 811a10287b70..35257c43f135 100644 --- a/drivers/net/iavf/iavf_fdir.c +++ b/drivers/net/iavf/iavf_fdir.c @@ -374,7 +374,7 @@ iavf_fdir_create(struct iavf_adapter *ad, if (filter->mark_flag == 1) iavf_fdir_rx_proc_enable(ad, 1); - rte_memcpy(rule, filter, sizeof(*rule)); + memcpy(rule, filter, sizeof(*rule)); flow->rule = rule; return 0; @@ -672,15 +672,13 @@ iavf_fdir_refine_input_set(const uint64_t input_set, VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4, PROT); memset(&ipv4_spec, 0, sizeof(ipv4_spec)); ipv4_spec.hdr.next_proto_id = proto_id; - rte_memcpy(hdr->buffer, &ipv4_spec.hdr, - sizeof(ipv4_spec.hdr)); + memcpy(hdr->buffer, &ipv4_spec.hdr, sizeof(ipv4_spec.hdr)); return true; case VIRTCHNL_PROTO_HDR_IPV6: VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6, PROT); memset(&ipv6_spec, 0, sizeof(ipv6_spec)); ipv6_spec.hdr.proto = proto_id; - rte_memcpy(hdr->buffer, &ipv6_spec.hdr, - sizeof(ipv6_spec.hdr)); + memcpy(hdr->buffer, &ipv6_spec.hdr, sizeof(ipv6_spec.hdr)); return true; default: return false; @@ -885,8 +883,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, ETHERTYPE); } - rte_memcpy(hdr1->buffer, eth_spec, - sizeof(struct rte_ether_hdr)); + memcpy(hdr1->buffer, eth_spec, + sizeof(struct rte_ether_hdr)); } hdrs->count = ++layer; @@ -976,8 +974,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, input_set |= IAVF_PROT_IPV4_INNER; } - rte_memcpy(hdr->buffer, &ipv4_spec->hdr, - sizeof(ipv4_spec->hdr)); + memcpy(hdr->buffer, &ipv4_spec->hdr, + sizeof(ipv4_spec->hdr)); hdrs->count = ++layer; @@ -1066,8 +1064,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, input_set |= IAVF_PROT_IPV6_INNER; } - rte_memcpy(hdr->buffer, &ipv6_spec->hdr, - sizeof(ipv6_spec->hdr)); + memcpy(hdr->buffer, &ipv6_spec->hdr, + sizeof(ipv6_spec->hdr)); hdrs->count = ++layer; break; @@ -1101,8 +1099,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1, ETH, ETHERTYPE); - rte_memcpy(hdr->buffer, &ipv6_frag_spec->hdr, - sizeof(ipv6_frag_spec->hdr)); + memcpy(hdr->buffer, &ipv6_frag_spec->hdr, + sizeof(ipv6_frag_spec->hdr)); } else if (ipv6_frag_mask->hdr.id == UINT32_MAX) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, @@ -1153,13 +1151,11 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, } if (l3 == RTE_FLOW_ITEM_TYPE_IPV4) - rte_memcpy(hdr->buffer, - &udp_spec->hdr, - sizeof(udp_spec->hdr)); + memcpy(hdr->buffer, &udp_spec->hdr, + sizeof(udp_spec->hdr)); else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6) - rte_memcpy(hdr->buffer, - &udp_spec->hdr, - sizeof(udp_spec->hdr)); + memcpy(hdr->buffer, &udp_spec->hdr, + sizeof(udp_spec->hdr)); } hdrs->count = ++layer; @@ -1210,13 +1206,11 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, } if (l3 == RTE_FLOW_ITEM_TYPE_IPV4) - rte_memcpy(hdr->buffer, - &tcp_spec->hdr, - sizeof(tcp_spec->hdr)); + memcpy(hdr->buffer, &tcp_spec->hdr, + sizeof(tcp_spec->hdr)); else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6) - rte_memcpy(hdr->buffer, - &tcp_spec->hdr, - sizeof(tcp_spec->hdr)); + memcpy(hdr->buffer, &tcp_spec->hdr, + sizeof(tcp_spec->hdr)); } hdrs->count = ++layer; @@ -1256,13 +1250,11 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, } if (l3 == RTE_FLOW_ITEM_TYPE_IPV4) - rte_memcpy(hdr->buffer, - &sctp_spec->hdr, - sizeof(sctp_spec->hdr)); + memcpy(hdr->buffer, &sctp_spec->hdr, + sizeof(sctp_spec->hdr)); else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6) - rte_memcpy(hdr->buffer, - &sctp_spec->hdr, - sizeof(sctp_spec->hdr)); + memcpy(hdr->buffer, &sctp_spec->hdr, + sizeof(sctp_spec->hdr)); } hdrs->count = ++layer; @@ -1291,8 +1283,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, GTPU_IP, TEID); } - rte_memcpy(hdr->buffer, - gtp_spec, sizeof(*gtp_spec)); + memcpy(hdr->buffer, gtp_spec, + sizeof(*gtp_spec)); } tun_inner = 1; @@ -1346,8 +1338,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, psc.qfi = gtp_psc_spec->hdr.qfi; psc.type = gtp_psc_spec->hdr.type; psc.next = 0; - rte_memcpy(hdr->buffer, &psc, - sizeof(struct iavf_gtp_psc_spec_hdr)); + memcpy(hdr->buffer, &psc, + sizeof(struct iavf_gtp_psc_spec_hdr)); } hdrs->count = ++layer; @@ -1367,8 +1359,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, L2TPV3, SESS_ID); } - rte_memcpy(hdr->buffer, l2tpv3oip_spec, - sizeof(*l2tpv3oip_spec)); + memcpy(hdr->buffer, l2tpv3oip_spec, + sizeof(*l2tpv3oip_spec)); } hdrs->count = ++layer; @@ -1388,8 +1380,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, ESP, SPI); } - rte_memcpy(hdr->buffer, &esp_spec->hdr, - sizeof(esp_spec->hdr)); + memcpy(hdr->buffer, &esp_spec->hdr, + sizeof(esp_spec->hdr)); } hdrs->count = ++layer; @@ -1409,8 +1401,7 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, AH, SPI); } - rte_memcpy(hdr->buffer, ah_spec, - sizeof(*ah_spec)); + memcpy(hdr->buffer, ah_spec, sizeof(*ah_spec)); } hdrs->count = ++layer; @@ -1430,8 +1421,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, PFCP, S_FIELD); } - rte_memcpy(hdr->buffer, pfcp_spec, - sizeof(*pfcp_spec)); + memcpy(hdr->buffer, pfcp_spec, + sizeof(*pfcp_spec)); } hdrs->count = ++layer; @@ -1455,8 +1446,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, PC_RTC_ID); } - rte_memcpy(hdr->buffer, ecpri_spec, - sizeof(*ecpri_spec)); + memcpy(hdr->buffer, ecpri_spec, + sizeof(*ecpri_spec)); } hdrs->count = ++layer; @@ -1471,8 +1462,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GRE); if (gre_spec && gre_mask) { - rte_memcpy(hdr->buffer, gre_spec, - sizeof(*gre_spec)); + memcpy(hdr->buffer, gre_spec, + sizeof(*gre_spec)); } tun_inner = 1; @@ -1520,8 +1511,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, SESS_ID); } - rte_memcpy(hdr->buffer, l2tpv2_spec, - sizeof(*l2tpv2_spec)); + memcpy(hdr->buffer, l2tpv2_spec, + sizeof(*l2tpv2_spec)); } tun_inner = 1; @@ -1538,8 +1529,8 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, PPP); if (ppp_spec && ppp_mask) { - rte_memcpy(hdr->buffer, ppp_spec, - sizeof(*ppp_spec)); + memcpy(hdr->buffer, ppp_spec, + sizeof(*ppp_spec)); } hdrs->count = ++layer; diff --git a/drivers/net/iavf/iavf_fsub.c b/drivers/net/iavf/iavf_fsub.c index 74e1e7099b8c..d98cde0fa59d 100644 --- a/drivers/net/iavf/iavf_fsub.c +++ b/drivers/net/iavf/iavf_fsub.c @@ -92,7 +92,7 @@ iavf_fsub_create(struct iavf_adapter *ad, struct rte_flow *flow, goto free_entry; } - rte_memcpy(rule, filter, sizeof(*rule)); + memcpy(rule, filter, sizeof(*rule)); flow->rule = rule; rte_free(meta); @@ -272,10 +272,10 @@ iavf_fsub_parse_pattern(const struct rte_flow_item pattern[], input_set_byte += 2; } - rte_memcpy(hdr1->buffer_spec, eth_spec, - sizeof(struct rte_ether_hdr)); - rte_memcpy(hdr1->buffer_mask, eth_mask, - sizeof(struct rte_ether_hdr)); + memcpy(hdr1->buffer_spec, eth_spec, + sizeof(struct rte_ether_hdr)); + memcpy(hdr1->buffer_mask, eth_mask, + sizeof(struct rte_ether_hdr)); } else { /* flow subscribe filter will add dst mac in kernel */ input_set_byte += 6; @@ -325,10 +325,10 @@ iavf_fsub_parse_pattern(const struct rte_flow_item pattern[], input_set_byte++; } - rte_memcpy(hdr->buffer_spec, &ipv4_spec->hdr, - sizeof(ipv4_spec->hdr)); - rte_memcpy(hdr->buffer_mask, &ipv4_mask->hdr, - sizeof(ipv4_spec->hdr)); + memcpy(hdr->buffer_spec, &ipv4_spec->hdr, + sizeof(ipv4_spec->hdr)); + memcpy(hdr->buffer_mask, &ipv4_mask->hdr, + sizeof(ipv4_spec->hdr)); } hdrs->count = ++layer; @@ -388,10 +388,10 @@ iavf_fsub_parse_pattern(const struct rte_flow_item pattern[], input_set_byte += 4; } - rte_memcpy(hdr->buffer_spec, &ipv6_spec->hdr, - sizeof(ipv6_spec->hdr)); - rte_memcpy(hdr->buffer_mask, &ipv6_mask->hdr, - sizeof(ipv6_spec->hdr)); + memcpy(hdr->buffer_spec, &ipv6_spec->hdr, + sizeof(ipv6_spec->hdr)); + memcpy(hdr->buffer_mask, &ipv6_mask->hdr, + sizeof(ipv6_spec->hdr)); } hdrs->count = ++layer; @@ -425,10 +425,10 @@ iavf_fsub_parse_pattern(const struct rte_flow_item pattern[], input_set_byte += 2; } - rte_memcpy(hdr->buffer_spec, &udp_spec->hdr, - sizeof(udp_spec->hdr)); - rte_memcpy(hdr->buffer_mask, &udp_mask->hdr, - sizeof(udp_mask->hdr)); + memcpy(hdr->buffer_spec, &udp_spec->hdr, + sizeof(udp_spec->hdr)); + memcpy(hdr->buffer_mask, &udp_mask->hdr, + sizeof(udp_mask->hdr)); } hdrs->count = ++layer; @@ -466,10 +466,10 @@ iavf_fsub_parse_pattern(const struct rte_flow_item pattern[], input_set_byte += 2; } - rte_memcpy(hdr->buffer_spec, &tcp_spec->hdr, - sizeof(tcp_spec->hdr)); - rte_memcpy(hdr->buffer_mask, &tcp_mask->hdr, - sizeof(tcp_mask->hdr)); + memcpy(hdr->buffer_spec, &tcp_spec->hdr, + sizeof(tcp_spec->hdr)); + memcpy(hdr->buffer_mask, &tcp_mask->hdr, + sizeof(tcp_mask->hdr)); } hdrs->count = ++layer; @@ -498,10 +498,10 @@ iavf_fsub_parse_pattern(const struct rte_flow_item pattern[], return -rte_errno; } - rte_memcpy(hdr->buffer_spec, &vlan_spec->hdr, - sizeof(vlan_spec->hdr)); - rte_memcpy(hdr->buffer_mask, &vlan_mask->hdr, - sizeof(vlan_mask->hdr)); + memcpy(hdr->buffer_spec, &vlan_spec->hdr, + sizeof(vlan_spec->hdr)); + memcpy(hdr->buffer_mask, &vlan_mask->hdr, + sizeof(vlan_mask->hdr)); } hdrs->count = ++layer; diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c index 6f6e95fc453f..0bcfb5bf242b 100644 --- a/drivers/net/iavf/iavf_generic_flow.c +++ b/drivers/net/iavf/iavf_generic_flow.c @@ -2019,7 +2019,7 @@ iavf_pattern_skip_void_item(struct rte_flow_item *items, pb = pe + 1; } /* Copy the END item. */ - rte_memcpy(items, pe, sizeof(struct rte_flow_item)); + memcpy(items, pe, sizeof(struct rte_flow_item)); } /* Check if the pattern matches a supported item type array */ diff --git a/drivers/net/iavf/iavf_tm.c b/drivers/net/iavf/iavf_tm.c index 32bb3be45e1b..a6ad6bb0a28d 100644 --- a/drivers/net/iavf/iavf_tm.c +++ b/drivers/net/iavf/iavf_tm.c @@ -342,8 +342,8 @@ iavf_tm_node_add(struct rte_eth_dev *dev, uint32_t node_id, tm_node->id = node_id; tm_node->parent = NULL; tm_node->reference_count = 0; - rte_memcpy(&tm_node->params, params, - sizeof(struct rte_tm_node_params)); + memcpy(&tm_node->params, params, + sizeof(struct rte_tm_node_params)); vf->tm_conf.root = tm_node; return 0; } @@ -403,8 +403,7 @@ iavf_tm_node_add(struct rte_eth_dev *dev, uint32_t node_id, tm_node->reference_count = 0; tm_node->parent = parent_node; tm_node->shaper_profile = shaper_profile; - rte_memcpy(&tm_node->params, params, - sizeof(struct rte_tm_node_params)); + memcpy(&tm_node->params, params, sizeof(struct rte_tm_node_params)); if (parent_node_type == IAVF_TM_NODE_TYPE_PORT) { TAILQ_INSERT_TAIL(&vf->tm_conf.tc_list, tm_node, node); @@ -543,8 +542,8 @@ iavf_shaper_profile_add(struct rte_eth_dev *dev, if (!shaper_profile) return -ENOMEM; shaper_profile->shaper_profile_id = shaper_profile_id; - rte_memcpy(&shaper_profile->profile, profile, - sizeof(struct rte_tm_shaper_params)); + memcpy(&shaper_profile->profile, profile, + sizeof(struct rte_tm_shaper_params)); TAILQ_INSERT_TAIL(&vf->tm_conf.shaper_profile_list, shaper_profile, node); diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 1111d30f57d1..711186c1b552 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -920,7 +920,7 @@ iavf_get_vlan_offload_caps_v2(struct iavf_adapter *adapter) return ret; } - rte_memcpy(&vf->vlan_v2_caps, vf->aq_resp, sizeof(vf->vlan_v2_caps)); + memcpy(&vf->vlan_v2_caps, vf->aq_resp, sizeof(vf->vlan_v2_caps)); return 0; } @@ -1427,8 +1427,8 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add) addr = &adapter->dev_data->mac_addrs[i]; if (rte_is_zero_ether_addr(addr)) continue; - rte_memcpy(list->list[j].addr, addr->addr_bytes, - sizeof(addr->addr_bytes)); + memcpy(list->list[j].addr, addr->addr_bytes, + sizeof(addr->addr_bytes)); list->list[j].type = (j == 0 ? VIRTCHNL_ETHER_ADDR_PRIMARY : VIRTCHNL_ETHER_ADDR_EXTRA); @@ -1547,8 +1547,7 @@ iavf_add_del_eth_addr(struct iavf_adapter *adapter, struct rte_ether_addr *addr, list->vsi_id = vf->vsi_res->vsi_id; list->num_elements = 1; list->list[0].type = type; - rte_memcpy(list->list[0].addr, addr->addr_bytes, - sizeof(addr->addr_bytes)); + memcpy(list->list[0].addr, addr->addr_bytes, sizeof(addr->addr_bytes)); args.ops = add ? VIRTCHNL_OP_ADD_ETH_ADDR : VIRTCHNL_OP_DEL_ETH_ADDR; args.in_args = cmd_buffer; -- 2.43.0