[PATCH 4/3] opensm/osm_sa_multipath_record.c: Proper rate comparison and selection

Hal Rosenstock
2011-07-26T16:24:47Z

Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
diff --git a/opensm/osm_sa_multipath_record.c b/opensm/osm_sa_multipath_record.c
index c45ca06..7924cc3 100644
--- a/opensm/osm_sa_multipath_record.c
+++ b/opensm/osm_sa_multipath_record.c
@@ -361,7 +361,8 @@ static ib_api_status_t mpr_rcv_get_path_parms(IN osm_sa_t * sa,
if (mtu > ib_port_info_get_mtu_cap(p_pi))
mtu = ib_port_info_get_mtu_cap(p_pi);

- if (rate > ib_port_info_compute_rate(p_pi, 0))
+ if (ib_path_compare_rates(rate,
+ ib_port_info_compute_rate(p_pi, 0)) > 0)
rate = ib_port_info_compute_rate(p_pi, 0);

/*
@@ -384,7 +385,8 @@ static ib_api_status_t mpr_rcv_get_path_parms(IN osm_sa_t * sa,
if (mtu > ib_port_info_get_mtu_cap(p_pi))
mtu = ib_port_info_get_mtu_cap(p_pi);

- if (rate > ib_port_info_compute_rate(p_pi, 0))
+ if (ib_path_compare_rates(rate,
+ ib_port_info_compute_rate(p_pi, 0)) > 0)
rate = ib_port_info_compute_rate(p_pi, 0);

if (sa->p_subn->opt.qos) {
@@ -417,7 +419,8 @@ static ib_api_status_t mpr_rcv_get_path_parms(IN osm_sa_t * sa,
if (mtu > ib_port_info_get_mtu_cap(p_pi))
mtu = ib_port_info_get_mtu_cap(p_pi);

- if (rate > ib_port_info_compute_rate(p_pi, 0))
+ if (ib_path_compare_rates(rate,
+ ib_port_info_compute_rate(p_pi, 0)) > 0)
rate = ib_port_info_compute_rate(p_pi, 0);

OSM_LOG(sa->p_log, OSM_LOG_DEBUG,
@@ -443,7 +446,7 @@ static ib_api_status_t mpr_rcv_get_path_parms(IN osm_sa_t * sa,
mtu = p_qos_level->mtu_limit;

if (p_qos_level->rate_limit_set
- && (rate > p_qos_level->rate_limit))
+ && (ib_path_compare_rates(rate, p_qos_level->rate_limit) > 0))
rate = p_qos_level->rate_limit;

if (p_qos_level->sl_set) {
@@ -507,23 +510,22 @@ static ib_api_status_t mpr_rcv_get_path_parms(IN osm_sa_t * sa,
required_rate = ib_multipath_rec_rate(p_mpr);
switch (ib_multipath_rec_rate_sel(p_mpr)) {
case 0: /* must be greater than */
- if (rate <= required_rate)
+ if (ib_path_compare_rates(rate, required_rate) <= 0)
status = IB_NOT_FOUND;
break;

case 1: /* must be less than */
- if (rate >= required_rate) {
+ if (ib_path_compare_rates(rate, required_rate) >= 0) {
/* adjust the rate to use the highest rate
lower then the required one */
- if (required_rate > 2)
- rate = required_rate - 1;
- else
+ rate = ib_path_rate_get_prev(required_rate);
+ if (!rate)
status = IB_NOT_FOUND;
}
break;

case 2: /* exact match */
- if (rate < required_rate)
+ if (ib_path_compare_rates(rate, required_rate))
status = IB_NOT_FOUND;
else
rate = required_rate;
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html