Linux-RDMA Archive on lore.kernel.org
 help / color / Atom feed
From: Jason Gunthorpe <jgg@nvidia.com>
To: Haakon Bugge <haakon.bugge@oracle.com>
Cc: Doug Ledford <dledford@redhat.com>,
	OFED mailing list <linux-rdma@vger.kernel.org>
Subject: Re: [PATCH for-next] RDMA/core: Unify RoCE check and re-factor code
Date: Mon, 19 Apr 2021 12:57:41 -0300
Message-ID: <20210419155741.GV1370958@nvidia.com> (raw)
In-Reply-To: <DE7C3C55-BDFC-47EE-ABBD-F2399697CBF5@oracle.com>

On Mon, Apr 19, 2021 at 03:49:08PM +0000, Haakon Bugge wrote:
> >> On 8 Apr 2021, at 14:25, Jason Gunthorpe <jgg@nvidia.com> wrote:
> >> 
> >> On Tue, Apr 06, 2021 at 12:37:03PM +0200, Håkon Bugge wrote:
> >>> In cm_req_handler(), unify the check for RoCE and re-factor to avoid
> >>> one test.
> >>> 
> >>> Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
> >>> Fixes: 8f9748602491 ("IB/cm: Reduce dependency on gid attribute ndev check")
> >>> Fixes: 194f64a3cad3 ("RDMA/core: Fix corrupted SL on passive side")
> >>> Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com>
> >>> drivers/infiniband/core/cm.c | 8 ++------
> >>> 1 file changed, 2 insertions(+), 6 deletions(-)
> >>> 
> >>> diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
> >>> index 32c836b..074faff 100644
> >>> +++ b/drivers/infiniband/core/cm.c
> >>> @@ -2138,21 +2138,17 @@ static int cm_req_handler(struct cm_work *work)
> >>> 		goto destroy;
> >>> 	}
> >>> 
> >>> -	if (cm_id_priv->av.ah_attr.type != RDMA_AH_ATTR_TYPE_ROCE)
> >>> -		cm_process_routed_req(req_msg, work->mad_recv_wc->wc);
> >>> -
> >>> 	memset(&work->path[0], 0, sizeof(work->path[0]));
> >>> 	if (cm_req_has_alt_path(req_msg))
> >>> 		memset(&work->path[1], 0, sizeof(work->path[1]));
> >>> 	grh = rdma_ah_read_grh(&cm_id_priv->av.ah_attr);
> >>> 	gid_attr = grh->sgid_attr;
> >>> 
> >>> -	if (gid_attr &&
> >>> -	    rdma_protocol_roce(work->port->cm_dev->ib_device,
> >>> -			       work->port->port_num)) {
> >>> +	if (gid_attr && cm_id_priv->av.ah_attr.type == RDMA_AH_ATTR_TYPE_ROCE) {
> >> 
> >> I think your other note was right, the gid_attr cannot be NULL when in
> >> ROCE mode, so we can delete the 'gid_attr &&' term too
> > 
> > Shall I send a v2 or do you fix it when you merge?
> 
> Have you made up you mind here :-)

Well, I marked it as changes-requested so I guess I did..

But anyway I'll fix it up, it does look obviously correct

Applied to for-next

Jason

      reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-06 10:37 Håkon Bugge
2021-04-08 12:25 ` Jason Gunthorpe
2021-04-08 13:24   ` Haakon Bugge
2021-04-19 15:49     ` Haakon Bugge
2021-04-19 15:57       ` Jason Gunthorpe [this message]

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=20210419155741.GV1370958@nvidia.com \
    --to=jgg@nvidia.com \
    --cc=dledford@redhat.com \
    --cc=haakon.bugge@oracle.com \
    --cc=linux-rdma@vger.kernel.org \
    /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

Linux-RDMA Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-rdma/0 linux-rdma/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-rdma linux-rdma/ https://lore.kernel.org/linux-rdma \
		linux-rdma@vger.kernel.org
	public-inbox-index linux-rdma

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-rdma


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git