-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
cfs_list_for_each(tmp, &conn->ibc_early_rxs)
kiblnd_debug_rx(cfs_list_entry(tmp, kib_rx_t, rx_list));
+ CDEBUG(D_CONSOLE, " tx_noops:\n");
+ cfs_list_for_each(tmp, &conn->ibc_tx_noops)
+ kiblnd_debug_tx(cfs_list_entry(tmp, kib_tx_t, tx_list));
+
CDEBUG(D_CONSOLE, " tx_queue_nocred:\n");
cfs_list_for_each(tmp, &conn->ibc_tx_queue_nocred)
kiblnd_debug_tx(cfs_list_entry(tmp, kib_tx_t, tx_list));
}
static void
-kiblnd_setup_mtu(struct rdma_cm_id *cmid)
+kiblnd_setup_mtu_locked(struct rdma_cm_id *cmid)
{
- unsigned long flags;
int mtu;
/* XXX There is no path record for iWARP, set by netdev->change_mtu? */
if (cmid->route.path_rec == NULL)
return;
- cfs_write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
-
mtu = kiblnd_translate_mtu(*kiblnd_tunables.kib_ib_mtu);
LASSERT (mtu >= 0);
if (mtu != 0)
cmid->route.path_rec->mtu = mtu;
-
- cfs_write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
}
kib_conn_t *
* she must dispose of 'cmid'. (Actually I'd block forever if I tried
* to destroy 'cmid' here since I'm called from the CM which still has
* its ref on 'cmid'). */
+ cfs_rwlock_t *glock = &kiblnd_data.kib_global_lock;
kib_net_t *net = peer->ibp_ni->ni_data;
+ kib_dev_t *dev = net->ibn_dev;
struct ib_qp_init_attr *init_qp_attr;
kib_conn_t *conn;
struct ib_cq *cq;
conn->ibc_cmid = cmid;
CFS_INIT_LIST_HEAD(&conn->ibc_early_rxs);
+ CFS_INIT_LIST_HEAD(&conn->ibc_tx_noops);
CFS_INIT_LIST_HEAD(&conn->ibc_tx_queue);
CFS_INIT_LIST_HEAD(&conn->ibc_tx_queue_rsrvd);
CFS_INIT_LIST_HEAD(&conn->ibc_tx_queue_nocred);
}
memset(conn->ibc_connvars, 0, sizeof(*conn->ibc_connvars));
+ cfs_write_lock_irqsave(glock, flags);
+ if (dev->ibd_failover) {
+ cfs_write_unlock_irqrestore(glock, flags);
+ CERROR("%s: failover in progress\n", dev->ibd_ifname);
+ goto failed_2;
+ }
+
+ if (dev->ibd_hdev->ibh_ibdev != cmid->device) {
+ /* wakeup failover thread and teardown connection */
+ if (kiblnd_dev_can_failover(dev)) {
+ cfs_list_add_tail(&dev->ibd_fail_list,
+ &kiblnd_data.kib_failed_devs);
+ cfs_waitq_signal(&kiblnd_data.kib_failover_waitq);
+ }
+
+ cfs_write_unlock_irqrestore(glock, flags);
+ CERROR("cmid HCA(%s), kib_dev(%s) need failover\n",
+ cmid->device->name, dev->ibd_ifname);
+ goto failed_2;
+ }
+
+ kiblnd_hdev_addref_locked(dev->ibd_hdev);
+ conn->ibc_hdev = dev->ibd_hdev;
+
+ kiblnd_setup_mtu_locked(cmid);
+
+ cfs_write_unlock_irqrestore(glock, flags);
+
LIBCFS_ALLOC(conn->ibc_rxs, IBLND_RX_MSGS(version) * sizeof(kib_rx_t));
if (conn->ibc_rxs == NULL) {
CERROR("Cannot allocate RX buffers\n");
goto failed_2;
}
- kiblnd_setup_mtu(cmid);
-
memset(init_qp_attr, 0, sizeof(*init_qp_attr));
init_qp_attr->event_handler = kiblnd_qp_event;
init_qp_attr->qp_context = conn;
init_qp_attr->send_cq = cq;
init_qp_attr->recv_cq = cq;
- rc = rdma_create_qp(cmid, net->ibn_dev->ibd_pd, init_qp_attr);
+ rc = rdma_create_qp(cmid, conn->ibc_hdev->ibh_pd, init_qp_attr);
if (rc != 0) {
CERROR("Can't create QP: %d, send_wr: %d, recv_wr: %d\n",
rc, init_qp_attr->cap.max_send_wr,
LASSERT (!cfs_in_interrupt());
LASSERT (cfs_atomic_read(&conn->ibc_refcount) == 0);
LASSERT (cfs_list_empty(&conn->ibc_early_rxs));
+ LASSERT (cfs_list_empty(&conn->ibc_tx_noops));
LASSERT (cfs_list_empty(&conn->ibc_tx_queue));
LASSERT (cfs_list_empty(&conn->ibc_tx_queue_rsrvd));
LASSERT (cfs_list_empty(&conn->ibc_tx_queue_nocred));
if (conn->ibc_connvars != NULL)
LIBCFS_FREE(conn->ibc_connvars, sizeof(*conn->ibc_connvars));
+ if (conn->ibc_hdev != NULL)
+ kiblnd_hdev_decref(conn->ibc_hdev);
+
/* See CAVEAT EMPTOR above in kiblnd_create_conn */
if (conn->ibc_state != IBLND_CONN_INIT) {
kib_net_t *net = peer->ibp_ni->ni_data;
int npages = p->ibp_npages;
int i;
- LASSERT (p->ibp_device == NULL);
-
for (i = 0; i < npages; i++)
if (p->ibp_pages[i] != NULL)
__free_page(p->ibp_pages[i]);
int i;
LASSERT (conn->ibc_rxs != NULL);
- LASSERT (conn->ibc_rx_pages->ibp_device != NULL);
+ LASSERT (conn->ibc_hdev != NULL);
for (i = 0; i < IBLND_RX_MSGS(conn->ibc_version); i++) {
rx = &conn->ibc_rxs[i];
LASSERT (rx->rx_nob >= 0); /* not posted */
- kiblnd_dma_unmap_single(conn->ibc_rx_pages->ibp_device,
+ kiblnd_dma_unmap_single(conn->ibc_hdev->ibh_ibdev,
KIBLND_UNMAP_ADDR(rx, rx_msgunmap,
rx->rx_msgaddr),
IBLND_MSG_SIZE, DMA_FROM_DEVICE);
}
- conn->ibc_rx_pages->ibp_device = NULL;
-
kiblnd_free_pages(conn->ibc_rx_pages);
conn->ibc_rx_pages = NULL;
rx->rx_conn = conn;
rx->rx_msg = (kib_msg_t *)(((char *)page_address(pg)) + pg_off);
- rx->rx_msgaddr = kiblnd_dma_map_single(conn->ibc_cmid->device,
+ rx->rx_msgaddr = kiblnd_dma_map_single(conn->ibc_hdev->ibh_ibdev,
rx->rx_msg, IBLND_MSG_SIZE,
DMA_FROM_DEVICE);
- LASSERT (!kiblnd_dma_mapping_error(conn->ibc_cmid->device,
+ LASSERT (!kiblnd_dma_mapping_error(conn->ibc_hdev->ibh_ibdev,
rx->rx_msgaddr));
KIBLND_UNMAP_ADDR_SET(rx, rx_msgunmap, rx->rx_msgaddr);
LASSERT (ipg <= IBLND_RX_MSG_PAGES(conn->ibc_version));
}
}
-
- conn->ibc_rx_pages->ibp_device = conn->ibc_cmid->device;
}
static void
kiblnd_unmap_tx_pool(kib_tx_pool_t *tpo)
{
+ kib_hca_dev_t *hdev = tpo->tpo_hdev;
kib_tx_t *tx;
int i;
LASSERT (tpo->tpo_pool.po_allocated == 0);
- LASSERT (tpo->tpo_tx_pages->ibp_device != NULL);
+
+ if (hdev == NULL)
+ return;
for (i = 0; i < tpo->tpo_pool.po_size; i++) {
tx = &tpo->tpo_tx_descs[i];
- kiblnd_dma_unmap_single(tpo->tpo_tx_pages->ibp_device,
+ kiblnd_dma_unmap_single(hdev->ibh_ibdev,
KIBLND_UNMAP_ADDR(tx, tx_msgunmap,
tx->tx_msgaddr),
IBLND_MSG_SIZE, DMA_TO_DEVICE);
}
- tpo->tpo_tx_pages->ibp_device = NULL;
+
+ kiblnd_hdev_decref(hdev);
+ tpo->tpo_hdev = NULL;
+}
+
+static kib_hca_dev_t *
+kiblnd_current_hdev(kib_dev_t *dev)
+{
+ kib_hca_dev_t *hdev;
+ unsigned long flags;
+ int i = 0;
+
+ cfs_read_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
+ while (dev->ibd_failover) {
+ cfs_read_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
+ if (i++ % 50 == 0)
+ CDEBUG(D_NET, "Wait for dev(%s) failover\n", dev->ibd_ifname);
+ cfs_schedule_timeout(cfs_time_seconds(1) / 100);
+
+ cfs_read_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
+ }
+
+ kiblnd_hdev_addref_locked(dev->ibd_hdev);
+ hdev = dev->ibd_hdev;
+
+ cfs_read_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
+
+ return hdev;
}
static void
kib_pages_t *txpgs = tpo->tpo_tx_pages;
kib_pool_t *pool = &tpo->tpo_pool;
kib_net_t *net = pool->po_owner->ps_net;
+ kib_dev_t *dev = net->ibn_dev;
struct page *page;
kib_tx_t *tx;
int page_offset;
int i;
LASSERT (net != NULL);
- LASSERT (net->ibn_dev->ibd_cmid != NULL &&
- net->ibn_dev->ibd_cmid->device != NULL);
/* pre-mapped messages are not bigger than 1 page */
CLASSERT (IBLND_MSG_SIZE <= PAGE_SIZE);
/* No fancy arithmetic when we do the buffer calculations */
CLASSERT (PAGE_SIZE % IBLND_MSG_SIZE == 0);
- txpgs->ibp_device = net->ibn_dev->ibd_cmid->device;
+ tpo->tpo_hdev = kiblnd_current_hdev(dev);
for (ipage = page_offset = i = 0; i < pool->po_size; i++) {
page = txpgs->ibp_pages[ipage];
page_offset);
tx->tx_msgaddr = kiblnd_dma_map_single(
- txpgs->ibp_device, tx->tx_msg,
+ tpo->tpo_hdev->ibh_ibdev, tx->tx_msg,
IBLND_MSG_SIZE, DMA_TO_DEVICE);
- LASSERT (!kiblnd_dma_mapping_error(txpgs->ibp_device,
+ LASSERT (!kiblnd_dma_mapping_error(tpo->tpo_hdev->ibh_ibdev,
tx->tx_msgaddr));
KIBLND_UNMAP_ADDR_SET(tx, tx_msgunmap, tx->tx_msgaddr);
}
struct ib_mr *
-kiblnd_find_dma_mr(kib_net_t *net, __u64 addr, __u64 size)
+kiblnd_find_dma_mr(kib_hca_dev_t *hdev, __u64 addr, __u64 size)
{
__u64 index;
- LASSERT (net->ibn_dev->ibd_mrs[0] != NULL);
+ LASSERT (hdev->ibh_mrs[0] != NULL);
- if (net->ibn_dev->ibd_nmrs == 1)
- return net->ibn_dev->ibd_mrs[0];
+ if (hdev->ibh_nmrs == 1)
+ return hdev->ibh_mrs[0];
- index = addr >> net->ibn_dev->ibd_mr_shift;
+ index = addr >> hdev->ibh_mr_shift;
- if (index < net->ibn_dev->ibd_nmrs &&
- index == ((addr + size - 1) >> net->ibn_dev->ibd_mr_shift))
- return net->ibn_dev->ibd_mrs[index];
+ if (index < hdev->ibh_nmrs &&
+ index == ((addr + size - 1) >> hdev->ibh_mr_shift))
+ return hdev->ibh_mrs[index];
return NULL;
}
struct ib_mr *
-kiblnd_find_rd_dma_mr(kib_net_t *net, kib_rdma_desc_t *rd)
+kiblnd_find_rd_dma_mr(kib_hca_dev_t *hdev, kib_rdma_desc_t *rd)
{
struct ib_mr *prev_mr;
struct ib_mr *mr;
int i;
- LASSERT (net->ibn_dev->ibd_mrs[0] != NULL);
+ LASSERT (hdev->ibh_mrs[0] != NULL);
if (*kiblnd_tunables.kib_map_on_demand > 0 &&
*kiblnd_tunables.kib_map_on_demand <= rd->rd_nfrags)
return NULL;
- if (net->ibn_dev->ibd_nmrs == 1)
- return net->ibn_dev->ibd_mrs[0];
+ if (hdev->ibh_nmrs == 1)
+ return hdev->ibh_mrs[0];
for (i = 0, mr = prev_mr = NULL;
i < rd->rd_nfrags; i++) {
- mr = kiblnd_find_dma_mr(net,
+ mr = kiblnd_find_dma_mr(hdev,
rd->rd_frags[i].rf_addr,
rd->rd_frags[i].rf_nob);
if (prev_mr == NULL)
if (pool->fpo_fmr_pool != NULL)
ib_destroy_fmr_pool(pool->fpo_fmr_pool);
+ if (pool->fpo_hdev != NULL)
+ kiblnd_hdev_decref(pool->fpo_hdev);
+
LIBCFS_FREE(pool, sizeof(kib_fmr_pool_t));
}
kiblnd_create_fmr_pool(kib_fmr_poolset_t *fps, kib_fmr_pool_t **pp_fpo)
{
/* FMR pool for RDMA */
+ kib_dev_t *dev = fps->fps_net->ibn_dev;
kib_fmr_pool_t *fpo;
struct ib_fmr_pool_param param = {
.max_pages_per_fmr = LNET_MAX_PAYLOAD/PAGE_SIZE,
.cache = !!*kiblnd_tunables.kib_fmr_cache};
int rc;
- LASSERT (fps->fps_net->ibn_dev != NULL &&
- fps->fps_net->ibn_dev->ibd_pd != NULL);
-
LIBCFS_ALLOC(fpo, sizeof(kib_fmr_pool_t));
if (fpo == NULL)
return -ENOMEM;
memset(fpo, 0, sizeof(kib_fmr_pool_t));
- fpo->fpo_fmr_pool = ib_create_fmr_pool(fps->fps_net->ibn_dev->ibd_pd, ¶m);
+ fpo->fpo_hdev = kiblnd_current_hdev(dev);
+ fpo->fpo_fmr_pool = ib_create_fmr_pool(fpo->fpo_hdev->ibh_pd, ¶m);
if (IS_ERR(fpo->fpo_fmr_pool)) {
CERROR("Failed to create FMR pool: %ld\n",
PTR_ERR(fpo->fpo_fmr_pool));
rc = PTR_ERR(fpo->fpo_fmr_pool);
+ kiblnd_hdev_decref(fpo->fpo_hdev);
LIBCFS_FREE(fpo, sizeof(kib_fmr_pool_t));
return rc;
}
}
static void
+kiblnd_fail_fmr_pool_set(kib_fmr_poolset_t *fps, cfs_list_t *zombies)
+{
+ cfs_spin_lock(&fps->fps_lock);
+
+ while (!cfs_list_empty(&fps->fps_pool_list)) {
+ kib_fmr_pool_t *fpo = cfs_list_entry(fps->fps_pool_list.next,
+ kib_fmr_pool_t, fpo_list);
+ fpo->fpo_failed = 1;
+ cfs_list_del(&fpo->fpo_list);
+ if (fpo->fpo_map_count == 0)
+ cfs_list_add(&fpo->fpo_list, zombies);
+ else
+ cfs_list_add(&fpo->fpo_list, &fps->fps_failed_pool_list);
+ }
+
+ cfs_spin_unlock(&fps->fps_lock);
+}
+
+static void
kiblnd_fini_fmr_pool_set(kib_fmr_poolset_t *fps)
{
+ kiblnd_destroy_fmr_pool_list(&fps->fps_failed_pool_list);
kiblnd_destroy_fmr_pool_list(&fps->fps_pool_list);
}
fps->fps_net = net;
cfs_spin_lock_init(&fps->fps_lock);
CFS_INIT_LIST_HEAD(&fps->fps_pool_list);
+ CFS_INIT_LIST_HEAD(&fps->fps_failed_pool_list);
rc = kiblnd_create_fmr_pool(fps, &fpo);
if (rc == 0)
cfs_list_add_tail(&fpo->fpo_list, &fps->fps_pool_list);
return rc;
}
+static int
+kiblnd_fmr_pool_is_idle(kib_fmr_pool_t *fpo, cfs_time_t now)
+{
+ if (fpo->fpo_map_count != 0) /* still in use */
+ return 0;
+ if (fpo->fpo_failed)
+ return 1;
+ return cfs_time_aftereq(now, fpo->fpo_deadline);
+}
+
void
kiblnd_fmr_pool_unmap(kib_fmr_t *fmr, int status)
{
CFS_LIST_HEAD (zombies);
kib_fmr_pool_t *fpo = fmr->fmr_pool;
kib_fmr_poolset_t *fps = fpo->fpo_owner;
+ cfs_time_t now = cfs_time_current();
kib_fmr_pool_t *tmp;
int rc;
if (fps->fps_pool_list.next == &fpo->fpo_list)
continue;
- if (fpo->fpo_map_count == 0 && /* no more reference */
- cfs_time_aftereq(cfs_time_current(), fpo->fpo_deadline)) {
+ if (kiblnd_fmr_pool_is_idle(fpo, now)) {
cfs_list_move(&fpo->fpo_list, &zombies);
fps->fps_version ++;
}
fps->fps_version ++;
cfs_list_add_tail(&fpo->fpo_list, &fps->fps_pool_list);
} else {
- fps->fps_next_retry = cfs_time_shift(10);
+ fps->fps_next_retry = cfs_time_shift(IBLND_POOL_RETRY);
}
cfs_spin_unlock(&fps->fps_lock);
}
void
-kiblnd_destroy_pool_list(kib_poolset_t *ps, cfs_list_t *head)
+kiblnd_destroy_pool_list(cfs_list_t *head)
{
kib_pool_t *pool;
while (!cfs_list_empty(head)) {
pool = cfs_list_entry(head->next, kib_pool_t, po_list);
cfs_list_del(&pool->po_list);
- ps->ps_pool_destroy(pool);
+
+ LASSERT (pool->po_owner != NULL);
+ pool->po_owner->ps_pool_destroy(pool);
}
}
static void
+kiblnd_fail_pool_set(kib_poolset_t *ps, cfs_list_t *zombies)
+{
+ cfs_spin_lock(&ps->ps_lock);
+ while (!cfs_list_empty(&ps->ps_pool_list)) {
+ kib_pool_t *po = cfs_list_entry(ps->ps_pool_list.next,
+ kib_pool_t, po_list);
+ po->po_failed = 1;
+ cfs_list_del(&po->po_list);
+ if (po->po_allocated == 0)
+ cfs_list_add(&po->po_list, zombies);
+ else
+ cfs_list_add(&po->po_list, &ps->ps_failed_pool_list);
+ }
+ cfs_spin_unlock(&ps->ps_lock);
+}
+
+static void
kiblnd_fini_pool_set(kib_poolset_t *ps)
{
- kiblnd_destroy_pool_list(ps, &ps->ps_pool_list);
+ kiblnd_destroy_pool_list(&ps->ps_failed_pool_list);
+ kiblnd_destroy_pool_list(&ps->ps_pool_list);
}
static int
strncpy(ps->ps_name, name, IBLND_POOL_NAME_LEN);
cfs_spin_lock_init(&ps->ps_lock);
CFS_INIT_LIST_HEAD(&ps->ps_pool_list);
+ CFS_INIT_LIST_HEAD(&ps->ps_failed_pool_list);
rc = ps->ps_pool_create(ps, size, &pool);
if (rc == 0)
return rc;
}
+static int
+kiblnd_pool_is_idle(kib_pool_t *pool, cfs_time_t now)
+{
+ if (pool->po_allocated != 0) /* still in use */
+ return 0;
+ if (pool->po_failed)
+ return 1;
+ return cfs_time_aftereq(now, pool->po_deadline);
+}
+
void
kiblnd_pool_free_node(kib_pool_t *pool, cfs_list_t *node)
{
if (ps->ps_pool_list.next == &pool->po_list)
continue;
- if (pool->po_allocated == 0 &&
- cfs_time_aftereq(now, pool->po_deadline))
+ if (kiblnd_pool_is_idle(pool, now))
cfs_list_move(&pool->po_list, &zombies);
}
cfs_spin_unlock(&ps->ps_lock);
if (!cfs_list_empty(&zombies))
- kiblnd_destroy_pool_list(ps, &zombies);
+ kiblnd_destroy_pool_list(&zombies);
}
cfs_list_t *
if (rc == 0) {
cfs_list_add_tail(&pool->po_list, &ps->ps_pool_list);
} else {
- /* retry 10 seconds later */
- ps->ps_next_retry = cfs_time_shift(10);
+ ps->ps_next_retry = cfs_time_shift(IBLND_POOL_RETRY);
CERROR("Can't allocate new %s pool because out of memory\n",
ps->ps_name);
}
}
int
-kiblnd_pmr_pool_map(kib_pmr_poolset_t *pps, kib_rdma_desc_t *rd,
- __u64 *iova, kib_phys_mr_t **pp_pmr)
+kiblnd_pmr_pool_map(kib_pmr_poolset_t *pps, kib_hca_dev_t *hdev,
+ kib_rdma_desc_t *rd, __u64 *iova, kib_phys_mr_t **pp_pmr)
{
kib_phys_mr_t *pmr;
cfs_list_t *node;
}
pmr = container_of(node, kib_phys_mr_t, pmr_list);
+ if (pmr->pmr_pool->ppo_hdev != hdev) {
+ kiblnd_pool_free_node(&pmr->pmr_pool->ppo_pool, node);
+ return -EAGAIN;
+ }
+
for (i = 0; i < rd->rd_nfrags; i ++) {
pmr->pmr_ipb[i].addr = rd->rd_frags[i].rf_addr;
pmr->pmr_ipb[i].size = rd->rd_frags[i].rf_nob;
}
- pmr->pmr_mr = ib_reg_phys_mr(pps->pps_poolset.ps_net->ibn_dev->ibd_pd,
+ pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd,
pmr->pmr_ipb, rd->rd_nfrags,
IB_ACCESS_LOCAL_WRITE |
IB_ACCESS_REMOTE_WRITE,
}
kiblnd_fini_pool(pool);
+ if (ppo->ppo_hdev != NULL)
+ kiblnd_hdev_decref(ppo->ppo_hdev);
+
LIBCFS_FREE(ppo, sizeof(kib_pmr_pool_t));
}
return -ENOMEM;
}
+ ppo->ppo_hdev = kiblnd_current_hdev(ps->ps_net->ibn_dev);
*pp_po = pool;
return 0;
}
LASSERT (pool->po_allocated == 0);
if (tpo->tpo_tx_pages != NULL) {
- if (tpo->tpo_tx_pages->ibp_device != NULL)
- kiblnd_unmap_tx_pool(tpo);
+ kiblnd_unmap_tx_pool(tpo);
kiblnd_free_pages(tpo->tpo_tx_pages);
}
kib_fmr_poolset_t *fps = &net->ibn_fmr_ps;
kib_pmr_poolset_t *pps = &net->ibn_pmr_ps;
kib_tx_poolset_t *tps = &net->ibn_tx_ps;
+ unsigned long flags;
int rc;
if (*kiblnd_tunables.kib_fmr_pool_size <
return -EINVAL;
}
+ cfs_read_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
if (*kiblnd_tunables.kib_map_on_demand > 0 ||
- net->ibn_dev->ibd_nmrs > 1) { /* premapping can fail if ibd_nmr > 1,
- * so we always create FMR/PMR pool and
- * map-on-demand if premapping failed */
+ net->ibn_dev->ibd_hdev->ibh_nmrs > 1) {
+ /* premapping can fail if ibd_nmr > 1, so we always create
+ * FMR/PMR pool and map-on-demand if premapping failed */
+ cfs_read_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
rc = kiblnd_init_fmr_pool_set(fps, net);
if (rc == 0) {
net->ibn_with_fmr = 1;
}
if (rc != 0)
return rc;
+ } else {
+ cfs_read_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
}
rc = kiblnd_init_pool_set(&tps->tps_poolset, net, "TX", IBLND_TX_MSGS(),
return rc;
}
-void
-kiblnd_dev_cleanup(kib_dev_t *ibdev)
-{
- int i;
-
- if (ibdev->ibd_mrs == NULL)
- return;
-
- for (i = 0; i < ibdev->ibd_nmrs; i++) {
- if (ibdev->ibd_mrs[i] == NULL)
- break;
-
- ib_dereg_mr(ibdev->ibd_mrs[i]);
- }
-
- LIBCFS_FREE(ibdev->ibd_mrs, sizeof(*ibdev->ibd_mrs) * ibdev->ibd_nmrs);
- ibdev->ibd_mrs = NULL;
-}
-
static int
-kiblnd_dev_get_attr(kib_dev_t *ibdev)
+kiblnd_hdev_get_attr(kib_hca_dev_t *hdev)
{
struct ib_device_attr *attr;
int rc;
/* It's safe to assume a HCA can handle a page size
* matching that of the native system */
- ibdev->ibd_page_shift = PAGE_SHIFT;
- ibdev->ibd_page_size = 1 << PAGE_SHIFT;
- ibdev->ibd_page_mask = ~((__u64)ibdev->ibd_page_size - 1);
+ hdev->ibh_page_shift = PAGE_SHIFT;
+ hdev->ibh_page_size = 1 << PAGE_SHIFT;
+ hdev->ibh_page_mask = ~((__u64)hdev->ibh_page_size - 1);
LIBCFS_ALLOC(attr, sizeof(*attr));
if (attr == NULL) {
return -ENOMEM;
}
- rc = ib_query_device(ibdev->ibd_cmid->device, attr);
+ rc = ib_query_device(hdev->ibh_ibdev, attr);
if (rc == 0)
- ibdev->ibd_mr_size = attr->max_mr_size;
+ hdev->ibh_mr_size = attr->max_mr_size;
LIBCFS_FREE(attr, sizeof(*attr));
return rc;
}
-#ifdef HAVE_OFED_TRANSPORT_IWARP
- /* XXX We can't trust this value returned by Chelsio driver, it's wrong
- * and we have reported the bug, remove these in the future when Chelsio
- * bug got fixed. */
- if (rdma_node_get_transport(ibdev->ibd_cmid->device->node_type) ==
- RDMA_TRANSPORT_IWARP)
- ibdev->ibd_mr_size = (1ULL << 32) - 1;
-#endif
-
- if (ibdev->ibd_mr_size == ~0ULL) {
- ibdev->ibd_mr_shift = 64;
+ if (hdev->ibh_mr_size == ~0ULL) {
+ hdev->ibh_mr_shift = 64;
return 0;
}
- for (ibdev->ibd_mr_shift = 0;
- ibdev->ibd_mr_shift < 64; ibdev->ibd_mr_shift ++) {
- if (ibdev->ibd_mr_size == (1ULL << ibdev->ibd_mr_shift) ||
- ibdev->ibd_mr_size == (1ULL << ibdev->ibd_mr_shift) - 1)
+ for (hdev->ibh_mr_shift = 0;
+ hdev->ibh_mr_shift < 64; hdev->ibh_mr_shift ++) {
+ if (hdev->ibh_mr_size == (1ULL << hdev->ibh_mr_shift) ||
+ hdev->ibh_mr_size == (1ULL << hdev->ibh_mr_shift) - 1)
return 0;
}
- CERROR("Invalid mr size: "LPX64"\n", ibdev->ibd_mr_size);
+ CERROR("Invalid mr size: "LPX64"\n", hdev->ibh_mr_size);
return -EINVAL;
}
+void
+kiblnd_hdev_cleanup_mrs(kib_hca_dev_t *hdev)
+{
+ int i;
+
+ if (hdev->ibh_nmrs == 0 || hdev->ibh_mrs == NULL)
+ return;
+
+ for (i = 0; i < hdev->ibh_nmrs; i++) {
+ if (hdev->ibh_mrs[i] == NULL)
+ break;
+
+ ib_dereg_mr(hdev->ibh_mrs[i]);
+ }
+
+ LIBCFS_FREE(hdev->ibh_mrs, sizeof(*hdev->ibh_mrs) * hdev->ibh_nmrs);
+ hdev->ibh_mrs = NULL;
+ hdev->ibh_nmrs = 0;
+}
+
+void
+kiblnd_hdev_destroy(kib_hca_dev_t *hdev)
+{
+ kiblnd_hdev_cleanup_mrs(hdev);
+
+ if (hdev->ibh_pd != NULL)
+ ib_dealloc_pd(hdev->ibh_pd);
+
+ if (hdev->ibh_cmid != NULL)
+ rdma_destroy_id(hdev->ibh_cmid);
+
+ LIBCFS_FREE(hdev, sizeof(*hdev));
+}
+
int
-kiblnd_dev_setup(kib_dev_t *ibdev)
+kiblnd_hdev_setup_mrs(kib_hca_dev_t *hdev)
{
struct ib_mr *mr;
int i;
int acflags = IB_ACCESS_LOCAL_WRITE |
IB_ACCESS_REMOTE_WRITE;
- rc = kiblnd_dev_get_attr(ibdev);
+ rc = kiblnd_hdev_get_attr(hdev);
if (rc != 0)
return rc;
- if (ibdev->ibd_mr_shift == 64) {
- LIBCFS_ALLOC(ibdev->ibd_mrs, 1 * sizeof(*ibdev->ibd_mrs));
- if (ibdev->ibd_mrs == NULL) {
+ if (hdev->ibh_mr_shift == 64) {
+ LIBCFS_ALLOC(hdev->ibh_mrs, 1 * sizeof(*hdev->ibh_mrs));
+ if (hdev->ibh_mrs == NULL) {
CERROR("Failed to allocate MRs table\n");
return -ENOMEM;
}
- ibdev->ibd_mrs[0] = NULL;
- ibdev->ibd_nmrs = 1;
+ hdev->ibh_mrs[0] = NULL;
+ hdev->ibh_nmrs = 1;
- mr = ib_get_dma_mr(ibdev->ibd_pd, acflags);
+ mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
if (IS_ERR(mr)) {
CERROR("Failed ib_get_dma_mr : %ld\n", PTR_ERR(mr));
- kiblnd_dev_cleanup(ibdev);
+ kiblnd_hdev_cleanup_mrs(hdev);
return PTR_ERR(mr);
}
- ibdev->ibd_mrs[0] = mr;
+ hdev->ibh_mrs[0] = mr;
goto out;
}
- mr_size = (1ULL << ibdev->ibd_mr_shift);
+ mr_size = (1ULL << hdev->ibh_mr_shift);
mm_size = (unsigned long)high_memory - PAGE_OFFSET;
- ibdev->ibd_nmrs = (int)((mm_size + mr_size - 1) >> ibdev->ibd_mr_shift);
+ hdev->ibh_nmrs = (int)((mm_size + mr_size - 1) >> hdev->ibh_mr_shift);
- if (ibdev->ibd_mr_shift < 32 || ibdev->ibd_nmrs > 1024) {
+ if (hdev->ibh_mr_shift < 32 || hdev->ibh_nmrs > 1024) {
/* it's 4T..., assume we will re-code at that time */
CERROR("Can't support memory size: x"LPX64
" with MR size: x"LPX64"\n", mm_size, mr_size);
}
/* create an array of MRs to cover all memory */
- LIBCFS_ALLOC(ibdev->ibd_mrs, sizeof(*ibdev->ibd_mrs) * ibdev->ibd_nmrs);
- if (ibdev->ibd_mrs == NULL) {
+ LIBCFS_ALLOC(hdev->ibh_mrs, sizeof(*hdev->ibh_mrs) * hdev->ibh_nmrs);
+ if (hdev->ibh_mrs == NULL) {
CERROR("Failed to allocate MRs' table\n");
return -ENOMEM;
}
- memset(ibdev->ibd_mrs, 0, sizeof(*ibdev->ibd_mrs) * ibdev->ibd_nmrs);
+ memset(hdev->ibh_mrs, 0, sizeof(*hdev->ibh_mrs) * hdev->ibh_nmrs);
- for (i = 0; i < ibdev->ibd_nmrs; i++) {
+ for (i = 0; i < hdev->ibh_nmrs; i++) {
struct ib_phys_buf ipb;
__u64 iova;
- ipb.size = ibdev->ibd_mr_size;
+ ipb.size = hdev->ibh_mr_size;
ipb.addr = i * mr_size;
iova = ipb.addr;
- mr = ib_reg_phys_mr(ibdev->ibd_pd, &ipb, 1, acflags, &iova);
+ mr = ib_reg_phys_mr(hdev->ibh_pd, &ipb, 1, acflags, &iova);
if (IS_ERR(mr)) {
CERROR("Failed ib_reg_phys_mr addr "LPX64
" size "LPX64" : %ld\n",
ipb.addr, ipb.size, PTR_ERR(mr));
- kiblnd_dev_cleanup(ibdev);
+ kiblnd_hdev_cleanup_mrs(hdev);
return PTR_ERR(mr);
}
LASSERT (iova == ipb.addr);
- ibdev->ibd_mrs[i] = mr;
+ hdev->ibh_mrs[i] = mr;
}
out:
- CDEBUG(D_CONSOLE, "Register global MR array, MR size: "
- LPX64", array size: %d\n",
- ibdev->ibd_mr_size, ibdev->ibd_nmrs);
+ if (hdev->ibh_mr_size != ~0ULL || hdev->ibh_nmrs != 1)
+ LCONSOLE_INFO("Register global MR array, MR size: "
+ LPX64", array size: %d\n",
+ hdev->ibh_mr_size, hdev->ibh_nmrs);
+ return 0;
+}
- cfs_list_add_tail(&ibdev->ibd_list,
- &kiblnd_data.kib_devs);
+static int
+kiblnd_dummy_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
+{ /* DUMMY */
return 0;
}
+static int
+kiblnd_dev_need_failover(kib_dev_t *dev)
+{
+ struct rdma_cm_id *cmid;
+ struct sockaddr_in srcaddr;
+ struct sockaddr_in dstaddr;
+ int rc;
+
+ if (dev->ibd_hdev == NULL || /* initializing */
+ dev->ibd_hdev->ibh_cmid == NULL || /* listener is dead */
+ *kiblnd_tunables.kib_dev_failover > 1) /* debugging */
+ return 1;
+
+ /* XXX: it's UGLY, but I don't have better way to find
+ * ib-bonding HCA failover because:
+ *
+ * a. no reliable CM event for HCA failover...
+ * b. no OFED API to get ib_device for current net_device...
+ *
+ * We have only two choices at this point:
+ *
+ * a. rdma_bind_addr(), it will conflict with listener cmid
+ * b. rdma_resolve_addr() to zero addr */
+ cmid = kiblnd_rdma_create_id(kiblnd_dummy_callback, dev, RDMA_PS_TCP,
+ IB_QPT_RC);
+ if (IS_ERR(cmid)) {
+ rc = PTR_ERR(cmid);
+ CERROR("Failed to create cmid for failover: %d\n", rc);
+ return rc;
+ }
+
+ memset(&srcaddr, 0, sizeof(srcaddr));
+ srcaddr.sin_family = AF_INET;
+ srcaddr.sin_addr.s_addr = (__force u32)htonl(dev->ibd_ifip);
+
+ memset(&dstaddr, 0, sizeof(dstaddr));
+ dstaddr.sin_family = AF_INET;
+ rc = rdma_resolve_addr(cmid, (struct sockaddr *)&srcaddr,
+ (struct sockaddr *)&dstaddr, 1);
+ if (rc != 0) {
+ CERROR("Failed to bind %s to device: %d\n",
+ dev->ibd_ifname, rc);
+ rdma_destroy_id(cmid);
+ return rc;
+ }
+
+ LASSERT (cmid->device != NULL);
+ if (dev->ibd_hdev->ibh_ibdev == cmid->device) {
+ /* don't need device failover */
+ rdma_destroy_id(cmid);
+ return 0;
+ }
+
+ return 1;
+}
+
+int
+kiblnd_dev_failover(kib_dev_t *dev)
+{
+ CFS_LIST_HEAD (zombie_tpo);
+ CFS_LIST_HEAD (zombie_ppo);
+ CFS_LIST_HEAD (zombie_fpo);
+ struct rdma_cm_id *cmid = NULL;
+ kib_hca_dev_t *hdev = NULL;
+ kib_hca_dev_t *old;
+ struct ib_pd *pd;
+ kib_net_t *net;
+ struct sockaddr_in addr;
+ unsigned long flags;
+ int rc = 0;
+
+ LASSERT (*kiblnd_tunables.kib_dev_failover > 1 ||
+ dev->ibd_can_failover ||
+ dev->ibd_hdev == NULL);
+
+ rc = kiblnd_dev_need_failover(dev);
+ if (rc <= 0)
+ goto out;
+
+ if (dev->ibd_hdev != NULL &&
+ dev->ibd_hdev->ibh_cmid != NULL) {
+ /* XXX it's not good to close old listener at here,
+ * because we can fail to create new listener.
+ * But we have to close it now, otherwise rdma_bind_addr
+ * will return EADDRINUSE... How crap! */
+ cfs_write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
+
+ cmid = dev->ibd_hdev->ibh_cmid;
+ /* make next schedule of kiblnd_dev_need_failover
+ * will return 1 for me */
+ dev->ibd_hdev->ibh_cmid = NULL;
+ cfs_write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
+
+ rdma_destroy_id(cmid);
+ }
+
+ cmid = kiblnd_rdma_create_id(kiblnd_cm_callback, dev, RDMA_PS_TCP,
+ IB_QPT_RC);
+ if (IS_ERR(cmid)) {
+ rc = PTR_ERR(cmid);
+ CERROR("Failed to create cmid for failover: %d\n", rc);
+ goto out;
+ }
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = (__force u32)htonl(dev->ibd_ifip);
+ addr.sin_port = htons(*kiblnd_tunables.kib_service);
+
+ /* Bind to failover device or port */
+ rc = rdma_bind_addr(cmid, (struct sockaddr *)&addr);
+ if (rc != 0) {
+ CERROR("Failed to bind %s to device: %d\n",
+ dev->ibd_ifname, rc);
+ rdma_destroy_id(cmid);
+ goto out;
+ }
+
+ LIBCFS_ALLOC(hdev, sizeof(*hdev));
+ if (hdev == NULL) {
+ CERROR("Failed to allocate kib_hca_dev\n");
+ rdma_destroy_id(cmid);
+ rc = -ENOMEM;
+ goto out;
+ }
+ memset(hdev, 0, sizeof(*hdev));
+ atomic_set(&hdev->ibh_ref, 1);
+ hdev->ibh_dev = dev;
+ hdev->ibh_cmid = cmid;
+ hdev->ibh_ibdev = cmid->device;
+
+ pd = ib_alloc_pd(cmid->device);
+ if (IS_ERR(pd)) {
+ rc = PTR_ERR(pd);
+ CERROR("Can't allocate PD: %d\n", rc);
+ goto out;
+ }
+
+ hdev->ibh_pd = pd;
+
+ rc = rdma_listen(cmid, 0);
+ if (rc != 0) {
+ CERROR("Can't start new listener: %d\n", rc);
+ goto out;
+ }
+
+ rc = kiblnd_hdev_setup_mrs(hdev);
+ if (rc != 0) {
+ CERROR("Can't setup device: %d\n", rc);
+ goto out;
+ }
+
+ cfs_write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
+
+ old = dev->ibd_hdev;
+ dev->ibd_hdev = hdev; /* take over the refcount */
+ hdev = old;
+
+ cfs_list_for_each_entry(net, &dev->ibd_nets, ibn_list) {
+ kiblnd_fail_pool_set(&net->ibn_tx_ps.tps_poolset, &zombie_tpo);
+ if (net->ibn_with_pmr)
+ kiblnd_fail_pool_set(&net->ibn_pmr_ps.pps_poolset, &zombie_ppo);
+ if (net->ibn_with_fmr)
+ kiblnd_fail_fmr_pool_set(&net->ibn_fmr_ps, &zombie_fpo);
+ }
+
+ cfs_write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
+ out:
+ if (!cfs_list_empty(&zombie_tpo))
+ kiblnd_destroy_pool_list(&zombie_tpo);
+ if (!cfs_list_empty(&zombie_ppo))
+ kiblnd_destroy_pool_list(&zombie_ppo);
+ if (!cfs_list_empty(&zombie_fpo))
+ kiblnd_destroy_fmr_pool_list(&zombie_fpo);
+ if (hdev != NULL)
+ kiblnd_hdev_decref(hdev);
+
+ if (rc != 0)
+ dev->ibd_failed_failover++;
+ else
+ dev->ibd_failed_failover = 0;
+
+ return rc;
+}
+
void
kiblnd_destroy_dev (kib_dev_t *dev)
{
LASSERT (dev->ibd_nnets == 0);
+ LASSERT (cfs_list_empty(&dev->ibd_nets));
- if (!cfs_list_empty(&dev->ibd_list)) /* on kib_devs? */
- cfs_list_del_init(&dev->ibd_list);
+ cfs_list_del(&dev->ibd_fail_list);
+ cfs_list_del(&dev->ibd_list);
- kiblnd_dev_cleanup(dev);
+ if (dev->ibd_hdev != NULL)
+ kiblnd_hdev_decref(dev->ibd_hdev);
- if (dev->ibd_pd != NULL)
- ib_dealloc_pd(dev->ibd_pd);
+ LIBCFS_FREE(dev, sizeof(*dev));
+}
- if (dev->ibd_cmid != NULL)
- rdma_destroy_id(dev->ibd_cmid);
+kib_dev_t *
+kiblnd_create_dev(char *ifname)
+{
+ struct net_device *netdev;
+ kib_dev_t *dev;
+ __u32 netmask;
+ __u32 ip;
+ int up;
+ int rc;
- LIBCFS_FREE(dev, sizeof(*dev));
+ rc = libcfs_ipif_query(ifname, &up, &ip, &netmask);
+ if (rc != 0) {
+ CERROR("Can't query IPoIB interface %s: %d\n",
+ ifname, rc);
+ return NULL;
+ }
+
+ if (!up) {
+ CERROR("Can't query IPoIB interface %s: it's down\n", ifname);
+ return NULL;
+ }
+
+ LIBCFS_ALLOC(dev, sizeof(*dev));
+ if (dev == NULL)
+ return NULL;
+
+ memset(dev, 0, sizeof(*dev));
+#ifdef HAVE_DEV_GET_BY_NAME_2ARG
+ netdev = dev_get_by_name(&init_net, ifname);
+#else
+ netdev = dev_get_by_name(ifname);
+#endif
+ if (netdev == NULL) {
+ dev->ibd_can_failover = 0;
+ } else {
+ dev->ibd_can_failover = !!(netdev->flags & IFF_MASTER);
+ dev_put(netdev);
+ }
+
+ CFS_INIT_LIST_HEAD(&dev->ibd_nets);
+ CFS_INIT_LIST_HEAD(&dev->ibd_list); /* not yet in kib_devs */
+ CFS_INIT_LIST_HEAD(&dev->ibd_fail_list);
+ dev->ibd_ifip = ip;
+ strcpy(&dev->ibd_ifname[0], ifname);
+
+ /* initialize the device */
+ rc = kiblnd_dev_failover(dev);
+ if (rc != 0) {
+ CERROR("Can't initialize device: %d\n", rc);
+ LIBCFS_FREE(dev, sizeof(*dev));
+ return NULL;
+ }
+
+ cfs_list_add_tail(&dev->ibd_list,
+ &kiblnd_data.kib_devs);
+ return dev;
}
void
kiblnd_data.kib_shutdown = 1;
cfs_waitq_broadcast(&kiblnd_data.kib_sched_waitq);
cfs_waitq_broadcast(&kiblnd_data.kib_connd_waitq);
+ cfs_waitq_broadcast(&kiblnd_data.kib_failover_waitq);
i = 2;
while (cfs_atomic_read(&kiblnd_data.kib_nthreads) != 0) {
kiblnd_ni_fini_pools(net);
+ cfs_write_lock_irqsave(g_lock, flags);
LASSERT (net->ibn_dev->ibd_nnets > 0);
net->ibn_dev->ibd_nnets--;
+ cfs_list_del(&net->ibn_list);
+ cfs_write_unlock_irqrestore(g_lock, flags);
/* fall through */
cfs_rwlock_init(&kiblnd_data.kib_global_lock);
CFS_INIT_LIST_HEAD(&kiblnd_data.kib_devs);
+ CFS_INIT_LIST_HEAD(&kiblnd_data.kib_failed_devs);
kiblnd_data.kib_peer_hash_size = IBLND_PEER_HASH_SIZE;
LIBCFS_ALLOC(kiblnd_data.kib_peers,
cfs_spin_lock_init(&kiblnd_data.kib_sched_lock);
CFS_INIT_LIST_HEAD(&kiblnd_data.kib_sched_conns);
cfs_waitq_init(&kiblnd_data.kib_sched_waitq);
+ cfs_waitq_init(&kiblnd_data.kib_failover_waitq);
kiblnd_data.kib_error_qpa.qp_state = IB_QPS_ERR;
goto failed;
}
+ if (*kiblnd_tunables.kib_dev_failover != 0)
+ rc = kiblnd_thread_start(kiblnd_failover_thread, NULL);
+
+ if (rc != 0) {
+ CERROR("Can't spawn o2iblnd failover thread: %d\n", rc);
+ goto failed;
+ }
+
/* flag everything initialised */
kiblnd_data.kib_init = IBLND_INIT_ALL;
/*****************************************************/
kib_net_t *net;
cfs_list_t *tmp;
struct timeval tv;
+ unsigned long flags;
int rc;
LASSERT (ni->ni_lnd == &the_o2iblnd);
ibdev = NULL;
}
- if (ibdev == NULL) {
- __u32 ip;
- __u32 netmask;
- int up;
- struct rdma_cm_id *id;
- struct ib_pd *pd;
- struct sockaddr_in addr;
-
- rc = libcfs_ipif_query(ifname, &up, &ip, &netmask);
- if (rc != 0) {
- CERROR("Can't query IPoIB interface %s: %d\n",
- ifname, rc);
- goto failed;
- }
-
- if (!up) {
- CERROR("Can't query IPoIB interface %s: it's down\n",
- ifname);
- goto failed;
- }
-
- LIBCFS_ALLOC(ibdev, sizeof(*ibdev));
- if (ibdev == NULL)
- goto failed;
+ if (ibdev == NULL)
+ ibdev = kiblnd_create_dev(ifname);
- memset(ibdev, 0, sizeof(*ibdev));
-
- CFS_INIT_LIST_HEAD(&ibdev->ibd_list); /* not yet in kib_devs */
- ibdev->ibd_ifip = ip;
- strcpy(&ibdev->ibd_ifname[0], ifname);
-
- id = rdma_create_id(kiblnd_cm_callback, ibdev, RDMA_PS_TCP);
- if (IS_ERR(id)) {
- CERROR("Can't create listen ID: %ld\n", PTR_ERR(id));
- goto failed;
- }
-
- ibdev->ibd_cmid = id;
-
- memset(&addr, 0, sizeof(addr));
- addr.sin_family = AF_INET;
- addr.sin_port = htons(*kiblnd_tunables.kib_service);
- addr.sin_addr.s_addr = htonl(ip);
-
- rc = rdma_bind_addr(id, (struct sockaddr *)&addr);
- if (rc != 0) {
- CERROR("Can't bind to %s: %d\n", ifname, rc);
- goto failed;
- }
-
- /* Binding should have assigned me an IB device */
- LASSERT (id->device != NULL);
- CDEBUG(D_CONSOLE, "Listener bound to %s:%u.%u.%u.%u:%d:%s\n",
- ifname, HIPQUAD(ip), *kiblnd_tunables.kib_service,
- id->device->name);
-
- pd = ib_alloc_pd(id->device);
- if (IS_ERR(pd)) {
- CERROR("Can't allocate PD: %ld\n", PTR_ERR(pd));
- goto failed;
- }
-
- ibdev->ibd_pd = pd;
-
- rc = rdma_listen(id, 256);
- if (rc != 0) {
- CERROR("Can't start listener: %d\n", rc);
- goto failed;
- }
-
- rc = kiblnd_dev_setup(ibdev);
- if (rc != 0) {
- CERROR("Can't setup device: %d\n", rc);
- goto failed;
- }
- }
+ if (ibdev == NULL)
+ goto failed;
- ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), ibdev->ibd_ifip);
net->ibn_dev = ibdev;
+ ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), ibdev->ibd_ifip);
rc = kiblnd_net_init_pools(net);
if (rc != 0) {
CERROR("Failed to initialize NI pools: %d\n", rc);
goto failed;
}
+
+ cfs_write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
ibdev->ibd_nnets++;
+ cfs_list_add_tail(&net->ibn_list, &ibdev->ibd_nets);
+ cfs_write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
+
net->ibn_init = IBLND_INIT_ALL;
return 0;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff