david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Prepare for adding a metadata queue to IPoIB

This commit is contained in:
Michael Brown 2007-09-17 06:12:33 +01:00
parent 440e7926fb
commit f6f1f2b7bb
2 changed files with 122 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
src/drivers/net/ipoib.c
View File

@ -45,19 +45,36 @@ extern struct ib_address_vector hack_ipoib_bcast_av;
#define IPOIB_MTU 2048 #define IPOIB_MTU 2048
/** Number of IPoIB send work queue entries */ /** Number of IPoIB send work queue entries */
#define IPOIB_NUM_SEND_WQES 8 #define IPOIB_DATA_NUM_SEND_WQES 4
/** Number of IPoIB receive work queue entries */ /** Number of IPoIB receive work queue entries */
#define IPOIB_NUM_RECV_WQES 8 #define IPOIB_DATA_NUM_RECV_WQES 8
/** Number of IPoIB completion entries */ /** Number of IPoIB completion entries */
#define IPOIB_NUM_CQES 8 #define IPOIB_DATA_NUM_CQES 8
struct ipoib_device { /** An IPoIB queue set */
struct ib_device *ibdev; struct ipoib_queue_set {
/** Completion queue */
struct ib_completion_queue *cq; struct ib_completion_queue *cq;
/** Queue pair */
struct ib_queue_pair *qp; struct ib_queue_pair *qp;
unsigned int rx_fill; /** Receive work queue fill level */
unsigned int recv_fill;
/** Receive work queue maximum fill level */
unsigned int recv_max_fill;
};
/** An IPoIB device */
struct ipoib_device {
/** Network device */
struct net_device *netdev;
/** Underlying Infiniband device */
struct ib_device *ibdev;
/** Data queue set */
struct ipoib_queue_set data;
/** Data queue set */
struct ipoib_queue_set meta;
}; };
/**************************************************************************** /****************************************************************************
@ -164,6 +181,69 @@ struct ll_protocol ipoib_protocol __ll_protocol = {
**************************************************************************** ****************************************************************************
*/ */
/**
* Destroy queue set
*
* @v ipoib IPoIB device
* @v qset Queue set
*/
static void ipoib_destroy_qset ( struct ipoib_device *ipoib,
struct ipoib_queue_set *qset ) {
struct ib_device *ibdev = ipoib->ibdev;
if ( qset->qp )
ib_destroy_qp ( ibdev, qset->qp );
if ( qset->cq )
ib_destroy_cq ( ibdev, qset->cq );
memset ( qset, 0, sizeof ( *qset ) );
}
/**
* Create queue set
*
* @v ipoib IPoIB device
* @v qset Queue set
* @ret rc Return status code
*/
static int ipoib_create_qset ( struct ipoib_device *ipoib,
struct ipoib_queue_set *qset,
unsigned int num_cqes,
unsigned int num_send_wqes,
unsigned int num_recv_wqes,
unsigned long qkey ) {
struct ib_device *ibdev = ipoib->ibdev;
int rc;
/* Store queue parameters */
qset->recv_max_fill = num_recv_wqes;
/* Allocate completion queue */
qset->cq = ib_create_cq ( ibdev, num_cqes );
if ( ! qset->cq ) {
DBGC ( ipoib, "IPoIB %p could not allocate completion queue\n",
ipoib );
rc = -ENOMEM;
goto err;
}
/* Allocate queue pair */
qset->qp = ib_create_qp ( ibdev, num_send_wqes, qset->cq,
num_recv_wqes, qset->cq, qkey );
if ( ! qset->qp ) {
DBGC ( ipoib, "IPoIB %p could not allocate queue pair\n",
ipoib );
rc = -ENOMEM;
goto err;
}
qset->qp->owner_priv = ipoib->netdev;
return 0;
err:
ipoib_destroy_qset ( ipoib, qset );
return rc;
}
/** /**
* Transmit packet via IPoIB network device * Transmit packet via IPoIB network device
* *
@ -183,7 +263,7 @@ static int ipoib_transmit ( struct net_device *netdev,
} }
iob_pull ( iobuf, ( sizeof ( *ipoib_pshdr ) ) ); iob_pull ( iobuf, ( sizeof ( *ipoib_pshdr ) ) );
return ib_post_send ( ibdev, ipoib->qp, return ib_post_send ( ibdev, ipoib->data.qp,
&hack_ipoib_bcast_av, iobuf ); &hack_ipoib_bcast_av, iobuf );
} }
@ -195,10 +275,10 @@ static int ipoib_transmit ( struct net_device *netdev,
* @v completion Completion * @v completion Completion
* @v iobuf I/O buffer * @v iobuf I/O buffer
*/ */
static void ipoib_complete_send ( struct ib_device *ibdev __unused, static void ipoib_data_complete_send ( struct ib_device *ibdev __unused,
struct ib_queue_pair *qp, struct ib_queue_pair *qp,
struct ib_completion *completion, struct ib_completion *completion,
struct io_buffer *iobuf ) { struct io_buffer *iobuf ) {
struct net_device *netdev = qp->owner_priv; struct net_device *netdev = qp->owner_priv;
netdev_tx_complete_err ( netdev, iobuf, netdev_tx_complete_err ( netdev, iobuf,
@ -213,10 +293,10 @@ static void ipoib_complete_send ( struct ib_device *ibdev __unused,
* @v completion Completion * @v completion Completion
* @v iobuf I/O buffer * @v iobuf I/O buffer
*/ */
static void ipoib_complete_recv ( struct ib_device *ibdev __unused, static void ipoib_data_complete_recv ( struct ib_device *ibdev __unused,
struct ib_queue_pair *qp, struct ib_queue_pair *qp,
struct ib_completion *completion, struct ib_completion *completion,
struct io_buffer *iobuf ) { struct io_buffer *iobuf ) {
struct net_device *netdev = qp->owner_priv; struct net_device *netdev = qp->owner_priv;
struct ipoib_device *ipoib = netdev->priv; struct ipoib_device *ipoib = netdev->priv;
struct ib_global_route_header *grh = iobuf->data; struct ib_global_route_header *grh = iobuf->data;
@ -232,7 +312,7 @@ static void ipoib_complete_recv ( struct ib_device *ibdev __unused,
netdev_rx ( netdev, iobuf ); netdev_rx ( netdev, iobuf );
} }
ipoib->rx_fill--; ipoib->data.recv_fill--;
} }
/** /**
@ -240,21 +320,21 @@ static void ipoib_complete_recv ( struct ib_device *ibdev __unused,
* *
* @v ipoib IPoIB device * @v ipoib IPoIB device
*/ */
static void ipoib_refill_recv ( struct ipoib_device *ipoib ) { static void ipoib_refill_recv ( struct ipoib_device *ipoib,
struct ipoib_queue_set *qset ) {
struct ib_device *ibdev = ipoib->ibdev; struct ib_device *ibdev = ipoib->ibdev;
struct io_buffer *iobuf; struct io_buffer *iobuf;
int rc; int rc;
while ( ipoib->rx_fill < IPOIB_NUM_RECV_WQES ) { while ( qset->recv_fill < qset->recv_max_fill ) {
iobuf = alloc_iob ( IPOIB_MTU ); iobuf = alloc_iob ( IPOIB_MTU );
if ( ! iobuf ) if ( ! iobuf )
break; break;
if ( ( rc = ib_post_recv ( ibdev, ipoib->qp, if ( ( rc = ib_post_recv ( ibdev, qset->qp, iobuf ) ) != 0 ) {
iobuf ) ) != 0 ) {
free_iob ( iobuf ); free_iob ( iobuf );
break; break;
} }
ipoib->rx_fill++; qset->recv_fill++;
} }
} }
@ -267,9 +347,9 @@ static void ipoib_poll ( struct net_device *netdev ) {
struct ipoib_device *ipoib = netdev->priv; struct ipoib_device *ipoib = netdev->priv;
struct ib_device *ibdev = ipoib->ibdev; struct ib_device *ibdev = ipoib->ibdev;
ib_poll_cq ( ibdev, ipoib->cq, ipoib_complete_send, ib_poll_cq ( ibdev, ipoib->data.cq, ipoib_data_complete_send,
ipoib_complete_recv ); ipoib_data_complete_recv );
ipoib_refill_recv ( ipoib ); ipoib_refill_recv ( ipoib, &ipoib->data );
} }
/** /**
@ -295,7 +375,7 @@ static int ipoib_open ( struct net_device *netdev ) {
int rc; int rc;
/* Attach to broadcast multicast GID */ /* Attach to broadcast multicast GID */
if ( ( rc = ib_mcast_attach ( ibdev, ipoib->qp, if ( ( rc = ib_mcast_attach ( ibdev, ipoib->data.qp,
&ibdev->broadcast_gid ) ) != 0 ) { &ibdev->broadcast_gid ) ) != 0 ) {
DBG ( "Could not attach to broadcast GID: %s\n", DBG ( "Could not attach to broadcast GID: %s\n",
strerror ( rc ) ); strerror ( rc ) );
@ -303,7 +383,7 @@ static int ipoib_open ( struct net_device *netdev ) {
} }
/* Fill receive ring */ /* Fill receive ring */
ipoib_refill_recv ( ipoib ); ipoib_refill_recv ( ipoib, &ipoib->data );
return 0; return 0;
} }
@ -318,7 +398,7 @@ static void ipoib_close ( struct net_device *netdev ) {
struct ib_device *ibdev = ipoib->ibdev; struct ib_device *ibdev = ipoib->ibdev;
/* Detach from broadcast multicast GID */ /* Detach from broadcast multicast GID */
ib_mcast_detach ( ibdev, ipoib->qp, &ipoib_broadcast.gid ); ib_mcast_detach ( ibdev, ipoib->data.qp, &ipoib_broadcast.gid );
/* FIXME: should probably flush the receive ring */ /* FIXME: should probably flush the receive ring */
} }
@ -353,32 +433,23 @@ int ipoib_probe ( struct ib_device *ibdev ) {
ib_set_ownerdata ( ibdev, netdev ); ib_set_ownerdata ( ibdev, netdev );
netdev->dev = ibdev->dev; netdev->dev = ibdev->dev;
memset ( ipoib, 0, sizeof ( *ipoib ) ); memset ( ipoib, 0, sizeof ( *ipoib ) );
ipoib->netdev = netdev;
ipoib->ibdev = ibdev; ipoib->ibdev = ibdev;
/* Allocate completion queue */ /* Allocate data queue set */
ipoib->cq = ib_create_cq ( ibdev, IPOIB_NUM_CQES ); if ( ( rc = ipoib_create_qset ( ipoib, &ipoib->data,
if ( ! ipoib->cq ) { IPOIB_DATA_NUM_CQES,
DBGC ( ipoib, "IPoIB %p could not allocate completion queue\n", IPOIB_DATA_NUM_SEND_WQES,
ipoib ); IPOIB_DATA_NUM_RECV_WQES,
rc = -ENOMEM; hack_ipoib_qkey ) ) != 0 ) {
goto err_create_cq; DBGC ( ipoib, "IPoIB %p could not allocate data QP: %s\n",
ipoib, strerror ( rc ) );
goto err_create_data_qset;
} }
/* Allocate queue pair */
ipoib->qp = ib_create_qp ( ibdev, IPOIB_NUM_SEND_WQES,
ipoib->cq, IPOIB_NUM_RECV_WQES,
ipoib->cq, hack_ipoib_qkey );
if ( ! ipoib->qp ) {
DBGC ( ipoib, "IPoIB %p could not allocate queue pair\n",
ipoib );
rc = -ENOMEM;
goto err_create_qp;
}
ipoib->qp->owner_priv = netdev;
/* Construct MAC address */ /* Construct MAC address */
mac = ( ( struct ipoib_mac * ) netdev->ll_addr ); mac = ( ( struct ipoib_mac * ) netdev->ll_addr );
mac->qpn = htonl ( ipoib->qp->qpn ); mac->qpn = htonl ( ipoib->data.qp->qpn );
memcpy ( &mac->gid, &ibdev->port_gid, sizeof ( mac->gid ) ); memcpy ( &mac->gid, &ibdev->port_gid, sizeof ( mac->gid ) );
/* Register network device */ /* Register network device */
@ -388,10 +459,8 @@ int ipoib_probe ( struct ib_device *ibdev ) {
return 0; return 0;
err_register_netdev: err_register_netdev:
ib_destroy_qp ( ibdev, ipoib->qp ); ipoib_destroy_qset ( ipoib, &ipoib->data );
err_create_qp: err_create_data_qset:
ib_destroy_cq ( ibdev, ipoib->cq );
err_create_cq:
netdev_nullify ( netdev ); netdev_nullify ( netdev );
netdev_put ( netdev ); netdev_put ( netdev );
return rc; return rc;

91
src/net/infiniband.c
View File

@ -150,6 +150,8 @@ void ib_destroy_qp ( struct ib_device *ibdev,
DBGC ( ibdev, "IBDEV %p destroying queue pair %#lx\n", DBGC ( ibdev, "IBDEV %p destroying queue pair %#lx\n",
ibdev, qp->qpn ); ibdev, qp->qpn );
ibdev->op->destroy_qp ( ibdev, qp ); ibdev->op->destroy_qp ( ibdev, qp );
list_del ( &qp->send.list );
list_del ( &qp->recv.list );
free ( qp ); free ( qp );
} }
@ -198,92 +200,3 @@ struct ib_device * alloc_ibdev ( size_t priv_size ) {
void free_ibdev ( struct ib_device *ibdev ) { void free_ibdev ( struct ib_device *ibdev ) {
free ( ibdev ); free ( ibdev );
} }
#if 0
/** Infiniband broadcast MAC address */
static uint8_t ib_broadcast[IB_ALEN] = { 0xff, };
/**
* Transmit Infiniband packet
*
* @v iobuf I/O buffer
* @v netdev Network device
* @v net_protocol Network-layer protocol
* @v ll_dest Link-layer destination address
*
* Prepends the Infiniband link-layer header and transmits the packet.
*/
static int ib_tx ( struct io_buffer *iobuf, struct net_device *netdev,
struct net_protocol *net_protocol, const void *ll_dest ) {
struct ibhdr *ibhdr = iob_push ( iobuf, sizeof ( *ibhdr ) );
/* Build Infiniband header */
ibhdr->proto = net_protocol->net_proto;
ibhdr->reserved = 0;
( void ) ll_dest;
/* Hand off to network device */
return netdev_tx ( netdev, iobuf );
}
/**
* Process received Infiniband packet
*
* @v iobuf I/O buffer
* @v netdev Network device
*
* Strips off the Infiniband link-layer header and passes up to the
* network-layer protocol.
*/
static int ib_rx ( struct io_buffer *iobuf, struct net_device *netdev ) {
struct ibhdr *ibhdr = iobuf->data;
/* Sanity check */
if ( iob_len ( iobuf ) < sizeof ( *ibhdr ) ) {
DBG ( "Infiniband packet too short (%d bytes)\n",
iob_len ( iobuf ) );
free_iob ( iobuf );
return -EINVAL;
}
/* Strip off Infiniband header */
iob_pull ( iobuf, sizeof ( *ibhdr ) );
/* Hand off to network-layer protocol */
return net_rx ( iobuf, netdev, ibhdr->proto, NULL );
}
/**
* Transcribe Infiniband address
*
* @v ll_addr Link-layer address
* @ret string Link-layer address in human-readable format
*/
const char * ib_ntoa ( const void *ll_addr ) {
static char buf[61];
const uint8_t *ib_addr = ll_addr;
unsigned int i;
char *p = buf;
for ( i = 0 ; i < IB_ALEN ; i++ ) {
p += sprintf ( p, ":%02x", ib_addr[i] );
}
return ( buf + 1 );
}
/** Infiniband protocol */
struct ll_protocol infiniband_protocol __ll_protocol = {
.name = "Infiniband",
.ll_proto = htons ( ARPHRD_INFINIBAND ),
.ll_addr_len = IB_ALEN,
.ll_header_len = IB_HLEN,
.ll_broadcast = ib_broadcast,
.tx = ib_tx,
.rx = ib_rx,
.ntoa = ib_ntoa,
};
#endif