Skip to contentSkip to conversation

C++ style coding does not compile

PATCH In review Smith, Stan 5 participants 8 messages Oct 1, 2009 – Oct 12, 2009 3 messages not in the archive InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 C++ style coding does not compile

Move C++ in-stream var declarations to top of {} block as in C style; Var assignments left in place. MSFT compiler errors out with Missing ';' before 'type', 'Illegal use of this type osm_prefix_route_t as an expression'?

opensm/opensm/osm_sa_path_record.c +7 -5
index 2247ebe..1166def 100644
@@ -1214,6 +1214,10 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
                        if (!ib_gid_is_multicast(&p_pr->dgid) &&
                            ib_gid_get_subnet_prefix(&p_pr->dgid) !=
                            sa->p_subn->opt.subnet_prefix) {
+
+                               osm_prefix_route_t *route;
+                               osm_prefix_route_t *r;
+
                                OSM_LOG(sa->p_log, OSM_LOG_VERBOSE,
                                        "Non local DGID subnet prefix 0x%016"
                                        PRIx64 "\n",
@@ -1221,11 +1225,9 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 
                                /* Find the router port that is configured to
                                   handle this prefix, if any */
-                               osm_prefix_route_t *route = NULL;
-                               osm_prefix_route_t *r = (osm_prefix_route_t *)
-                                   cl_qlist_head(&sa->p_subn->
-                                                 prefix_routes_list);
-
+                               route = NULL;
+                               r = (osm_prefix_route_t *) cl_qlist_head(
+                                       &sa->p_subn->prefix_routes_list);
                                while (r != (osm_prefix_route_t *)
                                       cl_qlist_end(&sa->p_subn->
                                                    prefix_routes_list)) {
#1 lore raw
Quoted 6 lines · Stan

Move C++ in-stream var declarations to top of {} block as in C style; Var assignments left in place. MSFT compiler errors out with Missing ';' before 'type', 'Illegal use of this type osm_prefix_route_t as an expression'?

In this patch whitespace characters are mangled.

Applied by hands. Thanks.

Sasha

Quoted 32 lines
opensm/opensm/osm_sa_path_record.c +7 -5
index 2247ebe..1166def 100644
@@ -1214,6 +1214,10 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
                        if (!ib_gid_is_multicast(&p_pr->dgid) &&
                            ib_gid_get_subnet_prefix(&p_pr->dgid) !=
                            sa->p_subn->opt.subnet_prefix) {
+
+                               osm_prefix_route_t *route;
+                               osm_prefix_route_t *r;
+
                                OSM_LOG(sa->p_log, OSM_LOG_VERBOSE,
                                        "Non local DGID subnet prefix 0x%016"
                                        PRIx64 "\n",
@@ -1221,11 +1225,9 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 
                                /* Find the router port that is configured to
                                   handle this prefix, if any */
-                               osm_prefix_route_t *route = NULL;
-                               osm_prefix_route_t *r = (osm_prefix_route_t *)
-                                   cl_qlist_head(&sa->p_subn->
-                                                 prefix_routes_list);
-
+                               route = NULL;
+                               r = (osm_prefix_route_t *) cl_qlist_head(
+                                       &sa->p_subn->prefix_routes_list);
                                while (r != (osm_prefix_route_t *)
                                       cl_qlist_end(&sa->p_subn->
                                                    prefix_routes_list)) {

A message that is not in the archive (sent off-list or not yet received): 3F6F638B8D880340AB536D29CD4C1E1912C86E8BA3-osO9UTpF0USkrb+BlOpmy7fspsVTdybXVpNB7YpNyf8@public.gmane.org

#3 lore raw

PATCH 1/1 opensm/osm_sa_path_record.c: separate router guid resolution code

Move off subnet destination (router address) resolution code to separate function to improve readability.

---
 opensm/opensm/osm_sa_path_record.c |  122 +++++++++++++++--------------------
 1 files changed, 52 insertions(+), 70 deletions(-)
opensm/opensm/osm_sa_path_record.c +52 -70
index b9c6055..c91c7a2 100644
@@ -1115,6 +1115,39 @@ Exit:
 
 /**********************************************************************
  **********************************************************************/
+/* Find the router port that is configured to handle this prefix, if any */
+static ib_net64_t find_router(osm_sa_t *sa, ib_net64_t prefix)
+{
+	osm_prefix_route_t *route = NULL;
+	osm_router_t *rtr;
+	cl_qlist_t *l = &sa->p_subn->prefix_routes_list;
+	cl_list_item_t *i;
+
+	OSM_LOG(sa->p_log, OSM_LOG_VERBOSE, "Non local DGID subnet prefix "
+		"0x%016" PRIx64 "\n", cl_ntoh64(prefix));
+
+	for (i = cl_qlist_head(l); i != cl_qlist_end(l); i = cl_qlist_next(i)) {
+		osm_prefix_route_t *r = (osm_prefix_route_t *)i;
+		if (!r->prefix || r->prefix == prefix) {
+			route = r;
+			break;
+		}
+	}
+	if (!route)
+		return 0;
+
+	if (route->guid == 0) /* first router */
+		rtr = (osm_router_t *) cl_qmap_head(&sa->p_subn->rtr_guid_tbl);
+	else
+		rtr = (osm_router_t *) cl_qmap_get(&sa->p_subn->rtr_guid_tbl,
+						   route->guid);
+
+	if (rtr == (osm_router_t *) cl_qmap_end(&sa->p_subn->rtr_guid_tbl))
+		return 0;
+
+	return osm_port_get_guid(osm_router_get_port_ptr(rtr));
+}
+
 static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 					IN const osm_madw_t * p_madw,
 					OUT const osm_port_t ** pp_src_port,
@@ -1127,8 +1160,6 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 	ib_net64_t dest_guid;
 	ib_api_status_t status;
 	ib_net16_t sa_status = IB_SA_MAD_STATUS_SUCCESS;
-	osm_router_t *p_rtr;
-	osm_port_t *p_rtr_port;
 
 	OSM_LOG_ENTER(sa->p_log);
 
@@ -1209,75 +1240,23 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 		memset(p_dgid, 0, sizeof(*p_dgid));
 
 	if (comp_mask & IB_PR_COMPMASK_DGID) {
-		dest_guid = p_pr->dgid.unicast.interface_id;
-		if (!ib_gid_is_link_local(&p_pr->dgid)) {
-			if (!ib_gid_is_multicast(&p_pr->dgid) &&
-			    ib_gid_get_subnet_prefix(&p_pr->dgid) !=
-			    sa->p_subn->opt.subnet_prefix) {
-				/* Find the router port that is configured to
-				   handle this prefix, if any */
-				osm_prefix_route_t *route = NULL;
-				osm_prefix_route_t *r = (osm_prefix_route_t *)
-				    cl_qlist_head(&sa->p_subn->
-						  prefix_routes_list);
-
-				OSM_LOG(sa->p_log, OSM_LOG_VERBOSE,
-					"Non local DGID subnet prefix 0x%016"
-					PRIx64 "\n",
-					cl_ntoh64(p_pr->dgid.unicast.prefix));
-
-				while (r != (osm_prefix_route_t *)
-				       cl_qlist_end(&sa->p_subn->
-						    prefix_routes_list)) {
-					if (r->prefix ==
-					    p_pr->dgid.unicast.prefix
-					    || r->prefix == 0) {
-						route = r;
-						break;
-					}
-					r = (osm_prefix_route_t *)
-					    cl_qlist_next(&r->list_item);
-				}
-
-				if (!route) {
-					/*
-					   This 'error' is the client's fault (bad gid) so
-					   don't enter it as an error in our own log.
-					   Return an error response to the client.
-					 */
-					sa_status =
-					    IB_SA_MAD_STATUS_INVALID_GID;
-					goto Exit;
-				} else if (route->guid == 0) {
-					/* first router */
-					p_rtr = (osm_router_t *)
-					    cl_qmap_head(&sa->
-							 p_subn->rtr_guid_tbl);
-				} else {
-					p_rtr = (osm_router_t *)
-					    cl_qmap_get(&sa->p_subn->
-							rtr_guid_tbl,
-							route->guid);
-				}
-
-				if (p_rtr ==
-				    (osm_router_t *) cl_qmap_end(&sa->p_subn->
-								 rtr_guid_tbl))
-				{
-					OSM_LOG(sa->p_log, OSM_LOG_ERROR,
-						"ERR 1F22: "
-						"Off subnet DGID but router not found\n");
-					sa_status =
-					    IB_SA_MAD_STATUS_INVALID_GID;
-					goto Exit;
-				}
-
-				p_rtr_port = osm_router_get_port_ptr(p_rtr);
-				dest_guid = osm_port_get_guid(p_rtr_port);
-				if (p_dgid)
-					*p_dgid = p_pr->dgid;
+		if (!ib_gid_is_link_local(&p_pr->dgid) &&
+		    !ib_gid_is_multicast(&p_pr->dgid) &&
+		    ib_gid_get_subnet_prefix(&p_pr->dgid) !=
+		    sa->p_subn->opt.subnet_prefix) {
+			dest_guid = find_router(sa, p_pr->dgid.unicast.prefix);
+			if (!dest_guid) {
+				char gid_str[INET6_ADDRSTRLEN];
+				OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 1F22: "
+					"Off subnet DGID %s, but router not "
+					"found\n",
+					inet_ntop(AF_INET6, p_pr->dgid.raw,
+						  gid_str, sizeof(gid_str)));
+				sa_status = IB_SA_MAD_STATUS_INVALID_GID;
+				goto Exit;
 			}
-		}
+		} else
+			dest_guid = p_pr->dgid.unicast.interface_id;
 
 		*pp_dest_port = osm_get_port_by_guid(sa->p_subn, dest_guid);
 		if (!*pp_dest_port) {
@@ -1293,6 +1272,9 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 			sa_status = IB_SA_MAD_STATUS_INVALID_GID;
 			goto Exit;
 		}
+
+		if (p_dgid)
+			*p_dgid = p_pr->dgid;
 	} else {
 		*pp_dest_port = 0;
 		if (comp_mask & IB_PR_COMPMASK_DLID) {
Signature · 6 lines
1.6.5.rc1

--
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
#4 lore raw

Re: [PATCH] opensm/osm_sa_path_record.c: separate router guid resolution code

T24gU2F0LCBPY3QgMywgMjAwOSBhdCA4OjE5IFBNLCBTYXNoYSBLaGFweW9yc2t5IDxzYXNoYWtA dm9sdGFpcmUuY29tPiB3cm90ZToKPgo+IE1vdmUgb2ZmIHN1Ym5ldCBkZXN0aW5hdGlvbiAocm91 dGVyIGFkZHJlc3MpIHJlc29sdXRpb24gY29kZSB0byBzZXBhcmF0ZQo+IGZ1bmN0aW9uIHRvIGlt cHJvdmUgcmVhZGFiaWxpdHkuCj4KPiBTaWduZWQtb2ZmLWJ5OiBTYXNoYSBLaGFweW9yc2t5IDxz YXNoYWtAdm9sdGFpcmUuY29tPgo+IC0tLQo+IMKgb3BlbnNtL29wZW5zbS9vc21fc2FfcGF0aF9y ZWNvcmQuYyB8IMKgMTIyICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gwqAx IGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDcwIGRlbGV0aW9ucygtKQo+Cj4gZGlm ZiAtLWdpdCBhL29wZW5zbS9vcGVuc20vb3NtX3NhX3BhdGhfcmVjb3JkLmMgYi9vcGVuc20vb3Bl bnNtL29zbV9zYV9wYXRoX3JlY29yZC5jCj4gaW5kZXggYjljNjA1NS4uYzkxYzdhMiAxMDA2NDQK PiAtLS0gYS9vcGVuc20vb3BlbnNtL29zbV9zYV9wYXRoX3JlY29yZC5jCj4gKysrIGIvb3BlbnNt L29wZW5zbS9vc21fc2FfcGF0aF9yZWNvcmQuYwo+IEBAIC0xMTE1LDYgKzExMTUsMzkgQEAgRXhp dDoKPgo+IMKgLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioKPiDCoCoqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCj4gKy8qIEZpbmQgdGhl IHJvdXRlciBwb3J0IHRoYXQgaXMgY29uZmlndXJlZCB0byBoYW5kbGUgdGhpcyBwcmVmaXgsIGlm IGFueSAqLwo+ICtzdGF0aWMgaWJfbmV0NjRfdCBmaW5kX3JvdXRlcihvc21fc2FfdCAqc2EsIGli X25ldDY0X3QgcHJlZml4KQo+ICt7Cj4gKyDCoCDCoCDCoCBvc21fcHJlZml4X3JvdXRlX3QgKnJv dXRlID0gTlVMTDsKPiArIMKgIMKgIMKgIG9zbV9yb3V0ZXJfdCAqcnRyOwo+ICsgwqAgwqAgwqAg Y2xfcWxpc3RfdCAqbCA9ICZzYS0+cF9zdWJuLT5wcmVmaXhfcm91dGVzX2xpc3Q7Cj4gKyDCoCDC oCDCoCBjbF9saXN0X2l0ZW1fdCAqaTsKPiArCj4gKyDCoCDCoCDCoCBPU01fTE9HKHNhLT5wX2xv ZywgT1NNX0xPR19WRVJCT1NFLCAiTm9uIGxvY2FsIERHSUQgc3VibmV0IHByZWZpeCAiCj4gKyDC oCDCoCDCoCDCoCDCoCDCoCDCoCAiMHglMDE2IiBQUkl4NjQgIlxuIiwgY2xfbnRvaDY0KHByZWZp eCkpOwo+ICsKPiArIMKgIMKgIMKgIGZvciAoaSA9IGNsX3FsaXN0X2hlYWQobCk7IGkgIT0gY2xf cWxpc3RfZW5kKGwpOyBpID0gY2xfcWxpc3RfbmV4dChpKSkgewo+ICsgwqAgwqAgwqAgwqAgwqAg wqAgwqAgb3NtX3ByZWZpeF9yb3V0ZV90ICpyID0gKG9zbV9wcmVmaXhfcm91dGVfdCAqKWk7Cj4g KyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAoIXItPnByZWZpeCB8fCByLT5wcmVmaXggPT0gcHJl Zml4KSB7Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCByb3V0ZSA9IHI7Cj4g KyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBicmVhazsKPiArIMKgIMKgIMKgIMKg IMKgIMKgIMKgIH0KPiArIMKgIMKgIMKgIH0KPiArIMKgIMKgIMKgIGlmICghcm91dGUpCj4gKyDC oCDCoCDCoCDCoCDCoCDCoCDCoCByZXR1cm4gMDsKClRoaXMgbWFrZXMgdGhlIGNsaWVudCBlcnJv ciAoYmFkIEdJRCkgbG9nIGFuIGVycm9yIG5vdy4gRG8gd2Ugd2FudCB0bwpwcmVzZXJ2ZSB0aGUg b3JpZ2luYWwgYmVoYXZpb3IgPwoKLS0gSGFsCgo+ICsKPiArIMKgIMKgIMKgIGlmIChyb3V0ZS0+ Z3VpZCA9PSAwKSAvKiBmaXJzdCByb3V0ZXIgKi8KPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJ0 ciA9IChvc21fcm91dGVyX3QgKikgY2xfcW1hcF9oZWFkKCZzYS0+cF9zdWJuLT5ydHJfZ3VpZF90 YmwpOwo+ICsgwqAgwqAgwqAgZWxzZQo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcnRyID0gKG9z bV9yb3V0ZXJfdCAqKSBjbF9xbWFwX2dldCgmc2EtPnBfc3Vibi0+cnRyX2d1aWRfdGJsLAo+ICsg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqByb3V0ZS0+Z3VpZCk7Cj4gKwo+ICsgwqAgwqAgwqAgaWYgKHJ0ciA9 PSAob3NtX3JvdXRlcl90ICopIGNsX3FtYXBfZW5kKCZzYS0+cF9zdWJuLT5ydHJfZ3VpZF90Ymwp KQo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcmV0dXJuIDA7Cj4gKwo+ICsgwqAgwqAgwqAgcmV0 dXJuIG9zbV9wb3J0X2dldF9ndWlkKG9zbV9yb3V0ZXJfZ2V0X3BvcnRfcHRyKHJ0cikpOwo+ICt9 Cj4gKwo+IMKgc3RhdGljIGliX25ldDE2X3QgcHJfcmN2X2dldF9lbmRfcG9pbnRzKElOIG9zbV9z YV90ICogc2EsCj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqBJTiBjb25zdCBvc21fbWFkd190ICogcF9tYWR3LAo+IMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgT1VUIGNvbnN0 IG9zbV9wb3J0X3QgKiogcHBfc3JjX3BvcnQsCj4gQEAgLTExMjcsOCArMTE2MCw2IEBAIHN0YXRp YyBpYl9uZXQxNl90IHByX3Jjdl9nZXRfZW5kX3BvaW50cyhJTiBvc21fc2FfdCAqIHNhLAo+IMKg IMKgIMKgIMKgaWJfbmV0NjRfdCBkZXN0X2d1aWQ7Cj4gwqAgwqAgwqAgwqBpYl9hcGlfc3RhdHVz X3Qgc3RhdHVzOwo+IMKgIMKgIMKgIMKgaWJfbmV0MTZfdCBzYV9zdGF0dXMgPSBJQl9TQV9NQURf U1RBVFVTX1NVQ0NFU1M7Cj4gLSDCoCDCoCDCoCBvc21fcm91dGVyX3QgKnBfcnRyOwo+IC0gwqAg wqAgwqAgb3NtX3BvcnRfdCAqcF9ydHJfcG9ydDsKPgo+IMKgIMKgIMKgIMKgT1NNX0xPR19FTlRF UihzYS0+cF9sb2cpOwo+Cj4gQEAgLTEyMDksNzUgKzEyNDAsMjMgQEAgc3RhdGljIGliX25ldDE2 X3QgcHJfcmN2X2dldF9lbmRfcG9pbnRzKElOIG9zbV9zYV90ICogc2EsCj4gwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqBtZW1zZXQocF9kZ2lkLCAwLCBzaXplb2YoKnBfZGdpZCkpOwo+Cj4gwqAgwqAg wqAgwqBpZiAoY29tcF9tYXNrICYgSUJfUFJfQ09NUE1BU0tfREdJRCkgewo+IC0gwqAgwqAgwqAg wqAgwqAgwqAgwqAgZGVzdF9ndWlkID0gcF9wci0+ZGdpZC51bmljYXN0LmludGVyZmFjZV9pZDsK PiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmICghaWJfZ2lkX2lzX2xpbmtfbG9jYWwoJnBfcHIt PmRnaWQpKSB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAoIWliX2dp ZF9pc19tdWx0aWNhc3QoJnBfcHItPmRnaWQpICYmCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCBpYl9naWRfZ2V0X3N1Ym5ldF9wcmVmaXgoJnBfcHItPmRnaWQpICE9 Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBzYS0+cF9zdWJuLT5v cHQuc3VibmV0X3ByZWZpeCkgewo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgLyogRmluZCB0aGUgcm91dGVyIHBvcnQgdGhhdCBpcyBjb25maWd1cmVkIHRv Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGhh bmRsZSB0aGlzIHByZWZpeCwgaWYgYW55ICovCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCBvc21fcHJlZml4X3JvdXRlX3QgKnJvdXRlID0gTlVMTDsKPiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG9zbV9wcmVmaXhf cm91dGVfdCAqciA9IChvc21fcHJlZml4X3JvdXRlX3QgKikKPiAtIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGNsX3FsaXN0X2hlYWQoJnNhLT5wX3N1 Ym4tPgo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcHJlZml4X3JvdXRlc19saXN0KTsKPiAtCj4gLSDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBPU01fTE9HKHNhLT5wX2xv ZywgT1NNX0xPR19WRVJCT1NFLAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgIk5vbiBsb2NhbCBER0lEIHN1Ym5ldCBwcmVmaXggMHgl MDE2Igo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgUFJJeDY0ICJcbiIsCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBjbF9udG9oNjQocF9wci0+ZGdpZC51bmljYXN0LnBy ZWZpeCkpOwo+IC0KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIHdoaWxlIChyICE9IChvc21fcHJlZml4X3JvdXRlX3QgKikKPiAtIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgY2xfcWxpc3RfZW5kKCZz YS0+cF9zdWJuLT4KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHByZWZpeF9yb3V0ZXNfbGlzdCkpIHsK PiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIGlmIChyLT5wcmVmaXggPT0KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHBfcHItPmRnaWQudW5pY2FzdC5wcmVmaXgK PiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIHx8IHItPnByZWZpeCA9PSAwKSB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCByb3V0ZSA9IHI7 Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCBicmVhazsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIH0KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHIgPSAob3NtX3ByZWZpeF9yb3V0ZV90 ICopCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCBjbF9xbGlzdF9uZXh0KCZyLT5saXN0X2l0ZW0pOwo+IC0gwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgfQo+IC0KPiAtIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmICghcm91dGUpIHsKPiAtIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC8qCj4g LSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoFRoaXMgJ2Vycm9yJyBpcyB0aGUgY2xpZW50J3MgZmF1bHQgKGJhZCBnaWQpIHNvCj4g LSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoGRvbid0IGVudGVyIGl0IGFzIGFuIGVycm9yIGluIG91ciBvd24gbG9nLgo+IC0gwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqBSZXR1cm4gYW4gZXJyb3IgcmVzcG9uc2UgdG8gdGhlIGNsaWVudC4KPiAtIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgKi8KPiAtIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHNh X3N0YXR1cyA9Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCBJQl9TQV9NQURfU1RBVFVTX0lOVkFMSURfR0lEOwo+IC0gwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgZ290 byBFeGl0Owo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg fSBlbHNlIGlmIChyb3V0ZS0+Z3VpZCA9PSAwKSB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAvKiBmaXJzdCByb3V0ZXIgKi8KPiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IHBfcnRyID0gKG9zbV9yb3V0ZXJfdCAqKQo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgY2xfcW1hcF9oZWFkKCZzYS0+Cj4g LSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHBfc3Vibi0+cnRyX2d1aWRfdGJsKTsKPiAtIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIH0gZWxzZSB7Cj4gLSDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBw X3J0ciA9IChvc21fcm91dGVyX3QgKikKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGNsX3FtYXBfZ2V0KCZzYS0+cF9zdWJu LT4KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJ0cl9ndWlkX3RibCwKPiAtIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIHJvdXRlLT5ndWlkKTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIH0KPiAtCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCBpZiAocF9ydHIgPT0KPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIChvc21fcm91dGVyX3QgKikgY2xfcW1hcF9l bmQoJnNhLT5wX3N1Ym4tPgo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqBydHJfZ3VpZF90YmwpKQo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgewo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgT1NNX0xPRyhzYS0+cF9sb2csIE9TTV9MT0dfRVJST1IsCj4gLSDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCAiRVJSIDFGMjI6ICIKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICJPZmYgc3VibmV0IERHSUQgYnV0 IHJvdXRlciBub3QgZm91bmRcbiIpOwo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgc2Ffc3RhdHVzID0KPiAtIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIElCX1NBX01B RF9TVEFUVVNfSU5WQUxJRF9HSUQ7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBnb3RvIEV4aXQ7Cj4gLSDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB9Cj4gLQo+IC0gwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcF9ydHJfcG9ydCA9IG9zbV9yb3V0ZXJfZ2V0X3Bv cnRfcHRyKHBfcnRyKTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIGRlc3RfZ3VpZCA9IG9zbV9wb3J0X2dldF9ndWlkKHBfcnRyX3BvcnQpOwo+IC0gwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKHBfZGdpZCkKPiAt IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg ICpwX2RnaWQgPSBwX3ByLT5kZ2lkOwo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgaWYgKCFpYl9n aWRfaXNfbGlua19sb2NhbCgmcF9wci0+ZGdpZCkgJiYKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgICFpYl9naWRfaXNfbXVsdGljYXN0KCZwX3ByLT5kZ2lkKSAmJgo+ICsgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgaWJfZ2lkX2dldF9zdWJuZXRfcHJlZml4KCZwX3ByLT5kZ2lkKSAh PQo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgc2EtPnBfc3Vibi0+b3B0LnN1Ym5ldF9w cmVmaXgpIHsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGRlc3RfZ3VpZCA9 IGZpbmRfcm91dGVyKHNhLCBwX3ByLT5kZ2lkLnVuaWNhc3QucHJlZml4KTsKPiArIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGlmICghZGVzdF9ndWlkKSB7Cj4gKyDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBjaGFyIGdpZF9zdHJbSU5FVDZfQURE UlNUUkxFTl07Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCBPU01fTE9HKHNhLT5wX2xvZywgT1NNX0xPR19FUlJPUiwgIkVSUiAxRjIyOiAiCj4gKyDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAiT2Zm IHN1Ym5ldCBER0lEICVzLCBidXQgcm91dGVyIG5vdCAiCj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAiZm91bmRcbiIsCj4gKyDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBpbmV0 X250b3AoQUZfSU5FVDYsIHBfcHItPmRnaWQucmF3LAo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgZ2lkX3N0 ciwgc2l6ZW9mKGdpZF9zdHIpKSk7Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCBzYV9zdGF0dXMgPSBJQl9TQV9NQURfU1RBVFVTX0lOVkFMSURfR0lEOwo+ ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgZ290byBFeGl0 Owo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgfQo+IC0gwqAgwqAgwqAgwqAg wqAgwqAgwqAgfQo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgfSBlbHNlCj4gKyDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBkZXN0X2d1aWQgPSBwX3ByLT5kZ2lkLnVuaWNhc3QuaW50 ZXJmYWNlX2lkOwo+Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAqcHBfZGVzdF9wb3J0ID0gb3Nt X2dldF9wb3J0X2J5X2d1aWQoc2EtPnBfc3VibiwgZGVzdF9ndWlkKTsKPiDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoGlmICghKnBwX2Rlc3RfcG9ydCkgewo+IEBAIC0xMjkzLDYgKzEyNzIsOSBAQCBz dGF0aWMgaWJfbmV0MTZfdCBwcl9yY3ZfZ2V0X2VuZF9wb2ludHMoSU4gb3NtX3NhX3QgKiBzYSwK PiDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHNhX3N0YXR1cyA9IElCX1NBX01B RF9TVEFUVVNfSU5WQUxJRF9HSUQ7Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqBnb3RvIEV4aXQ7Cj4gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB9Cj4gKwo+ICsgwqAgwqAgwqAg wqAgwqAgwqAgwqAgaWYgKHBfZGdpZCkKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgICpwX2RnaWQgPSBwX3ByLT5kZ2lkOwo+IMKgIMKgIMKgIMKgfSBlbHNlIHsKPiDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCpwcF9kZXN0X3BvcnQgPSAwOwo+IMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgaWYgKGNvbXBfbWFzayAmIElCX1BSX0NPTVBNQVNLX0RMSUQpIHsKPiAtLQo+IDEuNi41LnJj MQo+Cj4gLS0KPiBUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAi dW5zdWJzY3JpYmUgbGludXgtcmRtYSIgaW4KPiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFq b3Jkb21vQHZnZXIua2VybmVsLm9yZwo+IE1vcmUgbWFqb3Jkb21vIGluZm8gYXQgwqBodHRwOi8v dmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwKPgo=
--
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

A message that is not in the archive (sent off-list or not yet received): f0e08f230910050643j63ce8e81s6d6c9bb35f2fcea5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#6 lore raw

Re: [PATCH] opensm/osm_sa_path_record.c: separate router guid resolution code

Quoted 33 lines · Hal Rosenstock
Quoted 32 lines · Sasha Khapyorsky

Move off subnet destination (router address) resolution code to separate function to improve readability.

---
 opensm/opensm/osm_sa_path_record.c |  122 +++++++++++++++--------------------

 1 files changed, 52 insertions(+), 70 deletions(-)
opensm/opensm/osm_sa_path_record.c +15 -0
index b9c6055..c91c7a2 100644
@@ -1115,6 +1115,39 @@ Exit:
 
  /**********************************************************************
  **********************************************************************/
+/* Find the router port that is configured to handle this prefix, if any */
+static ib_net64_t find_router(osm_sa_t *sa, ib_net64_t prefix)
+{
+       osm_prefix_route_t *route = NULL;
+       osm_router_t *rtr;
+       cl_qlist_t *l = &sa->p_subn->prefix_routes_list;
+       cl_list_item_t *i;
+
+       OSM_LOG(sa->p_log, OSM_LOG_VERBOSE, "Non local DGID subnet prefix "
+               "0x%016" PRIx64 "\n", cl_ntoh64(prefix));
+
+       for (i = cl_qlist_head(l); i != cl_qlist_end(l); i = cl_qlist_next(i)) {
+               osm_prefix_route_t *r = (osm_prefix_route_t *)i;
+               if (!r->prefix || r->prefix == prefix) {
+                       route = r;
Quoted 8 lines

opensm/opensm/osm_sa_path_record.c Exit: · line 1137

Quoted 5 lines
opensm/opensm/osm_sa_path_record.c +5 -0
+                       break;
+               }
+       }
+       if (!route)
+               return 0;

This makes the client error (bad GID) log an error now. Do we want to preserve the original behavior ?

I agree that logging verbosity can be reduced to warning level for such client's error cases.

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

#7 lore raw

PATCH v2 1/1 opensm/osm_sa_path_record.c: separate router guid resolution code

Move off subnet destination (router address) resolution code to separate function to improve readability.

---
v2 changes:
- log router guid resolution failure on VERBOSE level - it is client's failure
- make *sa parameter const for find_router() function

 opensm/opensm/osm_sa_path_record.c |  120 +++++++++++++++---------------------
 1 files changed, 51 insertions(+), 69 deletions(-)
opensm/opensm/osm_sa_path_record.c +51 -69
index b9c6055..f36eb46 100644
@@ -1115,6 +1115,39 @@ Exit:
 
 /**********************************************************************
  **********************************************************************/
+/* Find the router port that is configured to handle this prefix, if any */
+static ib_net64_t find_router(const osm_sa_t *sa, ib_net64_t prefix)
+{
+	osm_prefix_route_t *route = NULL;
+	osm_router_t *rtr;
+	cl_qlist_t *l = &sa->p_subn->prefix_routes_list;
+	cl_list_item_t *i;
+
+	OSM_LOG(sa->p_log, OSM_LOG_VERBOSE, "Non local DGID subnet prefix "
+		"0x%016" PRIx64 "\n", cl_ntoh64(prefix));
+
+	for (i = cl_qlist_head(l); i != cl_qlist_end(l); i = cl_qlist_next(i)) {
+		osm_prefix_route_t *r = (osm_prefix_route_t *)i;
+		if (!r->prefix || r->prefix == prefix) {
+			route = r;
+			break;
+		}
+	}
+	if (!route)
+		return 0;
+
+	if (route->guid == 0) /* first router */
+		rtr = (osm_router_t *) cl_qmap_head(&sa->p_subn->rtr_guid_tbl);
+	else
+		rtr = (osm_router_t *) cl_qmap_get(&sa->p_subn->rtr_guid_tbl,
+						   route->guid);
+
+	if (rtr == (osm_router_t *) cl_qmap_end(&sa->p_subn->rtr_guid_tbl))
+		return 0;
+
+	return osm_port_get_guid(osm_router_get_port_ptr(rtr));
+}
+
 static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 					IN const osm_madw_t * p_madw,
 					OUT const osm_port_t ** pp_src_port,
@@ -1127,8 +1160,6 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 	ib_net64_t dest_guid;
 	ib_api_status_t status;
 	ib_net16_t sa_status = IB_SA_MAD_STATUS_SUCCESS;
-	osm_router_t *p_rtr;
-	osm_port_t *p_rtr_port;
 
 	OSM_LOG_ENTER(sa->p_log);
 
@@ -1209,75 +1240,23 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 		memset(p_dgid, 0, sizeof(*p_dgid));
 
 	if (comp_mask & IB_PR_COMPMASK_DGID) {
-		dest_guid = p_pr->dgid.unicast.interface_id;
-		if (!ib_gid_is_link_local(&p_pr->dgid)) {
-			if (!ib_gid_is_multicast(&p_pr->dgid) &&
-			    ib_gid_get_subnet_prefix(&p_pr->dgid) !=
-			    sa->p_subn->opt.subnet_prefix) {
-				/* Find the router port that is configured to
-				   handle this prefix, if any */
-				osm_prefix_route_t *route = NULL;
-				osm_prefix_route_t *r = (osm_prefix_route_t *)
-				    cl_qlist_head(&sa->p_subn->
-						  prefix_routes_list);
-
+		if (!ib_gid_is_link_local(&p_pr->dgid) &&
+		    !ib_gid_is_multicast(&p_pr->dgid) &&
+		    ib_gid_get_subnet_prefix(&p_pr->dgid) !=
+		    sa->p_subn->opt.subnet_prefix) {
+			dest_guid = find_router(sa, p_pr->dgid.unicast.prefix);
+			if (!dest_guid) {
+				char gid_str[INET6_ADDRSTRLEN];
 				OSM_LOG(sa->p_log, OSM_LOG_VERBOSE,
-					"Non local DGID subnet prefix 0x%016"
-					PRIx64 "\n",
-					cl_ntoh64(p_pr->dgid.unicast.prefix));
-
-				while (r != (osm_prefix_route_t *)
-				       cl_qlist_end(&sa->p_subn->
-						    prefix_routes_list)) {
-					if (r->prefix ==
-					    p_pr->dgid.unicast.prefix
-					    || r->prefix == 0) {
-						route = r;
-						break;
-					}
-					r = (osm_prefix_route_t *)
-					    cl_qlist_next(&r->list_item);
-				}
-
-				if (!route) {
-					/*
-					   This 'error' is the client's fault (bad gid) so
-					   don't enter it as an error in our own log.
-					   Return an error response to the client.
-					 */
-					sa_status =
-					    IB_SA_MAD_STATUS_INVALID_GID;
-					goto Exit;
-				} else if (route->guid == 0) {
-					/* first router */
-					p_rtr = (osm_router_t *)
-					    cl_qmap_head(&sa->
-							 p_subn->rtr_guid_tbl);
-				} else {
-					p_rtr = (osm_router_t *)
-					    cl_qmap_get(&sa->p_subn->
-							rtr_guid_tbl,
-							route->guid);
-				}
-
-				if (p_rtr ==
-				    (osm_router_t *) cl_qmap_end(&sa->p_subn->
-								 rtr_guid_tbl))
-				{
-					OSM_LOG(sa->p_log, OSM_LOG_ERROR,
-						"ERR 1F22: "
-						"Off subnet DGID but router not found\n");
-					sa_status =
-					    IB_SA_MAD_STATUS_INVALID_GID;
-					goto Exit;
-				}
-
-				p_rtr_port = osm_router_get_port_ptr(p_rtr);
-				dest_guid = osm_port_get_guid(p_rtr_port);
-				if (p_dgid)
-					*p_dgid = p_pr->dgid;
+					"Off subnet DGID %s, but router not "
+					"found\n",
+					inet_ntop(AF_INET6, p_pr->dgid.raw,
+						  gid_str, sizeof(gid_str)));
+				sa_status = IB_SA_MAD_STATUS_INVALID_GID;
+				goto Exit;
 			}
-		}
+		} else
+			dest_guid = p_pr->dgid.unicast.interface_id;
 
 		*pp_dest_port = osm_get_port_by_guid(sa->p_subn, dest_guid);
 		if (!*pp_dest_port) {
@@ -1293,6 +1272,9 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
 			sa_status = IB_SA_MAD_STATUS_INVALID_GID;
 			goto Exit;
 		}
+
+		if (p_dgid)
+			*p_dgid = p_pr->dgid;
 	} else {
 		*pp_dest_port = 0;
 		if (comp_mask & IB_PR_COMPMASK_DLID) {
Signature · 6 lines
1.6.5

--
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
#8 lore raw

Re: [PATCH] opensm/osm_sa_path_record.c: separate router guid resolution code

In reply to Sasha Khapyorsky
Quoted 4 lines · Sasha Khapyorsky

Move off subnet destination (router address) resolution code to separate function to improve readability.
...
+static ib_net64_t find_router(osm_sa_t *sa, ib_net64_t prefix)

Much better. The *sa argument to find_router() can even be const.

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

A message that is not in the archive (sent off-list or not yet received): 4ACA3D10.5010909-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org

#10 lore raw

Re: [PATCH] opensm/osm_sa_path_record.c: separate router guid resolution code

Quoted 7 lines · Rolf Manderscheid
Quoted 4 lines · Sasha Khapyorsky

Move off subnet destination (router address) resolution code to separate function to improve readability.
...
+static ib_net64_t find_router(osm_sa_t *sa, ib_net64_t prefix)

Much better. The *sa argument to find_router() can even be const.

Ok. This cannot hurt.

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