xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r8169: improve rtl_tx

Browse Source 
[ Upstream commit ca1ab89cd2d654661f559bd83ad9fc7323cb6c86 ]

We can simplify the for() condition and eliminate variable tx_left.
The change also considers that tp->cur_tx may be incremented by a
racing rtl8169_start_xmit().
In addition replace the write to tp->dirty_tx and the following
smp_mb() with an equivalent call to smp_store_mb(). This implicitly
adds a WRITE_ONCE() to the write.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/c2e19e5e-3d3f-d663-af32-13c3374f5def@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: c71e3a5cffd5 ("r8169: Fix possible ring buffer corruption on fragmented Tx packets.")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Heiner Kallweit
2020-11-11 22:56:29 +01:00
committed by Greg Kroah-Hartman
parent 6d3eb1658b
commit 04f9d0cd39
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/realtek/r8169_main.c
View File

@@ -4469,11 +4469,11 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp,
int budget) int budget)
{ {
unsigned int dirty_tx, tx_left, bytes_compl = 0, pkts_compl = 0; unsigned int dirty_tx, bytes_compl = 0, pkts_compl = 0;
dirty_tx = tp->dirty_tx; dirty_tx = tp->dirty_tx;
for (tx_left = READ_ONCE(tp->cur_tx) - dirty_tx; tx_left; tx_left--) { while (READ_ONCE(tp->cur_tx) != dirty_tx) {
unsigned int entry = dirty_tx % NUM_TX_DESC; unsigned int entry = dirty_tx % NUM_TX_DESC;
struct sk_buff *skb = tp->tx_skb[entry].skb; struct sk_buff *skb = tp->tx_skb[entry].skb;
u32 status; u32 status;
@@ -4497,7 +4497,6 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp,
rtl_inc_priv_stats(&tp->tx_stats, pkts_compl, bytes_compl); rtl_inc_priv_stats(&tp->tx_stats, pkts_compl, bytes_compl);
tp->dirty_tx = dirty_tx;
/* Sync with rtl8169_start_xmit: /* Sync with rtl8169_start_xmit:
* - publish dirty_tx ring index (write barrier) * - publish dirty_tx ring index (write barrier)
* - refresh cur_tx ring index and queue status (read barrier) * - refresh cur_tx ring index and queue status (read barrier)
@@ -4505,7 +4504,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp,
* a racing xmit thread can only have a right view of the * a racing xmit thread can only have a right view of the
* ring status. * ring status.
*/ */
smp_mb(); smp_store_mb(tp->dirty_tx, dirty_tx);
if (netif_queue_stopped(dev) && if (netif_queue_stopped(dev) &&
rtl_tx_slots_avail(tp, MAX_SKB_FRAGS)) { rtl_tx_slots_avail(tp, MAX_SKB_FRAGS)) {
netif_wake_queue(dev); netif_wake_queue(dev);