infiniband-diags/saquery.c: switchinfo support added

From a77cadd4d81ac0e23db836d9382fd642d7e37897 Mon Sep 17 00:00:00 2001
From: Husam kahalah < hkahalah-DMD6N21cJuFWk0Htik3J/[email protected]>
Date: Sun, 3 Feb 2013 14:27:21 +0200
Subject: [PATCH] infiniband-diags/saquery.c: switchinfo support added

Added support in querying SwitchInfoRecords filtered by switch LID

Signed-off-by Husam kahalah < hkahalah-DMD6N21cJuFWk0Htik3J/[email protected]>

---
 src/saquery.c |   61 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 deletions(-)

src/saquery.c +0 -0

index d31d77d..753c7ac 100644

src/saquery.c +48 -0

 };
 
 struct query_cmd {

@@ -481,6 +482,41 @@ static void dump_service_record(void *data)
         cl_ntoh64(p_sr->service_data64[1]));
 }
 
+static void dump_switch_info_record(void *data)
+{
+  ib_switch_info_record_t *p_sir = data;
+
+  printf("SwitchInfoRecord dump:\n"
+        "\t\tRID\n"
+        "\t\tlid.....................%u\n"
+        "\t\tSwitchInfo dump:\n"
+        "\t\tlin_cap.................0x%X\n"
+        "\t\trand_cap................0x%X\n"
+        "\t\tmcast_cap...............0x%X\n"
+        "\t\tlin_top.................0x%X\n"
+        "\t\tdef_port................%u\n"
+        "\t\tdef_mcast_pri_port......%u\n"
+        "\t\tdef_mcast_not_port......%u\n"
+        "\t\tlife_state..............%u\n"
+        "\t\tlids_per_port...........0x%X\n"
+        "\t\tenforce_cap.............0x%X\n"
+        "\t\tflags...................%u\n"
+        "\t\tmcast_top...............0x%X\n",
+        cl_ntoh16(p_sir->lid),
+        cl_ntoh16(p_sir->switch_info.lin_cap),
+        cl_ntoh16(p_sir->switch_info.rand_cap),
+        cl_ntoh16(p_sir->switch_info.mcast_cap),
+        cl_ntoh16(p_sir->switch_info.lin_top),
+        p_sir->switch_info.def_port,
+        p_sir->switch_info.def_mcast_pri_port,
+        p_sir->switch_info.def_mcast_not_port,
+        p_sir->switch_info.life_state,
+        cl_ntoh16(p_sir->switch_info.lids_per_port),
+        cl_ntoh16(p_sir->switch_info.enforce_cap),
+        p_sir->switch_info.flags,
+        cl_ntoh16(p_sir->switch_info.mcast_top));
+}
+
 static void dump_inform_info_record(void *data)
 {
  char gid_str[INET6_ADDRSTRLEN];

@@ -1090,6 +1126,19 @@ static int query_node_records(const struct query_cmd 
 *q, struct sa_handle * h,
   &nr, sizeof(nr), dump_node_record);
 }
 
+static int query_switchinfo_records(const struct query_cmd *q,
+ struct sa_handle * h, struct query_params *p,
+ int argc, char *argv[])
+{
+  ib_switch_info_record_t swir;
+ ib_net64_t comp_mask = 0;
+
+  memset(&swir, 0, sizeof(swir));
+  CHECK_AND_SET_VAL(p->swir_lid, 16, 0, swir.lid, SWIR, LID);
+ return get_and_dump_any_records(h, IB_SA_ATTR_SWITCHINFORECORD, 0, 
 comp_mask,
+ &swir, 0, dump_switch_info_record);
+}
+
 static int query_portinfo_records(const struct query_cmd *q,

struct sa_handle * h, struct query_params *p,
int argc, char *argv[])

src/saquery.c +0 -0

   default:
  return -1;

  }

src/saquery.c +1 -0

@@ -1584,6 +1641,7 @@ int main(int argc, char **argv)
   {"x", 'x', 0, NULL, "get LinkRecord info"},
   {"c", 'c', 0, NULL, "get the SA's class port info"},
   {"S", 'S', 0, NULL, "get ServiceRecord info"},
+  {"W", 'W', 0, NULL, "get SwitchInfoRecord"},
   {"I", 'I', 0, NULL, "get InformInfoRecord (subscription) info"},
   {"list", 'D', 0, NULL, "the node desc of the CA's"},
   {"src-to-dst", 1, 1, "<src:dst>", "get a PathRecord for"

src/saquery.c +0 -0

   {0}
   };
 

Signature · 1 line

1.7.1

Quoted 1 line

+ ib_net16_t swir_lid;

We don't need this field or lid option. Other records simply have an optional parameter to specify the lid.

The usage should be:

SwitchRecord [lid]

Thank you for your time, I have the following notes:
I plan to add support for more records other than switchInfoRecord like smInfo, multipath, nodeInfo

I plan also to add component filter to those records attributes in the same way that pathInfo and MCR were implemented, this is the reason why I started adding attributes to query_params structure
I'am not talking about RID(record identifier) attributes only, but also about other attributes that may differ between records.
If it is available to add to query_params structure in that way let me know , otherwise I will add just RID attributes in the suggested way.

-----Original Message-----
From: Ira Weiny <[email protected]>
To: Ira Weiny <[email protected]>
Cc: "Husam Kahalah" <HKahalah-DMD6N21cJuFWk0Htik3J/[email protected]>, [email protected], [email protected]
Date: Thu, 21 Feb 2013 10:33:44 -0800
Subject: Re: [PATCH] infiniband-diags/saquery.c: switchinfo support added

On Thu, 21 Feb 2013 10:09:00 -0800
Ira Weiny <[email protected]> wrote:

[snip]

Quoted 3 lines

Quoted 1 line

+ ib_net16_t swir_lid;

We don't need this field or lid option. Other records simply have an

optional parameter to specify the lid.

Quoted 5 lines

The usage should be:

SwitchRecord [lid]

Sorry I meant "SwitchInfoRecord" or SWIR.

Ira

[snip]
--
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