mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Allen Hubbe <Allen.Hubbe@emc.com>
To: linux-ntb@googlegroups.com
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
	Jon Mason <jdmason@kudzu.us>, Dave Jiang <dave.jiang@intel.com>,
	Allen Hubbe <Allen.Hubbe@emc.com>
Subject: [PATCH v2 11/17] NTB: Reset transport QP link stats on down
Date: Thu, 21 May 2015 04:20:55 -0400	[thread overview]
Message-ID: <20f4b3419bc565d02beade6a9db19b3796dd9dc9.1432196075.git.Allen.Hubbe@emc.com> (raw)
In-Reply-To: <cover.1432192681.git.Allen.Hubbe@emc.com>
In-Reply-To: <cover.1432196075.git.Allen.Hubbe@emc.com>

Reset the link stats when the link goes down.  In particular, the tx and
rx index and count must be reset, or else the tx side will be sending
packets to the rx side, where the rx side is not expecting them.  Reset
all the stats, to be consistent.

Signed-off-by: Allen Hubbe <Allen.Hubbe@emc.com>
---
 drivers/ntb/ntb_transport.c | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
index 6260016..eff776f 100644
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -648,18 +648,37 @@ static int ntb_set_mw(struct ntb_transport_ctx *nt, int num_mw,
 	return 0;
 }
 
+static void ntb_qp_link_down_reset(struct ntb_transport_qp *qp)
+{
+	qp->link_is_up = false;
+
+	qp->tx_index = 0;
+	qp->rx_index = 0;
+	qp->rx_bytes = 0;
+	qp->rx_pkts = 0;
+	qp->rx_ring_empty = 0;
+	qp->rx_err_no_buf = 0;
+	qp->rx_err_oflow = 0;
+	qp->rx_err_ver = 0;
+	qp->rx_memcpy = 0;
+	qp->rx_async = 0;
+	qp->tx_bytes = 0;
+	qp->tx_pkts = 0;
+	qp->tx_ring_full = 0;
+	qp->tx_err_no_buf = 0;
+	qp->tx_memcpy = 0;
+	qp->tx_async = 0;
+}
+
 static void ntb_qp_link_cleanup(struct ntb_transport_qp *qp)
 {
 	struct ntb_transport_ctx *nt = qp->transport;
 	struct pci_dev *pdev = nt->ndev->pdev;
 
-	if (qp->link_is_up) {
-		cancel_delayed_work_sync(&qp->link_work);
-		return;
-	}
-
 	dev_info(&pdev->dev, "qp %d: Link Cleanup\n", qp->qp_num);
-	qp->link_is_up = false;
+
+	cancel_delayed_work_sync(&qp->link_work);
+	ntb_qp_link_down_reset(qp);
 
 	if (qp->event_handler)
 		qp->event_handler(qp->cb_data, qp->link_is_up);
@@ -866,9 +885,9 @@ static int ntb_transport_init_queue(struct ntb_transport_ctx *nt,
 	qp->qp_num = qp_num;
 	qp->transport = nt;
 	qp->ndev = nt->ndev;
-	qp->link_is_up = false;
 	qp->client_ready = false;
 	qp->event_handler = NULL;
+	ntb_qp_link_down_reset(qp);
 
 	if (qp_count % mw_count && mw_num + 1 < qp_count / mw_count)
 		num_qps_mw = qp_count / mw_count + 1;
@@ -1454,7 +1473,6 @@ static void ntb_send_link_down(struct ntb_transport_qp *qp)
 	if (!qp->link_is_up)
 		return;
 
-	qp->link_is_up = false;
 	dev_info(&pdev->dev, "qp %d: Send Link Down\n", qp->qp_num);
 
 	for (i = 0; i < NTB_LINK_DOWN_TIMEOUT; i++) {
@@ -1476,6 +1494,8 @@ static void ntb_send_link_down(struct ntb_transport_qp *qp)
 	if (rc)
 		dev_err(&pdev->dev, "ntb: QP%d unable to send linkdown msg\n",
 			qp->qp_num);
+
+	ntb_qp_link_down_reset(qp);
 }
 
 /**
-- 
2.4.0.rc0.43.gcf8a8c6


  parent reply	other threads:[~2015-05-21 13:33 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-21  8:20 [PATCH v2 00/17] NTB: Add NTB hardware abstraction layer Allen Hubbe
2015-05-21  9:45 ` Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 01/17] NTB: Move files in preparation for NTB abstraction Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 02/17] NTB: Add NTB hardware abstraction layer Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 03/17] NTB: Enable link for Intel root port mode in probe Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 04/17] NTB: Check the device ID to set errata flags Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 05/17] NTB: Add parameters for Intel SNB B2B addresses Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 06/17] NTB: Add ping pong test client Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 07/17] NTB: Add tool " Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 08/17] NTB: Rate limit ntb_qp_link_work Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 09/17] NTB: Differentiate transport link down messages Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 10/17] NTB: Do not advance transport RX on link down Allen Hubbe
2015-05-21  8:20   ` Allen Hubbe [this message]
2015-05-21  8:20   ` [PATCH v2 12/17] NTB: Use NUMA memory and DMA chan in transport Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 13/17] NTB: Use NUMA memory in Intel driver Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 14/17] NTB: Improve performance with write combining Allen Hubbe
2015-05-21  8:20   ` [PATCH v2 15/17] NTB: Default to CPU memcpy for performance Allen Hubbe
2015-05-21  8:21   ` [PATCH v2 16/17] NTB: Fix small code format issues in transport Allen Hubbe
2015-05-21  8:21   ` [PATCH v2 17/17] NTB: Rename intel hw to proper platform names Allen Hubbe

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=20f4b3419bc565d02beade6a9db19b3796dd9dc9.1432196075.git.Allen.Hubbe@emc.com \
    --to=allen.hubbe@emc.com \
    --cc=dave.jiang@intel.com \
    --cc=jdmason@kudzu.us \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-ntb@googlegroups.com \
    --cc=linux-pci@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
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

all inboxes | Powered by JetHome®