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

Commit 64bfd68e authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

i40e: Fix Flow Director raw_buf cleanup 



The Tx cleanup flow was incorrectly assuming it could check for the flow
director bits after it had unmapped the buffer.  However in this case it
results in us trying to free a raw_buf as though it is an sk_buff.

To fix this I am moving up the flag test for the FD_SB bit so that when
find a non-NULL skb or raw_buf value we then check the flag and use the
appropriate call to free the buffer.

Change-ID: I6284034ba1ea87c9922e56f6eb3181f7f09bddde
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f19a973f

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+4 −4
Original line number Diff line number Diff line
@@ -532,6 +532,9 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring, 
					    struct i40e_tx_buffer *tx_buffer)

{

	if (tx_buffer->skb) {

		if (tx_buffer->tx_flags & I40E_TX_FLAGS_FD_SB)

			kfree(tx_buffer->raw_buf);

		else

			dev_kfree_skb_any(tx_buffer->skb);

		if (dma_unmap_len(tx_buffer, len))

			dma_unmap_single(ring->dev,
@@ -545,9 +548,6 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring, 
			       DMA_TO_DEVICE);

	}



	if (tx_buffer->tx_flags & I40E_TX_FLAGS_FD_SB)

		kfree(tx_buffer->raw_buf);



	tx_buffer->next_to_watch = NULL;

	tx_buffer->skb = NULL;

	dma_unmap_len_set(tx_buffer, len, 0);

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+4 −4
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring, 
					    struct i40e_tx_buffer *tx_buffer)

{

	if (tx_buffer->skb) {

		if (tx_buffer->tx_flags & I40E_TX_FLAGS_FD_SB)

			kfree(tx_buffer->raw_buf);

		else

			dev_kfree_skb_any(tx_buffer->skb);

		if (dma_unmap_len(tx_buffer, len))

			dma_unmap_single(ring->dev,
@@ -64,9 +67,6 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring, 
			       DMA_TO_DEVICE);

	}



	if (tx_buffer->tx_flags & I40E_TX_FLAGS_FD_SB)

		kfree(tx_buffer->raw_buf);



	tx_buffer->next_to_watch = NULL;

	tx_buffer->skb = NULL;

	dma_unmap_len_set(tx_buffer, len, 0);