Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp2762524rdh; Wed, 27 Sep 2023 11:54:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaPs59zo4f5vjGxtZtxuAOC51cnKjTzAAzgKPb68aEYhLa07cjIdGP8QRQOE8vvIGyuS7Z X-Received: by 2002:a05:6a00:398c:b0:68c:44ed:fb6 with SMTP id fi12-20020a056a00398c00b0068c44ed0fb6mr4180999pfb.16.1695840892123; Wed, 27 Sep 2023 11:54:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695840892; cv=none; d=google.com; s=arc-20160816; b=fAXMKGwbgjFZvzky0mp3ReqPf9MWoYZtcoY8i+6pR3BPTO/hHrNQOtHqaaxJOr6jsw 6GaRmnde/IjboaDy6eklZhRQuypSuYlmC5sXoelN6A64QUsxsGu52yJL1lGH3jjOhfTJ RvNOjPgGV3p3HA/05uH3IzTf8+Hu3aXoHIVfF39fGAKd0vleliwteiCCQ5MB2uJJpyvR ONTwrbuqV++jy1+N/DFTmoAV3rAdqgb0xIe+oA0HuXD3Ou5QV4MrSkbm62FovcqLHVND ymVWF1CGt9tOC65osRVm/ExgAiyETCtAwqY8WYneVW8St3NN1j/Yu2qkU/xXQjEBjXnC 3cXg== 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=dUqLSSdHEBJ+KA8+mv0OKPagXGgN2rO+oDpjT6foCzM=; fh=7SsncGRbN74Z5AHCSqGaWZ8qQBPFU2OgoSp70ZMB+sA=; b=0Eei9nBxbym7J7JnjDdkv1x4WTu1lIIaSALG8H0PnzMyyTAIODbh266Hnj0pBcFiHR upwhrBE/rgeZAH/XkvdPU/oT/QvF3mu4EVQPkdprk6zbLpMGEADizJl229fYUhrkt+YS sIrcdtL/uSCOlLOQYEmwWEJnVttcfH0K6q6Awu0A47icFMgqF7M3x5gQaZQKX71nevAY rNhw3Cln4Lvm9Dnv06d4W/PqVbHmUGbXv94XEZgQAdji4LP6IgaszSRInjXUFLjZC1mt uzDWJgsNs49niwZCI+o8PrG3fwUpqJMGEHIIykBTtvU8bs+noKN2p/mMwNNYcvwy7DdJ Bsiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=LIVle9WZ; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=vtx2qKY2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id g20-20020a056a001a1400b0068fcf6fe22esi16882113pfv.306.2023.09.27.11.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 11:54:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=LIVle9WZ; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=vtx2qKY2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 5D188802FB6C; Wed, 27 Sep 2023 11:46:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229534AbjI0SqU (ORCPT + 99 others); Wed, 27 Sep 2023 14:46:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjI0SqT (ORCPT ); Wed, 27 Sep 2023 14:46:19 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 497358F; Wed, 27 Sep 2023 11:46:18 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 6EB866017F; Wed, 27 Sep 2023 20:46:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1695840376; bh=eyWyK7TlkzBJCtBBJ/CXcDT6nfZD6J5YeGBFsunPCag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LIVle9WZOWn6aD6dqLkakqPBGJI3QKKhpIvj4ohX77NetK7FZsmrMb0dh6jpz2/Nv 3Nm7eN698nE3Y6Zbv6KGJFMx98YL+m5uDMPUpC2KyWE096xMld/G5JQbYFyN2TJ1Bp kUHwV6O7ANKltpaV5MRxUgq2rNDb2r4jJBREpn9HTPfG4Ac5Nvt3tKR2fwy0ihogY1 OER1Bk9x5ZCM1/c3eLguY7jZhgXIw3jyLox0w0nlEKPTagloD6OY4OOXXAH40+M45P nNq43PrxSccmaV6Y5bfL9AkqMELa4o5p53WQA77sC3ehV2fljR7ICbJfe4FSeJ8NWy WGqcrejHSJwiA== 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 UDcH-kqXjvO1; Wed, 27 Sep 2023 20:46:13 +0200 (CEST) Received: from defiant.home (78-2-200-97.adsl.net.t-com.hr [78.2.200.97]) by domac.alu.hr (Postfix) with ESMTPSA id C8ECA60174; Wed, 27 Sep 2023 20:46:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1695840373; bh=eyWyK7TlkzBJCtBBJ/CXcDT6nfZD6J5YeGBFsunPCag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vtx2qKY2k77KFOwaunjM9GBleUhuDJYnVeBrTA+d87zHihAMSc/XVd4H8fRvcXc4i 3vKDMaQ0IHXW3sXAjATPQZx6+/AAKSUOFRanT+X2LlQrh3Uqm2nOiaEF5bM/2A4v1q gZ2BOrinV6U4133GQ5s8VPGVrM1+6b8pAagJhitIZ+xKXSbCTZFlAXC5610A2Inj3H HsO1/P5oQK8nKaCgMvT4fyl2XeKValBfQDGjTq7BIxveynrL18qJ20GhWfZZEBssgt agUEzi9QruhXqaECETnvhZy5zaRQBzkGgX4NkKwNkvgtJsJMWhCPYaaxsgCIskMb3L SakgHwLQJuFIA== From: Mirsad Goran Todorovac To: Heiner Kallweit , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: nic_swsd@realtek.com, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Mirsad Goran Todorovac , Marco Elver Subject: [PATCH RFC v1 3/3] r8169: fix the KCSAN reported data-race in rtl_tx while reading TxDescArray[entry].opts1 Date: Wed, 27 Sep 2023 20:42:01 +0200 Message-Id: <20230927184158.243575-3-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927184158.243575-1-mirsad.todorovac@alu.unizg.hr> References: <20230927184158.243575-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 agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 27 Sep 2023 11:46:36 -0700 (PDT) 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 Cc: nic_swsd@realtek.com Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Marco Elver 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 --- v1: the initial patch proposal. fixes the KCSAN warning. 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