lkml.org 
[lkml]   [2016]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.6 16/81] sfc: on MC reset, clear PIO buffer linkage in TXQs
    Date
    4.6-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Edward Cree <ecree@solarflare.com>

    [ 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.

    Fixes: 183233bec810 "sfc: Allocate and link PIO buffers; map them with write-combining"
    Signed-off-by: Edward Cree <ecree@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/sfc/ef10.c | 16 ++++++++++++++++
    1 file changed, 16 insertions(+)

    --- a/drivers/net/ethernet/sfc/ef10.c
    +++ b/drivers/net/ethernet/sfc/ef10.c
    @@ -619,6 +619,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)
    @@ -635,6 +646,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)
    @@ -1018,6 +1033,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;

    /* Driver-created vswitches and vports must be re-created */

    \
     
     \ /
      Last update: 2016-06-23 01:21    [W:4.302 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site