r8169: use READ_ONCE in rtl_tx_slots_avail
Heiner Kallweit
maintainerPATCH 1/1 r8169: use READ_ONCE in rtl_tx_slots_avail
tp->dirty_tx and tp->cur_tx may be changed by a racing rtl_tx() or rtl8169_start_xmit(). Use READ_ONCE() to annotate the races and ensure that the compiler doesn't use cached values.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/ethernet/realtek/r8169_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +2 -1
@@ -4144,7 +4144,8 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,static bool rtl_tx_slots_avail (struct rtl8169_private *tp,unsigned int nr_frags) { -unsigned int slots_avail = tp->dirty_tx +NUM_TX_DESC - tp->cur_tx; +unsigned int slots_avail =READ_ONCE (tp->dirty_tx) +NUM_TX_DESC + -READ_ONCE (tp->cur_tx);/* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */ return slots_avail > nr_frags;
Signature · 1 line
2.29.2
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Wed, 11 Nov 2020 22:14:27 +0100 you wrote:
tp->dirty_txandtp->cur_txmay be changed by a racingrtl_tx()orrtl8169_start_xmit(). UseREAD_ONCE()to annotate the races and ensure that the compiler doesn't use cached values.Signed-off-by Heiner Kallweit <[email protected]>--- drivers/net/ethernet/realtek/r8169_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Here is the summary with links:
- [net-next] r8169: use READ_ONCE in rtl_tx_slots_avail
https://git.kernel.org/netdev/net-next/c/95f3c5458dfa
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html