p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NTB: Reset transport QP link stats on down 

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>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Allen Hubbe 2015-05-12 08:09:15 -04:00 committed by Jon Mason
parent c0900b33d1
commit 2849b5d706
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/ntb/ntb_transport.c
View File

@ -648,18 +648,37 @@ static int ntb_set_mw(struct ntb_transport_ctx *nt, int num_mw,
return 0; 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) static void ntb_qp_link_cleanup(struct ntb_transport_qp *qp)
{ {
struct ntb_transport_ctx *nt = qp->transport; struct ntb_transport_ctx *nt = qp->transport;
struct pci_dev *pdev = nt->ndev->pdev; 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); 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) if (qp->event_handler)
qp->event_handler(qp->cb_data, qp->link_is_up); 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->qp_num = qp_num;
qp->transport = nt; qp->transport = nt;
qp->ndev = nt->ndev; qp->ndev = nt->ndev;
qp->link_is_up = false;
qp->client_ready = false; qp->client_ready = false;
qp->event_handler = NULL; qp->event_handler = NULL;
ntb_qp_link_down_reset(qp);
if (qp_count % mw_count && mw_num + 1 < qp_count / mw_count) if (qp_count % mw_count && mw_num + 1 < qp_count / mw_count)
num_qps_mw = qp_count / mw_count + 1; num_qps_mw = qp_count / mw_count + 1;
@ -1468,7 +1487,6 @@ static void ntb_send_link_down(struct ntb_transport_qp *qp)
if (!qp->link_is_up) if (!qp->link_is_up)
return; return;
qp->link_is_up = false;
dev_info(&pdev->dev, "qp %d: Send Link Down\n", qp->qp_num); dev_info(&pdev->dev, "qp %d: Send Link Down\n", qp->qp_num);
for (i = 0; i < NTB_LINK_DOWN_TIMEOUT; i++) { for (i = 0; i < NTB_LINK_DOWN_TIMEOUT; i++) {
@ -1490,6 +1508,8 @@ static void ntb_send_link_down(struct ntb_transport_qp *qp)
if (rc) if (rc)
dev_err(&pdev->dev, "ntb: QP%d unable to send linkdown msg\n", dev_err(&pdev->dev, "ntb: QP%d unable to send linkdown msg\n",
qp->qp_num); qp->qp_num);
ntb_qp_link_down_reset(qp);
} }
/** /**