Author: np
Date: Tue Nov 24 00:17:05 2020
New Revision: 367970
URL: https://svnweb.freebsd.org/changeset/base/367970
Log:
MFC r366929 and r367608.
r366929:
cxgbe(4): fix the size of the iq/eq maps.
The firmware can allocate ingress and egress context ids anywhere from
its configured range. Size the iq/eq maps to match the entire range
instead of assuming that the firmware always allocates the first
available context id.
Reported by: Baptiste Wicht @ Verisign
r367608:
cxgbev(4): Make sure that the iq/eq map sizes are correct for VFs.
This should have been part of r366929.
Sponsored by: Chelsio Communications
Modified:
stable/12/sys/dev/cxgbe/adapter.h
stable/12/sys/dev/cxgbe/t4_main.c
stable/12/sys/dev/cxgbe/t4_netmap.c
stable/12/sys/dev/cxgbe/t4_sge.c
stable/12/sys/dev/cxgbe/t4_vf.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/cxgbe/adapter.h
==============================================================================
--- stable/12/sys/dev/cxgbe/adapter.h Tue Nov 24 00:12:42 2020
(r367969)
+++ stable/12/sys/dev/cxgbe/adapter.h Tue Nov 24 00:17:05 2020
(r367970)
@@ -785,6 +785,8 @@ struct sge {
uint16_t iq_base; /* first abs_id */
int eq_start; /* first cntxt_id */
int eq_base; /* first abs_id */
+ int iqmap_sz;
+ int eqmap_sz;
struct sge_iq **iqmap; /* iq->cntxt_id to iq mapping */
struct sge_eq **eqmap; /* eq->cntxt_id to eq mapping */
Modified: stable/12/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/12/sys/dev/cxgbe/t4_main.c Tue Nov 24 00:12:42 2020
(r367969)
+++ stable/12/sys/dev/cxgbe/t4_main.c Tue Nov 24 00:17:05 2020
(r367970)
@@ -1311,6 +1311,8 @@ t4_attach(device_t dev)
s->nm_txq = malloc(s->nnmtxq * sizeof(struct sge_nm_txq),
M_CXGBE, M_ZERO | M_WAITOK);
#endif
+ MPASS(s->niq <= s->iqmap_sz);
+ MPASS(s->neq <= s->eqmap_sz);
s->ctrlq = malloc(nports * sizeof(struct sge_wrq), M_CXGBE,
M_ZERO | M_WAITOK);
@@ -1318,9 +1320,9 @@ t4_attach(device_t dev)
M_ZERO | M_WAITOK);
s->txq = malloc(s->ntxq * sizeof(struct sge_txq), M_CXGBE,
M_ZERO | M_WAITOK);
- s->iqmap = malloc(s->niq * sizeof(struct sge_iq *), M_CXGBE,
+ s->iqmap = malloc(s->iqmap_sz * sizeof(struct sge_iq *), M_CXGBE,
M_ZERO | M_WAITOK);
- s->eqmap = malloc(s->neq * sizeof(struct sge_eq *), M_CXGBE,
+ s->eqmap = malloc(s->eqmap_sz * sizeof(struct sge_eq *), M_CXGBE,
M_ZERO | M_WAITOK);
sc->irq = malloc(sc->intr_count * sizeof(struct irq), M_CXGBE,
@@ -4298,6 +4300,19 @@ get_params__post_init(struct adapter *sc)
("%s: L2 table size (%u) larger than expected (%u)",
__func__, sc->vres.l2t.size, L2T_SIZE));
sc->params.core_vdd = val[6];
+
+ param[0] = FW_PARAM_PFVF(IQFLINT_END);
+ param[1] = FW_PARAM_PFVF(EQ_END);
+ rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 2, param, val);
+ if (rc != 0) {
+ device_printf(sc->dev,
+ "failed to query parameters (post_init2): %d.\n", rc);
+ return (rc);
+ }
+ MPASS((int)val[0] >= sc->sge.iq_start);
+ sc->sge.iqmap_sz = val[0] - sc->sge.iq_start + 1;
+ MPASS((int)val[1] >= sc->sge.eq_start);
+ sc->sge.eqmap_sz = val[1] - sc->sge.eq_start + 1;
if (chip_id(sc) >= CHELSIO_T6) {
Modified: stable/12/sys/dev/cxgbe/t4_netmap.c
==============================================================================
--- stable/12/sys/dev/cxgbe/t4_netmap.c Tue Nov 24 00:12:42 2020
(r367969)
+++ stable/12/sys/dev/cxgbe/t4_netmap.c Tue Nov 24 00:17:05 2020
(r367970)
@@ -188,9 +188,9 @@ alloc_nm_rxq_hwq(struct vi_info *vi, struct sge_nm_rxq
nm_rxq->iq_cntxt_id = be16toh(c.iqid);
nm_rxq->iq_abs_id = be16toh(c.physiqid);
cntxt_id = nm_rxq->iq_cntxt_id - sc->sge.iq_start;
- if (cntxt_id >= sc->sge.niq) {
+ if (cntxt_id >= sc->sge.iqmap_sz) {
panic ("%s: nm_rxq->iq_cntxt_id (%d) more than the max (%d)",
- __func__, cntxt_id, sc->sge.niq - 1);
+ __func__, cntxt_id, sc->sge.iqmap_sz - 1);
}
sc->sge.iqmap[cntxt_id] = (void *)nm_rxq;
@@ -201,9 +201,9 @@ alloc_nm_rxq_hwq(struct vi_info *vi, struct sge_nm_rxq
nm_rxq->fl_db_threshold = chip_id(sc) <= CHELSIO_T5 ? 8 : 4;
MPASS(nm_rxq->fl_sidx == na->num_rx_desc);
cntxt_id = nm_rxq->fl_cntxt_id - sc->sge.eq_start;
- if (cntxt_id >= sc->sge.neq) {
+ if (cntxt_id >= sc->sge.eqmap_sz) {
panic("%s: nm_rxq->fl_cntxt_id (%d) more than the max (%d)",
- __func__, cntxt_id, sc->sge.neq - 1);
+ __func__, cntxt_id, sc->sge.eqmap_sz - 1);
}
sc->sge.eqmap[cntxt_id] = (void *)nm_rxq;
@@ -300,9 +300,9 @@ alloc_nm_txq_hwq(struct vi_info *vi, struct sge_nm_txq
nm_txq->cntxt_id = G_FW_EQ_ETH_CMD_EQID(be32toh(c.eqid_pkd));
cntxt_id = nm_txq->cntxt_id - sc->sge.eq_start;
- if (cntxt_id >= sc->sge.neq)
+ if (cntxt_id >= sc->sge.eqmap_sz)
panic("%s: nm_txq->cntxt_id (%d) more than the max (%d)", __func__,
- cntxt_id, sc->sge.neq - 1);
+ cntxt_id, sc->sge.eqmap_sz - 1);
sc->sge.eqmap[cntxt_id] = (void *)nm_txq;
nm_txq->pidx = nm_txq->cidx = 0;
Modified: stable/12/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- stable/12/sys/dev/cxgbe/t4_sge.c Tue Nov 24 00:12:42 2020
(r367969)
+++ stable/12/sys/dev/cxgbe/t4_sge.c Tue Nov 24 00:17:05 2020
(r367970)
@@ -3442,9 +3442,9 @@ alloc_iq_fl(struct vi_info *vi, struct sge_iq *iq, str
iq->flags |= IQ_ALLOCATED;
cntxt_id = iq->cntxt_id - sc->sge.iq_start;
- if (cntxt_id >= sc->sge.niq) {
+ if (cntxt_id >= sc->sge.iqmap_sz) {
panic ("%s: iq->cntxt_id (%d) more than the max (%d)", __func__,
- cntxt_id, sc->sge.niq - 1);
+ cntxt_id, sc->sge.iqmap_sz - 1);
}
sc->sge.iqmap[cntxt_id] = iq;
@@ -3456,9 +3456,9 @@ alloc_iq_fl(struct vi_info *vi, struct sge_iq *iq, str
fl->pidx = fl->cidx = 0;
cntxt_id = fl->cntxt_id - sc->sge.eq_start;
- if (cntxt_id >= sc->sge.neq) {
+ if (cntxt_id >= sc->sge.eqmap_sz) {
panic("%s: fl->cntxt_id (%d) more than the max (%d)",
- __func__, cntxt_id, sc->sge.neq - 1);
+ __func__, cntxt_id, sc->sge.eqmap_sz - 1);
}
sc->sge.eqmap[cntxt_id] = (void *)fl;
@@ -4027,9 +4027,9 @@ ctrl_eq_alloc(struct adapter *sc, struct sge_eq *eq)
eq->cntxt_id = G_FW_EQ_CTRL_CMD_EQID(be32toh(c.cmpliqid_eqid));
cntxt_id = eq->cntxt_id - sc->sge.eq_start;
- if (cntxt_id >= sc->sge.neq)
+ if (cntxt_id >= sc->sge.eqmap_sz)
panic("%s: eq->cntxt_id (%d) more than the max (%d)", __func__,
- cntxt_id, sc->sge.neq - 1);
+ cntxt_id, sc->sge.eqmap_sz - 1);
sc->sge.eqmap[cntxt_id] = eq;
return (rc);
@@ -4073,9 +4073,9 @@ eth_eq_alloc(struct adapter *sc, struct vi_info *vi, s
eq->cntxt_id = G_FW_EQ_ETH_CMD_EQID(be32toh(c.eqid_pkd));
eq->abs_id = G_FW_EQ_ETH_CMD_PHYSEQID(be32toh(c.physeqid_pkd));
cntxt_id = eq->cntxt_id - sc->sge.eq_start;
- if (cntxt_id >= sc->sge.neq)
+ if (cntxt_id >= sc->sge.eqmap_sz)
panic("%s: eq->cntxt_id (%d) more than the max (%d)", __func__,
- cntxt_id, sc->sge.neq - 1);
+ cntxt_id, sc->sge.eqmap_sz - 1);
sc->sge.eqmap[cntxt_id] = eq;
return (rc);
@@ -4118,9 +4118,9 @@ ofld_eq_alloc(struct adapter *sc, struct vi_info *vi,
eq->cntxt_id = G_FW_EQ_OFLD_CMD_EQID(be32toh(c.eqid_pkd));
cntxt_id = eq->cntxt_id - sc->sge.eq_start;
- if (cntxt_id >= sc->sge.neq)
+ if (cntxt_id >= sc->sge.eqmap_sz)
panic("%s: eq->cntxt_id (%d) more than the max (%d)", __func__,
- cntxt_id, sc->sge.neq - 1);
+ cntxt_id, sc->sge.eqmap_sz - 1);
sc->sge.eqmap[cntxt_id] = eq;
return (rc);
Modified: stable/12/sys/dev/cxgbe/t4_vf.c
==============================================================================
--- stable/12/sys/dev/cxgbe/t4_vf.c Tue Nov 24 00:12:42 2020
(r367969)
+++ stable/12/sys/dev/cxgbe/t4_vf.c Tue Nov 24 00:17:05 2020
(r367970)
@@ -684,13 +684,16 @@ t4vf_attach(device_t dev)
s->neq += sc->params.nports; /* ctrl queues: 1 per port */
s->niq = s->nrxq + 1; /* 1 extra for firmware event queue */
+ s->iqmap_sz = s->niq;
+ s->eqmap_sz = s->neq;
+
s->rxq = malloc(s->nrxq * sizeof(struct sge_rxq), M_CXGBE,
M_ZERO | M_WAITOK);
s->txq = malloc(s->ntxq * sizeof(struct sge_txq), M_CXGBE,
M_ZERO | M_WAITOK);
- s->iqmap = malloc(s->niq * sizeof(struct sge_iq *), M_CXGBE,
+ s->iqmap = malloc(s->iqmap_sz * sizeof(struct sge_iq *), M_CXGBE,
M_ZERO | M_WAITOK);
- s->eqmap = malloc(s->neq * sizeof(struct sge_eq *), M_CXGBE,
+ s->eqmap = malloc(s->eqmap_sz * sizeof(struct sge_eq *), M_CXGBE,
M_ZERO | M_WAITOK);
sc->irq = malloc(sc->intr_count * sizeof(struct irq), M_CXGBE,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
