ionic: clean tx queue of unfinished requests

Clean out tx requests that didn't get finished before
shutting down the queue.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index fb62d78e41d99aab13d7922acdf77e2f14254b10..bab471b82e5229cfd6f19fa88acbeb5226f2b9ab 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -1454,6 +1454,7 @@ static void ionic_txrx_deinit(struct ionic_lif *lif)
        for (i = 0; i < lif->nxqs; i++) {
                ionic_lif_qcq_deinit(lif, lif->txqcqs[i].qcq);
                ionic_tx_flush(&lif->txqcqs[i].qcq->cq);
+               ionic_tx_empty(&lif->txqcqs[i].qcq->q);
 
                ionic_lif_qcq_deinit(lif, lif->rxqcqs[i].qcq);
                ionic_rx_flush(&lif->rxqcqs[i].qcq->cq);

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
index 15ff633e81ba36fd10521966792c1cee10e8039d..d233b6e77b1eef230043dfeb0825cf961b4fb09b 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
@@ -593,6 +593,22 @@ void ionic_tx_flush(struct ionic_cq *cq)
                                   work_done, 0);
 }
 
+void ionic_tx_empty(struct ionic_queue *q)
+{
+       struct ionic_desc_info *desc_info;
+       int done = 0;
+
+       /* walk the not completed tx entries, if any */
+       while (q->head != q->tail) {
+               desc_info = q->tail;
+               q->tail = desc_info->next;
+               ionic_tx_clean(q, desc_info, NULL, desc_info->cb_arg);
+               desc_info->cb = NULL;
+               desc_info->cb_arg = NULL;
+               done++;
+       }
+}
+
 static int ionic_tx_tcp_inner_pseudo_csum(struct sk_buff *skb)
 {
        int err;

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.h b/drivers/net/ethernet/pensando/ionic/ionic_txrx.h
index 53775c62c85a2535c99ee1472f0eed3c07c4b391..71973e3c35a6892893828a2d0fd7fd303e016954 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.h
@@ -9,6 +9,7 @@ void ionic_tx_flush(struct ionic_cq *cq);
 
 void ionic_rx_fill(struct ionic_queue *q);
 void ionic_rx_empty(struct ionic_queue *q);
+void ionic_tx_empty(struct ionic_queue *q);
 int ionic_rx_napi(struct napi_struct *napi, int budget);
 netdev_tx_t ionic_start_xmit(struct sk_buff *skb, struct net_device *netdev);