opensm: Add support for optimized SLtoVLMappingTable programming

Optimized SLtoVLMappingTable programming reduces the number of MADs needed from O(n**2) to O(n). See IBA 1.2.1 vol 1 p. 843 14.2.5.8 SLtoVLMappingTable.

---
Changes since v2:
Use osm_log rather than OSM_LOG in osm_slvl_rcv_process for optimized sl2vl mapping programming verbose log message
Removed unneeded check of p_physp in input port loop in osm_slvl_rcv_process for optimized sl2vl mapping programming

Changes since v1:
Changed optimized programming flow in osm_qos to only call sl2vl_update once per switch supporting this feature

index 3c08689..583c070 100644
@@ -206,6 +206,7 @@ typedef struct osm_subn_opt {
 	boolean_t daemon;
 	boolean_t sm_inactive;
 	boolean_t babbling_port_policy;
+	boolean_t use_optimized_slvl;
 	osm_qos_options_t qos_options;
 	osm_qos_options_t qos_ca_options;
 	osm_qos_options_t qos_sw0_options;

@@ -433,6 +434,10 @@ typedef struct osm_subn_opt {
 *	babbling_port_policy
 *		OpenSM will enforce its "babbling" port policy.
 *
+*	use_optimized_slvl
+*		Use optimized SLtoVLMappingTable programming if
+*		device indicates it supports this.
+*
 *	perfmgr
 *		Enable or disable the performance manager
 *

index 09029db..103b5c6 100644
@@ -354,6 +354,7 @@ static const opt_rec_t opt_tbl[] = {
 	{ "daemon", OPT_OFFSET(daemon), opts_parse_boolean, NULL, 0 },
 	{ "sm_inactive", OPT_OFFSET(sm_inactive), opts_parse_boolean, NULL, 1 },
 	{ "babbling_port_policy", OPT_OFFSET(babbling_port_policy), opts_parse_boolean, NULL, 1 },
+	{ "use_optimized_slvl", OPT_OFFSET(use_optimized_slvl), opts_parse_boolean, NULL, 1 },
 #ifdef ENABLE_OSM_PERF_MGR
 	{ "perfmgr", OPT_OFFSET(perfmgr), opts_parse_boolean, NULL, 0 },
 	{ "perfmgr_redir", OPT_OFFSET(perfmgr_redir), opts_parse_boolean, NULL, 0 },

@@ -713,6 +714,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt)
 	p_opt->daemon = FALSE;
 	p_opt->sm_inactive = FALSE;
 	p_opt->babbling_port_policy = FALSE;
+	p_opt->use_optimized_slvl = FALSE;
 #ifdef ENABLE_OSM_PERF_MGR
 	p_opt->perfmgr = FALSE;
 	p_opt->perfmgr_redir = TRUE;

@@ -1499,10 +1501,13 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)
 		"# SM Inactive\n"
 		"sm_inactive %s\n\n"
 		"# Babbling Port Policy\n"
-		"babbling_port_policy %s\n\n",
+		"babbling_port_policy %s\n\n"
+		"# Use Optimized SLtoVLMapping programming if supported by device\n"
+		"use_optimized_slvl %s\n\n",
 		p_opts->daemon ? "TRUE" : "FALSE",
 		p_opts->sm_inactive ? "TRUE" : "FALSE",
-		p_opts->babbling_port_policy ? "TRUE" : "FALSE");
+		p_opts->babbling_port_policy ? "TRUE" : "FALSE",
+		p_opts->use_optimized_slvl ? "TRUE" : "FALSE");
 
 #ifdef ENABLE_OSM_PERF_MGR
 	fprintf(out,

--
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

Ports (input and output) number parsing from attribute modifier value of SLtoVLMappingTable response was endianess dependent and actually was broken on a big endian machines. Fix it by doing this endianess independently.

---

When reviewing this patch I found couple of bugs in this code unrelated to the proposed change. Posting the fixes in this thread.

 opensm/opensm/osm_slvl_map_rcv.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

index 4f75690..3b24a8e 100644
@@ -105,10 +105,8 @@ void osm_slvl_rcv_process(IN void *context, IN void *p_data)
 
 	/* in case of a non switch node the attr modifier should be ignored */
 	if (osm_node_get_type(p_node) == IB_NODE_TYPE_SWITCH) {
-		out_port_num =
-		    (uint8_t) cl_ntoh32(p_smp->attr_mod & 0xFF000000);
-		in_port_num =
-		    (uint8_t) cl_ntoh32((p_smp->attr_mod & 0x00FF0000) << 8);
+		out_port_num = cl_ntoh32(p_smp->attr_mod) & 0xff;
+		in_port_num = (cl_ntoh32(p_smp->attr_mod) >> 8) & 0xff;
 		p_physp = osm_node_get_physp_ptr(p_node, out_port_num);
 	} else {
 		p_physp = p_port->p_physp;

1.6.6.rc4

--
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

Verify that port number values received from network are in range and valid for access. Report error otherwise.

---
 opensm/opensm/osm_slvl_map_rcv.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

index b35d867..6229db9 100644
@@ -104,8 +104,17 @@ void osm_slvl_rcv_process(IN void *context, IN void *p_data)
 
 	/* in case of a non switch node the attr modifier should be ignored */
 	if (osm_node_get_type(p_node) == IB_NODE_TYPE_SWITCH) {
+		unsigned num_ports = osm_node_get_num_physp(p_node) - 1;
 		out_port_num = cl_ntoh32(p_smp->attr_mod) & 0xff;
 		in_port_num = (cl_ntoh32(p_smp->attr_mod) >> 8) & 0xff;
+		if (in_port_num > num_ports || out_port_num > num_ports) {
+			OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 2C07"
+				"Invalid attribute modifier 0x%x reveived in"
+				" response from switch 0x%" PRIx64 "\n",
+				cl_ntoh32(p_smp->attr_mod),
+				cl_ntoh64(node_guid));
+			goto Exit;
+		}
 		p_physp = osm_node_get_physp_ptr(p_node, out_port_num);
 	} else {
 		p_physp = p_port->p_physp;

1.6.6.rc4

--
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

Won't this spam the OpenSM log ?

           ^^^^^^^^

            typo

--
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

Yes, unfortunately. But unlike SA queries, etc., this is response to OpenSM originated request and messing attribute modifier there is more critical there than just invalid query from some client.

However basically I am sharing your concerns. Maybe we need a separate log level for things like that (OSM_LOG_WARNING or so).

Thanks for finding. I'm fixing this.

Sasha
--
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

Yes but why would SMA mess up attribute modifier though ? So is this just detecting OpenSM bug with AM ?

-- Hal

--
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

How could I know? :)

It is not for OpenSM internal bugs detecting. It is "don't trust to information from a network", in this specific case attribute modifier elements are used as pointers indexes (sl2vl tables), so OpenSM don't need to crash due to broken SMAs or other sort of attack.

Sasha
--
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

Yes, I noticed that but...

I thought this was only done when these issues are actually found and in general we are relying on compliance. Is there a specific known issue here ?

If we are worrying about this as a general principle, there are more places to bullet proof like this. I am wondering about why the exception here.

-- Hal

--
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

OpenSM can rely on compliance in many cases, but it cannot crash (or become nonoperational in any other way) relying on compliance.

Likely so and it would be good to fix all of them.

It is not exception. I found this one, so fixed.

Sasha
--
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's fine as a general principle but isn't practical. There are many cases where OpenSM relies on SMA/PMA/SA client compliance (without such checking/overhead).

Have you done a code review/inspection for such cases ?

I think there are more unprotected cases than protected ones.

-- Hal

--
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

No, I've never hunted this specially, perhaps fixed couple of such occasionally (like this one).

Have you done a code review/inspection?

Sasha
--
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 wasn't referring to just SA queries.

I don't think this is consistent with your treatment of other proposed error messages.

I think the logging needs more than just another level.

-- Hal

--
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

In case when response was received for non-existing port (for example when it was dropped after querying) OpenSM data structures access mutex will be released twice. Fix this.

---
 opensm/opensm/osm_slvl_map_rcv.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

index 3b24a8e..b35d867 100644
@@ -91,7 +91,6 @@ void osm_slvl_rcv_process(IN void *context, IN void *p_data)
 	p_port = osm_get_port_by_guid(sm->p_subn, port_guid);
 
 	if (!p_port) {
-		cl_plock_release(sm->p_lock);
 		OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 2C06: "
 			"No port object for port with GUID 0x%" PRIx64
 			"\n\t\t\t\tfor parent node GUID 0x%" PRIx64

1.6.6.rc4

--
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 Hal,

I didn't ask for such change. Instead I asked to avoid the function (osm_slvl_rcv_process() in this patch) constructed in form of:

	if (cond1)
		goto flow1;

	do_flow2;

	goto end;

flow1:

	do_flow1;

end:

In general this is equivalent to simpler and more readable:

	if (cond1)
		do_flow1();
	else
		do_flow2();

And in case of osm_slvl_rcv_process() even nicer merge is possible when slvl port table setup loop is shared, but its range (start*port and end*port values) is defined differently for various input cases. Just like this (against your patch, rebased over recent fixes, compilation only tested):

index 7ca0b8f..73c6253 100644
@@ -72,8 +72,8 @@ void osm_slvl_rcv_process(IN void *context, IN void *p_data)
 	ib_net64_t port_guid;
 	ib_net64_t node_guid;
 	uint32_t attr_mod;
-	uint8_t out_port_num, in_port_num, startinport, startoutport,
-		endinport, endoutport;
+	uint8_t startinport, endinport, startoutport, endoutport;
+	uint8_t in_port, out_port;
 
 	CL_ASSERT(sm);
 

@@ -109,80 +109,51 @@ void osm_slvl_rcv_process(IN void *context, IN void *p_data)
 	if (osm_node_get_type(p_node) == IB_NODE_TYPE_SWITCH) {
 		unsigned num_ports = osm_node_get_num_physp(p_node) - 1;
 		attr_mod = cl_ntoh32(p_smp->attr_mod);
-		out_port_num = attr_mod & 0xff;
-		in_port_num = (attr_mod >> 8) & 0xff;
-		if (in_port_num > num_ports || out_port_num > num_ports) {
+
+		if (attr_mod & 0x10000) {
+			startoutport = ib_switch_info_is_enhanced_port0(&p_node->sw->switch_info) ? 0 : 1;
+			endoutport = osm_node_get_num_physp(p_node) - 1;
+		} else
+			startoutport = endoutport = attr_mod & 0xff;
+
+		if (attr_mod & 0x20000) {
+			startinport = ib_switch_info_is_enhanced_port0(&p_node->sw->switch_info) ? 0 : 1;
+			endinport = osm_node_get_num_physp(p_node) - 1;
+		} else
+			startinport = endinport = (attr_mod >> 8) & 0xff;
+
+		if (startinport > num_ports || startoutport > num_ports) {
 			OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 2C07"
 				"Invalid attribute modifier 0x%x reveived in"
 				" response from switch 0x%" PRIx64 "\n",
-				cl_ntoh32(p_smp->attr_mod),
-				cl_ntoh64(node_guid));
+				cl_ntoh32(attr_mod), cl_ntoh64(node_guid));
 			goto Exit;
 		}
-		if (attr_mod & 0x30000)
-			goto opt_sl2vl;
-		p_physp = osm_node_get_physp_ptr(p_node, out_port_num);
-	} else {
-		p_physp = p_port->p_physp;
-		out_port_num = p_physp->port_num;
-		in_port_num = 0;
-	}
 
-	/*
-	   We do not care if this is a result of a set or get -
-	   all we want is to update the subnet.
-	 */
-	OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
-		"Received SLtoVL GetResp in_port_num %u out_port_num %u with "
-		"GUID 0x%" PRIx64 " for parent node GUID 0x%" PRIx64 ", TID 0x%"
-		PRIx64 "\n", in_port_num, out_port_num, cl_ntoh64(port_guid),
-		cl_ntoh64(node_guid), cl_ntoh64(p_smp->trans_id));
-
-	/*
-	   Determine if we encountered a new Physical Port.
-	   If so, Ignore it.
-	 */
-	if (!p_physp) {
-		OSM_LOG(sm->p_log, OSM_LOG_ERROR,
-			"Got invalid port number %u\n", out_port_num);
-		goto Exit;
+	} else {
+		startoutport = endoutport = p_port->p_physp->port_num;
+		startinport = endinport = 0;
 	}
 
