[src/netbsd-9]: src/sys/dev/pci Pull up following revision(s) (requested by j...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2170de4e5d52
branches:  netbsd-9
changeset: 950259:2170de4e5d52
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jan 23 13:01:10 2021 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #1186):

        sys/dev/pci/if_ena.c: revision 1.27

PR kern/55942: destroyed ena(4) evcnts cause panic

Fix event counter teardown code. From KUSABA Takeshi

diffstat:

 sys/dev/pci/if_ena.c |  27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diffs (91 lines):

diff -r e2a98e8c304f -r 2170de4e5d52 sys/dev/pci/if_ena.c
--- a/sys/dev/pci/if_ena.c      Fri Jan 15 17:47:48 2021 +0000
+++ b/sys/dev/pci/if_ena.c      Sat Jan 23 13:01:10 2021 +0000
@@ -36,7 +36,7 @@
 #if 0
 __FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.15.2.3 2020/08/05 14:59:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.15.2.4 2021/01/23 13:01:10 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -470,18 +470,20 @@
            + sizeof(st->rx_drops) == sizeof(*st));
 }
 static inline void
-ena_free_counters(struct evcnt *begin, int size)
+ena_free_counters(struct evcnt *begin, int size, int offset)
 {
        struct evcnt *end = (struct evcnt *)((char *)begin + size);
+       begin = (struct evcnt *)((char *)begin + offset);
 
        for (; begin < end; ++begin)
                counter_u64_free(*begin);
 }
 
 static inline void
-ena_reset_counters(struct evcnt *begin, int size)
+ena_reset_counters(struct evcnt *begin, int size, int offset)
 {
        struct evcnt *end = (struct evcnt *)((char *)begin + size);
+       begin = (struct evcnt *)((char *)begin + offset);
 
        for (; begin < end; ++begin)
                counter_u64_zero(*begin);
@@ -566,9 +568,9 @@
        struct ena_ring *rxr = &adapter->rx_ring[qid];
 
        ena_free_counters((struct evcnt *)&txr->tx_stats,
-           sizeof(txr->tx_stats));
+           sizeof(txr->tx_stats), offsetof(struct ena_stats_tx, cnt));
        ena_free_counters((struct evcnt *)&rxr->rx_stats,
-           sizeof(rxr->rx_stats));
+           sizeof(rxr->rx_stats), offsetof(struct ena_stats_rx, cnt));
 
        ENA_RING_MTX_LOCK(txr);
        drbr_free(txr->br, M_DEVBUF);
@@ -670,7 +672,8 @@
 
        /* Reset TX statistics. */
        ena_reset_counters((struct evcnt *)&tx_ring->tx_stats,
-           sizeof(tx_ring->tx_stats));
+           sizeof(tx_ring->tx_stats),
+           offsetof(struct ena_stats_tx, cnt));
 
        tx_ring->next_to_use = 0;
        tx_ring->next_to_clean = 0;
@@ -867,7 +870,8 @@
 
        /* Reset RX statistics. */
        ena_reset_counters((struct evcnt *)&rx_ring->rx_stats,
-           sizeof(rx_ring->rx_stats));
+           sizeof(rx_ring->rx_stats),
+           offsetof(struct ena_stats_rx, cnt));
 
        rx_ring->next_to_clean = 0;
        rx_ring->next_to_use = 0;
@@ -2210,7 +2214,8 @@
 
        ena_refill_all_rx_bufs(adapter);
        ena_reset_counters((struct evcnt *)&adapter->hw_stats,
-           sizeof(adapter->hw_stats));
+           sizeof(adapter->hw_stats),
+           offsetof(struct ena_hw_stats, rx_packets));
 
        return (0);
 }
@@ -3905,9 +3910,11 @@
        ena_free_all_io_rings_resources(adapter);
 
        ena_free_counters((struct evcnt *)&adapter->hw_stats,
-           sizeof(struct ena_hw_stats));
+           sizeof(struct ena_hw_stats),
+           offsetof(struct ena_hw_stats, rx_packets));
        ena_free_counters((struct evcnt *)&adapter->dev_stats,
-           sizeof(struct ena_stats_dev));
+           sizeof(struct ena_stats_dev),
+            offsetof(struct ena_stats_dev, wd_expired));
 
        if (likely(adapter->rss_support))
                ena_com_rss_destroy(ena_dev);