[v1,2/3] r8169: fix the KCSAN reported data-race in rtl_tx while reading TxDescArray[entry].opts1
| Message ID | 20231014031257.178630-2-mirsad.todorovac@alu.unizg.hr |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id
ib8csp2278669vqb;
Fri, 13 Oct 2023 20:16:52 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IFu/MS792x+ID+L4A8oe+4grtI6QpafESb2JnfXCqZJCDpjNgHV9r2vEmEGL0G/GzCYlG31
X-Received: by 2002:a05:6e02:60a:b0:34f:7ba2:50e8 with SMTP id
t10-20020a056e02060a00b0034f7ba250e8mr28265496ils.2.1697253411977;
Fri, 13 Oct 2023 20:16:51 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1697253411; cv=none;
d=google.com; s=arc-20160816;
b=mkRB+POw2ht9LE/zOx/vJ0pqcUlBrSSgV110ps3dXcLQpIxoPPahHlgLHddm1O53gy
dvur/gTt30KVYu7+eT1ibMbqLm+3QzfyUDy/kq2szx9taDnUJfwqfb7SonhQAIh+KVO7
gSqDDkShqolIb43wHBIxkTD975V4B6DyQrMR+Fx/P2oFupzsceDvDyxlpdIkFBB8THZ3
JOYl7/RbElc3pBy7aG0YLgc5F760zyIleWx6LhQcSTuSNKBkxAS61fnLeh1ZL26D7Qw8
HI3U8yt0Iqao6+EBg7ojK9pfkl7VX5jTjBbbTto7LDsB2kk+Ooy4qfnUQwTuhUCznzbe
1ADw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from
:dkim-signature:dkim-signature;
bh=shtGQZTA8x/ZskajPiRs74nN/R7Nybn+TE0QOW76kKA=;
fh=7SsncGRbN74Z5AHCSqGaWZ8qQBPFU2OgoSp70ZMB+sA=;
b=vNFjfIyu7NrzVr/fEb09drd2O+8HD+mC11gdl3pka5MiRBVAGvIo7DNzBQKoz+ifTW
ARTqcHrv96LyxZFDI3zmqa5P/RDd73R8Ad/ZgFgwsRHtt29HCVKKiZRE8gHXi698Uuso
d//zPsmWgIVGdLFrXdsZRrx7G7D2TkOxD1/pI4rJSXpLu0KCBbqzya2R/xJUWnwT+FRO
qtDUcBCIkX7IBh5L212uYi4iTmWmeVqv1Sk40gO/8C+OK4dumKLodDOfbSLI0XHhGoe0
O0kcVkc/O6LimTeO8Gt73fzw0hD9Q0SV+MeH6a14cEV1PSx/omrUtq+zJwzARuGULHdi
sYow==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=TeXv0wia;
dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=e2Uo6ftm;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.31 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr
Received: from morse.vger.email (morse.vger.email. [23.128.96.31])
by mx.google.com with ESMTPS id
d15-20020a63ed0f000000b00553800fe4dcsi5979769pgi.583.2023.10.13.20.16.51
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 13 Oct 2023 20:16:51 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Authentication-Results: mx.google.com;
dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=TeXv0wia;
dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=e2Uo6ftm;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.31 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by morse.vger.email (Postfix) with ESMTP id 20002822B728;
Fri, 13 Oct 2023 20:16:48 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232686AbjJNDQR (ORCPT <rfc822;hjfbswb@gmail.com> + 20 others);
Fri, 13 Oct 2023 23:16:17 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47130 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232799AbjJNDQL (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Fri, 13 Oct 2023 23:16:11 -0400
Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37B2EDC;
Fri, 13 Oct 2023 20:16:09 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
by domac.alu.hr (Postfix) with ESMTP id 38F5160152;
Sat, 14 Oct 2023 05:16:07 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail;
t=1697253367; bh=qpOvD4XKNURhpjg+KezJHAqIpJEgRBJVeTOQFFPohOI=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=TeXv0wiavGusj1Qc5l1MBeaQYu9LQTT+L+2Gnnv3zRNLtWWic0x06WB2m+/L43s2J
Q7EUlusEHyRsFfsxARCOfkRev/ZYGC80t+rlnKG8NoUZRntCxclsMkIOZMsEDobTQJ
0CCGNwPHsdfUs8ZomBmNls2/fFz8+JR1kDCmqpgMYSr5Exn6r8VJRGo2CnIFzfCvRw
Xvn7Nlj3nkLtqYHbSRmn3qqdFImp+FwyrklL6PVSrJ61gytLgrPTvmTj9bX18zbtBu
phN8pXrOAX/WL61HJc8xu8OVEKqh73N1c3nB3F6WhcPV+AX9Bd0ri2gbN1kDsgymk0
yO5F1MaqRbDeA==
X-Virus-Scanned: Debian amavisd-new at domac.alu.hr
Received: from domac.alu.hr ([127.0.0.1])
by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id O7q1u_sy9m9E; Sat, 14 Oct 2023 05:16:04 +0200 (CEST)
Received: from defiant.home (78-2-88-84.adsl.net.t-com.hr [78.2.88.84])
by domac.alu.hr (Postfix) with ESMTPSA id AD4606013C;
Sat, 14 Oct 2023 05:16:04 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail;
t=1697253364; bh=qpOvD4XKNURhpjg+KezJHAqIpJEgRBJVeTOQFFPohOI=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=e2Uo6ftmNu9RizOSdjuT3QyjrqJLfp/dudX+moNZQmcIonxeEOTbj9MdjiUoxfDFn
D1Wr1B6xgbGA3xi4eqqkxngEBVxvADh/FDTAl0J4mEOvgHbPcZAgBKCQW6Izqhfg6G
S8gSejnBwLMpfA6EJyjt+y9Ik9Fx5WN/liFtFbEcC4iSxAxFAdJwDFTtrzvj0d8TG4
Hh1v6d+apw2mJ+9ExZjBX/ny798VHpJvEgwOAOFT6340wdhRSobJrxqvN0pLCU4mYJ
3+sJg2MsYrenhXS0Ak5VpU2cuc5WTg8vokelC+UXQbu86kC0kbkTI4OiE/1u3KrNpF
Wbg/3RT6znKRw==
From: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
To: Heiner Kallweit <hkallweit1@gmail.com>, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: nic_swsd@realtek.com, "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>,
Marco Elver <elver@google.com>
Subject: [PATCH v1 2/3] r8169: fix the KCSAN reported data-race in rtl_tx
while reading TxDescArray[entry].opts1
Date: Sat, 14 Oct 2023 05:12:58 +0200
Message-Id: <20231014031257.178630-2-mirsad.todorovac@alu.unizg.hr>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20231014031257.178630-1-mirsad.todorovac@alu.unizg.hr>
References: <20231014031257.178630-1-mirsad.todorovac@alu.unizg.hr>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]);
Fri, 13 Oct 2023 20:16:49 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1779699193738748786
X-GMAIL-MSGID: 1779699193738748786
|
| Series |
[v1,1/3] r8169: fix the KCSAN reported data-race in rtl_tx() while reading tp->cur_tx
|
|
Commit Message
Mirsad Todorovac
Oct. 14, 2023, 3:12 a.m. UTC
KCSAN reported the following data-race:
==================================================================
BUG: KCSAN: data-race in rtl8169_poll (drivers/net/ethernet/realtek/r8169_main.c:4368 drivers/net/ethernet/realtek/r8169_main.c:4581) r8169
race at unknown origin, with read to 0xffff888140d37570 of 4 bytes by interrupt on cpu 21:
rtl8169_poll (drivers/net/ethernet/realtek/r8169_main.c:4368 drivers/net/ethernet/realtek/r8169_main.c:4581) r8169
__napi_poll (net/core/dev.c:6527)
net_rx_action (net/core/dev.c:6596 net/core/dev.c:6727)
__do_softirq (kernel/softirq.c:553)
__irq_exit_rcu (kernel/softirq.c:427 kernel/softirq.c:632)
irq_exit_rcu (kernel/softirq.c:647)
sysvec_apic_timer_interrupt (arch/x86/kernel/apic/apic.c:1074 (discriminator 14))
asm_sysvec_apic_timer_interrupt (./arch/x86/include/asm/idtentry.h:645)
cpuidle_enter_state (drivers/cpuidle/cpuidle.c:291)
cpuidle_enter (drivers/cpuidle/cpuidle.c:390)
call_cpuidle (kernel/sched/idle.c:135)
do_idle (kernel/sched/idle.c:219 kernel/sched/idle.c:282)
cpu_startup_entry (kernel/sched/idle.c:378 (discriminator 1))
start_secondary (arch/x86/kernel/smpboot.c:210 arch/x86/kernel/smpboot.c:294)
secondary_startup_64_no_verify (arch/x86/kernel/head_64.S:433)
value changed: 0xb0000042 -> 0x00000000
Reported by Kernel Concurrency Sanitizer on:
CPU: 21 PID: 0 Comm: swapper/21 Tainted: G L 6.6.0-rc2-kcsan-00143-gb5cbe7c00aa0 #41
Hardware name: ASRock X670E PG Lightning/X670E PG Lightning, BIOS 1.21 04/26/2023
==================================================================
The read side is in
drivers/net/ethernet/realtek/r8169_main.c
=========================================
4355 static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp,
4356 int budget)
4357 {
4358 unsigned int dirty_tx, bytes_compl = 0, pkts_compl = 0;
4359 struct sk_buff *skb;
4360
4361 dirty_tx = tp->dirty_tx;
4362
4363 while (READ_ONCE(tp->cur_tx) != dirty_tx) {
4364 unsigned int entry = dirty_tx % NUM_TX_DESC;
4365 u32 status;
4366
→ 4367 status = le32_to_cpu(tp->TxDescArray[entry].opts1);
4368 if (status & DescOwn)
4369 break;
4370
4371 skb = tp->tx_skb[entry].skb;
4372 rtl8169_unmap_tx_skb(tp, entry);
4373
4374 if (skb) {
4375 pkts_compl++;
4376 bytes_compl += skb->len;
4377 napi_consume_skb(skb, budget);
4378 }
4379 dirty_tx++;
4380 }
4381
4382 if (tp->dirty_tx != dirty_tx) {
4383 dev_sw_netstats_tx_add(dev, pkts_compl, bytes_compl);
4384 WRITE_ONCE(tp->dirty_tx, dirty_tx);
4385
4386 netif_subqueue_completed_wake(dev, 0, pkts_compl, bytes_compl,
4387 rtl_tx_slots_avail(tp),
4388 R8169_TX_START_THRS);
4389 /*
4390 * 8168 hack: TxPoll requests are lost when the Tx packets are
4391 * too close. Let's kick an extra TxPoll request when a burst
4392 * of start_xmit activity is detected (if it is not detected,
4393 * it is slow enough). -- FR
4394 * If skb is NULL then we come here again once a tx irq is
4395 * triggered after the last fragment is marked transmitted.
4396 */
4397 if (READ_ONCE(tp->cur_tx) != dirty_tx && skb)
4398 rtl8169_doorbell(tp);
4399 }
4400 }
tp->TxDescArray[entry].opts1 is reported to have a data-race and READ_ONCE() fixes
this KCSAN warning.
4366
→ 4367 status = le32_to_cpu(READ_ONCE(tp->TxDescArray[entry].opts1));
4368 if (status & DescOwn)
4369 break;
4370
Fixes: ^1da177e4c3f4 ("initial git repository build")
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: nic_swsd@realtek.com
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Marco Elver <elver@google.com>
Cc: netdev@vger.kernel.org
Link: https://lore.kernel.org/lkml/dc7fc8fa-4ea4-e9a9-30a6-7c83e6b53188@alu.unizg.hr/
Signed-off-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
---
drivers/net/ethernet/realtek/r8169_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Sat, 14 Oct 2023 at 05:16, Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> wrote: > > KCSAN reported the following data-race: > > ================================================================== > BUG: KCSAN: data-race in rtl8169_poll (drivers/net/ethernet/realtek/r8169_main.c:4368 drivers/net/ethernet/realtek/r8169_main.c:4581) r8169 > > race at unknown origin, with read to 0xffff888140d37570 of 4 bytes by interrupt on cpu 21: > rtl8169_poll (drivers/net/ethernet/realtek/r8169_main.c:4368 drivers/net/ethernet/realtek/r8169_main.c:4581) r8169 > __napi_poll (net/core/dev.c:6527) > net_rx_action (net/core/dev.c:6596 net/core/dev.c:6727) > __do_softirq (kernel/softirq.c:553) > __irq_exit_rcu (kernel/softirq.c:427 kernel/softirq.c:632) > irq_exit_rcu (kernel/softirq.c:647) > sysvec_apic_timer_interrupt (arch/x86/kernel/apic/apic.c:1074 (discriminator 14)) > asm_sysvec_apic_timer_interrupt (./arch/x86/include/asm/idtentry.h:645) > cpuidle_enter_state (drivers/cpuidle/cpuidle.c:291) > cpuidle_enter (drivers/cpuidle/cpuidle.c:390) > call_cpuidle (kernel/sched/idle.c:135) > do_idle (kernel/sched/idle.c:219 kernel/sched/idle.c:282) > cpu_startup_entry (kernel/sched/idle.c:378 (discriminator 1)) > start_secondary (arch/x86/kernel/smpboot.c:210 arch/x86/kernel/smpboot.c:294) > secondary_startup_64_no_verify (arch/x86/kernel/head_64.S:433) > > value changed: 0xb0000042 -> 0x00000000 > > Reported by Kernel Concurrency Sanitizer on: > CPU: 21 PID: 0 Comm: swapper/21 Tainted: G L 6.6.0-rc2-kcsan-00143-gb5cbe7c00aa0 #41 > Hardware name: ASRock X670E PG Lightning/X670E PG Lightning, BIOS 1.21 04/26/2023 > ================================================================== > > The read side is in > > drivers/net/ethernet/realtek/r8169_main.c > ========================================= > 4355 static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, > 4356 int budget) > 4357 { > 4358 unsigned int dirty_tx, bytes_compl = 0, pkts_compl = 0; > 4359 struct sk_buff *skb; > 4360 > 4361 dirty_tx = tp->dirty_tx; > 4362 > 4363 while (READ_ONCE(tp->cur_tx) != dirty_tx) { > 4364 unsigned int entry = dirty_tx % NUM_TX_DESC; > 4365 u32 status; > 4366 > → 4367 status = le32_to_cpu(tp->TxDescArray[entry].opts1); > 4368 if (status & DescOwn) > 4369 break; > 4370 > 4371 skb = tp->tx_skb[entry].skb; > 4372 rtl8169_unmap_tx_skb(tp, entry); > 4373 > 4374 if (skb) { > 4375 pkts_compl++; > 4376 bytes_compl += skb->len; > 4377 napi_consume_skb(skb, budget); > 4378 } > 4379 dirty_tx++; > 4380 } > 4381 > 4382 if (tp->dirty_tx != dirty_tx) { > 4383 dev_sw_netstats_tx_add(dev, pkts_compl, bytes_compl); > 4384 WRITE_ONCE(tp->dirty_tx, dirty_tx); > 4385 > 4386 netif_subqueue_completed_wake(dev, 0, pkts_compl, bytes_compl, > 4387 rtl_tx_slots_avail(tp), > 4388 R8169_TX_START_THRS); > 4389 /* > 4390 * 8168 hack: TxPoll requests are lost when the Tx packets are > 4391 * too close. Let's kick an extra TxPoll request when a burst > 4392 * of start_xmit activity is detected (if it is not detected, > 4393 * it is slow enough). -- FR > 4394 * If skb is NULL then we come here again once a tx irq is > 4395 * triggered after the last fragment is marked transmitted. > 4396 */ > 4397 if (READ_ONCE(tp->cur_tx) != dirty_tx && skb) > 4398 rtl8169_doorbell(tp); > 4399 } > 4400 } > > tp->TxDescArray[entry].opts1 is reported to have a data-race and READ_ONCE() fixes > this KCSAN warning. > > 4366 > → 4367 status = le32_to_cpu(READ_ONCE(tp->TxDescArray[entry].opts1)); > 4368 if (status & DescOwn) > 4369 break; > 4370 > > Fixes: ^1da177e4c3f4 ("initial git repository build") > Cc: Heiner Kallweit <hkallweit1@gmail.com> > Cc: nic_swsd@realtek.com > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Eric Dumazet <edumazet@google.com> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Paolo Abeni <pabeni@redhat.com> > Cc: Marco Elver <elver@google.com> > Cc: netdev@vger.kernel.org > Link: https://lore.kernel.org/lkml/dc7fc8fa-4ea4-e9a9-30a6-7c83e6b53188@alu.unizg.hr/ > Signed-off-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> Acked-by: Marco Elver <elver@google.com> > --- > drivers/net/ethernet/realtek/r8169_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c > index 81be6085a480..361b90007148 100644 > --- a/drivers/net/ethernet/realtek/r8169_main.c > +++ b/drivers/net/ethernet/realtek/r8169_main.c > @@ -4364,7 +4364,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, > unsigned int entry = dirty_tx % NUM_TX_DESC; > u32 status; > > - status = le32_to_cpu(tp->TxDescArray[entry].opts1); > + status = le32_to_cpu(READ_ONCE(tp->TxDescArray[entry].opts1)); > if (status & DescOwn) > break; > > -- > 2.34.1 >
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 81be6085a480..361b90007148 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4364,7 +4364,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, unsigned int entry = dirty_tx % NUM_TX_DESC; u32 status; - status = le32_to_cpu(tp->TxDescArray[entry].opts1); + status = le32_to_cpu(READ_ONCE(tp->TxDescArray[entry].opts1)); if (status & DescOwn) break;