IB/hfi1, qib, cm, sa: Last set for 4.15 merge window

Hi Doug,

Here is the latest set of patches I have that we'd like to land in 4.15. There are some driver fixes, including a qib that is marked as stable. We also have a CM and SA patch thrown in the mix.

As always patches available for browsing at:
https://github.com/ddalessa/kernel/tree/for-4.15

---

Dennis Dalessandro (1):
IB/hfi1: Initialize bth1 in 16B rc ack builder

Don Hiatt (2):
IB/hfi1: Mask the path bits with the LMC for 16B RC Acks IB/CM: Change sgid to IB GID when handling CM request

Jan Sokolowski (1):
IB/hfi1: Use 4096 for default active MTU in query_qp

Mike Marciniszyn (1):
IB/qib: Fix comparison error with qperf compare/swap test

Venkata Sandeep Dhanalakota (1):
IB/SA: Check dlid before SA agent queries for ClassPortInfo

 drivers/infiniband/core/cm.c       |   38 ++++++++++++++++++++++++++++++++++--
 drivers/infiniband/core/sa_query.c |   10 +++++++++
 drivers/infiniband/hw/hfi1/rc.c    |   10 +++++----
 drivers/infiniband/hw/hfi1/verbs.c |    2 +-
 drivers/infiniband/hw/qib/qib_rc.c |    6 +++---
 5 files changed, 55 insertions(+), 11 deletions(-)

From: Don Hiatt <[email protected]>

16B packets require that the path bits are masked with the LMC. This mask is done correctly in all 16B header creation but was left out for the RC Acknowledge.

---
 drivers/infiniband/hw/hfi1/rc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

index fd01a76..e6fa936 100644
@@ -843,11 +843,11 @@ static inline void hfi1_make_rc_ack_16B(struct rvt_qp *qp,
 	/* Convert dwords to flits */
 	len = (*hwords + *nwords) >> 1;
 
-	hfi1_make_16b_hdr(hdr,
-			  ppd->lid | rdma_ah_get_path_bits(&qp->remote_ah_attr),
+	hfi1_make_16b_hdr(hdr, ppd->lid |
+			  (rdma_ah_get_path_bits(&qp->remote_ah_attr) &
+			  ((1 << ppd->lmc) - 1)),
 			  opa_get_lid(rdma_ah_get_dlid(&qp->remote_ah_attr),
-				      16B),
-			  len, pkey, becn, 0, l4, sc5);
+				      16B), len, pkey, becn, 0, l4, sc5);
 
 	bth0 = pkey | (OP(ACKNOWLEDGE) << 24);
 	bth0 |= extra_bytes << 20;

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied 1,4,5,6 of this series to for-next

Thanks,
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

It is possible the bth1 variable could be used uninitialized so going ahead and giving it a default value.

---
 drivers/infiniband/hw/hfi1/rc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index e6fa936..68d5c3c 100644
@@ -814,7 +814,7 @@ static inline void hfi1_make_rc_ack_16B(struct rvt_qp *qp,
 	struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);
 	struct hfi1_16b_header *hdr = &opa_hdr->opah;
 	struct ib_other_headers *ohdr;
-	u32 bth0, bth1;
+	u32 bth0, bth1 = 0;
 	u16 len, pkey;
 	u8 becn = !!is_fecn;
 	u8 l4 = OPA_16B_L4_IB_LOCAL;

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied to for-rc
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Venkata Sandeep Dhanalakota <[email protected]>

SA queries SM for class port info when there is a LID_CHANGE event.

When a base lid is configured before fm is started ie when smlid is not yet assigned, SA handles the LID_CHANGE event and tries query SM with lid 0. This will cause an hang.

[ 1106.958820] INFO: task kworker/2:0:23 blocked for more than 120 seconds.
[ 1106.965082] Tainted: G O 4.12.0+ #1
[ 1106.969602] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables
 this message.
[ 1106.977227] kworker/2:0 D 0 23 2 0x00000000
[ 1106.977250] Workqueue: infiniband update_ib_cpi [ib_core]
[ 1106.977261] Call Trace:
[ 1106.977273] __schedule+0x28e/0x860
[ 1106.977285] schedule+0x36/0x80
[ 1106.977298] schedule_timeout+0x1a3/0x2e0
[ 1106.977310] ? radix_tree_iter_tag_clear+0x1b/0x20
[ 1106.977322] ? idr_alloc+0x64/0x90
[ 1106.977334] wait_for_completion+0xe3/0x140
[ 1106.977347] ? wake_up_q+0x80/0x80
[ 1106.977369] update_ib_cpi+0x163/0x210 [ib_core]
[ 1106.977381] process_one_work+0x147/0x370
[ 1106.977394] worker_thread+0x4a/0x390
[ 1106.977406] kthread+0x109/0x140
[ 1106.977418] ? process_one_work+0x370/0x370
[ 1106.977430] ? kthread_park+0x60/0x60
[ 1106.977443] ret_from_fork+0x22/0x30

Always ensure a proper smlid is assigned before querying SM for cpi.

---
 drivers/infiniband/core/sa_query.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

index ab5e102..24b9b5f 100644
@@ -1345,6 +1345,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
 
 static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask)
 {
+	struct rdma_ah_attr ah_attr;
 	unsigned long flags;
 
 	spin_lock_irqsave(&query->port->ah_lock, flags);

@@ -1356,6 +1357,15 @@ static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask)
 	query->sm_ah = query->port->sm_ah;
 	spin_unlock_irqrestore(&query->port->ah_lock, flags);
 
