From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 A2A1A3A63E3 for ; Tue, 2 Jun 2026 19:04:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780427084; cv=none; b=XoMr5JAI+xNmIfdQGWoEX80fsXjoE4/8eo6Oi+NzVnvNujm21Xc/fQXbaSKL1DYE1439uwyJYND9slTzf98icfHMWS9lr+wG6e6sZJCcOOCrqwMiwOT41F906QZGdBCv5fQDi6KF/ob74Jla68TJaprmW+5M2hlmAF9sQnl5HaM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780427084; c=relaxed/simple; bh=Zgif0igdQQMspA1oBTWsmEZzC0rgoGUZtBv0C48908c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WWVL2dR4wmXbvX5q46qwIwRW3uOp5Evlzn6d6F0HRYdgVQC3/LO/WmJC/WOZvVR8bazVwJxvysDgN9aeFa41T92TWNPJQAfGDLV96JwL1fpS0Aq0qpqqIkdIFJFERhb8bYq49RhilqRrHl4gib2/+FdgvkhORKNxfP9ygQhz1W4= 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=QUUJtD2P; arc=none smtp.client-ip=209.85.215.202 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="QUUJtD2P" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c85a2f19558so1953754a12.2 for ; Tue, 02 Jun 2026 12:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780427082; x=1781031882; 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=xnSI4J+CBWDclbQGZosSxbGTKid6nBzQTErk+VxUuNM=; b=QUUJtD2PDDsgpv+JDQccoubWES0YQZ2tC8Mea51V4+dhE+00hbbgIA+qrNYofGoixg PlYy8xERGkd5rLQmPv4QzhPObmlEU087tg7iB/mpf0825HFDF1qEH6kvbxddOG86d72z /xqiEXlUA9JBjE2pC4V+F4rcCGCEPxGmLRlbfBOJTS6qz3Zw/6sx6iDIx7vr7WYTfY7u iKxO2Lf+OagniYkIytBV0DqTu+Qzc2VzLsd5DXDcsI/5CSoeKUank//sTX3GbYyLBUon JjqSDXOEP6qny5wHAyz/qFm7hhAGdmUbOgxTn930xu7Y8LeSy7GD6EgKRBn7pbC4MRvx EdmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780427082; x=1781031882; 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=xnSI4J+CBWDclbQGZosSxbGTKid6nBzQTErk+VxUuNM=; b=luRMKgcW4Xv9i36CERvvrQhz4gw2ovFOKgxxl7lXmZQ4JQ9+deXDJHJ8OxL9TRJQLP 0OG3m0b4et0ipfw0rKJLYYs+p98WTsbVFb3jNwjBZI/tv07+ELWShwWfbnDHdmiWJkpQ MBgnFuYSslr8aDiMVqBw2FJCLbV1F9e3RzW1cVqkGCWnCIqqszsV+lXpFZA/IUrkf4aq AecwRFHteeZljmiNH0VEMRLBbilP/WJ9WYQwqsAnflMrhFrj1m1dNOlSRbcyCAQ8uerM hnHba/FgU8n+xE7pjnVH8Q0IT6sYf2N8S4JlvWIo/n/KLSLnB0kzjy1LvmytiuTlBeWa 2xkQ== X-Forwarded-Encrypted: i=1; AFNElJ+Yx+1YPeVgUzhBqUKhkcvmMO+dgdH+wfwJzP+8NFNmuIiO7dQdtdnx5TfoAL9c2cPXQkSBsM4=@vger.kernel.org X-Gm-Message-State: AOJu0YxgfmlP6YLYaAHRajfgiahFI7Y+XZ5f/oyGD1ZDINbWPwlheL5z pe0SMoadIBPDEWtRXab/75g9MM4kp3k/ZBGbgA7y9ppy/IdxbW6d1JrguwHeqc8zN4h916+ulrt rZU4b2w== X-Received: from pldt6.prod.google.com ([2002:a17:903:40c6:b0:2bf:189e:7110]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1a28:b0:2bf:9760:b963 with SMTP id d9443c01a7336-2c1644cbf25mr476125ad.26.1780427081614; Tue, 02 Jun 2026 12:04:41 -0700 (PDT) Date: Tue, 2 Jun 2026 19:03:44 +0000 In-Reply-To: <20260602190436.139591-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260602190436.139591-1-kuniyu@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602190436.139591-5-kuniyu@google.com> Subject: [PATCH v5 net-next 4/5] geneve: Add dualstack flag to struct geneve_config. 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" When collect metadata mode (IFLA_GENEVE_COLLECT_METADATA) is enabled, the GENEVE device creates both IPv4 and IPv6 sockets and bind()s them to wildcard addresses. The next patch allows creating only one socket bound to a specific address even when the collect metadata mode is enabled. Then, we need a flag to distinguish dualstack GENEVE devices to detect local address conflict. Let's add the dualstack flag to struct geneve_config. IFLA_GENEVE_COLLECT_METADATA processing is moved up in geneve_nl2info() for the next patch to overwrite dualstack to false while keeping collect_md true. Note that IFLA_GENEVE_REMOTE and IFLA_GENEVE_REMOTE6 does not set cfg->dualstack to false since is_tnl_info_zero() ignores the wildcard remote address: # ip link add geneve0 type geneve external remote 0.0.0.1 Error: Device is externally controlled, so attributes (VNI, Port, and so on) must not be specified. # ip link add geneve0 type geneve external remote 0.0.0.0 # ss -ua | grep geneve UNCONN 0 0 0.0.0.0:geneve 0.0.0.0:* UNCONN 0 0 *:geneve *:* Signed-off-by: Kuniyuki Iwashima --- v2: Don't set cfg->dualstack for IFLA_GENEVE_REMOTE6? --- drivers/net/geneve.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 4f841eced028..3a62d132a8c4 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -73,6 +73,7 @@ struct geneve_dev_node { struct geneve_config { bool collect_md; + bool dualstack; bool use_udp6_rx_checksums; bool ttl_inherit; bool gro_hint; @@ -1108,12 +1109,12 @@ static int geneve_sock_add(struct geneve_dev *geneve, bool ipv6) static int geneve_open(struct net_device *dev) { struct geneve_dev *geneve = netdev_priv(dev); - bool metadata = geneve->cfg.collect_md; + bool dualstack = geneve->cfg.dualstack; bool ipv4, ipv6; int ret = 0; - ipv6 = geneve->cfg.info.mode & IP_TUNNEL_INFO_IPV6 || metadata; - ipv4 = !ipv6 || metadata; + ipv6 = geneve->cfg.info.mode & IP_TUNNEL_INFO_IPV6 || dualstack; + ipv4 = !ipv6 || dualstack; #if IS_ENABLED(CONFIG_IPV6) if (ipv6) { ret = geneve_sock_add(geneve, true); @@ -1906,6 +1907,16 @@ static int geneve_nl2info(struct nlattr *tb[], struct nlattr *data[], struct ip_tunnel_info *info = &cfg->info; int attrtype; + if (data[IFLA_GENEVE_COLLECT_METADATA]) { + if (changelink) { + attrtype = IFLA_GENEVE_COLLECT_METADATA; + goto change_notsup; + } + + cfg->collect_md = true; + cfg->dualstack = true; + } + if (data[IFLA_GENEVE_REMOTE] && data[IFLA_GENEVE_REMOTE6]) { NL_SET_ERR_MSG(extack, "Cannot specify both IPv4 and IPv6 Remote addresses"); @@ -2025,14 +2036,6 @@ static int geneve_nl2info(struct nlattr *tb[], struct nlattr *data[], cfg->port_max = ntohs(p->high); } - if (data[IFLA_GENEVE_COLLECT_METADATA]) { - if (changelink) { - attrtype = IFLA_GENEVE_COLLECT_METADATA; - goto change_notsup; - } - cfg->collect_md = true; - } - if (data[IFLA_GENEVE_UDP_CSUM]) { if (changelink) { attrtype = IFLA_GENEVE_UDP_CSUM; @@ -2153,6 +2156,7 @@ static int geneve_newlink(struct net_device *dev, .use_udp6_rx_checksums = false, .ttl_inherit = false, .collect_md = false, + .dualstack = false, .port_min = 1, .port_max = USHRT_MAX, }; @@ -2382,6 +2386,7 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name, .use_udp6_rx_checksums = true, .ttl_inherit = false, .collect_md = true, + .dualstack = true, .port_min = 1, .port_max = USHRT_MAX, }; -- 2.54.0.1013.g208068f2d8-goog