Re: [PATCH net-next 4/8] bnxt_en: Fill HW RSS table from the RSS logical indirection table.

[Jakub Kicinski <kuba@kernel.org>]

On Mon, 29 Jun 2020 02:34:20 -0400 Michael Chan wrote:
> Now that we have the logical table, we can fill the HW RSS table
> using the logical table's entries and converting them to the HW
> specific format.  Re-initialize the logical table to standard
> distribution if the number of RX rings changes during ring reservation.
> 
> Signed-off-by: Michael Chan <michael.chan@broadcom.com>
> ---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c | 89 ++++++++++++++++++-------------
>  1 file changed, 53 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index 7bf843d..87d37dc 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -4882,9 +4882,52 @@ int bnxt_get_nr_rss_ctxs(struct bnxt *bp, int rx_rings)
>  	return 1;
>  }
>  
> +static void __bnxt_fill_hw_rss_tbl(struct bnxt *bp, struct bnxt_vnic_info *vnic)
> +{
> +	bool no_rss = !(vnic->flags & BNXT_VNIC_RSS_FLAG);
> +	u16 i, j;
> +
> +	/* Fill the RSS indirection table with ring group ids */
> +	for (i = 0, j = 0; i < HW_HASH_INDEX_SIZE; i++) {
> +		if (!no_rss)
> +			j = bp->rss_indir_tbl[i];
> +		vnic->rss_table[i] = cpu_to_le16(vnic->fw_grp_ids[j]);
> +	}
> +}
> +
> +static void __bnxt_fill_hw_rss_tbl_p5(struct bnxt *bp,
> +				      struct bnxt_vnic_info *vnic)
> +{
> +	__le16 *ring_tbl = vnic->rss_table;
> +	struct bnxt_rx_ring_info *rxr;
> +	u16 tbl_size, i;
> +
> +	tbl_size = (bp->rx_nr_rings + BNXT_RSS_TABLE_ENTRIES_P5 - 1) &
> +		   ~(BNXT_RSS_TABLE_ENTRIES_P5 - 1);

nit: DIV_ROUND_UP() ?

> +	for (i = 0; i < tbl_size; i++) {
> +		u16 ring_id, j;
> +
> +		j = bp->rss_indir_tbl[i];
> +		rxr = &bp->rx_ring[j];
> +
> +		ring_id = rxr->rx_ring_struct.fw_ring_id;
> +		*ring_tbl++ = cpu_to_le16(ring_id);
> +		ring_id = bnxt_cp_ring_for_rx(bp, rxr);
> +		*ring_tbl++ = cpu_to_le16(ring_id);
> +	}
> +}
> +

> @@ -8252,6 +8267,8 @@ 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(nn->dp.netdev))

> +	bnxt_set_dflt_rss_indir_tbl(bp);
> +
>  	if (rc) {
>  		netdev_err(bp->dev, "ring reservation/IRQ init failure rc: %d\n", rc);
>  		return rc;