From patchwork Wed Sep 30 22:04:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arlin Davis X-Patchwork-Id: 50777 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8UM4gAd008902 for ; Wed, 30 Sep 2009 22:04:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752462AbZI3WE2 (ORCPT ); Wed, 30 Sep 2009 18:04:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754369AbZI3WE2 (ORCPT ); Wed, 30 Sep 2009 18:04:28 -0400 Received: from mga01.intel.com ([192.55.52.88]:38667 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752462AbZI3WE1 (ORCPT ); Wed, 30 Sep 2009 18:04:27 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 30 Sep 2009 14:59:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,482,1249282800"; d="scan'208";a="731842577" Received: from ardavis-mobl1.amr.corp.intel.com (HELO ardavisMOBL1) ([10.7.151.150]) by fmsmga001.fm.intel.com with ESMTP; 30 Sep 2009 15:07:27 -0700 From: "Arlin Davis" To: , Cc: "Smith, Stan" Subject: [PATCH] DAPL v2: dtest, dtestx: remove IB verb definitions Date: Wed, 30 Sep 2009 15:04:31 -0700 Message-ID: <6DF924A7A42A4E68A8F2217696304884@amr.corp.intel.com> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 Thread-Index: AcpCGfxRG/17VO2+Qh2S4AYEc1Kfbg== X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/test/dtest/dtest.c b/test/dtest/dtest.c index 75cbe4c..5ac16c4 100755 --- a/test/dtest/dtest.c +++ b/test/dtest/dtest.c @@ -100,7 +100,6 @@ #define MAX_PROCS 1000 /* Header files needed for DAT/uDAPL */ -#include "infiniband/verbs.h" #include "dat2/udat.h" /* definitions */ @@ -219,7 +218,7 @@ union dcm_addr { uint8_t port_num; uint16_t lid; uint32_t qpn; - union ibv_gid gid; + uint8_t gid[16]; } ib; }; @@ -447,15 +446,13 @@ int main(int argc, char **argv) (void*)ia_attr.ia_address_ptr, sizeof(DAT_SOCK_ADDR6)); - if (local.ib.qp_type == IBV_QPT_UD) { - ucm = 1; - printf("%d Local uCM Address = QPN=0x%x, LID=0x%x\n", - getpid(), ntohl(local.ib.qpn), - ntohs(local.ib.lid)); - printf("%d Remote uCM Address = QPN=0x%x, LID=0x%x\n", - getpid(), ntohl(remote.ib.qpn), - ntohs(remote.ib.lid)); - } + printf("%d Local Address %s port %d\n", getpid(), + inet_ntoa(((struct sockaddr_in *)&local)->sin_addr), + SERVER_CONN_QUAL); + + printf("%d Local Address QPN=0x%x, LID=0x%x <<< ucm provider\n", + getpid(), ntohl(local.ib.qpn), + ntohs(local.ib.lid)); /* Create Protection Zone */ start = get_time(); diff --git a/test/dtest/dtestx.c b/test/dtest/dtestx.c index 6e17b6d..2132f31 100755 --- a/test/dtest/dtestx.c +++ b/test/dtest/dtestx.c @@ -65,7 +65,6 @@ #endif -#include "infiniband/verbs.h" #include "dat2/udat.h" #include "dat2/dat_ib_extensions.h" @@ -189,7 +188,7 @@ union dcm_addr { uint8_t port_num; uint16_t lid; uint32_t qpn; - union ibv_gid gid; + uint8_t gid[16]; } ib; }; @@ -444,24 +443,20 @@ int connect_ep(char *hostname) (void*)ia_attr.ia_address_ptr, sizeof(DAT_SOCK_ADDR6)); - if (local.ib.qp_type == IBV_QPT_UD) { - ucm = 1; + printf("%d Local Address %s port %d\n", getpid(), + inet_ntoa(((struct sockaddr_in *)&local)->sin_addr), + SERVER_ID); - if (ud_test) { - printf("%d UD test over UCM provider not supported\n", - getpid()); - exit(1); - } + printf("%d Local Address QPN=0x%x, LID=0x%x <<< ucm provider\n", + getpid(), ntohl(local.ib.qpn), + ntohs(local.ib.lid)); - printf("%d Local uCM Address = QPN=0x%x, LID=0x%x\n", - getpid(), ntohl(local.ib.qpn), - ntohs(local.ib.lid)); - printf("%d Remote uCM Address = QPN=0x%x, LID=0x%x\n", - getpid(), ntohl(remote.ib.qpn), - ntohs(remote.ib.lid)); + if (ucm && ud_test) { + printf("%d UD test over UCM provider not supported\n", + getpid()); + exit(1); } - /* Print provider specific attributes */ for (i = 0; i < prov_attrs.num_provider_specific_attr; i++) { LOGPRINTF(" Provider Specific Attribute[%d] %s=%s\n",