From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4342DC71136 for ; Fri, 13 Jun 2025 20:33:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1380160671; Fri, 13 Jun 2025 20:33:31 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id cxrarohzwd19; Fri, 13 Jun 2025 20:33:30 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 75E8660D8B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1749846810; bh=OBk8y2WrRSYe0+qd1bXdlKUoFp7dWqpBPCvB8ZCmdDU=; h=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=fMXFuPK7vyCo1K2KjZK7hfg5CxNBxsGPQVhrsMo3tILW9a9BrMiIQaClYuHOyEAkY upS72r0w3xdY4C3JAgpM59kvWxMTReEi8oqXAHrj8fxcOo1xDGpatbysyXk7+/PaXe ntYKkvuOgefoWaZ96rVqc0aQSr6yP+/vAUIMQZuvB/Pani3qt66ELcDEcLhgeLL0vk 7nPgLzMeh41WiMCCMUei8jQR6eXyk+i6iiY3PhJ6YwDfUv5YtZXfqT7Z1vgUVT5KqD Hkwiz0P7yFvyPp+xtcRT1Zfl7PJqdgvxvZho3LxnAGgYvWMEExVWazoME/494lRs4G 8h0YGRDhNUsnw== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 75E8660D8B; Fri, 13 Jun 2025 20:33:30 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists1.osuosl.org (Postfix) with ESMTP id A61A9183 for ; Fri, 13 Jun 2025 20:33:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8C6B160BF1 for ; Fri, 13 Jun 2025 20:33:29 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id KRnfciryHNlS for ; Fri, 13 Jun 2025 20:33:29 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::102a; helo=mail-pj1-x102a.google.com; envelope-from=stfomichev@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org F3E3860671 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F3E3860671 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by smtp3.osuosl.org (Postfix) with ESMTPS id F3E3860671 for ; Fri, 13 Jun 2025 20:33:28 +0000 (UTC) Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-3116db72bd7so2766148a91.2 for ; Fri, 13 Jun 2025 13:33:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749846808; x=1750451608; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OBk8y2WrRSYe0+qd1bXdlKUoFp7dWqpBPCvB8ZCmdDU=; b=ZqYngfeKuyDkhRPKV5JMi9E2qqqvneHaK7t8NhiDsu/5CV9hjAPcd0lWSomuPqOSlK B2fHzb6M9lfBUiVgvuRtjDxHILAx+X94PPmu15i2YZwAlFKa4x1LThAuLgAth4TUmeOF mqD+uaWEpS5xk3RtCsAD6Q1h5Mx/cbu0dWt8txkhxOa/iFZsiIX/tlvhOFrA8/baNZsC SlXkEBSzf6odXSQDWNWpf7RnwR+M2LRyuUf9nTBpTmL5nssDSry6a5+Ts8kcKDyO0uNM VfEi4BQ52NFGtTUC2cy2KBMe3uUyppme8k8V07fhooPNKtsYtRD3ykk1G2lw0yinsqlN MT/g== X-Forwarded-Encrypted: i=1; AJvYcCW7eJ7EP6jePrupWi7HIwqcZq2vwwL7IIeesve7HaOWLv5LP+6lQFmpUexz5fGWqGLO6EfERlLa/dQx7Ojn+Ts=@lists.osuosl.org X-Gm-Message-State: AOJu0YxXKVHqJ7R3S4HSfUK/JBcun+oFhYhgoEwQaQNJzFmPjBRl1GyL sNDj29FA7OQqGfK38RrdRkwThOa5+liqjp4Ldd1jHtBiPmNwSecEvgY= X-Gm-Gg: ASbGncs+ZEeKRnxTkGDDpGzNCpqOgDRb7Cgg0k7ELeYcvn8QbKcJpbZ6kD9Hgf4YJNu 5SWCcwJgagxYZi0NBgpGYsin/mLZX17zSp9rL1sZT9/Wk2LBq6IGnBhUH78OdqjCuBe7hMVIy8F qbb0gvz8qElVuUI9HJxauC/e6t5nCBZvuixFcL+w/DEz/raJ4adWhTL1szorB6zTK6DMpBGLxSJ V+rXwweNzkjZh0ER+pS1pSg/t1nE5wFemeMD7XrtJPE/t527CX1yvU/OCPiN7nMh86YkjRzQS1T 2+dcrMk6pTt0mxq2IzPw8ZRH2OYsR/zuAStXLjz4VIFg4ajZKvq189iZDwWoPXWWTfdiKG6kwPH O81LaWS62mTUWYKxlQFsiuGc= X-Google-Smtp-Source: AGHT+IHoQe9kZNmiwFgO4UN/YI6LxV+FrHuaz2eiRSh2X5ivyPpLydz1ZML9qM0wZPZU19hVvxBN7A== X-Received: by 2002:a17:90b:58e6:b0:312:db8:dbd1 with SMTP id 98e67ed59e1d1-313f1ca7bb8mr1421800a91.5.1749846808151; Fri, 13 Jun 2025 13:33:28 -0700 (PDT) Received: from localhost (c-73-158-218-242.hsd1.ca.comcast.net. [73.158.218.242]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-2365deaa9dfsm18866135ad.172.2025.06.13.13.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 13:33:27 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, skalluru@marvell.com, manishc@marvell.com, andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, ajit.khaparde@broadcom.com, sriharsha.basavapatna@broadcom.com, somnath.kotur@broadcom.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, tariqt@nvidia.com, saeedm@nvidia.com, louis.peens@corigine.com, shshaikh@marvell.com, GR-Linux-NIC-Dev@marvell.com, ecree.xilinx@gmail.com, horms@kernel.org, dsahern@kernel.org, shuah@kernel.org, tglx@linutronix.de, mingo@kernel.org, ruanjinjie@huawei.com, idosch@nvidia.com, razor@blackwall.org, petrm@nvidia.com, kuniyu@google.com, sdf@fomichev.me, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, linux-net-drivers@amd.com, linux-kselftest@vger.kernel.org, leon@kernel.org Date: Fri, 13 Jun 2025 13:33:20 -0700 Message-ID: <20250613203325.1127217-2-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250613203325.1127217-1-stfomichev@gmail.com> References: <20250613203325.1127217-1-stfomichev@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749846808; x=1750451608; darn=lists.osuosl.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OBk8y2WrRSYe0+qd1bXdlKUoFp7dWqpBPCvB8ZCmdDU=; b=OV0Wrbma9gYeXUTCcg5vfrBlVinr6LWqFTd7YeMidLgOndRNcrh9NFuWHzlxbttz1i Nb48hqIabZ7xI52d9mUU+b/ICH2i99GDwjoZCZuQln+01ig+6xtjhhdHDu/XzkOthh8k zB2rvgZ6InqD5z4SnOtKdZ9RIzBNnLqVr95F59+F0rkpEkXKpzzwoxGu+4EX5JE7ARdi GaH4lngSjs0ADy8V8GyxAEO/3mzJOotaRx62k6UrWDuLtbqXVniAr+wa4gTdVTDzdyRH dZo+pQJlq74w75XEv+TJntqmpuriVN1QC0qgEVWCz8iMoXEJ0coGEGr7YLY87IJK9qQx r7ww== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=OV0Wrbma Subject: [Intel-wired-lan] [PATCH net-next v4 1/6] geneve: rely on rtnl lock in geneve_offload_rx_ports X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" udp_tunnel_push_rx_port will grab mutex in the next patch so we can't use rcu. geneve_offload_rx_ports is called from geneve_netdevice_event for NETDEV_UDP_TUNNEL_PUSH_INFO and NETDEV_UDP_TUNNEL_DROP_INFO which both have ASSERT_RTNL. Entries are added to and removed from the sock_list under rtnl lock as well (when adding or removing a tunneling device). Signed-off-by: Stanislav Fomichev --- drivers/net/geneve.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index ffc15a432689..9efedc6758bf 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -41,6 +41,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); /* per-network namespace private data for this module */ struct geneve_net { struct list_head geneve_list; + /* sock_list is protected by rtnl lock */ struct list_head sock_list; }; @@ -1179,8 +1180,9 @@ static void geneve_offload_rx_ports(struct net_device *dev, bool push) struct geneve_net *gn = net_generic(net, geneve_net_id); struct geneve_sock *gs; - rcu_read_lock(); - list_for_each_entry_rcu(gs, &gn->sock_list, list) { + ASSERT_RTNL(); + + list_for_each_entry(gs, &gn->sock_list, list) { if (push) { udp_tunnel_push_rx_port(dev, gs->sock, UDP_TUNNEL_TYPE_GENEVE); @@ -1189,7 +1191,6 @@ static void geneve_offload_rx_ports(struct net_device *dev, bool push) UDP_TUNNEL_TYPE_GENEVE); } } - rcu_read_unlock(); } /* Initialize the device structure. */ -- 2.49.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68859235065; Fri, 13 Jun 2025 20:33:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749846810; cv=none; b=E8IbsO4vDyGrt3TNa0xipjJEu7uNAquxpWYnuNxe0dy1F4NZKVlTHJT7SBsGYzms7M94It7dIPin3lrdOzYc8/aFbZXf9TUrW/cK540T9WSS5Pbcc52J3hl6jBDl5y0cP1Kl9XbEhl74OnjJt3dwvx2LvnZdgzwMfkRtuMqWIzM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749846810; c=relaxed/simple; bh=JkoN2dWrcEqUNM0emlkw41oWkqb12RsAg6lhxUAnLNY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VP0Omrlsyhoz7ZfoKXMhDFARUVVAXXSctx9WGwGPcP+ykyyY3TBS6EZsmN/c9K0l0S5Tfrs8L6wYl60aZxVGKwJ7gt2F6cb20F9witA9YVMef/OD6kWLMHXos6RY9fUZvDRsto9vUESOU6lm2HibxgLLeeRN7wuqZ9AMV0tMBFo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PH+2W0c6; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PH+2W0c6" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-3116db72bd7so2766153a91.2; Fri, 13 Jun 2025 13:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749846808; x=1750451608; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OBk8y2WrRSYe0+qd1bXdlKUoFp7dWqpBPCvB8ZCmdDU=; b=PH+2W0c64/GA5O4zdma2Qtg9hJdZEMY8qc+A/n/+fSOL3J4sZLu34tbrRK9X55rHhn NO0KLmo0IcPjozxMRAlICoPYwKqAViPqWhVHJGlEGz08fb40Cali1OJw/V2iN187bwYa UzyHbLvyzrklI1eXmBBdxNS/uKHaoZdJhf6CytTM7Dv04V61UGM71lGv7eedN1gNqLle Ljx8ZAAvU614Bcd8UzkbX1hWsqBrdQjtqTwCIIe174V52zR1hd8g27gCY0pW6K2w4n6D wMGK7QPWhiv5sWwynVg1LYBzsefj6n2ec4CsCH98KtXDkOiLshfnbgxqRMWaFc+xINy2 WKzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749846808; x=1750451608; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OBk8y2WrRSYe0+qd1bXdlKUoFp7dWqpBPCvB8ZCmdDU=; b=DOWCE1OmtfmuFNZrZvZZj4AUye42aBnOA1THNMDdl2Mxz1TVL69nksLGURXLSQAH0Y 75eiyawvLZsLv29jOosNYU8siHeJhxTizPin2PzCD/02rjNlN5Lae8OJIlf3h/tRm2z0 /3uu+DvhRpqs0rXTwzjNXKgp5lOYnoYGcR9Yu++ffNMp22Xj39BPCm3RcQoTfi8ZW9dD BbMI9uTj4DK+k8lzTpWX0G8kwjFctG+RdQ7AD++Nr1VtNGWhn01xV7yiOKJO7LVthV44 m0zRNpaAdJJBlGgImEvKM2NssRMp2uggTO5WDBQRL7t5bD82Nlx/sAD1ARSRGx97Hhd6 RbDw== X-Forwarded-Encrypted: i=1; AJvYcCU/I/LE1WrdlijGkKJDeRg4tMs3wCPTq44FWIXxZKg911uje643OiYoNxF6EFoHCdiVjbcXssdi604OEw==@vger.kernel.org, AJvYcCUn/dX8LmYYCREX4H/mGsLgAJXXzmGiX7CBWFP4cdGbB033GugRvQglT8MLM5h4LmGwb0eUhlJ+E99SdJA=@vger.kernel.org, AJvYcCUpuRXjlIvxVjVJuugtdZ1XRfoxtUfYH4T2EvDGrmrK9++Fo+R22ePdtQ199wTlHE7Oai9DQPdRFv8+3+ePjj0f@vger.kernel.org X-Gm-Message-State: AOJu0Yw2cVZEPuDI24vnnn5+F2IcTJWJbUNloemF2H1vo2/VovX8u4kW jdQ1pEBbFE6mVqXAPuMAy79ZZttw06B20H7ls69iKeX6q928c68ETM0mD8rV X-Gm-Gg: ASbGnctDbJTHzIM85EKoVKj6UXPtk6SMiNFJ+4+MXQIQmQA7KEr88VC15qOdNKbbZMP JaGJFjL2jpnTFtLR6vF+dsgH46R5dHvqZQAc6yVek+YIrUV2EqTuVa/CQt+tXFNtHCdUDYVpFsw rD/UmUmkT1VwApsCL0fEniGty428Jy7qUVJA5HqbbjVIs5BpntLhU1UKGkTnTNxkPyjJCQ2JOve kLmcxGRzzMqd/uRB/6xtjHWqhZV6RvQFVP1nVS2kSp0weE3W9/zcpNk+AkNr2Ds6nEIRZJh7f9E jzdjk7YwKeTkVaA5lYwxq9gBp9KWG5Hc8wRX4cTf0Ai8j95kPhdc5zNDk5nwTti/2qAQzyA93U2 P02FI/slv1DTOtDCbw6IZ9J8= X-Google-Smtp-Source: AGHT+IHoQe9kZNmiwFgO4UN/YI6LxV+FrHuaz2eiRSh2X5ivyPpLydz1ZML9qM0wZPZU19hVvxBN7A== X-Received: by 2002:a17:90b:58e6:b0:312:db8:dbd1 with SMTP id 98e67ed59e1d1-313f1ca7bb8mr1421800a91.5.1749846808151; Fri, 13 Jun 2025 13:33:28 -0700 (PDT) Received: from localhost (c-73-158-218-242.hsd1.ca.comcast.net. [73.158.218.242]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-2365deaa9dfsm18866135ad.172.2025.06.13.13.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 13:33:27 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, skalluru@marvell.com, manishc@marvell.com, andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, ajit.khaparde@broadcom.com, sriharsha.basavapatna@broadcom.com, somnath.kotur@broadcom.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, tariqt@nvidia.com, saeedm@nvidia.com, louis.peens@corigine.com, shshaikh@marvell.com, GR-Linux-NIC-Dev@marvell.com, ecree.xilinx@gmail.com, horms@kernel.org, dsahern@kernel.org, shuah@kernel.org, tglx@linutronix.de, mingo@kernel.org, ruanjinjie@huawei.com, idosch@nvidia.com, razor@blackwall.org, petrm@nvidia.com, kuniyu@google.com, sdf@fomichev.me, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, linux-net-drivers@amd.com, linux-kselftest@vger.kernel.org, leon@kernel.org Subject: [PATCH net-next v4 1/6] geneve: rely on rtnl lock in geneve_offload_rx_ports Date: Fri, 13 Jun 2025 13:33:20 -0700 Message-ID: <20250613203325.1127217-2-stfomichev@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250613203325.1127217-1-stfomichev@gmail.com> References: <20250613203325.1127217-1-stfomichev@gmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit udp_tunnel_push_rx_port will grab mutex in the next patch so we can't use rcu. geneve_offload_rx_ports is called from geneve_netdevice_event for NETDEV_UDP_TUNNEL_PUSH_INFO and NETDEV_UDP_TUNNEL_DROP_INFO which both have ASSERT_RTNL. Entries are added to and removed from the sock_list under rtnl lock as well (when adding or removing a tunneling device). Signed-off-by: Stanislav Fomichev --- drivers/net/geneve.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index ffc15a432689..9efedc6758bf 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -41,6 +41,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); /* per-network namespace private data for this module */ struct geneve_net { struct list_head geneve_list; + /* sock_list is protected by rtnl lock */ struct list_head sock_list; }; @@ -1179,8 +1180,9 @@ static void geneve_offload_rx_ports(struct net_device *dev, bool push) struct geneve_net *gn = net_generic(net, geneve_net_id); struct geneve_sock *gs; - rcu_read_lock(); - list_for_each_entry_rcu(gs, &gn->sock_list, list) { + ASSERT_RTNL(); + + list_for_each_entry(gs, &gn->sock_list, list) { if (push) { udp_tunnel_push_rx_port(dev, gs->sock, UDP_TUNNEL_TYPE_GENEVE); @@ -1189,7 +1191,6 @@ static void geneve_offload_rx_ports(struct net_device *dev, bool push) UDP_TUNNEL_TYPE_GENEVE); } } - rcu_read_unlock(); } /* Initialize the device structure. */ -- 2.49.0