Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp6127331pxv; Thu, 29 Jul 2021 07:10:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXGOb/kR/C73ISNPkn67mXWKN37vMyn7SZm0cGb9oXubKU13i2uybnc1LG9U8TUgbe/MH8 X-Received: by 2002:a02:9508:: with SMTP id y8mr4661000jah.28.1627567818986; Thu, 29 Jul 2021 07:10:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627567818; cv=none; d=google.com; s=arc-20160816; b=sZIoikxiIWpz9nbTdkzyNmAE1gSgAO1svHsnkFKGiWVuSc4I5DRcB5byxBVM9pCL71 3F+/xLsHarP3puRYItELs8Jfapv8avJHpiG1r2BTu8ggprU1P4Ag3vzztoXTp2YaT2Un D2vdta5HC2mH2YLHMcK9bFYtV9bSfhTuA8Cez2Laui11LyzIYviVpjv2LBOBRDJvOFXQ MBWVRq0miLRgHdUyDhVkn6S2obOvVGKUauSnxhs4DPMZyB/rj8oiSsCnJCGG4LnCeb5B UMfAf/Viun5KeeI5gX9WuTrg0SrbQmmEwSI6NRudic8nt3/UgdZ4D3npr9OJ3wu2cl6U jtag== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iUbKmZrRdLY3n1b6U2Lw/0j19Y8lo1M0tYmtZzBcov8=; b=N+vDK1dGjSuds7YyAQbWXp5c5zk87c4qNsBbjAzahygVnCYBdfOlS8OUPabwtbsY5V oZMH+8UJw4LR/NOTPPXcvEY3Gu93RE/fazwFkPWRGmwgiFe+uSCXNlBXBmbYMoKwiV2v vMen9bHL7VsdFDfX5F0VzOq2PAZV3WLLVslLoB4a12pPQVk3Wedh0D4w1QoX9lD00IGl gaVd2TJRSZKO7Fwi6KTxR1XEoM66ZZ4nO5KmjY+5AMAySxPaZR43jzrIdEUlbnXDLIcO pPqLt1lhr2bOJfYYNy3GLmVh8HdOJuKvsoawDo5rjaIA0MnP4pCtV4MtJB8MOVo6mlUV Op4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ThelWYi2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v5si3807378jan.37.2021.07.29.07.10.06; Thu, 29 Jul 2021 07:10:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ThelWYi2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239412AbhG2OIk (ORCPT + 99 others); Thu, 29 Jul 2021 10:08:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:48368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238468AbhG2OA0 (ORCPT ); Thu, 29 Jul 2021 10:00:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E63D61058; Thu, 29 Jul 2021 13:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627567178; bh=6f66JCNGVujFPLVnD/7Skf1XFUdFeTvUC9OU/wXr0Bo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ThelWYi26kPZL3mn+h1T41ej0fGH4PV5okkW00VKeA6bXE31yYC7l7nlQn/ctzK75 ktiSXS8sFRHTQPYk+j6aihrEucnkVK8MS0Rv1Zqk0dsLRdGfkas90I1q+jS/P4/2Ns DtcLbMZuuFAi+1NivMN/y8Fb/YnYhlJ1TNqGtbXI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , syzbot , "David S. Miller" , Sasha Levin Subject: [PATCH 5.13 06/22] net: annotate data race around sk_ll_usec Date: Thu, 29 Jul 2021 15:54:37 +0200 Message-Id: <20210729135137.540429813@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729135137.336097792@linuxfoundation.org> References: <20210729135137.336097792@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit 0dbffbb5335a1e3aa6855e4ee317e25e669dd302 ] sk_ll_usec is read locklessly from sk_can_busy_loop() while another thread can change its value in sock_setsockopt() This is correct but needs annotations. BUG: KCSAN: data-race in __skb_try_recv_datagram / sock_setsockopt write to 0xffff88814eb5f904 of 4 bytes by task 14011 on cpu 0: sock_setsockopt+0x1287/0x2090 net/core/sock.c:1175 __sys_setsockopt+0x14f/0x200 net/socket.c:2100 __do_sys_setsockopt net/socket.c:2115 [inline] __se_sys_setsockopt net/socket.c:2112 [inline] __x64_sys_setsockopt+0x62/0x70 net/socket.c:2112 do_syscall_64+0x4a/0x90 arch/x86/entry/common.c:47 entry_SYSCALL_64_after_hwframe+0x44/0xae read to 0xffff88814eb5f904 of 4 bytes by task 14001 on cpu 1: sk_can_busy_loop include/net/busy_poll.h:41 [inline] __skb_try_recv_datagram+0x14f/0x320 net/core/datagram.c:273 unix_dgram_recvmsg+0x14c/0x870 net/unix/af_unix.c:2101 unix_seqpacket_recvmsg+0x5a/0x70 net/unix/af_unix.c:2067 ____sys_recvmsg+0x15d/0x310 include/linux/uio.h:244 ___sys_recvmsg net/socket.c:2598 [inline] do_recvmmsg+0x35c/0x9f0 net/socket.c:2692 __sys_recvmmsg net/socket.c:2771 [inline] __do_sys_recvmmsg net/socket.c:2794 [inline] __se_sys_recvmmsg net/socket.c:2787 [inline] __x64_sys_recvmmsg+0xcf/0x150 net/socket.c:2787 do_syscall_64+0x4a/0x90 arch/x86/entry/common.c:47 entry_SYSCALL_64_after_hwframe+0x44/0xae value changed: 0x00000000 -> 0x00000101 Reported by Kernel Concurrency Sanitizer on: CPU: 1 PID: 14001 Comm: syz-executor.3 Not tainted 5.13.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Signed-off-by: Eric Dumazet Reported-by: syzbot Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/busy_poll.h | 2 +- net/core/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index 73af4a64a599..40296ed976a9 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -38,7 +38,7 @@ static inline bool net_busy_loop_on(void) static inline bool sk_can_busy_loop(const struct sock *sk) { - return sk->sk_ll_usec && !signal_pending(current); + return READ_ONCE(sk->sk_ll_usec) && !signal_pending(current); } bool sk_busy_loop_end(void *p, unsigned long start_time); diff --git a/net/core/sock.c b/net/core/sock.c index 2003c5ebb4c2..37d732fe3fcf 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1172,7 +1172,7 @@ set_sndbuf: if (val < 0) ret = -EINVAL; else - sk->sk_ll_usec = val; + WRITE_ONCE(sk->sk_ll_usec, val); } break; case SO_PREFER_BUSY_POLL: -- 2.30.2