diff options
| author |   Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
| commit | 525a2c651cdd08b19a4c04f63b87e460765220ac (patch) | |
| tree | ad65ead1b0a281be08e5c47e2a7eb911dd0d2a9b /drivers/infiniband/core/counters.c | |
| parent | IB/mlx5: Support per device q counters in switchdev mode (diff) | |
| parent | Do not dereference 'siw_crypto_shash' before checking (diff) | |
| download | linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.tar.xz linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.zip | |
Merge branch 'wip/dl-for-rc' into wip/dl-for-next
The fix for IB port statistics initialization ("IB/core: Fix querying
total rdma stats") is needed before we take a follow-on patch to
for-next.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/counters.c')
| -rw-r--r-- | drivers/infiniband/core/counters.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c index 9ed7fce85747..d60416f0bf3a 100644 --- a/drivers/infiniband/core/counters.c +++ b/drivers/infiniband/core/counters.c @@ -393,6 +393,9 @@ u64 rdma_counter_get_hwstat_value(struct ib_device *dev, u8 port, u32 index) u64 sum; port_counter = &dev->port_data[port].port_counter; + if (!port_counter->hstats) + return 0; + sum = get_running_counters_hwstat_sum(dev, port, index); sum += port_counter->hstats->value[index]; @@ -594,7 +597,7 @@ void rdma_counter_init(struct ib_device *dev) struct rdma_port_counter *port_counter; u32 port, i; - if (!dev->ops.alloc_hw_stats || !dev->port_data) + if (!dev->port_data) return; rdma_for_each_port(dev, port) { @@ -602,6 +605,9 @@ void rdma_counter_init(struct ib_device *dev) port_counter->mode.mode = RDMA_COUNTER_MODE_NONE; mutex_init(&port_counter->lock); + if (!dev->ops.alloc_hw_stats) + continue; + port_counter->hstats = dev->ops.alloc_hw_stats(dev, port); if (!port_counter->hstats) goto fail; @@ -623,9 +629,6 @@ 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); |