Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d23e946c authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: fix wrong frag_idx reported by RX CQ 



The RX CQ can report completions with invalid frag_idx when the RXQ that
was *previously* using it, was not cleaned up properly. This hits
a BUG_ON() in be2net.

When completion coalescing is enabled on a CQ, an explicit CQ-notify
(with rearm) is needed for each compl, to flush partially coalesced CQ
entries that are pending DMA.

In be_close(), this fix now notifies CQ for each compl, waits explicitly
for the flush compl to arrive and complains if it doesn't arrive.

Also renaming be_crit_error() to be_hw_error() as it's the more
appropriate name and to convey that we don't wait for the flush compl
only when a HW error has occurred.

Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a323d9bf

drivers/net/ethernet/emulex/benet/be.h

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static inline bool be_error(struct be_adapter *adapter) 
	return adapter->eeh_error || adapter->hw_error || adapter->fw_timeout;

}



static inline bool be_crit_error(struct be_adapter *adapter)

static inline bool be_hw_error(struct be_adapter *adapter)

{

	return adapter->eeh_error || adapter->hw_error;

}

drivers/net/ethernet/emulex/benet/be_main.c

+32 −6
Original line number Diff line number Diff line
@@ -1689,15 +1689,41 @@ static void be_rx_cq_clean(struct be_rx_obj *rxo) 
	struct be_queue_info *rxq = &rxo->q;

	struct be_queue_info *rx_cq = &rxo->cq;

	struct be_rx_compl_info *rxcp;

	struct be_adapter *adapter = rxo->adapter;

	int flush_wait = 0;

	u16 tail;



	/* First cleanup pending rx completions */

	while ((rxcp = be_rx_compl_get(rxo)) != NULL) {

	/* Consume pending rx completions.

	 * Wait for the flush completion (identified by zero num_rcvd)

	 * to arrive. Notify CQ even when there are no more CQ entries

	 * for HW to flush partially coalesced CQ entries.

	 * In Lancer, there is no need to wait for flush compl.

	 */

	for (;;) {

		rxcp = be_rx_compl_get(rxo);

		if (rxcp == NULL) {

			if (lancer_chip(adapter))

				break;



			if (flush_wait++ > 10 || be_hw_error(adapter)) {

				dev_warn(&adapter->pdev->dev,

					 "did not receive flush compl\n");

				break;

			}

			be_cq_notify(adapter, rx_cq->id, true, 0);

			mdelay(1);

		} else {

			be_rx_compl_discard(rxo, rxcp);

		be_cq_notify(rxo->adapter, rx_cq->id, false, 1);

			be_cq_notify(adapter, rx_cq->id, true, 1);

			if (rxcp->num_rcvd == 0)

				break;

		}

	}



	/* Then free posted rx buffer that were not used */

	/* After cleanup, leave the CQ in unarmed state */

	be_cq_notify(adapter, rx_cq->id, false, 0);



	/* Then free posted rx buffers that were not used */

	tail = (rxq->head + rxq->len - atomic_read(&rxq->used)) % rxq->len;

	for (; atomic_read(&rxq->used) > 0; index_inc(&tail, rxq->len)) {

		page_info = get_rx_page_info(rxo, tail);
@@ -2157,7 +2183,7 @@ void be_detect_error(struct be_adapter *adapter) 
	u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;

	u32 i;



	if (be_crit_error(adapter))

	if (be_hw_error(adapter))

		return;



	if (lancer_chip(adapter)) {