lkml.org 
[lkml]   [2013]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC 74/77] vmxnet3: Limit number of rx queues to 1 if per-queue MSI-Xs failed
    Date
    Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
    ---
    drivers/net/vmxnet3/vmxnet3_drv.c | 16 ++++++++--------
    1 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
    index 3df7f32..00dc0d0 100644
    --- a/drivers/net/vmxnet3/vmxnet3_drv.c
    +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
    @@ -2814,12 +2814,14 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)

    err = vmxnet3_acquire_msix_vectors(adapter,
    adapter->intr.num_intrs);
    - /* If we cannot allocate one MSIx vector per queue
    - * then limit the number of rx queues to 1
    - */
    - if (err == VMXNET3_LINUX_MIN_MSIX_VECT) {
    - if (adapter->share_intr != VMXNET3_INTR_BUDDYSHARE
    - || adapter->num_rx_queues != 1) {
    + if (!err) {
    + /* If we cannot allocate one MSIx vector per queue
    + * then limit the number of rx queues to 1
    + */
    + if ((adapter->intr.num_intrs ==
    + VMXNET3_LINUX_MIN_MSIX_VECT) &&
    + ((adapter->share_intr != VMXNET3_INTR_BUDDYSHARE) ||
    + (adapter->num_rx_queues != 1))) {
    adapter->share_intr = VMXNET3_INTR_TXSHARE;
    netdev_err(adapter->netdev,
    "Number of rx queues : 1\n");
    @@ -2829,8 +2831,6 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
    }
    return;
    }
    - if (!err)
    - return;

    /* If we cannot allocate MSIx vectors use only one rx queue */
    dev_info(&adapter->pdev->dev,
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2013-10-02 23:41    [W:4.265 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site