Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3385810rwb; Tue, 16 Aug 2022 01:53:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR5UYf/dvlLfe10QPg+Vips4D8JkXJZS7E4caBuTYMFi/XqSW8kst8rvsTyjg3YtMwu5uH/6 X-Received: by 2002:a17:902:d48a:b0:16f:51a:252a with SMTP id c10-20020a170902d48a00b0016f051a252amr20668483plg.71.1660639998698; Tue, 16 Aug 2022 01:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660639998; cv=none; d=google.com; s=arc-20160816; b=BS4oaZe2AyWkhfcfv5WIP/xa7uHcDuosL9AJgYtdcK7ftcCHwcrZJkcdyNx+/KSOz4 bon4AhKsVzslladIYDbAiazGK5MSx8dmNi84p+Qbf7ElTX5i32YdFS5m8b5+PNwmd3Xn C6b76m3ssx71sSM2lq56lBJGtV28CJtCrL22Y+7sW/bWzfX2pG0XhSchh3fIy1aM+oZN 9ETFM3vd5cblppfY980o6BbVvjd7zWgJtDbK8KuPprzHuNA59ppjk8Gb7PrzKl6eMsT0 Mh7HDrhj81EJGIXg7BE/91SCymlvQvoXTVZ/kvL8ZNxIAS/dFKXgwvt1yrYt09Vls77/ pUhw== 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; bh=V+V7SGE1WHozIaXLIy6WGjvIZ5CklIm6fLWTrqxbonM=; b=HvqNpknwIVZqBwq2zfLYfu06wGtQjkuB8QJzdvUf1DrNCIyHYXY5NXXN3wFdQu2e+v p/p9TNGnf6lKWk2chw4x3JSwyTdQdFT1ZVlPN4Dj+51+HxiyJezFe54SQu7pUHW1emDd 49tyWkud8UYQDSag6NVAjFtrP9pOn38i8vI7CIooKoUg43A6X6JA26uy5UJar8YjXp48 mwcYB3FgYGpkwLCUwLhShkUqQxbnN3ZjD8O+WsptCj6uhbLFs1qSru0pWC5/R+IhAP7n qaVVay/3Swz+UgFxv6yjTWc5y+PdMzzSNGcL3rF3eIPxQjOpMmgPeFiod75Ic7Abzxmq VBsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=FoJYAccZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t16-20020a17090340d000b0016e5aadc449si12464369pld.137.2022.08.16.01.53.07; Tue, 16 Aug 2022 01:53:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=FoJYAccZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231592AbiHPIE4 (ORCPT + 99 others); Tue, 16 Aug 2022 04:04:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230287AbiHPIDj (ORCPT ); Tue, 16 Aug 2022 04:03:39 -0400 Received: from smtp-fw-9102.amazon.com (smtp-fw-9102.amazon.com [207.171.184.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 995878A1CF; Mon, 15 Aug 2022 22:26:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1660627595; x=1692163595; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V+V7SGE1WHozIaXLIy6WGjvIZ5CklIm6fLWTrqxbonM=; b=FoJYAccZPGPLfdrs02a1qHq7znBabporIiKbvKa5bi/M0Wtl6b/iOGC+ 8/SqZiEhxAXvLTlN5ROADLSSBcx8Nz5zi9oZcGlNmVBEMRX/k8flBtlq9 yUrFyIqA45SrN7pRItZLzJMOG9sd9tHKxXRRxrRxyNz5wJpuvk9eBhVsr 8=; X-IronPort-AV: E=Sophos;i="5.93,240,1654560000"; d="scan'208";a="249243085" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-iad-1a-87b71607.us-east-1.amazon.com) ([10.25.36.210]) by smtp-border-fw-9102.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2022 05:26:19 +0000 Received: from EX13MTAUWB001.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan3.iad.amazon.com [10.40.163.38]) by email-inbound-relay-iad-1a-87b71607.us-east-1.amazon.com (Postfix) with ESMTPS id 5A872141032; Tue, 16 Aug 2022 05:26:16 +0000 (UTC) Received: from EX19D004ANA001.ant.amazon.com (10.37.240.138) by EX13MTAUWB001.ant.amazon.com (10.43.161.207) with Microsoft SMTP Server (TLS) id 15.0.1497.38; Tue, 16 Aug 2022 05:26:15 +0000 Received: from 88665a182662.ant.amazon.com (10.43.160.55) by EX19D004ANA001.ant.amazon.com (10.37.240.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1118.12; Tue, 16 Aug 2022 05:26:13 +0000 From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni CC: Kuniyuki Iwashima , Kuniyuki Iwashima , , Subject: [PATCH v1 net 08/15] net: Fix data-races around netdev_tstamp_prequeue. Date: Mon, 15 Aug 2022 22:23:40 -0700 Message-ID: <20220816052347.70042-9-kuniyu@amazon.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816052347.70042-1-kuniyu@amazon.com> References: <20220816052347.70042-1-kuniyu@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.43.160.55] X-ClientProxiedBy: EX13D24UWB003.ant.amazon.com (10.43.161.222) To EX19D004ANA001.ant.amazon.com (10.37.240.138) X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While reading netdev_tstamp_prequeue, it can be changed concurrently. Thus, we need to add READ_ONCE() to its readers. Fixes: 3b098e2d7c69 ("net: Consistent skb timestamping") Signed-off-by: Kuniyuki Iwashima --- net/core/dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 07da69c1ac0a..4705e6630efa 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4928,7 +4928,7 @@ static int netif_rx_internal(struct sk_buff *skb) { int ret; - net_timestamp_check(netdev_tstamp_prequeue, skb); + net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb); trace_netif_rx(skb); @@ -5281,7 +5281,7 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, int ret = NET_RX_DROP; __be16 type; - net_timestamp_check(!netdev_tstamp_prequeue, skb); + net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb); trace_netif_receive_skb(skb); @@ -5664,7 +5664,7 @@ static int netif_receive_skb_internal(struct sk_buff *skb) { int ret; - net_timestamp_check(netdev_tstamp_prequeue, skb); + net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb); if (skb_defer_rx_timestamp(skb)) return NET_RX_SUCCESS; @@ -5694,7 +5694,7 @@ void netif_receive_skb_list_internal(struct list_head *head) INIT_LIST_HEAD(&sublist); list_for_each_entry_safe(skb, next, head, list) { - net_timestamp_check(netdev_tstamp_prequeue, skb); + net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb); skb_list_del_init(skb); if (!skb_defer_rx_timestamp(skb)) list_add_tail(&skb->list, &sublist); -- 2.30.2