From patchwork Thu Aug 11 00:42:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arlin Davis X-Patchwork-Id: 1055452 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7B0gcE7017017 for ; Thu, 11 Aug 2011 00:42:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755535Ab1HKAma (ORCPT ); Wed, 10 Aug 2011 20:42:30 -0400 Received: from mga03.intel.com ([143.182.124.21]:50932 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755529Ab1HKAm3 convert rfc822-to-8bit (ORCPT ); Wed, 10 Aug 2011 20:42:29 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 10 Aug 2011 17:42:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,353,1309762800"; d="scan'208";a="37259058" Received: from azsmsx603.amr.corp.intel.com ([10.2.161.23]) by azsmga001.ch.intel.com with ESMTP; 10 Aug 2011 17:42:15 -0700 Received: from fmsmsx103.amr.corp.intel.com (10.19.9.34) by azsmsx603.amr.corp.intel.com (10.2.161.23) with Microsoft SMTP Server (TLS) id 8.2.255.0; Wed, 10 Aug 2011 17:42:15 -0700 Received: from fmsmsx151.amr.corp.intel.com ([169.254.6.155]) by FMSMSX103.amr.corp.intel.com ([169.254.3.119]) with mapi id 14.01.0323.003; Wed, 10 Aug 2011 17:42:14 -0700 From: "Davis, Arlin R" To: linux-rdma , "ofw@lists.openfabrics.org" , "ewg@lists.openfabrics.org" Subject: [PATCH 6/10] DAPL v2.0: scm: add support for IB collective drivers in socket cm provider Thread-Topic: [PATCH 6/10] DAPL v2.0: scm: add support for IB collective drivers in socket cm provider Thread-Index: AcxXv4J6xcXwyoYKT9G8dOVy+SdSFQ== Date: Thu, 11 Aug 2011 00:42:14 +0000 Message-ID: <54347E5A035A054EAE9D05927FB467F916E42B5F@FMSMSX151.amr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 11 Aug 2011 00:42:38 +0000 (UTC) Add collective member address and threading information on a per transport basis. Call create/free service with HCA open/close. Signed-off-by: Arlin Davis --- dapl/openib_scm/dapl_ib_util.h | 18 +++++++++++++++++- dapl/openib_scm/device.c | 13 +++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dapl/openib_scm/dapl_ib_util.h b/dapl/openib_scm/dapl_ib_util.h index 5f9fb43..0d7f9f3 100644 --- a/dapl/openib_scm/dapl_ib_util.h +++ b/dapl/openib_scm/dapl_ib_util.h @@ -111,7 +111,23 @@ typedef struct _ib_hca_transport uint8_t sl; uint16_t pkey; int pkey_idx; - +#ifdef DAT_IB_COLLECTIVES + /* Collective member device and address information */ + ib_thread_state_t coll_thread_state; + DAPL_OS_THREAD coll_thread; + DAPL_OS_LOCK coll_lock; + DAPL_OS_WAIT_OBJECT coll_event; + struct dapl_llist_entry *grp_list; + user_progress_func_t *user_func; + int l_sock; + struct sockaddr_in m_addr; + void *m_ctx; + void *m_info; + void *f_info; + int m_size; + int f_size; + int t_id; +#endif } ib_hca_transport_t; /* prototypes */ diff --git a/dapl/openib_scm/device.c b/dapl/openib_scm/device.c index 4c50f03..41fccdf 100644 --- a/dapl/openib_scm/device.c +++ b/dapl/openib_scm/device.c @@ -57,6 +57,10 @@ static const char rcsid[] = "$Id: $"; #include +#ifdef DAT_IB_COLLECTIVES +#include +#endif + ib_thread_state_t g_ib_thread_state = 0; DAPL_OS_THREAD g_ib_thread; DAPL_OS_LOCK g_hca_lock; @@ -440,6 +444,11 @@ found: (unsigned long long)htonll(hca_ptr->ib_trans.gid.global. interface_id)); +#ifdef DAT_IB_COLLECTIVES + if (dapli_create_collective_service(hca_ptr)) + goto bail; +#endif + ibv_free_device_list(dev_list); return dat_status; @@ -471,6 +480,10 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) { dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " close_hca: %p\n", hca_ptr); +#ifdef DAT_IB_COLLECTIVES + dapli_free_collective_service(hca_ptr); +#endif + dapl_os_lock(&g_hca_lock); if (g_ib_thread_state != IB_THREAD_RUN) { dapl_os_unlock(&g_hca_lock);