opensm/osm_vendor_ibumad: Use OSM_UMAD_MAX_AGENTS rather than UMAD_CA_MAX_AGENTS
PATCH 1/1 opensm/osm_vendor_ibumad: Use OSM_UMAD_MAX_AGENTS rather than UMAD_CA_MAX_AGENTS
---
opensm/include/vendor/osm_vendor_ibumad.h +3 -1
@@ -66,6 +66,8 @@ BEGIN_C_DECLS#define OSM_DEFAULT_RETRY_COUNT 3#define OSM_UMAD_MAX_CAS 32#define OSM_UMAD_MAX_PORTS_PER_CA 2 +#define OSM_UMAD_MAX_AGENTS 32 +/****s* OpenSM: Vendor UMAD/osm_ca_info_t * NAME * osm_ca_info_t
@@ -154,7 +156,7 @@ typedef struct _osm_vendor {osm_ca_info_t *p_ca_info;uint32_t timeout;int max_retries; -osm_bind_handle_t agents[UMAD_CA_MAX_AGENTS ]; +osm_bind_handle_t agents[OSM_UMAD_MAX_AGENTS ];char ca_names[OSM_UMAD_MAX_CAS ][UMAD_CA_NAME_LEN ];vendor_match_tbl_t mtbl;umad_port_t umad_port;
opensm/libvendor/osm_vendor_ibumad.c +4 -4
@@ -288,7 +288,7 @@ static void *umad_receiver(void *p_ptr) } } -if (mad_agent >=UMAD_CA_MAX_AGENTS || +if (mad_agent >=OSM_UMAD_MAX_AGENTS || !(p_bind = p_vend->agents[mad_agent])) {OSM_LOG (p_ur->p_log,OSM_LOG_ERROR ,"ERR 5407: " "invalid mad agent %d - dropping\n" , mad_agent);
@@ -738,7 +738,7 @@ static void osm_vendor_close_port(osm_vendor_t * const p_vend) }if (p_vend->umad_port_id >=0 ) { -for (i =0 ; i <UMAD_CA_MAX_AGENTS ; i++) +for (i =0 ; i <OSM_UMAD_MAX_AGENTS ; i++)if (p_vend->agents[i])umad_unregister (p_vend->umad_port_id, i);umad_close_port (p_vend->umad_port_id);
@@ -862,7 +862,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend, goto Exit; } -if (p_bind->agent_id >=UMAD_CA_MAX_AGENTS || +if (p_bind->agent_id >=OSM_UMAD_MAX_AGENTS || p_vend->agents[p_bind->agent_id]) { OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5427: " "bad agent id %u or duplicate agent for class %u vers %u\n",
@@ -890,7 +890,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend, goto Exit; } -if (p_bind->agent_id1 >=UMAD_CA_MAX_AGENTS || +if (p_bind->agent_id1 >=OSM_UMAD_MAX_AGENTS || p_vend->agents[p_bind->agent_id1]) { OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5429: " "bad agent id %u or duplicate agent for class 1 vers %u\n",
--
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
Hi Hal,
Could you add commit message to your patches (this and another)?
Quoted 17 lines · Hal Rosenstock
Signed-off-by Hal Rosenstock <[email protected]>---
opensm/include/vendor/osm_vendor_ibumad.h +2
-0@@ -66,6 +66,8 @@ BEGIN_C_DECLS#define OSM_DEFAULT_RETRY_COUNT 3#define OSM_UMAD_MAX_CAS 32#define OSM_UMAD_MAX_PORTS_PER_CA 2 +#define OSM_UMAD_MAX_AGENTS 32 +/****s* OpenSM: Vendor UMAD/osm_ca_info_t * NAME * osm_ca_info_t
opensm/include/vendor/osm_vendor_ibumad.h typedef struct _osm_vendor { · line 159
Quoted 5 lines
opensm/include/vendor/osm_vendor_ibumad.h +1
-1@@ -154,7 +156,7 @@ typedef struct _osm_vendor {osm_ca_info_t *p_ca_info;uint32_t timeout;int max_retries; -osm_bind_handle_t agents[UMAD_CA_MAX_AGENTS ]; +osm_bind_handle_t agents[OSM_UMAD_MAX_AGENTS ];
Any reason?
Sasha
Quoted 44 lines
opensm/include/vendor/osm_vendor_ibumad.h +0
-0char ca_names[OSM_UMAD_MAX_CAS ][UMAD_CA_NAME_LEN ];vendor_match_tbl_t mtbl;umad_port_t umad_port;opensm/libvendor/osm_vendor_ibumad.c +4
-5@@ -288,7 +288,7 @@ static void *umad_receiver(void *p_ptr) } } -if (mad_agent >=UMAD_CA_MAX_AGENTS || +if (mad_agent >=OSM_UMAD_MAX_AGENTS || !(p_bind = p_vend->agents[mad_agent])) {OSM_LOG (p_ur->p_log,OSM_LOG_ERROR ,"ERR 5407: " "invalid mad agent %d - dropping\n" , mad_agent);@@ -738,7 +738,7 @@ static void osm_vendor_close_port(osm_vendor_t * const p_vend) }if (p_vend->umad_port_id >=0 ) { -for (i =0 ; i <UMAD_CA_MAX_AGENTS ; i++) +for (i =0 ; i <OSM_UMAD_MAX_AGENTS ; i++)if (p_vend->agents[i])umad_unregister (p_vend->umad_port_id, i);umad_close_port (p_vend->umad_port_id);@@ -862,7 +862,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend, goto Exit; } -if (p_bind->agent_id >=UMAD_CA_MAX_AGENTS || +if (p_bind->agent_id >=OSM_UMAD_MAX_AGENTS || p_vend->agents[p_bind->agent_id]) { OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5427: " "bad agent id %u or duplicate agent for class %u vers %u\n",@@ -890,7 +890,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend, goto Exit; } -if (p_bind->agent_id1 >=UMAD_CA_MAX_AGENTS || +if (p_bind->agent_id1 >=OSM_UMAD_MAX_AGENTS || p_vend->agents[p_bind->agent_id1]) { OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5429: " "bad agent id %u or duplicate agent for class 1 vers %u\n", --
Quoted 4 lines
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
--
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
Hi Sasha,
Quoted 3 lines · Sasha Khapyorsky
Hi Hal,
Could you add commit message to your patches (this and another)?
I thought the subject was sufficient and seems to be included in the commits. Is that true ? What are you looking for here that is not being done ?
Quoted 17 lines · Hal Rosenstock
Quoted 16 lines
Signed-off-by Hal Rosenstock <[email protected]>---
opensm/include/vendor/osm_vendor_ibumad.h +2
-0@@ -66,6 +66,8 @@ BEGIN_C_DECLS #define OSM_DEFAULT_RETRY_COUNT 3 #define OSM_UMAD_MAX_CAS 32 #define OSM_UMAD_MAX_PORTS_PER_CA 2 +#define OSM_UMAD_MAX_AGENTS 32 + /****s* OpenSM: Vendor UMAD/osm_ca_info_t* NAME * osm_ca_info_t
Quoted 8 lines
opensm/include/vendor/osm_vendor_ibumad.h typedef struct _osm_vendor { · line 159
Quoted 6 lines
opensm/include/vendor/osm_vendor_ibumad.h +1
-1@@ -154,7 +156,7 @@ typedef struct _osm_vendor { osm_ca_info_t *p_ca_info; uint32_t timeout; int max_retries; - osm_bind_handle_t agents[UMAD_CA_MAX_AGENTS]; + osm_bind_handle_t agents[OSM_UMAD_MAX_AGENTS];Any reason?
To make the umad vendor layer "stand on its own". This was discussed in the Windows porting issues. See thread which ends
http://lists.openfabrics.org/pipermail/ofw/2009-October/005819.html
-- Hal
Quoted 40 lines
Sasha
Quoted 38 lines
opensm/include/vendor/osm_vendor_ibumad.h +0
-0char ca_names[OSM_UMAD_MAX_CAS][UMAD_CA_NAME_LEN]; vendor_match_tbl_t mtbl; umad_port_t umad_port;opensm/libvendor/osm_vendor_ibumad.c +1
-1@@ -288,7 +288,7 @@ static void *umad_receiver(void *p_ptr) } } - if (mad_agent >= UMAD_CA_MAX_AGENTS || + if (mad_agent >= OSM_UMAD_MAX_AGENTS || !(p_bind = p_vend->agents[mad_agent])) {
OSM_LOG(p_ur->p_log, OSM_LOG_ERROR, "ERR 5407: " "invalid mad agent %d - dropping\n", mad_agent);opensm/libvendor/osm_vendor_ibumad.c +2
-2@@ -738,7 +738,7 @@ static void osm_vendor_close_port(osm_vendor_t * const p_vend) } if (p_vend->umad_port_id >= 0) { - for (i = 0; i < UMAD_CA_MAX_AGENTS; i++) + for (i = 0; i < OSM_UMAD_MAX_AGENTS; i++) if (p_vend->agents[i]) umad_unregister(p_vend->umad_port_id, i); umad_close_port(p_vend->umad_port_id);@@ -862,7 +862,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend, goto Exit; } - if (p_bind->agent_id >= UMAD_CA_MAX_AGENTS || + if (p_bind->agent_id >= OSM_UMAD_MAX_AGENTS || p_vend->agents[p_bind->agent_id]) {OSM_LOG(p_vend->p_log,
OSM_LOG_ERROR, "ERR 5427: "
"bad agent id %u or duplicate agent for class %u vers %u\n",opensm/libvendor/osm_vendor_ibumad.c +0
-0@@ -890,7 +890,7 @@ osm_vendor_bind(IN osm_vendor_t * const p_vend, goto Exit; }
Quoted 15 lines
Quoted 10 lines
opensm/libvendor/osm_vendor_ibumad.c +1
-1- if (p_bind->agent_id1 >= UMAD_CA_MAX_AGENTS || + if (p_bind->agent_id1 >= OSM_UMAD_MAX_AGENTS || p_vend->agents[p_bind->agent_id1]) {OSM_LOG(p_vend->p_log,
OSM_LOG_ERROR, "ERR 5429: " "bad agent id %u or duplicate agent for class 1 vers %u\n", --
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--
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
--
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
Quoted 3 lines · Hal Rosenstock
I thought the subject was sufficient and seems to be included in the commits. Is that true ?
Subject is just *one* line patch summary and not patch description (as you trying to use it).
Quoted 2 lines
What are you looking for here that is not
being done ?
Specifically the patch motivation was unclear to me. And this is due to violation of patch submitting recommendations: Look at
/usr/src/linux/Documentation/SubmittingPatches
, specifically #2 and #15 in Section 1.
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
Quoted 12 lines · Hal Rosenstock
Quoted 11 lines
opensm/include/vendor/osm_vendor_ibumad.h typedef struct _osm_vendor { · line 159
Quoted 9 lines
/****s* OpenSM: Vendor UMAD/osm_ca_info_t
* NAME
*osm_ca_info_topensm/include/vendor/osm_vendor_ibumad.h +1
-1@@ -154,7 +156,7 @@ typedef struct _osm_vendor { osm_ca_info_t *p_ca_info; uint32_t timeout; int max_retries; - osm_bind_handle_t agents[UMAD_CA_MAX_AGENTS]; + osm_bind_handle_t agents[OSM_UMAD_MAX_AGENTS];Any reason?
Quoted 3 lines
To make the umad vendor layer "stand on its own". This was discussed in the Windows porting issues. See thread which ends
http://lists.openfabrics.org/pipermail/ofw/2009-October/005819.html
I (and guess that many other OpenSM source and change log readers) am not subscribed on ofw list and unaware about this discussion. Could you summarize (in the patch change log) what is going on there and what is motivation for this change?
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