+	/*
+	 * Always check if sm_ah has valid dlid assigned,
+	 * before querying for class port info
+	 */
+	if ((rdma_query_ah(query->sm_ah->ah, &ah_attr) < 0) ||
+	    !rdma_ah_get_dlid(&ah_attr)) {
+		kref_put(&query->sm_ah->ref, free_sm_ah);
+		return -EAGAIN;
+	}
 	query->mad_buf = ib_create_send_mad(query->port->agent, 1,
 					    query->sm_ah->pkey_index,
 					    0, IB_MGMT_SA_HDR, IB_MGMT_SA_DATA,

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

SGkgSGFsLA0KDQpUaGUgcGF0Y2ggaW50ZW5kcyB0byBvbmx5IGNoZWNrIGlmIHNtbGlkIGlzIGFz c2lnbmVkIG9yIG5vdC4gSXQgZG9lcyBub3QgaW50ZW5kIHRvIGNoZWNrIGlmIHNtbGlkIGlzIGEg dmFsaWQgbGlkIG9yIG5vdC4gVmFsaWRpdHkgb2YgbGlkIGlzIHRha2VuIGNhcmUgYnkgdGhlIGlu ZGl2aWR1YWwgZHJpdmVycywgZHVyaW5nIGNyZWF0ZV9haCgpLg0KDQpUaGFua3MsDQpTYW5kZWVw DQoNCi0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQpGcm9tOiBIYWwgUm9zZW5zdG9jayBbbWFp bHRvOmhhbEBkZXYubWVsbGFub3guY28uaWxdIA0KU2VudDogVHVlc2RheSwgTm92ZW1iZXIgMTQs IDIwMTcgNToxMiBBTQ0KVG86IERhbGVzc2FuZHJvLCBEZW5uaXMgPGRlbm5pcy5kYWxlc3NhbmRy b0BpbnRlbC5jb20+OyBkbGVkZm9yZEByZWRoYXQuY29tDQpDYzogbGludXgtcmRtYUB2Z2VyLmtl cm5lbC5vcmc7IE1hcmNpbmlzenluLCBNaWtlIDxtaWtlLm1hcmNpbmlzenluQGludGVsLmNvbT47 IERoYW5hbGFrb3RhLCBWZW5rYXRhIFMgPHZlbmthdGEucy5kaGFuYWxha290YUBpbnRlbC5jb20+ OyBXZWlueSwgSXJhIDxpcmEud2VpbnlAaW50ZWwuY29tPg0KU3ViamVjdDogUmU6IFtQQVRDSCBm b3ItbmV4dCAzLzZdIElCL1NBOiBDaGVjayBkbGlkIGJlZm9yZSBTQSBhZ2VudCBxdWVyaWVzIGZv ciBDbGFzc1BvcnRJbmZvDQpJbXBvcnRhbmNlOiBIaWdoDQoNCk9uIDExLzE0LzIwMTcgNzozNCBB TSwgRGVubmlzIERhbGVzc2FuZHJvIHdyb3RlOg0KPiBGcm9tOiBWZW5rYXRhIFNhbmRlZXAgRGhh bmFsYWtvdGEgPHZlbmthdGEucy5kaGFuYWxha290YUBpbnRlbC5jb20+DQo+IA0KPiBTQSBxdWVy aWVzIFNNIGZvciBjbGFzcyBwb3J0IGluZm8gd2hlbiB0aGVyZSBpcyBhIExJRF9DSEFOR0UgZXZl bnQuDQo+IA0KPiBXaGVuIGEgYmFzZSBsaWQgaXMgY29uZmlndXJlZCBiZWZvcmUgZm0gaXMgc3Rh cnRlZCBpZSB3aGVuIHNtbGlkIGlzIA0KPiBub3QgeWV0IGFzc2lnbmVkLCBTQSBoYW5kbGVzIHRo ZSBMSURfQ0hBTkdFIGV2ZW50IGFuZCB0cmllcyBxdWVyeSBTTSANCj4gd2l0aCBsaWQgMC4gVGhp cyB3aWxsIGNhdXNlIGFuIGhhbmcuDQo+IA0KPiBbIDExMDYuOTU4ODIwXSBJTkZPOiB0YXNrIGt3 b3JrZXIvMjowOjIzIGJsb2NrZWQgZm9yIG1vcmUgdGhhbiAxMjAgc2Vjb25kcy4NCj4gWyAxMTA2 Ljk2NTA4Ml0gVGFpbnRlZDogRyBPIDQuMTIuMCsgIzEgWyAxMTA2Ljk2OTYwMl0gImVjaG8gMCA+ IA0KPiAvcHJvYy9zeXMva2VybmVsL2h1bmdfdGFza190aW1lb3V0X3NlY3MiIGRpc2FibGVzICB0 aGlzIG1lc3NhZ2UuDQo+IFsgMTEwNi45NzcyMjddIGt3b3JrZXIvMjowIEQgMCAyMyAyIDB4MDAw MDAwMDAgWyAxMTA2Ljk3NzI1MF0gDQo+IFdvcmtxdWV1ZTogaW5maW5pYmFuZCB1cGRhdGVfaWJf Y3BpIFtpYl9jb3JlXSBbIDExMDYuOTc3MjYxXSBDYWxsIA0KPiBUcmFjZToNCj4gWyAxMTA2Ljk3 NzI3M10gX19zY2hlZHVsZSsweDI4ZS8weDg2MA0KPiBbIDExMDYuOTc3Mjg1XSBzY2hlZHVsZSsw eDM2LzB4ODANCj4gWyAxMTA2Ljk3NzI5OF0gc2NoZWR1bGVfdGltZW91dCsweDFhMy8weDJlMCBb IDExMDYuOTc3MzEwXSA/IA0KPiByYWRpeF90cmVlX2l0ZXJfdGFnX2NsZWFyKzB4MWIvMHgyMA0K PiBbIDExMDYuOTc3MzIyXSA/IGlkcl9hbGxvYysweDY0LzB4OTANCj4gWyAxMTA2Ljk3NzMzNF0g d2FpdF9mb3JfY29tcGxldGlvbisweGUzLzB4MTQwIFsgMTEwNi45NzczNDddID8gDQo+IHdha2Vf dXBfcSsweDgwLzB4ODAgWyAxMTA2Ljk3NzM2OV0gdXBkYXRlX2liX2NwaSsweDE2My8weDIxMCBb aWJfY29yZV0gDQo+IFsgMTEwNi45NzczODFdIHByb2Nlc3Nfb25lX3dvcmsrMHgxNDcvMHgzNzAg WyAxMTA2Ljk3NzM5NF0gDQo+IHdvcmtlcl90aHJlYWQrMHg0YS8weDM5MCBbIDExMDYuOTc3NDA2 XSBrdGhyZWFkKzB4MTA5LzB4MTQwIFsgDQo+IDExMDYuOTc3NDE4XSA/IHByb2Nlc3Nfb25lX3dv cmsrMHgzNzAvMHgzNzAgWyAxMTA2Ljk3NzQzMF0gPyANCj4ga3RocmVhZF9wYXJrKzB4NjAvMHg2 MCBbIDExMDYuOTc3NDQzXSByZXRfZnJvbV9mb3JrKzB4MjIvMHgzMA0KPiANCj4gQWx3YXlzIGVu c3VyZSBhIHByb3BlciBzbWxpZCBpcyBhc3NpZ25lZCBiZWZvcmUgcXVlcnlpbmcgU00gZm9yIGNw aS4NCj4gDQo+IEZpeGVzOiBlZTFjNjBiMWJmZiAoIklCL1NBOiBNb2RpZnkgU0EgdG8gaW1wbGlj aXRseSBjYWNoZSBDbGFzcyBQb3J0IA0KPiBpbmZvIikNCj4gUmV2aWV3ZWQtYnk6IE1pa2UgTWFy Y2luaXN6eW4gPG1pa2UubWFyY2luaXN6eW5AaW50ZWwuY29tPg0KPiBSZXZpZXdlZC1ieTogSXJh IFdlaW55IDxpcmEud2VpbnlAaW50ZWwuY29tPg0KPiBTaWduZWQtb2ZmLWJ5OiBWZW5rYXRhIFNh bmRlZXAgRGhhbmFsYWtvdGEgDQo+IDx2ZW5rYXRhLnMuZGhhbmFsYWtvdGFAaW50ZWwuY29tPg0K PiBTaWduZWQtb2ZmLWJ5OiBEZW5uaXMgRGFsZXNzYW5kcm8gPGRlbm5pcy5kYWxlc3NhbmRyb0Bp bnRlbC5jb20+DQo+IC0tLQ0KPiAgZHJpdmVycy9pbmZpbmliYW5kL2NvcmUvc2FfcXVlcnkuYyB8 ICAgMTAgKysrKysrKysrKw0KPiAgMSBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAw IGRlbGV0aW9ucygtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW5maW5pYmFuZC9jb3Jl L3NhX3F1ZXJ5LmMgDQo+IGIvZHJpdmVycy9pbmZpbmliYW5kL2NvcmUvc2FfcXVlcnkuYw0KPiBp bmRleCBhYjVlMTAyLi4yNGI5YjVmIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL2luZmluaWJhbmQv Y29yZS9zYV9xdWVyeS5jDQo+ICsrKyBiL2RyaXZlcnMvaW5maW5pYmFuZC9jb3JlL3NhX3F1ZXJ5 LmMNCj4gQEAgLTEzNDUsNiArMTM0NSw3IEBAIGludCBpYl9pbml0X2FoX2Zyb21fcGF0aChzdHJ1 Y3QgaWJfZGV2aWNlIA0KPiAqZGV2aWNlLCB1OCBwb3J0X251bSwNCj4gIA0KPiAgc3RhdGljIGlu dCBhbGxvY19tYWQoc3RydWN0IGliX3NhX3F1ZXJ5ICpxdWVyeSwgZ2ZwX3QgZ2ZwX21hc2spICB7 DQo+ICsJc3RydWN0IHJkbWFfYWhfYXR0ciBhaF9hdHRyOw0KPiAgCXVuc2lnbmVkIGxvbmcgZmxh Z3M7DQo+ICANCj4gIAlzcGluX2xvY2tfaXJxc2F2ZSgmcXVlcnktPnBvcnQtPmFoX2xvY2ssIGZs YWdzKTsgQEAgLTEzNTYsNiArMTM1NywxNSANCj4gQEAgc3RhdGljIGludCBhbGxvY19tYWQoc3Ry dWN0IGliX3NhX3F1ZXJ5ICpxdWVyeSwgZ2ZwX3QgZ2ZwX21hc2spDQo+ICAJcXVlcnktPnNtX2Fo ID0gcXVlcnktPnBvcnQtPnNtX2FoOw0KPiAgCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnF1ZXJ5 LT5wb3J0LT5haF9sb2NrLCBmbGFncyk7DQo+ICANCj4gKwkvKg0KPiArCSAqIEFsd2F5cyBjaGVj ayBpZiBzbV9haCBoYXMgdmFsaWQgZGxpZCBhc3NpZ25lZCwNCj4gKwkgKiBiZWZvcmUgcXVlcnlp bmcgZm9yIGNsYXNzIHBvcnQgaW5mbw0KPiArCSAqLw0KPiArCWlmICgocmRtYV9xdWVyeV9haChx dWVyeS0+c21fYWgtPmFoLCAmYWhfYXR0cikgPCAwKSB8fA0KPiArCSAgICAhcmRtYV9haF9nZXRf ZGxpZCgmYWhfYXR0cikpIHsNCg0KSXNuJ3QgdmFsaWQgU00gTElEIG1vcmUgY29tcGxleCB0aGFu IGp1c3QgIT0gMCA/DQoNCkZvciBJQiwgaW52YWxpZCBTTSBMSUQgaXMgIT0gMCBhbmQgbm90IGlu IG11bHRpY2FzdCBMSUQgcmFuZ2UgKD49IDB4QzAwMCB3aGljaCBpbmNsdWRlcyB0aGUgcGVybWlz c2l2ZSBMSUQpLiBBdCBhIG1pbmltdW0gKGZvciBhdCBsZWFzdCBJQiksIHRoaXMgY2hlY2sgc2hv dWxkIGFsc28gaW5jbHVkZSB0aGUgcGVybWlzc2l2ZSBMSUQuDQoNCi0tIEhhbA0KDQo+ICsJCWty ZWZfcHV0KCZxdWVyeS0+c21fYWgtPnJlZiwgZnJlZV9zbV9haCk7DQo+ICsJCXJldHVybiAtRUFH QUlOOw0KPiArCX0NCj4gIAlxdWVyeS0+bWFkX2J1ZiA9IGliX2NyZWF0ZV9zZW5kX21hZChxdWVy eS0+cG9ydC0+YWdlbnQsIDEsDQo+ICAJCQkJCSAgICBxdWVyeS0+c21fYWgtPnBrZXlfaW5kZXgs DQo+ICAJCQkJCSAgICAwLCBJQl9NR01UX1NBX0hEUiwgSUJfTUdNVF9TQV9EQVRBLA0KPiANCj4g LS0NCj4gVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vi c2NyaWJlIGxpbnV4LXJkbWEiIA0KPiBpbiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jk b21vQHZnZXIua2VybmVsLm9yZyBNb3JlIG1ham9yZG9tbyANCj4gaW5mbyBhdCAgaHR0cDovL3Zn ZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sDQo+IA0K
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

I think that is Hal's point - there are multiple ways to say 'not assigned' for SMLID, including == 0 and == 0xFFFF

It is best to use !valid as a test for an unassigned SM lid.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Venkata Sandeep Dhanalakota <[email protected]>

SA queries SM for class port info when there is a LID_CHANGE event.

When a base lid is configured before fm is started ie when smlid is not yet assigned, SA handles the LID_CHANGE event and tries query SM with lid 0. This will cause an hang.

[ 1106.958820] INFO: task kworker/2:0:23 blocked for more than 120 seconds.
[ 1106.965082] Tainted: G O 4.12.0+ #1
[ 1106.969602] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables
 this message.
[ 1106.977227] kworker/2:0 D 0 23 2 0x00000000
[ 1106.977250] Workqueue: infiniband update_ib_cpi [ib_core]
[ 1106.977261] Call Trace:
[ 1106.977273] __schedule+0x28e/0x860
[ 1106.977285] schedule+0x36/0x80
[ 1106.977298] schedule_timeout+0x1a3/0x2e0
[ 1106.977310] ? radix_tree_iter_tag_clear+0x1b/0x20
[ 1106.977322] ? idr_alloc+0x64/0x90
[ 1106.977334] wait_for_completion+0xe3/0x140
[ 1106.977347] ? wake_up_q+0x80/0x80
[ 1106.977369] update_ib_cpi+0x163/0x210 [ib_core]
[ 1106.977381] process_one_work+0x147/0x370
[ 1106.977394] worker_thread+0x4a/0x390
[ 1106.977406] kthread+0x109/0x140
[ 1106.977418] ? process_one_work+0x370/0x370
[ 1106.977430] ? kthread_park+0x60/0x60
[ 1106.977443] ret_from_fork+0x22/0x30

Always ensure a proper smlid is assigned before querying SM for cpi.

---
changes since v1:
Add inline function to check for valid lid

---
 drivers/infiniband/core/sa_query.c |   10 ++++++++++
 include/rdma/opa_addr.h            |   16 ++++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)

