diff options
author | Michael Brown | 2016-03-08 10:54:42 +0100 |
---|---|---|
committer | Michael Brown | 2016-03-08 13:23:30 +0100 |
commit | 14ad9cbd6713daa10e473f6dfffad4d5373beadf (patch) | |
tree | a2404498fc5e9f28983d4cf13a5c27abda2c723f /src/net/infiniband | |
parent | [infiniband] Record multicast GID attachment as part of group membership (diff) | |
download | ipxe-14ad9cbd6713daa10e473f6dfffad4d5373beadf.tar.gz ipxe-14ad9cbd6713daa10e473f6dfffad4d5373beadf.tar.xz ipxe-14ad9cbd6713daa10e473f6dfffad4d5373beadf.zip |
[infiniband] Parse MLID, rate, and SL from multicast membership record
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net/infiniband')
-rw-r--r-- | src/net/infiniband/ib_mcast.c | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/src/net/infiniband/ib_mcast.c b/src/net/infiniband/ib_mcast.c index 3a055908..6f904331 100644 --- a/src/net/infiniband/ib_mcast.c +++ b/src/net/infiniband/ib_mcast.c @@ -42,11 +42,12 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); * Generate multicast membership MAD * * @v ibdev Infiniband device - * @v gid Multicast GID + * @v av Address vector * @v join Join (rather than leave) group * @v mad MAD to fill in */ -static void ib_mcast_mad ( struct ib_device *ibdev, union ib_gid *gid, +static void ib_mcast_mad ( struct ib_device *ibdev, + struct ib_address_vector *av, int join, union ib_mad *mad ) { struct ib_mad_sa *sa = &mad->sa; @@ -61,7 +62,7 @@ static void ib_mcast_mad ( struct ib_device *ibdev, union ib_gid *gid, htonl ( IB_SA_MCMEMBER_REC_MGID | IB_SA_MCMEMBER_REC_PORT_GID | IB_SA_MCMEMBER_REC_JOIN_STATE ); sa->sa_data.mc_member_record.scope__join_state = 1; - memcpy ( &sa->sa_data.mc_member_record.mgid, gid, + memcpy ( &sa->sa_data.mc_member_record.mgid, &av->gid, sizeof ( sa->sa_data.mc_member_record.mgid ) ); memcpy ( &sa->sa_data.mc_member_record.port_gid, &ibdev->gid, sizeof ( sa->sa_data.mc_member_record.port_gid ) ); @@ -75,20 +76,19 @@ static void ib_mcast_mad ( struct ib_device *ibdev, union ib_gid *gid, * @v madx Management transaction * @v rc Status code * @v mad Received MAD (or NULL on error) - * @v av Source address vector (or NULL on error) + * @v src Source address vector (or NULL on error) */ static void ib_mcast_complete ( struct ib_device *ibdev, struct ib_mad_interface *mi __unused, struct ib_mad_transaction *madx, int rc, union ib_mad *mad, - struct ib_address_vector *av __unused ) { + struct ib_address_vector *src __unused ) { struct ib_mc_membership *membership = ib_madx_get_ownerdata ( madx ); struct ib_queue_pair *qp = membership->qp; - union ib_gid *gid = &membership->gid; + struct ib_address_vector *av = membership->av; struct ib_mc_member_record *mc_member_record = &mad->sa.sa_data.mc_member_record; int joined; - unsigned long qkey; /* Report failures */ if ( ( rc == 0 ) && ( mad->hdr.status != htons ( IB_MGMT_STATUS_OK ) )) @@ -101,13 +101,17 @@ static void ib_mcast_complete ( struct ib_device *ibdev, /* Extract values from MAD */ joined = ( mad->hdr.method == IB_MGMT_METHOD_GET_RESP ); - qkey = ntohl ( mc_member_record->qkey ); - DBGC ( ibdev, "IBDEV %s QPN %#lx %s " IB_GID_FMT " qkey %lx\n", + av->qkey = ntohl ( mc_member_record->qkey ); + av->lid = ntohs ( mc_member_record->mlid ); + av->rate = ( mc_member_record->rate_selector__rate & 0x3f ); + av->sl = ( ( ntohl ( mc_member_record->sl__flow_label__hop_limit ) + >> 28 ) & 0x0f ); + DBGC ( ibdev, "IBDEV %s QPN %#lx %s " IB_GID_FMT " qkey %#lx\n", ibdev->name, qp->qpn, ( joined ? "joined" : "left" ), - IB_GID_ARGS ( gid ), qkey ); + IB_GID_ARGS ( &av->gid ), av->qkey ); /* Set queue key */ - qp->qkey = qkey; + qp->qkey = av->qkey; if ( ( rc = ib_modify_qp ( ibdev, qp ) ) != 0 ) { DBGC ( ibdev, "IBDEV %s QPN %#lx could not modify qkey: %s\n", ibdev->name, qp->qpn, strerror ( rc ) ); @@ -120,7 +124,7 @@ static void ib_mcast_complete ( struct ib_device *ibdev, membership->madx = NULL; /* Hand off to upper completion handler */ - membership->complete ( ibdev, qp, membership, rc, mad ); + membership->complete ( membership, rc ); } /** Multicast membership management transaction completion operations */ @@ -134,21 +138,20 @@ static struct ib_mad_transaction_operations ib_mcast_op = { * @v ibdev Infiniband device * @v qp Queue pair * @v membership Multicast group membership - * @v gid Multicast GID to join + * @v av Address vector to fill in * @v joined Join completion handler * @ret rc Return status code */ int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp, - struct ib_mc_membership *membership, union ib_gid *gid, - void ( * complete ) ( struct ib_device *ibdev, - struct ib_queue_pair *qp, - struct ib_mc_membership *membership, - int rc, union ib_mad *mad ) ) { + struct ib_mc_membership *membership, + struct ib_address_vector *av, + void ( * complete ) ( struct ib_mc_membership *membership, + int rc ) ) { union ib_mad mad; int rc; DBGC ( ibdev, "IBDEV %s QPN %#lx joining " IB_GID_FMT "\n", - ibdev->name, qp->qpn, IB_GID_ARGS ( gid ) ); + ibdev->name, qp->qpn, IB_GID_ARGS ( &av->gid ) ); /* Sanity checks */ assert ( qp != NULL ); @@ -156,11 +159,11 @@ int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp, /* Initialise structure */ membership->qp = qp; - memcpy ( &membership->gid, gid, sizeof ( membership->gid ) ); + membership->av = av; membership->complete = complete; /* Attach queue pair to multicast GID */ - if ( ( rc = ib_mcast_attach ( ibdev, qp, gid ) ) != 0 ) { + if ( ( rc = ib_mcast_attach ( ibdev, qp, &av->gid ) ) != 0 ) { DBGC ( ibdev, "IBDEV %s QPN %#lx could not attach: %s\n", ibdev->name, qp->qpn, strerror ( rc ) ); goto err_mcast_attach; @@ -168,7 +171,7 @@ int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp, membership->attached = 1; /* Initiate multicast membership join */ - ib_mcast_mad ( ibdev, gid, 1, &mad ); + ib_mcast_mad ( ibdev, av, 1, &mad ); membership->madx = ib_create_madx ( ibdev, ibdev->gsi, &mad, NULL, &ib_mcast_op ); if ( ! membership->madx ) { @@ -183,7 +186,7 @@ int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp, ib_destroy_madx ( ibdev, ibdev->gsi, membership->madx ); err_create_madx: - ib_mcast_detach ( ibdev, qp, gid ); + ib_mcast_detach ( ibdev, qp, &av->gid ); membership->attached = 0; err_mcast_attach: return rc; @@ -198,7 +201,7 @@ int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp, */ void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp, struct ib_mc_membership *membership ) { - union ib_gid *gid = &membership->gid; + struct ib_address_vector *av = membership->av; union ib_mad mad; int rc; @@ -207,13 +210,13 @@ void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp, return; DBGC ( ibdev, "IBDEV %s QPN %#lx leaving " IB_GID_FMT "\n", - ibdev->name, qp->qpn, IB_GID_ARGS ( gid ) ); + ibdev->name, qp->qpn, IB_GID_ARGS ( &av->gid ) ); /* Sanity check */ assert ( qp != NULL ); /* Detach from multicast GID */ - ib_mcast_detach ( ibdev, qp, &membership->gid ); + ib_mcast_detach ( ibdev, qp, &av->gid ); membership->attached = 0; /* Cancel multicast membership join, if applicable */ @@ -223,7 +226,7 @@ void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp, } /* Send a single group leave MAD */ - ib_mcast_mad ( ibdev, &membership->gid, 0, &mad ); + ib_mcast_mad ( ibdev, av, 0, &mad ); if ( ( rc = ib_mi_send ( ibdev, ibdev->gsi, &mad, NULL ) ) != 0 ) { DBGC ( ibdev, "IBDEV %s QPN %#lx could not send leave request: " "%s\n", ibdev->name, qp->qpn, strerror ( rc ) ); |