Obtains a response to the get path record!

4 files changed, 214 insertions, 16 deletions

diff --git a/src/drivers/net/ipoib.c b/src/drivers/net/ipoib.c
index 2d351e4b..a848b711 100644
--- a/src/drivers/net/ipoib.c
+++ b/src/drivers/net/ipoib.c
@@ -44,15 +44,24 @@ extern struct ib_address_vector hack_ipoib_bcast_av;
 /** IPoIB MTU */
 #define IPOIB_MTU 2048
 
-/** Number of IPoIB send work queue entries */
+/** Number of IPoIB data send work queue entries */
 #define IPOIB_DATA_NUM_SEND_WQES 4
 
-/** Number of IPoIB receive work queue entries */
-#define IPOIB_DATA_NUM_RECV_WQES 8
+/** Number of IPoIB data receive work queue entries */
+#define IPOIB_DATA_NUM_RECV_WQES 4
 
-/** Number of IPoIB completion entries */
+/** Number of IPoIB data completion entries */
 #define IPOIB_DATA_NUM_CQES 8
 
+/** Number of IPoIB metadata send work queue entries */
+#define IPOIB_META_NUM_SEND_WQES 4
+
+/** Number of IPoIB metadata receive work queue entries */
+#define IPOIB_META_NUM_RECV_WQES 4
+
+/** Number of IPoIB metadata completion entries */
+#define IPOIB_META_NUM_CQES 8
+
 /** An IPoIB queue set */
 struct ipoib_queue_set {
 	/** Completion queue */
@@ -84,10 +93,15 @@ struct ipoib_device {
  ****************************************************************************
  */
 
+/** Broadcast QPN used in IPoIB MAC addresses
+ *
+ * This is a guaranteed invalid real QPN
+ */
+#define IPOIB_BROADCAST_QPN 0xffffffffUL
+
 /** Broadcast IPoIB address */
 static struct ipoib_mac ipoib_broadcast = {
-	.gid = { { 0xff, 0x12, 0x40, 0x1b, 0x00, 0x00, 0x00, 0x00,
-		   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff } },
+	.qpn = ntohl ( IPOIB_BROADCAST_QPN ),
 };
 
 /**
@@ -245,6 +259,73 @@ static int ipoib_create_qset ( struct ipoib_device *ipoib,
 }
 
 /**
+ * Transmit path record request
+ *
+ * @v ipoib		IPoIB device
+ * @v gid		Destination GID
+ * @ret rc		Return status code
+ */
+static int ipoib_get_path_record ( struct ipoib_device *ipoib,
+				   struct ib_gid *gid ) {
+	struct ib_device *ibdev = ipoib->ibdev;
+	struct io_buffer *iobuf;
+	struct ib_mad_path_record *path_record;
+	struct ib_address_vector av;
+ 	static uint32_t tid = 0;
+	int rc;
+
+	DBG ( "get_path_record():\n" );
+	int get_path_record(struct ib_gid *dgid, uint16_t *dlid_p,
+			    uint8_t *sl_p, uint8_t *rate_p);
+	uint16_t tmp_dlid;
+	uint8_t tmp_sl;
+	uint8_t tmp_rate;
+	get_path_record ( gid, &tmp_dlid, &tmp_sl, &tmp_rate );
+
+	DBG ( "ipoib_get_path_record():\n" );
+
+	/* Allocate I/O buffer */
+	iobuf = alloc_iob ( sizeof ( *path_record ) );
+	if ( ! iobuf )
+		return -ENOMEM;
+	iob_put ( iobuf, sizeof ( *path_record ) );
+	path_record = iobuf->data;
+	memset ( path_record, 0, sizeof ( *path_record ) );
+
+	/* Construct path record request */
+	path_record->mad_hdr.base_version = IB_MGMT_BASE_VERSION;
+	path_record->mad_hdr.mgmt_class = IB_MGMT_CLASS_SUBN_ADM;
+	path_record->mad_hdr.class_version = 2;
+	path_record->mad_hdr.method = IB_MGMT_METHOD_GET;
+	path_record->mad_hdr.attr_id = htons ( IB_SA_ATTR_PATH_REC );
+	path_record->mad_hdr.tid = tid++;
+	path_record->sa_hdr.comp_mask[1] =
+		htonl ( IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID );
+	memcpy ( &path_record->dgid, gid, sizeof ( path_record->dgid ) );
+	memcpy ( &path_record->sgid, &ibdev->port_gid,
+		 sizeof ( path_record->sgid ) );
+
+	DBG_HD ( path_record, sizeof ( *path_record ) );
+
+	/* Construct address vector */
+	memset ( &av, 0, sizeof ( av ) );
+	av.dlid = ibdev->sm_lid;
+	av.dest_qp = IB_SA_QPN;
+	av.qkey = IB_SA_QKEY;
+
+	/* Post send request */
+	if ( ( rc = ib_post_send ( ibdev, ipoib->meta.qp, &av,
+				   iobuf ) ) != 0 ) {
+		DBGC ( ipoib, "IPoIB %p could not send get path record: %s\n",
+		       ipoib, strerror ( rc ) );
+		free_iob ( iobuf );
+		return rc;
+	}
+
+	return 0;
+}
+
+/**
  * Transmit packet via IPoIB network device
  *
  * @v netdev		Network device
@@ -256,19 +337,29 @@ static int ipoib_transmit ( struct net_device *netdev,
 	struct ipoib_device *ipoib = netdev->priv;
 	struct ib_device *ibdev = ipoib->ibdev;
 	struct ipoib_pseudo_hdr *ipoib_pshdr = iobuf->data;
+	int rc;
 
 	if ( iob_len ( iobuf ) < sizeof ( *ipoib_pshdr ) ) {
 		DBGC ( ipoib, "IPoIB %p buffer too short\n", ipoib );
 		return -EINVAL;
 	}
 
+	DBG ( "TX pseudo-header:\n" );
+	DBG_HD ( ipoib_pshdr, sizeof ( *ipoib_pshdr ) );
+	if ( ipoib_pshdr->peer.qpn != htonl ( IPOIB_BROADCAST_QPN ) ) {
+		DBG ( "Get path record\n" );
+		rc = ipoib_get_path_record ( ipoib, &ipoib_pshdr->peer.gid );
+		free_iob ( iobuf );
+		return 0;
+	}
+
 	iob_pull ( iobuf, ( sizeof ( *ipoib_pshdr ) ) );
 	return ib_post_send ( ibdev, ipoib->data.qp,
 			      &hack_ipoib_bcast_av, iobuf );
 }
 
 /**
- * Handle IPoIB send completion
+ * Handle IPoIB data send completion
  *
  * @v ibdev		Infiniband device
  * @v qp		Queue pair
@@ -286,7 +377,7 @@ static void ipoib_data_complete_send ( struct ib_device *ibdev __unused,
 }
 
 /**
- * Handle IPoIB receive completion
+ * Handle IPoIB data receive completion
  *
  * @v ibdev		Infiniband device
  * @v qp		Queue pair
@@ -316,6 +407,61 @@ static void ipoib_data_complete_recv ( struct ib_device *ibdev __unused,
 }
 
 /**
+ * Handle IPoIB metadata send completion
+ *
+ * @v ibdev		Infiniband device
+ * @v qp		Queue pair
+ * @v completion	Completion
+ * @v iobuf		I/O buffer
+ */
+static void ipoib_meta_complete_send ( struct ib_device *ibdev __unused,
+				       struct ib_queue_pair *qp,
+				       struct ib_completion *completion,
+				       struct io_buffer *iobuf ) {
+	struct net_device *netdev = qp->owner_priv;
+	struct ipoib_device *ipoib = netdev->priv;
+
+	DBG ( "Woohoo! METADATA TX completion\n" );
+
+
+	if ( completion->syndrome ) {
+		DBGC ( ipoib, "IPoIB %p metadata TX completion error %x\n",
+		       ipoib, completion->syndrome );
+	}
+	free_iob ( iobuf );
+}
+
+/**
+ * Handle IPoIB metadata receive completion
+ *
+ * @v ibdev		Infiniband device
+ * @v qp		Queue pair
+ * @v completion	Completion
+ * @v iobuf		I/O buffer
+ */
+static void ipoib_meta_complete_recv ( struct ib_device *ibdev __unused,
+				       struct ib_queue_pair *qp,
+				       struct ib_completion *completion,
+				       struct io_buffer *iobuf ) {
+	struct net_device *netdev = qp->owner_priv;
+	struct ipoib_device *ipoib = netdev->priv;
+
+	DBG ( "***************** META TX!!!!!! ********\n" );
+
+	if ( completion->syndrome ) {
+		DBGC ( ipoib, "IPoIB %p metadata RX completion error %x\n",
+		       ipoib, completion->syndrome );
+	} else {
+		iob_put ( iobuf, completion->len );
+		DBG ( "Metadata RX:\n" );
+		DBG_HD ( iobuf->data, iob_len ( iobuf ) );
+	}
+
+	ipoib->meta.recv_fill--;
+	free_iob ( iobuf );
+}
+
+/**
  * Refill IPoIB receive ring
  *
  * @v ipoib		IPoIB device
@@ -349,6 +495,9 @@ static void ipoib_poll ( struct net_device *netdev ) {
 
 	ib_poll_cq ( ibdev, ipoib->data.cq, ipoib_data_complete_send,
 		     ipoib_data_complete_recv );
+	ib_poll_cq ( ibdev, ipoib->meta.cq, ipoib_meta_complete_send,
+		     ipoib_meta_complete_recv );
+	ipoib_refill_recv ( ipoib, &ipoib->meta );
 	ipoib_refill_recv ( ipoib, &ipoib->data );
 }
 
@@ -382,7 +531,8 @@ static int ipoib_open ( struct net_device *netdev ) {
 		return rc;
 	}
 
-	/* Fill receive ring */
+	/* Fill receive rings */
+	ipoib_refill_recv ( ipoib, &ipoib->meta );
 	ipoib_refill_recv ( ipoib, &ipoib->data );
 
 	return 0;
@@ -436,6 +586,17 @@ int ipoib_probe ( struct ib_device *ibdev ) {
 	ipoib->netdev = netdev;
 	ipoib->ibdev = ibdev;
 
+	/* Allocate metadata queue set */
+	if ( ( rc = ipoib_create_qset ( ipoib, &ipoib->meta,
+					IPOIB_META_NUM_CQES,
+					IPOIB_META_NUM_SEND_WQES,
+					IPOIB_META_NUM_RECV_WQES,
+					IB_SA_QKEY ) ) != 0 ) {
+		DBGC ( ipoib, "IPoIB %p could not allocate metadata QP: %s\n",
+		       ipoib, strerror ( rc ) );
+		goto err_create_meta_qset;
+	}
+
 	/* Allocate data queue set */
 	if ( ( rc = ipoib_create_qset ( ipoib, &ipoib->data,
 					IPOIB_DATA_NUM_CQES,
@@ -461,6 +622,8 @@ int ipoib_probe ( struct ib_device *ibdev ) {
  err_register_netdev:
 	ipoib_destroy_qset ( ipoib, &ipoib->data );
  err_create_data_qset:
+	ipoib_destroy_qset ( ipoib, &ipoib->meta );
+ err_create_meta_qset:
 	netdev_nullify ( netdev );
 	netdev_put ( netdev );
 	return rc;
diff --git a/src/drivers/net/mlx_ipoib/ib_mad.c b/src/drivers/net/mlx_ipoib/ib_mad.c
index 73b49f20..4da4677b 100644
--- a/src/drivers/net/mlx_ipoib/ib_mad.c
+++ b/src/drivers/net/mlx_ipoib/ib_mad.c
@@ -264,7 +264,7 @@ static int join_mc_group(__u32 * qkey_p, __u16 * mlid_p, __u8 join)
 	return is_good ? 0 : -1;
 }
 
-static int get_path_record(union ib_gid_u *dgid, __u16 * dlid_p, u8 * sl_p,
+int get_path_record(union ib_gid_u *dgid, __u16 * dlid_p, u8 * sl_p,
 			   u8 * rate_p)
 {
 	struct path_record_mad_st *mad, *rcv_mad;
@@ -321,6 +321,9 @@ static int get_path_record(union ib_gid_u *dgid, __u16 * dlid_p, u8 * sl_p,
 	cpu_to_be_buf(mad, sizeof *mad);
 	memcpy(mad->path_record.sgid.raw, ib_data.port_gid.raw, 16);
 
+	DBG ( "data:\n" );
+	DBG_HD ( mad, sizeof ( *mad ) );
+
 	rc = post_send_req(qp, snd_wqe, 1);
 	if (rc) {
 		eprintf("");
diff --git a/src/drivers/net/mlx_ipoib/ib_mad.h b/src/drivers/net/mlx_ipoib/ib_mad.h
index 5ffb5404..51b90d21 100644
--- a/src/drivers/net/mlx_ipoib/ib_mad.h
+++ b/src/drivers/net/mlx_ipoib/ib_mad.h
@@ -104,7 +104,7 @@ union mad_u {
 	struct ib_mad_st mad;
 } __attribute__ ((packed));
 
-static int get_path_record(union ib_gid_u *dgid, __u16 * dlid_p, __u8 * sl_p,
+int get_path_record(union ib_gid_u *dgid, __u16 * dlid_p, __u8 * sl_p,
 			   __u8 * rate_p);
 
 #endif				/* __ib_mad_h__ */
diff --git a/src/drivers/net/mlx_ipoib/mt25218.c b/src/drivers/net/mlx_ipoib/mt25218.c
index 08207819..fb98d543 100644
--- a/src/drivers/net/mlx_ipoib/mt25218.c
+++ b/src/drivers/net/mlx_ipoib/mt25218.c
@@ -174,8 +174,8 @@ static int arbel_cmd ( struct arbel *arbel, unsigned long command,
 		size_t dump_len = in_len;
 		if ( dump_len > 256 )
 			dump_len = 256;
-		DBG ( "Input:\n" );
-		DBG_HD ( in, dump_len );
+		//		DBG ( "Input:\n" );
+		//		DBG_HD ( in, dump_len );
 	}
 
 	/* Issue command */
@@ -212,8 +212,8 @@ static int arbel_cmd ( struct arbel *arbel, unsigned long command,
 		size_t dump_len = out_len;
 		if ( dump_len > 256 )
 			dump_len = 256;
-		DBG ( "Output:\n" );
-		DBG_HD ( out, dump_len );
+		//		DBG ( "Output:\n" );
+		//		DBG_HD ( out, dump_len );
 	}
 
 	return 0;
@@ -749,7 +749,7 @@ static void arbel_ring_doorbell ( struct arbel *arbel,
 
 /** GID used for GID-less send work queue entries */
 static const struct ib_gid arbel_no_gid = {
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 }
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0 }
 };
 
 /**
@@ -805,6 +805,14 @@ static int arbel_post_send ( struct ib_device *ibdev,
 	MLX_FILL_1 ( &wqe->ud, 3, ud_address_vector.sl, av->sl );
 	gid = ( av->gid_present ? &av->gid : &arbel_no_gid );
 	memcpy ( &wqe->ud.u.dwords[4], gid, sizeof ( *gid ) );
+	
+	if ( ! av->gid_present ) {
+		DBG ( "no_gid:\n" );
+		DBG_HD ( &arbel_no_gid, sizeof ( arbel_no_gid ) );
+		DBG ( "gid:\n" );
+		DBG_HD ( &wqe->ud.u.dwords[4], 16 );
+	}
+	
 	MLX_FILL_1 ( &wqe->ud, 8, destination_qp, av->dest_qp );
 	MLX_FILL_1 ( &wqe->ud, 9, q_key, av->qkey );
 	MLX_FILL_1 ( &wqe->data[0], 0, byte_count, iob_len ( iobuf ) );
@@ -821,6 +829,11 @@ static int arbel_post_send ( struct ib_device *ibdev,
 		     f, 1,
 		     always1, 1 );
 
+
+	DBG ( "arbel_post_send()\n" );
+	DBG_HD ( wqe, sizeof ( *wqe ) );
+
+
 	/* Update doorbell record */
 	barrier();
 	qp_db_rec = &arbel->db_rec[arbel_send_wq->doorbell_idx].qp;
@@ -1248,6 +1261,17 @@ static int arbel_get_port_gid ( struct arbel *arbel,
 	return 0;
 }
 
+static int arbel_get_sm_lid ( struct arbel *arbel,
+			      unsigned long *sm_lid ) {
+	struct ib_mad_port_info port_info;
+	int rc;
+
+	if ( ( rc = arbel_get_port_info ( arbel, &port_info ) ) != 0 )
+		return rc;
+	*sm_lid = ntohs ( port_info.mastersm_lid );
+	return 0;
+}
+
 static int arbel_get_broadcast_gid ( struct arbel *arbel,
 				     struct ib_gid *broadcast_gid ) {
 	static const struct ib_gid ipv4_broadcast_gid = {
@@ -1323,6 +1347,13 @@ static int arbel_probe ( struct pci_device *pci,
 	arbel->limits.reserved_qps =
 		( 1 << MLX_GET ( &dev_lim, log2_rsvd_qps ) );
 
+	/* Get subnet manager LID */
+	if ( ( rc = arbel_get_sm_lid ( arbel, &ibdev->sm_lid ) ) != 0 ) {
+		DBGC ( arbel, "Arbel %p could not determine subnet manager "
+		       "LID: %s\n", arbel, strerror ( rc ) );
+		goto err_get_sm_lid;
+	}
+
 	/* Get port GID */
 	if ( ( rc = arbel_get_port_gid ( arbel, &ibdev->port_gid ) ) != 0 ) {
 		DBGC ( arbel, "Arbel %p could not determine port GID: %s\n",
@@ -1362,6 +1393,7 @@ static int arbel_probe ( struct pci_device *pci,
  err_ipoib_probe:
  err_get_broadcast_gid:
  err_get_port_gid:
+ err_get_sm_lid:
  err_query_dev_lim:
 	ib_driver_close ( 0 );
  err_ib_driver_init: