Commit a81dcd85 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: assign TXQs without gaps 



Since we only allocate VIs for the number of TXQs we actually need, we
 cannot naively use "channel * TXQ_TYPES + txq" for the TXQ number, as
 this has gaps (when efx->tx_queues_per_channel < EFX_TXQ_TYPES) and
 thus overruns the driver's VI allocations, causing the firmware to
 reject the MC_CMD_INIT_TXQ based on INSTANCE.
Thus, we distinguish INSTANCE (stored in tx_queue->queue) from LABEL
 (tx_queue->label); the former is allocated starting from 0 in
 efx_set_channels(), while the latter is simply the txq type (index in
 channel->tx_queue array).
To simplify things, rather than changing tx_queues_per_channel after
 setting up TXQs, make Siena always probe its HIGHPRI queues at start
 of day, rather than deferring it until tc mqprio enables them.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69a70496

drivers/net/ethernet/sfc/ef10.c

+1 −1
Original line number Diff line number Diff line
@@ -2244,7 +2244,7 @@ static u32 efx_ef10_tso_versions(struct efx_nic *efx) 


static void efx_ef10_tx_init(struct efx_tx_queue *tx_queue)

{

	bool csum_offload = tx_queue->queue & EFX_TXQ_TYPE_OFFLOAD;

	bool csum_offload = tx_queue->label & EFX_TXQ_TYPE_OFFLOAD;

	struct efx_channel *channel = tx_queue->channel;

	struct efx_nic *efx = tx_queue->efx;

	struct efx_ef10_nic_data *nic_data;

drivers/net/ethernet/sfc/efx_channels.c

+28 −10
Original line number Diff line number Diff line
@@ -524,7 +524,8 @@ efx_alloc_channel(struct efx_nic *efx, int i, struct efx_channel *old_channel) 
	for (j = 0; j < EFX_TXQ_TYPES; j++) {

		tx_queue = &channel->tx_queue[j];

		tx_queue->efx = efx;

		tx_queue->queue = i * EFX_TXQ_TYPES + j;

		tx_queue->queue = -1;

		tx_queue->label = j;

		tx_queue->channel = channel;

	}
@@ -853,8 +854,9 @@ rollback: 


int efx_set_channels(struct efx_nic *efx)

{

	struct efx_channel *channel;

	struct efx_tx_queue *tx_queue;

	struct efx_channel *channel;

	unsigned int next_queue = 0;

	int xdp_queue_number;

	int rc;
@@ -884,15 +886,31 @@ int efx_set_channels(struct efx_nic *efx) 
		else

			channel->rx_queue.core_index = -1;



		if (channel->channel >= efx->tx_channel_offset) {

			if (efx_channel_is_xdp_tx(channel)) {

				efx_for_each_channel_tx_queue(tx_queue, channel) {

			tx_queue->queue -= (efx->tx_channel_offset *

					    EFX_TXQ_TYPES);



			if (efx_channel_is_xdp_tx(channel) &&

			    xdp_queue_number < efx->xdp_tx_queue_count) {

					tx_queue->queue = next_queue++;

					netif_dbg(efx, drv, efx->net_dev, "Channel %u TXQ %u is XDP %u, HW %u\n",

						  channel->channel, tx_queue->label,

						  xdp_queue_number, tx_queue->queue);

					/* We may have a few left-over XDP TX

					 * queues owing to xdp_tx_queue_count

					 * not dividing evenly by EFX_TXQ_TYPES.

					 * We still allocate and probe those

					 * TXQs, but never use them.

					 */

					if (xdp_queue_number < efx->xdp_tx_queue_count)

						efx->xdp_tx_queues[xdp_queue_number] = tx_queue;

					xdp_queue_number++;

				}

			} else {

				efx_for_each_channel_tx_queue(tx_queue, channel) {

					tx_queue->queue = next_queue++;

					netif_dbg(efx, drv, efx->net_dev, "Channel %u TXQ %u is HW %u\n",

						  channel->channel, tx_queue->label,

						  tx_queue->queue);

				}

			}

		}

	}

drivers/net/ethernet/sfc/ethtool_common.c

+3 −4
Original line number Diff line number Diff line
@@ -287,8 +287,7 @@ static void efx_fill_test(unsigned int test_index, u8 *strings, u64 *data, 
}



#define EFX_CHANNEL_NAME(_channel) "chan%d", _channel->channel

#define EFX_TX_QUEUE_NAME(_tx_queue) "txq%d", _tx_queue->queue

#define EFX_RX_QUEUE_NAME(_rx_queue) "rxq%d", _rx_queue->queue

#define EFX_TX_QUEUE_NAME(_tx_queue) "txq%d", _tx_queue->label

#define EFX_LOOPBACK_NAME(_mode, _counter)			\

	"loopback.%s." _counter, STRING_TABLE_LOOKUP(_mode, efx_loopback_mode)
@@ -316,11 +315,11 @@ static int efx_fill_loopback_test(struct efx_nic *efx, 


	efx_for_each_channel_tx_queue(tx_queue, channel) {

		efx_fill_test(test_index++, strings, data,

			      &lb_tests->tx_sent[tx_queue->queue],

			      &lb_tests->tx_sent[tx_queue->label],

			      EFX_TX_QUEUE_NAME(tx_queue),

			      EFX_LOOPBACK_NAME(mode, "tx_sent"));

		efx_fill_test(test_index++, strings, data,

			      &lb_tests->tx_done[tx_queue->queue],

			      &lb_tests->tx_done[tx_queue->label],

			      EFX_TX_QUEUE_NAME(tx_queue),

			      EFX_LOOPBACK_NAME(mode, "tx_done"));

	}

drivers/net/ethernet/sfc/farch.c

+3 −3
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ int efx_farch_tx_probe(struct efx_tx_queue *tx_queue) 


void efx_farch_tx_init(struct efx_tx_queue *tx_queue)

{

	int csum = tx_queue->queue & EFX_TXQ_TYPE_OFFLOAD;

	int csum = tx_queue->label & EFX_TXQ_TYPE_OFFLOAD;

	struct efx_nic *efx = tx_queue->efx;

	efx_oword_t reg;
@@ -395,7 +395,7 @@ void efx_farch_tx_init(struct efx_tx_queue *tx_queue) 
			      FRF_AZ_TX_DESCQ_EVQ_ID,

			      tx_queue->channel->channel,

			      FRF_AZ_TX_DESCQ_OWNER_ID, 0,

			      FRF_AZ_TX_DESCQ_LABEL, tx_queue->queue,

			      FRF_AZ_TX_DESCQ_LABEL, tx_queue->label,

			      FRF_AZ_TX_DESCQ_SIZE,

			      __ffs(tx_queue->txd.entries),

			      FRF_AZ_TX_DESCQ_TYPE, 0,
@@ -409,7 +409,7 @@ void efx_farch_tx_init(struct efx_tx_queue *tx_queue) 


	EFX_POPULATE_OWORD_1(reg,

			     FRF_BZ_TX_PACE,

			     (tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI) ?

			     (tx_queue->label & EFX_TXQ_TYPE_HIGHPRI) ?

			     FFE_BZ_TX_PACE_OFF :

			     FFE_BZ_TX_PACE_RESERVED);

	efx_writeo_table(efx, &reg, FR_BZ_TX_PACE_TBL, tx_queue->queue);

drivers/net/ethernet/sfc/mcdi_functions.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ int efx_mcdi_tx_init(struct efx_tx_queue *tx_queue, bool tso_v2) 
{

	MCDI_DECLARE_BUF(inbuf, MC_CMD_INIT_TXQ_IN_LEN(EFX_MAX_DMAQ_SIZE * 8 /

						       EFX_BUF_SIZE));

	bool csum_offload = tx_queue->queue & EFX_TXQ_TYPE_OFFLOAD;

	bool csum_offload = tx_queue->label & EFX_TXQ_TYPE_OFFLOAD;

	size_t entries = tx_queue->txd.buf.len / EFX_BUF_SIZE;

	struct efx_channel *channel = tx_queue->channel;

	struct efx_nic *efx = tx_queue->efx;
@@ -176,7 +176,7 @@ int efx_mcdi_tx_init(struct efx_tx_queue *tx_queue, bool tso_v2) 


	MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_SIZE, tx_queue->ptr_mask + 1);

	MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_TARGET_EVQ, channel->channel);

	MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_LABEL, tx_queue->queue);

	MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_LABEL, tx_queue->label);

	MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_INSTANCE, tx_queue->queue);

	MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_OWNER_ID, 0);

	MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_PORT_ID, efx->vport_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE