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

sfc: farch: fix TX queue lookup in TX flush done handling 



We're starting from a TXQ instance number ('qid'), not a TXQ type, so
 efx_get_tx_queue() is inappropriate (and could return NULL, leading
 to panics).

Fixes: 12804793 ("sfc: decouple TXQ type from label")
Reported-by: default avatarTrevor Hemsley <themsley@voiceflex.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4acd4764

drivers/net/ethernet/sfc/farch.c

+4 −4
Original line number Diff line number Diff line
@@ -1081,18 +1081,18 @@ static void 
efx_farch_handle_tx_flush_done(struct efx_nic *efx, efx_qword_t *event)

{

	struct efx_tx_queue *tx_queue;

	struct efx_channel *channel;

	int qid;



	qid = EFX_QWORD_FIELD(*event, FSF_AZ_DRIVER_EV_SUBDATA);

	if (qid < EFX_MAX_TXQ_PER_CHANNEL * (efx->n_tx_channels + efx->n_extra_tx_channels)) {

		tx_queue = efx_get_tx_queue(efx, qid / EFX_MAX_TXQ_PER_CHANNEL,

					    qid % EFX_MAX_TXQ_PER_CHANNEL);

		if (atomic_cmpxchg(&tx_queue->flush_outstanding, 1, 0)) {

		channel = efx_get_tx_channel(efx, qid / EFX_MAX_TXQ_PER_CHANNEL);

		tx_queue = channel->tx_queue + (qid % EFX_MAX_TXQ_PER_CHANNEL);

		if (atomic_cmpxchg(&tx_queue->flush_outstanding, 1, 0))

			efx_farch_magic_event(tx_queue->channel,

					      EFX_CHANNEL_MAGIC_TX_DRAIN(tx_queue));

	}

}

}



/* If this flush done event corresponds to a &struct efx_rx_queue: If the flush

 * was successful then send an %EFX_CHANNEL_MAGIC_RX_DRAIN, otherwise add