-	osm_dump_slvl_map_table(sm->p_log, port_guid, in_port_num,
-				out_port_num, p_slvl_tbl, OSM_LOG_DEBUG);
-
-	osm_physp_set_slvl_tbl(p_physp, p_slvl_tbl, in_port_num);
-	goto Exit;
-
-opt_sl2vl:
-	if (osm_log_is_active(sm->p_log, OSM_LOG_VERBOSE))
-		osm_log(sm->p_log, OSM_LOG_VERBOSE,
-			"Received optimized SLtoVL get response in_port_num %u "
-			"out_port_num %u with GUID 0x%" PRIx64 " for parent "
-			"node GUID 0x%" PRIx64 ", TID 0x%" PRIx64 "\n",
-			in_port_num, out_port_num, cl_ntoh64(port_guid),
-			cl_ntoh64(node_guid), cl_ntoh64(p_smp->trans_id));
-
-	osm_dump_slvl_map_table(sm->p_log, port_guid, in_port_num,
-				out_port_num, p_slvl_tbl, OSM_LOG_DEBUG);
-
-	if (attr_mod & 0x10000) {
-		startoutport = ib_switch_info_is_enhanced_port0(&p_node->sw->switch_info) ? 0 : 1;
-		endoutport = osm_node_get_num_physp(p_node);
-	} else
-		endoutport = startoutport = out_port_num;
-	if (attr_mod & 0x20000) {
-		startinport = ib_switch_info_is_enhanced_port0(&p_node->sw->switch_info) ? 0 : 1;
-		endinport = osm_node_get_num_physp(p_node);
-	} else
-		endinport = startinport = in_port_num;
-
-	for (out_port_num = startoutport; out_port_num < endoutport;
-	     out_port_num++) {
-		p_physp = osm_node_get_physp_ptr(p_node, out_port_num);
-		for (in_port_num = startinport; in_port_num < endinport;
-		     in_port_num++)
-			osm_physp_set_slvl_tbl(p_physp, p_slvl_tbl, in_port_num);
+	OSM_LOG(sm->p_log, OSM_LOG_DEBUG, "Received SLtoVL GetResp"
+		" in_port_num %u out_port_num %u with GUID 0x%" PRIx64
+		" for parent node GUID 0x%" PRIx64 ", TID 0x%" PRIx64 "\n",
+		startinport == endinport ? startinport : 0xff,
+		startoutport == endoutport ? startoutport : 0xff,
+		cl_ntoh64(port_guid), cl_ntoh64(node_guid),
+		cl_ntoh64(p_smp->trans_id));
+
+	osm_dump_slvl_map_table(sm->p_log, port_guid,
+				startinport == endinport ? startinport : 0xff,
+				startoutport == endoutport ? startoutport : 0xff,
+				p_slvl_tbl, OSM_LOG_DEBUG);
+
+	for (out_port = startoutport; out_port <= endoutport; out_port++) {
+		p_physp = osm_node_get_physp_ptr(p_node, out_port);
+		for (in_port = startinport; in_port <= endinport; in_port++)
+			osm_physp_set_slvl_tbl(p_physp, p_slvl_tbl, in_port);
 	}
 
 Exit:

	for (out_port_num = startoutport; out_port_num < endoutport;
	     out_port_num++)

--
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

SGkgU2FzaGEsCgpPbiBUdWUsIERlYyAyOSwgMjAwOSBhdCAxMToyOSBBTSwgU2FzaGEgS2hhcHlv cnNreSA8c2FzaGFrQHZvbHRhaXJlLmNvbT4gd3JvdGU6Cj4gSGkgSGFsLAo+Cj4gT24gMTQ6NDEg VHVlIDAxIERlYyDCoCDCoCAsIEhhbCBSb3NlbnN0b2NrIHdyb3RlOgo+Pgo+PiBPcHRpbWl6ZWQg U0x0b1ZMTWFwcGluZ1RhYmxlIHByb2dyYW1taW5nIHJlZHVjZXMgdGhlIG51bWJlciBvZiBNQURz Cj4+IG5lZWRlZCBmcm9tIE8obioqMikgdG8gTyhuKS4gU2VlIElCQSAxLjIuMSB2b2wgMSBwLiA4 NDMgMTQuMi41LjgKPj4gU0x0b1ZMTWFwcGluZ1RhYmxlLgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBI YWwgUm9zZW5zdG9jayA8aGFsLnJvc2Vuc3RvY2tAZ21haWwuY29tPgo+PiAtLS0KPj4gQ2hhbmdl cyBzaW5jZSB2MjoKPj4gVXNlIG9zbV9sb2cgcmF0aGVyIHRoYW4gT1NNX0xPRyBpbiBvc21fc2x2 bF9yY3ZfcHJvY2VzcyBmb3Igb3B0aW1pemVkCj4+IHNsMnZsIG1hcHBpbmcgcHJvZ3JhbW1pbmcg dmVyYm9zZSBsb2cgbWVzc2FnZQo+Cj4gSSBkaWRuJ3QgYXNrIGZvciBzdWNoIGNoYW5nZS4gSW5z dGVhZCBJIGFza2VkIHRvIGF2b2lkIHRoZSBmdW5jdGlvbgo+IChvc21fc2x2bF9yY3ZfcHJvY2Vz cygpIGluIHRoaXMgcGF0Y2gpIGNvbnN0cnVjdGVkIGluIGZvcm0gb2Y6Cj4KPiDCoCDCoCDCoCDC oGlmIChjb25kMSkKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGdvdG8gZmxvdzE7Cj4KPiDCoCDC oCDCoCDCoGRvX2Zsb3cyOwo+Cj4gwqAgwqAgwqAgwqBnb3RvIGVuZDsKPgo+IGZsb3cxOgo+IMKg IMKgIMKgIMKgZG9fZmxvdzE7Cj4KPiBlbmQ6Cj4KPiBJbiBnZW5lcmFsIHRoaXMgaXMgZXF1aXZh bGVudCB0byBzaW1wbGVyIGFuZCBtb3JlIHJlYWRhYmxlOgo+Cj4gwqAgwqAgwqAgwqBpZiAoY29u ZDEpCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBkb19mbG93MSgpOwo+IMKgIMKgIMKgIMKgZWxz ZQo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgZG9fZmxvdzIoKTsKPgo+IEFuZCBpbiBjYXNlIG9m IG9zbV9zbHZsX3Jjdl9wcm9jZXNzKCkgZXZlbiBuaWNlciBtZXJnZSBpcyBwb3NzaWJsZSB3aGVu Cj4gc2x2bCBwb3J0IHRhYmxlIHNldHVwIGxvb3AgaXMgc2hhcmVkLCBidXQgaXRzIHJhbmdlIChz dGFydCpwb3J0IGFuZAo+IGVuZCpwb3J0IHZhbHVlcykgaXMgZGVmaW5lZCBkaWZmZXJlbnRseSBm b3IgdmFyaW91cyBpbnB1dCBjYXNlcy4gSnVzdAo+IGxpa2UgdGhpcyAoYWdhaW5zdCB5b3VyIHBh dGNoLCByZWJhc2VkIG92ZXIgcmVjZW50IGZpeGVzLCBjb21waWxhdGlvbgo+IG9ubHkgdGVzdGVk KToKPgo+Cj4gZGlmZiAtLWdpdCBhL29wZW5zbS9vcGVuc20vb3NtX3NsdmxfbWFwX3Jjdi5jIGIv b3BlbnNtL29wZW5zbS9vc21fc2x2bF9tYXBfcmN2LmMKPiBpbmRleCA3Y2EwYjhmLi43M2M2MjUz IDEwMDY0NAo+IC0tLSBhL29wZW5zbS9vcGVuc20vb3NtX3NsdmxfbWFwX3Jjdi5jCj4gKysrIGIv b3BlbnNtL29wZW5zbS9vc21fc2x2bF9tYXBfcmN2LmMKPiBAQCAtNzIsOCArNzIsOCBAQCB2b2lk IG9zbV9zbHZsX3Jjdl9wcm9jZXNzKElOIHZvaWQgKmNvbnRleHQsIElOIHZvaWQgKnBfZGF0YSkK PiDCoCDCoCDCoCDCoGliX25ldDY0X3QgcG9ydF9ndWlkOwo+IMKgIMKgIMKgIMKgaWJfbmV0NjRf dCBub2RlX2d1aWQ7Cj4gwqAgwqAgwqAgwqB1aW50MzJfdCBhdHRyX21vZDsKPiAtIMKgIMKgIMKg IHVpbnQ4X3Qgb3V0X3BvcnRfbnVtLCBpbl9wb3J0X251bSwgc3RhcnRpbnBvcnQsIHN0YXJ0b3V0 cG9ydCwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGVuZGlucG9ydCwgZW5kb3V0cG9ydDsKPiAr IMKgIMKgIMKgIHVpbnQ4X3Qgc3RhcnRpbnBvcnQsIGVuZGlucG9ydCwgc3RhcnRvdXRwb3J0LCBl bmRvdXRwb3J0Owo+ICsgwqAgwqAgwqAgdWludDhfdCBpbl9wb3J0LCBvdXRfcG9ydDsKPgo+IMKg IMKgIMKgIMKgQ0xfQVNTRVJUKHNtKTsKPgo+IEBAIC0xMDksODAgKzEwOSw1MSBAQCB2b2lkIG9z bV9zbHZsX3Jjdl9wcm9jZXNzKElOIHZvaWQgKmNvbnRleHQsIElOIHZvaWQgKnBfZGF0YSkKPiDC oCDCoCDCoCDCoGlmIChvc21fbm9kZV9nZXRfdHlwZShwX25vZGUpID09IElCX05PREVfVFlQRV9T V0lUQ0gpIHsKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHVuc2lnbmVkIG51bV9wb3J0cyA9IG9z bV9ub2RlX2dldF9udW1fcGh5c3AocF9ub2RlKSAtIDE7Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqBhdHRyX21vZCA9IGNsX250b2gzMihwX3NtcC0+YXR0cl9tb2QpOwo+IC0gwqAgwqAgwqAgwqAg wqAgwqAgwqAgb3V0X3BvcnRfbnVtID0gYXR0cl9tb2QgJiAweGZmOwo+IC0gwqAgwqAgwqAgwqAg wqAgwqAgwqAgaW5fcG9ydF9udW0gPSAoYXR0cl9tb2QgPj4gOCkgJiAweGZmOwo+IC0gwqAgwqAg wqAgwqAgwqAgwqAgwqAgaWYgKGluX3BvcnRfbnVtID4gbnVtX3BvcnRzIHx8IG91dF9wb3J0X251 bSA+IG51bV9wb3J0cykgewo+ICsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmIChhdHRyX21v ZCAmIDB4MTAwMDApIHsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHN0YXJ0 b3V0cG9ydCA9IGliX3N3aXRjaF9pbmZvX2lzX2VuaGFuY2VkX3BvcnQwKCZwX25vZGUtPnN3LT5z d2l0Y2hfaW5mbykgPyAwIDogMTsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IGVuZG91dHBvcnQgPSBvc21fbm9kZV9nZXRfbnVtX3BoeXNwKHBfbm9kZSkgLSAxOwo+ICsgwqAg wqAgwqAgwqAgwqAgwqAgwqAgfSBlbHNlCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCBzdGFydG91dHBvcnQgPSBlbmRvdXRwb3J0ID0gYXR0cl9tb2QgJiAweGZmOwo+ICsKPiAr IMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmIChhdHRyX21vZCAmIDB4MjAwMDApIHsKPiArIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHN0YXJ0aW5wb3J0ID0gaWJfc3dpdGNoX2luZm9f aXNfZW5oYW5jZWRfcG9ydDAoJnBfbm9kZS0+c3ctPnN3aXRjaF9pbmZvKSA/IDAgOiAxOwo+ICsg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgZW5kaW5wb3J0ID0gb3NtX25vZGVfZ2V0 X251bV9waHlzcChwX25vZGUpIC0gMTsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIH0gZWxzZQo+ ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgc3RhcnRpbnBvcnQgPSBlbmRpbnBv cnQgPSAoYXR0cl9tb2QgPj4gOCkgJiAweGZmOwo+ICsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKg IGlmIChzdGFydGlucG9ydCA+IG51bV9wb3J0cyB8fCBzdGFydG91dHBvcnQgPiBudW1fcG9ydHMp IHsKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoE9TTV9MT0coc20tPnBfbG9n LCBPU01fTE9HX0VSUk9SLCAiRVJSIDJDMDciCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAiSW52YWxpZCBhdHRyaWJ1dGUgbW9kaWZpZXIgMHgleCByZXZl aXZlZCBpbiIKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCIgcmVzcG9uc2UgZnJvbSBzd2l0Y2ggMHglIiBQUkl4NjQgIlxuIiwKPiAtIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGNsX250b2gzMihwX3NtcC0+YXR0cl9t b2QpLAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgY2xf bnRvaDY0KG5vZGVfZ3VpZCkpOwo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgY2xfbnRvaDMyKGF0dHJfbW9kKSwgY2xfbnRvaDY0KG5vZGVfZ3VpZCkpOwo+ IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgZ290byBFeGl0Owo+IMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgfQo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKGF0dHJfbW9kICYg MHgzMDAwMCkKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGdvdG8gb3B0X3Ns MnZsOwo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgcF9waHlzcCA9IG9zbV9ub2RlX2dldF9waHlz cF9wdHIocF9ub2RlLCBvdXRfcG9ydF9udW0pOwo+IC0gwqAgwqAgwqAgfSBlbHNlIHsKPiAtIMKg IMKgIMKgIMKgIMKgIMKgIMKgIHBfcGh5c3AgPSBwX3BvcnQtPnBfcGh5c3A7Cj4gLSDCoCDCoCDC oCDCoCDCoCDCoCDCoCBvdXRfcG9ydF9udW0gPSBwX3BoeXNwLT5wb3J0X251bTsKPiAtIMKgIMKg IMKgIMKgIMKgIMKgIMKgIGluX3BvcnRfbnVtID0gMDsKPiAtIMKgIMKgIMKgIH0KPgo+IC0gwqAg wqAgwqAgLyoKPiAtIMKgIMKgIMKgIMKgIMKgV2UgZG8gbm90IGNhcmUgaWYgdGhpcyBpcyBhIHJl c3VsdCBvZiBhIHNldCBvciBnZXQgLQo+IC0gwqAgwqAgwqAgwqAgwqBhbGwgd2Ugd2FudCBpcyB0 byB1cGRhdGUgdGhlIHN1Ym5ldC4KPiAtIMKgIMKgIMKgIMKgKi8KPiAtIMKgIMKgIMKgIE9TTV9M T0coc20tPnBfbG9nLCBPU01fTE9HX1ZFUkJPU0UsCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAi UmVjZWl2ZWQgU0x0b1ZMIEdldFJlc3AgaW5fcG9ydF9udW0gJXUgb3V0X3BvcnRfbnVtICV1IHdp dGggIgo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgIkdVSUQgMHglIiBQUkl4NjQgIiBmb3IgcGFy ZW50IG5vZGUgR1VJRCAweCUiIFBSSXg2NCAiLCBUSUQgMHglIgo+IC0gwqAgwqAgwqAgwqAgwqAg wqAgwqAgUFJJeDY0ICJcbiIsIGluX3BvcnRfbnVtLCBvdXRfcG9ydF9udW0sIGNsX250b2g2NChw b3J0X2d1aWQpLAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgY2xfbnRvaDY0KG5vZGVfZ3VpZCks IGNsX250b2g2NChwX3NtcC0+dHJhbnNfaWQpKTsKPiAtCj4gLSDCoCDCoCDCoCAvKgo+IC0gwqAg wqAgwqAgwqAgwqBEZXRlcm1pbmUgaWYgd2UgZW5jb3VudGVyZWQgYSBuZXcgUGh5c2ljYWwgUG9y dC4KPiAtIMKgIMKgIMKgIMKgIMKgSWYgc28sIElnbm9yZSBpdC4KPiAtIMKgIMKgIMKgIMKgKi8K PiAtIMKgIMKgIMKgIGlmICghcF9waHlzcCkgewo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgT1NN X0xPRyhzbS0+cF9sb2csIE9TTV9MT0dfRVJST1IsCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCAiR290IGludmFsaWQgcG9ydCBudW1iZXIgJXVcbiIsIG91dF9wb3J0X251bSk7 Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCBnb3RvIEV4aXQ7Cj4gKyDCoCDCoCDCoCB9IGVsc2Ug ewo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgc3RhcnRvdXRwb3J0ID0gZW5kb3V0cG9ydCA9IHBf cG9ydC0+cF9waHlzcC0+cG9ydF9udW07Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBzdGFydGlu cG9ydCA9IGVuZGlucG9ydCA9IDA7Cj4gwqAgwqAgwqAgwqB9Cj4KPiAtIMKgIMKgIMKgIG9zbV9k dW1wX3NsdmxfbWFwX3RhYmxlKHNtLT5wX2xvZywgcG9ydF9ndWlkLCBpbl9wb3J0X251bSwKPiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG91dF9wb3J0X251 bSwgcF9zbHZsX3RibCwgT1NNX0xPR19ERUJVRyk7Cj4gLQo+IC0gwqAgwqAgwqAgb3NtX3BoeXNw X3NldF9zbHZsX3RibChwX3BoeXNwLCBwX3NsdmxfdGJsLCBpbl9wb3J0X251bSk7Cj4gLSDCoCDC oCDCoCBnb3RvIEV4aXQ7Cj4gLQo+IC1vcHRfc2wydmw6Cj4gLSDCoCDCoCDCoCBpZiAob3NtX2xv Z19pc19hY3RpdmUoc20tPnBfbG9nLCBPU01fTE9HX1ZFUkJPU0UpKQo+IC0gwqAgwqAgwqAgwqAg wqAgwqAgwqAgb3NtX2xvZyhzbS0+cF9sb2csIE9TTV9MT0dfVkVSQk9TRSwKPiAtIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICJSZWNlaXZlZCBvcHRpbWl6ZWQgU0x0b1ZMIGdldCBy ZXNwb25zZSBpbl9wb3J0X251bSAldSAiCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCAib3V0X3BvcnRfbnVtICV1IHdpdGggR1VJRCAweCUiIFBSSXg2NCAiIGZvciBwYXJlbnQg Igo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgIm5vZGUgR1VJRCAweCUiIFBS SXg2NCAiLCBUSUQgMHglIiBQUkl4NjQgIlxuIiwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIGluX3BvcnRfbnVtLCBvdXRfcG9ydF9udW0sIGNsX250b2g2NChwb3J0X2d1aWQp LAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgY2xfbnRvaDY0KG5vZGVfZ3Vp ZCksIGNsX250b2g2NChwX3NtcC0+dHJhbnNfaWQpKTsKPiAtCj4gLSDCoCDCoCDCoCBvc21fZHVt cF9zbHZsX21hcF90YWJsZShzbS0+cF9sb2csIHBvcnRfZ3VpZCwgaW5fcG9ydF9udW0sCj4gLSDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBvdXRfcG9ydF9udW0s IHBfc2x2bF90YmwsIE9TTV9MT0dfREVCVUcpOwo+IC0KPiAtIMKgIMKgIMKgIGlmIChhdHRyX21v ZCAmIDB4MTAwMDApIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHN0YXJ0b3V0cG9ydCA9IGli X3N3aXRjaF9pbmZvX2lzX2VuaGFuY2VkX3BvcnQwKCZwX25vZGUtPnN3LT5zd2l0Y2hfaW5mbykg PyAwIDogMTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGVuZG91dHBvcnQgPSBvc21fbm9kZV9n ZXRfbnVtX3BoeXNwKHBfbm9kZSk7Cj4gLSDCoCDCoCDCoCB9IGVsc2UKPiAtIMKgIMKgIMKgIMKg IMKgIMKgIMKgIGVuZG91dHBvcnQgPSBzdGFydG91dHBvcnQgPSBvdXRfcG9ydF9udW07Cj4gLSDC oCDCoCDCoCBpZiAoYXR0cl9tb2QgJiAweDIwMDAwKSB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDC oCBzdGFydGlucG9ydCA9IGliX3N3aXRjaF9pbmZvX2lzX2VuaGFuY2VkX3BvcnQwKCZwX25vZGUt PnN3LT5zd2l0Y2hfaW5mbykgPyAwIDogMTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGVuZGlu cG9ydCA9IG9zbV9ub2RlX2dldF9udW1fcGh5c3AocF9ub2RlKTsKPiAtIMKgIMKgIMKgIH0gZWxz ZQo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgZW5kaW5wb3J0ID0gc3RhcnRpbnBvcnQgPSBpbl9w b3J0X251bTsKPiAtCj4gLSDCoCDCoCDCoCBmb3IgKG91dF9wb3J0X251bSA9IHN0YXJ0b3V0cG9y dDsgb3V0X3BvcnRfbnVtIDwgZW5kb3V0cG9ydDsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgb3V0X3Bv cnRfbnVtKyspIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHBfcGh5c3AgPSBvc21fbm9kZV9n ZXRfcGh5c3BfcHRyKHBfbm9kZSwgb3V0X3BvcnRfbnVtKTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKg IMKgIGZvciAoaW5fcG9ydF9udW0gPSBzdGFydGlucG9ydDsgaW5fcG9ydF9udW0gPCBlbmRpbnBv cnQ7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGluX3BvcnRfbnVtKyspCj4gLSDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBvc21fcGh5c3Bfc2V0X3NsdmxfdGJsKHBf cGh5c3AsIHBfc2x2bF90YmwsIGluX3BvcnRfbnVtKTsKPiArIMKgIMKgIMKgIE9TTV9MT0coc20t PnBfbG9nLCBPU01fTE9HX0RFQlVHLCAiUmVjZWl2ZWQgU0x0b1ZMIEdldFJlc3AiCj4gKyDCoCDC oCDCoCDCoCDCoCDCoCDCoCAiIGluX3BvcnRfbnVtICV1IG91dF9wb3J0X251bSAldSB3aXRoIEdV SUQgMHglIiBQUkl4NjQKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgICIgZm9yIHBhcmVudCBub2Rl IEdVSUQgMHglIiBQUkl4NjQgIiwgVElEIDB4JSIgUFJJeDY0ICJcbiIsCj4gKyDCoCDCoCDCoCDC oCDCoCDCoCDCoCBzdGFydGlucG9ydCA9PSBlbmRpbnBvcnQgPyBzdGFydGlucG9ydCA6IDB4ZmYs Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBzdGFydG91dHBvcnQgPT0gZW5kb3V0cG9ydCA/IHN0 YXJ0b3V0cG9ydCA6IDB4ZmYsCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBjbF9udG9oNjQocG9y dF9ndWlkKSwgY2xfbnRvaDY0KG5vZGVfZ3VpZCksCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBj bF9udG9oNjQocF9zbXAtPnRyYW5zX2lkKSk7Cj4gKwo+ICsgwqAgwqAgwqAgb3NtX2R1bXBfc2x2 bF9tYXBfdGFibGUoc20tPnBfbG9nLCBwb3J0X2d1aWQsCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBzdGFydGlucG9ydCA9PSBlbmRpbnBvcnQgPyBzdGFy dGlucG9ydCA6IDB4ZmYsCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCBzdGFydG91dHBvcnQgPT0gZW5kb3V0cG9ydCA/IHN0YXJ0b3V0cG9ydCA6IDB4ZmYs Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwX3Nsdmxf dGJsLCBPU01fTE9HX0RFQlVHKTsKPiArCj4gKyDCoCDCoCDCoCBmb3IgKG91dF9wb3J0ID0gc3Rh cnRvdXRwb3J0OyBvdXRfcG9ydCA8PSBlbmRvdXRwb3J0OyBvdXRfcG9ydCsrKSB7Cj4gKyDCoCDC oCDCoCDCoCDCoCDCoCDCoCBwX3BoeXNwID0gb3NtX25vZGVfZ2V0X3BoeXNwX3B0cihwX25vZGUs IG91dF9wb3J0KTsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGZvciAoaW5fcG9ydCA9IHN0YXJ0 aW5wb3J0OyBpbl9wb3J0IDw9IGVuZGlucG9ydDsgaW5fcG9ydCsrKQo+ICsgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgb3NtX3BoeXNwX3NldF9zbHZsX3RibChwX3BoeXNwLCBwX3Ns dmxfdGJsLCBpbl9wb3J0KTsKPiDCoCDCoCDCoCDCoH0KPgo+IMKgRXhpdDoKClRoaXMgcGF0Y2gg bG9va3MgZ29vZCB0byBtZSBhbmQgYXBwZWFycyB0byBiZSB3b3JraW5nIGluIGJvdGggdGhlIG5v bgpvcHRpbWl6ZWQgYW5kIG9wdGltaXplZCBjYXNlcyBhbHRob3VnaCB0aGVyZSBpcyBhdCBsZWFz dCBvbmUgc3VidGxlCmNoYW5nZSBhbmQgY2hlY2sgcmVtb3ZhbCB3aGljaCBzaG91bGQgYmUgT0sg KG5vdCBzdXJlIHdoYXQgdGhlCm9yaWdpbmFsIG1vdGl2YXRpb24gd2FzKS4KCj4+IFJlbW92ZWQg dW5uZWVkZWQgY2hlY2sgb2YgcF9waHlzcCBpbiBpbnB1dCBwb3J0IGxvb3AgaW4gb3NtX3Nsdmxf cmN2X3Byb2Nlc3MKPj4gZm9yIG9wdGltaXplZCBzbDJ2bCBtYXBwaW5nIHByb2dyYW1taW5nCj4+ Cj4+IENoYW5nZXMgc2luY2UgdjE6Cj4+IENoYW5nZWQgb3B0aW1pemVkIHByb2dyYW1taW5nIGZs b3cgaW4gb3NtX3FvcyB0byBvbmx5IGNhbGwKPj4gc2wydmxfdXBkYXRlIG9uY2UgcGVyIHN3aXRj aCBzdXBwb3J0aW5nIHRoaXMgZmVhdHVyZQo+Pgo+PiBkaWZmIC0tZ2l0IGEvb3BlbnNtL2luY2x1 ZGUvb3BlbnNtL29zbV9zdWJuZXQuaCBiL29wZW5zbS9pbmNsdWRlL29wZW5zbS9vc21fc3VibmV0 LmgKPj4gaW5kZXggM2MwODY4OS4uNTgzYzA3MCAxMDA2NDQKPj4gLS0tIGEvb3BlbnNtL2luY2x1 ZGUvb3BlbnNtL29zbV9zdWJuZXQuaAo+PiArKysgYi9vcGVuc20vaW5jbHVkZS9vcGVuc20vb3Nt X3N1Ym5ldC5oCj4+IEBAIC0yMDYsNiArMjA2LDcgQEAgdHlwZWRlZiBzdHJ1Y3Qgb3NtX3N1Ym5f b3B0IHsKPj4gwqAgwqAgwqAgYm9vbGVhbl90IGRhZW1vbjsKPj4gwqAgwqAgwqAgYm9vbGVhbl90 IHNtX2luYWN0aXZlOwo+PiDCoCDCoCDCoCBib29sZWFuX3QgYmFiYmxpbmdfcG9ydF9wb2xpY3k7 Cj4+ICsgwqAgwqAgYm9vbGVhbl90IHVzZV9vcHRpbWl6ZWRfc2x2bDsKPj4gwqAgwqAgwqAgb3Nt X3Fvc19vcHRpb25zX3QgcW9zX29wdGlvbnM7Cj4+IMKgIMKgIMKgIG9zbV9xb3Nfb3B0aW9uc190 IHFvc19jYV9vcHRpb25zOwo+PiDCoCDCoCDCoCBvc21fcW9zX29wdGlvbnNfdCBxb3Nfc3cwX29w dGlvbnM7Cj4+IEBAIC00MzMsNiArNDM0LDEwIEBAIHR5cGVkZWYgc3RydWN0IG9zbV9zdWJuX29w dCB7Cj4+IMKgKiDCoCDCoGJhYmJsaW5nX3BvcnRfcG9saWN5Cj4+IMKgKiDCoCDCoCDCoCDCoCDC oCDCoE9wZW5TTSB3aWxsIGVuZm9yY2UgaXRzICJiYWJibGluZyIgcG9ydCBwb2xpY3kuCj4+IMKg Kgo+PiArKiDCoCDCoHVzZV9vcHRpbWl6ZWRfc2x2bAo+PiArKiDCoCDCoCDCoCDCoCDCoCDCoFVz ZSBvcHRpbWl6ZWQgU0x0b1ZMTWFwcGluZ1RhYmxlIHByb2dyYW1taW5nIGlmCj4+ICsqIMKgIMKg IMKgIMKgIMKgIMKgZGV2aWNlIGluZGljYXRlcyBpdCBzdXBwb3J0cyB0aGlzLgo+PiArKgo+PiDC oCogwqAgwqBwZXJmbWdyCj4+IMKgKiDCoCDCoCDCoCDCoCDCoCDCoEVuYWJsZSBvciBkaXNhYmxl IHRoZSBwZXJmb3JtYW5jZSBtYW5hZ2VyCj4+IMKgKgo+PiBkaWZmIC0tZ2l0IGEvb3BlbnNtL29w ZW5zbS9vc21fcW9zLmMgYi9vcGVuc20vb3BlbnNtL29zbV9xb3MuYwo+PiBpbmRleCAwOGY5YTYw Li42MTdhODZlIDEwMDY0NAo+PiAtLS0gYS9vcGVuc20vb3BlbnNtL29zbV9xb3MuYwo+PiArKysg Yi9vcGVuc20vb3BlbnNtL29zbV9xb3MuYwo+Cj4gSSdtIHlldCByZXZpZXdpbmcgdGhlIGNoYW5n ZXMgaW4gb3NtX3Fvcy5jLgo+Cj4+IEBAIC0xLDUgKzEsNiBAQAo+PiDCoC8qCj4+IMKgICogQ29w eXJpZ2h0IChjKSAyMDA2LTIwMDkgVm9sdGFpcmUsIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K Pj4gKyAqIENvcHlyaWdodCAoYykgMjAwOSBITlIgQ29uc3VsdGluZy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KPj4gwqAgKgo+PiDCoCAqIFRoaXMgc29mdHdhcmUgaXMgYXZhaWxhYmxlIHRvIHlvdSB1 bmRlciBhIGNob2ljZSBvZiBvbmUgb2YgdHdvCj4+IMKgICogbGljZW5zZXMuIMKgWW91IG1heSBj aG9vc2UgdG8gYmUgbGljZW5zZWQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUKPj4gQEAgLTE1 MCw3ICsxNTEsNyBAQCBzdGF0aWMgaWJfYXBpX3N0YXR1c190IHZsYXJiX3VwZGF0ZShvc21fc21f dCAqIHNtLCBvc21fcGh5c3BfdCAqIHAsCj4+Cj4+IMKgc3RhdGljIGliX2FwaV9zdGF0dXNfdCBz bDJ2bF91cGRhdGVfdGFibGUob3NtX3NtX3QgKiBzbSwgb3NtX3BoeXNwX3QgKiBwLAo+PiDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB1 aW50OF90IGluX3BvcnQsIHVpbnQ4X3Qgb3V0X3BvcnQsCj4+IC0gwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgdW5zaWduZWQgZm9yY2VfdXBk YXRlLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIHVuc2lnbmVkIG9wdGltaXplLCB1bnNpZ25lZCBmb3JjZV91cGRhdGUsCj4+IMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IGNvbnN0IGliX3NsdmxfdGFibGVfdCAqIHNsMnZsX3RhYmxlKQo+PiDCoHsKPj4gwqAgwqAgwqAg b3NtX21hZHdfY29udGV4dF90IGNvbnRleHQ7Cj4+IEBAIC0xODAsNDEgKzE4MSw0NyBAQCBzdGF0 aWMgaWJfYXBpX3N0YXR1c190IHNsMnZsX3VwZGF0ZV90YWJsZShvc21fc21fdCAqIHNtLCBvc21f cGh5c3BfdCAqIHAsCj4+IMKgIMKgIMKgIGNvbnRleHQuc2x2bF9jb250ZXh0Lm5vZGVfZ3VpZCA9 IG9zbV9ub2RlX2dldF9ub2RlX2d1aWQocF9ub2RlKTsKPj4gwqAgwqAgwqAgY29udGV4dC5zbHZs X2NvbnRleHQucG9ydF9ndWlkID0gb3NtX3BoeXNwX2dldF9wb3J0X2d1aWQocCk7Cj4+IMKgIMKg IMKgIGNvbnRleHQuc2x2bF9jb250ZXh0LnNldF9tZXRob2QgPSBUUlVFOwo+PiAtIMKgIMKgIGF0 dHJfbW9kID0gaW5fcG9ydCA8PCA4IHwgb3V0X3BvcnQ7Cj4+ICsgwqAgwqAgaWYgKG9wdGltaXpl KQo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIC8qIHdpbGRjYXJkIGJvdGggaW5wdXQgYW5kIG91dHB1 dCBwb3J0cyAqLwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIGF0dHJfbW9kID0gMHgzMDAwMDsKPj4g KyDCoCDCoCBlbHNlCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgYXR0cl9tb2QgPSBpbl9wb3J0IDw8 IDggfCBvdXRfcG9ydDsKPj4gwqAgwqAgwqAgcmV0dXJuIG9zbV9yZXFfc2V0KHNtLCBvc21fcGh5 c3BfZ2V0X2RyX3BhdGhfcHRyKHApLAo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCh1aW50OF90ICopICYgdGJsLCBzaXplb2YodGJsKSwKPj4gwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBJQl9NQURfQVRUUl9TTFZMX1RBQkxFLCBjbF9odG9uMzIo YXR0cl9tb2QpLAo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoENMX0RJ U1BfTVNHSURfTk9ORSwgJmNvbnRleHQpOwo+PiDCoH0KPj4KPj4gLXN0YXRpYyBpYl9hcGlfc3Rh dHVzX3Qgc2wydmxfdXBkYXRlKG9zbV9zbV90ICogc20sIG9zbV9wb3J0X3QgKiBwX3BvcnQsCj4+ ICtzdGF0aWMgaWJfYXBpX3N0YXR1c190IHNsMnZsX3VwZGF0ZShvc21fc21fdCAqIHNtLCBvc21f cGh5c3BfdCAqIHAwLAo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCBvc21fcGh5c3BfdCAqIHAsIHVpbnQ4X3QgcG9ydF9udW0sCj4+IC0gwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgdW5zaWduZWQgZm9yY2Vf dXBkYXRlLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIHVuc2lnbmVkIG9wdGltaXplLCB1bnNpZ25lZCBmb3JjZV91cGRhdGUsCj4+IMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGNvbnN0IHN0cnVjdCBx b3NfY29uZmlnICpxY2ZnKQo+PiDCoHsKPj4gwqAgwqAgwqAgaWJfYXBpX3N0YXR1c190IHN0YXR1 czsKPj4gwqAgwqAgwqAgdWludDhfdCBpLCBudW1fcG9ydHM7Cj4+IC0gwqAgwqAgb3NtX3BoeXNw X3QgKnBfcGh5c3A7Cj4+ICsgwqAgwqAgb3NtX25vZGVfdCAqcF9ub2RlOwo+Pgo+PiAtIMKgIMKg IGlmIChvc21fbm9kZV9nZXRfdHlwZShvc21fcGh5c3BfZ2V0X25vZGVfcHRyKHApKSA9PSBJQl9O T0RFX1RZUEVfU1dJVENIKSB7Cj4+ICsgwqAgwqAgcF9ub2RlID0gb3NtX3BoeXNwX2dldF9ub2Rl X3B0cihwKTsKPj4gKyDCoCDCoCBpZiAob3NtX25vZGVfZ2V0X3R5cGUocF9ub2RlKSA9PSBJQl9O T0RFX1RZUEVfU1dJVENIKSB7Cj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmIChpYl9wb3J0X2lu Zm9fZ2V0X3ZsX2NhcCgmcC0+cG9ydF9pbmZvKSA9PSAxKSB7Cj4+IMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIC8qIENoZWNrIHBvcnQgMCdzIGNhcGFiaWxpdHkgbWFzayAqLwo+PiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHBfcGh5c3AgPSBwX3BvcnQtPnBfcGh5c3A7 Cj4+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKCEKPj4gLSDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAocF9waHlzcC0+cG9ydF9pbmZvLgo+PiAtIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgY2FwYWJpbGl0eV9tYXNrICYgSUJfUE9S VF9DQVBfSEFTX1NMX01BUCkpCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYg KCEocDAtPnBvcnRfaW5mby5jYXBhYmlsaXR5X21hc2sgJiBJQl9QT1JUX0NBUF9IQVNfU0xfTUFQ KSkKPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcmV0dXJu IElCX1NVQ0NFU1M7Cj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIH0KPj4gLSDCoCDCoCDCoCDCoCDC oCDCoCBudW1fcG9ydHMgPSBvc21fbm9kZV9nZXRfbnVtX3BoeXNwKG9zbV9waHlzcF9nZXRfbm9k ZV9wdHIocCkpOwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIG51bV9wb3J0cyA9IG9zbV9ub2RlX2dl dF9udW1fcGh5c3AocF9ub2RlKTsKPj4gwqAgwqAgwqAgfSBlbHNlIHsKPj4gwqAgwqAgwqAgwqAg wqAgwqAgwqAgaWYgKCEocC0+cG9ydF9pbmZvLmNhcGFiaWxpdHlfbWFzayAmIElCX1BPUlRfQ0FQ X0hBU19TTF9NQVApKQo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCByZXR1cm4g SUJfU1VDQ0VTUzsKPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgbnVtX3BvcnRzID0gMTsKPj4gwqAg wqAgwqAgfQo+Pgo+PiArIMKgIMKgIGlmIChvcHRpbWl6ZSkKPj4gKyDCoCDCoCDCoCDCoCDCoCDC oCByZXR1cm4gc2wydmxfdXBkYXRlX3RhYmxlKHNtLCBwLCAxLCBwb3J0X251bSwgb3B0aW1pemUs Cj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgZm9yY2VfdXBkYXRlLCAmcWNmZy0+c2wydmwpOwo+PiArCj4+IMKgIMKgIMKgIGZvciAo aSA9IDA7IGkgPCBudW1fcG9ydHM7IGkrKykgewo+PiAtIMKgIMKgIMKgIMKgIMKgIMKgIHN0YXR1 cyA9IHNsMnZsX3VwZGF0ZV90YWJsZShzbSwgcCwgaSwgcG9ydF9udW0sIGZvcmNlX3VwZGF0ZSwK Pj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCAmcWNmZy0+c2wydmwpOwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIHN0YXR1cyA9IHNs MnZsX3VwZGF0ZV90YWJsZShzbSwgcCwgaSwgcG9ydF9udW0sIG9wdGltaXplLAo+PiArIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGZv cmNlX3VwZGF0ZSwgJnFjZmctPnNsMnZsKTsKPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKHN0 YXR1cyAhPSBJQl9TVUNDRVNTKQo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBy ZXR1cm4gc3RhdHVzOwo+PiDCoCDCoCDCoCB9Cj4+IEBAIC0yMjIsMjIgKzIyOSwzMCBAQCBzdGF0 aWMgaWJfYXBpX3N0YXR1c190IHNsMnZsX3VwZGF0ZShvc21fc21fdCAqIHNtLCBvc21fcG9ydF90 ICogcF9wb3J0LAo+PiDCoCDCoCDCoCByZXR1cm4gSUJfU1VDQ0VTUzsKPj4gwqB9Cj4+Cj4+IC1z dGF0aWMgaW50IHFvc19waHlzcF9zZXR1cChvc21fbG9nX3QgKiBwX2xvZywgb3NtX3NtX3QgKiBz bSwKPj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG9zbV9wb3J0X3QgKiBw X3BvcnQsIG9zbV9waHlzcF90ICogcCwKPj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoHVpbnQ4X3QgcG9ydF9udW0sIHVuc2lnbmVkIGZvcmNlX3VwZGF0ZSwKPj4gLSDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGNvbnN0IHN0cnVjdCBxb3NfY29uZmlnICpx Y2ZnKQo+PiArc3RhdGljIGludCB2bGFyYl9waHlzcF9zZXR1cChvc21fc21fdCAqIHNtLCBvc21f cGh5c3BfdCAqIHAsIHVpbnQ4X3QgcG9ydF9udW0sCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqB1bnNpZ25lZCBmb3JjZV91cGRhdGUsCj4+ICsgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBjb25zdCBzdHJ1Y3QgcW9zX2NvbmZpZyAqcWNmZykK Pj4gwqB7Cj4+IC0gwqAgwqAgaWJfYXBpX3N0YXR1c190IHN0YXR1czsKPj4gLQo+PiDCoCDCoCDC oCAvKiBPcFZMcyBzaG91bGQgYmUgb2sgYXQgdGhpcyBtb21lbnQgLSBqdXN0IHVzZSBpdCAqLwo+ Pgo+PiDCoCDCoCDCoCAvKiBzZXR1cCBWTCBoaWdoIGxpbWl0IG9uIHRoZSBwaHlzcCBsYXRlciB0 byBiZSB1cGRhdGVkIGJ5IGxpbmsgbWdyICovCj4+IMKgIMKgIMKgIHAtPnZsX2hpZ2hfbGltaXQg PSBxY2ZnLT52bF9oaWdoX2xpbWl0Owo+Pgo+PiDCoCDCoCDCoCAvKiBzZXR1cCBWTEFyYml0cmF0 aW9uICovCj4+IC0gwqAgwqAgc3RhdHVzID0gdmxhcmJfdXBkYXRlKHNtLCBwLCBwb3J0X251bSwg Zm9yY2VfdXBkYXRlLCBxY2ZnKTsKPj4gKyDCoCDCoCByZXR1cm4gdmxhcmJfdXBkYXRlKHNtLCBw LCBwb3J0X251bSwgZm9yY2VfdXBkYXRlLCBxY2ZnKTsKPj4gK30KPj4gKwo+PiArc3RhdGljIGlu dCBxb3NfcGh5c3Bfc2V0dXAob3NtX2xvZ190ICogcF9sb2csIG9zbV9zbV90ICogc20sCj4+ICsg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBvc21fcGh5c3BfdCAqIHAwLCBvc21f cGh5c3BfdCAqIHAsCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB1aW50 OF90IHBvcnRfbnVtLCB1bnNpZ25lZCBmb3JjZV91cGRhdGUsCj4+ICsgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqBjb25zdCBzdHJ1Y3QgcW9zX2NvbmZpZyAqcWNmZykKPj4gK3sK Pj4gKyDCoCDCoCBpYl9hcGlfc3RhdHVzX3Qgc3RhdHVzOwo+PiArCj4+ICsgwqAgwqAgLyogc2V0 dXAgVkxBcmJpdHJhdGlvbiAqLwo+PiArIMKgIMKgIHN0YXR1cyA9IHZsYXJiX3BoeXNwX3NldHVw KHNtLCBwLCBwb3J0X251bSwgZm9yY2VfdXBkYXRlLCBxY2ZnKTsKPj4gwqAgwqAgwqAgaWYgKHN0 YXR1cyAhPSBJQl9TVUNDRVNTKSB7Cj4+IC0gwqAgwqAgwqAgwqAgwqAgwqAgT1NNX0xPRyhwX2xv ZywgT1NNX0xPR19FUlJPUiwgIkVSUiA2MjAyIDogIgo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIE9T TV9MT0cocF9sb2csIE9TTV9MT0dfRVJST1IsICJFUlIgNjIwMjogIgo+PiDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCAiZmFpbGVkIHRvIHVwZGF0ZSBWTEFyYml0cmF0aW9uIHRhYmxl cyAiCj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICJmb3IgcG9ydCAlIiBQUkl4 NjQgIiAjJWRcbiIsCj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGNsX250b2g2 NChwLT5wb3J0X2d1aWQpLCBwb3J0X251bSk7Cj4+IEBAIC0yNDUsOSArMjYwLDkgQEAgc3RhdGlj IGludCBxb3NfcGh5c3Bfc2V0dXAob3NtX2xvZ190ICogcF9sb2csIG9zbV9zbV90ICogc20sCj4+ IMKgIMKgIMKgIH0KPj4KPj4gwqAgwqAgwqAgLyogc2V0dXAgU0wyVkwgdGFibGVzICovCj4+IC0g wqAgwqAgc3RhdHVzID0gc2wydmxfdXBkYXRlKHNtLCBwX3BvcnQsIHAsIHBvcnRfbnVtLCBmb3Jj ZV91cGRhdGUsIHFjZmcpOwo+PiArIMKgIMKgIHN0YXR1cyA9IHNsMnZsX3VwZGF0ZShzbSwgcDAs IHAsIHBvcnRfbnVtLCAwLCBmb3JjZV91cGRhdGUsIHFjZmcpOwo+PiDCoCDCoCDCoCBpZiAoc3Rh dHVzICE9IElCX1NVQ0NFU1MpIHsKPj4gLSDCoCDCoCDCoCDCoCDCoCDCoCBPU01fTE9HKHBfbG9n LCBPU01fTE9HX0VSUk9SLCAiRVJSIDYyMDMgOiAiCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgT1NN X0xPRyhwX2xvZywgT1NNX0xPR19FUlJPUiwgIkVSUiA2MjAzOiAiCj4+IMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgICJmYWlsZWQgdG8gdXBkYXRlIFNMMlZMTWFwcGluZyB0YWJsZXMg Igo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAiZm9yIHBvcnQgJSIgUFJJeDY0 ICIgIyVkXG4iLAo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBjbF9udG9oNjQo cC0+cG9ydF9ndWlkKSwgcG9ydF9udW0pOwo+PiBAQCAtMjY3LDYgKzI4Miw3IEBAIGludCBvc21f cW9zX3NldHVwKG9zbV9vcGVuc21fdCAqIHBfb3NtKQo+PiDCoCDCoCDCoCB1aW50MzJfdCBudW1f cGh5c3A7Cj4+IMKgIMKgIMKgIG9zbV9waHlzcF90ICpwX3BoeXNwOwo+PiDCoCDCoCDCoCBvc21f bm9kZV90ICpwX25vZGU7Cj4+ICsgwqAgwqAgb3NtX3N3aXRjaF90ICpwX3N3Owo+PiDCoCDCoCDC oCB1bnNpZ25lZCBmb3JjZV91cGRhdGU7Cj4+IMKgIMKgIMKgIGludCByZXQgPSAwOwo+PiDCoCDC oCDCoCB1aW50OF90IGk7Cj4+IEBAIC0yOTAsNiArMzA2LDQ0IEBAIGludCBvc21fcW9zX3NldHVw KG9zbV9vcGVuc21fdCAqIHBfb3NtKQo+PiDCoCDCoCDCoCAvKiByZWFkIFFvUyBwb2xpY3kgY29u ZmlnIGZpbGUgKi8KPj4gwqAgwqAgwqAgb3NtX3Fvc19wYXJzZV9wb2xpY3lfZmlsZSgmcF9vc20t PnN1Ym4pOwo+Pgo+PiArIMKgIMKgIC8qIGxvb3Agb24gc3dpdGNoZXMgdGhhdCBzdXBwb3J0IG9w dGltaXplZCBTTDJWTCBwcm9ncmFtbWluZyBmaXJzdCAqLwo+PiArIMKgIMKgIHBfdGJsID0gJnBf b3NtLT5zdWJuLnN3X2d1aWRfdGJsOwo+PiArIMKgIMKgIHBfbmV4dCA9IGNsX3FtYXBfaGVhZChw X3RibCk7Cj4+ICsgwqAgwqAgd2hpbGUgKHBfbmV4dCAhPSBjbF9xbWFwX2VuZChwX3RibCkpIHsK Pj4gKyDCoCDCoCDCoCDCoCDCoCDCoCBwX3N3ID0gKG9zbV9zd2l0Y2hfdCAqKSBwX25leHQ7Cj4+ ICsgwqAgwqAgwqAgwqAgwqAgwqAgcF9uZXh0ID0gY2xfcW1hcF9uZXh0KHBfbmV4dCk7Cj4+ICsK Pj4gKyDCoCDCoCDCoCDCoCDCoCDCoCBpZiAoaWJfc3dpdGNoX2luZm9fZ2V0X29wdF9zbDJ2bG1h cHBpbmcoJnBfc3ctPnN3aXRjaF9pbmZvKSAmJgo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IHBfb3NtLT5zdWJuLm9wdC51c2Vfb3B0aW1pemVkX3NsdmwpIHsKPj4gKyDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCBwX3BoeXNwID0gb3NtX25vZGVfZ2V0X3BoeXNwX3B0cihwX3N3LT5w X25vZGUsIDEpOwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG51bV9waHlzcCA9 IG9zbV9ub2RlX2dldF9udW1fcGh5c3AocF9zdy0+cF9ub2RlKTsKPj4gKyDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCBmb3JjZV91cGRhdGUgPSBwX29zbS0+c3Vibi5uZWVkX3VwZGF0ZTsK Pj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBmb3IgKGkgPSAxOyBpIDwgbnVtX3Bo eXNwOyBpKyspIHsKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCBwX3BoeXNwID0gb3NtX25vZGVfZ2V0X3BoeXNwX3B0cihwX3N3LT5wX25vZGUsIGkpOwo+PiAr IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmICghcF9waHlzcCkK Pj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCBjb250aW51ZTsKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCBpZiAodmxhcmJfcGh5c3Bfc2V0dXAoJnBfb3NtLT5zbSwgcF9waHlzcCwgaSwKPj4gKyDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCBwX3BoeXNwLT5uZWVkX3VwZGF0ZSB8fAo+PiArIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIHBfb3NtLT5zdWJuLm5lZWRfdXBkYXRlLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICZzd2Vf Y29uZmlnKSkKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCByZXQgPSAtMTsKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCBmb3JjZV91cGRhdGUgfD0gcF9waHlzcC0+bmVlZF91cGRhdGU7Cj4+ICsgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgfQo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIGlmIChzbDJ2bF91cGRhdGUoJnBfb3NtLT5zbSwKPj4gKyDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG9zbV9ub2RlX2dldF9waHlz cF9wdHIocF9zdy0+cF9ub2RlLCAwKSwKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHBfcGh5c3AsIGksIDEsIGZvcmNlX3VwZGF0ZSwK Pj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCZzd2VfY29uZmlnKSkgewo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIE9TTV9MT0coJnBfb3NtLT5sb2csIE9TTV9MT0dfRVJST1IsICJFUlIgNjIwNDog Igo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgICJmYWlsZWQgdG8gdXBkYXRlIG9wdGltaXplZCBTTDJWTE1hcHBpbmciCj4+ICsgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgIiB0YWJsZXMg Zm9yIHBvcnQgJSIgUFJJeDY0ICIgIyVkXG4iLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGNsX250b2g2NChwX3BoeXNwLT5wb3J0X2d1 aWQpLCBpKTsKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBy ZXQgPSAtMTsKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB9Cj4+ICsgwqAgwqAg wqAgwqAgwqAgwqAgfQo+PiArIMKgIMKgIH0KPj4gKwo+PiArIMKgIMKgIC8qIG5vdywgbG9vcCBv biBwb3J0cyBza2lwcGluZyB0aGUgZXh0ZXJuYWwgcG9ydHMgb2Ygc3dpdGNoZXMKPj4gKyDCoCDC oCDCoCDCoHRoYXQgc3VwcG9ydCBvcHRpbWl6ZWQgU0wyVkwgcHJvZ3JhbW1pbmcgKi8KPj4gwqAg wqAgwqAgcF90YmwgPSAmcF9vc20tPnN1Ym4ucG9ydF9ndWlkX3RibDsKPj4gwqAgwqAgwqAgcF9u ZXh0ID0gY2xfcW1hcF9oZWFkKHBfdGJsKTsKPj4gwqAgwqAgwqAgd2hpbGUgKHBfbmV4dCAhPSBj bF9xbWFwX2VuZChwX3RibCkpIHsKPj4gQEAgLTI5OCw2ICszNTIsMTEgQEAgaW50IG9zbV9xb3Nf c2V0dXAob3NtX29wZW5zbV90ICogcF9vc20pCj4+Cj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIHBf bm9kZSA9IHBfcG9ydC0+cF9ub2RlOwo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAocF9ub2Rl LT5zdykgewo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC8qIHNraXAgc3dpdGNo ZXMgd2l0aCBvcHRpbWl6ZWQgU0wyVkwgbWFwcGluZwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgcHJvZ3JhbW1pbmcgc2luY2UgYWxyZWFkeSBkb25lICovCj4+ICsgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKGliX3N3aXRjaF9pbmZvX2dldF9vcHRfc2wy dmxtYXBwaW5nKCZwX25vZGUtPnN3LT5zd2l0Y2hfaW5mbykgJiYKPj4gKyDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwX29zbS0+c3Vibi5vcHQudXNlX29wdGltaXplZF9zbHZs KQo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGdvdG8gY2hl Y2tfcG9ydDA7Cj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG51bV9waHlzcCA9 IG9zbV9ub2RlX2dldF9udW1fcGh5c3AocF9ub2RlKTsKPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgZm9yIChpID0gMTsgaSA8IG51bV9waHlzcDsgaSsrKSB7Cj4+IMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHBfcGh5c3AgPSBvc21fbm9kZV9n ZXRfcGh5c3BfcHRyKHBfbm9kZSwgaSk7Cj4+IEBAIC0zMDYsMTAgKzM2NSwxMSBAQCBpbnQgb3Nt X3Fvc19zZXR1cChvc21fb3BlbnNtX3QgKiBwX29zbSkKPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgZm9yY2VfdXBkYXRlID0gcF9waHlzcC0+bmVlZF91cGRh dGUgfHwKPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgcF9vc20tPnN1Ym4ubmVlZF91cGRhdGU7Cj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIGlmIChxb3NfcGh5c3Bfc2V0dXAoJnBfb3NtLT5sb2csICZwX29z bS0+c20sCj4+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcF9wb3J0LCBwX3BoeXNwLCBpLAo+PiArIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIHBfcG9ydC0+cF9waHlzcCwgcF9waHlzcCwgaSwKPj4gwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgZm9yY2VfdXBkYXRlLCAmc3dlX2NvbmZpZykpCj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJldCA9IC0xOwo+PiDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB9Cj4+ICtjaGVja19wb3J0MDoKPj4gwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgLyogc2tpcCBiYXNlIHBvcnQgMCAqLwo+PiDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAoIWliX3N3aXRjaF9pbmZvX2lzX2VuaGFuY2VkX3Bv cnQwCj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICgmcF9ub2RlLT5z dy0+c3dpdGNoX2luZm8pKQo+PiBAQCAtMzI2LDggKzM4Niw4IEBAIGludCBvc21fcW9zX3NldHVw KG9zbV9vcGVuc21fdCAqIHBfb3NtKQo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCBjb250aW51ZTsKPj4KPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgZm9yY2VfdXBkYXRlID0gcF9w aHlzcC0+bmVlZF91cGRhdGUgfHwgcF9vc20tPnN1Ym4ubmVlZF91cGRhdGU7Cj4+IC0gwqAgwqAg wqAgwqAgwqAgwqAgaWYgKHFvc19waHlzcF9zZXR1cCgmcF9vc20tPmxvZywgJnBfb3NtLT5zbSwg cF9wb3J0LCBwX3BoeXNwLAo+PiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIDAsIGZvcmNlX3VwZGF0ZSwgY2ZnKSkKPj4gKyDCoCDCoCDCoCDCoCDCoCDC oCBpZiAocW9zX3BoeXNwX3NldHVwKCZwX29zbS0+bG9nLCAmcF9vc20tPnNtLCBwX3BvcnQtPnBf cGh5c3AsCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgcF9waHlzcCwgMCwgZm9yY2VfdXBkYXRlLCBjZmcpKQo+PiDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCByZXQgPSAtMTsKPj4gwqAgwqAgwqAgfQo+Pgo+PiBkaWZmIC0tZ2l0IGEv b3BlbnNtL29wZW5zbS9vc21fc2x2bF9tYXBfcmN2LmMgYi9vcGVuc20vb3BlbnNtL29zbV9zbHZs X21hcF9yY3YuYwo+PiBpbmRleCA0Zjc1NjkwLi4yMTRhNzYzIDEwMDY0NAo+PiAtLS0gYS9vcGVu c20vb3BlbnNtL29zbV9zbHZsX21hcF9yY3YuYwo+PiArKysgYi9vcGVuc20vb3BlbnNtL29zbV9z bHZsX21hcF9yY3YuYwo+PiBAQCAtMiw2ICsyLDcgQEAKPj4gwqAgKiBDb3B5cmlnaHQgKGMpIDIw MDQtMjAwOSBWb2x0YWlyZSwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgo+PiDCoCAqIENvcHly aWdodCAoYykgMjAwMi0yMDA1IE1lbGxhbm94IFRlY2hub2xvZ2llcyBMVEQuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCj4+IMKgICogQ29weXJpZ2h0IChjKSAxOTk2LTIwMDMgSW50ZWwgQ29ycG9yYXRp b24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCj4+ICsgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSE5SIENv bnN1bHRpbmcuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCj4+IMKgICoKPj4gwqAgKiBUaGlzIHNvZnR3 YXJlIGlzIGF2YWlsYWJsZSB0byB5b3UgdW5kZXIgYSBjaG9pY2Ugb2Ygb25lIG9mIHR3bwo+PiDC oCAqIGxpY2Vuc2VzLiDCoFlvdSBtYXkgY2hvb3NlIHRvIGJlIGxpY2Vuc2VkIHVuZGVyIHRoZSB0 ZXJtcyBvZiB0aGUgR05VCj4+IEBAIC03MCw3ICs3MSw5IEBAIHZvaWQgb3NtX3NsdmxfcmN2X3By b2Nlc3MoSU4gdm9pZCAqY29udGV4dCwgSU4gdm9pZCAqcF9kYXRhKQo+PiDCoCDCoCDCoCBvc21f c2x2bF9jb250ZXh0X3QgKnBfY29udGV4dDsKPj4gwqAgwqAgwqAgaWJfbmV0NjRfdCBwb3J0X2d1 aWQ7Cj4+IMKgIMKgIMKgIGliX25ldDY0X3Qgbm9kZV9ndWlkOwo+PiAtIMKgIMKgIHVpbnQ4X3Qg b3V0X3BvcnRfbnVtLCBpbl9wb3J0X251bTsKPj4gKyDCoCDCoCB1aW50MzJfdCBhdHRyX21vZDsK Pj4gKyDCoCDCoCB1aW50OF90IG91dF9wb3J0X251bSwgaW5fcG9ydF9udW0sIHN0YXJ0aW5wb3J0 LCBzdGFydG91dHBvcnQsCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgZW5kaW5wb3J0LCBlbmRvdXRw b3J0Owo+Pgo+PiDCoCDCoCDCoCBDTF9BU1NFUlQoc20pOwo+Pgo+PiBAQCAtMTA5LDYgKzExMiw5 IEBAIHZvaWQgb3NtX3NsdmxfcmN2X3Byb2Nlc3MoSU4gdm9pZCAqY29udGV4dCwgSU4gdm9pZCAq cF9kYXRhKQo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAodWludDhfdCkgY2xfbnRvaDMy KHBfc21wLT5hdHRyX21vZCAmIDB4RkYwMDAwMDApOwo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCBp bl9wb3J0X251bSA9Cj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICh1aW50OF90KSBjbF9u dG9oMzIoKHBfc21wLT5hdHRyX21vZCAmIDB4MDBGRjAwMDApIDw8IDgpOwo+PiArIMKgIMKgIMKg IMKgIMKgIMKgIGF0dHJfbW9kID0gY2xfbnRvaDMyKHBfc21wLT5hdHRyX21vZCk7Cj4+ICsgwqAg wqAgwqAgwqAgwqAgwqAgaWYgKGF0dHJfbW9kICYgMHgzMDAwMCkKPj4gKyDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCBnb3RvIG9wdF9zbDJ2bDsKPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg cF9waHlzcCA9IG9zbV9ub2RlX2dldF9waHlzcF9wdHIocF9ub2RlLCBvdXRfcG9ydF9udW0pOwo+ PiDCoCDCoCDCoCB9IGVsc2Ugewo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwX3BoeXNwID0gcF9w b3J0LT5wX3BoeXNwOwo+PiBAQCAtMTIxLDcgKzEyNyw3IEBAIHZvaWQgb3NtX3NsdmxfcmN2X3By b2Nlc3MoSU4gdm9pZCAqY29udGV4dCwgSU4gdm9pZCAqcF9kYXRhKQo+PiDCoCDCoCDCoCDCoCDC oGFsbCB3ZSB3YW50IGlzIHRvIHVwZGF0ZSB0aGUgc3VibmV0Lgo+PiDCoCDCoCDCoCDCoCovCj4+ IMKgIMKgIMKgIE9TTV9MT0coc20tPnBfbG9nLCBPU01fTE9HX1ZFUkJPU0UsCj4+IC0gwqAgwqAg wqAgwqAgwqAgwqAgIkdvdCBTTHRvVkwgZ2V0IHJlc3BvbnNlIGluX3BvcnRfbnVtICV1IG91dF9w b3J0X251bSAldSB3aXRoICIKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCAiUmVjZWl2ZWQgU0x0b1ZM IEdldFJlc3AgaW5fcG9ydF9udW0gJXUgb3V0X3BvcnRfbnVtICV1IHdpdGggIgo+PiDCoCDCoCDC oCDCoCDCoCDCoCDCoCAiR1VJRCAweCUiIFBSSXg2NCAiIGZvciBwYXJlbnQgbm9kZSBHVUlEIDB4 JSIgUFJJeDY0ICIsIFRJRCAweCUiCj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIFBSSXg2NCAiXG4i LCBpbl9wb3J0X251bSwgb3V0X3BvcnRfbnVtLCBjbF9udG9oNjQocG9ydF9ndWlkKSwKPj4gwqAg wqAgwqAgwqAgwqAgwqAgwqAgY2xfbnRvaDY0KG5vZGVfZ3VpZCksIGNsX250b2g2NChwX3NtcC0+ dHJhbnNfaWQpKTsKPj4gQEAgLTE0MCw2ICsxNDYsMzggQEAgdm9pZCBvc21fc2x2bF9yY3ZfcHJv Y2VzcyhJTiB2b2lkICpjb250ZXh0LCBJTiB2b2lkICpwX2RhdGEpCj4+IMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG91dF9wb3J0X251bSwgcF9zbHZsX3RibCwg T1NNX0xPR19ERUJVRyk7Cj4+Cj4+IMKgIMKgIMKgIG9zbV9waHlzcF9zZXRfc2x2bF90YmwocF9w aHlzcCwgcF9zbHZsX3RibCwgaW5fcG9ydF9udW0pOwo+PiArIMKgIMKgIGdvdG8gRXhpdDsKPj4g Kwo+PiArb3B0X3NsMnZsOgo+PiArIMKgIMKgIGlmIChvc21fbG9nX2lzX2FjdGl2ZShzbS0+cF9s b2csIE9TTV9MT0dfVkVSQk9TRSkpCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgb3NtX2xvZyhzbS0+ cF9sb2csIE9TTV9MT0dfVkVSQk9TRSwKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCAiUmVjZWl2ZWQgb3B0aW1pemVkIFNMdG9WTCBnZXQgcmVzcG9uc2UgaW5fcG9ydF9udW0gJXUg Igo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICJvdXRfcG9ydF9udW0gJXUgd2l0 aCBHVUlEIDB4JSIgUFJJeDY0ICIgZm9yIHBhcmVudCAiCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgIm5vZGUgR1VJRCAweCUiIFBSSXg2NCAiLCBUSUQgMHglIiBQUkl4NjQgIlxu IiwKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpbl9wb3J0X251bSwgb3V0X3Bv cnRfbnVtLCBjbF9udG9oNjQocG9ydF9ndWlkKSwKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCBjbF9udG9oNjQobm9kZV9ndWlkKSwgY2xfbnRvaDY0KHBfc21wLT50cmFuc19pZCkp Owo+PiArCj4+ICsgwqAgwqAgb3NtX2R1bXBfc2x2bF9tYXBfdGFibGUoc20tPnBfbG9nLCBwb3J0 X2d1aWQsIGluX3BvcnRfbnVtLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIG91dF9wb3J0X251bSwgcF9zbHZsX3RibCwgT1NNX0xPR19ERUJVRyk7Cj4+ICsK Pj4gKyDCoCDCoCBpZiAoYXR0cl9tb2QgJiAweDEwMDAwKSB7Cj4+ICsgwqAgwqAgwqAgwqAgwqAg wqAgc3RhcnRvdXRwb3J0ID0gaWJfc3dpdGNoX2luZm9faXNfZW5oYW5jZWRfcG9ydDAoJnBfbm9k ZS0+c3ctPnN3aXRjaF9pbmZvKSA/IDAgOiAxOwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIGVuZG91 dHBvcnQgPSBvc21fbm9kZV9nZXRfbnVtX3BoeXNwKHBfbm9kZSk7Cj4+ICsgwqAgwqAgfSBlbHNl Cj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgZW5kb3V0cG9ydCA9IHN0YXJ0b3V0cG9ydCA9IG91dF9w b3J0X251bTsKPgo+IEZvciB0aGlzIGNhc2UgKHdoZW4gZW5kb3V0cG9ydCA9PSBzdGFydG91dHBv cnQpIGluIGxhdGVyIGxvb3A6Cj4KPiDCoCDCoCDCoCDCoGZvciAob3V0X3BvcnRfbnVtID0gc3Rh cnRvdXRwb3J0OyBvdXRfcG9ydF9udW0gPCBlbmRvdXRwb3J0Owo+IMKgIMKgIMKgIMKgIMKgIMKg IG91dF9wb3J0X251bSsrKQo+Cj4gbm90aGluZyB3aWxsIGJlIGRvbmUuIFJpZ2h0PwoKUmlnaHQ7 IGZpeGVkIGluIHlvdXIgcGF0Y2guCgo+Cj4+ICsgwqAgwqAgaWYgKGF0dHJfbW9kICYgMHgyMDAw MCkgewo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIHN0YXJ0aW5wb3J0ID0gaWJfc3dpdGNoX2luZm9f aXNfZW5oYW5jZWRfcG9ydDAoJnBfbm9kZS0+c3ctPnN3aXRjaF9pbmZvKSA/IDAgOiAxOwo+PiAr IMKgIMKgIMKgIMKgIMKgIMKgIGVuZGlucG9ydCA9IG9zbV9ub2RlX2dldF9udW1fcGh5c3AocF9u b2RlKTsKPj4gKyDCoCDCoCB9IGVsc2UKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCBlbmRpbnBvcnQg PSBzdGFydGlucG9ydCA9IGluX3BvcnRfbnVtOwo+Cj4gRGl0dG8gd2l0aCAnaW5wb3J0Jy4KCkRp dHRvLgoKLS0gSGFsCgo+IFNhc2hhCj4KPj4gKwo+PiArIMKgIMKgIGZvciAob3V0X3BvcnRfbnVt ID0gc3RhcnRvdXRwb3J0OyBvdXRfcG9ydF9udW0gPCBlbmRvdXRwb3J0Owo+PiArIMKgIMKgIMKg IMKgIMKgb3V0X3BvcnRfbnVtKyspIHsKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCBwX3BoeXNwID0g b3NtX25vZGVfZ2V0X3BoeXNwX3B0cihwX25vZGUsIG91dF9wb3J0X251bSk7Cj4+ICsgwqAgwqAg wqAgwqAgwqAgwqAgZm9yIChpbl9wb3J0X251bSA9IHN0YXJ0aW5wb3J0OyBpbl9wb3J0X251bSA8 IGVuZGlucG9ydDsKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGluX3BvcnRfbnVtKysp Cj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgb3NtX3BoeXNwX3NldF9zbHZsX3Ri bChwX3BoeXNwLCBwX3NsdmxfdGJsLCBpbl9wb3J0X251bSk7Cj4+ICsgwqAgwqAgfQo+Pgo+PiDC oEV4aXQ6Cj4+IMKgIMKgIMKgIGNsX3Bsb2NrX3JlbGVhc2Uoc20tPnBfbG9jayk7Cj4+IGRpZmYg LS1naXQgYS9vcGVuc20vb3BlbnNtL29zbV9zdWJuZXQuYyBiL29wZW5zbS9vcGVuc20vb3NtX3N1 Ym5ldC5jCj4+IGluZGV4IDA5MDI5ZGIuLjEwM2I1YzYgMTAwNjQ0Cj4+IC0tLSBhL29wZW5zbS9v cGVuc20vb3NtX3N1Ym5ldC5jCj4+ICsrKyBiL29wZW5zbS9vcGVuc20vb3NtX3N1Ym5ldC5jCj4+ IEBAIC0zNTQsNiArMzU0LDcgQEAgc3RhdGljIGNvbnN0IG9wdF9yZWNfdCBvcHRfdGJsW10gPSB7 Cj4+IMKgIMKgIMKgIHsgImRhZW1vbiIsIE9QVF9PRkZTRVQoZGFlbW9uKSwgb3B0c19wYXJzZV9i b29sZWFuLCBOVUxMLCAwIH0sCj4+IMKgIMKgIMKgIHsgInNtX2luYWN0aXZlIiwgT1BUX09GRlNF VChzbV9pbmFjdGl2ZSksIG9wdHNfcGFyc2VfYm9vbGVhbiwgTlVMTCwgMSB9LAo+PiDCoCDCoCDC oCB7ICJiYWJibGluZ19wb3J0X3BvbGljeSIsIE9QVF9PRkZTRVQoYmFiYmxpbmdfcG9ydF9wb2xp Y3kpLCBvcHRzX3BhcnNlX2Jvb2xlYW4sIE5VTEwsIDEgfSwKPj4gKyDCoCDCoCB7ICJ1c2Vfb3B0 aW1pemVkX3NsdmwiLCBPUFRfT0ZGU0VUKHVzZV9vcHRpbWl6ZWRfc2x2bCksIG9wdHNfcGFyc2Vf Ym9vbGVhbiwgTlVMTCwgMSB9LAo+PiDCoCNpZmRlZiBFTkFCTEVfT1NNX1BFUkZfTUdSCj4+IMKg IMKgIMKgIHsgInBlcmZtZ3IiLCBPUFRfT0ZGU0VUKHBlcmZtZ3IpLCBvcHRzX3BhcnNlX2Jvb2xl YW4sIE5VTEwsIDAgfSwKPj4gwqAgwqAgwqAgeyAicGVyZm1ncl9yZWRpciIsIE9QVF9PRkZTRVQo cGVyZm1ncl9yZWRpciksIG9wdHNfcGFyc2VfYm9vbGVhbiwgTlVMTCwgMCB9LAo+PiBAQCAtNzEz LDYgKzcxNCw3IEBAIHZvaWQgb3NtX3N1Ym5fc2V0X2RlZmF1bHRfb3B0KElOIG9zbV9zdWJuX29w dF90ICogcF9vcHQpCj4+IMKgIMKgIMKgIHBfb3B0LT5kYWVtb24gPSBGQUxTRTsKPj4gwqAgwqAg wqAgcF9vcHQtPnNtX2luYWN0aXZlID0gRkFMU0U7Cj4+IMKgIMKgIMKgIHBfb3B0LT5iYWJibGlu Z19wb3J0X3BvbGljeSA9IEZBTFNFOwo+PiArIMKgIMKgIHBfb3B0LT51c2Vfb3B0aW1pemVkX3Ns dmwgPSBGQUxTRTsKPj4gwqAjaWZkZWYgRU5BQkxFX09TTV9QRVJGX01HUgo+PiDCoCDCoCDCoCBw X29wdC0+cGVyZm1nciA9IEZBTFNFOwo+PiDCoCDCoCDCoCBwX29wdC0+cGVyZm1ncl9yZWRpciA9 IFRSVUU7Cj4+IEBAIC0xNDk5LDEwICsxNTAxLDEzIEBAIGludCBvc21fc3Vibl9vdXRwdXRfY29u ZihGSUxFICpvdXQsIElOIG9zbV9zdWJuX29wdF90ICogcF9vcHRzKQo+PiDCoCDCoCDCoCDCoCDC oCDCoCDCoCAiIyBTTSBJbmFjdGl2ZVxuIgo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCAic21faW5h Y3RpdmUgJXNcblxuIgo+PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCAiIyBCYWJibGluZyBQb3J0IFBv bGljeVxuIgo+PiAtIMKgIMKgIMKgIMKgIMKgIMKgICJiYWJibGluZ19wb3J0X3BvbGljeSAlc1xu XG4iLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgICJiYWJibGluZ19wb3J0X3BvbGljeSAlc1xuXG4i Cj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgIiMgVXNlIE9wdGltaXplZCBTTHRvVkxNYXBwaW5nIHBy b2dyYW1taW5nIGlmIHN1cHBvcnRlZCBieSBkZXZpY2VcbiIKPj4gKyDCoCDCoCDCoCDCoCDCoCDC oCAidXNlX29wdGltaXplZF9zbHZsICVzXG5cbiIsCj4+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIHBf b3B0cy0+ZGFlbW9uID8gIlRSVUUiIDogIkZBTFNFIiwKPj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg cF9vcHRzLT5zbV9pbmFjdGl2ZSA/ICJUUlVFIiA6ICJGQUxTRSIsCj4+IC0gwqAgwqAgwqAgwqAg wqAgwqAgcF9vcHRzLT5iYWJibGluZ19wb3J0X3BvbGljeSA/ICJUUlVFIiA6ICJGQUxTRSIpOwo+ PiArIMKgIMKgIMKgIMKgIMKgIMKgIHBfb3B0cy0+YmFiYmxpbmdfcG9ydF9wb2xpY3kgPyAiVFJV RSIgOiAiRkFMU0UiLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIHBfb3B0cy0+dXNlX29wdGltaXpl ZF9zbHZsID8gIlRSVUUiIDogIkZBTFNFIik7Cj4+Cj4+IMKgI2lmZGVmIEVOQUJMRV9PU01fUEVS Rl9NR1IKPj4gwqAgwqAgwqAgZnByaW50ZihvdXQsCj4+IC0tCj4+IFRvIHVuc3Vic2NyaWJlIGZy b20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC1yZG1hIiBpbgo+ PiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwo+PiBN b3JlIG1ham9yZG9tbyBpbmZvIGF0IMKgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8t aW5mby5odG1sCj4+Cj4gLS0KPiBUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0 aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtcmRtYSIgaW4KPiB0aGUgYm9keSBvZiBhIG1lc3Nh Z2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwo+IE1vcmUgbWFqb3Jkb21vIGluZm8gYXQg wqBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwKPgo= --
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

The IBA 1.2.1 states (Vol.1, p.840, Table XX, explanation (b)) that SL2VL mapping capability for switch external ports must be indicated on its port 0 PortInfo:CapMask. So it lets us to unify this capability check over all types of IB nodes.

---
 opensm/opensm/osm_qos.c |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)

