From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>
Cc: Leon Romanovsky <leonro@mellanox.com>,
RDMA mailing list <linux-rdma@vger.kernel.org>,
Majd Dibbiny <majd@mellanox.com>, Mark Zhang <markz@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>,
linux-netdev <netdev@vger.kernel.org>
Subject: [PATCH rdma-next v1 09/17] IB/mlx5: Support statistic q counter configuration
Date: Sun, 7 Apr 2019 10:50:05 +0300 [thread overview]
Message-ID: <20190407075013.12955-10-leon@kernel.org> (raw)
In-Reply-To: <20190407075013.12955-1-leon@kernel.org>
From: Mark Zhang <markz@mellanox.com>
Add support for ib callbacks counter_bind_qp() and counter_unbind_qp().
Signed-off-by: Mark Zhang <markz@mellanox.com>
Reviewed-by: Majd Dibbiny <majd@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/infiniband/hw/mlx5/main.c | 55 +++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index d0b3e916ca8e..8e9dfc1119c2 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -5398,6 +5398,59 @@ static int mlx5_ib_get_hw_stats(struct ib_device *ibdev,
return num_counters;
}
+static int mlx5_ib_counter_bind_qp(struct rdma_counter *counter,
+ struct ib_qp *qp)
+{
+ struct mlx5_ib_dev *dev = to_mdev(qp->device);
+ u16 cnt_set_id = 0;
+ int err;
+
+ if (counter->id == 0) {
+ err = mlx5_cmd_alloc_q_counter(dev->mdev,
+ &cnt_set_id,
+ MLX5_SHARED_RESOURCE_UID);
+ if (err)
+ return err;
+ counter->id = cnt_set_id;
+ }
+
+ err = mlx5_ib_qp_set_counter(qp, counter);
+ if (err)
+ goto fail_set_counter;
+
+ return 0;
+
+fail_set_counter:
+ if (cnt_set_id != 0) {
+ mlx5_core_dealloc_q_counter(dev->mdev, cnt_set_id);
+ counter->id = 0;
+ }
+
+ return err;
+}
+
+static int mlx5_ib_counter_unbind_qp(struct ib_qp *qp, bool force)
+{
+ struct mlx5_ib_dev *dev = to_mdev(qp->device);
+ struct rdma_counter *counter = qp->counter;
+ int err;
+
+ err = mlx5_ib_qp_set_counter(qp, NULL);
+ if (err && !force)
+ return err;
+
+ /*
+ * Deallocate the counter if this is the last QP bound on it;
+ * If @force is set then we still deallocate the q counter
+ * no matter if there's any error in previous. used for cases
+ * like qp destroy.
+ */
+ if (atomic_read(&counter->usecnt) == 1)
+ return mlx5_core_dealloc_q_counter(dev->mdev, counter->id);
+
+ return 0;
+}
+
static int mlx5_ib_rn_get_params(struct ib_device *device, u8 port_num,
enum rdma_netdev_t type,
struct rdma_netdev_alloc_params *params)
@@ -6276,6 +6329,8 @@ static void mlx5_ib_stage_odp_cleanup(struct mlx5_ib_dev *dev)
static const struct ib_device_ops mlx5_ib_dev_hw_stats_ops = {
.alloc_hw_stats = mlx5_ib_alloc_hw_stats,
.get_hw_stats = mlx5_ib_get_hw_stats,
+ .counter_bind_qp = mlx5_ib_counter_bind_qp,
+ .counter_unbind_qp = mlx5_ib_counter_unbind_qp,
};
int mlx5_ib_stage_counters_init(struct mlx5_ib_dev *dev)
--
2.20.1
next prev parent reply other threads:[~2019-04-07 7:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-07 7:49 [PATCH rdma-next v1 00/17] Statistics counter support Leon Romanovsky
2019-04-07 7:49 ` Leon Romanovsky
2019-04-07 7:49 ` [PATCH mlx5-next v1 01/17] net/mlx5: Add rts2rts_qp_counters_set_id field in hca cap Leon Romanovsky
2019-04-07 7:49 ` [PATCH rdma-next v1 02/17] RDMA/restrack: Introduce statistic counter Leon Romanovsky
2019-04-07 7:49 ` [PATCH rdma-next v1 03/17] RDMA/restrack: Add an API to attach a task to a resource Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 04/17] RDMA/restrack: Make is_visible_in_pid_ns() as an API Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 05/17] RDMA/counter: Add set/clear per-port auto mode support Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 06/17] RDMA/counter: Add "auto" configuration " Leon Romanovsky
2019-04-07 7:50 ` [PATCH mlx5-next v1 07/17] IB/mlx5: Support set qp counter Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 08/17] IB/mlx5: Add counter set id as a parameter for mlx5_ib_query_q_counters() Leon Romanovsky
2019-04-07 7:50 ` Leon Romanovsky [this message]
2019-04-07 7:50 ` [PATCH rdma-next v1 10/17] RDMA/nldev: Allow counter auto mode configration through RDMA netlink Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 11/17] RDMA/netlink: Implement counter dumpit calback Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 12/17] IB/mlx5: Add counter_alloc_stats() and counter_update_stats() support Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 13/17] RDMA/core: Get sum value of all counters when perform a sysfs stat read Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 14/17] RDMA/counter: Allow manual mode configuration support Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 15/17] RDMA/nldev: Allow counter manual mode configration through RDMA netlink Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 16/17] RDMA/nldev: Allow get counter mode " Leon Romanovsky
2019-04-07 7:50 ` [PATCH rdma-next v1 17/17] RDMA/nldev: Allow get default counter statistics " Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190407075013.12955-10-leon@kernel.org \
--to=leon@kernel.org \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=leonro@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=majd@mellanox.com \
--cc=markz@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.