From b7b929931a07fbb27b43d5cd105f366c3e29807e Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 17 Oct 2018 10:38:51 -0400 Subject: c11 safe string handling support Change-Id: Ied34720ca5a6e6e717eea4e86003e854031b6eab Signed-off-by: Dave Barach --- src/plugins/dpdk/api/dpdk_test.c | 4 ++-- src/plugins/dpdk/buffer.c | 6 +++--- src/plugins/dpdk/device/common.c | 2 +- src/plugins/dpdk/device/flow.c | 12 ++++++------ src/plugins/dpdk/device/init.c | 4 ++-- src/plugins/dpdk/hqos/hqos.c | 4 ++-- src/plugins/dpdk/ipsec/ipsec.c | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/plugins/dpdk') diff --git a/src/plugins/dpdk/api/dpdk_test.c b/src/plugins/dpdk/api/dpdk_test.c index 8204edfe66a..637b4016111 100644 --- a/src/plugins/dpdk/api/dpdk_test.c +++ b/src/plugins/dpdk/api/dpdk_test.c @@ -94,7 +94,7 @@ _(SW_INTERFACE_SET_DPDK_HQOS_TCTBL_REPLY, \ do { \ vam->result_ready = 0; \ mp = vl_msg_api_alloc(sizeof(*mp)); \ - memset (mp, 0, sizeof (*mp)); \ + clib_memset (mp, 0, sizeof (*mp)); \ mp->_vl_msg_id = ntohs (VL_API_##T + dm->msg_id_base); \ mp->client_index = vam->my_client_index; \ } while(0); @@ -103,7 +103,7 @@ do { \ do { \ vam->result_ready = 0; \ mp = vl_msg_api_alloc(sizeof(*mp)+(n)); \ - memset (mp, 0, sizeof (*mp)); \ + clib_memset (mp, 0, sizeof (*mp)); \ mp->_vl_msg_id = ntohs (VL_API_##T + dm->msg_id_base); \ mp->client_index = vam->my_client_index; \ } while(0); diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c index cc7eed059f0..f7ed932e35f 100644 --- a/src/plugins/dpdk/buffer.c +++ b/src/plugins/dpdk/buffer.c @@ -140,7 +140,7 @@ del_free_list (vlib_main_t * vm, vlib_buffer_free_list_t * f) vec_free (f->name); vec_free (f->buffers); /* Poison it. */ - memset (f, 0xab, sizeof (f[0])); + clib_memset (f, 0xab, sizeof (f[0])); } /* Add buffer free list. */ @@ -209,7 +209,7 @@ CLIB_MULTIARCH_FN (dpdk_buffer_fill_free_list) (vlib_main_t * vm, if (rte_mempool_get_bulk (rmp, (void *) d->mbuf_alloc_list, n_alloc) < 0) return 0; - memset (&bt, 0, sizeof (vlib_buffer_t)); + clib_memset (&bt, 0, sizeof (vlib_buffer_t)); vlib_buffer_init_for_free_list (&bt, fl); bt.buffer_pool_index = privp->buffer_pool_index; @@ -383,7 +383,7 @@ dpdk_packet_template_init (vlib_main_t * vm, vlib_packet_template_t *t = (vlib_packet_template_t *) vt; vlib_worker_thread_barrier_sync (vm); - memset (t, 0, sizeof (t[0])); + clib_memset (t, 0, sizeof (t[0])); vec_add (t->packet_data, packet_data, n_packet_data_bytes); diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c index b9ba161423b..57430eff977 100644 --- a/src/plugins/dpdk/device/common.c +++ b/src/plugins/dpdk/device/common.c @@ -214,7 +214,7 @@ dpdk_device_stop (dpdk_device_t * xd) rte_eth_allmulticast_disable (xd->port_id); rte_eth_dev_stop (xd->port_id); - memset (&xd->link, 0, sizeof (struct rte_eth_link)); + clib_memset (&xd->link, 0, sizeof (struct rte_eth_link)); /* For bonded interface, stop slave links */ if (xd->pmd == VNET_DPDK_PMD_BOND) diff --git a/src/plugins/dpdk/device/flow.c b/src/plugins/dpdk/device/flow.c index 6ed11e2f304..6612ce4e1ad 100644 --- a/src/plugins/dpdk/device/flow.c +++ b/src/plugins/dpdk/device/flow.c @@ -179,7 +179,7 @@ dpdk_flow_add (dpdk_device_t * xd, vnet_flow_t * f, dpdk_flow_entry_t * fe) .vni_reserved = clib_host_to_net_u32 (((u32) - 1) << 8) }; - memset (raw, 0, sizeof raw); + clib_memset (raw, 0, sizeof raw); raw[0].item.relative = 1; raw[0].item.length = vxlan_hdr_sz; @@ -258,12 +258,12 @@ dpdk_flow_ops_fn (vnet_main_t * vnm, vnet_flow_dev_op_t op, u32 dev_instance, { /* make sure no action is taken for in-flight (marked) packets */ fle = pool_elt_at_index (xd->flow_lookup_entries, fe->mark); - memset (fle, -1, sizeof (*fle)); + clib_memset (fle, -1, sizeof (*fle)); vec_add1 (xd->parked_lookup_indexes, fe->mark); xd->parked_loop_count = dm->vlib_main->main_loop_count; } - memset (fe, 0, sizeof (*fe)); + clib_memset (fe, 0, sizeof (*fe)); pool_put (xd->flow_entries, fe); goto disable_rx_offload; @@ -294,7 +294,7 @@ dpdk_flow_ops_fn (vnet_main_t * vnm, vnet_flow_dev_op_t op, u32 dev_instance, fe->mark = fle - xd->flow_lookup_entries; /* install entry in the lookup table */ - memset (fle, -1, sizeof (*fle)); + clib_memset (fle, -1, sizeof (*fle)); if (flow->actions & VNET_FLOW_ACTION_MARK) fle->flow_id = flow->mark_flow_id; if (flow->actions & VNET_FLOW_ACTION_REDIRECT_TO_NODE) @@ -329,11 +329,11 @@ dpdk_flow_ops_fn (vnet_main_t * vnm, vnet_flow_dev_op_t op, u32 dev_instance, done: if (rv) { - memset (fe, 0, sizeof (*fe)); + clib_memset (fe, 0, sizeof (*fe)); pool_put (xd->flow_entries, fe); if (fle) { - memset (fle, -1, sizeof (*fle)); + clib_memset (fle, -1, sizeof (*fle)); pool_put (xd->flow_lookup_entries, fle); } } diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 7d9ec7e5c80..697458c04b6 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -145,7 +145,7 @@ dpdk_device_lock_init (dpdk_device_t * xd) { xd->lockp[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES); - memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES); + clib_memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES); } } @@ -1518,7 +1518,7 @@ dpdk_update_link_state (dpdk_device_t * xd, f64 now) return; xd->time_last_link_update = now ? now : xd->time_last_link_update; - memset (&xd->link, 0, sizeof (xd->link)); + clib_memset (&xd->link, 0, sizeof (xd->link)); rte_eth_link_get_nowait (xd->port_id, &xd->link); if (LINK_STATE_ELOGS) diff --git a/src/plugins/dpdk/hqos/hqos.c b/src/plugins/dpdk/hqos/hqos.c index 04455c5d534..1a8dd6d98fe 100644 --- a/src/plugins/dpdk/hqos/hqos.c +++ b/src/plugins/dpdk/hqos/hqos.c @@ -268,10 +268,10 @@ dpdk_port_setup_hqos (dpdk_device_t * xd, dpdk_device_config_hqos_t * hqos) /* Allocate the per-thread device data array */ vec_validate_aligned (xd->hqos_wt, tm->n_vlib_mains - 1, CLIB_CACHE_LINE_BYTES); - memset (xd->hqos_wt, 0, tm->n_vlib_mains * sizeof (xd->hqos_wt[0])); + clib_memset (xd->hqos_wt, 0, tm->n_vlib_mains * sizeof (xd->hqos_wt[0])); vec_validate_aligned (xd->hqos_ht, 0, CLIB_CACHE_LINE_BYTES); - memset (xd->hqos_ht, 0, sizeof (xd->hqos_ht[0])); + clib_memset (xd->hqos_ht, 0, sizeof (xd->hqos_ht[0])); /* Allocate space for one SWQ per worker thread in the I/O TX thread data structure */ vec_validate (xd->hqos_ht->swq, worker_thread_count); diff --git a/src/plugins/dpdk/ipsec/ipsec.c b/src/plugins/dpdk/ipsec/ipsec.c index 1bd46d55b8e..ded8912e943 100644 --- a/src/plugins/dpdk/ipsec/ipsec.c +++ b/src/plugins/dpdk/ipsec/ipsec.c @@ -407,7 +407,7 @@ static void __attribute__ ((unused)) clear_and_free_obj (void *obj) { struct rte_mempool *mp = rte_mempool_from_obj (obj); - memset (obj, 0, mp->elt_size); + clib_memset (obj, 0, mp->elt_size); rte_mempool_put (mp, obj); } @@ -1031,9 +1031,9 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt, { vec_validate_init_empty_aligned (cwm->ops, VLIB_FRAME_SIZE - 1, 0, CLIB_CACHE_LINE_BYTES); - memset (cwm->cipher_resource_idx, ~0, + clib_memset (cwm->cipher_resource_idx, ~0, IPSEC_CRYPTO_N_ALG * sizeof(*cwm->cipher_resource_idx)); - memset (cwm->auth_resource_idx, ~0, + clib_memset (cwm->auth_resource_idx, ~0, IPSEC_INTEG_N_ALG * sizeof(*cwm->auth_resource_idx)); } /* *INDENT-ON* */ -- cgit 1.2.3-korg