[RFC,v1,2/3] r8169: fix the KCSAN reported data race in rtl_rx while reading desc->opts1
Message ID | 20230927184158.243575-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:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2833291vqu; Wed, 27 Sep 2023 11:54:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFF54H47dlqwK1iEuvfIscm6hyIWvoXuX38pq8rH49x3DPZo1EZj3MRa/MqLo3VnEuQWe9U X-Received: by 2002:a17:902:e80e:b0:1c2:193e:1126 with SMTP id u14-20020a170902e80e00b001c2193e1126mr4702842plg.28.1695840883875; Wed, 27 Sep 2023 11:54:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695840883; cv=none; d=google.com; s=arc-20160816; b=a2Om8iM7hZEjVo/dPasEVHPSE4LxAl9ZzWeoeg8wUUVGNvfVjCmIM4ObJGU7rE825u +D5D6fxFzZdPx3htPyNKPXeTtLAJa+yN0q2JQvB035gLiko3zOstvPOHpSTxcH5DeaV8 Ax7HcL7Q6MLSOD79mnnzukIFMzYMq9m1yHWPTEkqCR7lv31QzfE4jQfql1rn8gUCcngB kGT+0y8w7fXGFlunLKijma/EAw4XzYwwLxgBXuotnvMaLtFSrFffKsxqhdZ0863s6OOG JARosFeUMkFXokt9fwcjXJNJlLmwW8FG+sz0p28vhzFtxaUa8siW2sh/nrogLAuBu34J By7Q== 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=/+orp7T6b6oFx/gh5swcg7kiZ72CI2uLAcmraU7PXLg=; fh=7SsncGRbN74Z5AHCSqGaWZ8qQBPFU2OgoSp70ZMB+sA=; b=qn1e0Mzxy4Shxv/kzfOsn+dfl+QGByMZlIsnUANCjQAwJmO5JRiTqRH5MAW22NfreF CBzHMfGSkZyJj4H57zdGjbvi3QlfmmH/WLEK5ou2VBbf9hJIvm294b8UUppHXCZfkt7l v12ZzQppQkHr2yhAkN2iYuhAtNaKXc2oAQ4kdBWmoS0qbxGQab+egDeBzbthNpf1avTg KKT5/Hg3/nV050lHYi80jjzhGIvnvpwWUppycPEKwvAu6aaO8IuPklTyzurogBb4UY5n EOHHAXyHANk7KRHr5CBaXrZxu2agtZnOlW/VipG/1naXS0V60C9hdW47S4Eaki0ctt+8 SOlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b="Vmm/E2i+"; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=Sz1VZjlP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u12-20020a170902e5cc00b001c5c344a425si10376073plf.418.2023.09.27.11.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 11:54:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b="Vmm/E2i+"; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=Sz1VZjlP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 B7E89801F112; Wed, 27 Sep 2023 11:46:10 -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 S229568AbjI0Spk (ORCPT <rfc822;ruipengqi7@gmail.com> + 20 others); Wed, 27 Sep 2023 14:45:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjI0Spj (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 27 Sep 2023 14:45:39 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [IPv6:2001:b68:2:2800::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5B6FE6; Wed, 27 Sep 2023 11:45:37 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 8A2526017F; Wed, 27 Sep 2023 20:45:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1695840336; bh=jCUkxm8G1cRHqM0Z9NMo4Scij68gCyXJSLjxVEFYhK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vmm/E2i+UQIrYXgrkKdDbqQsXDSnRfM9A3xANbIIEZsUiZwC/kP5gBf9mdoTTKez/ xImMuP1G6mfUPVtBfPB0x/aDGALlS6Usstpc6SPIHbdv1jmzguxJ2msRneBd9vaDgk QJDDB8CeIghPo09ysR/Ow3d/xmlfFQFNM5WqJ3fWb14ZgLRU4DNIm5k20C+MxANl59 DEvT3p6v2lkzkC+56hSEpuGy2X6a2Yryn18wnD1cUn+5FqG0eqfh8JlpkgkvmSSXgi Kq4pYAYU4IuRFZfKncM7CDQ/gL98pG6jpppe5rLbULVFMMTIJHjyOPriWTNN50YQT2 qKT0pbB58jp9g== 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 KK14IOTF3v0S; Wed, 27 Sep 2023 20:45:33 +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 BCCEB60174; Wed, 27 Sep 2023 20:45:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1695840333; bh=jCUkxm8G1cRHqM0Z9NMo4Scij68gCyXJSLjxVEFYhK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sz1VZjlP3pp7oLnmqR8DU+0cZdw/mXlESmiccRiDX26R1Fv7vKKOpJSoScsUvAlEz xzx7W/yGOvGMYUbSM+Gg5tknbsIX3k3SLNrc5X7Jhm4wuTLEfGJclYxu+4HxYJm986 /yqdAvWG6KeD14aEor2uro8zmRRsRB/we/b24UZRgEkDGuywvHU+tKDa/jQ4ccjYDY ZxLzeBgVIIrlCMqziExchoWNsPH15t4KkVA8KuIRiwasxnQ0gNtVAr4Y2552sPMom/ jT/t/Y6m2IU+NYMJR3GoOSoDWcp//qElYoZaqJjDSqhRe4NY7ecy8g8k7aBc9Qpf4l vnIZGa9fFe7GQ== 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 RFC v1 2/3] r8169: fix the KCSAN reported data race in rtl_rx while reading desc->opts1 Date: Wed, 27 Sep 2023 20:41:59 +0200 Message-Id: <20230927184158.243575-2-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: <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 (agentk.vger.email [0.0.0.0]); Wed, 27 Sep 2023 11:46:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778218050966217899 X-GMAIL-MSGID: 1778218050966217899 |
Series |
[RFC,v1,1/3] r8169: fix the KCSAN reported data-race in rtl_tx() while reading tp->cur_tx
|
|
Commit Message
Mirsad Todorovac
Sept. 27, 2023, 6:41 p.m. UTC
KCSAN reported the following data-race bug: ================================================================== BUG: KCSAN: data-race in rtl8169_poll (drivers/net/ethernet/realtek/r8169_main.c:4430 drivers/net/ethernet/realtek/r8169_main.c:4583) r8169 race at unknown origin, with read to 0xffff888117e43510 of 4 bytes by interrupt on cpu 21: rtl8169_poll (drivers/net/ethernet/realtek/r8169_main.c:4430 drivers/net/ethernet/realtek/r8169_main.c:4583) 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: 0x80003fff -> 0x3402805f 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 ================================================================== drivers/net/ethernet/realtek/r8169_main.c: ========================================== 4429 → 4430 status = le32_to_cpu(desc->opts1); 4431 if (status & DescOwn) 4432 break; 4433 4434 /* This barrier is needed to keep us from reading 4435 * any other fields out of the Rx descriptor until 4436 * we know the status of DescOwn 4437 */ 4438 dma_rmb(); 4439 4440 if (unlikely(status & RxRES)) { 4441 if (net_ratelimit()) 4442 netdev_warn(dev, "Rx ERROR. status = %08x\n", Marco Elver explained that dma_rmb() doesn't prevent the compiler to tear up the access to desc->opts1 which can be written to concurrently. READ_ONCE() should prevent that from happening: 4429 → 4430 status = le32_to_cpu(READ_ONCE(desc->opts1)); 4431 if (status & DescOwn) 4432 break; 4433 As the consequence of this fix, this KCSAN warning was eliminated. Fixes: 6202806e7c03a ("r8169: drop member opts1_mask from struct rtl8169_private") Suggested-by: Marco Elver <elver@google.com> 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: 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> Signed-off-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> --- 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 281aaa851847..81be6085a480 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4427,7 +4427,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, int budget dma_addr_t addr; u32 status; - status = le32_to_cpu(desc->opts1); + status = le32_to_cpu(READ_ONCE(desc->opts1)); if (status & DescOwn) break;