Index: head/sys/dev/ena/ena.h =================================================================== --- head/sys/dev/ena/ena.h +++ head/sys/dev/ena/ena.h @@ -213,16 +213,8 @@ struct ena_stats_tx { counter_u64_t cnt; counter_u64_t bytes; - counter_u64_t queue_stop; counter_u64_t prepare_ctx_err; - counter_u64_t queue_wakeup; counter_u64_t dma_mapping_err; - /* Not counted */ - counter_u64_t unsupported_desc_num; - /* Not counted */ - counter_u64_t napi_comp; - /* Not counted */ - counter_u64_t tx_poll; counter_u64_t doorbells; counter_u64_t missing_tx_comp; counter_u64_t bad_req_id; @@ -235,13 +227,9 @@ counter_u64_t bytes; counter_u64_t refil_partial; counter_u64_t bad_csum; - /* Not counted */ - counter_u64_t page_alloc_fail; counter_u64_t mbuf_alloc_fail; counter_u64_t dma_mapping_err; counter_u64_t bad_desc_num; - /* Not counted */ - counter_u64_t small_copy_len_pkt; counter_u64_t bad_req_id; counter_u64_t empty_rx_ring; }; @@ -304,17 +292,9 @@ } __aligned(CACHE_LINE_SIZE); struct ena_stats_dev { - /* Not counted */ - counter_u64_t tx_timeout; - /* Not counted */ - counter_u64_t io_suspend; - /* Not counted */ - counter_u64_t io_resume; - /* Not counted */ counter_u64_t wd_expired; counter_u64_t interface_up; counter_u64_t interface_down; - /* Not counted */ counter_u64_t admin_q_pause; }; Index: head/sys/dev/ena/ena.c =================================================================== --- head/sys/dev/ena/ena.c +++ head/sys/dev/ena/ena.c @@ -2777,10 +2777,7 @@ rc = ena_com_prepare_tx(io_sq, &ena_tx_ctx, &nb_hw_desc); if (unlikely(rc != 0)) { ena_trace(ENA_WARNING, "failed to prepare tx bufs\n"); - counter_enter(); - counter_u64_add_protected(tx_ring->tx_stats.queue_stop, 1); - counter_u64_add_protected(tx_ring->tx_stats.prepare_ctx_err, 1); - counter_exit(); + counter_u64_add(tx_ring->tx_stats.prepare_ctx_err, 1); goto dma_error; } Index: head/sys/dev/ena/ena_sysctl.c =================================================================== --- head/sys/dev/ena/ena_sysctl.c +++ head/sys/dev/ena/ena_sysctl.c @@ -119,15 +119,6 @@ dev_stats = &adapter->dev_stats; admin_stats = &adapter->ena_dev->admin_queue.stats; - SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "tx_timeout", - CTLFLAG_RD, &dev_stats->tx_timeout, - "Driver TX timeouts"); - SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "io_suspend", - CTLFLAG_RD, &dev_stats->io_suspend, - "IO queue suspends"); - SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "io_resume", - CTLFLAG_RD, &dev_stats->io_resume, - "IO queue resumes"); SYSCTL_ADD_COUNTER_U64(ctx, child, OID_AUTO, "wd_expired", CTLFLAG_RD, &dev_stats->wd_expired, "Watchdog expiry count"); @@ -166,22 +157,9 @@ &tx_stats->prepare_ctx_err, "TX buffer preparation failures"); SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, - "queue_wakeup", CTLFLAG_RD, - &tx_stats->queue_wakeup, "Queue wakeups"); - SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, "dma_mapping_err", CTLFLAG_RD, &tx_stats->dma_mapping_err, "DMA mapping failures"); SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, - "unsupported_desc_num", CTLFLAG_RD, - &tx_stats->unsupported_desc_num, - "Excessive descriptor packet discards"); - SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, - "napi_comp", CTLFLAG_RD, - &tx_stats->napi_comp, "Napi completions"); - SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, - "tx_poll", CTLFLAG_RD, - &tx_stats->tx_poll, "TX poll count"); - SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, "doorbells", CTLFLAG_RD, &tx_stats->doorbells, "Queue doorbells"); SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, @@ -191,9 +169,6 @@ "bad_req_id", CTLFLAG_RD, &tx_stats->bad_req_id, "Bad request id count"); SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, - "stops", CTLFLAG_RD, - &tx_stats->queue_stop, "Queue stops"); - SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, "mbuf_collapses", CTLFLAG_RD, &tx_stats->collapse, "Mbuf collapse count"); @@ -222,9 +197,6 @@ "bad_csum", CTLFLAG_RD, &rx_stats->bad_csum, "Bad RX checksum"); SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, - "page_alloc_fail", CTLFLAG_RD, - &rx_stats->page_alloc_fail, "Failed page allocs"); - SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, "mbuf_alloc_fail", CTLFLAG_RD, &rx_stats->mbuf_alloc_fail, "Failed mbuf allocs"); SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, @@ -233,9 +205,6 @@ SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, "bad_desc_num", CTLFLAG_RD, &rx_stats->bad_desc_num, "Bad descriptor count"); - SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, - "small_copy_len_pkt", CTLFLAG_RD, - &rx_stats->small_copy_len_pkt, "Small copy packet count"); SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, "bad_req_id", CTLFLAG_RD, &rx_stats->bad_req_id, "Bad request id count");