opensm: perfmgr, only set orig_lid when we have a valid port. Otherwise leave it as 0

Commit Message

Ira Weiny April 18, 2011, 5:32 a.m. UTC

On Apr 17, 2011, at 8:06 AM, Alex Netes wrote:

> Hi Ira,
> 
> On 15:17 Fri 15 Apr     , Ira Weiny wrote:
>> 
>> Subject: [PATCH] opensm: perfmgr, only set orig_lid when we have a valid port.  Otherwise leave it as 0
>> 
>> 
>> Signed-off-by: Ira Weiny <[e-mail]>
>> ---
>> opensm/osm_perfmgr.c |    4 +++-
>> 1 files changed, 3 insertions(+), 1 deletions(-)
>> 
>> diff --git a/opensm/osm_perfmgr.c b/opensm/osm_perfmgr.c
>> index 6a1fa63..3e1575a 100644
>> --- a/opensm/osm_perfmgr.c
>> +++ b/opensm/osm_perfmgr.c
>> @@ -454,7 +454,9 @@ static void collect_guids(cl_map_item_t * p_map_item, void *context)
>> 				  ib_switch_info_is_enhanced_port0(&node->sw->
>> 								   switch_info));
>> 		for (port = mon_node->esp0 ? 0 : 1; port < num_ports; port++) {
>> -			mon_node->port[port].orig_lid = get_base_lid(node, port);
>> +			mon_node->port[port].orig_lid = 0;
>> +			if (osm_physp_is_valid(&node->physp_table[port]))
>> +				mon_node->port[port].orig_lid = get_base_lid(node, port);
>> 			mon_node->port[port].valid = TRUE;
> 
> Shouldn't this port marked with mon_node->port[port].valid = FALSE ?

New patch below.


Subject: [PATCH 1/5] opensm/perfmgr: set redirect orig_lid and valid flag only when we have a valid port.

Signed-off-by: Ira Weiny <[e-mail]>
---
 opensm/osm_perfmgr.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/opensm/osm_perfmgr.c b/opensm/osm_perfmgr.c
index 5758587..3578e13 100644
--- a/opensm/osm_perfmgr.c
+++ b/opensm/osm_perfmgr.c
@@ -454,8 +454,12 @@  static void collect_guids(cl_map_item_t * p_map_item, void *context)
 				  ib_switch_info_is_enhanced_port0(&node->sw->
 								   switch_info));
 		for (port = mon_node->esp0 ? 0 : 1; port < num_ports; port++) {
-			mon_node->port[port].orig_lid = get_base_lid(node, port);
-			mon_node->port[port].valid = TRUE;
+			mon_node->port[port].orig_lid = 0;
+			mon_node->port[port].valid = FALSE;
+			if (osm_physp_is_valid(&node->physp_table[port])) {
+				mon_node->port[port].orig_lid = get_base_lid(node, port);
+				mon_node->port[port].valid = TRUE;
+			}
 		}
 
 		cl_qmap_insert(&pm->monitored_map, node_guid,