On 4/2/2012 3:35 PM, Roland Dreier wrote:
> From: Roland Dreier <rol...@purestorage.com>
>
> Commit e9319b0cb00d ("IB/core: Fix SDR rates in sysfs") changed our
> sysfs rate attribute to return EINVAL to userspace if the underlying
> device driver returns an invalid rate. Apparently some drivers do this
> when the link is down and some userspace pukes if it gets an error when
> reading this attribute, so avoid a regression by not return an error to
> match the old code.
>
> Signed-off-by: Roland Dreier <rol...@purestorage.com>
> ---
> I think I'd rather just add this, to get back closer to the original
> behavior even for non-fixed drivers (but I'll still merge the mlx4
> patch, since that makes sense too).
>
> drivers/infiniband/core/sysfs.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
> index 83b720e..246fdc1 100644
> --- a/drivers/infiniband/core/sysfs.c
> +++ b/drivers/infiniband/core/sysfs.c
> @@ -179,7 +179,7 @@ static ssize_t rate_show(struct ib_port *p, struct
> port_attribute *unused,
> {
> struct ib_port_attr attr;
> char *speed = "";
> - int rate = -1; /* in deci-Gb/sec */
> + int rate; /* in deci-Gb/sec */
> ssize_t ret;
>
> ret = ib_query_port(p->ibdev, p->port_num, &attr);
> @@ -187,9 +187,6 @@ static ssize_t rate_show(struct ib_port *p, struct
> port_attribute *unused,
> return ret;
>
> switch (attr.active_speed) {
> - case IB_SPEED_SDR:
> - rate = 25;
> - break;
> case IB_SPEED_DDR:
> speed = " DDR";
> rate = 50;
> @@ -210,6 +207,10 @@ static ssize_t rate_show(struct ib_port *p, struct
> port_attribute *unused,
> speed = " EDR";
> rate = 250;
> break;
> + case IB_SPEED_SDR:
> + default: /* default to SDR for invalid rates */
> + rate = 25;
> + break;
> }
>
> rate *= ib_width_enum_to_int(attr.active_width);
Should there be a similar change to ib_width_enum_to_int implementation
in ib_verbs.h and then rate < 0 returning -EINVAL here can be removed ?
-- Hal
--
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
