From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 EAFA92BE7BE for ; Sat, 2 May 2026 03:14:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777691669; cv=none; b=qzp3Wu+QrdHrD5wWXz5hi5ubOXCRdHnqNMFPnpcMQ1M1fCaKW/D2e5OSjClYqDnZciu3A2M1e182HTc+veqYXRU5+UUlcgp/5hkGYP2WEuZShD2LhtCoaJqe4s5VhQcpU+uiS0EX7mmyazPQ/zjH+fKhOKcbRN1nNipEH/yMVr4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777691669; c=relaxed/simple; bh=q5qJCi0zt+LetNHU53lUrttCUupM4/+dzGhkX2VxTbY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QXSomU5R0ZCezpNFzPvI23zU1b8iu5SU9/iZdECUTdS/F/mnGajXHIvXypuLIsSSRnacDPsgkLbvK+G0AEgtGOXnGNnzCQBU636TIjlPP6PF3gUVUdKT1BxD+0AJX9yVSi2igFF0KOxQQfRq55BqCc6pOVQqo/W70Zhh1MIQbi8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=VZMlyLjC; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="VZMlyLjC" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2b258636d16so26961195ad.2 for ; Fri, 01 May 2026 20:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777691667; x=1778296467; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=FcerhljnoUPbmnUag65wkuf+iiDo1CSQYWUdnEyWGRs=; b=VZMlyLjChtuNmo50teUfwbmWm1bs1Zz+w7MYXFWC6am60uk+wHoyJIgXDqL0n8Yq+C PITO3TJfnUJrRKQJFANt1jJZLVUbws6v9VsqMwa4GLUB6rMiac0/LiBwbgnZNMUbiHOZ TLMtrgNh0JTWaluEQl00ovwfwl9/CyH8hA6z+Mhs29PUs8vP4UY7iyMAk55cU1OtFGPG 3ExounGLj/JGMgRLlhSyDNrw9r7FIrTCr++ac6F3ltJQ0fPFZIyidJ/NBQWRfHfxwBiB PAt131RiYnd7DjnRXtTFOJ1TWtDJG1RNGaFBDAdB22lYqGFrqG69ga299izST7TVDLyA WjCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777691667; x=1778296467; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FcerhljnoUPbmnUag65wkuf+iiDo1CSQYWUdnEyWGRs=; b=TkZGk71P7xTebX0iZIg0C/VEoFAcUzzya8mvXcPSWtfkOVa3/Navzm+Eqb53h+JNIG lhJ0yv61BjL+8pFIQ2GEoftvSXgo9+8eBgJcQ4OQ7EkHlAmhv6O6vo3Nyfxsq4MzzxL6 PX613hiVwx7VzvqhqurSMK6WHxuSROgS0rd+PgYLA9hYRy2D3DF/PRzmoazPOfjDdRbC H54HK67epPIDulnyanAl6751MJCFANp504jmBaoOamF0XQcBUYW3gJHg+IH3wbNpncn9 aZKqXEool03WLBR/+XYPp+8vu60bpfr63WquMxw7hwUBapiprZOe002uRHWOLWRFypFg aa6A== X-Forwarded-Encrypted: i=1; AFNElJ/M2ahWr7yUXdnlCA0bFH1I3fr/YH1JSyx1pOxa98YW/X0y9depcHMQe5lW25czxBsly+MtIFU=@vger.kernel.org X-Gm-Message-State: AOJu0YyDstUVsvxorx8/VMi13QLdgcMw9fnQfWLCIh8h79YiPTk/TT12 tz1VJZDPPSoG3NZPzJavr3p4PTvPtD1JLWFakKs6E8WDUnEpjQnhj84vZaSllFH/Y/ArIP1HLzL JRtqWoQ== X-Received: from plpj13.prod.google.com ([2002:a17:903:3d8d:b0:2b4:5be2:f5a6]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2f0d:b0:2b7:8a56:7cda with SMTP id d9443c01a7336-2b9f252f9b3mr14082885ad.4.1777691667217; Fri, 01 May 2026 20:14:27 -0700 (PDT) Date: Sat, 2 May 2026 03:13:06 +0000 In-Reply-To: <20260502031401.3557229-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260502031401.3557229-1-kuniyu@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260502031401.3557229-14-kuniyu@google.com> Subject: [PATCH v1 net-next 13/15] pfcp: Store struct sock in struct pfcp_dev. From: Kuniyuki Iwashima To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn Cc: Simon Horman , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" pfcp does not need to access struct socket itself in the fast path; it only reads struct sock, and struct socket is only used for tunnel setup and teardown. Let's store struct sock directly in struct pfcp_dev. pfcp_del_sock() is called from dev->netdev_ops->ndo_uninit(). The 2nd synchronize_net() in unregister_netdevice_many_notify() ensures that inflight pfcp RX fast paths finish before pfcp_dev is freed. Note that synchronize_rcu() is added in the error path of pfcp_newlink() since free_netdev() will free pfcp_dev immediately once we remove synchronize_rcu() in udp_tunnel_sock_release(). Signed-off-by: Kuniyuki Iwashima --- drivers/net/pfcp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/pfcp.c b/drivers/net/pfcp.c index 870137695e8a..5f1c9d2c0b49 100644 --- a/drivers/net/pfcp.c +++ b/drivers/net/pfcp.c @@ -18,7 +18,7 @@ struct pfcp_dev { struct list_head list; - struct socket *sock; + struct sock *sk; struct net_device *dev; struct net *net; @@ -104,8 +104,8 @@ static int pfcp_encap_recv(struct sock *sk, struct sk_buff *skb) static void pfcp_del_sock(struct pfcp_dev *pfcp) { - udp_tunnel_sock_release(pfcp->sock->sk); - pfcp->sock = NULL; + udp_tunnel_sock_release(pfcp->sk); + pfcp->sk = NULL; } static void pfcp_dev_uninit(struct net_device *dev) @@ -151,7 +151,7 @@ static void pfcp_link_setup(struct net_device *dev) netif_keep_dst(dev); } -static struct socket *pfcp_create_sock(struct pfcp_dev *pfcp) +static struct sock *pfcp_create_sock(struct pfcp_dev *pfcp) { struct udp_tunnel_sock_cfg tuncfg = {}; struct udp_port_cfg udp_conf = { @@ -174,14 +174,14 @@ static struct socket *pfcp_create_sock(struct pfcp_dev *pfcp) setup_udp_tunnel_sock(net, sock->sk, &tuncfg); - return sock; + return sock->sk; } static int pfcp_add_sock(struct pfcp_dev *pfcp) { - pfcp->sock = pfcp_create_sock(pfcp); + pfcp->sk = pfcp_create_sock(pfcp); - return PTR_ERR_OR_ZERO(pfcp->sock); + return PTR_ERR_OR_ZERO(pfcp->sk); } static int pfcp_newlink(struct net_device *dev, @@ -216,6 +216,7 @@ static int pfcp_newlink(struct net_device *dev, exit_del_pfcp_sock: pfcp_del_sock(pfcp); + synchronize_rcu(); exit_err: pfcp->net = NULL; return err; -- 2.54.0.545.g6539524ca2-goog