All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Gunthorpe <jgg@nvidia.com>
To: Leon Romanovsky <leonro@nvidia.com>
Cc: Max Gurtovoy <mgurtovoy@nvidia.com>,
	Guoqing Jiang <guoqing.jiang@cloud.ionos.com>,
	Sagi Grimberg <sagi@grimberg.me>,
	linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
	Santosh Shilimkar <santosh.shilimkar@oracle.com>,
	rds-devel@oss.oracle.com, linux-nvme@lists.infradead.org,
	Chao Leng <lengchao@huawei.com>, Keith Busch <kbusch@kernel.org>,
	Jack Wang <jinpu.wang@cloud.ionos.com>,
	Christoph Hellwig <hch@lst.de>
Subject: Re: [PATCH rdma v2] RDMA: Add rdma_connect_locked()
Date: Tue, 27 Oct 2020 10:23:26 -0300	[thread overview]
Message-ID: <20201027132326.GK1523783@nvidia.com> (raw)
In-Reply-To: <20201027131936.GD1763578@unreal>

On Tue, Oct 27, 2020 at 03:19:36PM +0200, Leon Romanovsky wrote:

> > +int rdma_connect_locked(struct rdma_cm_id *id,
> > +			struct rdma_conn_param *conn_param)
> >  {
> >  	struct rdma_id_private *id_priv =
> >  		container_of(id, struct rdma_id_private, id);
> >  	int ret;
> >
> > -	mutex_lock(&id_priv->handler_mutex);
> >  	if (!cma_comp_exch(id_priv, RDMA_CM_ROUTE_RESOLVED, RDMA_CM_CONNECT)) {
> >  		ret = -EINVAL;
> >  		goto err_unlock;
> 
> Not a big deal, but his label is not correct anymore.

Oh, yep

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 193c8902b9db26..f58d19881524dc 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -4053,10 +4053,8 @@ int rdma_connect_locked(struct rdma_cm_id *id,
 		container_of(id, struct rdma_id_private, id);
 	int ret;
 
-	if (!cma_comp_exch(id_priv, RDMA_CM_ROUTE_RESOLVED, RDMA_CM_CONNECT)) {
-		ret = -EINVAL;
-		goto err_unlock;
-	}
+	if (!cma_comp_exch(id_priv, RDMA_CM_ROUTE_RESOLVED, RDMA_CM_CONNECT))
+		return -EINVAL;
 
 	if (!id->qp) {
 		id_priv->qp_num = conn_param->qp_num;
@@ -4078,7 +4076,6 @@ int rdma_connect_locked(struct rdma_cm_id *id,
 	return 0;
 err_state:
 	cma_comp_exch(id_priv, RDMA_CM_CONNECT, RDMA_CM_ROUTE_RESOLVED);
-err_unlock:
 	return ret;
 }
 EXPORT_SYMBOL(rdma_connect_locked);

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

WARNING: multiple messages have this Message-ID (diff)
From: Jason Gunthorpe <jgg@nvidia.com>
To: Leon Romanovsky <leonro@nvidia.com>
Cc: <linux-rdma@vger.kernel.org>,
	Guoqing Jiang <guoqing.jiang@cloud.ionos.com>,
	Christoph Hellwig <hch@lst.de>,
	Jack Wang <jinpu.wang@cloud.ionos.com>,
	Chao Leng <lengchao@huawei.com>,
	"Santosh Shilimkar" <santosh.shilimkar@oracle.com>,
	Keith Busch <kbusch@kernel.org>, <linux-nvme@lists.infradead.org>,
	Max Gurtovoy <mgurtovoy@nvidia.com>, <netdev@vger.kernel.org>,
	<rds-devel@oss.oracle.com>, Sagi Grimberg <sagi@grimberg.me>
Subject: Re: [PATCH rdma v2] RDMA: Add rdma_connect_locked()
Date: Tue, 27 Oct 2020 10:23:26 -0300	[thread overview]
Message-ID: <20201027132326.GK1523783@nvidia.com> (raw)
In-Reply-To: <20201027131936.GD1763578@unreal>

On Tue, Oct 27, 2020 at 03:19:36PM +0200, Leon Romanovsky wrote:

> > +int rdma_connect_locked(struct rdma_cm_id *id,
> > +			struct rdma_conn_param *conn_param)
> >  {
> >  	struct rdma_id_private *id_priv =
> >  		container_of(id, struct rdma_id_private, id);
> >  	int ret;
> >
> > -	mutex_lock(&id_priv->handler_mutex);
> >  	if (!cma_comp_exch(id_priv, RDMA_CM_ROUTE_RESOLVED, RDMA_CM_CONNECT)) {
> >  		ret = -EINVAL;
> >  		goto err_unlock;
> 
> Not a big deal, but his label is not correct anymore.

Oh, yep

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 193c8902b9db26..f58d19881524dc 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -4053,10 +4053,8 @@ int rdma_connect_locked(struct rdma_cm_id *id,
 		container_of(id, struct rdma_id_private, id);
 	int ret;
 
-	if (!cma_comp_exch(id_priv, RDMA_CM_ROUTE_RESOLVED, RDMA_CM_CONNECT)) {
-		ret = -EINVAL;
-		goto err_unlock;
-	}
+	if (!cma_comp_exch(id_priv, RDMA_CM_ROUTE_RESOLVED, RDMA_CM_CONNECT))
+		return -EINVAL;
 
 	if (!id->qp) {
 		id_priv->qp_num = conn_param->qp_num;
@@ -4078,7 +4076,6 @@ int rdma_connect_locked(struct rdma_cm_id *id,
 	return 0;
 err_state:
 	cma_comp_exch(id_priv, RDMA_CM_CONNECT, RDMA_CM_ROUTE_RESOLVED);
-err_unlock:
 	return ret;
 }
 EXPORT_SYMBOL(rdma_connect_locked);

  reply	other threads:[~2020-10-27 13:23 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-27 12:20 [PATCH rdma v2] RDMA: Add rdma_connect_locked() Jason Gunthorpe
2020-10-27 12:20 ` Jason Gunthorpe
2020-10-27 13:06 ` Max Gurtovoy
2020-10-27 13:06   ` Max Gurtovoy
2020-10-27 13:19 ` Leon Romanovsky
2020-10-27 13:19   ` Leon Romanovsky
2020-10-27 13:23   ` Jason Gunthorpe [this message]
2020-10-27 13:23     ` Jason Gunthorpe
2020-10-27 21:08 ` Sagi Grimberg
2020-10-27 21:08   ` Sagi Grimberg
2020-10-28  9:19 ` Maor Gottlieb
2020-10-28  9:19   ` Maor Gottlieb
2020-10-28 12:14   ` Jason Gunthorpe
2020-10-28 12:14     ` Jason Gunthorpe
2020-10-28 13:31     ` Maor Gottlieb
2020-10-28 13:31       ` Maor Gottlieb

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=20201027132326.GK1523783@nvidia.com \
    --to=jgg@nvidia.com \
    --cc=guoqing.jiang@cloud.ionos.com \
    --cc=hch@lst.de \
    --cc=jinpu.wang@cloud.ionos.com \
    --cc=kbusch@kernel.org \
    --cc=lengchao@huawei.com \
    --cc=leonro@nvidia.com \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=mgurtovoy@nvidia.com \
    --cc=netdev@vger.kernel.org \
    --cc=rds-devel@oss.oracle.com \
    --cc=sagi@grimberg.me \
    --cc=santosh.shilimkar@oracle.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.