index ab5e102..62d7def 100644
@@ -1345,6 +1345,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
 
 static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask)
 {
+	struct rdma_ah_attr ah_attr;
 	unsigned long flags;
 
 	spin_lock_irqsave(&query->port->ah_lock, flags);

@@ -1356,6 +1357,15 @@ static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask)
 	query->sm_ah = query->port->sm_ah;
 	spin_unlock_irqrestore(&query->port->ah_lock, flags);
 
+	/*
+	 * Always check if sm_ah has valid dlid assigned,
+	 * before querying for class port info
+	 */
+	if ((rdma_query_ah(query->sm_ah->ah, &ah_attr) < 0) ||
+	    !rdma_is_valid_unicast_lid(&ah_attr)) {
+		kref_put(&query->sm_ah->ref, free_sm_ah);
+		return -EAGAIN;
+	}
 	query->mad_buf = ib_create_send_mad(query->port->agent, 1,
 					    query->sm_ah->pkey_index,
 					    0, IB_MGMT_SA_HDR, IB_MGMT_SA_DATA,

index f68fca2..2bbb7a6 100644
@@ -114,4 +114,20 @@ static inline u32 opa_get_mcast_base(u32 nr_top_bits)
 	return (be32_to_cpu(OPA_LID_PERMISSIVE) << (32 - nr_top_bits));
 }
 
+/* Check for a valid unicast LID for non-SM traffic types */
+static inline bool rdma_is_valid_unicast_lid(struct rdma_ah_attr *attr)
+{
+	if (attr->type == RDMA_AH_ATTR_TYPE_IB) {
+		if (!rdma_ah_get_dlid(attr) ||
+		    rdma_ah_get_dlid(attr) >=
+		    be32_to_cpu(IB_MULTICAST_LID_BASE))
+			return false;
+	} else if (attr->type == RDMA_AH_ATTR_TYPE_OPA) {
+		if (!rdma_ah_get_dlid(attr) ||
+		    rdma_ah_get_dlid(attr) >=
+		    opa_get_mcast_base(OPA_MCAST_NR))
+			return false;
+	}
+	return true;
+}
 #endif /* OPA_ADDR_H */

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Shouldn't we do something about this long hang as well?

