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

Commit f34a55e4 authored by Mark Zhang's avatar Mark Zhang Committed by Jason Gunthorpe
Browse files

RDMA/core: Get sum value of all counters when perform a sysfs stat read 



Since a QP can only be bound to one counter, then if it is bound to a
separate counter, for backward compatibility purpose, the statistic value
must be:
* stat of default counter
+ stat of all running allocated counters
+ stat of all deallocated counters (history stats)

Signed-off-by: default avatarMark Zhang <markz@mellanox.com>
Reviewed-by: default avatarMajd Dibbiny <majd@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 18d422ce

drivers/infiniband/core/counters.c

+89 −0
Original line number Diff line number Diff line
@@ -158,6 +158,20 @@ static int __rdma_counter_unbind_qp(struct ib_qp *qp) 
	return ret;

}



static void counter_history_stat_update(const struct rdma_counter *counter)

{

	struct ib_device *dev = counter->device;

	struct rdma_port_counter *port_counter;

	int i;



	port_counter = &dev->port_data[counter->port].port_counter;

	if (!port_counter->hstats)

		return;



	for (i = 0; i < counter->stats->num_counters; i++)

		port_counter->hstats->value[i] += counter->stats->value[i];

}



/**

 * rdma_get_counter_auto_mode - Find the counter that @qp should be bound

 *     with in auto mode
@@ -215,6 +229,7 @@ static void counter_release(struct kref *kref) 
	struct rdma_counter *counter;



	counter = container_of(kref, struct rdma_counter, kref);

	counter_history_stat_update(counter);

	counter->device->ops.counter_dealloc(counter);

	rdma_counter_free(counter);

}
@@ -299,6 +314,55 @@ int rdma_counter_query_stats(struct rdma_counter *counter) 
	return ret;

}



static u64 get_running_counters_hwstat_sum(struct ib_device *dev,

					   u8 port, u32 index)

{

	struct rdma_restrack_entry *res;

	struct rdma_restrack_root *rt;

	struct rdma_counter *counter;

	unsigned long id = 0;

	u64 sum = 0;



	rt = &dev->res[RDMA_RESTRACK_COUNTER];

	xa_lock(&rt->xa);

	xa_for_each(&rt->xa, id, res) {

		if (!rdma_restrack_get(res))

			continue;



		xa_unlock(&rt->xa);



		counter = container_of(res, struct rdma_counter, res);

		if ((counter->device != dev) || (counter->port != port) ||

		    rdma_counter_query_stats(counter))

			goto next;



		sum += counter->stats->value[index];



next:

		xa_lock(&rt->xa);

		rdma_restrack_put(res);

	}



	xa_unlock(&rt->xa);

	return sum;

}



/**

 * rdma_counter_get_hwstat_value() - Get the sum value of all counters on a

 *   specific port, including the running ones and history data

 */

u64 rdma_counter_get_hwstat_value(struct ib_device *dev, u8 port, u32 index)

{

	struct rdma_port_counter *port_counter;

	u64 sum;



	port_counter = &dev->port_data[port].port_counter;

	sum = get_running_counters_hwstat_sum(dev, port, index);

	sum += port_counter->hstats->value[index];



	return sum;

}



void rdma_counter_init(struct ib_device *dev)

{

	struct rdma_port_counter *port_counter;
@@ -311,9 +375,34 @@ void rdma_counter_init(struct ib_device *dev) 
		port_counter = &dev->port_data[port].port_counter;

		port_counter->mode.mode = RDMA_COUNTER_MODE_NONE;

		mutex_init(&port_counter->lock);



		port_counter->hstats = dev->ops.alloc_hw_stats(dev, port);

		if (!port_counter->hstats)

			goto fail;

	}



	return;



fail:

	rdma_for_each_port(dev, port) {

		port_counter = &dev->port_data[port].port_counter;

		kfree(port_counter->hstats);

		port_counter->hstats = NULL;

	}



	return;

}



void rdma_counter_release(struct ib_device *dev)

{

	struct rdma_port_counter *port_counter;

	u32 port;



	if (!dev->ops.alloc_hw_stats)

		return;



	rdma_for_each_port(dev, port) {

		port_counter = &dev->port_data[port].port_counter;

		kfree(port_counter->hstats);

	}

}

drivers/infiniband/core/sysfs.c

+7 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <rdma/ib_mad.h>

#include <rdma/ib_pma.h>

#include <rdma/ib_cache.h>

#include <rdma/rdma_counter.h>



struct ib_port;
@@ -800,9 +801,12 @@ static int update_hw_stats(struct ib_device *dev, struct rdma_hw_stats *stats, 
	return 0;

}



static ssize_t print_hw_stat(struct rdma_hw_stats *stats, int index, char *buf)

static ssize_t print_hw_stat(struct ib_device *dev, int port_num,

			     struct rdma_hw_stats *stats, int index, char *buf)

{

	return sprintf(buf, "%llu\n", stats->value[index]);

	u64 v = rdma_counter_get_hwstat_value(dev, port_num, index);



	return sprintf(buf, "%llu\n", stats->value[index] + v);

}



static ssize_t show_hw_stats(struct kobject *kobj, struct attribute *attr,
@@ -828,7 +832,7 @@ static ssize_t show_hw_stats(struct kobject *kobj, struct attribute *attr, 
	ret = update_hw_stats(dev, stats, hsa->port_num, hsa->index);

	if (ret)

		goto unlock;

	ret = print_hw_stat(stats, hsa->index, buf);

	ret = print_hw_stat(dev, hsa->port_num, stats, hsa->index, buf);

unlock:

	mutex_unlock(&stats->lock);

include/rdma/rdma_counter.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ struct rdma_counter_mode { 


struct rdma_port_counter {

	struct rdma_counter_mode mode;

	struct rdma_hw_stats *hstats;

	struct mutex lock;

};
@@ -49,5 +50,6 @@ int rdma_counter_bind_qp_auto(struct ib_qp *qp, u8 port); 
int rdma_counter_unbind_qp(struct ib_qp *qp, bool force);



int rdma_counter_query_stats(struct rdma_counter *counter);

u64 rdma_counter_get_hwstat_value(struct ib_device *dev, u8 port, u32 index);



#endif /* _RDMA_COUNTER_H_ */