index 08f9a60..afeaa11 100644
@@ -194,23 +194,15 @@ static ib_api_status_t sl2vl_update(osm_sm_t * sm, osm_port_t * p_port,
 {
 	ib_api_status_t status;
 	uint8_t i, num_ports;
-	osm_physp_t *p_physp;
+	ib_port_info_t *pi = &p_port->p_physp->port_info;
+
+	if (!(pi->capability_mask & IB_PORT_CAP_HAS_SL_MAP))
+		return IB_SUCCESS;
 
-	if (osm_node_get_type(osm_physp_get_node_ptr(p)) == IB_NODE_TYPE_SWITCH) {
-		if (ib_port_info_get_vl_cap(&p->port_info) == 1) {
-			/* Check port 0's capability mask */
-			p_physp = p_port->p_physp;
-			if (!
-			    (p_physp->port_info.
-			     capability_mask & IB_PORT_CAP_HAS_SL_MAP))
-				return IB_SUCCESS;
-		}
+	if (osm_node_get_type(osm_physp_get_node_ptr(p)) == IB_NODE_TYPE_SWITCH)
 		num_ports = osm_node_get_num_physp(osm_physp_get_node_ptr(p));
-	} else {
-		if (!(p->port_info.capability_mask & IB_PORT_CAP_HAS_SL_MAP))
-			return IB_SUCCESS;
+	else
 		num_ports = 1;
-	}
 
 	for (i = 0; i < num_ports; i++) {
 		status = sl2vl_update_table(sm, p, i, port_num, force_update,

1.6.6

--
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 splits QoS related port parameters setup over switch external ports and end ports. Such separation leaves us with simpler code and saves some repeated flows in case of switch external ports (actually required per switch and not per port).

Another advantages: Optimized Sl2VL Mapping procedure can be implemented easier using this model. A low level port QoS related parameters setup infrastructure is ready for supporting per port QoS related configuration (which hopefully will be implemented some days).

---
 opensm/opensm/osm_qos.c |  137 +++++++++++++++++++++--------------------------
 1 files changed, 61 insertions(+), 76 deletions(-)

index afeaa11..f54e995 100644
@@ -77,6 +77,7 @@ static ib_api_status_t vlarb_update_table_block(osm_sm_t * sm,
 	osm_madw_context_t context;
 	uint32_t attr_mod;
 	unsigned vl_mask, i;
+	ib_api_status_t status;
 
 	vl_mask = (1 << (ib_port_info_get_op_vls(&p->port_info) - 1)) - 1;
 

@@ -96,10 +97,17 @@ static ib_api_status_t vlarb_update_table_block(osm_sm_t * sm,
 	context.vla_context.set_method = TRUE;
 	attr_mod = ((block_num + 1) << 16) | port_num;
 
-	return osm_req_set(sm, osm_physp_get_dr_path_ptr(p),
-			   (uint8_t *) & block, sizeof(block),
-			   IB_MAD_ATTR_VL_ARBITRATION, cl_hton32(attr_mod),
-			   CL_DISP_MSGID_NONE, &context);
+	status = osm_req_set(sm, osm_physp_get_dr_path_ptr(p),
+			     (uint8_t *) & block, sizeof(block),
+			     IB_MAD_ATTR_VL_ARBITRATION, cl_hton32(attr_mod),
+			     CL_DISP_MSGID_NONE, &context);
+	if (status != IB_SUCCESS)
+		OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 6202 : "
+			"failed to update VLArbitration tables "
+			"for port %" PRIx64 " block %u\n",
+			cl_ntoh64(p->port_guid), block_num);
+
+	return status;
 }
 
 static ib_api_status_t vlarb_update(osm_sm_t * sm, osm_physp_t * p,

@@ -157,6 +165,7 @@ static ib_api_status_t sl2vl_update_table(osm_sm_t * sm, osm_physp_t * p,
 	ib_slvl_table_t tbl, *p_tbl;
 	osm_node_t *p_node = osm_physp_get_node_ptr(p);
 	uint32_t attr_mod;
+	ib_api_status_t status;
 	unsigned vl_mask;
 	uint8_t vl1, vl2;
 	int i;

@@ -181,70 +190,65 @@ static ib_api_status_t sl2vl_update_table(osm_sm_t * sm, osm_physp_t * p,
 	context.slvl_context.port_guid = osm_physp_get_port_guid(p);
 	context.slvl_context.set_method = TRUE;
 	attr_mod = in_port << 8 | out_port;
-	return osm_req_set(sm, osm_physp_get_dr_path_ptr(p),
-			   (uint8_t *) & tbl, sizeof(tbl),
-			   IB_MAD_ATTR_SLVL_TABLE, cl_hton32(attr_mod),
-			   CL_DISP_MSGID_NONE, &context);
+	status = osm_req_set(sm, osm_physp_get_dr_path_ptr(p),
+			     (uint8_t *) & tbl, sizeof(tbl),
+			     IB_MAD_ATTR_SLVL_TABLE, cl_hton32(attr_mod),
+			     CL_DISP_MSGID_NONE, &context);
+	if (status != IB_SUCCESS)
+		OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 6203 : "
+			"failed to update SL2VLMapping tables "
+			"for port %" PRIx64 "i, attr_mod 0x%x\n",
+			cl_ntoh64(p->port_guid), attr_mod);
+	return status;
 }
 
-static ib_api_status_t sl2vl_update(osm_sm_t * sm, osm_port_t * p_port,
-				    osm_physp_t * p, uint8_t port_num,
-				    unsigned force_update,
-				    const struct qos_config *qcfg)
+static int qos_extports_setup(osm_sm_t * sm, osm_node_t *node,
+			      const struct qos_config *qcfg)
 {
-	ib_api_status_t status;
-	uint8_t i, num_ports;
-	ib_port_info_t *pi = &p_port->p_physp->port_info;
-
-	if (!(pi->capability_mask & IB_PORT_CAP_HAS_SL_MAP))
-		return IB_SUCCESS;
+	osm_physp_t *p0, *p;
+	unsigned force_update;
+	unsigned num_ports = osm_node_get_num_physp(node);
+	int ret = 0;
+	unsigned i, j;
 
-	if (osm_node_get_type(osm_physp_get_node_ptr(p)) == IB_NODE_TYPE_SWITCH)
-		num_ports = osm_node_get_num_physp(osm_physp_get_node_ptr(p));
-	else
-		num_ports = 1;
+	for (i = 1; i < num_ports; i++) {
+		p = osm_node_get_physp_ptr(node, i);
+		force_update = p->need_update || sm->p_subn->need_update;
+		p->vl_high_limit = qcfg->vl_high_limit;
+		if (vlarb_update(sm, p, p->port_num, force_update, qcfg))
+			ret = -1;
+	}
 
-	for (i = 0; i < num_ports; i++) {
-		status = sl2vl_update_table(sm, p, i, port_num, force_update,
-					    &qcfg->sl2vl);
-		if (status != IB_SUCCESS)
-			return status;
+	p0 = osm_node_get_physp_ptr(node, 0);
+	if (!(p0->port_info.capability_mask & IB_PORT_CAP_HAS_SL_MAP))
+		return ret;
+
+	for (i = 1; i < num_ports; i++) {
+		p = osm_node_get_physp_ptr(node, i);
+		force_update = p->need_update || sm->p_subn->need_update;
+		for (j = 0; j < num_ports; j++)
+			if (sl2vl_update_table(sm, p, i, j, force_update,
+					       &qcfg->sl2vl))
+				ret = -1;
 	}
 
-	return IB_SUCCESS;
+	return ret;
 }
 
-static int qos_physp_setup(osm_log_t * p_log, osm_sm_t * sm,
-			   osm_port_t * p_port, osm_physp_t * p,
-			   uint8_t port_num, unsigned force_update,
-			   const struct qos_config *qcfg)
+static int qos_endport_setup(osm_sm_t * sm, osm_physp_t * p,
+			     const struct qos_config *qcfg)
 {
-	ib_api_status_t status;
+	unsigned force_update = p->need_update || sm->p_subn->need_update;
 
-	/* OpVLs should be ok at this moment - just use it */
-
-	/* setup VL high limit on the physp later to be updated by link mgr */
 	p->vl_high_limit = qcfg->vl_high_limit;
-
-	/* setup VLArbitration */
-	status = vlarb_update(sm, p, port_num, force_update, qcfg);
-	if (status != IB_SUCCESS) {
-		OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 6202 : "
-			"failed to update VLArbitration tables "
-			"for port %" PRIx64 " #%d\n",
-			cl_ntoh64(p->port_guid), port_num);
+	if (vlarb_update(sm, p, 0, force_update, qcfg))
 		return -1;
-	}
 
-	/* setup SL2VL tables */
-	status = sl2vl_update(sm, p_port, p, port_num, force_update, qcfg);
-	if (status != IB_SUCCESS) {
-		OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 6203 : "
-			"failed to update SL2VLMapping tables "
-			"for port %" PRIx64 " #%d\n",
-			cl_ntoh64(p->port_guid), port_num);
+	if (!(p->port_info.capability_mask & IB_PORT_CAP_HAS_SL_MAP))
+		return 0;
+
+	if (sl2vl_update_table(sm, p, 0, 0, force_update, &qcfg->sl2vl))
 		return -1;
-	}
 
 	return 0;
 }

@@ -256,12 +260,8 @@ int osm_qos_setup(osm_opensm_t * p_osm)
 	cl_qmap_t *p_tbl;
 	cl_map_item_t *p_next;
 	osm_port_t *p_port;
-	uint32_t num_physp;
-	osm_physp_t *p_physp;
 	osm_node_t *p_node;
-	unsigned force_update;
 	int ret = 0;
-	uint8_t i;
 
 	if (!p_osm->subn.opt.qos)
 		return 0;

@@ -290,18 +290,9 @@ int osm_qos_setup(osm_opensm_t * p_osm)
 
 		p_node = p_port->p_node;
 		if (p_node->sw) {
-			num_physp = osm_node_get_num_physp(p_node);
-			for (i = 1; i < num_physp; i++) {
-				p_physp = osm_node_get_physp_ptr(p_node, i);
-				if (!p_physp)
-					continue;
-				force_update = p_physp->need_update ||
-				    p_osm->subn.need_update;
-				if (qos_physp_setup(&p_osm->log, &p_osm->sm,
-						    p_port, p_physp, i,
-						    force_update, &swe_config))
-					ret = -1;
-			}
+			if (qos_extports_setup(&p_osm->sm, p_node, &swe_config))
+				ret = -1;
+
 			/* skip base port 0 */
 			if (!ib_switch_info_is_enhanced_port0
 			    (&p_node->sw->switch_info))

@@ -313,13 +304,7 @@ int osm_qos_setup(osm_opensm_t * p_osm)
 		else
 			cfg = &ca_config;
 
-		p_physp = p_port->p_physp;
-		if (!p_physp)
-			continue;
-
-		force_update = p_physp->need_update || p_osm->subn.need_update;
-		if (qos_physp_setup(&p_osm->log, &p_osm->sm, p_port, p_physp,
-				    0, force_update, cfg))
+		if (qos_endport_setup(&p_osm->sm, p_port->p_physp, cfg))
 			ret = -1;
 	}
 

1.6.6

--
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

T24gVHVlLCBKYW4gNSwgMjAxMCBhdCA2OjEwIEFNLCBTYXNoYSBLaGFweW9yc2t5IDxzYXNoYWtA dm9sdGFpcmUuY29tPiB3cm90ZToKPgo+IFRoaXMgc3BsaXRzIFFvUyByZWxhdGVkIHBvcnQgcGFy YW1ldGVycyBzZXR1cCBvdmVyIHN3aXRjaCBleHRlcm5hbCBwb3J0cwo+IGFuZCBlbmQgcG9ydHMu IFN1Y2ggc2VwYXJhdGlvbiBsZWF2ZXMgdXMgd2l0aCBzaW1wbGVyIGNvZGUgYW5kIHNhdmVzCj4g c29tZSByZXBlYXRlZCBmbG93cyBpbiBjYXNlIG9mIHN3aXRjaCBleHRlcm5hbCBwb3J0cyAoYWN0 dWFsbHkgcmVxdWlyZWQKPiBwZXIgc3dpdGNoIGFuZCBub3QgcGVyIHBvcnQpLgoKTm90IHN1cmUg d2hhdCB5b3UgbWVhbiBieSByZXF1aXJlZCBpbiB0aGlzIHN0YXRlbWVudC4gV2hhdCBhcmUgeW91 CnJlZmVycmluZyB0byBhcyByZXF1aXJlZCBwZXIgc3dpdGNoIHJhdGhlciB0aGFuIHBlciBwb3J0 ID8KCj4gQW5vdGhlciBhZHZhbnRhZ2VzOiBPcHRpbWl6ZWQgU2wyVkwgTWFwcGluZyBwcm9jZWR1 cmUgY2FuIGJlIGltcGxlbWVudGVkCj4gZWFzaWVyIHVzaW5nIHRoaXMgbW9kZWwuIEEgbG93IGxl dmVsIHBvcnQgUW9TIHJlbGF0ZWQgcGFyYW1ldGVycyBzZXR1cAo+IGluZnJhc3RydWN0dXJlIGlz IHJlYWR5IGZvciBzdXBwb3J0aW5nIHBlciBwb3J0IFFvUyByZWxhdGVkIGNvbmZpZ3VyYXRpb24K PiAod2hpY2ggaG9wZWZ1bGx5IHdpbGwgYmUgaW1wbGVtZW50ZWQgc29tZSBkYXlzKS4KPgo+IFNp Z25lZC1vZmYtYnk6IFNhc2hhIEtoYXB5b3Jza3kgPHNhc2hha0B2b2x0YWlyZS5jb20+Cj4gLS0t Cj4gwqBvcGVuc20vb3BlbnNtL29zbV9xb3MuYyB8IMKgMTM3ICsrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gwqAxIGZpbGVzIGNoYW5nZWQsIDYxIGluc2Vy dGlvbnMoKyksIDc2IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL29wZW5zbS9vcGVuc20v b3NtX3Fvcy5jIGIvb3BlbnNtL29wZW5zbS9vc21fcW9zLmMKPiBpbmRleCBhZmVhYTExLi5mNTRl OTk1IDEwMDY0NAo+IC0tLSBhL29wZW5zbS9vcGVuc20vb3NtX3Fvcy5jCj4gKysrIGIvb3BlbnNt L29wZW5zbS9vc21fcW9zLmMKPiBAQCAtNzcsNiArNzcsNyBAQCBzdGF0aWMgaWJfYXBpX3N0YXR1 c190IHZsYXJiX3VwZGF0ZV90YWJsZV9ibG9jayhvc21fc21fdCAqIHNtLAo+IMKgIMKgIMKgIMKg b3NtX21hZHdfY29udGV4dF90IGNvbnRleHQ7Cj4gwqAgwqAgwqAgwqB1aW50MzJfdCBhdHRyX21v ZDsKPiDCoCDCoCDCoCDCoHVuc2lnbmVkIHZsX21hc2ssIGk7Cj4gKyDCoCDCoCDCoCBpYl9hcGlf c3RhdHVzX3Qgc3RhdHVzOwo+Cj4gwqAgwqAgwqAgwqB2bF9tYXNrID0gKDEgPDwgKGliX3BvcnRf aW5mb19nZXRfb3BfdmxzKCZwLT5wb3J0X2luZm8pIC0gMSkpIC0gMTsKPgo+IEBAIC05NiwxMCAr OTcsMTcgQEAgc3RhdGljIGliX2FwaV9zdGF0dXNfdCB2bGFyYl91cGRhdGVfdGFibGVfYmxvY2so b3NtX3NtX3QgKiBzbSwKPiDCoCDCoCDCoCDCoGNvbnRleHQudmxhX2NvbnRleHQuc2V0X21ldGhv ZCA9IFRSVUU7Cj4gwqAgwqAgwqAgwqBhdHRyX21vZCA9ICgoYmxvY2tfbnVtICsgMSkgPDwgMTYp IHwgcG9ydF9udW07Cj4KPiAtIMKgIMKgIMKgIHJldHVybiBvc21fcmVxX3NldChzbSwgb3NtX3Bo eXNwX2dldF9kcl9wYXRoX3B0cihwKSwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgKHVpbnQ4X3QgKikgJiBibG9jaywgc2l6ZW9mKGJsb2NrKSwKPiAtIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgSUJfTUFEX0FUVFJfVkxfQVJCSVRSQVRJT04s IGNsX2h0b24zMihhdHRyX21vZCksCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoENMX0RJU1BfTVNHSURfTk9ORSwgJmNvbnRleHQpOwo+ICsgwqAgwqAgwqAgc3RhdHVz ID0gb3NtX3JlcV9zZXQoc20sIG9zbV9waHlzcF9nZXRfZHJfcGF0aF9wdHIocCksCj4gKyDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCh1aW50OF90ICopICYgYmxvY2ss IHNpemVvZihibG9jayksCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoElCX01BRF9BVFRSX1ZMX0FSQklUUkFUSU9OLCBjbF9odG9uMzIoYXR0cl9tb2QpLAo+ICsg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBDTF9ESVNQX01TR0lEX05P TkUsICZjb250ZXh0KTsKPiArIMKgIMKgIMKgIGlmIChzdGF0dXMgIT0gSUJfU1VDQ0VTUykKPiAr IMKgIMKgIMKgIMKgIMKgIMKgIMKgIE9TTV9MT0coc20tPnBfbG9nLCBPU01fTE9HX0VSUk9SLCAi RVJSIDYyMDIgOiAiCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAiZmFpbGVk IHRvIHVwZGF0ZSBWTEFyYml0cmF0aW9uIHRhYmxlcyAiCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCAiZm9yIHBvcnQgJSIgUFJJeDY0ICIgYmxvY2sgJXVcbiIsCj4gKyDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBjbF9udG9oNjQocC0+cG9ydF9ndWlkKSwgYmxv Y2tfbnVtKTsKPiArCj4gKyDCoCDCoCDCoCByZXR1cm4gc3RhdHVzOwo+IMKgfQo+Cj4gwqBzdGF0 aWMgaWJfYXBpX3N0YXR1c190IHZsYXJiX3VwZGF0ZShvc21fc21fdCAqIHNtLCBvc21fcGh5c3Bf dCAqIHAsCj4gQEAgLTE1Nyw2ICsxNjUsNyBAQCBzdGF0aWMgaWJfYXBpX3N0YXR1c190IHNsMnZs X3VwZGF0ZV90YWJsZShvc21fc21fdCAqIHNtLCBvc21fcGh5c3BfdCAqIHAsCj4gwqAgwqAgwqAg wqBpYl9zbHZsX3RhYmxlX3QgdGJsLCAqcF90Ymw7Cj4gwqAgwqAgwqAgwqBvc21fbm9kZV90ICpw X25vZGUgPSBvc21fcGh5c3BfZ2V0X25vZGVfcHRyKHApOwo+IMKgIMKgIMKgIMKgdWludDMyX3Qg YXR0cl9tb2Q7Cj4gKyDCoCDCoCDCoCBpYl9hcGlfc3RhdHVzX3Qgc3RhdHVzOwo+IMKgIMKgIMKg IMKgdW5zaWduZWQgdmxfbWFzazsKPiDCoCDCoCDCoCDCoHVpbnQ4X3QgdmwxLCB2bDI7Cj4gwqAg wqAgwqAgwqBpbnQgaTsKPiBAQCAtMTgxLDcwICsxOTAsNjUgQEAgc3RhdGljIGliX2FwaV9zdGF0 dXNfdCBzbDJ2bF91cGRhdGVfdGFibGUob3NtX3NtX3QgKiBzbSwgb3NtX3BoeXNwX3QgKiBwLAo+ IMKgIMKgIMKgIMKgY29udGV4dC5zbHZsX2NvbnRleHQucG9ydF9ndWlkID0gb3NtX3BoeXNwX2dl dF9wb3J0X2d1aWQocCk7Cj4gwqAgwqAgwqAgwqBjb250ZXh0LnNsdmxfY29udGV4dC5zZXRfbWV0 aG9kID0gVFJVRTsKPiDCoCDCoCDCoCDCoGF0dHJfbW9kID0gaW5fcG9ydCA8PCA4IHwgb3V0X3Bv cnQ7Cj4gLSDCoCDCoCDCoCByZXR1cm4gb3NtX3JlcV9zZXQoc20sIG9zbV9waHlzcF9nZXRfZHJf cGF0aF9wdHIocCksCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCh1 aW50OF90ICopICYgdGJsLCBzaXplb2YodGJsKSwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgSUJfTUFEX0FUVFJfU0xWTF9UQUJMRSwgY2xfaHRvbjMyKGF0dHJfbW9k KSwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgQ0xfRElTUF9NU0dJ RF9OT05FLCAmY29udGV4dCk7Cj4gKyDCoCDCoCDCoCBzdGF0dXMgPSBvc21fcmVxX3NldChzbSwg b3NtX3BoeXNwX2dldF9kcl9wYXRoX3B0cihwKSwKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgKHVpbnQ4X3QgKikgJiB0YmwsIHNpemVvZih0YmwpLAo+ICsgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBJQl9NQURfQVRUUl9TTFZMX1RB QkxFLCBjbF9odG9uMzIoYXR0cl9tb2QpLAo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqBDTF9ESVNQX01TR0lEX05PTkUsICZjb250ZXh0KTsKPiArIMKgIMKgIMKg IGlmIChzdGF0dXMgIT0gSUJfU1VDQ0VTUykKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIE9TTV9M T0coc20tPnBfbG9nLCBPU01fTE9HX0VSUk9SLCAiRVJSIDYyMDMgOiAiCj4gKyDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAiZmFpbGVkIHRvIHVwZGF0ZSBTTDJWTE1hcHBpbmcgdGFi bGVzICIKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICJmb3IgcG9ydCAlIiBQ Ukl4NjQgImksIGF0dHJfbW9kIDB4JXhcbiIsCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCBjbF9udG9oNjQocC0+cG9ydF9ndWlkKSwgYXR0cl9tb2QpOwo+ICsgwqAgwqAgwqAg cmV0dXJuIHN0YXR1czsKPiDCoH0KPgo+IC1zdGF0aWMgaWJfYXBpX3N0YXR1c190IHNsMnZsX3Vw ZGF0ZShvc21fc21fdCAqIHNtLCBvc21fcG9ydF90ICogcF9wb3J0LAo+IC0gwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgb3NtX3BoeXNwX3QgKiBwLCB1 aW50OF90IHBvcnRfbnVtLAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgdW5zaWduZWQgZm9yY2VfdXBkYXRlLAo+IC0gwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgY29uc3Qgc3RydWN0IHFvc19jb25m aWcgKnFjZmcpCj4gK3N0YXRpYyBpbnQgcW9zX2V4dHBvcnRzX3NldHVwKG9zbV9zbV90ICogc20s IG9zbV9ub2RlX3QgKm5vZGUsCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCBjb25zdCBzdHJ1Y3QgcW9zX2NvbmZpZyAqcWNmZykKPiDCoHsKPiAtIMKgIMKgIMKg IGliX2FwaV9zdGF0dXNfdCBzdGF0dXM7Cj4gLSDCoCDCoCDCoCB1aW50OF90IGksIG51bV9wb3J0 czsKPiAtIMKgIMKgIMKgIGliX3BvcnRfaW5mb190ICpwaSA9ICZwX3BvcnQtPnBfcGh5c3AtPnBv cnRfaW5mbzsKPiAtCj4gLSDCoCDCoCDCoCBpZiAoIShwaS0+Y2FwYWJpbGl0eV9tYXNrICYgSUJf UE9SVF9DQVBfSEFTX1NMX01BUCkpCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCByZXR1cm4gSUJf U1VDQ0VTUzsKPiArIMKgIMKgIMKgIG9zbV9waHlzcF90ICpwMCwgKnA7Cj4gKyDCoCDCoCDCoCB1 bnNpZ25lZCBmb3JjZV91cGRhdGU7Cj4gKyDCoCDCoCDCoCB1bnNpZ25lZCBudW1fcG9ydHMgPSBv c21fbm9kZV9nZXRfbnVtX3BoeXNwKG5vZGUpOwo+ICsgwqAgwqAgwqAgaW50IHJldCA9IDA7Cj4g KyDCoCDCoCDCoCB1bnNpZ25lZCBpLCBqOwo+Cj4gLSDCoCDCoCDCoCBpZiAob3NtX25vZGVfZ2V0 X3R5cGUob3NtX3BoeXNwX2dldF9ub2RlX3B0cihwKSkgPT0gSUJfTk9ERV9UWVBFX1NXSVRDSCkK PiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG51bV9wb3J0cyA9IG9zbV9ub2RlX2dldF9udW1fcGh5 c3Aob3NtX3BoeXNwX2dldF9ub2RlX3B0cihwKSk7Cj4gLSDCoCDCoCDCoCBlbHNlCj4gLSDCoCDC oCDCoCDCoCDCoCDCoCDCoCBudW1fcG9ydHMgPSAxOwo+ICsgwqAgwqAgwqAgZm9yIChpID0gMTsg aSA8IG51bV9wb3J0czsgaSsrKSB7Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwID0gb3NtX25v ZGVfZ2V0X3BoeXNwX3B0cihub2RlLCBpKTsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGZvcmNl X3VwZGF0ZSA9IHAtPm5lZWRfdXBkYXRlIHx8IHNtLT5wX3N1Ym4tPm5lZWRfdXBkYXRlOwo+ICsg wqAgwqAgwqAgwqAgwqAgwqAgwqAgcC0+dmxfaGlnaF9saW1pdCA9IHFjZmctPnZsX2hpZ2hfbGlt aXQ7Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAodmxhcmJfdXBkYXRlKHNtLCBwLCBwLT5w b3J0X251bSwgZm9yY2VfdXBkYXRlLCBxY2ZnKSkKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIHJldCA9IC0xOwo+ICsgwqAgwqAgwqAgfQo+Cj4gLSDCoCDCoCDCoCBmb3IgKGkg PSAwOyBpIDwgbnVtX3BvcnRzOyBpKyspIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHN0YXR1 cyA9IHNsMnZsX3VwZGF0ZV90YWJsZShzbSwgcCwgaSwgcG9ydF9udW0sIGZvcmNlX3VwZGF0ZSwK PiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgICZxY2ZnLT5zbDJ2bCk7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAoc3Rh dHVzICE9IElCX1NVQ0NFU1MpCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBy ZXR1cm4gc3RhdHVzOwo+ICsgwqAgwqAgwqAgcDAgPSBvc21fbm9kZV9nZXRfcGh5c3BfcHRyKG5v ZGUsIDApOwo+ICsgwqAgwqAgwqAgaWYgKCEocDAtPnBvcnRfaW5mby5jYXBhYmlsaXR5X21hc2sg JiBJQl9QT1JUX0NBUF9IQVNfU0xfTUFQKSkKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJldHVy biByZXQ7CgpTYW1lIGNvbW1lbnQgb24gdGhpcyBhcyBwcmV2aW91cyBvc21fcW9zIHBhdGNoIGNv bW1lbnQgb24gbWVyZ2luZyB0aGUKU0wyVkwgbWFwcGluZyBjYXBhYmlsaXR5IGNoZWNrLgoKLS0g SGFsCgo+ICsKPiArIMKgIMKgIMKgIGZvciAoaSA9IDE7IGkgPCBudW1fcG9ydHM7IGkrKykgewo+ ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcCA9IG9zbV9ub2RlX2dldF9waHlzcF9wdHIobm9kZSwg aSk7Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBmb3JjZV91cGRhdGUgPSBwLT5uZWVkX3VwZGF0 ZSB8fCBzbS0+cF9zdWJuLT5uZWVkX3VwZGF0ZTsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGZv ciAoaiA9IDA7IGogPCBudW1fcG9ydHM7IGorKykKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIGlmIChzbDJ2bF91cGRhdGVfdGFibGUoc20sIHAsIGksIGosIGZvcmNlX3VwZGF0 ZSwKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgJnFjZmctPnNsMnZsKSkKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJldCA9IC0xOwo+IMKgIMKgIMKgIMKgfQo+Cj4gLSDC oCDCoCDCoCByZXR1cm4gSUJfU1VDQ0VTUzsKPiArIMKgIMKgIMKgIHJldHVybiByZXQ7Cj4gwqB9 Cj4KPiAtc3RhdGljIGludCBxb3NfcGh5c3Bfc2V0dXAob3NtX2xvZ190ICogcF9sb2csIG9zbV9z bV90ICogc20sCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG9zbV9w b3J0X3QgKiBwX3BvcnQsIG9zbV9waHlzcF90ICogcCwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgdWludDhfdCBwb3J0X251bSwgdW5zaWduZWQgZm9yY2VfdXBkYXRl LAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBjb25zdCBzdHJ1Y3Qg cW9zX2NvbmZpZyAqcWNmZykKPiArc3RhdGljIGludCBxb3NfZW5kcG9ydF9zZXR1cChvc21fc21f dCAqIHNtLCBvc21fcGh5c3BfdCAqIHAsCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoGNvbnN0IHN0cnVjdCBxb3NfY29uZmlnICpxY2ZnKQo+IMKgewo+IC0gwqAg wqAgwqAgaWJfYXBpX3N0YXR1c190IHN0YXR1czsKPiArIMKgIMKgIMKgIHVuc2lnbmVkIGZvcmNl X3VwZGF0ZSA9IHAtPm5lZWRfdXBkYXRlIHx8IHNtLT5wX3N1Ym4tPm5lZWRfdXBkYXRlOwo+Cj4g LSDCoCDCoCDCoCAvKiBPcFZMcyBzaG91bGQgYmUgb2sgYXQgdGhpcyBtb21lbnQgLSBqdXN0IHVz ZSBpdCAqLwo+IC0KPiAtIMKgIMKgIMKgIC8qIHNldHVwIFZMIGhpZ2ggbGltaXQgb24gdGhlIHBo eXNwIGxhdGVyIHRvIGJlIHVwZGF0ZWQgYnkgbGluayBtZ3IgKi8KPiDCoCDCoCDCoCDCoHAtPnZs X2hpZ2hfbGltaXQgPSBxY2ZnLT52bF9oaWdoX2xpbWl0Owo+IC0KPiAtIMKgIMKgIMKgIC8qIHNl dHVwIFZMQXJiaXRyYXRpb24gKi8KPiAtIMKgIMKgIMKgIHN0YXR1cyA9IHZsYXJiX3VwZGF0ZShz bSwgcCwgcG9ydF9udW0sIGZvcmNlX3VwZGF0ZSwgcWNmZyk7Cj4gLSDCoCDCoCDCoCBpZiAoc3Rh dHVzICE9IElCX1NVQ0NFU1MpIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIE9TTV9MT0cocF9s b2csIE9TTV9MT0dfRVJST1IsICJFUlIgNjIwMiA6ICIKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgICJmYWlsZWQgdG8gdXBkYXRlIFZMQXJiaXRyYXRpb24gdGFibGVzICIKPiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICJmb3IgcG9ydCAlIiBQUkl4NjQgIiAj JWRcbiIsCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBjbF9udG9oNjQocC0+ cG9ydF9ndWlkKSwgcG9ydF9udW0pOwo+ICsgwqAgwqAgwqAgaWYgKHZsYXJiX3VwZGF0ZShzbSwg cCwgMCwgZm9yY2VfdXBkYXRlLCBxY2ZnKSkKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHJldHVy biAtMTsKPiAtIMKgIMKgIMKgIH0KPgo+IC0gwqAgwqAgwqAgLyogc2V0dXAgU0wyVkwgdGFibGVz ICovCj4gLSDCoCDCoCDCoCBzdGF0dXMgPSBzbDJ2bF91cGRhdGUoc20sIHBfcG9ydCwgcCwgcG9y dF9udW0sIGZvcmNlX3VwZGF0ZSwgcWNmZyk7Cj4gLSDCoCDCoCDCoCBpZiAoc3RhdHVzICE9IElC X1NVQ0NFU1MpIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIE9TTV9MT0cocF9sb2csIE9TTV9M T0dfRVJST1IsICJFUlIgNjIwMyA6ICIKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgICJmYWlsZWQgdG8gdXBkYXRlIFNMMlZMTWFwcGluZyB0YWJsZXMgIgo+IC0gwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgImZvciBwb3J0ICUiIFBSSXg2NCAiICMlZFxuIiwKPiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGNsX250b2g2NChwLT5wb3J0X2d1aWQp LCBwb3J0X251bSk7Cj4gKyDCoCDCoCDCoCBpZiAoIShwLT5wb3J0X2luZm8uY2FwYWJpbGl0eV9t YXNrICYgSUJfUE9SVF9DQVBfSEFTX1NMX01BUCkpCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBy ZXR1cm4gMDsKPiArCj4gKyDCoCDCoCDCoCBpZiAoc2wydmxfdXBkYXRlX3RhYmxlKHNtLCBwLCAw LCAwLCBmb3JjZV91cGRhdGUsICZxY2ZnLT5zbDJ2bCkpCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqByZXR1cm4gLTE7Cj4gLSDCoCDCoCDCoCB9Cj4KPiDCoCDCoCDCoCDCoHJldHVybiAwOwo+IMKg fQo+IEBAIC0yNTYsMTIgKzI2MCw4IEBAIGludCBvc21fcW9zX3NldHVwKG9zbV9vcGVuc21fdCAq IHBfb3NtKQo+IMKgIMKgIMKgIMKgY2xfcW1hcF90ICpwX3RibDsKPiDCoCDCoCDCoCDCoGNsX21h cF9pdGVtX3QgKnBfbmV4dDsKPiDCoCDCoCDCoCDCoG9zbV9wb3J0X3QgKnBfcG9ydDsKPiAtIMKg IMKgIMKgIHVpbnQzMl90IG51bV9waHlzcDsKPiAtIMKgIMKgIMKgIG9zbV9waHlzcF90ICpwX3Bo eXNwOwo+IMKgIMKgIMKgIMKgb3NtX25vZGVfdCAqcF9ub2RlOwo+IC0gwqAgwqAgwqAgdW5zaWdu ZWQgZm9yY2VfdXBkYXRlOwo+IMKgIMKgIMKgIMKgaW50IHJldCA9IDA7Cj4gLSDCoCDCoCDCoCB1 aW50OF90IGk7Cj4KPiDCoCDCoCDCoCDCoGlmICghcF9vc20tPnN1Ym4ub3B0LnFvcykKPiDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoHJldHVybiAwOwo+IEBAIC0yOTAsMTggKzI5MCw5IEBAIGludCBv c21fcW9zX3NldHVwKG9zbV9vcGVuc21fdCAqIHBfb3NtKQo+Cj4gwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqBwX25vZGUgPSBwX3BvcnQtPnBfbm9kZTsKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGlm IChwX25vZGUtPnN3KSB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBudW1f cGh5c3AgPSBvc21fbm9kZV9nZXRfbnVtX3BoeXNwKHBfbm9kZSk7Cj4gLSDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCBmb3IgKGkgPSAxOyBpIDwgbnVtX3BoeXNwOyBpKyspIHsKPiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHBfcGh5c3AgPSBv c21fbm9kZV9nZXRfcGh5c3BfcHRyKHBfbm9kZSwgaSk7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAoIXBfcGh5c3ApCj4gLSDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBjb250aW51ZTsKPiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGZvcmNlX3VwZGF0 ZSA9IHBfcGh5c3AtPm5lZWRfdXBkYXRlIHx8Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwX29zbS0+c3Vibi5uZWVkX3VwZGF0ZTsKPiAtIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmIChxb3NfcGh5c3Bf c2V0dXAoJnBfb3NtLT5sb2csICZwX29zbS0+c20sCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwX3Bv cnQsIHBfcGh5c3AsIGksCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBmb3JjZV91cGRhdGUsICZzd2Vf Y29uZmlnKSkKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIHJldCA9IC0xOwo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgfQo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKHFvc19leHRwb3J0 c19zZXR1cCgmcF9vc20tPnNtLCBwX25vZGUsICZzd2VfY29uZmlnKSkKPiArIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJldCA9IC0xOwo+ICsKPiDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoC8qIHNraXAgYmFzZSBwb3J0IDAgKi8KPiDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGlmICghaWJfc3dpdGNoX2luZm9faXNfZW5o YW5jZWRfcG9ydDAKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCgm cF9ub2RlLT5zdy0+c3dpdGNoX2luZm8pKQo+IEBAIC0zMTMsMTMgKzMwNCw3IEBAIGludCBvc21f cW9zX3NldHVwKG9zbV9vcGVuc21fdCAqIHBfb3NtKQo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg ZWxzZQo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgY2ZnID0gJmNhX2NvbmZp ZzsKPgo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgcF9waHlzcCA9IHBfcG9ydC0+cF9waHlzcDsK PiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmICghcF9waHlzcCkKPiAtIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIGNvbnRpbnVlOwo+IC0KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKg IGZvcmNlX3VwZGF0ZSA9IHBfcGh5c3AtPm5lZWRfdXBkYXRlIHx8IHBfb3NtLT5zdWJuLm5lZWRf dXBkYXRlOwo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKHFvc19waHlzcF9zZXR1cCgmcF9v c20tPmxvZywgJnBfb3NtLT5zbSwgcF9wb3J0LCBwX3BoeXNwLAo+IC0gwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgMCwgZm9yY2VfdXBkYXRlLCBjZmcp KQo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKHFvc19lbmRwb3J0X3NldHVwKCZwX29zbS0+ c20sIHBfcG9ydC0+cF9waHlzcCwgY2ZnKSkKPiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoHJldCA9IC0xOwo+IMKgIMKgIMKgIMKgfQo+Cj4gLS0KPiAxLjYuNgo+Cj4gLS0KPiBU byB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUg bGludXgtcmRtYSIgaW4KPiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIu a2VybmVsLm9yZwo+IE1vcmUgbWFqb3Jkb21vIGluZm8gYXQgwqBodHRwOi8vdmdlci5rZXJuZWwu b3JnL21ham9yZG9tby1pbmZvLmh0bWwKPgo=
--
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

Duplicated per switch external port setup detection of common (per switch) data - such as: number of ports, Sl2VL mapping capability p0->port_info.capability_mask.

I answered there.

Sasha
--
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 was your use of the word 'required' which was confusing to me. It's clear now what you mean.

-- Hal

--
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

Table 146 PortInfo

That footnote was added at IBA 1.2.1.

Change appears to be for switches to always rely on this bit rather than only when VLCap is 1. I wonder if there are any switches with VLCap > 1 that don't set the IsSLMappingSupported CapabilityMask bit. There shouldn't be (at least if they are IBA 1.2.1 compliant) but are you sure about this ?

-- Hal

--
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'm not sure about this, but think that probability of using such hypothetical old switches for any sort of QoS is very low. And anyway it doesn't look for me that we have any stronger SL2VL mapping capability indication - 'VLCap > 1' by itself doesn't do this too, right?

Sasha
--
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

Low but not zero... I'm also not sure it's just old switches... I've seen many rejections (status 7) since you made this change.

It does. There's a requirement that SL2VL mapping is required when VLCap > 1.

-- Hal

--
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 interesting. Do you have any details?

Correct, I found it in o7-4. Basically we can check both (now after switch/endport separation in the code this should be easier), but I would prefer to understand better an issue (if we have) first.

Also same o7-4 is applicable to CA and router ports. Do you know why was VLCap > 1 condition ignored there?

Sasha
--
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've been unable to get test time for this as yet.

I see no mention of CA and router ports in o7-4. What are you referring to here ?

Where is the "there" that you are referring to above ?

-- Hal

--
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 the point. o7-4 is not limited by switch ports.

This was the question, why such capability check should be (was) ideologically different for CA ports? If 'VLCap > 1' is significant capability indication for switch ports this should be the same interpretation with CA and router ports.

not switch ports.

Sasha
--
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

The difference is due to capability mask being valid for CA and router ports and only valid for switch port 0. Later on (at IBA 1.2.1), we came back and said for switch external ports they were the same as switch port 0 which was how footnote (b) came to be added but I'm not sure about relying on the conformance to this.

-- Hal

--
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 Hal,

[snip]

[snip]

After rebasing this part over recently posted patches it becomes:

index f54e995..6bbbfa2 100644
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2006-2009 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2009 HNR Consulting. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

@@ -157,14 +158,13 @@ static ib_api_status_t vlarb_update(osm_sm_t * sm, osm_physp_t * p,
 }
 
 static ib_api_status_t sl2vl_update_table(osm_sm_t * sm, osm_physp_t * p,
-					  uint8_t in_port, uint8_t out_port,
+					  uint8_t in_port, uint32_t attr_mod,
 					  unsigned force_update,
 					  const ib_slvl_table_t * sl2vl_table)
 {
 	osm_madw_context_t context;
 	ib_slvl_table_t tbl, *p_tbl;
 	osm_node_t *p_node = osm_physp_get_node_ptr(p);
-	uint32_t attr_mod;
 	ib_api_status_t status;
 	unsigned vl_mask;
 	uint8_t vl1, vl2;

@@ -189,7 +189,6 @@ static ib_api_status_t sl2vl_update_table(osm_sm_t * sm, osm_physp_t * p,
 	context.slvl_context.node_guid = osm_node_get_node_guid(p_node);
 	context.slvl_context.port_guid = osm_physp_get_port_guid(p);
 	context.slvl_context.set_method = TRUE;
-	attr_mod = in_port << 8 | out_port;
 	status = osm_req_set(sm, osm_physp_get_dr_path_ptr(p),
 			     (uint8_t *) & tbl, sizeof(tbl),
 			     IB_MAD_ATTR_SLVL_TABLE, cl_hton32(attr_mod),

@@ -223,12 +222,20 @@ static int qos_extports_setup(osm_sm_t * sm, osm_node_t *node,
 	if (!(p0->port_info.capability_mask & IB_PORT_CAP_HAS_SL_MAP))
 		return ret;
 
+	if (ib_switch_info_get_opt_sl2vlmapping(&node->sw->switch_info) &&
+	    sm->p_subn->opt.use_optimized_slvl) {
+		p = osm_node_get_physp_ptr(node, 1);
+		force_update = p->need_update || sm->p_subn->need_update;
+		return sl2vl_update_table(sm, p, 1, 0x30000, force_update,
+					  &qcfg->sl2vl);
+	}
+
 	for (i = 1; i < num_ports; i++) {
 		p = osm_node_get_physp_ptr(node, i);
 		force_update = p->need_update || sm->p_subn->need_update;
 		for (j = 0; j < num_ports; j++)
-			if (sl2vl_update_table(sm, p, i, j, force_update,
-					       &qcfg->sl2vl))
+			if (sl2vl_update_table(sm, p, i, i << 8 | j,
+					       force_update, &qcfg->sl2vl))
 				ret = -1;
 	}
 

, does it look fine for you?

Sasha
--
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

In the optimized case, doesn't this send extra SL2VL mapping table ? Couldn''t that be eliminated by checking for this in the new endport routine (and skipping the remainder of that routine) ?

-- Hal

--
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 don't see how, could you elaborate?

Sasha

--
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

Doesn't this send a table for the endport even when optimized ?

-- Hal

--
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

Yes, and how is this different from the original patch?

Remember, that there is a different configuration for switch's port 0 (needed or not - this is another question), so we must to take it into account.

Sasha
--
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

The original patch didn't do this but missed accounting for the switch port 0 configuration.

Yes but is there a need for this if they are the same and wildcarding is used ? That will save what seems to me to be an unneeded MAD request/response pair per switch.

-- Hal

--
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 cannot understand. What do you mean?

This leads us to switch ports (0 and externals) QoS configuration unification. Basically I have nothing against this, but this is not actually related to this patch series. And should be done first as completely separate change, then we can merge SL2VL setup too.

However, there is some related long time pended task - QoS policy and QoS port parameters configurations merge. Keeping this in the mind I would think that finally we will need ability to have "per-port" SL2VL and VLArb configuration. We can take it into account even now.

Sasha
--
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

SGkgU2FzaGEsCgpPbiBUdWUsIEphbiA1LCAyMDEwIGF0IDY6MTggQU0sIFNhc2hhIEtoYXB5b3Jz a3kgPHNhc2hha0B2b2x0YWlyZS5jb20+IHdyb3RlOgo+IEhpIEhhbCwKPgo+IE9uIDE0OjQxIFR1 ZSAwMSBEZWMgwqAgwqAgLCBIYWwgUm9zZW5zdG9jayB3cm90ZToKPj4KPj4gT3B0aW1pemVkIFNM dG9WTE1hcHBpbmdUYWJsZSBwcm9ncmFtbWluZyByZWR1Y2VzIHRoZSBudW1iZXIgb2YgTUFEcwo+ PiBuZWVkZWQgZnJvbSBPKG4qKjIpIHRvIE8obikuIFNlZSBJQkEgMS4yLjEgdm9sIDEgcC4gODQz IDE0LjIuNS44Cj4+IFNMdG9WTE1hcHBpbmdUYWJsZS4KPj4KPj4gU2lnbmVkLW9mZi1ieTogSGFs IFJvc2Vuc3RvY2sgPGhhbC5yb3NlbnN0b2NrQGdtYWlsLmNvbT4KPj4gLS0tCj4KPiBbc25pcF0K Pgo+PiBkaWZmIC0tZ2l0IGEvb3BlbnNtL29wZW5zbS9vc21fcW9zLmMgYi9vcGVuc20vb3BlbnNt L29zbV9xb3MuYwo+PiBpbmRleCAwOGY5YTYwLi42MTdhODZlIDEwMDY0NAo+PiAtLS0gYS9vcGVu c20vb3BlbnNtL29zbV9xb3MuYwo+PiArKysgYi9vcGVuc20vb3BlbnNtL29zbV9xb3MuYwo+Cj4g W3NuaXBdCj4KPj4gQEAgLTI5MCw2ICszMDYsNDQgQEAgaW50IG9zbV9xb3Nfc2V0dXAob3NtX29w ZW5zbV90ICogcF9vc20pCj4+IMKgIMKgIMKgIC8qIHJlYWQgUW9TIHBvbGljeSBjb25maWcgZmls ZSAqLwo+PiDCoCDCoCDCoCBvc21fcW9zX3BhcnNlX3BvbGljeV9maWxlKCZwX29zbS0+c3Vibik7 Cj4+Cj4+ICsgwqAgwqAgLyogbG9vcCBvbiBzd2l0Y2hlcyB0aGF0IHN1cHBvcnQgb3B0aW1pemVk IFNMMlZMIHByb2dyYW1taW5nIGZpcnN0ICovCj4+ICsgwqAgwqAgcF90YmwgPSAmcF9vc20tPnN1 Ym4uc3dfZ3VpZF90Ymw7Cj4+ICsgwqAgwqAgcF9uZXh0ID0gY2xfcW1hcF9oZWFkKHBfdGJsKTsK Pj4gKyDCoCDCoCB3aGlsZSAocF9uZXh0ICE9IGNsX3FtYXBfZW5kKHBfdGJsKSkgewo+PiArIMKg IMKgIMKgIMKgIMKgIMKgIHBfc3cgPSAob3NtX3N3aXRjaF90ICopIHBfbmV4dDsKPj4gKyDCoCDC oCDCoCDCoCDCoCDCoCBwX25leHQgPSBjbF9xbWFwX25leHQocF9uZXh0KTsKPj4gKwo+PiArIMKg IMKgIMKgIMKgIMKgIMKgIGlmIChpYl9zd2l0Y2hfaW5mb19nZXRfb3B0X3NsMnZsbWFwcGluZygm cF9zdy0+c3dpdGNoX2luZm8pICYmCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcF9vc20t PnN1Ym4ub3B0LnVzZV9vcHRpbWl6ZWRfc2x2bCkgewo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIHBfcGh5c3AgPSBvc21fbm9kZV9nZXRfcGh5c3BfcHRyKHBfc3ctPnBfbm9kZSwg MSk7Cj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgbnVtX3BoeXNwID0gb3NtX25v ZGVfZ2V0X251bV9waHlzcChwX3N3LT5wX25vZGUpOwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIGZvcmNlX3VwZGF0ZSA9IHBfb3NtLT5zdWJuLm5lZWRfdXBkYXRlOwo+PiArIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGZvciAoaSA9IDE7IGkgPCBudW1fcGh5c3A7IGkr Kykgewo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHBfcGh5 c3AgPSBvc21fbm9kZV9nZXRfcGh5c3BfcHRyKHBfc3ctPnBfbm9kZSwgaSk7Cj4+ICsgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKCFwX3BoeXNwKQo+PiArIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGNvbnRp bnVlOwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmICh2 bGFyYl9waHlzcF9zZXR1cCgmcF9vc20tPnNtLCBwX3BoeXNwLCBpLAo+PiArIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIHBfcGh5c3AtPm5lZWRfdXBkYXRlIHx8Cj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcF9v c20tPnN1Ym4ubmVlZF91cGRhdGUsCj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgJnN3ZV9jb25maWcp KQo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIHJldCA9IC0xOwo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIGZvcmNlX3VwZGF0ZSB8PSBwX3BoeXNwLT5uZWVkX3VwZGF0ZTsKPj4gKyDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCB9Cj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg aWYgKHNsMnZsX3VwZGF0ZSgmcF9vc20tPnNtLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgb3NtX25vZGVfZ2V0X3BoeXNwX3B0cihw X3N3LT5wX25vZGUsIDApLAo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgcF9waHlzcCwgaSwgMSwgZm9yY2VfdXBkYXRlLAo+Cj4gQXQg dGhpcyBwb2ludCBpID0gbnVtX3BoeXNwLCB3aGljaCBpcyBhbiBpbnZhbGlkIHN3aXRjaCBwb3J0 IG51bWJlciwKPiByaWdodD8KClllcywgYnV0IGluIHNsMnZsX3VwZGF0ZV90YWJsZSBvdXRwdXQg cG9ydCBudW0gaXMgbm90IHVzZWQgd2hlbgpvcHRpbWl6ZSBpcyAxIHdoaWNoIGlzIHRoZSBjYXNl IGhlcmUuCgotLSBIYWwKCj4gU2FzaGEKPgo+Cj4+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAmc3dlX2NvbmZpZykpIHsKPj4gKyDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBPU01fTE9HKCZwX29zbS0+bG9n LCBPU01fTE9HX0VSUk9SLCAiRVJSIDYyMDQ6ICIKPj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAiZmFpbGVkIHRvIHVwZGF0ZSBvcHRpbWl6 ZWQgU0wyVkxNYXBwaW5nIgo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgICIgdGFibGVzIGZvciBwb3J0ICUiIFBSSXg2NCAiICMlZFxuIiwK Pj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCBjbF9udG9oNjQocF9waHlzcC0+cG9ydF9ndWlkKSwgaSk7Cj4+ICsgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcmV0ID0gLTE7Cj4+ICsgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgfQo+PiArIMKgIMKgIMKgIMKgIMKgIMKgIH0KPj4gKyDCoCDCoCB9Cj4+ ICsKPj4gKyDCoCDCoCAvKiBub3csIGxvb3Agb24gcG9ydHMgc2tpcHBpbmcgdGhlIGV4dGVybmFs IHBvcnRzIG9mIHN3aXRjaGVzCj4+ICsgwqAgwqAgwqAgwqB0aGF0IHN1cHBvcnQgb3B0aW1pemVk IFNMMlZMIHByb2dyYW1taW5nICovCj4+IMKgIMKgIMKgIHBfdGJsID0gJnBfb3NtLT5zdWJuLnBv cnRfZ3VpZF90Ymw7Cj4+IMKgIMKgIMKgIHBfbmV4dCA9IGNsX3FtYXBfaGVhZChwX3RibCk7Cj4+ IMKgIMKgIMKgIHdoaWxlIChwX25leHQgIT0gY2xfcW1hcF9lbmQocF90YmwpKSB7Cj4gLS0KPiBU byB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUg bGludXgtcmRtYSIgaW4KPiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIu a2VybmVsLm9yZwo+IE1vcmUgbWFqb3Jkb21vIGluZm8gYXQgwqBodHRwOi8vdmdlci5rZXJuZWwu b3JnL21ham9yZG9tby1pbmZvLmh0bWwKPgo=
--
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

Rebased and Applied. Thanks.

Sasha
--
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