[PATCH] umad_sm.h Add SM trap definitions

2013-06-03 Thread Line Holen
Signed-off-by: Line Holen line.ho...@oracle.com

---

diff --git a/include/infiniband/umad_sm.h b/include/infiniband/umad_sm.h
index 0ef3863..297734f 100644
--- a/include/infiniband/umad_sm.h
+++ b/include/infiniband/umad_sm.h
@@ -4,6 +4,7 @@
  * Copyright (c) 2004 Intel Corporation.  All rights reserved.
  * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
  * Copyright (c) 2004 Voltaire Corporation.  All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -77,6 +78,25 @@ enum {
 };
 
 enum {
+   UMAD_SM_GID_IN_SERVICE_TRAP = 64,
+   UMAD_SM_GID_OUT_OF_SERVICE_TRAP = 65,
+   UMAD_SM_MGID_CREATED_TRAP   = 66,
+   UMAD_SM_MGID_DESTROYED_TRAP = 67,
+   UMAD_SM_UNPATH_TRAP = 68,
+   UMAD_SM_REPATH_TRAP = 69,
+   UMAD_SM_LINK_STATE_CHANGED_TRAP = 128,
+   UMAD_SM_LINK_INTEGRITY_THRESHOLD_TRAP   = 129,
+   UMAD_SM_BUFFER_OVERRUN_THRESHOLD_TRAP   = 130,
+   UMAD_SM_WATCHDOG_TIMER_EXPIRED_TRAP = 131,
+   UMAD_SM_LOCAL_CHANGES_TRAP  = 144,
+   UMAD_SM_SYS_IMG_GUID_CHANGED_TRAP   = 145,
+   UMAD_SM_BAD_MKEY_TRAP   = 256,
+   UMAD_SM_BAD_PKEY_TRAP   = 257,
+   UMAD_SM_BAD_QKEY_TRAP   = 258,
+   UMAD_SM_BAD_SWITCH_PKEY_TRAP= 259
+};
+
+enum {
UMAD_LEN_SMP_DATA   = 64,
UMAD_SMP_MAX_HOPS   = 64
 };
--
To unsubscribe from this list: send the line unsubscribe linux-rdma in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] Some log changes

2013-06-03 Thread Line Holen
Signed-off-by: Line Holen line.ho...@oracle.com

---

diff --git a/opensm/osm_lin_fwd_rcv.c b/opensm/osm_lin_fwd_rcv.c
index dd18c09..13d9b72 100644
--- a/opensm/osm_lin_fwd_rcv.c
+++ b/opensm/osm_lin_fwd_rcv.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2002-2005,2008 Mellanox Technologies LTD. All rights reserved.
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
  * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -104,8 +105,8 @@ void osm_lft_rcv_process(IN void *context, IN void *data)
}
} else {
OSM_LOG(sm-p_log, OSM_LOG_ERROR, ERR 0402: 
-   Setting forwarding table block failed (%s)
-   , Switch 0x% PRIx64  %s\n,
+   Setting forwarding table block %d failed (%s)
+   , Switch 0x% PRIx64  %s\n, block_num,
ib_get_err_str(status), cl_ntoh64(node_guid),
p_sw-p_node-print_desc);
}
diff --git a/opensm/osm_node_desc_rcv.c b/opensm/osm_node_desc_rcv.c
index 065909b..546ffed 100644
--- a/opensm/osm_node_desc_rcv.c
+++ b/opensm/osm_node_desc_rcv.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved.
  * Copyright (c) 2002-2007 Mellanox Technologies LTD. All rights reserved.
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -87,7 +88,7 @@ static void nd_rcv_process_nd(IN osm_sm_t * sm, IN osm_node_t 
* p_node,
 #endif /* ENABLE_OSM_PERF_MGR */
 
OSM_LOG(sm-p_log, OSM_LOG_VERBOSE,
-   Node 0x% PRIx64 \n\t\t\t\tDescription = %s\n,
+   Node 0x% PRIx64 , Description = %s\n,
cl_ntoh64(osm_node_get_node_guid(p_node)), p_node-print_desc);
 
OSM_LOG_EXIT(sm-p_log);
diff --git a/opensm/osm_port_info_rcv.c b/opensm/osm_port_info_rcv.c
index 2ea35b8..7dcd15e 100644
--- a/opensm/osm_port_info_rcv.c
+++ b/opensm/osm_port_info_rcv.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2002-2012 Mellanox Technologies LTD. All rights reserved.
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
  * Copyright (c) 2009 HNR Consulting. All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -146,8 +147,8 @@ static void pi_rcv_process_endport(IN osm_sm_t * sm, IN 
osm_physp_t * p_physp,
cl_ntoh64(port_guid));
else {
OSM_LOG(sm-p_log, OSM_LOG_VERBOSE,
-   Detected another SM. Requesting SMInfo
-   \n\t\t\t\tPort 0x% PRIx64 \n,
+   Detected another SM. Requesting SMInfo 

+   from port 0x% PRIx64 \n,
cl_ntoh64(port_guid));
 
/*
@@ -168,8 +169,10 @@ static void pi_rcv_process_endport(IN osm_sm_t * sm, IN 
osm_physp_t * p_physp,
if (status != IB_SUCCESS)
OSM_LOG(sm-p_log, OSM_LOG_ERROR,
ERR 0F05: 
-   Failure requesting SMInfo 
(%s)\n,
-   ib_get_err_str(status));
+   Failure requesting SMInfo (%s) 

+   from port 0x% PRIx64 \n,
+   ib_get_err_str(status),
+   cl_ntoh64(port_guid));
}
} else {
p_sm =
diff --git a/opensm/osm_sminfo_rcv.c b/opensm/osm_sminfo_rcv.c
index a0092a5..6520e65 100644
--- a/opensm/osm_sminfo_rcv.c
+++ b/opensm/osm_sminfo_rcv.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved.
  * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

RE: [PATCH libibverbs v5 3/7] livibverbs: Add support for XRC SRQs

2013-06-03 Thread Hefty, Sean
enum verbs_context_mask {
  VERBS_CONTEXT_XRCD  = 1  0,
  -   VERBS_CONTEXT_RESERVED  = 1  1
  +   VERBS_CONTEXT_SRQ   = 1  1,
  +   VERBS_CONTEXT_RESERVED  = 1  2
};
 
 Would VERBS_CONTEXT_XSRQ or VERBS_CONTEXT_SRQ_EX be more clear?

The structure being extended is ibv_srq, so I think just 'SRQ' is clearer.  The 
same holds for VERBS_CONTEXT_QP.

- Sean
--
To unsubscribe from this list: send the line unsubscribe linux-rdma in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: Status of ummunot branch?

2013-06-03 Thread Jeff Squyres (jsquyres)
On May 29, 2013, at 1:53 AM, Or Gerlitz or.gerl...@gmail.com wrote:

 Have you looked on ODP? see
 https://www.openfabrics.org/resources/document-downloads/presentations/doc_download/568-on-demand-paging-for-user-space-networking.html


Is the idea behind ODP that, at the beginning of time, you register the entire 
memory space (i.e., NULL to 2^64) and then never worry about registered memory?

-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

--
To unsubscribe from this list: send the line unsubscribe linux-rdma in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html