Commit 5fa65524 authored Aug 26, 2020 by Edwin Peer Committed by David S. Miller Aug 26, 2020

bnxt_en: init RSS table for Minimal-Static VF reservation



There are no VF rings available during probe when the device is configured
using the Minimal-Static reservation strategy. In this case, the RSS
indirection table can only be initialized later, during bnxt_open_nic().
However, this was not happening because the rings will already have been
reserved via bnxt_init_dflt_ring_mode(), causing bnxt_need_reserve_rings()
to return false in bnxt_reserve_rings() and bypass the RSS table init.

Solve this by pushing the call to bnxt_set_dflt_rss_indir_tbl() into
__bnxt_reserve_rings(), which is common to both paths and is called
whenever ring configuration is changed. After doing this, the RSS table
init that must be called from bnxt_init_one() happens implicitly via
bnxt_set_default_rings(), necessitating doing the allocation earlier in
order to avoid a null pointer dereference.

Fixes: bd3191b5 ("bnxt_en: Implement ethtool -X to set indirection table.")
Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 12cce90b

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -6219,6 +6219,9 @@ static int __bnxt_reserve_rings(struct bnxt *bp)
		if (!tx \|\| !rx \|\| !cp \|\| !grp \|\| !vnic \|\| !stat)
		return -ENOMEM;

		if (!netif_is_rxfh_configured(bp->dev))
		bnxt_set_dflt_rss_indir_tbl(bp);

		return rc;
		}

		@@ -8500,9 +8503,6 @@ int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init)
		rc = bnxt_init_int_mode(bp);
		bnxt_ulp_irq_restart(bp, rc);
		}
		if (!netif_is_rxfh_configured(bp->dev))
		bnxt_set_dflt_rss_indir_tbl(bp);

		if (rc) {
		netdev_err(bp->dev, "ring reservation/IRQ init failure rc: %d\n", rc);
		return rc;
		@@ -12209,6 +12209,10 @@ static int bnxt_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		if (BNXT_CHIP_P5(bp))
		bp->flags \|= BNXT_FLAG_CHIP_P5;

		rc = bnxt_alloc_rss_indir_tbl(bp);
		if (rc)
		goto init_err_pci_clean;

		rc = bnxt_fw_init_one_p2(bp);
		if (rc)
		goto init_err_pci_clean;
		@@ -12313,11 +12317,6 @@ static int bnxt_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		*/
		bp->tx_nr_rings_per_tc = bp->tx_nr_rings;

		rc = bnxt_alloc_rss_indir_tbl(bp);
		if (rc)
		goto init_err_pci_clean;
		bnxt_set_dflt_rss_indir_tbl(bp);

		if (BNXT_PF(bp)) {
		if (!bnxt_pf_wq) {
		bnxt_pf_wq =

Admin message