Added 2 new method to libibmad:

- mad_rpc_open_port2 - mad_rpc_close_port2 mad_rpc_open_port2 will return a pointer to struct ibmad_ports_pair that holds smi/gsi port items that includes inside the relevant ca name and ibmad_port pointer. Signed-off-by: Asaf Mazor <[email protected]>
linux-rdma · Dec 11, 2024 · ed84a2e · ed84a2e
1 parent 5d15305
commit ed84a2e
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 1 deletion.
diff --git a/debian/libibmad5.symbols b/debian/libibmad5.symbols
@@ -156,3 +156,6 @@ libibmad.so.5 libibmad5 #MINVER#
  smp_set_via@IBMAD_1.3 1.3.11
  str2drpath@IBMAD_1.3 1.3.11
  xdump@IBMAD_1.3 1.3.11
+ mad_rpc_open_port2@IBMAD_1.5 5.55.0
+ mad_rpc_close_port2@IBMAD_1.5 5.55.0
+
diff --git a/libibmad/CMakeLists.txt b/libibmad/CMakeLists.txt
@@ -9,7 +9,7 @@ publish_internal_headers(util
 
 rdma_library(ibmad libibmad.map
   # See Documentation/versioning.md
-  5 5.4.${PACKAGE_VERSION}
+  5 5.5.${PACKAGE_VERSION}
   bm.c
   cc.c
   dump.c

diff --git a/libibmad/libibmad.map b/libibmad/libibmad.map
@@ -161,3 +161,10 @@ IBMAD_1.4 {
 		mad_dump_linkspeedexten2;
 		mad_dump_linkspeedextsup2;
 } IBMAD_1.3;
+
+IBMAD_1.5 {
+	global:
+		mad_rpc_open_port2;
+		mad_rpc_close_port2;
+} IBMAD_1.4;
+
diff --git a/libibmad/mad.h b/libibmad/mad.h
@@ -1408,6 +1408,16 @@ typedef struct ib_bm_call {
 	uint64_t bkey;
 } ib_bm_call_t;
 
+typedef struct ibmad_ports_item {
+	struct ibmad_port *port;
+	char ca_name[20];
+} ibmad_ports_item_t;
+
+struct ibmad_ports_pair {
+	ibmad_ports_item_t smi;
+	ibmad_ports_item_t gsi;
+};
+
 #define IB_MIN_UCAST_LID	1
 #define IB_MAX_UCAST_LID	(0xc000-1)
 #define IB_MIN_MCAST_LID	0xc000
@@ -1483,7 +1493,10 @@ int madrpc_set_retries(int retries);
 int madrpc_set_timeout(int timeout);
 struct ibmad_port *mad_rpc_open_port(char *dev_name, int dev_port,
 				     int *mgmt_classes, int num_classes);
+struct ibmad_ports_pair *mad_rpc_open_port2(char *dev_name, int dev_port,
+				     int *mgmt_classes, int num_classes);
 void mad_rpc_close_port(struct ibmad_port *srcport);
+void mad_rpc_close_port2(struct  ibmad_ports_pair *srcport);
 
 /*
  * On redirection, the dport argument is updated with the redirection target,

diff --git a/libibmad/rpc.c b/libibmad/rpc.c
@@ -436,3 +436,132 @@ void mad_rpc_close_port(struct ibmad_port *port)
 	umad_close_port(port->port_id);
 	free(port);
 }
+
+static int get_smi_gsi_pair(const char *ca_name, int portnum, struct ibmad_ports_pair *ports_pair)
+{
+	struct umad_ca_pair ca_pair;
+	int smi_port_id = -1;
+	int gsi_port_id = -1;
+	int rc = -1;
+	rc = umad_get_smi_gsi_pair_by_ca_name(ca_name, portnum, &ca_pair);
+
+	if (rc < 0) {
+		IBWARN("Can't open UMAD port (%s) (%s:%d)", strerror(-rc), ca_name, portnum);
+		return rc;
+	}
+
+	smi_port_id = umad_open_port(ca_pair.smi_name, ca_pair.smi_preferred_port);
+
+	if (smi_port_id < 0) {
+		IBWARN("Can't open SMI UMAD port (%s) (%s:%d)", strerror(-smi_port_id), ca_pair.smi_name, ca_pair.smi_preferred_port);
+		return smi_port_id;
+	}
+
+	gsi_port_id = umad_open_port(ca_pair.gsi_name, ca_pair.gsi_preferred_port);
+
+	if (gsi_port_id < 0) {
+		IBWARN("Can't open GSI UMAD port (%s) (%s:%d)", strerror(-gsi_port_id), ca_pair.gsi_name, ca_pair.gsi_preferred_port);
+		umad_close_port(smi_port_id);
+		return gsi_port_id;
+	}
+
+	ports_pair->smi.port->port_id = smi_port_id;
+	ports_pair->gsi.port->port_id = gsi_port_id;
+	strncpy(ports_pair->smi.ca_name, ca_pair.smi_name, UMAD_CA_NAME_LEN);
+	strncpy(ports_pair->gsi.ca_name, ca_pair.gsi_name, UMAD_CA_NAME_LEN);
+
+	return 0;
+}
+
+struct ibmad_ports_pair *mad_rpc_open_port2(char *dev_name, int dev_port,
+				     int *mgmt_classes, int num_classes)
+{
+	struct ibmad_port *smi;
+	struct ibmad_port *gsi;
+	struct ibmad_ports_pair *ports_pair;
+	char *debug_level_env;
+
+	if (num_classes >= MAX_CLASS) {
+		IBWARN("too many classes %d requested", num_classes);
+		errno = EINVAL;
+		return NULL;
+	}
+
+	if (umad_init() < 0) {
+		IBWARN("can't init UMAD library");
+		errno = ENODEV;
+		return NULL;
+	}
+
+	debug_level_env = getenv("LIBIBMAD_DEBUG_LEVEL");
+	if (debug_level_env) {
+		ibdebug = atoi(debug_level_env);
+	}
+
+	smi = malloc(sizeof(*smi));
+	if (!smi) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	memset(smi, 0, sizeof(*smi));
+
+	gsi = malloc(sizeof(*gsi));
+	if (!gsi) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	memset(gsi, 0, sizeof(*gsi));
+
+	ports_pair = malloc(sizeof(*ports_pair));
+	if (!ports_pair) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	memset(ports_pair, 0, sizeof(*ports_pair));
+	ports_pair->smi.port = smi;
+	ports_pair->gsi.port = gsi;
+
+	if ((get_smi_gsi_pair(dev_name, dev_port, ports_pair)) < 0) {
+		IBWARN("can't open UMAD port (%s:%d)", dev_name, dev_port);
+		if (!errno)
+			errno = EIO;
+		free(smi);
+		free(gsi);
+		free(ports_pair);
+		return NULL;
+	}
+
+	memset(ports_pair->smi.port->class_agents, 0xff, sizeof ports_pair->smi.port->class_agents);
+	memset(ports_pair->gsi.port->class_agents, 0xff, sizeof ports_pair->gsi.port->class_agents);
+	while (num_classes--) {
+		uint8_t rmpp_version = 0;
+		int mgmt = *mgmt_classes++;
+		struct ibmad_port *p = (mgmt == IB_SMI_CLASS || mgmt == IB_SMI_DIRECT_CLASS) ?
+								ports_pair->smi.port : ports_pair->gsi.port;
+		if (mgmt == IB_SA_CLASS)
+			rmpp_version = 1;
+		if (mgmt < 0 || mgmt >= MAX_CLASS ||
+		    mad_register_client_via(mgmt, rmpp_version, p) < 0) {
+			IBWARN("client_register for mgmt %d failed", mgmt);
+			if (!errno)
+				errno = EINVAL;
+			umad_close_port(ports_pair->smi.port->port_id);
+			umad_close_port(ports_pair->gsi.port->port_id);
+			free(ports_pair->smi.port);
+			free(ports_pair->gsi.port);
+			free(ports_pair);
+			return NULL;
+		}
+	}
+
+	return ports_pair;
+}
+
+void mad_rpc_close_port2(struct ibmad_ports_pair *srcport)
+{
+	umad_close_port(srcport->smi.port->port_id);
+	umad_close_port(srcport->gsi.port->port_id);
+	free(srcport->smi.port);
+	free(srcport->gsi.port);
+	free(srcport);
+}