VPP-580: Host Interface created via Command Line Arg is misnamed - vpp

diff options

author	Billy McFall <bmcfall@redhat.com>	2017-01-05 13:23:39 -0500
committer	Damjan Marion <dmarion.lists@gmail.com>	2017-01-13 15:37:46 +0000
commit	35b2607fcd033a18a32ba61b44e68d6e9e3eeeca (patch)
tree	79c47d14f882844261c98bd41a38277462097e92
parent	52e84f3cad6078e89031dafd789a8df57c1d7e1f (diff)

VPP-580: Host Interface created via Command Line Arg is misnamed

Host interfaces created via the command-line arguments are missed named (i.e. - UnknownEthernet0 instead of af_packet0). In DPDK 16.11, they changed the driver names from eth_xxx to net_xxx. However, looks like the AF_PACKET driver still returns "AF_PACKET PMD" as the driver name in the rte_eth_dev_info_get(..) call. I modified the driver name look table in vnet/devices/dpdk/dpdk.h to revert the name back. Change-Id: I2b0a9f6b4d5245b76548027891d40f81a56b230d Signed-off-by: Billy McFall <bmcfall@redhat.com>

Diffstat

-rw-r--r--

src/vnet/devices/dpdk/dpdk.h

1 files changed, 1 insertions, 1 deletions

/* * Copyright (c) 2017 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 * * 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. */ #ifndef SRC_VNET_SESSION_SESSION_DEBUG_H_ #define SRC_VNET_SESSION_SESSION_DEBUG_H_ #include <vnet/session/transport.h> #include <vlib/vlib.h> #define foreach_session_dbg_evt \ _(ENQ, "enqueue") \ _(DEQ, "dequeue") \ _(DEQ_NODE, "dequeue") \ _(POLL_GAP_TRACK, "poll gap track") \ typedef enum _session_evt_dbg { #define _(sym, str) SESSION_EVT_##sym, foreach_session_dbg_evt #undef _ } session_evt_dbg_e; #define SESSION_DBG (0) #define SESSION_DEQ_NODE_EVTS (0) #define SESSION_EVT_POLL_DBG (1) #if TRANSPORT_DEBUG && SESSION_DBG #define DEC_SESSION_ETD(_s, _e, _size) \ struct \ { \ u32 data[_size]; \ } * ed; \ transport_proto_vft_t *vft = \ session_get_transport_vft (_s->session_type); \ transport_connection_t *_tc = \ vft->get_connection (_s->connection_index, _s->thread_index); \ ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, \ _e, _tc->elog_track) #define DEC_SESSION_ED(_e, _size) \ struct \ { \ u32 data[_size]; \ } * ed; \ ed = ELOG_DATA (&vlib_global_main.elog_main, _e) #define SESSION_EVT_DEQ_HANDLER(_s, _body) \ { \ ELOG_TYPE_DECLARE (_e) = \ { \ .format = "deq: id %d len %d rd %d wnd %d", \ .format_args = "i4i4i4i4", \ }; \ DEC_SESSION_ETD(_s, _e, 4); \ do { _body; } while (0); \ } #define SESSION_EVT_ENQ_HANDLER(_s, _body) \ { \ ELOG_TYPE_DECLARE (_e) = \ { \ .format = "enq: id %d length %d", \ .format_args = "i4i4", \ }; \ DEC_SESSION_ETD(_s, _e, 2); \ do { _body; } while (0); \ } #if SESSION_DEQ_NODE_EVTS #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt) \ { \ ELOG_TYPE_DECLARE (_e) = \ { \ .format = "deq-node: %s", \ .format_args = "t4", \ .n_enum_strings = 2, \ .enum_strings = { \ "start", \ "end", \ }, \ }; \ DEC_SESSION_ED(_e, 1); \ ed->data[0] = _node_evt; \ } #else #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt) #endif #if SESSION_DBG && SESSION_EVT_POLL_DBG #define SESSION_EVT_POLL_GAP(_smm, _my_thread_index) \ { \ ELOG_TYPE_DECLARE (_e) = \ { \ .format = "nixon-gap: %d MS", \ .format_args = "i4", \ }; \ DEC_SESSION_ED(_e, 1); \ ed->data[0] = (u32) ((now - \ _smm->last_event_poll_by_thread[my_thread_index])*1000.0); \ } #define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _my_thread_index) \ { \ if (PREDICT_TRUE( \ smm->last_event_poll_by_thread[my_thread_index] != 0.0)) \ if (now > smm->last_event_poll_by_thread[_my_thread_index] + 500e-6)\ SESSION_EVT_POLL_GAP(smm, my_thread_index); \ _smm->last_event_poll_by_thread[my_thread_index] = now; \ } #else #define SESSION_EVT_POLL_GAP(_smm, _my_thread_index) #define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _my_thread_index) #endif #define CONCAT_HELPER(_a, _b) _a##_b #define CC(_a, _b) CONCAT_HELPER(_a, _b) #define SESSION_EVT_DBG(_evt, _args...) CC(_evt, _HANDLER)(_args) #else #define SESSION_EVT_DBG(_evt, _args...) #endif #endif /* SRC_VNET_SESSION_SESSION_DEBUG_H_ */ /* * fd.io coding-style-patch-verification: ON * * Local Variables: * eval: (c-set-style "gnu") * End: */


context:
space:
mode: