Page MenuHomeFreeBSD
Files F154059730

D40765.diff
No OneTemporary
Actions

D40765.diff
View Options

diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c
--- a/sys/dev/ena/ena.c
+++ b/sys/dev/ena/ena.c
@@ -3479,6 +3479,15 @@
ENA_LOCK_UNLOCK();
}
+static void
+ena_free_stats(struct ena_adapter *adapter)
+{
+ ena_free_counters((counter_u64_t *)&adapter->hw_stats,
+ sizeof(struct ena_hw_stats));
+ ena_free_counters((counter_u64_t *)&adapter->dev_stats,
+ sizeof(struct ena_stats_dev));
+
+}
/**
* ena_attach - Device Initialization Routine
* @pdev: device information struct
@@ -3656,6 +3665,13 @@
/* initialize rings basic information */
ena_init_io_rings(adapter);
+ /* Initialize statistics */
+ ena_alloc_counters((counter_u64_t *)&adapter->dev_stats,
+ sizeof(struct ena_stats_dev));
+ ena_alloc_counters((counter_u64_t *)&adapter->hw_stats,
+ sizeof(struct ena_hw_stats));
+ ena_sysctl_add_nodes(adapter);
+
/* setup network interface */
rc = ena_setup_ifnet(pdev, adapter, &get_feat_ctx);
if (unlikely(rc != 0)) {
@@ -3677,13 +3693,6 @@
taskqueue_start_threads(&adapter->metrics_tq, 1, PI_NET, "%s metricsq",
device_get_nameunit(adapter->pdev));
- /* Initialize statistics */
- ena_alloc_counters((counter_u64_t *)&adapter->dev_stats,
- sizeof(struct ena_stats_dev));
- ena_alloc_counters((counter_u64_t *)&adapter->hw_stats,
- sizeof(struct ena_hw_stats));
- ena_sysctl_add_nodes(adapter);
-
#ifdef DEV_NETMAP
rc = ena_netmap_attach(adapter);
if (rc != 0) {
@@ -3706,6 +3715,7 @@
ether_ifdetach(adapter->ifp);
#endif /* DEV_NETMAP */
err_msix_free:
+ ena_free_stats(adapter);
ena_com_dev_reset(adapter->ena_dev, ENA_REGS_RESET_INIT_ERR);
ena_free_mgmnt_irq(adapter);
ena_disable_msix(adapter);
@@ -3778,10 +3788,7 @@
netmap_detach(adapter->ifp);
#endif /* DEV_NETMAP */
- ena_free_counters((counter_u64_t *)&adapter->hw_stats,
- sizeof(struct ena_hw_stats));
- ena_free_counters((counter_u64_t *)&adapter->dev_stats,
- sizeof(struct ena_stats_dev));
+ ena_free_stats(adapter);
rc = ena_free_rx_dma_tag(adapter);
if (unlikely(rc != 0))

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 26, 8:22 PM (14 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32196770
Default Alt Text
D40765.diff (1 KB)

Event Timeline