* limitations under the License.
*/
-#define rte_mbuf_from_vlib_buffer(x) (((struct rte_mbuf *)x) - 1)
-#define vlib_buffer_from_rte_mbuf(x) ((vlib_buffer_t *)(x+1))
-
#define DPDK_NB_RX_DESC_DEFAULT 1024
#define DPDK_NB_TX_DESC_DEFAULT 1024
#define DPDK_NB_RX_DESC_VIRTIO 256
_(nchannels, n) \
#define foreach_eal_single_hyphen_arg \
-_(blacklist, b) \
_(mem-alloc-request, m) \
_(force-ranks, r)
_(proc-type) \
_(file-prefix) \
_(vdev) \
-_(log-level)
-
-typedef struct
-{
- /* must be first */
- struct rte_pktmbuf_pool_private mbp_priv;
- u8 buffer_pool_index;
-} dpdk_mempool_private_t;
-
+_(log-level) \
+_(iova-mode)
static inline void
dpdk_get_xstats (dpdk_device_t * xd)
{
+ int len, ret;
+
if (!(xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP))
return;
- int len;
- if ((len = rte_eth_xstats_get (xd->port_id, NULL, 0)) > 0)
- {
- vec_validate (xd->xstats, len - 1);
- vec_validate (xd->last_cleared_xstats, len - 1);
- len =
- rte_eth_xstats_get (xd->port_id, xd->xstats, vec_len (xd->xstats));
-
- ASSERT (vec_len (xd->xstats) == len);
- ASSERT (vec_len (xd->last_cleared_xstats) == len);
+ len = rte_eth_xstats_get (xd->port_id, NULL, 0);
+ if (len < 0)
+ return;
- _vec_len (xd->xstats) = len;
- _vec_len (xd->last_cleared_xstats) = len;
+ vec_validate (xd->xstats, len - 1);
+ ret = rte_eth_xstats_get (xd->port_id, xd->xstats, len);
+ if (ret < 0 || ret > len)
+ {
+ _vec_len (xd->xstats) = 0;
+ return;
}
+
+ _vec_len (xd->xstats) = len;
}
+#define DPDK_UPDATE_COUNTER(vnm, tidx, xd, stat, cnt) \
+ do \
+ { \
+ u64 _v = (xd)->stats.stat; \
+ u64 _lv = (xd)->last_stats.stat; \
+ if (PREDICT_FALSE (_v != _lv)) \
+ { \
+ if (PREDICT_FALSE (_v < _lv)) \
+ dpdk_log_warn ("%v: %s counter decreased (before %lu after %lu)", \
+ xd->name, #stat, _lv, _v); \
+ else \
+ vlib_increment_simple_counter ( \
+ vec_elt_at_index ((vnm)->interface_main.sw_if_counters, cnt), \
+ (tidx), (xd)->sw_if_index, _v - _lv); \
+ } \
+ } \
+ while (0)
static inline void
dpdk_update_counters (dpdk_device_t * xd, f64 now)
{
- vlib_simple_counter_main_t *cm;
vnet_main_t *vnm = vnet_get_main ();
u32 thread_index = vlib_get_thread_index ();
- u64 rxerrors, last_rxerrors;
/* only update counters for PMD interfaces */
if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
return;
xd->time_last_stats_update = now ? now : xd->time_last_stats_update;
- clib_memcpy (&xd->last_stats, &xd->stats, sizeof (xd->last_stats));
+ clib_memcpy_fast (&xd->last_stats, &xd->stats, sizeof (xd->last_stats));
rte_eth_stats_get (xd->port_id, &xd->stats);
/* maybe bump interface rx no buffer counter */
- if (PREDICT_FALSE (xd->stats.rx_nombuf != xd->last_stats.rx_nombuf))
- {
- cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
- VNET_INTERFACE_COUNTER_RX_NO_BUF);
-
- vlib_increment_simple_counter (cm, thread_index, xd->sw_if_index,
- xd->stats.rx_nombuf -
- xd->last_stats.rx_nombuf);
- }
-
- /* missed pkt counter */
- if (PREDICT_FALSE (xd->stats.imissed != xd->last_stats.imissed))
- {
- cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
- VNET_INTERFACE_COUNTER_RX_MISS);
-
- vlib_increment_simple_counter (cm, thread_index, xd->sw_if_index,
- xd->stats.imissed -
- xd->last_stats.imissed);
- }
- rxerrors = xd->stats.ierrors;
- last_rxerrors = xd->last_stats.ierrors;
-
- if (PREDICT_FALSE (rxerrors != last_rxerrors))
- {
- cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
- VNET_INTERFACE_COUNTER_RX_ERROR);
-
- vlib_increment_simple_counter (cm, thread_index, xd->sw_if_index,
- rxerrors - last_rxerrors);
- }
+ DPDK_UPDATE_COUNTER (vnm, thread_index, xd, rx_nombuf,
+ VNET_INTERFACE_COUNTER_RX_NO_BUF);
+ DPDK_UPDATE_COUNTER (vnm, thread_index, xd, imissed,
+ VNET_INTERFACE_COUNTER_RX_MISS);
+ DPDK_UPDATE_COUNTER (vnm, thread_index, xd, ierrors,
+ VNET_INTERFACE_COUNTER_RX_ERROR);
dpdk_get_xstats (xd);
}