Otherwise seems like a reasonable step to me..

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Took it to for-next

Although I am unclear why a bad SM lid should cause a hang? Doesn't like seem like a bug unto itself?

Thanks,
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi Jason,
Yes it is a bug to hang on bad SM lid. While root causing the hang, I thought it is better to add some logic that will prevent sending the packets with bad dlid in first place.

Thank you,
Sandeep

Took it to for-next

Although I am unclear why a bad SM lid should cause a hang? Doesn't like seem like a bug unto itself?

Thanks,
Jason

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Don Hiatt <[email protected]>

ULPs do not understand OPA GIDs and will reject CM requests if the sgid does not match the local_gid. In order to fix this behavior we convert the OPA GID back to an IB GID.

---
 drivers/infiniband/core/cm.c |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

index 5927ee4..f9f6f5e 100644
@@ -1560,6 +1560,37 @@ static u16 cm_get_bth_pkey(struct cm_work *work)
 	return pkey;
 }
 
+/**
+ * Convert OPA SGID to IB SGID
+ * ULPs (such as IPoIB) do not understand OPA GIDs and will
+ * reject them as the local_gid will not match the sgid. Therefore,
+ * change the pathrec's SGID to an IB SGID.
+ *
+ * @work: Work completion
+ * @path: Path record
+ */
+static void cm_opa_to_ib_sgid(struct cm_work *work,
+			      struct sa_path_rec *path)
+{
+	struct ib_device *dev = work->port->cm_dev->ib_device;
+	struct ib_gid_attr gid_attr;
+	u8 port_num = work->port->port_num;
+
+	if (rdma_cap_opa_ah(dev, port_num) &&
+	    (ib_is_opa_gid(&path->sgid))) {
+		union ib_gid sgid;
+
+		if (ib_get_cached_gid(dev, port_num, 0,
+				      &sgid, &gid_attr)) {
+			dev_warn(&dev->dev,
+				 "Error updating sgid in CM request\n");
+			return;
+		}
+
+		path->sgid = sgid;
+	}
+}
+
 static void cm_format_req_event(struct cm_work *work,
 				struct cm_id_private *cm_id_priv,
 				struct ib_cm_id *listen_id)

