From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 D66FA22F149 for ; Mon, 10 Feb 2025 13:31:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739194265; cv=none; b=oV4kWV/Iky/zE27i3GHnmA/VydxEHOKO80WyuHpC2A42rxg0x6p8s8IT36HsdtRXdHzlh2i0ujs7ohqOQgnQD7idzf/3dt4sTAYQEGbGbU+cXNaiE4n3jl/1FLB05KRQwAWe0ebQRHbf++6FToh82fuMpRL8sctJzBgNs9w1myA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739194265; c=relaxed/simple; bh=afU0eP8leIGpj7KOdqVDO3ES9Mr3NHsvuQ09X1iwlHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QQaQiWZFJgJP1WgyEjFJ7UbaymijeG9c9cj6izZxn4gWHXcMvYbWeoLXJ3l8jDqTifwJxD/gJ4xHhpRqxfd0X2JxKB/kriNYZ8ekOaM29rnPFDlwi4m0svrI//8DDX88joIpjqOqek866lF7I3FKC8W+8ZCoA+ostLEbVXnY2s4= 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=fFb+ROpI; arc=none smtp.client-ip=209.85.214.178 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="fFb+ROpI" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f4500a5c3so82742435ad.3 for ; Mon, 10 Feb 2025 05:31:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739194263; x=1739799063; darn=lists.linux.dev; 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=pJKz1g6voDImT0UUTo/s+cF5fKbKW++euQC6BW/L/6A=; b=fFb+ROpINPSv+IisyCIZy+UDDvixpJgccbAnrmShrVNihxQu36ypG2aCWPR5M8MHLr Zchpjhfgp+g7wWcD65m3WwaM52aWY8JjfCufS2CHDe+YF/PfSBW/vEIiHu1ZiHdxstHH 3jzNSt5eNhQ39q3gwKGmrxwm60QsKGkx4Zx9JMb9WFVJy9P8PJdOJi2miiZiOFq25XIv QWke7emiP8ZWtHJI6D8u/u+v/+anyUjfujBqgUDtE4Zdv9kG7ue31NpZ4EkhHXyUoG0p gSTzvqu0gwczT8IS941n1QSk/2n6t0Nf3lk4s6yCZuKW17k7wQq4S49UYpI5YZ7otEv/ HvEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739194263; x=1739799063; 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=pJKz1g6voDImT0UUTo/s+cF5fKbKW++euQC6BW/L/6A=; b=EWkC7rhM1Fb2odqUm0Hgkx4CnnJykGfC9fljIHlLMbvx83qliDDeIXXAGIejwV3xKW stSkucBO7OYPMzfDTyaOKOcJLJ2yatotBV3j1QFqLZWlExeziXQ44vgOfBD2lpiv6Bwg u5961NTGYO+Roae/OaJyi88HIV79d+IHlzZ8Jk9ki6N67vLBsxfZF04bWNC/1WBQEYRW v6+vHbaI6ICeOaMgtJcrxEaDOP8tKURlkcY4u5i6mMAugKoLMEP0y20780UhVGUe0Z42 h64CZOHZjyETDgZKFQFljeeEw9pH2ZpQ283E+NEc7JMX9vp9XTHnBQIyWMpXowh/SuzL 1NlQ== X-Forwarded-Encrypted: i=1; AJvYcCWw9f6rG25eU/2I2sR6K5Iu6+FyC6xil8QnBGNHRCNAhXSIqvb5upVbzDD/EW1TClbvIAkImqs=@lists.linux.dev X-Gm-Message-State: AOJu0Yzrusb9rN8i4Tz1+k3uply/KGpLA5CzkiHyVUrWfbRtQunuCFSl kWDryGG0DpKq0hlan/QLOSsLpwEB4hHxdUBLYCxQYPoyGOam5PG/ X-Gm-Gg: ASbGncsxpdZ88GaFPwPL24yMTlOSK6aWHdDEPs/OaN2huslAFSjAwX8PXBVmr7ZsEOC feFOCWWtgmv7/fgc9EZCGFotQKkp9W8+E75VxakT1tE3j87JtGLkRSm/eBAalWCWutwTNJygJtt c37SE3CJ6vhzbXjybppT4qbpFu8uIjZQ0qVK1c/l/F7dyd5qhGTjjTBB/W8roSwDg1Tw4kPHsSV A7UCiANSEO0Mek0doNZl/91J58XTA8XY65hlm+jvC1GekfpNatlIVeX8smGY7utUysWPFT+k5se FvdSwg== X-Google-Smtp-Source: AGHT+IGNFjsW8yGSZG6C2tbCv5/JZ09OmB3LKkjVhY7agbUhlCe28tcl+Qcya8rlcfYhnDrE2/S9OQ== X-Received: by 2002:a17:902:e946:b0:216:7cde:51a with SMTP id d9443c01a7336-21f4e72631dmr249984615ad.28.1739194263028; Mon, 10 Feb 2025 05:31:03 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3653af3bsm78799445ad.57.2025.02.10.05.30.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 05:31:02 -0800 (PST) From: Xiao Liang To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Kuniyuki Iwashima , Jakub Kicinski Cc: "David S. Miller" , David Ahern , Eric Dumazet , Paolo Abeni , Andrew Lunn , Simon Horman , Shuah Khan , Donald Hunter , Alexander Aring , Stefan Schmidt , Miquel Raynal , Steffen Klassert , Herbert Xu , linux-rdma@vger.kernel.org, linux-can@vger.kernel.org, osmocom-net-gprs@lists.osmocom.org, bpf@vger.kernel.org, linux-ppp@vger.kernel.org, wireguard@lists.zx2c4.com, linux-wireless@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, bridge@lists.linux.dev, linux-wpan@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v9 05/11] net: ip_tunnel: Use link netns in newlink() of rtnl_link_ops Date: Mon, 10 Feb 2025 21:29:56 +0800 Message-ID: <20250210133002.883422-6-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210133002.883422-1-shaw.leon@gmail.com> References: <20250210133002.883422-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: bridge@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When link_net is set, use it as link netns instead of dev_net(). This prepares for rtnetlink core to create device in target netns directly, in which case the two namespaces may be different. Convert common ip_tunnel_newlink() to accept an extra link netns argument. Don't overwrite ip_tunnel.net in ip_tunnel_init(). Signed-off-by: Xiao Liang --- include/net/ip_tunnels.h | 5 +++-- net/ipv4/ip_gre.c | 8 +++++--- net/ipv4/ip_tunnel.c | 10 ++++++---- net/ipv4/ip_vti.c | 3 ++- net/ipv4/ipip.c | 3 ++- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 1aa31bdb2b31..ae1f2dda4533 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -406,8 +406,9 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, bool log_ecn_error); int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], struct ip_tunnel_parm_kern *p, __u32 fwmark); -int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm_kern *p, __u32 fwmark); +int ip_tunnel_newlink(struct net *net, struct net_device *dev, + struct nlattr *tb[], struct ip_tunnel_parm_kern *p, + __u32 fwmark); void ip_tunnel_setup(struct net_device *dev, unsigned int net_id); bool ip_tunnel_netlink_encap_parms(struct nlattr *data[], diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 1fe9b13d351c..26d15f907551 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1413,7 +1413,8 @@ static int ipgre_newlink(struct net_device *dev, err = ipgre_netlink_parms(dev, data, tb, &p, &fwmark); if (err < 0) return err; - return ip_tunnel_newlink(dev, tb, &p, fwmark); + return ip_tunnel_newlink(params->link_net ? : dev_net(dev), dev, tb, &p, + fwmark); } static int erspan_newlink(struct net_device *dev, @@ -1433,7 +1434,8 @@ static int erspan_newlink(struct net_device *dev, err = erspan_netlink_parms(dev, data, tb, &p, &fwmark); if (err) return err; - return ip_tunnel_newlink(dev, tb, &p, fwmark); + return ip_tunnel_newlink(params->link_net ? : dev_net(dev), dev, tb, &p, + fwmark); } static int ipgre_changelink(struct net_device *dev, struct nlattr *tb[], @@ -1701,7 +1703,7 @@ static struct rtnl_link_ops erspan_link_ops __read_mostly = { struct net_device *gretap_fb_dev_create(struct net *net, const char *name, u8 name_assign_type) { - struct rtnl_newlink_params params = { .net = net }; + struct rtnl_newlink_params params = { .src_net = net }; struct nlattr *tb[IFLA_MAX + 1]; struct net_device *dev; LIST_HEAD(list_kill); diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 09b73acf037a..618a50d5c0c2 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -1213,11 +1213,11 @@ void ip_tunnel_delete_nets(struct list_head *net_list, unsigned int id, } EXPORT_SYMBOL_GPL(ip_tunnel_delete_nets); -int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm_kern *p, __u32 fwmark) +int ip_tunnel_newlink(struct net *net, struct net_device *dev, + struct nlattr *tb[], struct ip_tunnel_parm_kern *p, + __u32 fwmark) { struct ip_tunnel *nt; - struct net *net = dev_net(dev); struct ip_tunnel_net *itn; int mtu; int err; @@ -1326,7 +1326,9 @@ int ip_tunnel_init(struct net_device *dev) } tunnel->dev = dev; - tunnel->net = dev_net(dev); + if (!tunnel->net) + tunnel->net = dev_net(dev); + strscpy(tunnel->parms.name, dev->name); iph->version = 4; iph->ihl = 5; diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index b901bee03e6d..159b4473290e 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -585,7 +585,8 @@ static int vti_newlink(struct net_device *dev, __u32 fwmark = 0; vti_netlink_parms(data, &parms, &fwmark); - return ip_tunnel_newlink(dev, tb, &parms, fwmark); + return ip_tunnel_newlink(params->link_net ? : dev_net(dev), dev, tb, + &parms, fwmark); } static int vti_changelink(struct net_device *dev, struct nlattr *tb[], diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index a8b844bcfc64..bab0bf90c908 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -455,7 +455,8 @@ static int ipip_newlink(struct net_device *dev, } ipip_netlink_parms(data, &p, &t->collect_md, &fwmark); - return ip_tunnel_newlink(dev, tb, &p, fwmark); + return ip_tunnel_newlink(params->link_net ? : dev_net(dev), dev, tb, &p, + fwmark); } static int ipip_changelink(struct net_device *dev, struct nlattr *tb[], -- 2.48.1