linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-ntb@googlegroups.com,
	Jon Mason <jdmason@kudzu.us>
Cc: Allen Hubbe <allenbh@gmail.com>,
	Dave Jiang <dave.jiang@intel.com>,
	Serge Semin <fancer.lancer@gmail.com>,
	Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v3 6/8] NTB: perf: Fix support for hardware that doesn't have port numbers
Date: Wed,  9 Jan 2019 12:22:31 -0700	[thread overview]
Message-ID: <20190109192233.5752-7-logang@deltatee.com> (raw)
In-Reply-To: <20190109192233.5752-1-logang@deltatee.com>

Legacy drivers do not have port numbers (but is reliably only two ports)
and was broken by the recent commit that added mult-port support to
ntb_perf. This is especially important to support the cross link
topology which is perfectly symmetric and cannot assign unique port
numbers easily.

Hardware that returns zero for both the local port and the peer should
just always use gidx=0 for the only peer.

Fixes: 5648e56d03fa ("NTB: ntb_perf: Add full multi-port NTB API support")
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Allen Hubbe <allenbh@gmail.com>
Tested-by: Alexander Fomichev <fomichev.ru@gmail.com>
---
 drivers/ntb/test/ntb_perf.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index bd0474e62a40..7165f7ab8e35 100644
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -1417,6 +1417,16 @@ static int perf_init_peers(struct perf_ctx *perf)
 	if (perf->gidx == -1)
 		perf->gidx = pidx;
 
+	/*
+	 * Hardware with only two ports may not have unique port
+	 * numbers. In this case, the gidxs should all be zero.
+	 */
+	if (perf->pcnt == 1 &&  ntb_port_number(perf->ntb) == 0 &&
+	    ntb_peer_port_number(perf->ntb, 0) == 0) {
+		perf->gidx = 0;
+		perf->peers[0].gidx = 0;
+	}
+
 	for (pidx = 0; pidx < perf->pcnt; pidx++) {
 		ret = perf_setup_peer_mw(&perf->peers[pidx]);
 		if (ret)
-- 
2.19.0


  parent reply	other threads:[~2019-01-09 19:22 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-09 19:22 [PATCH v3 0/8] Fix breakage caused by the NTB multi-port patchset Logan Gunthorpe
2019-01-09 19:22 ` [PATCH v3 1/8] NTB: ntb_tool: reading the link file should not end in a NULL byte Logan Gunthorpe
2019-01-09 19:22 ` [PATCH v3 2/8] NTB: Revert the change to use the NTB device dev for DMA allocations Logan Gunthorpe
2019-01-09 19:22 ` [PATCH v3 3/8] NTB: Fix the default port and peer numbers for legacy drivers Logan Gunthorpe
2019-01-09 19:22 ` [PATCH v3 4/8] NTB: ntb_pingpong: Choose doorbells based on port number Logan Gunthorpe
2019-01-09 19:22 ` [PATCH v3 5/8] NTB: perf: Don't require one more memory window than number of peers Logan Gunthorpe
2019-01-09 19:22 ` Logan Gunthorpe [this message]
2019-01-09 19:22 ` [PATCH v3 7/8] NTB: perf: Fix race condition when run with ntb_test Logan Gunthorpe
2019-01-09 19:22 ` [PATCH v3 8/8] NTB: ntb_test: Fix bug when counting remote files Logan Gunthorpe
2019-01-09 19:32 ` [PATCH v3 0/8] Fix breakage caused by the NTB multi-port patchset Dave Jiang
2019-01-09 19:33   ` Logan Gunthorpe
2019-02-11 14:40 ` Jon Mason

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=20190109192233.5752-7-logang@deltatee.com \
    --to=logang@deltatee.com \
    --cc=allenbh@gmail.com \
    --cc=dave.jiang@intel.com \
    --cc=fancer.lancer@gmail.com \
    --cc=jdmason@kudzu.us \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-ntb@googlegroups.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).