Skip to content

Commit

Permalink
[infiniband] Provide a general mechanism for multicast group joins
Browse files Browse the repository at this point in the history 
Generalise out the multicast group membership record code from IPoIB.
  • Loading branch information
Michael Brown committed Jul 17, 2009
1 parent 3c77fe7 commit 0fbf2f6
Show file tree
Hide file tree
Showing 6 changed files with 274 additions and 129 deletions.
142 changes: 13 additions & 129 deletions src/drivers/net/ipoib.c
View file
Expand Up @@ -30,6 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <gpxe/infiniband.h>
#include <gpxe/ib_qset.h>
#include <gpxe/ib_pathrec.h>
#include <gpxe/ib_mcast.h>
#include <gpxe/ipoib.h>

/** @file
Expand Down Expand Up @@ -67,20 +68,14 @@ struct ipoib_device {
struct ib_queue_set meta;
/** Broadcast MAC */
struct ipoib_mac broadcast;
/** Attached to multicast group
/** Joined to multicast group
*
* This flag indicates whether or not we have attached our
* data queue pair to the broadcast multicast GID.
* This flag indicates whether or not we have initiated the
* join to the IPv4 multicast group.
*/
int broadcast_attached;
int broadcast_joined;
};

/** TID half used to identify multicast member record replies */
#define IPOIB_TID_MC_MEMBER_REC 0x22222222UL

/** IPoIB metadata TID */
static uint32_t ipoib_meta_tid = 0;

