From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 9CAA3220F2D for ; Thu, 28 May 2026 00:57:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779929823; cv=none; b=QPVcLBHSU87raM/Hm5jCiQFwnOGluoz+jL082dWRtRDewk2ldtaCVf2I/elSPzFb99PC9SfMZwNOO4+U/yqRtd+p7h/6IQGMpb9X0M4o/ydvLFQ9bKmD033pkTeROjMkIKMbQhM5Mfq3szMNdPW5DgckD9ujbppMpXj93+S18bA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779929823; c=relaxed/simple; bh=FJo4wMVFE9DryFLbLwV7IV8Rh0XgCgthAAPirB4o/m4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SVuEttFY/+/yFdCVZ/pLs8Qhb3D2sXxJd7KD0X28qFOvUwpjpD8lW0Cjmyhqy/ygVid0Lhyek/7ct7YYNRGhKu1gEyLVey8X6z5eTHzFdjpXL1u5enuNGcNxM9lAQI0IPWk/pXE+adD9SFV98+71VHKyaCm/lgHSOUilfd+6+NM= 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=XuIhlBiS; arc=none smtp.client-ip=209.85.216.73 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="XuIhlBiS" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-368b01f8adeso15216481a91.0 for ; Wed, 27 May 2026 17:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779929821; x=1780534621; 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=0K+1Qp1xgnJmzzQlfZG3fILd5bahZIizeNc9EpiqVeA=; b=XuIhlBiSeoWkWlvuuOFpkeDADNNkIKIc6Vfe0aZtLib9g2OeE+R5c0FStJY8jZHRgN B1CgY43VkEyVc+rND1ePwxS6RS1F7dDrv4DnDnr3A0ofzGio1ScOyqMd6uAyNTDl0I1g a/BGvJAP+Gyz8hJNV8CgSDPQfMRUr2NHA8sK0r9UBoGNp7DbA3w8RJ/+nQO0tuC4TwY1 1Fm/JRtTaD+A5Qbul8YGZao22aNjUWfph1aF+77GXx10Z233EsH4CCQ70Ep0wmoRsCnF nI/x50XWLbj5zs7+qayB+GNOfj+9bXCn/w3LDSdCFL7kjbbM1Pmfe4TCMqeKJ2T9zChv 4DQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779929821; x=1780534621; 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=0K+1Qp1xgnJmzzQlfZG3fILd5bahZIizeNc9EpiqVeA=; b=RshPlj+AA9HjoXxTE9f4PS9ukoUQxvVC3GmOkFTvfUltvzo8H1WKEiA72Qzu5HJuUG TKkDFfSkB8ql/tVIAUg1btGrSsPkikKWkKXbB7N+nVWCs9gfPEqwEiWkRQ+9ngKzfQAr ZLRRT9LgZzqDyHRm3amjEnJEewzuKIQC5RyhF4hoTW7UG0MGYDaYUXouEmX35R3+HdDL e+nL/fg8lfQeAv4/h5/0+3r0W9bcdJWemBh14Qa56++1XuArx8nzjsSYLV6ZAHTwJxD3 7IGAKFLR/93k79PEjxlQe/pOwbFmMHNQCRa/GuxlPqsQJ10S6uwfbmu9DW6YiP4UMGl6 tCtA== X-Forwarded-Encrypted: i=1; AFNElJ9fp0DItbVtACZop514Zw0U6rkHxdTvmRT+IcHq8bP8pxfAXJaZ2hbiSHrF5YyKDyXsPLpvGlM=@vger.kernel.org X-Gm-Message-State: AOJu0YyCbGUH1BUKtNv2oMrckRxqcyqqjHRSwg5NCP1z+WLQ7VFru4CX yvHj2toZfz+XGy1P+g+87wcrQG+oENanSja7nrQ3fN8Wpje1ZX3Di3XZAufcTxvK+SWD9B+/2uo 330l+lQ== X-Received: from plbba6.prod.google.com ([2002:a17:902:7206:b0:2bc:bdcd:c51f]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ef10:b0:2bd:6732:6817 with SMTP id d9443c01a7336-2beb05e291amr272758975ad.23.1779929821418; Wed, 27 May 2026 17:57:01 -0700 (PDT) Date: Thu, 28 May 2026 00:56:45 +0000 In-Reply-To: <20260528005658.1756248-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260528005658.1756248-1-kuniyu@google.com> X-Mailer: git-send-email 2.54.0.794.g4f17f83d09-goog Message-ID: <20260528005658.1756248-3-kuniyu@google.com> Subject: [PATCH v4 net-next 2/5] geneve: Pass struct geneve_dev to geneve_create_sock(). From: Kuniyuki Iwashima To: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , David Ahern , Stephen Hemminger , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" This is a prep patch to make a subsequent patch clean. We will need to access geneve_dev->cfg.info.key.u.{ipv4,ipv6}.src in geneve_create_sock() later. Let's pass down struct geneve_dev from geneve_sock_add() to geneve_create_sock() instead of individual config fields. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet --- drivers/net/geneve.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 8413c21fee6f..7e8c3023842e 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -760,9 +760,10 @@ static int geneve_udp_encap_err_lookup(struct sock *sk, struct sk_buff *skb) return -EPFNOSUPPORT; } -static struct sock *geneve_create_sock(struct net *net, bool ipv6, - __be16 port, bool ipv6_rx_csum) +static struct sock *geneve_create_sock(struct net *net, + struct geneve_dev *geneve, bool ipv6) { + struct ip_tunnel_info *info = &geneve->cfg.info; struct udp_port_cfg udp_conf; struct socket *sock; int err; @@ -772,13 +773,13 @@ static struct sock *geneve_create_sock(struct net *net, bool ipv6, if (ipv6) { udp_conf.family = AF_INET6; udp_conf.ipv6_v6only = 1; - udp_conf.use_udp6_rx_checksums = ipv6_rx_csum; + udp_conf.use_udp6_rx_checksums = geneve->cfg.use_udp6_rx_checksums; } else { udp_conf.family = AF_INET; udp_conf.local_ip.s_addr = htonl(INADDR_ANY); } - udp_conf.local_udp_port = port; + udp_conf.local_udp_port = info->key.tp_dst; /* Open UDP socket */ err = udp_sock_create(net, &udp_conf, &sock); @@ -970,8 +971,8 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb, } /* Create new listen socket if needed */ -static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port, - bool ipv6, bool ipv6_rx_csum) +static struct geneve_sock *geneve_socket_create(struct net *net, + struct geneve_dev *geneve, bool ipv6) { struct geneve_net *gn = net_generic(net, geneve_net_id); struct udp_tunnel_sock_cfg tunnel_cfg; @@ -983,7 +984,7 @@ static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port, if (!gs) return ERR_PTR(-ENOMEM); - sk = geneve_create_sock(net, ipv6, port, ipv6_rx_csum); + sk = geneve_create_sock(net, geneve, ipv6); if (IS_ERR(sk)) { kfree(gs); return ERR_CAST(sk); @@ -1073,8 +1074,7 @@ static int geneve_sock_add(struct geneve_dev *geneve, bool ipv6) goto out; } - gs = geneve_socket_create(net, geneve->cfg.info.key.tp_dst, ipv6, - geneve->cfg.use_udp6_rx_checksums); + gs = geneve_socket_create(net, geneve, ipv6); if (IS_ERR(gs)) return PTR_ERR(gs); -- 2.54.0.794.g4f17f83d09-goog