[openib-general] [PATCH 2/2] OpenSM/osm_sa_mcmember_record.c: Add NodeDescription to mcast group join error messages

[Hal Rosenstock]

OpenSM/osm_sa_mcmember_record.c: Add NodeDescription to mcast group join
error messages

Signed-off-by: Ira K. Weiny <weiny2 at llnl.gov>
Signed-off-by: Hal Rosenstock <halr at voltaire.com>

diff --git a/osm/opensm/osm_sa_mcmember_record.c b/osm/opensm/osm_sa_mcmember_record.c
index 2c55198..62d00ac 100644
--- a/osm/opensm/osm_sa_mcmember_record.c
+++ b/osm/opensm/osm_sa_mcmember_record.c
@@ -1610,9 +1610,11 @@ __osm_mcmr_rcv_join_mgrp(
                "__osm_mcmr_rcv_join_mgrp: ERR 1B10: "
                "Provided Join State != FullMember - required for create, "
                "MGID: 0x%016" PRIx64 " : "
-               "0x%016" PRIx64 "\n",
+               "0x%016" PRIx64 " from port 0x%016" PRIx64 " (%s)\n",
                cl_ntoh64( p_recvd_mcmember_rec->mgid.unicast.prefix ),
-               cl_ntoh64( p_recvd_mcmember_rec->mgid.unicast.interface_id ) );
+               cl_ntoh64( p_recvd_mcmember_rec->mgid.unicast.interface_id ),
+               cl_ntoh64( portguid ),
+               p_port->p_node->print_desc);
       sa_status = IB_SA_MAD_STATUS_REQ_INVALID;
       osm_sa_send_error( p_rcv->p_resp, p_madw, sa_status );
       goto Exit;
@@ -1649,14 +1651,15 @@ __osm_mcmr_rcv_join_mgrp(
                "component mask = 0x%016" PRIx64 ", "
                "expected comp mask = 0x%016" PRIx64 ", "
                "MGID: 0x%016" PRIx64 " : "
-               "0x%016" PRIx64 " from port 0x%016" PRIx64 "\n",
+               "0x%016" PRIx64 " from port 0x%016" PRIx64 " (%s)\n",
                ib_get_sa_method_str(p_sa_mad->method),
                p_recvd_mcmember_rec->scope_state,
                cl_ntoh64(p_sa_mad->comp_mask),
                CL_NTOH64(REQUIRED_MC_CREATE_COMP_MASK),
                cl_ntoh64( p_recvd_mcmember_rec->mgid.unicast.prefix ),
                cl_ntoh64( p_recvd_mcmember_rec->mgid.unicast.interface_id ),
-               cl_ntoh64( portguid ) );
+               cl_ntoh64( portguid ),
+               p_port->p_node->print_desc);
 
       sa_status = IB_SA_MAD_STATUS_INSUF_COMPS;
       osm_sa_send_error( p_rcv->p_resp, p_madw, sa_status );
@@ -1713,9 +1716,10 @@ __osm_mcmr_rcv_join_mgrp(
     osm_log( p_rcv->p_log, OSM_LOG_ERROR,
              "__osm_mcmr_rcv_join_mgrp: ERR 1B12: "
              "__validate_more_comp_fields, __validate_port_caps, "
-             "or JoinState = 0 failed from port 0x%016" PRIx64 ", "
+             "or JoinState = 0 failed from port 0x%016" PRIx64 " (%s), "
              "sending IB_SA_MAD_STATUS_REQ_INVALID\n",
-             cl_ntoh64( portguid ) );
+             cl_ntoh64( portguid ),
+             p_port->p_node->print_desc);
 
     sa_status = IB_SA_MAD_STATUS_REQ_INVALID;
     osm_sa_send_error( p_rcv->p_resp, p_madw, sa_status );
@@ -1742,8 +1746,10 @@ __osm_mcmr_rcv_join_mgrp(
 
       osm_log( p_rcv->p_log, OSM_LOG_ERROR,
                "__osm_mcmr_rcv_join_mgrp: ERR 1B13: "
-               "__validate_modify failed, "
-               "sending IB_SA_MAD_STATUS_REQ_INVALID\n" );
+               "__validate_modify failed from port 0x%016" PRIx64 " (%s), "
+               "sending IB_SA_MAD_STATUS_REQ_INVALID\n",
+               cl_ntoh64( portguid ),
+               p_port->p_node->print_desc);
 
       sa_status = IB_SA_MAD_STATUS_REQ_INVALID;
       osm_sa_send_error( p_rcv->p_resp, p_madw, sa_status );
@@ -1794,8 +1800,10 @@ __osm_mcmr_rcv_join_mgrp(
   {
     osm_log( p_rcv->p_log, OSM_LOG_ERROR,
              "__osm_mcmr_rcv_join_mgrp: ERR 1B14: "
-             "osm_sm_mcgrp_join failed, "
-             "sending IB_SA_MAD_STATUS_NO_RESOURCES\n" );
+             "osm_sm_mcgrp_join failed from port 0x%016" PRIx64 " (%s), "
+             "sending IB_SA_MAD_STATUS_NO_RESOURCES\n",
+             cl_ntoh64( portguid ),
+             p_port->p_node->print_desc);
 
     CL_PLOCK_EXCL_ACQUIRE(p_rcv->p_lock);