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

Commit 7f83a9e6 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Do no clear Tx status bits since eop_desc provides enough info 



There isn't any need to clear the status bits in the descriptors due to the
fact that the eop_desc provides enough information for us to know
that we have cleaned to the last packet that the software has put on the
ring.  The status bits are cleared as a part of putting the frame on the
ring so as long as we do not read the descriptor bit prior to reading the
value eop_desc we should be able to guarantee that we will not clean beyond
the end of the current data stream.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b37c0fbe

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -763,6 +763,9 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector, 
		if (!eop_desc)

		if (!eop_desc)

			break;

			break;





		/* prevent any other reads prior to eop_desc */

		rmb();



		/* if DD is not set pending work has not been completed */

		/* if DD is not set pending work has not been completed */

		if (!(eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)))

		if (!(eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)))

			break;

			break;
@@ -773,12 +776,8 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector, 
		/* clear next_to_watch to prevent false hangs */

		/* clear next_to_watch to prevent false hangs */

		tx_buffer->next_to_watch = NULL;

		tx_buffer->next_to_watch = NULL;





		/* prevent any other reads prior to eop_desc being verified */

		rmb();



		do {

		do {

			ixgbe_unmap_tx_resource(tx_ring, tx_buffer);

			ixgbe_unmap_tx_resource(tx_ring, tx_buffer);

			tx_desc->wb.status = 0;

			if (likely(tx_desc == eop_desc)) {

			if (likely(tx_desc == eop_desc)) {

				eop_desc = NULL;

				eop_desc = NULL;

				dev_kfree_skb_any(tx_buffer->skb);

				dev_kfree_skb_any(tx_buffer->skb);