]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
net: mv643xx_eth: reclaim TX skbs only when released by the HW
authorKarl Beldan <karl.beldan@rivierawaves.com>
Wed, 5 Nov 2014 14:32:59 +0000 (15:32 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Nov 2014 19:54:39 +0000 (14:54 -0500)
commit2c2a9cbd64387d6b70ac5db013e9bfe9412c7354
tree24457fbbaab2016171b13aae6c2e105c082b8f2a
parent66f1c44887ba4f47d617f8ae21cf8e04e1892bd7
net: mv643xx_eth: reclaim TX skbs only when released by the HW

ATM, txq_reclaim will dequeue and free an skb for each tx desc released
by the hw that has TX_LAST_DESC set. However, in case of TSO, each
hw desc embedding the last part of a segment has TX_LAST_DESC set,
losing the one-to-one 'last skb frag'/'TX_LAST_DESC set' correspondance,
which causes data corruption.

Fix this by checking TX_ENABLE_INTERRUPT instead of TX_LAST_DESC, and
warn when trying to dequeue from an empty txq (which can be symptomatic
of releasing skbs prematurely).

Fixes: 3ae8f4e0b98 ('net: mv643xx_eth: Implement software TSO')
Reported-by: Slawomir Gajzner <slawomir.gajzner@gmail.com>
Reported-by: Julien D'Ascenzio <jdascenzio@yahoo.fr>
Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Cc: Ian Campbell <ijc@hellion.org.uk>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/mv643xx_eth.c