lkml.org 
[lkml]   [2022]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 07/21] i40e: Fix incorrect netdevs real number of RX/TX queues
    Date
    From: Jedrzej Jagielski <jedrzej.jagielski@intel.com>

    commit e738451d78b2f8a9635d66c6a87f304b4d965f7a upstream.

    There was a wrong queues representation in sysfs during
    driver's reinitialization in case of online cpus number is
    less than combined queues. It was caused by stopped
    NetworkManager, which is responsible for calling vsi_open
    function during driver's initialization.
    In specific situation (ex. 12 cpus online) there were 16 queues
    in /sys/class/net/<iface>/queues. In case of modifying queues with
    value higher, than number of online cpus, then it caused write
    errors and other errors.
    Add updating of sysfs's queues representation during driver
    initialization.

    Fixes: 41c445ff0f48 ("i40e: main driver core")
    Signed-off-by: Lukasz Cieplicki <lukaszx.cieplicki@intel.com>
    Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
    Tested-by: Gurucharan G <gurucharanx.g@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/intel/i40e/i40e_main.c | 32 +++++++++++++++++++++-------
    1 file changed, 25 insertions(+), 7 deletions(-)

    --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
    +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
    @@ -7741,6 +7741,27 @@ int i40e_open(struct net_device *netdev)
    }

    /**
    + * i40e_netif_set_realnum_tx_rx_queues - Update number of tx/rx queues
    + * @vsi: vsi structure
    + *
    + * This updates netdev's number of tx/rx queues
    + *
    + * Returns status of setting tx/rx queues
    + **/
    +static int i40e_netif_set_realnum_tx_rx_queues(struct i40e_vsi *vsi)
    +{
    + int ret;
    +
    + ret = netif_set_real_num_rx_queues(vsi->netdev,
    + vsi->num_queue_pairs);
    + if (ret)
    + return ret;
    +
    + return netif_set_real_num_tx_queues(vsi->netdev,
    + vsi->num_queue_pairs);
    +}
    +
    +/**
    * i40e_vsi_open -
    * @vsi: the VSI to open
    *
    @@ -7776,13 +7797,7 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
    goto err_setup_rx;

    /* Notify the stack of the actual queue counts. */
    - err = netif_set_real_num_tx_queues(vsi->netdev,
    - vsi->num_queue_pairs);
    - if (err)
    - goto err_set_queues;
    -
    - err = netif_set_real_num_rx_queues(vsi->netdev,
    - vsi->num_queue_pairs);
    + err = i40e_netif_set_realnum_tx_rx_queues(vsi);
    if (err)
    goto err_set_queues;

    @@ -12811,6 +12826,9 @@ struct i40e_vsi *i40e_vsi_setup(struct i
    ret = i40e_config_netdev(vsi);
    if (ret)
    goto err_netdev;
    + ret = i40e_netif_set_realnum_tx_rx_queues(vsi);
    + if (ret)
    + goto err_netdev;
    ret = register_netdev(vsi->netdev);
    if (ret)
    goto err_netdev;

    \
     
     \ /
      Last update: 2022-01-10 08:32    [W:4.316 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site