4.15-stable review patch.  If anyone has any objections, please let me know.

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

From: Alex Estrin <alex.est...@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.marcinis...@intel.com>
Signed-off-by: Alex Estrin <alex.est...@intel.com>
Signed-off-by: Jason Gunthorpe <j...@mellanox.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/infiniband/ulp/ipoib/ipoib_cm.c |   10 ++++++----
 drivers/infiniband/ulp/ipoib/ipoib_ib.c |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

--- 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 *de
        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)) {
--- 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, s
 
        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),


Reply via email to