aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/oce
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2019-05-28 18:32:04 +0000
committerAlexander Motin <mav@FreeBSD.org>2019-05-28 18:32:04 +0000
commit3582828053556ca0e05ed9aab3e78008a0595e09 (patch)
tree09f468df4d9dcb06f63bb357b1b8a641c8e8d5d4 /sys/dev/oce
parent1bae1560eebda7d1e71ba288197b6a0ad520bbf7 (diff)
downloadsrc-3582828053556ca0e05ed9aab3e78008a0595e09.tar.gz
src-3582828053556ca0e05ed9aab3e78008a0595e09.zip
Fix array out of bound panic introduced in r306219.
As I see, different NICs in different configurations may have different numbers of TX and RX queues. The code was assuming 1:1 mapping between event queues (interrupts) and TX/RX queues. Since number of interrupts is set to maximum of TX and RX queues, when those two are different, the system is doomed. I have no documentation or deep knowledge about this hardware, so this change is based on general observations and code reading. If some of my guesses are wrong, please do better. I just confirmed HP NC550SFP NICs are working now. MFC after: 2 weeks Sponsored by: iXsystems, Inc.
Notes
Notes: svn path=/head/; revision=348332
Diffstat (limited to 'sys/dev/oce')
-rw-r--r--sys/dev/oce/oce_if.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 221a871a7ceb..44fb04fef791 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -2394,10 +2394,20 @@ oce_eqd_set_periodic(POCE_SOFTC sc)
goto modify_eqd;
}
- rq = sc->rq[i];
- rxpkts = rq->rx_stats.rx_pkts;
- wq = sc->wq[i];
- tx_reqs = wq->tx_stats.tx_reqs;
+ if (i == 0) {
+ rq = sc->rq[0];
+ rxpkts = rq->rx_stats.rx_pkts;
+ } else
+ rxpkts = 0;
+ if (i + 1 < sc->nrqs) {
+ rq = sc->rq[i + 1];
+ rxpkts += rq->rx_stats.rx_pkts;
+ }
+ if (i < sc->nwqs) {
+ wq = sc->wq[i];
+ tx_reqs = wq->tx_stats.tx_reqs;
+ } else
+ tx_reqs = 0;
now = ticks;
if (!aic->ticks || now < aic->ticks ||