opensm/osm_vendor_mlx: fix compilation error

Fix compilation error of that was introduced with patch that added configurable transaction retries - osm_vendor_mlx didn't have a definition of OSM_DEFAULT_RETRY_COUNT.

---
 opensm/include/vendor/osm_vendor_mlx.h      |    3 +++
 opensm/include/vendor/osm_vendor_mlx_defs.h |    2 --
 opensm/libvendor/osm_vendor_mlx_txn.c       |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

index e67d280..867baf1 100644
@@ -92,5 +92,8 @@ typedef struct _osm_vend_wrap {
 #define OSM_BIND_INVALID_HANDLE NULL
 #endif
 
+/* The maximum number of retransmissions of the same MAD */
+#define OSM_DEFAULT_RETRY_COUNT  3
+
 END_C_DECLS
 #endif

index d4c2c30..54cf286 100644
@@ -52,8 +52,6 @@
 BEGIN_C_DECLS
 /* The maximum number of outstanding MADs an RMPP sender can transmit */
 #define OSMV_RMPP_RECV_WIN       16
-/* The maximum number of retransmissions of the same MAD */
-#define OSMV_MAX_RETRANSMIT      3
 /* Transaction Timeout = OSMV_TXN_TIMEOUT_FACTOR * Response Timeout */
 #define OSMV_TXN_TIMEOUT_FACTOR  128
 /************/

index 93d17c8..60dc293 100644
@@ -558,7 +558,7 @@ __osmv_txn_timeout_cb(IN uint64_t key,
 	switch (osmv_txn_get_rmpp_state(p_txn)) {
 
 	case OSMV_TXN_RMPP_NONE:
-		if (num_regs <= OSMV_MAX_RETRANSMIT) {
+		if (num_regs <= OSM_DEFAULT_RETRY_COUNT) {
 			/* We still did not exceed the limit of retransmissions.
 			 * Set the next timeout's value.
 			 */

@@ -622,7 +622,7 @@ __osmv_txn_timeout_cb(IN uint64_t key,
 			osmv_txn_get_tid(p_txn));
 
 		p_send_ctx = osmv_txn_get_rmpp_send_ctx(p_txn);
-		if (num_regs <= OSMV_MAX_RETRANSMIT) {
+		if (num_regs <= OSM_DEFAULT_RETRY_COUNT) {
 			/* We still did not exceed the limit of retransmissions.
 			 * Set the next timeout's value.
 			 */

1.5.1.4

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

Applied. Thanks.

Sasha
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

BTW as far as I understand osm_vendor_mlx is used only with ibmgtsim. Right? If so could this be switched to osm_vendor_ibumad?

There is already libumad2sim.so (in ibsim) which catches all user_mad calls and redirects this to where you want. Adoption of such model to ibmgtsim would have a many advantages: it doesn't require OpenSM rebuild, it supports not only OpenSM and osmtest, but virtually any application which uses user_mad, it is really simple.

Finally this will leave us with only one vendor layer - osm_vendor_ibumad. (AFAIK windows OpenSM is moving this direction too).

Sasha
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

H5 Sasha,

That is the plan. It's not as trivial as it sounds.
Some things that exist in vendor_mlx do not exist
in vendor_ibumad (such as RMPP implementation), but this is certainly the plan.

AFAIK, WinSM and ibmgtsim are the only two things that are using non-umad vendor. Once they both will switch to umad, the whole vendor layers as it exists
today in OpenSM won't be necessary.

--Yevgeny

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