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>,
Mark Bloch <markb@mellanox.com>,
Yishai Hadas <yishaih@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>,
linux-netdev <netdev@vger.kernel.org>
Subject: [PATCH mlx5-next 04/11] net/mlx5: Remove references to local mlx5_core functions
Date: Wed, 28 Nov 2018 20:53:36 +0200 [thread overview]
Message-ID: <20181128185343.21669-5-leon@kernel.org> (raw)
In-Reply-To: <20181128185343.21669-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
As a preparation to move SRQ functionality to RDMA, drop all references
to mlx5_core logic and make SRQ be dependent on shared code only.
Most of the time, we are interested to know if events are working/not
working and it is possible with previous commit ("net/mlx5: Debug print
for forwarded async events").
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/srq.c | 22 +++----------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/srq.c b/drivers/net/ethernet/mellanox/mlx5/core/srq.c
index 248f1c8dd5d3..690815234838 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/srq.c
@@ -10,15 +10,12 @@
#include <linux/mlx5/srq.h>
#include <rdma/ib_verbs.h>
#include <linux/mlx5/transobj.h>
-#include "mlx5_core.h"
static int srq_event_notifier(struct notifier_block *nb,
unsigned long type, void *data)
{
struct mlx5_srq_table *table;
- struct mlx5_core_dev *dev;
struct mlx5_core_srq *srq;
- struct mlx5_priv *priv;
struct mlx5_eqe *eqe;
u32 srqn;
@@ -27,12 +24,9 @@ static int srq_event_notifier(struct notifier_block *nb,
return NOTIFY_DONE;
table = container_of(nb, struct mlx5_srq_table, nb);
- priv = container_of(table, struct mlx5_priv, srq_table);
- dev = container_of(priv, struct mlx5_core_dev, priv);
eqe = data;
srqn = be32_to_cpu(eqe->data.qp_srq.qp_srq_n) & 0xffffff;
- mlx5_core_dbg(dev, "SRQ event (%d): srqn 0x%x\n", eqe->type, srqn);
spin_lock(&table->lock);
@@ -42,10 +36,8 @@ static int srq_event_notifier(struct notifier_block *nb,
spin_unlock(&table->lock);
- if (!srq) {
- mlx5_core_warn(dev, "Async event for bogus SRQ 0x%08x\n", srqn);
+ if (!srq)
return NOTIFY_OK;
- }
srq->event(srq, eqe->type);
@@ -617,10 +609,8 @@ int mlx5_core_create_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
spin_lock_irq(&table->lock);
err = radix_tree_insert(&table->tree, srq->srqn, srq);
spin_unlock_irq(&table->lock);
- if (err) {
- mlx5_core_warn(dev, "err %d, srqn 0x%x\n", err, srq->srqn);
+ if (err)
goto err_destroy_srq_split;
- }
return 0;
@@ -640,14 +630,8 @@ int mlx5_core_destroy_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq)
spin_lock_irq(&table->lock);
tmp = radix_tree_delete(&table->tree, srq->srqn);
spin_unlock_irq(&table->lock);
- if (!tmp) {
- mlx5_core_warn(dev, "srq 0x%x not found in tree\n", srq->srqn);
+ if (!tmp || tmp != srq)
return -EINVAL;
- }
- if (tmp != srq) {
- mlx5_core_warn(dev, "corruption on srqn 0x%x\n", srq->srqn);
- return -EINVAL;
- }
err = destroy_srq_split(dev, srq);
if (err)
--
2.19.1
next prev parent reply other threads:[~2018-11-29 5:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-28 18:53 [PATCH mlx5-next 00/11] Remove SRQ code from mlx5_core Leon Romanovsky
2018-11-28 18:53 ` [PATCH mlx5-next 01/11] net/mlx5: Align SRQ licenses and copyright information Leon Romanovsky
2018-11-28 18:53 ` [PATCH mlx5-next 02/11] net/mlx5: Remove dead transobj code Leon Romanovsky
2018-11-28 18:53 ` [PATCH mlx5-next 03/11] net/mlx5: Remove not-used lib/eq.h header file Leon Romanovsky
2018-11-28 18:53 ` Leon Romanovsky [this message]
2018-11-28 18:53 ` [PATCH mlx5-next 05/11] net/mlx5: Move SRQ functions to RDMA part Leon Romanovsky
2018-11-28 18:53 ` [PATCH mlx5-next 06/11] RDMA/mlx5: Remove SRQ signature global flag Leon Romanovsky
2018-11-28 18:53 ` [PATCH mlx5-next 07/11] RDMA/mlx5: Use stages for callback to setup and release DEVX Leon Romanovsky
2018-11-28 18:53 ` [PATCH mlx5-next 08/11] RDMA/mlx5: Update SRQ functions signatures to mlx5_ib format Leon Romanovsky
2018-11-28 18:53 ` [PATCH mlx5-next 09/11] RDMA/mlx5: Initialize SRQ tables on mlx5_ib Leon Romanovsky
2018-11-28 18:53 ` [PATCH mlx5-next 10/11] RDMA/mlx5: Unfold create RMP function Leon Romanovsky
2018-11-28 18:53 ` [PATCH rdma-next 11/11] RDMA/mlx5: Unfold modify " Leon Romanovsky
2018-12-04 7:29 ` [PATCH mlx5-next 00/11] Remove SRQ code from mlx5_core 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=20181128185343.21669-5-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=markb@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
--cc=yishaih@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).