| Message ID | 5681AF4E.8060604@dev.mellanox.co.il (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Dec 28, 2015 at 04:53:18PM -0500, Hal Rosenstock wrote: > > Port number is not part of ClassPortInfo attribute but is > still needed as a parameter when invoking process_mad. > > To properly handle this attribute, port_num is added as a > parameter to get_counter_table and get_perf_mad was changed > not to store port_num in the attribute itself when it's > querying the ClassPortInfo attribute. > > This handles issue pointed out by Matan Barak <matanb@dev.mellanox.co.il> > > Signed-off-by: Hal Rosenstock <hal@mellanox.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> > Acked-by: Matan Barak <matanb@mellanox.com> > --- > diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c > index 539040f..2daf832 100644 > --- a/drivers/infiniband/core/sysfs.c > +++ b/drivers/infiniband/core/sysfs.c > @@ -438,7 +438,8 @@ static int get_perf_mad(struct ib_device *dev, int port_num, int attr, > in_mad->mad_hdr.method = IB_MGMT_METHOD_GET; > in_mad->mad_hdr.attr_id = attr; > > - in_mad->data[41] = port_num; /* PortSelect field */ > + if (attr != IB_PMA_CLASS_PORT_INFO) > + in_mad->data[41] = port_num; /* PortSelect field */ > > if ((dev->process_mad(dev, IB_MAD_IGNORE_MKEY, > port_num, NULL, NULL, > @@ -714,11 +715,12 @@ err: > * Figure out which counter table to use depending on > * the device capabilities. > */ > -static struct attribute_group *get_counter_table(struct ib_device *dev) > +static struct attribute_group *get_counter_table(struct ib_device *dev, > + int port_num) > { > struct ib_class_port_info cpi; > > - if (get_perf_mad(dev, 0, IB_PMA_CLASS_PORT_INFO, > + if (get_perf_mad(dev, port_num, IB_PMA_CLASS_PORT_INFO, > &cpi, 40, sizeof(cpi)) >= 0) { > > if (cpi.capability_mask && IB_PMA_CLASS_CAP_EXT_WIDTH) > @@ -776,7 +778,7 @@ static int add_port(struct ib_device *device, int port_num, > goto err_put; > } > > - p->pma_table = get_counter_table(device); > + p->pma_table = get_counter_table(device, port_num); > ret = sysfs_create_group(&p->kobj, p->pma_table); > if (ret) > goto err_put_gid_attrs; -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 28, 2015 at 11:53 PM, Hal Rosenstock <hal@dev.mellanox.co.il> wrote: > > Port number is not part of ClassPortInfo attribute but is > still needed as a parameter when invoking process_mad. > > To properly handle this attribute, port_num is added as a > parameter to get_counter_table and get_perf_mad was changed > not to store port_num in the attribute itself when it's > querying the ClassPortInfo attribute. > > This handles issue pointed out by Matan Barak <matanb@dev.mellanox.co.il> > > Signed-off-by: Hal Rosenstock <hal@mellanox.com> > Acked-by: Matan Barak <matanb@mellanox.com> > --- > diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c > index 539040f..2daf832 100644 > --- a/drivers/infiniband/core/sysfs.c > +++ b/drivers/infiniband/core/sysfs.c > @@ -438,7 +438,8 @@ static int get_perf_mad(struct ib_device *dev, int port_num, int attr, > in_mad->mad_hdr.method = IB_MGMT_METHOD_GET; > in_mad->mad_hdr.attr_id = attr; > > - in_mad->data[41] = port_num; /* PortSelect field */ > + if (attr != IB_PMA_CLASS_PORT_INFO) > + in_mad->data[41] = port_num; /* PortSelect field */ > > if ((dev->process_mad(dev, IB_MAD_IGNORE_MKEY, > port_num, NULL, NULL, > @@ -714,11 +715,12 @@ err: > * Figure out which counter table to use depending on > * the device capabilities. > */ > -static struct attribute_group *get_counter_table(struct ib_device *dev) > +static struct attribute_group *get_counter_table(struct ib_device *dev, > + int port_num) > { > struct ib_class_port_info cpi; > > - if (get_perf_mad(dev, 0, IB_PMA_CLASS_PORT_INFO, > + if (get_perf_mad(dev, port_num, IB_PMA_CLASS_PORT_INFO, > &cpi, 40, sizeof(cpi)) >= 0) { > > if (cpi.capability_mask && IB_PMA_CLASS_CAP_EXT_WIDTH) > @@ -776,7 +778,7 @@ static int add_port(struct ib_device *device, int port_num, > goto err_put; > } > > - p->pma_table = get_counter_table(device); > + p->pma_table = get_counter_table(device, port_num); > ret = sysfs_create_group(&p->kobj, p->pma_table); > if (ret) > goto err_put_gid_attrs; > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Please just add: Fixes: 145d9c541032 ('IB/core: Display extended counter set if available') -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index 539040f..2daf832 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -438,7 +438,8 @@ static int get_perf_mad(struct ib_device *dev, int port_num, int attr, in_mad->mad_hdr.method = IB_MGMT_METHOD_GET; in_mad->mad_hdr.attr_id = attr; - in_mad->data[41] = port_num; /* PortSelect field */ + if (attr != IB_PMA_CLASS_PORT_INFO) + in_mad->data[41] = port_num; /* PortSelect field */ if ((dev->process_mad(dev, IB_MAD_IGNORE_MKEY, port_num, NULL, NULL, @@ -714,11 +715,12 @@ err: * Figure out which counter table to use depending on * the device capabilities. */ -static struct attribute_group *get_counter_table(struct ib_device *dev) +static struct attribute_group *get_counter_table(struct ib_device *dev, + int port_num) { struct ib_class_port_info cpi; - if (get_perf_mad(dev, 0, IB_PMA_CLASS_PORT_INFO, + if (get_perf_mad(dev, port_num, IB_PMA_CLASS_PORT_INFO, &cpi, 40, sizeof(cpi)) >= 0) { if (cpi.capability_mask && IB_PMA_CLASS_CAP_EXT_WIDTH) @@ -776,7 +778,7 @@ static int add_port(struct ib_device *device, int port_num, goto err_put; } - p->pma_table = get_counter_table(device); + p->pma_table = get_counter_table(device, port_num); ret = sysfs_create_group(&p->kobj, p->pma_table); if (ret) goto err_put_gid_attrs;