@@ -1573,10 +1604,13 @@ static void cm_format_req_event(struct cm_work *work,
 	param->bth_pkey = cm_get_bth_pkey(work);
 	param->port = cm_id_priv->av.port->port_num;
 	param->primary_path = &work->path[0];
-	if (req_msg->alt_local_lid)
+	cm_opa_to_ib_sgid(work, param->primary_path);
+	if (cm_req_has_alt_path(req_msg)) {
 		param->alternate_path = &work->path[1];
-	else
+		cm_opa_to_ib_sgid(work, param->alternate_path);
+	} else {
 		param->alternate_path = NULL;
+	}
 	param->remote_ca_guid = req_msg->local_ca_guid;
 	param->remote_qkey = be32_to_cpu(req_msg->local_qkey);
 	param->remote_qpn = be32_to_cpu(cm_req_get_local_qpn(req_msg));

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

SGkgRGVubmlzLA0KDQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IGxpbnV4 LXJkbWEtb3duZXJAdmdlci5rZXJuZWwub3JnIFttYWlsdG86bGludXgtcmRtYS0NCj4gb3duZXJA dmdlci5rZXJuZWwub3JnXSBPbiBCZWhhbGYgT2YgRGVubmlzIERhbGVzc2FuZHJvDQo+IFNlbnQ6 IFR1ZXNkYXksIE5vdmVtYmVyIDE0LCAyMDE3IDY6MzUgQU0NCj4gVG86IGRsZWRmb3JkQHJlZGhh dC5jb20NCj4gQ2M6IGxpbnV4LXJkbWFAdmdlci5rZXJuZWwub3JnOyBEb24gSGlhdHQgPGRvbi5o aWF0dEBpbnRlbC5jb20+OyBJcmEgV2VpbnkNCj4gPGlyYS53ZWlueUBpbnRlbC5jb20+DQo+IFN1 YmplY3Q6IFtQQVRDSCBmb3ItbmV4dCA0LzZdIElCL0NNOiBDaGFuZ2Ugc2dpZCB0byBJQiBHSUQg d2hlbiBoYW5kbGluZyBDTQ0KPiByZXF1ZXN0DQo+IA0KPiBGcm9tOiBEb24gSGlhdHQgPGRvbi5o aWF0dEBpbnRlbC5jb20+DQo+IA0KPiBVTFBzIGRvIG5vdCB1bmRlcnN0YW5kIE9QQSBHSURzIGFu ZCB3aWxsIHJlamVjdCBDTSByZXF1ZXN0cyBpZiB0aGUgc2dpZCBkb2VzDQo+IG5vdCBtYXRjaCB0 aGUgbG9jYWxfZ2lkLiBJbiBvcmRlciB0byBmaXggdGhpcyBiZWhhdmlvciB3ZSBjb252ZXJ0IHRo ZSBPUEEgR0lEDQo+IGJhY2sgdG8gYW4gSUIgR0lELg0KPiANCj4gUmV2aWV3ZWQtYnk6IElyYSBX ZWlueSA8aXJhLndlaW55QGludGVsLmNvbT4NCj4gU2lnbmVkLW9mZi1ieTogRG9uIEhpYXR0IDxk b24uaGlhdHRAaW50ZWwuY29tPg0KPiBTaWduZWQtb2ZmLWJ5OiBEZW5uaXMgRGFsZXNzYW5kcm8g PGRlbm5pcy5kYWxlc3NhbmRyb0BpbnRlbC5jb20+DQo+IC0tLQ0KPiAgZHJpdmVycy9pbmZpbmli YW5kL2NvcmUvY20uYyB8ICAgMzgNCj4gKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0NCj4gIDEgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMo LSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2luZmluaWJhbmQvY29yZS9jbS5jIGIvZHJp dmVycy9pbmZpbmliYW5kL2NvcmUvY20uYyBpbmRleA0KPiA1OTI3ZWU0Li5mOWY2ZjVlIDEwMDY0 NA0KPiAtLS0gYS9kcml2ZXJzL2luZmluaWJhbmQvY29yZS9jbS5jDQo+ICsrKyBiL2RyaXZlcnMv aW5maW5pYmFuZC9jb3JlL2NtLmMNCj4gQEAgLTE1NjAsNiArMTU2MCwzNyBAQCBzdGF0aWMgdTE2 IGNtX2dldF9idGhfcGtleShzdHJ1Y3QgY21fd29yayAqd29yaykNCj4gIAlyZXR1cm4gcGtleTsN Cj4gIH0NCj4gDQo+ICsvKioNCj4gKyAqIENvbnZlcnQgT1BBIFNHSUQgdG8gSUIgU0dJRA0KPiAr ICogVUxQcyAoc3VjaCBhcyBJUG9JQikgZG8gbm90IHVuZGVyc3RhbmQgT1BBIEdJRHMgYW5kIHdp bGwNCj4gKyAqIHJlamVjdCB0aGVtIGFzIHRoZSBsb2NhbF9naWQgd2lsbCBub3QgbWF0Y2ggdGhl IHNnaWQuIFRoZXJlZm9yZSwNCj4gKyAqIGNoYW5nZSB0aGUgcGF0aHJlYydzIFNHSUQgdG8gYW4g SUIgU0dJRC4NCj4gKyAqDQpBZGRyZXNzIGFuZCBvdGhlciBjb252ZXJzaW9ucyBhcmUgaW4gaWJf c2EuaCBzdWNoIGFzIHBhdGhfY29udl9vcGFfdG9faWIoKS4NCkRvIHBhdGhfY29udl9vcGFfdG9f aWIgZnVuY3Rpb24gYWxzbyBuZWVkIHN1Y2ggb3BhIHRvIGliIGdpZCBjb252ZXJzaW9uPw0KQ2Fu IHlvdSBwbGFjZSBjbV9vcGFfdG9faWJfc2dpZCBmdW5jdGlvbiBpbiBjb3JlL2FkZHIuYyBhcyBp dCBkZWFscyB3aXRoIGFkZHJlc3Nlcy4NCg0KV2hpbGUgcmVwbHlpbmcgYmFjayB0byBDTSByZXF1 ZXN0LCBpcyBpdCBvayB0byByZXBseSBiYWNrIHdpdGggSUIgR0lEIGFuZCByZXZlcnNlIGNvbnZl cnNpb24gbm90IG5lZWRlZCBvciBpdCByZXBsaWVzIHdpdGggT1BBIEdJRD8NCg0KPiArICogQHdv cms6IFdvcmsgY29tcGxldGlvbg0KPiArICogQHBhdGg6IFBhdGggcmVjb3JkDQo+ICsgKi8NCj4g K3N0YXRpYyB2b2lkIGNtX29wYV90b19pYl9zZ2lkKHN0cnVjdCBjbV93b3JrICp3b3JrLA0KPiAr CQkJICAgICAgc3RydWN0IHNhX3BhdGhfcmVjICpwYXRoKQ0KPiArew0KPiArCXN0cnVjdCBpYl9k ZXZpY2UgKmRldiA9IHdvcmstPnBvcnQtPmNtX2Rldi0+aWJfZGV2aWNlOw0KPiArCXN0cnVjdCBp Yl9naWRfYXR0ciBnaWRfYXR0cjsNCj4gKwl1OCBwb3J0X251bSA9IHdvcmstPnBvcnQtPnBvcnRf bnVtOw0KPiArDQo+ICsJaWYgKHJkbWFfY2FwX29wYV9haChkZXYsIHBvcnRfbnVtKSAmJg0KPiAr CSAgICAoaWJfaXNfb3BhX2dpZCgmcGF0aC0+c2dpZCkpKSB7DQo+ICsJCXVuaW9uIGliX2dpZCBz Z2lkOw0KPiArDQo+ICsJCWlmIChpYl9nZXRfY2FjaGVkX2dpZChkZXYsIHBvcnRfbnVtLCAwLA0K T25seSBnaWQgMCBuZWVkcyBjb252ZXJzaW9uPw0KDQo+ICsJCQkJICAgICAgJnNnaWQsICZnaWRf YXR0cikpIHsNClNpbmNlIGdpZCBhdHRyaWJ1dGUgaXMgbm90IHVzZWQgaGVyZSBhbmQgYXBwbGlj YWJsZSB0byBSb0NFIGFuZCBpdHMgb3B0aW9uYWwsIGNhbiB5b3UgcGFzcyBOVUxMIGFuZCBhdm9p ZCBnaWRfYXR0cj8NCg0KPiArCQkJZGV2X3dhcm4oJmRldi0+ZGV2LA0KPiArCQkJCSAiRXJyb3Ig dXBkYXRpbmcgc2dpZCBpbiBDTSByZXF1ZXN0XG4iKTsNCj4gKwkJCXJldHVybjsNCj4gKwkJfQ0K PiArDQo+ICsJCXBhdGgtPnNnaWQgPSBzZ2lkOw0KPiArCX0NCj4gK30NCj4gKw0KPiAgc3RhdGlj IHZvaWQgY21fZm9ybWF0X3JlcV9ldmVudChzdHJ1Y3QgY21fd29yayAqd29yaywNCj4gIAkJCQlz dHJ1Y3QgY21faWRfcHJpdmF0ZSAqY21faWRfcHJpdiwNCj4gIAkJCQlzdHJ1Y3QgaWJfY21faWQg Kmxpc3Rlbl9pZCkNCj4gQEAgLTE1NzMsMTAgKzE2MDQsMTMgQEAgc3RhdGljIHZvaWQgY21fZm9y bWF0X3JlcV9ldmVudChzdHJ1Y3QgY21fd29yaw0KPiAqd29yaywNCj4gIAlwYXJhbS0+YnRoX3Br ZXkgPSBjbV9nZXRfYnRoX3BrZXkod29yayk7DQo+ICAJcGFyYW0tPnBvcnQgPSBjbV9pZF9wcml2 LT5hdi5wb3J0LT5wb3J0X251bTsNCj4gIAlwYXJhbS0+cHJpbWFyeV9wYXRoID0gJndvcmstPnBh dGhbMF07DQo+IC0JaWYgKHJlcV9tc2ctPmFsdF9sb2NhbF9saWQpDQo+ICsJY21fb3BhX3RvX2li X3NnaWQod29yaywgcGFyYW0tPnByaW1hcnlfcGF0aCk7DQo+ICsJaWYgKGNtX3JlcV9oYXNfYWx0 X3BhdGgocmVxX21zZykpIHsNCj4gIAkJcGFyYW0tPmFsdGVybmF0ZV9wYXRoID0gJndvcmstPnBh dGhbMV07DQo+IC0JZWxzZQ0KPiArCQljbV9vcGFfdG9faWJfc2dpZCh3b3JrLCBwYXJhbS0+YWx0 ZXJuYXRlX3BhdGgpOw0KPiArCX0gZWxzZSB7DQo+ICAJCXBhcmFtLT5hbHRlcm5hdGVfcGF0aCA9 IE5VTEw7DQo+ICsJfQ0KPiAgCXBhcmFtLT5yZW1vdGVfY2FfZ3VpZCA9IHJlcV9tc2ctPmxvY2Fs X2NhX2d1aWQ7DQo+ICAJcGFyYW0tPnJlbW90ZV9xa2V5ID0gYmUzMl90b19jcHUocmVxX21zZy0+ bG9jYWxfcWtleSk7DQo+ICAJcGFyYW0tPnJlbW90ZV9xcG4gPSBiZTMyX3RvX2NwdShjbV9yZXFf Z2V0X2xvY2FsX3FwbihyZXFfbXNnKSk7DQo+IA0KPiAtLQ0KPiBUbyB1bnN1YnNjcmliZSBmcm9t IHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtcmRtYSIgaW4gdGhl IGJvZHkNCj4gb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcgTW9yZSBt YWpvcmRvbW8gaW5mbyBhdA0KPiBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZv Lmh0bWwNCg==
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi Parav,

Since this function is only used by the CM (and is only necessary because the responder is not performing a path record query itself, while the requester has already done query for us) there is no point in moving it to core/addr.c. Further, if we do move the function there, we will have to include all the required include files (pathrec, wc, helper functions) . Given the limited applicability of this function I prefer to keep it as a static function as it is.

Yes, it is okay to reply back with an IB GID and we do not need the reverse conversion (effectively they are the same thing as the requester in this case has already done a pathrec query and does nothing with the reply, and, even if it does the requester already has the IB gid and will know how to resolve it).

Yes,  because gid 1 is the OPA gid (per the OPA spec there is only one gid per port so gid 1 is a caching point for the opa gid).

Will do.

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

SGkgRG9uLA0KDQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IERvbiBIaWF0 dCBbbWFpbHRvOmRvbi5oaWF0dEBpbnRlbC5jb21dDQo+IFNlbnQ6IFRodXJzZGF5LCBOb3ZlbWJl ciAzMCwgMjAxNyA1OjQwIFBNDQo+IFRvOiBQYXJhdiBQYW5kaXQgPHBhcmF2QG1lbGxhbm94LmNv bT47IERlbm5pcyBEYWxlc3NhbmRybw0KPiA8ZGVubmlzLmRhbGVzc2FuZHJvQGludGVsLmNvbT47 IGRsZWRmb3JkQHJlZGhhdC5jb20NCj4gQ2M6IGxpbnV4LXJkbWFAdmdlci5rZXJuZWwub3JnOyBJ cmEgV2VpbnkgPGlyYS53ZWlueUBpbnRlbC5jb20+Ow0KPiBkb24uaGlhdHRAaW50ZWwuY29tDQo+ IFN1YmplY3Q6IFJlOiBbUEFUQ0ggZm9yLW5leHQgNC82XSBJQi9DTTogQ2hhbmdlIHNnaWQgdG8g SUIgR0lEIHdoZW4gaGFuZGxpbmcNCj4gQ00gcmVxdWVzdA0KPiANCj4gSGkgUGFyYXYsDQo+IA0K PiBPbiAxMS8xNC8yMDE3IDEwOjUwIEFNLCBQYXJhdiBQYW5kaXQgd3JvdGU6DQo+ID4gSGkgRGVu bmlzLA0KPiA+DQo+ID4+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+ID4+IEZyb206IGxp bnV4LXJkbWEtb3duZXJAdmdlci5rZXJuZWwub3JnIFttYWlsdG86bGludXgtcmRtYS0NCj4gPj4g b3duZXJAdmdlci5rZXJuZWwub3JnXSBPbiBCZWhhbGYgT2YgRGVubmlzIERhbGVzc2FuZHJvDQo+ ID4+IFNlbnQ6IFR1ZXNkYXksIE5vdmVtYmVyIDE0LCAyMDE3IDY6MzUgQU0NCj4gPj4gVG86IGRs ZWRmb3JkQHJlZGhhdC5jb20NCj4gPj4gQ2M6IGxpbnV4LXJkbWFAdmdlci5rZXJuZWwub3JnOyBE b24gSGlhdHQgPGRvbi5oaWF0dEBpbnRlbC5jb20+OyBJcmENCj4gPj4gV2VpbnkgPGlyYS53ZWlu eUBpbnRlbC5jb20+DQo+ID4+IFN1YmplY3Q6IFtQQVRDSCBmb3ItbmV4dCA0LzZdIElCL0NNOiBD aGFuZ2Ugc2dpZCB0byBJQiBHSUQgd2hlbg0KPiA+PiBoYW5kbGluZyBDTSByZXF1ZXN0DQo+ID4+ DQo+ID4+IEZyb206IERvbiBIaWF0dCA8ZG9uLmhpYXR0QGludGVsLmNvbT4NCj4gPj4NCj4gPj4g VUxQcyBkbyBub3QgdW5kZXJzdGFuZCBPUEEgR0lEcyBhbmQgd2lsbCByZWplY3QgQ00gcmVxdWVz dHMgaWYgdGhlDQo+ID4+IHNnaWQgZG9lcyBub3QgbWF0Y2ggdGhlIGxvY2FsX2dpZC4gSW4gb3Jk ZXIgdG8gZml4IHRoaXMgYmVoYXZpb3Igd2UNCj4gPj4gY29udmVydCB0aGUgT1BBIEdJRCBiYWNr IHRvIGFuIElCIEdJRC4NCj4gPj4NCj4gPj4gUmV2aWV3ZWQtYnk6IElyYSBXZWlueSA8aXJhLndl aW55QGludGVsLmNvbT4NCj4gPj4gU2lnbmVkLW9mZi1ieTogRG9uIEhpYXR0IDxkb24uaGlhdHRA aW50ZWwuY29tPg0KPiA+PiBTaWduZWQtb2ZmLWJ5OiBEZW5uaXMgRGFsZXNzYW5kcm8gPGRlbm5p cy5kYWxlc3NhbmRyb0BpbnRlbC5jb20+DQo+ID4+IC0tLQ0KPiA+PiAgIGRyaXZlcnMvaW5maW5p YmFuZC9jb3JlL2NtLmMgfCAgIDM4DQo+ID4+ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tDQo+ID4+ICAgMSBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAyIGRl bGV0aW9ucygtKQ0KPiA+Pg0KPiA+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9pbmZpbmliYW5kL2Nv cmUvY20uYw0KPiA+PiBiL2RyaXZlcnMvaW5maW5pYmFuZC9jb3JlL2NtLmMgaW5kZXggNTkyN2Vl NC4uZjlmNmY1ZSAxMDA2NDQNCj4gPj4gLS0tIGEvZHJpdmVycy9pbmZpbmliYW5kL2NvcmUvY20u Yw0KPiA+PiArKysgYi9kcml2ZXJzL2luZmluaWJhbmQvY29yZS9jbS5jDQo+ID4+IEBAIC0xNTYw LDYgKzE1NjAsMzcgQEAgc3RhdGljIHUxNiBjbV9nZXRfYnRoX3BrZXkoc3RydWN0IGNtX3dvcmsN Cj4gKndvcmspDQo+ID4+ICAgCXJldHVybiBwa2V5Ow0KPiA+PiAgIH0NCj4gPj4NCj4gPj4gKy8q Kg0KPiA+PiArICogQ29udmVydCBPUEEgU0dJRCB0byBJQiBTR0lEDQo+ID4+ICsgKiBVTFBzIChz dWNoIGFzIElQb0lCKSBkbyBub3QgdW5kZXJzdGFuZCBPUEEgR0lEcyBhbmQgd2lsbA0KPiA+PiAr ICogcmVqZWN0IHRoZW0gYXMgdGhlIGxvY2FsX2dpZCB3aWxsIG5vdCBtYXRjaCB0aGUgc2dpZC4g VGhlcmVmb3JlLA0KPiA+PiArICogY2hhbmdlIHRoZSBwYXRocmVjJ3MgU0dJRCB0byBhbiBJQiBT R0lELg0KPiA+PiArICoNCj4gPiBBZGRyZXNzIGFuZCBvdGhlciBjb252ZXJzaW9ucyBhcmUgaW4g aWJfc2EuaCBzdWNoIGFzIHBhdGhfY29udl9vcGFfdG9faWIoKS4NCj4gPiBEbyBwYXRoX2NvbnZf b3BhX3RvX2liIGZ1bmN0aW9uIGFsc28gbmVlZCBzdWNoIG9wYSB0byBpYiBnaWQgY29udmVyc2lv bj8NCj4gPiBDYW4geW91IHBsYWNlIGNtX29wYV90b19pYl9zZ2lkIGZ1bmN0aW9uIGluIGNvcmUv YWRkci5jIGFzIGl0IGRlYWxzIHdpdGgNCj4gYWRkcmVzc2VzLg0KPiBTaW5jZSB0aGlzIGZ1bmN0 aW9uIGlzIG9ubHkgdXNlZCBieSB0aGUgQ00gKGFuZCBpcyBvbmx5IG5lY2Vzc2FyeSBiZWNhdXNl IHRoZQ0KPiByZXNwb25kZXIgaXMgbm90IHBlcmZvcm1pbmcgYSBwYXRoIHJlY29yZCBxdWVyeSBp dHNlbGYsIHdoaWxlIHRoZSByZXF1ZXN0ZXIgaGFzDQo+IGFscmVhZHkgZG9uZSBxdWVyeSBmb3Ig dXMpIHRoZXJlIGlzIG5vIHBvaW50IGluIG1vdmluZyBpdCB0byBjb3JlL2FkZHIuYy4gRnVydGhl ciwNCj4gaWYgd2UgZG8gbW92ZSB0aGUgZnVuY3Rpb24gdGhlcmUsIHdlIHdpbGwgaGF2ZSB0byBp bmNsdWRlIGFsbCB0aGUgcmVxdWlyZWQgaW5jbHVkZQ0KPiBmaWxlcyAocGF0aHJlYywgd2MsIGhl bHBlcg0KPiBmdW5jdGlvbnMpIC4gR2l2ZW4gdGhlIGxpbWl0ZWQgYXBwbGljYWJpbGl0eSBvZiB0 aGlzIGZ1bmN0aW9uIEkgcHJlZmVyIHRvIGtlZXAgaXQgYXMgYQ0KPiBzdGF0aWMgZnVuY3Rpb24g YXMgaXQgaXMuDQo+ID4gV2hpbGUgcmVwbHlpbmcgYmFjayB0byBDTSByZXF1ZXN0LCBpcyBpdCBv ayB0byByZXBseSBiYWNrIHdpdGggSUIgR0lEIGFuZA0KPiByZXZlcnNlIGNvbnZlcnNpb24gbm90 IG5lZWRlZCBvciBpdCByZXBsaWVzIHdpdGggT1BBIEdJRD8NCj4gDQo+IFllcywgaXQgaXMgb2th eSB0byByZXBseSBiYWNrIHdpdGggYW4gSUIgR0lEIGFuZCB3ZSBkbyBub3QgbmVlZCB0aGUgcmV2 ZXJzZQ0KPiBjb252ZXJzaW9uIChlZmZlY3RpdmVseSB0aGV5IGFyZSB0aGUgc2FtZSB0aGluZyBh cyB0aGUgcmVxdWVzdGVyIGluIHRoaXMgY2FzZSBoYXMNCj4gYWxyZWFkeSBkb25lIGEgcGF0aHJl YyBxdWVyeSBhbmQgZG9lcyBub3RoaW5nIHdpdGggdGhlIHJlcGx5LCBhbmQsIGV2ZW4gaWYgaXQN Cj4gZG9lcyB0aGUgcmVxdWVzdGVyIGFscmVhZHkgaGFzIHRoZSBJQiBnaWQgYW5kIHdpbGwga25v dyBob3cgdG8gcmVzb2x2ZSBpdCkuDQpPay4NCg0KPiA+PiArICogQHdvcms6IFdvcmsgY29tcGxl dGlvbg0KPiA+PiArICogQHBhdGg6IFBhdGggcmVjb3JkDQo+ID4+ICsgKi8NCj4gPj4gK3N0YXRp YyB2b2lkIGNtX29wYV90b19pYl9zZ2lkKHN0cnVjdCBjbV93b3JrICp3b3JrLA0KPiA+PiArCQkJ ICAgICAgc3RydWN0IHNhX3BhdGhfcmVjICpwYXRoKQ0KPiA+PiArew0KPiA+PiArCXN0cnVjdCBp Yl9kZXZpY2UgKmRldiA9IHdvcmstPnBvcnQtPmNtX2Rldi0+aWJfZGV2aWNlOw0KPiA+PiArCXN0 cnVjdCBpYl9naWRfYXR0ciBnaWRfYXR0cjsNCj4gPj4gKwl1OCBwb3J0X251bSA9IHdvcmstPnBv cnQtPnBvcnRfbnVtOw0KPiA+PiArDQo+ID4+ICsJaWYgKHJkbWFfY2FwX29wYV9haChkZXYsIHBv cnRfbnVtKSAmJg0KPiA+PiArCSAgICAoaWJfaXNfb3BhX2dpZCgmcGF0aC0+c2dpZCkpKSB7DQo+ ID4+ICsJCXVuaW9uIGliX2dpZCBzZ2lkOw0KPiA+PiArDQo+ID4+ICsJCWlmIChpYl9nZXRfY2Fj aGVkX2dpZChkZXYsIHBvcnRfbnVtLCAwLA0KPiA+IE9ubHkgZ2lkIDAgbmVlZHMgY29udmVyc2lv bj8NCj4gWWVzLMKgIGJlY2F1c2UgZ2lkIDEgaXMgdGhlIE9QQSBnaWQgKHBlciB0aGUgT1BBIHNw ZWMgdGhlcmUgaXMgb25seSBvbmUgZ2lkIHBlciBwb3J0DQo+IHNvIGdpZCAxIGlzIGEgY2FjaGlu ZyBwb2ludCBmb3IgdGhlIG9wYSBnaWQpLg0KPiA+PiArCQkJCSAgICAgICZzZ2lkLCAmZ2lkX2F0 dHIpKSB7DQo+ID4gU2luY2UgZ2lkIGF0dHJpYnV0ZSBpcyBub3QgdXNlZCBoZXJlIGFuZCBhcHBs aWNhYmxlIHRvIFJvQ0UgYW5kIGl0cyBvcHRpb25hbCwgY2FuDQo+IHlvdSBwYXNzIE5VTEwgYW5k IGF2b2lkIGdpZF9hdHRyPw0KPiBXaWxsIGRvLg0KT2suIFRoYW5rcy4NCg0K
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Jan Sokolowski <[email protected]>

Currently, if a port is queried that has an invalid Maximum Transmission Unit, driver reports default MTU of 2048. This in incorrect.

Use default value of 4096 if invalid.

---
 drivers/infiniband/hw/hfi1/verbs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index a38785e..6d27c85 100644
@@ -1486,7 +1486,7 @@ static int query_port(struct rvt_dev_info *rdi, u8 port_num,
 	props->max_mtu = mtu_to_enum((!valid_ib_mtu(hfi1_max_mtu) ?
 				      4096 : hfi1_max_mtu), IB_MTU_4096);
 	props->active_mtu = !valid_ib_mtu(ppd->ibmtu) ? props->max_mtu :
-		mtu_to_enum(ppd->ibmtu, IB_MTU_2048);
+		mtu_to_enum(ppd->ibmtu, IB_MTU_4096);
 
 	/*
 	 * sm_lid of 0xFFFF needs special handling so that it can

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

This is probably the only one that really needs to go for the rc. The rest can push off till 4.16 I think. This is trivial and prevents use of an uninitialized variable.

These two fix problems introduced in 4.13

This is not a critical bug fix.

This one is an older bug in qib.

Still under discussion/rework.

Jason, if you want to pull:
https://patchwork.kernel.org/patch/10057487/
for the -rc I can submit a v2 of the other 5 once Sandeep's rework is ready.

-Denny

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

SGkgRGVubmlzLA0KDQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IGxpbnV4 LXJkbWEtb3duZXJAdmdlci5rZXJuZWwub3JnIFttYWlsdG86bGludXgtcmRtYS0NCj4gb3duZXJA dmdlci5rZXJuZWwub3JnXSBPbiBCZWhhbGYgT2YgRGVubmlzIERhbGVzc2FuZHJvDQo+IFNlbnQ6 IFdlZG5lc2RheSwgTm92ZW1iZXIgMjksIDIwMTcgMTI6NDMgUE0NCj4gVG86IGRsZWRmb3JkQHJl ZGhhdC5jb207IEphc29uIEd1bnRob3JwZSA8amdnQHppZXBlLmNhPg0KPiBDYzogTWlrZSBNYXJj aW5pc3p5biA8bWlrZS5tYXJjaW5pc3p5bkBpbnRlbC5jb20+OyBKYW4gU29rb2xvd3NraQ0KPiA8 amFuLnNva29sb3dza2lAaW50ZWwuY29tPjsgbGludXgtcmRtYUB2Z2VyLmtlcm5lbC5vcmc7IE1p Y2hhZWwgSi4gUnVobA0KPiA8bWljaGFlbC5qLnJ1aGxAaW50ZWwuY29tPjsgVmVua2F0YSBTYW5k ZWVwIERoYW5hbGFrb3RhDQo+IDx2ZW5rYXRhLnMuZGhhbmFsYWtvdGFAaW50ZWwuY29tPjsgRG9u IEhpYXR0IDxkb24uaGlhdHRAaW50ZWwuY29tPjsgSXJhDQo+IFdlaW55IDxpcmEud2VpbnlAaW50 ZWwuY29tPg0KPiBTdWJqZWN0OiBSZTogW1BBVENIIGZvci1uZXh0IDAvNl0gSUIvaGZpMSwgcWli LCBjbSwgc2E6IExhc3Qgc2V0IGZvciA0LjE1IG1lcmdlDQo+IHdpbmRvdw0KPiANCj4gT24gMTEv MTQvMjAxNyA3OjM0IEFNLCBEZW5uaXMgRGFsZXNzYW5kcm8gd3JvdGU6DQo+ID4gSGkgRG91ZywN Cj4gPg0KPiA+IEhlcmUgaXMgdGhlIGxhdGVzdCBzZXQgb2YgcGF0Y2hlcyBJIGhhdmUgdGhhdCB3 ZSdkIGxpa2UgdG8gbGFuZCBpbg0KPiA+IDQuMTUuIFRoZXJlIGFyZSBzb21lIGRyaXZlciBmaXhl cywgaW5jbHVkaW5nIGEgcWliIHRoYXQgaXMgbWFya2VkIGFzDQo+ID4gc3RhYmxlLiBXZSBhbHNv IGhhdmUgYSBDTSBhbmQgU0EgcGF0Y2ggdGhyb3duIGluIHRoZSBtaXguDQo+ID4NCj4gPiBBcyBh bHdheXMgcGF0Y2hlcyBhdmFpbGFibGUgZm9yIGJyb3dzaW5nIGF0Og0KPiA+IGh0dHBzOi8vZ2l0 aHViLmNvbS9kZGFsZXNzYS9rZXJuZWwvdHJlZS9mb3ItNC4xNQ0KPiA+DQo+ID4gLS0tDQo+ID4N Cj4gPiBEZW5uaXMgRGFsZXNzYW5kcm8gKDEpOg0KPiA+ICAgICAgICBJQi9oZmkxOiBJbml0aWFs aXplIGJ0aDEgaW4gMTZCIHJjIGFjayBidWlsZGVyDQo+IA0KPiBUaGlzIGlzIHByb2JhYmx5IHRo ZSBvbmx5IG9uZSB0aGF0IHJlYWxseSBuZWVkcyB0byBnbyBmb3IgdGhlIHJjLiBUaGUgcmVzdCBj YW4gcHVzaA0KPiBvZmYgdGlsbCA0LjE2IEkgdGhpbmsuIFRoaXMgaXMgdHJpdmlhbCBhbmQgcHJl dmVudHMgdXNlIG9mIGFuIHVuaW5pdGlhbGl6ZWQgdmFyaWFibGUuDQo+IA0KPiA+IERvbiBIaWF0 dCAoMik6DQo+ID4gICAgICAgIElCL2hmaTE6IE1hc2sgdGhlIHBhdGggYml0cyB3aXRoIHRoZSBM TUMgZm9yIDE2QiBSQyBBY2tzDQo+ID4gICAgICAgIElCL0NNOiBDaGFuZ2Ugc2dpZCB0byBJQiBH SUQgd2hlbiBoYW5kbGluZyBDTSByZXF1ZXN0DQo+IA0KVGhlcmUgYXJlIGNvdXBsZSBvZiBxdWVy aWVzIGFuZCBpbnB1dHMgdG8gYW1lbmQgYWJvdmUgcGF0Y2ggb2YgSUIvQ00uDQpEaWQgeW91IGdl dCBhIGNoYW5jZSB0byBhZGRyZXNzIHRoZW0/DQoNCg0KPiBUaGVzZSB0d28gZml4IHByb2JsZW1z IGludHJvZHVjZWQgaW4gNC4xMw0KPiANCj4gPiBKYW4gU29rb2xvd3NraSAoMSk6DQo+ID4gICAg ICAgIElCL2hmaTE6IFVzZSA0MDk2IGZvciBkZWZhdWx0IGFjdGl2ZSBNVFUgaW4gcXVlcnlfcXAN Cj4gDQo+IFRoaXMgaXMgbm90IGEgY3JpdGljYWwgYnVnIGZpeC4NCj4gDQo+ID4gTWlrZSBNYXJj aW5pc3p5biAoMSk6DQo+ID4gICAgICAgIElCL3FpYjogRml4IGNvbXBhcmlzb24gZXJyb3Igd2l0 aCBxcGVyZiBjb21wYXJlL3N3YXAgdGVzdA0KPiANCj4gVGhpcyBvbmUgaXMgYW4gb2xkZXIgYnVn IGluIHFpYi4NCj4gDQo+ID4gVmVua2F0YSBTYW5kZWVwIERoYW5hbGFrb3RhICgxKToNCj4gPiAg ICAgICAgSUIvU0E6IENoZWNrIGRsaWQgYmVmb3JlIFNBIGFnZW50IHF1ZXJpZXMgZm9yIENsYXNz UG9ydEluZm8NCj4gDQo+IFN0aWxsIHVuZGVyIGRpc2N1c3Npb24vcmV3b3JrLg0KPiANCj4gSmFz b24sIGlmIHlvdSB3YW50IHRvIHB1bGw6DQo+IGh0dHBzOi8vcGF0Y2h3b3JrLmtlcm5lbC5vcmcv cGF0Y2gvMTAwNTc0ODcvDQo+IGZvciB0aGUgLXJjIEkgY2FuIHN1Ym1pdCBhIHYyIG9mIHRoZSBv dGhlciA1IG9uY2UgU2FuZGVlcCdzIHJld29yayBpcyByZWFkeS4NCj4gDQo+IC1EZW5ueQ0KPiAN Cj4gDQo+IC0tDQo+IFRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5l ICJ1bnN1YnNjcmliZSBsaW51eC1yZG1hIiBpbiB0aGUgYm9keQ0KPiBvZiBhIG1lc3NhZ2UgdG8g bWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZyBNb3JlIG1ham9yZG9tbyBpbmZvIGF0DQo+IGh0dHA6 Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbA0K
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi Parva,

Sorry, I totally missed your comments. I'll look at the archive and address them.

Thanks,

don

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Okay thanks, patchworks reflects this now.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Mike Marciniszyn <[email protected]>

This failure exists with qib:

ver_rc_compare_swap:
mismatch, sequence 2, expected 123456789abcdef, got 0

The request builder was using the incorrect inlines to build the request header resulting in incorrect data in the atomic header.

Fix by using the appropriate inlines to create the request.

---
 drivers/infiniband/hw/qib/qib_rc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

index 8f5754f..e4a9ba1 100644
@@ -434,13 +434,13 @@ int qib_make_rc_req(struct rvt_qp *qp, unsigned long *flags)
 				qp->s_state = OP(COMPARE_SWAP);
 				put_ib_ateth_swap(wqe->atomic_wr.swap,
 						  &ohdr->u.atomic_eth);
-				put_ib_ateth_swap(wqe->atomic_wr.compare_add,
-						  &ohdr->u.atomic_eth);
+				put_ib_ateth_compare(wqe->atomic_wr.compare_add,
+						     &ohdr->u.atomic_eth);
 			} else {
 				qp->s_state = OP(FETCH_ADD);
 				put_ib_ateth_swap(wqe->atomic_wr.compare_add,
 						  &ohdr->u.atomic_eth);
-				put_ib_ateth_swap(0, &ohdr->u.atomic_eth);
+				put_ib_ateth_compare(0, &ohdr->u.atomic_eth);
 			}
 			put_ib_ateth_vaddr(wqe->atomic_wr.remote_addr,
 					   &ohdr->u.atomic_eth);