Patch "sfc: on MC reset, clear PIO buffer linkage in TXQs" has been added to the 3.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
sfc: on MC reset, clear PIO buffer linkage in TXQs
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sfc-on-mc-reset-clear-pio-buffer-linkage-in-txqs.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Fri Jun 17 20:28:14 PDT 2016
From: Edward Cree <[email protected]>
Date: Tue, 24 May 2016 18:53:36 +0100
Subject: sfc: on MC reset, clear PIO buffer linkage in TXQs
Status: RO
Content-Length: 1705
Lines: 56
From: Edward Cree <[email protected]>
[ Upstream commit c0795bf64cba4d1b796fdc5b74b33772841ed1bb ]
Otherwise, if we fail to allocate new PIO buffers, our TXQs will try to use the old ones, which aren't there any more.
--- drivers/net/ethernet/sfc/ef10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/net/ethernet/sfc/ef10.c +16 -0
@@ -451,6 +451,17 @@ fail: return rc; } +static void efx_ef10_forget_old_piobufs (struct efx_nic *efx) +{ +struct efx_channel *channel; +struct efx_tx_queue *tx_queue; + +/* All our existing PIO buffers went away */ +efx_for_each_channel (channel, efx) +efx_for_each_channel_tx_queue (tx_queue, channel) + tx_queue->piobuf =NULL ; +} +#else /* !EFX_USE_PIO */ static int efx_ef10_alloc_piobufs (struct efx_nic *efx,unsigned int n)
@@ -467,6 +478,10 @@ static void efx_ef10_free_piobufs(struct { } +static void efx_ef10_forget_old_piobufs (struct efx_nic *efx) +{ +} +#endif /* EFX_USE_PIO */ static void efx_ef10_remove (struct efx_nic *efx)
@@ -698,6 +713,7 @@ static void efx_ef10_reset_mc_allocation nic_data->must_realloc_vis = true; nic_data->must_restore_filters = true; nic_data->must_restore_piobufs = true; +efx_ef10_forget_old_piobufs (efx); nic_data->rx_rss_context =EFX_EF10_RSS_CONTEXT_INVALID ; }
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/sfc-on-mc-reset-clear-pio-buffer-linkage-in-txqs.patch