lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 039/124] IB/ipoib: Fix for notify send CQ failure messages
    Date
    From: Alex Estrin <alex.estrin@intel.com>

    [ Upstream commit 809cb6955650d892c6ef95f1d55f28fceded0ce1 ]

    If IB_CQ_REPORT_MISSED_EVENTS flag is passed in ib_req_notify_cq()
    it may return positive value indicating non-empty CQ.
    If return code not verified the log might be flooded with false
    warning messages "request notify on send CQ failed".

    Fixes: 8966e28d2e40 ("IB/ipoib: Use NAPI in UD/TX flows")
    Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
    Signed-off-by: Alex Estrin <alex.estrin@intel.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 ++++++----
    drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +-
    2 files changed, 7 insertions(+), 5 deletions(-)

    diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
    index 71ea9e26666c..c075d6850ed3 100644
    --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
    +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
    @@ -766,12 +766,14 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_
    skb_orphan(skb);
    skb_dst_drop(skb);

    - if (netif_queue_stopped(dev))
    - if (ib_req_notify_cq(priv->send_cq, IB_CQ_NEXT_COMP |
    - IB_CQ_REPORT_MISSED_EVENTS)) {
    + if (netif_queue_stopped(dev)) {
    + rc = ib_req_notify_cq(priv->send_cq, IB_CQ_NEXT_COMP |
    + IB_CQ_REPORT_MISSED_EVENTS);
    + if (unlikely(rc < 0))
    ipoib_warn(priv, "IPoIB/CM:request notify on send CQ failed\n");
    + else if (rc)
    napi_schedule(&priv->send_napi);
    - }
    + }

    rc = post_send(priv, tx, tx->tx_head & (ipoib_sendq_size - 1), tx_req);
    if (unlikely(rc)) {
    diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
    index e6151a29c412..28658080e761 100644
    --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
    +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
    @@ -644,7 +644,7 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb,

    if (netif_queue_stopped(dev))
    if (ib_req_notify_cq(priv->send_cq, IB_CQ_NEXT_COMP |
    - IB_CQ_REPORT_MISSED_EVENTS))
    + IB_CQ_REPORT_MISSED_EVENTS) < 0)
    ipoib_warn(priv, "request notify on send CQ failed\n");

    rc = post_send(priv, priv->tx_head & (ipoib_sendq_size - 1),
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 23:34    [W:4.239 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site