/** Broadcast IPoIB address */
static struct ipoib_mac ipoib_broadcast = {
.qpn = htonl ( IB_QPN_BROADCAST ),
Expand Down Expand Up @@ -332,67 +327,6 @@ struct net_device * alloc_ipoibdev ( size_t priv_size ) {
****************************************************************************
*/

/**
* Transmit multicast group membership request
*
* @v ipoib IPoIB device
* @v gid Multicast GID
* @v join Join (rather than leave) group
* @ret rc Return status code
*/
static int ipoib_mc_member_record ( struct ipoib_device *ipoib,
struct ib_gid *gid, int join ) {
struct ib_device *ibdev = ipoib->ibdev;
struct io_buffer *iobuf;
struct ib_mad_sa *sa;
struct ib_address_vector av;
int rc;

/* Allocate I/O buffer */
iobuf = alloc_iob ( sizeof ( *sa ) );
if ( ! iobuf )
return -ENOMEM;
iob_put ( iobuf, sizeof ( *sa ) );
sa = iobuf->data;
memset ( sa, 0, sizeof ( *sa ) );

/* Construct path record request */
sa->mad_hdr.base_version = IB_MGMT_BASE_VERSION;
sa->mad_hdr.mgmt_class = IB_MGMT_CLASS_SUBN_ADM;
sa->mad_hdr.class_version = 2;
sa->mad_hdr.method =
( join ? IB_MGMT_METHOD_SET : IB_MGMT_METHOD_DELETE );
sa->mad_hdr.attr_id = htons ( IB_SA_ATTR_MC_MEMBER_REC );
sa->mad_hdr.tid[0] = IPOIB_TID_MC_MEMBER_REC;
sa->mad_hdr.tid[1] = ipoib_meta_tid++;
sa->sa_hdr.comp_mask[1] =
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,
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 ) );

/* Construct address vector */
memset ( &av, 0, sizeof ( av ) );
av.lid = ibdev->sm_lid;
av.sl = ibdev->sm_sl;
av.qpn = IB_QPN_GMA;
av.qkey = IB_QKEY_GMA;

/* 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
*
Expand Down Expand Up @@ -529,33 +463,6 @@ static void ipoib_meta_complete_send ( struct ib_device *ibdev __unused,
free_iob ( iobuf );
}

/**
* Handle received IPoIB multicast membership record
*
* @v ipoib IPoIB device
* @v mc_member_record Multicast membership record
*/
static void ipoib_recv_mc_member_record ( struct ipoib_device *ipoib,
struct ib_mc_member_record *mc_member_record ) {
unsigned long data_qkey;
int joined;
int rc;

/* Record parameters */
joined = ( mc_member_record->scope__join_state & 0x0f );
data_qkey = ntohl ( mc_member_record->qkey );
DBGC ( ipoib, "IPoIB %p %s broadcast group: qkey %lx\n",
ipoib, ( joined ? "joined" : "left" ), data_qkey );

/* Update data queue pair qkey */
if ( ( rc = ib_modify_qp ( ipoib->ibdev, ipoib->data.qp,
IB_MODIFY_QKEY, data_qkey ) ) != 0 ){
DBGC ( ipoib, "IPoIB %p could not update data qkey: %s\n",
ipoib, strerror ( rc ) );
return;
}
}

/**
* Handle IPoIB metadata receive completion
*
Expand Down Expand Up @@ -594,10 +501,6 @@ ipoib_meta_complete_recv ( struct ib_device *ibdev __unused,
}

switch ( sa->mad_hdr.tid[0] ) {
case IPOIB_TID_MC_MEMBER_REC:
ipoib_recv_mc_member_record ( ipoib,
&sa->sa_data.mc_member_record );
break;
default:
DBGC ( ipoib, "IPoIB %p unwanted response:\n",
ipoib );
Expand Down Expand Up @@ -647,31 +550,13 @@ static void ipoib_irq ( struct net_device *netdev __unused,
static int ipoib_join_broadcast_group ( struct ipoib_device *ipoib ) {
int rc;

/* Sanity check */
if ( ! ipoib->data.qp )
return 0;

/* Attach data queue to broadcast multicast GID */
assert ( ipoib->broadcast_attached == 0 );
if ( ( rc = ib_mcast_attach ( ipoib->ibdev, ipoib->data.qp,
&ipoib->broadcast.gid ) ) != 0 ){
DBGC ( ipoib, "IPoIB %p could not attach to broadcast GID: "
"%s\n", ipoib, strerror ( rc ) );
return rc;
}
ipoib->broadcast_attached = 1;

/* Initiate broadcast group join */
if ( ( rc = ipoib_mc_member_record ( ipoib, &ipoib->broadcast.gid,
1 ) ) != 0 ) {
DBGC ( ipoib, "IPoIB %p could not send broadcast join: %s\n",
if ( ( rc = ib_mcast_join ( ipoib->ibdev, ipoib->data.qp,
&ipoib->broadcast.gid ) ) != 0 ) {
DBGC ( ipoib, "IPoIB %p could not join broadcast group: %s\n",
ipoib, strerror ( rc ) );
return rc;
}

/* We will set link up on the network device when we receive
* the broadcast join response.
*/
ipoib->broadcast_joined = 1;

return 0;
}
Expand All @@ -684,11 +569,10 @@ static int ipoib_join_broadcast_group ( struct ipoib_device *ipoib ) {
static void ipoib_leave_broadcast_group ( struct ipoib_device *ipoib ) {

/* Detach data queue from broadcast multicast GID */
if ( ipoib->broadcast_attached ) {
assert ( ipoib->data.qp != NULL );
ib_mcast_detach ( ipoib->ibdev, ipoib->data.qp,
&ipoib->broadcast.gid );
ipoib->broadcast_attached = 0;
if ( ipoib->broadcast_joined ) {
ib_mcast_leave ( ipoib->ibdev, ipoib->data.qp,
&ipoib->broadcast.gid );
ipoib->broadcast_joined = 0;
}
}

Expand Down
1 change: 1 addition & 0 deletions src/include/gpxe/errfile.h
View file
Expand Up @@ -146,6 +146,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define ERRFILE_ib_qset ( ERRFILE_NET | 0x001a0000 )
#define ERRFILE_ib_gma ( ERRFILE_NET | 0x001b0000 )
#define ERRFILE_ib_pathrec ( ERRFILE_NET | 0x001c0000 )
#define ERRFILE_ib_mcast ( ERRFILE_NET | 0x001d0000 )

#define ERRFILE_image ( ERRFILE_IMAGE | 0x00000000 )
#define ERRFILE_elf ( ERRFILE_IMAGE | 0x00010000 )
Expand Down
2 changes: 2 additions & 0 deletions src/include/gpxe/ib_mad.h
View file
Expand Up @@ -203,6 +203,8 @@ struct ib_smp_class_specific {

#define IB_SA_CLASS_VERSION 2

#define IB_SA_METHOD_DELETE_RESP 0x95

struct ib_rmpp_hdr {
uint32_t raw[3];
} __attribute__ (( packed ));
Expand Down
19 changes: 19 additions & 0 deletions src/include/gpxe/ib_mcast.h
View file
@@ -0,0 +1,19 @@
#ifndef _GPXE_IB_MCAST_H
#define _GPXE_IB_MCAST_H

/** @file
*
* Infiniband multicast groups
*
*/

FILE_LICENCE ( GPL2_OR_LATER );

#include <gpxe/infiniband.h>

extern int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp,
struct ib_gid *gid );
extern void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp,
struct ib_gid *gid );

#endif /* _GPXE_IB_MCAST_H */
4 changes: 4 additions & 0 deletions src/net/infiniband.c
View file
Expand Up @@ -554,6 +554,10 @@ void ib_close ( struct ib_device *ibdev ) {
* @v qp Queue pair
* @v gid Multicast GID
* @ret rc Return status code
*
* Note that this function handles only the local device's attachment
* to the multicast GID; it does not issue the relevant MADs to join
* the multicast group on the subnet.
*/
int ib_mcast_attach ( struct ib_device *ibdev, struct ib_queue_pair *qp,
struct ib_gid *gid ) {
Expand Down

0 comments on commit 0fbf2f6

Please sign in to comment.