Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e2a51a0 authored by Hal Rosenstock's avatar Hal Rosenstock Committed by Doug Ledford
Browse files

IB/core: sysfs.c: Fix PerfMgt ClassPortInfo handling 



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>

Fixes: 145d9c54 ('IB/core: Display extended counter set if available')

Signed-off-by: default avatarHal Rosenstock <hal@mellanox.com>
Acked-by: default avatarMatan Barak <matanb@mellanox.com>
Acked-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b6aeb980

drivers/infiniband/core/sysfs.c

+6 −4
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ static int get_perf_mad(struct ib_device *dev, int port_num, __be16 attr, 
	in_mad->mad_hdr.method        = IB_MGMT_METHOD_GET;

	in_mad->mad_hdr.attr_id       = attr;



	if (attr != IB_PMA_CLASS_PORT_INFO)

		in_mad->data[41] = port_num;	/* PortSelect field */



	if ((dev->process_mad(dev, IB_MAD_IGNORE_MKEY,
@@ -714,11 +715,12 @@ alloc_group_attrs(ssize_t (*show)(struct ib_port *, 
 * 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;