From patchwork Mon Dec 6 19:00:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Heinz X-Patchwork-Id: 379612 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB6IxQcm016007 for ; Mon, 6 Dec 2010 19:00:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753003Ab0LFTAM (ORCPT ); Mon, 6 Dec 2010 14:00:12 -0500 Received: from avexcashub1.qlogic.com ([198.70.193.61]:42824 "EHLO avexcashub1.qlogic.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586Ab0LFTAM (ORCPT ); Mon, 6 Dec 2010 14:00:12 -0500 Received: from MNEXCASHUB1.qlogic.org (10.33.2.103) by avexcashub1.qlogic.org (10.1.4.161) with Microsoft SMTP Server (TLS) id 8.1.436.0; Mon, 6 Dec 2010 11:00:12 -0800 Received: from MNEXMB1.qlogic.org ([fe80::8516:7839:9549:6996]) by MNEXCASHUB1.qlogic.org ([::1]) with mapi; Mon, 6 Dec 2010 13:00:10 -0600 From: Mike Heinz To: "linux-rdma@vger.kernel.org" Date: Mon, 6 Dec 2010 13:00:09 -0600 Subject: [PATCH v6] SA Busy code Thread-Topic: [PATCH v6] SA Busy code Thread-Index: AcuVd814EpqXMe2LSjKREF/5T68H1w== Message-ID: <4C2744E8AD2982428C5BFE523DF8CDCB4A208DF511@MNEXMB1.qlogic.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Dec 2010 19:00:14 +0000 (UTC) diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index 64e660c..10fead0 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c @@ -1828,14 +1828,21 @@ static void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv, /* Complete corresponding request */ if (ib_response_mad(mad_recv_wc->recv_buf.mad)) { + u16 busy = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.status) & + IB_MGMT_MAD_STATUS_BUSY; + spin_lock_irqsave(&mad_agent_priv->lock, flags); mad_send_wr = ib_find_send_mad(mad_agent_priv, mad_recv_wc); - if (!mad_send_wr) { + if (!mad_send_wr || + (busy && mad_send_wr->retries_left && + (mad_recv_wc->recv_buf.mad->mad_hdr.method != + IB_MGMT_METHOD_TRAP_REPRESS))) { spin_unlock_irqrestore(&mad_agent_priv->lock, flags); ib_free_recv_mad(mad_recv_wc); deref_mad_agent(mad_agent_priv); return; } + ib_mark_mad_done(mad_send_wr); spin_unlock_irqrestore(&mad_agent_priv->lock, flags); diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h index d3b9401..b901968 100644 --- a/include/rdma/ib_mad.h +++ b/include/rdma/ib_mad.h @@ -77,6 +77,15 @@ #define IB_MGMT_MAX_METHODS 128 +/* MAD Status field bit masks */ +#define IB_MGMT_MAD_STATUS_SUCCESS 0x0000 +#define IB_MGMT_MAD_STATUS_BUSY 0x0001 +#define IB_MGMT_MAD_STATUS_REDIRECT_REQD 0x0002 +#define IB_MGMT_MAD_STATUS_BAD_VERSION 0x0004 +#define IB_MGMT_MAD_STATUS_UNSUPPORTED_METHOD 0x0008 +#define IB_MGMT_MAD_STATUS_UNSUPPORTED_METHOD_ATTRIB 0x000c +#define IB_MGMT_MAD_STATUS_INVALID_ATTRIB_VALUE 0x001c + /* RMPP information */ #define IB_MGMT_RMPP_VERSION 1