From 6bcc95a65970918d551ab950045725ad7835c307 Mon Sep 17 00:00:00 2001 From: Michal Mazur Date: Tue, 7 Nov 2017 19:49:02 +0100 Subject: Fix style of ODP plugin and add Linaro copyrights Change-Id: I5c86cd0a1150ba2e915ce3413c67c504740356b3 Signed-off-by: Michal Mazur --- src/plugins/odp/odp_packet.c | 175 ++++++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 92 deletions(-) (limited to 'src/plugins/odp/odp_packet.c') diff --git a/src/plugins/odp/odp_packet.c b/src/plugins/odp/odp_packet.c index a8c606d8..d2088142 100755 --- a/src/plugins/odp/odp_packet.c +++ b/src/plugins/odp/odp_packet.c @@ -1,18 +1,7 @@ -/* - *------------------------------------------------------------------ - * Copyright (c) 2016 Cisco and/or its affiliates. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *------------------------------------------------------------------ + * SPDX-License-Identifier: BSD-3-Clause */ #include @@ -27,7 +16,7 @@ static u32 odp_packet_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, - u32 flags) + u32 flags) { /* nothing for now */ return 0; @@ -45,7 +34,7 @@ odp_packet_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, * @return Number of packets with no detected error */ u32 -drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len) +drop_err_pkts (odp_packet_t pkt_tbl[], unsigned len) { odp_packet_t pkt; unsigned pkt_cnt = len; @@ -55,72 +44,72 @@ drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len) { pkt = pkt_tbl[i]; - if (odp_unlikely(odp_packet_has_error(pkt))) - { - odp_packet_free(pkt); /* Drop */ - pkt_cnt--; - } - else if (odp_unlikely(i != j++)) - { - pkt_tbl[j-1] = pkt; - } + if (odp_unlikely (odp_packet_has_error (pkt))) + { + odp_packet_free (pkt); /* Drop */ + pkt_cnt--; + } + else if (odp_unlikely (i != j++)) + { + pkt_tbl[j - 1] = pkt; + } } return pkt_cnt; } static odp_pktio_t -create_pktio(const char *dev, odp_pool_t pool, u32 mode) +create_pktio (const char *dev, odp_pool_t pool, u32 mode) { odp_pktio_t pktio; int ret; odp_pktio_param_t pktio_param; odp_pktin_queue_param_t pktin_param; - odp_pktio_param_init(&pktio_param); + odp_pktio_param_init (&pktio_param); - switch(mode) + switch (mode) { - case APPL_MODE_PKT_BURST: + case APPL_MODE_PKT_BURST: pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT; break; - case APPL_MODE_PKT_QUEUE: + case APPL_MODE_PKT_QUEUE: pktio_param.in_mode = ODP_PKTIN_MODE_QUEUE; break; - case APPL_MODE_PKT_SCHED: + case APPL_MODE_PKT_SCHED: pktio_param.in_mode = ODP_PKTIN_MODE_SCHED; break; - default: - clib_warning("Invalid mode\n"); + default: + clib_warning ("Invalid mode\n"); } /* Open a packet IO instance */ - pktio = odp_pktio_open(dev, pool, &pktio_param); + pktio = odp_pktio_open (dev, pool, &pktio_param); if (pktio == ODP_PKTIO_INVALID) { - clib_warning("Error: pktio create failed for %s",dev); + clib_warning ("Error: pktio create failed for %s", dev); } - odp_pktin_queue_param_init(&pktin_param); + odp_pktin_queue_param_init (&pktin_param); if (mode == APPL_MODE_PKT_SCHED) pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; - if (odp_pktin_queue_config(pktio, &pktin_param)) + if (odp_pktin_queue_config (pktio, &pktin_param)) { - clib_warning("Error: pktin config failed"); + clib_warning ("Error: pktin config failed"); } - if (odp_pktout_queue_config(pktio, NULL)) + if (odp_pktout_queue_config (pktio, NULL)) { - clib_warning("Error: pktout config failed"); + clib_warning ("Error: pktout config failed"); } - ret = odp_pktio_start(pktio); + ret = odp_pktio_start (pktio); if (ret != 0) { - clib_warning("Error: unable to start"); + clib_warning ("Error: unable to start"); } return pktio; @@ -132,30 +121,30 @@ odp_worker_thread_enable () /*If worker threads are enabled, switch to polling mode */ foreach_vlib_main (( - { - vlib_node_set_state (this_vlib_main, - odp_packet_input_node.index, - VLIB_NODE_STATE_POLLING); - })); + { + vlib_node_set_state (this_vlib_main, + odp_packet_input_node.index, + VLIB_NODE_STATE_POLLING); + })); return 0; } int odp_worker_thread_disable () { - foreach_vlib_main (( - { - vlib_node_set_state (this_vlib_main, - odp_packet_input_node.index, - VLIB_NODE_STATE_DISABLED); - })); + foreach_vlib_main (( + { + vlib_node_set_state (this_vlib_main, + odp_packet_input_node.index, + VLIB_NODE_STATE_DISABLED); + })); return 0; } u32 odp_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, - u32 * sw_if_index , u32 mode) + u32 * sw_if_index, u32 mode) { odp_packet_main_t *om = &odp_packet_main; int ret = 0; @@ -165,8 +154,8 @@ odp_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, vnet_sw_interface_t *sw; vnet_main_t *vnm = vnet_get_main (); uword *p; - u8 *host_if_name_dup=vec_dup(host_if_name); - vlib_thread_main_t *tm= vlib_get_thread_main(); + u8 *host_if_name_dup = vec_dup (host_if_name); + vlib_thread_main_t *tm = vlib_get_thread_main (); p = mhash_get (&om->if_index_by_host_if_name, host_if_name); if (p) @@ -175,17 +164,17 @@ odp_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, pool_get (om->interfaces, oif); oif->if_index = oif - om->interfaces; oif->host_if_name = host_if_name_dup; - oif->per_interface_next_index= ~0; + oif->per_interface_next_index = ~0; /* Create a pktio instance */ - oif->pktio=create_pktio((char*)host_if_name, om->pool, mode); - oif->mode=mode; + oif->pktio = create_pktio ((char *) host_if_name, om->pool, mode); + oif->mode = mode; om->if_count++; if (tm->n_vlib_mains > 1) { oif->lockp = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, - CLIB_CACHE_LINE_BYTES); + CLIB_CACHE_LINE_BYTES); memset ((void *) oif->lockp, 0, CLIB_CACHE_LINE_BYTES); } @@ -205,7 +194,9 @@ odp_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, } error = ethernet_register_interface (vnm, odp_packet_device_class.index, - oif->if_index, hw_addr, &oif->hw_if_index, odp_packet_eth_flag_change); + oif->if_index, hw_addr, + &oif->hw_if_index, + odp_packet_eth_flag_change); if (error) { @@ -222,24 +213,24 @@ odp_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, vnet_hw_interface_set_flags (vnm, oif->hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP); - mhash_set_mem (&om->if_index_by_host_if_name, host_if_name_dup, &oif->if_index, - 0); + mhash_set_mem (&om->if_index_by_host_if_name, host_if_name_dup, + &oif->if_index, 0); if (sw_if_index) *sw_if_index = oif->sw_if_index; if (tm->n_vlib_mains > 1 && pool_elts (om->interfaces) == 1) { - /*Fixme :Workers support commented for now as vlib_buffer not thread safe*/ + /*Fixme :Workers support commented for now as vlib_buffer not thread safe */ //odp_worker_thread_enable (); } - else + else { - vlib_node_set_state (vm, odp_packet_input_node.index, - VLIB_NODE_STATE_POLLING); + vlib_node_set_state (vm, odp_packet_input_node.index, + VLIB_NODE_STATE_POLLING); } return 0; - error: +error: vec_free (host_if_name_dup); return ret; @@ -252,7 +243,7 @@ odp_packet_delete_if (vlib_main_t * vm, u8 * host_if_name) odp_packet_main_t *om = &odp_packet_main; odp_packet_if_t *oif = 0; uword *p; - vlib_thread_main_t *tm= vlib_get_thread_main(); + vlib_thread_main_t *tm = vlib_get_thread_main (); p = mhash_get (&om->if_index_by_host_if_name, host_if_name); @@ -267,8 +258,8 @@ odp_packet_delete_if (vlib_main_t * vm, u8 * host_if_name) om->if_count--; - odp_pktio_stop(odp_pktio_lookup((char*)host_if_name)); - odp_pktio_close(odp_pktio_lookup((char*)host_if_name)); + odp_pktio_stop (odp_pktio_lookup ((char *) host_if_name)); + odp_pktio_close (odp_pktio_lookup ((char *) host_if_name)); vec_free (oif->host_if_name); oif->host_if_name = NULL; @@ -276,12 +267,12 @@ odp_packet_delete_if (vlib_main_t * vm, u8 * host_if_name) mhash_unset (&om->if_index_by_host_if_name, host_if_name, &oif->if_index); ethernet_delete_interface (vnm, oif->hw_if_index); - pool_put(om->interfaces, oif); + pool_put (om->interfaces, oif); if (tm->n_vlib_mains > 1 && pool_elts (om->interfaces) == 0) { - odp_pool_destroy(om->pool); - /*Fixme :Workers support commented for now*/ + odp_pool_destroy (om->pool); + /*Fixme :Workers support commented for now */ // odp_worker_thread_disable (); } @@ -299,49 +290,49 @@ odp_packet_init (vlib_main_t * vm) odp_platform_init_t platform_params; odp_pool_param_t params; - memset(om, 0, sizeof(odp_packet_main_t)); + memset (om, 0, sizeof (odp_packet_main_t)); om->input_cpu_first_index = 0; om->input_cpu_count = 1; om->if_count = 0; - memset(&platform_params, 0, sizeof(platform_params)); + memset (&platform_params, 0, sizeof (platform_params)); - if (odp_init_global(&om->instance, NULL, &platform_params)) - clib_warning("Error:ODP global init failed"); + if (odp_init_global (&om->instance, NULL, &platform_params)) + clib_warning ("Error:ODP global init failed"); - if (odp_init_local(om->instance, ODP_THREAD_CONTROL) != 0) + if (odp_init_local (om->instance, ODP_THREAD_CONTROL) != 0) { - clib_warning("Error: ODP local init failed"); - odp_term_global(om->instance); + clib_warning ("Error: ODP local init failed"); + odp_term_global (om->instance); } /* Create packet pool */ - odp_pool_param_init(¶ms); + odp_pool_param_init (¶ms); params.pkt.seg_len = SHM_PKT_POOL_BUF_SIZE; - params.pkt.len = SHM_PKT_POOL_BUF_SIZE; - params.type = ODP_POOL_PACKET; - params.pkt.num = SHM_PKT_POOL_NB_PKTS; + params.pkt.len = SHM_PKT_POOL_BUF_SIZE; + params.type = ODP_POOL_PACKET; + params.pkt.num = SHM_PKT_POOL_NB_PKTS; - om->pool = odp_pool_create(SHM_PKT_POOL_NAME, ¶ms); + om->pool = odp_pool_create (SHM_PKT_POOL_NAME, ¶ms); if (om->pool == ODP_POOL_INVALID) { - clib_warning("Error: packet pool create failed"); + clib_warning ("Error: packet pool create failed"); } /* find out which cpus will be used for input */ - p = hash_get_mem (tm->thread_registrations_by_name, "workers"); - tr = p ? (vlib_thread_registration_t *) p[0] : 0; + p = hash_get_mem (tm->thread_registrations_by_name, "workers"); + tr = p ? (vlib_thread_registration_t *) p[0] : 0; if (tr && tr->count > 0) { - om->input_cpu_first_index = tr->first_index; - om->input_cpu_count = tr->count; + om->input_cpu_first_index = tr->first_index; + om->input_cpu_count = tr->count; } mhash_init_vec_string (&om->if_index_by_host_if_name, sizeof (uword)); vec_validate_aligned (om->rx_buffers, tm->n_vlib_mains - 1, - CLIB_CACHE_LINE_BYTES); + CLIB_CACHE_LINE_BYTES); return 0; } -- cgit 1.2.3-korg