From patchwork Wed Feb 19 12:50:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982135 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 5674C1E105E; Wed, 19 Feb 2025 12:51:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969465; cv=none; b=nMexeF46fSz4/CYZaCHzMWEwwSeGayGzqo+YuokSSeoby8o+sZwSynkKCi3A6TLa3iLWUdCwKk1HxZnRxkc/5dT5RdL32XIpyBYueSWBK+FjFNbXzVKqFvVicdFDzSC9sHmPTZVPwTazGimCnLNR+9vUDC2aVQw/BVrp5gKB7kg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969465; c=relaxed/simple; bh=PbUXwb75wlN+Ai+ym+Xm59yi3YKBtBMlSAHxh5phdAc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IYyVQJ6Dj98Z1a4lYjrSkuJERU29X9ekkkQGDW0J3t6uqZqkTEej7a6KOKK7CsCone4K8Bx/LOwnh+UIbFNRvWB53pl3hI8wlQ5Q8rkr/1tMX4tO2WUg3hv7jqVEAbdViecaRTqr1dqaL/lIchHtCSKqmNngCL0mmspfmggp6tg= 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=ecbgRuOP; arc=none smtp.client-ip=209.85.214.179 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="ecbgRuOP" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22128b7d587so61216405ad.3; Wed, 19 Feb 2025 04:51:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969463; x=1740574263; 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=cUZVG0cQpX36tsrgh/ArNurrF9hV9SVnXTfgFQUKvso=; b=ecbgRuOPJt5TgNbUWjN3xWsKIy4XyHaJDdrJ14hWFD310P5kqlOpPiCAdIrJ6MnZgK f6a2qiNdxjsZwou06cvneXr4WK9lYOtDJquvpTCL0gdBSL2CSwdPdQeYG75xKCbQWUFW P8LtOhuhDIWUuzOpUM5TEjnheevfenovhzDc8ZvAcrSxWEXw4k4xxSw8B8P6ZRhsrSyY o1gaHtA0Q6U6btCHdI4faZIHIXdGb6jMbMTFGRjqH7Vd6OwRgnzcMgGtl5uCi9/lYHGf yguR7fpqPGq9BB9YKDlTtnooZDToRYtOqbfdxdewyepul4rtXf1poqXXa+D5dQ8r4WDZ rrVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969463; x=1740574263; 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=cUZVG0cQpX36tsrgh/ArNurrF9hV9SVnXTfgFQUKvso=; b=gzdkp3gjSZQLqf9KEodvLZtlqwk0wDuVf/DNA5m4+VKQWBKnr8gOLwPTvF6l1LfLx9 aKDlI1Zek7/rH+ZtJzdiieOEtbcwYkY92+ibO58J6crrZwAPfWQ0lkfDO1IL6ZUMLC+9 M66V7/4lWcWEmo9CcexS0AmlyECu3dfm3saHai5Zo5KIB657II3nPAjnyyP34cXOMEra j5OGBd1LTJJtBu5zjcfoQTP8OwnTtEMUdUtR6p4uFC+vgPJ7Us2KKf2nxFCD6O1j3m9R qKrDHgA815skkVM3NLb8dOFZuh6B4LCPxwBx6qPrvRlkjsoU9wpDauheaYBtU3ztBSvO sazw== X-Forwarded-Encrypted: i=1; AJvYcCVOcRHJiIR7rVkdOHkfJMQhYjBpchU6oNR+qSRTzdVfJL7vmQSLkF0O5CHrCgoDsMqLRFMWDsfZnD7KTA==@vger.kernel.org, AJvYcCVhX11t4/1UBkW001Wm5/lo+J9MTwXyKGs53dzFd/zgiw+9vQU+laIpzoABIlbmk3mFj8o=@vger.kernel.org, AJvYcCVk0PDtXP//d5HqLb4NJ1x4HHfORs09vfCBaU00EG3TQ3A4ibfM9uSatvH2GcgNQg95qiAwFoaKfJun/k9C@vger.kernel.org, AJvYcCVlp9KrngXsAwUM9mp4QHKdNhSo092L7Z6QezvnoPZb3MBMcysZge97TR3jiqzlHojSW3GzQykbPXii@vger.kernel.org, AJvYcCWJdcMN8PO8r/oh8n2oM50eSimc+brdIpIN5bQYUKilB7mKZraX26+Ki9maBjguORs0MG6EoGLDFqFwLw==@vger.kernel.org, AJvYcCWuQIRy7ZsNN0hhNTudJUEVUzkQDwxL/bkPEBMstsici6FqdUXktKz5INhisDfWa5X7xOfqcmJp543CylxQ3ZBm@vger.kernel.org, AJvYcCXX3zhWB4eGDofNRJe2zI7g2kv3AK0yPrpzlUOaL4+STcP9prNWeohcD/rXLfW020e6na7vMuHAJTzDqBwJf7g=@vger.kernel.org, AJvYcCXdl8jOK4Jr2/hLUvKRy5dwaMaqww+XOTVpJWP1eS9ExKrubF+XQNsbTEJlm6A36BhPYHN2AnS3RYPW@vger.kernel.org X-Gm-Message-State: AOJu0Yzs1kNO/4oi65u1grqqCqFS/JWTgUdHqSAhEEpo4GHLZSJhrrsK xapTiBJbyT3RB84Fef8NQoTGXsxs2JSH2+DUK+mQAihkaXfXgF3dtKlul8qoyDM= X-Gm-Gg: ASbGnctAeUbSlJuxGQePlG4p4We82q5ItC3BR3ehJGvUp4mpPaVpF68S71L005QceV+ PgAdQ/aoLAWh6o4LwHjdZuZYoAEfpRpAP7utlUpsETnFniM8X/pNAt/CVH92N7dVQ0hgLhR9OkV 1Fs5JpJQ+RWmggrR3a236D3MNUS4P8XqFFCmAaX8uPszicEtyI44xt0ObgPR+/YzUsNv01xX/tr SY1JnnOSNuTkDJXxdfJJ3FtLfGOMAZAtSVF8jeFUqJt8hcOjP1RevTIOAMvG/B9tFCCgKZ9PVVu PnM+LQ== X-Google-Smtp-Source: AGHT+IGj+mvdG9uQ6taCs0F1tgau+Kd1RL6XlmFtErS9OY17fyECZArX3uy2OYbhVupliE/g/xkWBw== X-Received: by 2002:a17:902:d2c6:b0:220:be86:a42d with SMTP id d9443c01a7336-22170777df8mr53655825ad.21.1739969462888; Wed, 19 Feb 2025 04:51:02 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:51: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 v10 01/13] rtnetlink: Lookup device in target netns when creating link Date: Wed, 19 Feb 2025 20:50:27 +0800 Message-ID: <20250219125039.18024-2-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When creating link, lookup for existing device in target net namespace instead of current one. For example, two links created by: # ip link add dummy1 type dummy # ip link add netns ns1 dummy1 type dummy should have no conflict since they are in different namespaces. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- net/core/rtnetlink.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index abe1a461ea67..0f3e2c6021de 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3867,20 +3867,26 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, { struct nlattr ** const tb = tbs->tb; struct net *net = sock_net(skb->sk); + struct net *device_net; struct net_device *dev; struct ifinfomsg *ifm; bool link_specified; + /* When creating, lookup for existing device in target net namespace */ + device_net = (nlh->nlmsg_flags & NLM_F_CREATE) && + (nlh->nlmsg_flags & NLM_F_EXCL) ? + tgt_net : net; + ifm = nlmsg_data(nlh); if (ifm->ifi_index > 0) { link_specified = true; - dev = __dev_get_by_index(net, ifm->ifi_index); + dev = __dev_get_by_index(device_net, ifm->ifi_index); } else if (ifm->ifi_index < 0) { NL_SET_ERR_MSG(extack, "ifindex can't be negative"); return -EINVAL; } else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME]) { link_specified = true; - dev = rtnl_dev_get(net, tb); + dev = rtnl_dev_get(device_net, tb); } else { link_specified = false; dev = NULL; From patchwork Wed Feb 19 12:50:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982136 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 141B71E0DCD; Wed, 19 Feb 2025 12:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969477; cv=none; b=CV4O+MEXzSpwxrvWzAM8CNTjMl7n3YSrzdHjVk4UeMCTt4DGZq1ZZpsrnFoeFaaQFox/RWInY9WGROxkLvk1OKgOyBvTfkMhZUSRgzuxxRLDqP3qo075uj3LyLgaT+xMY/dtHRk0nixlUbg4L/iuLQUbozfCNDCYrQVKhZ5gN6I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969477; c=relaxed/simple; bh=vtwyK66ZLCNrjHC3imF1sIe3ur7BswtPCnz4Ve5sCIM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bVDmAIx12esBHiyJMTE4I+lzI2Sf5IgZ9Ay0epAXKywDQ+33ihx0Eiyb/rDj1h3utwqZFAC1WQn+kCMMfXs1r58TwGggGYpejG9C/cqkbSBl+A9PKZxoMK+tf4HMgiInkUhhlPfkt7rn/dwyic/y/K6rmBJ0Hs0gcfTtgtbV+xg= 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=drZucXv6; arc=none smtp.client-ip=209.85.214.177 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="drZucXv6" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-220f048c038so87878055ad.2; Wed, 19 Feb 2025 04:51:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969473; x=1740574273; 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=93fOiXLiPOPHhDRJ9eVLB7ZJAOD1HkX3lWv5xa2feOw=; b=drZucXv6PtPQMuNU2NKd3b/VGRqbb4lzRdbfnmwAPi0O/DjxO3ZtYEYgVuavb0agVl +BwcpxOTtcfwdizvhznRd+kUSjNmkQGDujv6TmwJaZM/iMO+cSbayVwmK6CsLJ70VwDo XAP8Fkak2yxr3wvWgtFpOiOv3mmJsd7cB51foiAXH863TjPvj7l9Q85jfFyfX9HZiRZu NqSkUPxT4PyefZHj4+hM0iE2tEEgQevBybqoiziBMggOOFywWI8MQMSqnW5wQJAFcA9m QkTj9t8ijwtS9d6F5psCL054GN6w9FOJqr7UTRqbjEMEpnme9KMXK2uwrjP3QNJqy6Sb vZkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969473; x=1740574273; 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=93fOiXLiPOPHhDRJ9eVLB7ZJAOD1HkX3lWv5xa2feOw=; b=C1HKrJR9+sN0Z40qdQ3CkQSmJCUkFucubn2QWibfVQXttomImDDT/krrI4luavzyJw xRG/xcvAFoYMExMpiTzMtfdriHwy4bRisdde6K+c1RRYrg0/AUwCGNAaAxQ5rvN+dWhL +cLEcyb+lu/4GrrPJ/uUgUa5vxd40K7uCM++XT0ZkN77gzop4KRYbwrBUM/wDDQmlkWT PbRKEBU6Hb4mqxsxLt19UWV21u4BIvZY1jSpE9EEdF9rHSaI69PYQSMAf4DYeRhrMate GrzAlJp2eBNUAGArcoghuzkDP3SHtku1WNSkpNDGxopSF9236qxkwpF6OrHwTczdRBWQ 2XYg== X-Forwarded-Encrypted: i=1; AJvYcCUXXvaqFgbSeBatHLqPiklKKaZao60t1UFxUIW/p7ZiwdlQpdU9NGkQwOyDUQWm9udCpPpTI5p0/iFP@vger.kernel.org, AJvYcCVBpYQ/v7arI//w3xhxz9sn3oUKaxjQq2BzJoYRHZ2IMYRkUgyyyR13v+xokxHsdQdkyfDnCzkG+caU@vger.kernel.org, AJvYcCVoZJqJSZP0hi7rX/6MN+1JGy7R8w5fPcoPLsmw83s5NmqYG08hhUFC2gOwN13rZTpP/OYQ5bI2IGoXwg==@vger.kernel.org, AJvYcCVzsxVIPgZnTdM2z8KRj4V5JhBh8bp3HT+F76LmDDdazsAaPIho0tCVlvFf1IDGoP3jUp2uUPJc5JlsV6Wj@vger.kernel.org, AJvYcCWVI8LJNXgZf/GArMguGyuGp/UceSVQrGOxRNcUEXf9JUDawlqtVSpszHvB86MEsvscZwNy+G8t9lPqPzjECgnB@vger.kernel.org, AJvYcCX8/ZHs9yG/GkWEaeQ1b7iMoykkhjEn0AMROW8pwiIJrrcHa71A7Vx8HSsyV6peTQHlnw/kM7MCCbsvn/FVLKM=@vger.kernel.org, AJvYcCXOu2fgJb2Vku5HWYCttXJ/S+nR9JkTJBTRQbezceNLTHMaTwWkZ9bxc1nFVFFRr+GmHQ0=@vger.kernel.org, AJvYcCXk2QfiFmaU0zc+8etl9kqJIUNQWdHaVY9SiK3bRfd1yWWqq/Qs8bAkk+CvvukM9fndpUjaQuuVsO7NIw==@vger.kernel.org X-Gm-Message-State: AOJu0YyKx9IiMKbRTQwJTZQ4uBUW6UgKZbO04x4FXELWTywEon/HkpMX qRxk9lBYSjADOvyKTPGdDTZW5oV0zr+iPY7OFeNDydUnxJjCX1p0Hpycs0w5018= X-Gm-Gg: ASbGncsjoQIgr2Co3qI8EIwaabxCn5cnDOygQPAuMPNFyiRom4N+P9nZ5JEdmvtCDEs wl+5KDDqvYDWhAUtMrBrL6yGR8ccpSyQAjHwH3E02LP+RiNpzQjtubY/Qg/7L56SetHFNyfqVgC 6QXy1zqg2cjRfmuRx6eiw6U51owpSgbcF24HBSjbbKXFLKnjRuk7+iAU0w6b3bO+qyKRGUkQY0H eplfYfnyFr1WemOV8vJN+kPslMo0MKv4tjG1j81qk53o1bo5Pzb4yS6Bmw4yqGNmvrkPCd1+I7K TFt+6w== X-Google-Smtp-Source: AGHT+IFwrijUxTicBZSeJZUUaytXHE0DfRRF5DwivmwpPm4+n8c4+GP1YGLfqkZTKfGUAWsG4vSnVg== X-Received: by 2002:a17:902:ce03:b0:21f:6c81:f63 with SMTP id d9443c01a7336-22104020041mr311521055ad.16.1739969472430; Wed, 19 Feb 2025 04:51:12 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:51:11 -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 v10 02/13] rtnetlink: Pack newlink() params into struct Date: Wed, 19 Feb 2025 20:50:28 +0800 Message-ID: <20250219125039.18024-3-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are 4 net namespaces involved when creating links: - source netns - where the netlink socket resides, - target netns - where to put the device being created, - link netns - netns associated with the device (backend), - peer netns - netns of peer device. Currently, two nets are passed to newlink() callback - "src_net" parameter and "dev_net" (implicitly in net_device). They are set as follows, depending on netlink attributes in the request. +------------+-------------------+---------+---------+ | peer netns | IFLA_LINK_NETNSID | src_net | dev_net | +------------+-------------------+---------+---------+ | | absent | source | target | | absent +-------------------+---------+---------+ | | present | link | link | +------------+-------------------+---------+---------+ | | absent | peer | target | | present +-------------------+---------+---------+ | | present | peer | link | +------------+-------------------+---------+---------+ When IFLA_LINK_NETNSID is present, the device is created in link netns first and then moved to target netns. This has some side effects, including extra ifindex allocation, ifname validation and link events. These could be avoided if we create it in target netns from the beginning. On the other hand, the meaning of src_net parameter is ambiguous. It varies depending on how parameters are passed. It is the effective link (or peer netns) by design, but some drivers ignore it and use dev_net instead. To provide more netns context for drivers, this patch packs existing newlink() parameters, along with the source netns, link netns and peer netns, into a struct. The old "src_net" is renamed to "net" to avoid confusion with real source netns, and will be deprecated later. The use of src_net are converted to params->net trivially. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 7 ++++-- drivers/net/amt.c | 7 ++++-- drivers/net/bareudp.c | 7 ++++-- drivers/net/bonding/bond_netlink.c | 6 +++-- drivers/net/can/dev/netlink.c | 4 +-- drivers/net/can/vxcan.c | 7 ++++-- .../ethernet/qualcomm/rmnet/rmnet_config.c | 7 ++++-- drivers/net/geneve.c | 7 ++++-- drivers/net/gtp.c | 6 +++-- drivers/net/ipvlan/ipvlan.h | 3 +-- drivers/net/ipvlan/ipvlan_main.c | 6 +++-- drivers/net/ipvlan/ipvtap.c | 6 ++--- drivers/net/macsec.c | 7 ++++-- drivers/net/macvlan.c | 19 ++++++++------ drivers/net/macvtap.c | 6 ++--- drivers/net/netkit.c | 14 +++++++---- drivers/net/pfcp.c | 5 ++-- drivers/net/ppp/ppp_generic.c | 7 ++++-- drivers/net/team/team_core.c | 6 +++-- drivers/net/veth.c | 7 ++++-- drivers/net/vrf.c | 5 ++-- drivers/net/vxlan/vxlan_core.c | 7 ++++-- drivers/net/wireguard/device.c | 5 ++-- drivers/net/wireless/virtual/virt_wifi.c | 6 +++-- drivers/net/wwan/wwan_core.c | 16 +++++++++--- include/linux/if_macvlan.h | 6 +++-- include/net/rtnetlink.h | 25 ++++++++++++++++--- net/8021q/vlan_netlink.c | 7 ++++-- net/batman-adv/soft-interface.c | 9 +++---- net/bridge/br_netlink.c | 6 +++-- net/caif/chnl_net.c | 5 ++-- net/core/rtnetlink.c | 15 ++++++++--- net/hsr/hsr_netlink.c | 6 +++-- net/ieee802154/6lowpan/core.c | 5 ++-- net/ipv4/ip_gre.c | 16 ++++++++---- net/ipv4/ip_vti.c | 6 +++-- net/ipv4/ipip.c | 6 +++-- net/ipv6/ip6_gre.c | 14 ++++++++--- net/ipv6/ip6_tunnel.c | 6 +++-- net/ipv6/ip6_vti.c | 5 ++-- net/ipv6/sit.c | 6 +++-- net/xfrm/xfrm_interface_core.c | 7 +++--- 42 files changed, 223 insertions(+), 110 deletions(-) diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c index 9ad8d9856275..16cb8ced9f35 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c @@ -97,10 +97,13 @@ static int ipoib_changelink(struct net_device *dev, struct nlattr *tb[], return ret; } -static int ipoib_new_child_link(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ipoib_new_child_link(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct net_device *pdev; struct ipoib_dev_priv *ppriv; u16 child_pkey; diff --git a/drivers/net/amt.c b/drivers/net/amt.c index 98c6205ed19f..96b7ec9a2c13 100644 --- a/drivers/net/amt.c +++ b/drivers/net/amt.c @@ -3161,11 +3161,14 @@ static int amt_validate(struct nlattr *tb[], struct nlattr *data[], return 0; } -static int amt_newlink(struct net *net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int amt_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct amt_dev *amt = netdev_priv(dev); + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; + struct net *net = params->net; int err = -EINVAL; amt->net = net; diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index 70814303aab8..fc21dcfb4848 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -698,10 +698,13 @@ static void bareudp_dellink(struct net_device *dev, struct list_head *head) unregister_netdevice_queue(dev, head); } -static int bareudp_newlink(struct net *net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int bareudp_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; + struct net *net = params->net; struct bareudp_conf conf; int err; diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c index 2a6a424806aa..ac5e402c34bc 100644 --- a/drivers/net/bonding/bond_netlink.c +++ b/drivers/net/bonding/bond_netlink.c @@ -564,10 +564,12 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[], return 0; } -static int bond_newlink(struct net *src_net, struct net_device *bond_dev, - struct nlattr *tb[], struct nlattr *data[], +static int bond_newlink(struct net_device *bond_dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; int err; err = bond_changelink(bond_dev, tb, data, extack); diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c index 01aacdcda260..f1db9b7ffd4d 100644 --- a/drivers/net/can/dev/netlink.c +++ b/drivers/net/can/dev/netlink.c @@ -624,8 +624,8 @@ static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev) return -EMSGSIZE; } -static int can_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int can_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { return -EOPNOTSUPP; diff --git a/drivers/net/can/vxcan.c b/drivers/net/can/vxcan.c index ca8811941085..6f8ebb1cfd7b 100644 --- a/drivers/net/can/vxcan.c +++ b/drivers/net/can/vxcan.c @@ -172,10 +172,13 @@ static void vxcan_setup(struct net_device *dev) /* forward declaration for rtnl_create_link() */ static struct rtnl_link_ops vxcan_link_ops; -static int vxcan_newlink(struct net *peer_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int vxcan_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct net *peer_net = params->net; + struct nlattr **tb = params->tb; struct vxcan_priv *priv; struct net_device *peer; diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c index f3bea196a8f9..8151e91395e2 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c @@ -117,11 +117,14 @@ static void rmnet_unregister_bridge(struct rmnet_port *port) rmnet_unregister_real_device(bridge_dev); } -static int rmnet_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int rmnet_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { u32 data_format = RMNET_FLAGS_INGRESS_DEAGGREGATION; + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct net_device *real_dev; int mode = RMNET_EPMODE_VND; struct rmnet_endpoint *ep; diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 642155cb8315..d373a851930c 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1614,10 +1614,13 @@ static void geneve_link_config(struct net_device *dev, geneve_change_mtu(dev, ldev_mtu - info->options_len); } -static int geneve_newlink(struct net *net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int geneve_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; + struct net *net = params->net; struct geneve_config cfg = { .df = GENEVE_DF_UNSET, .use_udp6_rx_checksums = false, diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index d64740bf44ed..d6d4326cb908 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1462,10 +1462,12 @@ static int gtp_create_sockets(struct gtp_dev *gtp, const struct nlattr *nla, #define GTP_TH_MAXLEN (sizeof(struct udphdr) + sizeof(struct gtp0_header)) #define GTP_IPV6_MAXLEN (sizeof(struct ipv6hdr) + GTP_TH_MAXLEN) -static int gtp_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int gtp_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct net *src_net = params->net; unsigned int role = GTP_ROLE_GGSN; struct gtp_dev *gtp; struct gtp_net *gn; diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h index 025e0c19ec25..50de3ee204db 100644 --- a/drivers/net/ipvlan/ipvlan.h +++ b/drivers/net/ipvlan/ipvlan.h @@ -166,8 +166,7 @@ struct ipvl_addr *ipvlan_addr_lookup(struct ipvl_port *port, void *lyr3h, void *ipvlan_get_L3_hdr(struct ipvl_port *port, struct sk_buff *skb, int *type); void ipvlan_count_rx(const struct ipvl_dev *ipvlan, unsigned int len, bool success, bool mcast); -int ipvlan_link_new(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +int ipvlan_link_new(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack); void ipvlan_link_delete(struct net_device *dev, struct list_head *head); void ipvlan_link_setup(struct net_device *dev); diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index da3a97a65507..19ce19ca7e32 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -532,11 +532,13 @@ static int ipvlan_nl_fillinfo(struct sk_buff *skb, return ret; } -int ipvlan_link_new(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +int ipvlan_link_new(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct ipvl_dev *ipvlan = netdev_priv(dev); + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct ipvl_port *port; struct net_device *phy_dev; int err; diff --git a/drivers/net/ipvlan/ipvtap.c b/drivers/net/ipvlan/ipvtap.c index 1afc4c47be73..edd13916831a 100644 --- a/drivers/net/ipvlan/ipvtap.c +++ b/drivers/net/ipvlan/ipvtap.c @@ -73,8 +73,8 @@ static void ipvtap_update_features(struct tap_dev *tap, netdev_update_features(vlan->dev); } -static int ipvtap_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ipvtap_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct ipvtap_dev *vlantap = netdev_priv(dev); @@ -97,7 +97,7 @@ static int ipvtap_newlink(struct net *src_net, struct net_device *dev, /* Don't put anything that may fail after macvlan_common_newlink * because we can't undo what it does. */ - err = ipvlan_link_new(src_net, dev, tb, data, extack); + err = ipvlan_link_new(dev, params, extack); if (err) { netdev_rx_handler_unregister(dev); return err; diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 1bc1e5993f56..1869b0513f57 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -4141,11 +4141,14 @@ static int macsec_add_dev(struct net_device *dev, sci_t sci, u8 icv_len) static struct lock_class_key macsec_netdev_addr_lock_key; -static int macsec_newlink(struct net *net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int macsec_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct macsec_dev *macsec = macsec_priv(dev); + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; + struct net *net = params->net; rx_handler_func_t *rx_handler; u8 icv_len = MACSEC_DEFAULT_ICV_LEN; struct net_device *real_dev; diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index fed4fe2a4748..f903b414eaeb 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -1440,16 +1440,19 @@ static int macvlan_changelink_sources(struct macvlan_dev *vlan, u32 mode, return 0; } -int macvlan_common_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +int macvlan_common_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct macvlan_dev *vlan = netdev_priv(dev); - struct macvlan_port *port; + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct net_device *lowerdev; - int err; - int macmode; + struct macvlan_port *port; bool create = false; + int macmode; + int err; if (!tb[IFLA_LINK]) return -EINVAL; @@ -1565,11 +1568,11 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, } EXPORT_SYMBOL_GPL(macvlan_common_newlink); -static int macvlan_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int macvlan_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { - return macvlan_common_newlink(src_net, dev, tb, data, extack); + return macvlan_common_newlink(dev, params, extack); } void macvlan_dellink(struct net_device *dev, struct list_head *head) diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 29a5929d48e5..b391a0f740a3 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -77,8 +77,8 @@ static void macvtap_update_features(struct tap_dev *tap, netdev_update_features(vlan->dev); } -static int macvtap_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int macvtap_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct macvtap_dev *vlantap = netdev_priv(dev); @@ -105,7 +105,7 @@ static int macvtap_newlink(struct net *src_net, struct net_device *dev, /* Don't put anything that may fail after macvlan_common_newlink * because we can't undo what it does. */ - err = macvlan_common_newlink(src_net, dev, tb, data, extack); + err = macvlan_common_newlink(dev, params, extack); if (err) { netdev_rx_handler_unregister(dev); return err; diff --git a/drivers/net/netkit.c b/drivers/net/netkit.c index 1e1b00756be7..640a2dbbbd28 100644 --- a/drivers/net/netkit.c +++ b/drivers/net/netkit.c @@ -327,17 +327,20 @@ static int netkit_validate(struct nlattr *tb[], struct nlattr *data[], static struct rtnl_link_ops netkit_link_ops; -static int netkit_new_link(struct net *peer_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int netkit_new_link(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { - struct nlattr *peer_tb[IFLA_MAX + 1], **tbp = tb, *attr; - enum netkit_action policy_prim = NETKIT_PASS; - enum netkit_action policy_peer = NETKIT_PASS; enum netkit_scrub scrub_prim = NETKIT_SCRUB_DEFAULT; enum netkit_scrub scrub_peer = NETKIT_SCRUB_DEFAULT; + struct nlattr *peer_tb[IFLA_MAX + 1], **tbp, *attr; + enum netkit_action policy_prim = NETKIT_PASS; + enum netkit_action policy_peer = NETKIT_PASS; + struct nlattr **data = params->data; + struct net *peer_net = params->net; enum netkit_mode mode = NETKIT_L3; unsigned char ifname_assign_type; + struct nlattr **tb = params->tb; u16 headroom = 0, tailroom = 0; struct ifinfomsg *ifmp = NULL; struct net_device *peer; @@ -345,6 +348,7 @@ static int netkit_new_link(struct net *peer_net, struct net_device *dev, struct netkit *nk; int err; + tbp = tb; if (data) { if (data[IFLA_NETKIT_MODE]) mode = nla_get_u32(data[IFLA_NETKIT_MODE]); diff --git a/drivers/net/pfcp.c b/drivers/net/pfcp.c index 68d0d9e92a22..7b0575940e1d 100644 --- a/drivers/net/pfcp.c +++ b/drivers/net/pfcp.c @@ -184,11 +184,12 @@ static int pfcp_add_sock(struct pfcp_dev *pfcp) return PTR_ERR_OR_ZERO(pfcp->sock); } -static int pfcp_newlink(struct net *net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int pfcp_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct pfcp_dev *pfcp = netdev_priv(dev); + struct net *net = params->net; struct pfcp_net *pn; int err; diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 4583e15ad03a..b3340f8a6149 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -1303,10 +1303,13 @@ static int ppp_nl_validate(struct nlattr *tb[], struct nlattr *data[], return 0; } -static int ppp_nl_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ppp_nl_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct ppp_config conf = { .unit = -1, .ifname_is_set = true, diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index f4019815f473..78edb8186b6d 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -2218,10 +2218,12 @@ static void team_setup(struct net_device *dev) dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; } -static int team_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int team_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **tb = params->tb; + if (tb[IFLA_ADDRESS] == NULL) eth_hw_addr_random(dev); diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 01251868a9c2..7dfda89f072f 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -1765,10 +1765,13 @@ static int veth_init_queues(struct net_device *dev, struct nlattr *tb[]) return 0; } -static int veth_newlink(struct net *peer_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int veth_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct net *peer_net = params->net; + struct nlattr **tb = params->tb; int err; struct net_device *peer; struct veth_priv *priv; diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 5f21ce1013c4..849c3ced2690 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -1675,11 +1675,12 @@ static void vrf_dellink(struct net_device *dev, struct list_head *head) unregister_netdevice_queue(dev, head); } -static int vrf_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int vrf_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct net_vrf *vrf = netdev_priv(dev); + struct nlattr **data = params->data; struct netns_vrf *nn_vrf; bool *add_fib_rules; struct net *net; diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index ac5bc78edfd7..09a4a5bf1038 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -4400,10 +4400,13 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[], return 0; } -static int vxlan_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int vxlan_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct vxlan_config conf; int err; diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c index 6cf173a008e7..404cf05bd72b 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -307,11 +307,12 @@ static void wg_setup(struct net_device *dev) wg->dev = dev; } -static int wg_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int wg_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct wg_device *wg = netdev_priv(dev); + struct net *src_net = params->net; int ret = -ENOMEM; rcu_assign_pointer(wg->creating_net, src_net); diff --git a/drivers/net/wireless/virtual/virt_wifi.c b/drivers/net/wireless/virtual/virt_wifi.c index 4ee374080466..26905b2b3ba3 100644 --- a/drivers/net/wireless/virtual/virt_wifi.c +++ b/drivers/net/wireless/virtual/virt_wifi.c @@ -519,11 +519,13 @@ static rx_handler_result_t virt_wifi_rx_handler(struct sk_buff **pskb) } /* Called with rtnl lock held. */ -static int virt_wifi_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int virt_wifi_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct virt_wifi_netdev_priv *priv = netdev_priv(dev); + struct net *src_net = params->net; + struct nlattr **tb = params->tb; int err; if (!tb[IFLA_LINK]) diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index a51e2755991a..a05c49b4e7f8 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -967,15 +967,18 @@ static struct net_device *wwan_rtnl_alloc(struct nlattr *tb[], return dev; } -static int wwan_rtnl_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int wwan_rtnl_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct wwan_device *wwandev = wwan_dev_get_by_parent(dev->dev.parent); - u32 link_id = nla_get_u32(data[IFLA_WWAN_LINK_ID]); struct wwan_netdev_priv *priv = netdev_priv(dev); + struct nlattr **data = params->data; + u32 link_id; int ret; + link_id = nla_get_u32(data[IFLA_WWAN_LINK_ID]); + if (IS_ERR(wwandev)) return PTR_ERR(wwandev); @@ -1061,6 +1064,11 @@ static void wwan_create_default_link(struct wwan_device *wwandev, { struct nlattr *tb[IFLA_MAX + 1], *linkinfo[IFLA_INFO_MAX + 1]; struct nlattr *data[IFLA_WWAN_MAX + 1]; + struct rtnl_newlink_params params = { + .net = &init_net, + .tb = tb, + .data = data, + }; struct net_device *dev; struct nlmsghdr *nlh; struct sk_buff *msg; @@ -1105,7 +1113,7 @@ static void wwan_create_default_link(struct wwan_device *wwandev, if (WARN_ON(IS_ERR(dev))) goto unlock; - if (WARN_ON(wwan_rtnl_newlink(&init_net, dev, tb, data, NULL))) { + if (WARN_ON(wwan_rtnl_newlink(dev, ¶ms, NULL))) { free_netdev(dev); goto unlock; } diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 523025106a64..0f7281e3e448 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h @@ -59,8 +59,10 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan, extern void macvlan_common_setup(struct net_device *dev); -extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +struct rtnl_newlink_params; + +extern int macvlan_common_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack); extern void macvlan_dellink(struct net_device *dev, struct list_head *head); diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h index bc0069a8b6ea..563a6a27436c 100644 --- a/include/net/rtnetlink.h +++ b/include/net/rtnetlink.h @@ -69,6 +69,25 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh) return AF_UNSPEC; } +/** + * struct rtnl_newlink_params - parameters of rtnl_link_ops::newlink() + * + * @net: Netns of interest + * @src_net: Source netns of rtnetlink socket + * @link_net: Link netns by IFLA_LINK_NETNSID, NULL if not specified + * @peer_net: Peer netns + * @tb: IFLA_* attributes + * @data: IFLA_INFO_DATA attributes + */ +struct rtnl_newlink_params { + struct net *net; + struct net *src_net; + struct net *link_net; + struct net *peer_net; + struct nlattr **tb; + struct nlattr **data; +}; + /** * struct rtnl_link_ops - rtnetlink link operations * @@ -125,10 +144,8 @@ struct rtnl_link_ops { struct nlattr *data[], struct netlink_ext_ack *extack); - int (*newlink)(struct net *src_net, - struct net_device *dev, - struct nlattr *tb[], - struct nlattr *data[], + int (*newlink)(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack); int (*changelink)(struct net_device *dev, struct nlattr *tb[], diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index 134419667d59..91df0f96e32a 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c @@ -135,11 +135,14 @@ static int vlan_changelink(struct net_device *dev, struct nlattr *tb[], return 0; } -static int vlan_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int vlan_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct vlan_dev_priv *vlan = vlan_dev_priv(dev); + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct net_device *real_dev; unsigned int max_mtu; __be16 proto; diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 822d788a5f86..d893c8013261 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1077,19 +1077,18 @@ static int batadv_softif_validate(struct nlattr *tb[], struct nlattr *data[], /** * batadv_softif_newlink() - pre-initialize and register new batadv link - * @src_net: the applicable net namespace * @dev: network device to register - * @tb: IFLA_INFO_DATA netlink attributes - * @data: enum batadv_ifla_attrs attributes + * @params: rtnl newlink parameters * @extack: extended ACK report struct * * Return: 0 if successful or error otherwise. */ -static int batadv_softif_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int batadv_softif_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct batadv_priv *bat_priv = netdev_priv(dev); + struct nlattr **data = params->data; const char *algo_name; int err; diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 3e0f47203f2a..6e337937d0d7 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -1553,11 +1553,13 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], return 0; } -static int br_dev_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int br_dev_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct net_bridge *br = netdev_priv(dev); + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; int err; err = register_netdevice(dev); diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 94ad09e36df2..fa6a3c2634a8 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -438,10 +438,11 @@ static void caif_netlink_parms(struct nlattr *data[], } } -static int ipcaif_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ipcaif_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; int ret; struct chnl_net *caifdev; ASSERT_RTNL(); diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 0f3e2c6021de..9ebbde0d131c 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3767,7 +3767,13 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm, struct netlink_ext_ack *extack) { unsigned char name_assign_type = NET_NAME_USER; - struct net *net = sock_net(skb->sk); + struct rtnl_newlink_params params = { + .src_net = sock_net(skb->sk), + .link_net = link_net, + .peer_net = peer_net, + .tb = tb, + .data = data, + }; u32 portid = NETLINK_CB(skb).portid; struct net_device *dev; char ifname[IFNAMSIZ]; @@ -3792,13 +3798,14 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm, dev->ifindex = ifm->ifi_index; + params.net = params.src_net; if (link_net) - net = link_net; + params.net = link_net; if (peer_net) - net = peer_net; + params.net = peer_net; if (ops->newlink) - err = ops->newlink(net, dev, tb, data, extack); + err = ops->newlink(dev, ¶ms, extack); else err = register_netdevice(dev); if (err < 0) { diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c index b68f2f71d0e1..39add538ba99 100644 --- a/net/hsr/hsr_netlink.c +++ b/net/hsr/hsr_netlink.c @@ -29,10 +29,12 @@ static const struct nla_policy hsr_policy[IFLA_HSR_MAX + 1] = { /* Here, it seems a netdevice has already been allocated for us, and the * hsr_dev_setup routine has been executed. Nice! */ -static int hsr_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int hsr_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct net *src_net = params->net; enum hsr_version proto_version; unsigned char multicast_spec; u8 proto = HSR_PROTOCOL_HSR; diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c index 175efd860f7b..704bf9e3f097 100644 --- a/net/ieee802154/6lowpan/core.c +++ b/net/ieee802154/6lowpan/core.c @@ -129,10 +129,11 @@ static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[], return 0; } -static int lowpan_newlink(struct net *src_net, struct net_device *ldev, - struct nlattr *tb[], struct nlattr *data[], +static int lowpan_newlink(struct net_device *ldev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **tb = params->tb; struct net_device *wdev; int ret; diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index c9f11a046c26..1fe9b13d351c 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1396,10 +1396,12 @@ ipgre_newlink_encap_setup(struct net_device *dev, struct nlattr *data[]) return 0; } -static int ipgre_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ipgre_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; struct ip_tunnel_parm_kern p; __u32 fwmark = 0; int err; @@ -1414,10 +1416,12 @@ static int ipgre_newlink(struct net *src_net, struct net_device *dev, return ip_tunnel_newlink(dev, tb, &p, fwmark); } -static int erspan_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int erspan_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; struct ip_tunnel_parm_kern p; __u32 fwmark = 0; int err; @@ -1697,6 +1701,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 nlattr *tb[IFLA_MAX + 1]; struct net_device *dev; LIST_HEAD(list_kill); @@ -1704,6 +1709,7 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name, int err; memset(&tb, 0, sizeof(tb)); + params.tb = tb; dev = rtnl_create_link(net, name, name_assign_type, &ipgre_tap_ops, tb, NULL); @@ -1714,7 +1720,7 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name, t = netdev_priv(dev); t->collect_md = true; - err = ipgre_newlink(net, dev, tb, NULL, NULL); + err = ipgre_newlink(dev, ¶ms, NULL); if (err < 0) { free_netdev(dev); return ERR_PTR(err); diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index f0b4419cef34..b901bee03e6d 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -575,11 +575,13 @@ static void vti_netlink_parms(struct nlattr *data[], *fwmark = nla_get_u32(data[IFLA_VTI_FWMARK]); } -static int vti_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int vti_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; struct ip_tunnel_parm_kern parms; + struct nlattr **tb = params->tb; __u32 fwmark = 0; vti_netlink_parms(data, &parms, &fwmark); diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index dc0db5895e0e..a8b844bcfc64 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -436,11 +436,13 @@ static void ipip_netlink_parms(struct nlattr *data[], *fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]); } -static int ipip_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ipip_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct ip_tunnel *t = netdev_priv(dev); + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; struct ip_tunnel_encap ipencap; struct ip_tunnel_parm_kern p; __u32 fwmark = 0; diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 235808cfec70..863852abe8ea 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -2005,11 +2005,14 @@ static int ip6gre_newlink_common(struct net *src_net, struct net_device *dev, return err; } -static int ip6gre_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ip6gre_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct ip6_tnl *nt = netdev_priv(dev); + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct net *net = dev_net(dev); struct ip6gre_net *ign; int err; @@ -2241,11 +2244,14 @@ static void ip6erspan_tap_setup(struct net_device *dev) netif_keep_dst(dev); } -static int ip6erspan_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ip6erspan_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { struct ip6_tnl *nt = netdev_priv(dev); + struct nlattr **data = params->data; + struct net *src_net = params->net; + struct nlattr **tb = params->tb; struct net *net = dev_net(dev); struct ip6gre_net *ign; int err; diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 48fd53b98972..54b843d20870 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -2002,10 +2002,12 @@ static void ip6_tnl_netlink_parms(struct nlattr *data[], parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]); } -static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ip6_tnl_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; struct net *net = dev_net(dev); struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); struct ip_tunnel_encap ipencap; diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 590737c27537..993f85aeb882 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -997,10 +997,11 @@ static void vti6_netlink_parms(struct nlattr *data[], parms->fwmark = nla_get_u32(data[IFLA_VTI_FWMARK]); } -static int vti6_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int vti6_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; struct net *net = dev_net(dev); struct ip6_tnl *nt; diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 39bd8951bfca..e2bd52cabdee 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1550,10 +1550,12 @@ static bool ipip6_netlink_6rd_parms(struct nlattr *data[], } #endif -static int ipip6_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], +static int ipip6_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; + struct nlattr **tb = params->tb; struct net *net = dev_net(dev); struct ip_tunnel *nt; struct ip_tunnel_encap ipencap; diff --git a/net/xfrm/xfrm_interface_core.c b/net/xfrm/xfrm_interface_core.c index c397eb99d867..5659a6cadd51 100644 --- a/net/xfrm/xfrm_interface_core.c +++ b/net/xfrm/xfrm_interface_core.c @@ -814,10 +814,11 @@ static void xfrmi_netlink_parms(struct nlattr *data[], parms->collect_md = true; } -static int xfrmi_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[], - struct netlink_ext_ack *extack) +static int xfrmi_newlink(struct net_device *dev, + struct rtnl_newlink_params *params, + struct netlink_ext_ack *extack) { + struct nlattr **data = params->data; struct net *net = dev_net(dev); struct xfrm_if_parms p = {}; struct xfrm_if *xi; From patchwork Wed Feb 19 12:50:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982137 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 B1B241E9B0C; Wed, 19 Feb 2025 12:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969484; cv=none; b=Kq9F1pbxqgucYi6OCXmhiPxEyUA6rVa8Jifp+dnvVv9tqv8sonIAqr2dx8qYxFoCDWDYOhXFtMwy/51tXavfoHVvXDE+d9vQvlgYX+wt9Bcd/KqvVzw6Bq4puCU2nDEOUjRC8B+bTuCYuEgWdPyY01R/CVtE260n4GIrpvn40qA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969484; c=relaxed/simple; bh=8eR0wqjLqOmuxHlxb3OVVBO1kE9FkqjGLjioV06GSQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t3U1nyr9iQm79pDdVNVyMm59YW+BC1g1UEDXLxyVcFpPubQG2quwyxxz6CHiM5AeZtF/ICGTXAey10OBLi+pFi2vqeh6YNZu723wKRMyeBCmaSabCzMq0eXfa/yoESoxXwD8Jui8Lij2Tl/Q3S2gZiCJ1g/2qi1OWeicrbKHN2c= 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=dwx2aFAp; arc=none smtp.client-ip=209.85.216.47 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="dwx2aFAp" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2fc1843495eso8790013a91.1; Wed, 19 Feb 2025 04:51:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969481; x=1740574281; 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=/A97M2zaAkPkySBdEofVw8pgt3e2mXhNRi7YscGFBDg=; b=dwx2aFApbKuzziHv8B+Qb2uqDyeLujKZOXLeKVmn1PCAgQSSKxN+7b1c2VGsdTi0jZ JQPKsdvZr9KnvbBRHn7kJXKhLg9sRd09yK/RS+jY/waG2IaGzqbayl0CW3bB6OwE59zi K8JCRwWwijmpy+7PzBNZEQJ6HK/NhKJKw3qkHHWhcwUY4C+hynTkBI1AkGgLMtncNWHh ayRoy5coixOezkCtZpKPU/ElCxPaFQfx+VLHEOZwG55LyvCDH/IJPgbVRHd85OyvrLNH yDow+eOPPJXltvxcVfbyFPijaYZasGkLELsQyUx0+TL3vcaqEe4pgXngtVuCL3ofeO6m /4wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969481; x=1740574281; 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=/A97M2zaAkPkySBdEofVw8pgt3e2mXhNRi7YscGFBDg=; b=XRAK6/G9pfQY61IYCZOw7qgtKCbbeE+KuR8rT0Hvo6bzQy4rLkRv15JlFZl2LDQvUS Gy80VWt2nkuEqjw4QHbcjHemkOYXop6q2/MtJLSY28RIR3WrgS7Ytznmq7lJJyI8bjdJ nn9tWOT3qtqbj72u3KVyBN2K2G2bzuABIF4EFhI+lPn5Aoeof0ZiPXNcwv/ISk4UXY0y y3aVXnRS48zwGcqs7EJ+eafArstf/zEXHeaKcwwZLDSX5YILwLXaqepDnhuL6P0F43Ah R29vTPQ3NDr2JS6XpZilLw2cgri/xxb3tbImUY25uAQtHzefMa5orJ4iZOu48hiW0VaF LW2Q== X-Forwarded-Encrypted: i=1; AJvYcCUbtyJQFrI2nBKH+x3yLEK6uWhxt6hzHt3SRhYZlpd+4633acId0aZZuKcySWRBlf6LZtKiW8eFgOHkTruTWkg=@vger.kernel.org, AJvYcCVnoZKlOqgDku5NRWG6jC2VvGwWH3SJZbY/Vdh8jmI9ebXuyM2MeHUbkIdFiMEw1zBG0/g=@vger.kernel.org, AJvYcCVwR8ZKyKdcqobzhE359/7KretXmWjj+ydrAaeX51vUZyT9DQyrkHVEzkkDWSQTEvMb/eP05bSdys1i@vger.kernel.org, AJvYcCWJgjp56YmQMjZxVoyMR53HmUGMpzqGXJc0TrKMmQmzr+zA/3Z/Yt3TdNt9i9hsFC3JLsQzVSAnb/5a@vger.kernel.org, AJvYcCXMtDTbeA9bHfLgI91UDL1EM0q0xrY7XrpZidukAEUXbKzU0HbSC9/1H4U9BaCSbkUEY0TYTCQcuJZTLGZY@vger.kernel.org, AJvYcCXSmXT2mbeCDtZQIjKX1cA6yRvOcFZ3ytsDAMRodlUu/RM8624oTxyok9Rxl3prGPDGnRIZUS1l2wMFgw==@vger.kernel.org, AJvYcCXY7FhlUDT1NTjFp6mZKMaYxAPZMrv+erfkvOqcbCrSNS9gqCYdQjrrEvhbZTO6Ihy4HXgOAY1L10GkYA==@vger.kernel.org, AJvYcCXiHTaZP4iQJaHgYH8FUfWXOH1JLssMkMrG+WIGrMnc75u8LW5ntVFyjODtbnGdCUdKqz1JGH/BK/c7yMvnN+48@vger.kernel.org X-Gm-Message-State: AOJu0YyotuK6C1njft9sPsVU10PTx34HFbXmI5EhXPlh0LAnoPY85Drw wlw76IT7Y09We8v+uSMz3QiVilmlJkLr8zrJ+2zRjj5g7liWX+Z1advWCMt2NWY= X-Gm-Gg: ASbGnctNHEul/gv+7fy4eZB24WHtc8wPU7zHMIn9p7k6qjVun5ZhvaKcqNGs6hSZSYs tappyVTBWoTGsm+ceLeQpjGC5RsWIgh1Xeo1f2j2Wr3WaLWLyvZuyHuPNsFFAmURaG5HbCVqpzy WkcdOQ8vBU0/XKoVXWgSJfi3F0nEpDr8uzKdURVD3+NrtkqPdRGLwlQSe1oa9WV5j0CT2BZXbY9 OE/W3aUBncmluieymZIoLUkHBvlqdZlA/3lgtjJ/fAx3jRk2rgouTGV1xs0sTOhN0TnOp4hpn2f URJnqg== X-Google-Smtp-Source: AGHT+IEUBhWwXPGbJB0c/P5YYbS1mahzsL5jnLOAoTy7sthWzlPO0yNFcwasqXoaMOXW8LwfTV2dYw== X-Received: by 2002:a17:90b:3dce:b0:2fa:20f4:d27f with SMTP id 98e67ed59e1d1-2fc41154398mr23076583a91.32.1739969481387; Wed, 19 Feb 2025 04:51:21 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:51:20 -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 v10 03/13] net: Use link/peer netns in newlink() of rtnl_link_ops Date: Wed, 19 Feb 2025 20:50:29 +0800 Message-ID: <20250219125039.18024-4-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add two helper functions - rtnl_newlink_link_net() and rtnl_newlink_peer_net() for netns fallback logic. Peer netns falls back to link netns, and link netns falls back to source netns. Convert the use of params->net in netdevice drivers to one of the helper functions for clarity. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 4 ++-- drivers/net/amt.c | 6 +++--- drivers/net/bareudp.c | 4 ++-- drivers/net/can/vxcan.c | 2 +- .../net/ethernet/qualcomm/rmnet/rmnet_config.c | 4 ++-- drivers/net/geneve.c | 4 ++-- drivers/net/gtp.c | 6 +++--- drivers/net/ipvlan/ipvlan_main.c | 4 ++-- drivers/net/macsec.c | 4 ++-- drivers/net/macvlan.c | 4 ++-- drivers/net/netkit.c | 2 +- drivers/net/pfcp.c | 6 +++--- drivers/net/ppp/ppp_generic.c | 4 ++-- drivers/net/veth.c | 2 +- drivers/net/vxlan/vxlan_core.c | 4 ++-- drivers/net/wireguard/device.c | 4 ++-- drivers/net/wireless/virtual/virt_wifi.c | 4 ++-- drivers/net/wwan/wwan_core.c | 2 +- include/net/rtnetlink.h | 17 +++++++++++++++++ net/8021q/vlan_netlink.c | 4 ++-- net/hsr/hsr_netlink.c | 8 ++++---- 21 files changed, 58 insertions(+), 41 deletions(-) diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c index 16cb8ced9f35..53db7c8191e3 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c @@ -101,8 +101,8 @@ static int ipoib_new_child_link(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; struct net_device *pdev; struct ipoib_dev_priv *ppriv; @@ -112,7 +112,7 @@ static int ipoib_new_child_link(struct net_device *dev, if (!tb[IFLA_LINK]) return -EINVAL; - pdev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK])); + pdev = __dev_get_by_index(link_net, nla_get_u32(tb[IFLA_LINK])); if (!pdev || pdev->type != ARPHRD_INFINIBAND) return -ENODEV; diff --git a/drivers/net/amt.c b/drivers/net/amt.c index 96b7ec9a2c13..53899b70fae1 100644 --- a/drivers/net/amt.c +++ b/drivers/net/amt.c @@ -3165,13 +3165,13 @@ static int amt_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct amt_dev *amt = netdev_priv(dev); struct nlattr **data = params->data; struct nlattr **tb = params->tb; - struct net *net = params->net; int err = -EINVAL; - amt->net = net; + amt->net = link_net; amt->mode = nla_get_u32(data[IFLA_AMT_MODE]); if (data[IFLA_AMT_MAX_TUNNELS] && @@ -3186,7 +3186,7 @@ static int amt_newlink(struct net_device *dev, amt->hash_buckets = AMT_HSIZE; amt->nr_tunnels = 0; get_random_bytes(&amt->hash_seed, sizeof(amt->hash_seed)); - amt->stream_dev = dev_get_by_index(net, + amt->stream_dev = dev_get_by_index(link_net, nla_get_u32(data[IFLA_AMT_LINK])); if (!amt->stream_dev) { NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_AMT_LINK], diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index fc21dcfb4848..d1473c5f8eef 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -702,9 +702,9 @@ static int bareudp_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct nlattr **data = params->data; struct nlattr **tb = params->tb; - struct net *net = params->net; struct bareudp_conf conf; int err; @@ -712,7 +712,7 @@ static int bareudp_newlink(struct net_device *dev, if (err) return err; - err = bareudp_configure(net, dev, &conf, extack); + err = bareudp_configure(link_net, dev, &conf, extack); if (err) return err; diff --git a/drivers/net/can/vxcan.c b/drivers/net/can/vxcan.c index 6f8ebb1cfd7b..99a78a757167 100644 --- a/drivers/net/can/vxcan.c +++ b/drivers/net/can/vxcan.c @@ -176,8 +176,8 @@ static int vxcan_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *peer_net = rtnl_newlink_peer_net(params); struct nlattr **data = params->data; - struct net *peer_net = params->net; struct nlattr **tb = params->tb; struct vxcan_priv *priv; struct net_device *peer; diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c index 8151e91395e2..ba8763cac9d9 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c @@ -121,9 +121,9 @@ static int rmnet_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); u32 data_format = RMNET_FLAGS_INGRESS_DEAGGREGATION; struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; struct net_device *real_dev; int mode = RMNET_EPMODE_VND; @@ -137,7 +137,7 @@ static int rmnet_newlink(struct net_device *dev, return -EINVAL; } - real_dev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK])); + real_dev = __dev_get_by_index(link_net, nla_get_u32(tb[IFLA_LINK])); if (!real_dev) { NL_SET_ERR_MSG_MOD(extack, "link does not exist"); return -ENODEV; diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index d373a851930c..c7700deefb00 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1618,9 +1618,9 @@ static int geneve_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct nlattr **data = params->data; struct nlattr **tb = params->tb; - struct net *net = params->net; struct geneve_config cfg = { .df = GENEVE_DF_UNSET, .use_udp6_rx_checksums = false, @@ -1634,7 +1634,7 @@ static int geneve_newlink(struct net_device *dev, if (err) return err; - err = geneve_configure(net, dev, extack, &cfg); + err = geneve_configure(link_net, dev, extack, &cfg); if (err) return err; diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index d6d4326cb908..2cf43e7d0edc 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1466,8 +1466,8 @@ static int gtp_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct nlattr **data = params->data; - struct net *src_net = params->net; unsigned int role = GTP_ROLE_GGSN; struct gtp_dev *gtp; struct gtp_net *gn; @@ -1498,7 +1498,7 @@ static int gtp_newlink(struct net_device *dev, gtp->restart_count = nla_get_u8_default(data[IFLA_GTP_RESTART_COUNT], 0); - gtp->net = src_net; + gtp->net = link_net; err = gtp_hashtable_new(gtp, hashsize); if (err < 0) @@ -1528,7 +1528,7 @@ static int gtp_newlink(struct net_device *dev, goto out_encap; } - gn = net_generic(src_net, gtp_net_id); + gn = net_generic(link_net, gtp_net_id); list_add(>p->list, &gn->gtp_dev_list); dev->priv_destructor = gtp_destructor; diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 19ce19ca7e32..b56144ca2fde 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -535,9 +535,9 @@ static int ipvlan_nl_fillinfo(struct sk_buff *skb, int ipvlan_link_new(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct ipvl_dev *ipvlan = netdev_priv(dev); struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; struct ipvl_port *port; struct net_device *phy_dev; @@ -547,7 +547,7 @@ int ipvlan_link_new(struct net_device *dev, struct rtnl_newlink_params *params, if (!tb[IFLA_LINK]) return -EINVAL; - phy_dev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK])); + phy_dev = __dev_get_by_index(link_net, nla_get_u32(tb[IFLA_LINK])); if (!phy_dev) return -ENODEV; diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 1869b0513f57..4de5d63fd577 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -4145,10 +4145,10 @@ static int macsec_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct macsec_dev *macsec = macsec_priv(dev); struct nlattr **data = params->data; struct nlattr **tb = params->tb; - struct net *net = params->net; rx_handler_func_t *rx_handler; u8 icv_len = MACSEC_DEFAULT_ICV_LEN; struct net_device *real_dev; @@ -4157,7 +4157,7 @@ static int macsec_newlink(struct net_device *dev, if (!tb[IFLA_LINK]) return -EINVAL; - real_dev = __dev_get_by_index(net, nla_get_u32(tb[IFLA_LINK])); + real_dev = __dev_get_by_index(link_net, nla_get_u32(tb[IFLA_LINK])); if (!real_dev) return -ENODEV; if (real_dev->type != ARPHRD_ETHER) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index f903b414eaeb..4e9d54be887c 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -1444,9 +1444,9 @@ int macvlan_common_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct macvlan_dev *vlan = netdev_priv(dev); struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; struct net_device *lowerdev; struct macvlan_port *port; @@ -1457,7 +1457,7 @@ int macvlan_common_newlink(struct net_device *dev, if (!tb[IFLA_LINK]) return -EINVAL; - lowerdev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK])); + lowerdev = __dev_get_by_index(link_net, nla_get_u32(tb[IFLA_LINK])); if (lowerdev == NULL) return -ENODEV; diff --git a/drivers/net/netkit.c b/drivers/net/netkit.c index 640a2dbbbd28..751347392570 100644 --- a/drivers/net/netkit.c +++ b/drivers/net/netkit.c @@ -331,13 +331,13 @@ static int netkit_new_link(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *peer_net = rtnl_newlink_peer_net(params); enum netkit_scrub scrub_prim = NETKIT_SCRUB_DEFAULT; enum netkit_scrub scrub_peer = NETKIT_SCRUB_DEFAULT; struct nlattr *peer_tb[IFLA_MAX + 1], **tbp, *attr; enum netkit_action policy_prim = NETKIT_PASS; enum netkit_action policy_peer = NETKIT_PASS; struct nlattr **data = params->data; - struct net *peer_net = params->net; enum netkit_mode mode = NETKIT_L3; unsigned char ifname_assign_type; struct nlattr **tb = params->tb; diff --git a/drivers/net/pfcp.c b/drivers/net/pfcp.c index 7b0575940e1d..f873a92d2445 100644 --- a/drivers/net/pfcp.c +++ b/drivers/net/pfcp.c @@ -188,12 +188,12 @@ static int pfcp_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct pfcp_dev *pfcp = netdev_priv(dev); - struct net *net = params->net; struct pfcp_net *pn; int err; - pfcp->net = net; + pfcp->net = link_net; err = pfcp_add_sock(pfcp); if (err) { @@ -207,7 +207,7 @@ static int pfcp_newlink(struct net_device *dev, goto exit_del_pfcp_sock; } - pn = net_generic(net, pfcp_net_id); + pn = net_generic(link_net, pfcp_net_id); list_add(&pfcp->list, &pn->pfcp_dev_list); netdev_dbg(dev, "registered new PFCP interface\n"); diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index b3340f8a6149..6220866258fc 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -1307,8 +1307,8 @@ static int ppp_nl_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; struct ppp_config conf = { .unit = -1, @@ -1346,7 +1346,7 @@ static int ppp_nl_newlink(struct net_device *dev, if (!tb[IFLA_IFNAME] || !nla_len(tb[IFLA_IFNAME]) || !*(char *)nla_data(tb[IFLA_IFNAME])) conf.ifname_is_set = false; - err = ppp_dev_configure(src_net, dev, &conf); + err = ppp_dev_configure(link_net, dev, &conf); out_unlock: mutex_unlock(&ppp_mutex); diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 7dfda89f072f..ba3ae2d8092f 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -1769,8 +1769,8 @@ static int veth_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *peer_net = rtnl_newlink_peer_net(params); struct nlattr **data = params->data; - struct net *peer_net = params->net; struct nlattr **tb = params->tb; int err; struct net_device *peer; diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index 09a4a5bf1038..f1212a9256f6 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -4404,8 +4404,8 @@ static int vxlan_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; struct vxlan_config conf; int err; @@ -4414,7 +4414,7 @@ static int vxlan_newlink(struct net_device *dev, if (err) return err; - return __vxlan_dev_create(src_net, dev, &conf, extack); + return __vxlan_dev_create(link_net, dev, &conf, extack); } static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c index 404cf05bd72b..c496d35b266d 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -311,11 +311,11 @@ static int wg_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct wg_device *wg = netdev_priv(dev); - struct net *src_net = params->net; int ret = -ENOMEM; - rcu_assign_pointer(wg->creating_net, src_net); + rcu_assign_pointer(wg->creating_net, link_net); init_rwsem(&wg->static_identity.lock); mutex_init(&wg->socket_update_lock); mutex_init(&wg->device_update_lock); diff --git a/drivers/net/wireless/virtual/virt_wifi.c b/drivers/net/wireless/virtual/virt_wifi.c index 26905b2b3ba3..f9d11a023313 100644 --- a/drivers/net/wireless/virtual/virt_wifi.c +++ b/drivers/net/wireless/virtual/virt_wifi.c @@ -524,7 +524,7 @@ static int virt_wifi_newlink(struct net_device *dev, struct netlink_ext_ack *extack) { struct virt_wifi_netdev_priv *priv = netdev_priv(dev); - struct net *src_net = params->net; + struct net *link_net = rtnl_newlink_link_net(params); struct nlattr **tb = params->tb; int err; @@ -534,7 +534,7 @@ static int virt_wifi_newlink(struct net_device *dev, netif_carrier_off(dev); priv->upperdev = dev; - priv->lowerdev = __dev_get_by_index(src_net, + priv->lowerdev = __dev_get_by_index(link_net, nla_get_u32(tb[IFLA_LINK])); if (!priv->lowerdev) diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index a05c49b4e7f8..63a47d420bc5 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -1065,7 +1065,7 @@ static void wwan_create_default_link(struct wwan_device *wwandev, struct nlattr *tb[IFLA_MAX + 1], *linkinfo[IFLA_INFO_MAX + 1]; struct nlattr *data[IFLA_WWAN_MAX + 1]; struct rtnl_newlink_params params = { - .net = &init_net, + .src_net = &init_net, .tb = tb, .data = data, }; diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h index 563a6a27436c..b22a106621fb 100644 --- a/include/net/rtnetlink.h +++ b/include/net/rtnetlink.h @@ -88,6 +88,23 @@ struct rtnl_newlink_params { struct nlattr **data; }; +/* Get effective link netns from newlink params. Generally, this is link_net + * and falls back to src_net. But for compatibility, a driver may * choose to + * use dev_net(dev) instead. + */ +static inline struct net *rtnl_newlink_link_net(struct rtnl_newlink_params *p) +{ + return p->link_net ? : p->src_net; +} + +/* Get peer netns from newlink params. Fallback to link netns if peer netns is + * not specified explicitly. + */ +static inline struct net *rtnl_newlink_peer_net(struct rtnl_newlink_params *p) +{ + return p->peer_net ? : rtnl_newlink_link_net(p); +} + /** * struct rtnl_link_ops - rtnetlink link operations * diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index 91df0f96e32a..a000b1ef0520 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c @@ -139,9 +139,9 @@ static int vlan_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct vlan_dev_priv *vlan = vlan_dev_priv(dev); struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; struct net_device *real_dev; unsigned int max_mtu; @@ -158,7 +158,7 @@ static int vlan_newlink(struct net_device *dev, return -EINVAL; } - real_dev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK])); + real_dev = __dev_get_by_index(link_net, nla_get_u32(tb[IFLA_LINK])); if (!real_dev) { NL_SET_ERR_MSG_MOD(extack, "link does not exist"); return -ENODEV; diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c index 39add538ba99..b120470246cc 100644 --- a/net/hsr/hsr_netlink.c +++ b/net/hsr/hsr_netlink.c @@ -33,8 +33,8 @@ static int hsr_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *link_net = rtnl_newlink_link_net(params); struct nlattr **data = params->data; - struct net *src_net = params->net; enum hsr_version proto_version; unsigned char multicast_spec; u8 proto = HSR_PROTOCOL_HSR; @@ -48,7 +48,7 @@ static int hsr_newlink(struct net_device *dev, NL_SET_ERR_MSG_MOD(extack, "Slave1 device not specified"); return -EINVAL; } - link[0] = __dev_get_by_index(src_net, + link[0] = __dev_get_by_index(link_net, nla_get_u32(data[IFLA_HSR_SLAVE1])); if (!link[0]) { NL_SET_ERR_MSG_MOD(extack, "Slave1 does not exist"); @@ -58,7 +58,7 @@ static int hsr_newlink(struct net_device *dev, NL_SET_ERR_MSG_MOD(extack, "Slave2 device not specified"); return -EINVAL; } - link[1] = __dev_get_by_index(src_net, + link[1] = __dev_get_by_index(link_net, nla_get_u32(data[IFLA_HSR_SLAVE2])); if (!link[1]) { NL_SET_ERR_MSG_MOD(extack, "Slave2 does not exist"); @@ -71,7 +71,7 @@ static int hsr_newlink(struct net_device *dev, } if (data[IFLA_HSR_INTERLINK]) - interlink = __dev_get_by_index(src_net, + interlink = __dev_get_by_index(link_net, nla_get_u32(data[IFLA_HSR_INTERLINK])); if (interlink && interlink == link[0]) { From patchwork Wed Feb 19 12:50:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982138 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 DE0EF1E1A18; Wed, 19 Feb 2025 12:51:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969493; cv=none; b=NXgGbIvE/PpiCiXlDdQURBqEiQk2feLk3uh0TF9zpwyc1iW4RZFsHqCz1E0zTIRqnbrkXnjb+2YH/RX3g6uTKTiNdBNefXV/tjte2cF/vgmB9l9pGa/udsru2bJoS+aS2lFpJj8bGZvS9dPlf0aX4y7zkCMDYj2fu2swsdapR8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969493; c=relaxed/simple; bh=wPBh+lm62MwNx5uxT7ebUmt4/Z+4/EESOV0PaYKRJhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sDQmV1cBdR/4BP7wab3zZslnhgpbcdrXrcbVeoVjNc+Zr+XOJjeqQGePEG7Lx3JKCqmfEJQ3t/FmloOwj+zNOR5MEQj39u+lUL/ymvBvmFkZOLf2YajWsyPLyV3BGndLrXtyrmaFD8f5TBzJBRO1gJHaY9k20yA0TrgxMGiliGA= 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=IqAKVtrs; arc=none smtp.client-ip=209.85.214.169 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="IqAKVtrs" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-220ecbdb4c2so2358725ad.3; Wed, 19 Feb 2025 04:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969490; x=1740574290; 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=so6ixpN3+kGL2R8Euj1cLc9vRqq6Wkcgz/xNsuJc6Sk=; b=IqAKVtrsIK9gPfYvB2qMyHNznqkv/bqL39s/TeYvl07ZnugiuA6iEKNeai4KI1M6G8 ICw8sihir6VBTGmR6m8LtIO9uBtzHXQxTgiZYXeYKH+cfufCVt74ziKaYs+NMr3boUOm eAGGBv8W7bpeBmsjvGVxIhNx8gj6KzXPS//YKVoNHbVoit5siXdtuzEe81ZilpbjIC51 ApjksghQhcb002RpAo9Hc9WO0Q8Qcnu1crjvqNlL16/5DGaqSrmlhWJ1NV+24BGyfwNs UDS4pewY33rqtWjR2ncQFgwhPywxfASXHHd9/1nJuwmhW9PGpVddb4ZO6o5BN85l+mGc 4iow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969490; x=1740574290; 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=so6ixpN3+kGL2R8Euj1cLc9vRqq6Wkcgz/xNsuJc6Sk=; b=WICITx8dW38A8p4vfYw64NcXz3zFVlHEw2wD+fePXjXyzb34NGPNlSzdht8JM6fNH7 U1EFom/XmbBSP9A1l6nm7wMXTrJjR3fD14ENwKQqVgoH9eM3j3gJL4InCG8QiIefHBVt lUSXJ9/dlITdw9VKVVVeXkroBnXK8ezgd8JN/uw0qn22+sgHv4fnC+Ie3vU6jBIZZ985 ibDy/tOvMSq7c9cLi46DjZN2RaKlYkpkMos0JoChawGDyrMDU1Rlm3NPZU0zjosPus48 YDDgNeEgM6E9H1LyYv0je/yMKfKRgxYCc04lEf0GFW4YOHEQ9VIyo1QuAB6V8n18buw/ NOcA== X-Forwarded-Encrypted: i=1; AJvYcCUTX5iYD4celzeoRnUPNXzhD0qjugCQ8dnrKQSjTqp14KH6r8GuOYiYBfn75hm6Gu4+7h4=@vger.kernel.org, AJvYcCUxcFoH08nYn6Ike5cSgoBX+AxuflvwwvhM6NLrl00NrxvCpOZyzbO+iyQt+TmFRhF05ODix6wl4HGoLw==@vger.kernel.org, AJvYcCWF8mseTqY3VvZmTT9+GYS9H/ZF3ZadpIhSgkwUerEv72x4I+ny94UKNxRJFWvyuF5m4hg6K2LIKhLiKwZ9gad3@vger.kernel.org, AJvYcCWpMeFmT0GlQFAQU3W8xF9hMRPY93Gfa+v5lJRAeU3ZJIRyIUEmEe21I7o2OViGYVu+U5eI72Yp2THV@vger.kernel.org, AJvYcCWpqL2+BmTFwAmiwD2InIlWDIAvNMAdCMzmHE5OPGDRcc1lH//NkRbSqAZZ2E5xYToFTaTXMGuYe5MUEU6m@vger.kernel.org, AJvYcCX0Zqt0Knq1/V8fVjFLrNGqh/BZwlgeo0nQlzF0gEqYS6LVmZ13gKMKPhyiGhEsn8QIGFOIzs+II6rFNg==@vger.kernel.org, AJvYcCXqa4DKLQ61oaFODfSX6zVnR44GsMSI3V/hzDf/w/Znv5lo8GKaeYTVUbrTit+HU+uX5XN24VMYCag7ahLjQIs=@vger.kernel.org, AJvYcCXzkzwDbk0YaZ1ml/FrUePO6kZtUpUCTjCRoIshSjltE1jl2yOP8YGI5ggMHPfVXDQB3G6JfkLaUpbq@vger.kernel.org X-Gm-Message-State: AOJu0YzF5793nj6pFhPx5qGD4s0kPRH0AJY6pxlY53aIWRWr+VCbmYve p/0MlQIDec0xOsf0iQ/pUJt/dm1aqRx6+9TN5+GEGBScGs5uizaRBh0qkV4IXTI= X-Gm-Gg: ASbGncvfhRn5+KnBSAN6Teg5/T+r9LZmP8ew2nVGFpLl0NROugO1yrm0naNt00zhwke QG0csqyg1TYi+uiA434zg6XeRiqjTl26/z9C8yb1HrykRRxyJSk2+riLtGvq1yKRT7ztpUquhOI hTffb3rUGyij1kyD3qr2qbwiT7qju0mnBrJYJPBz7Jx3zcQ5srHFS5Yxb2n4Ovfctlw9qqvwAj7 l8t5vi9wuUee6kxIjD2K8Flh5MfjMY0bFt++01czcZize9PkY/+Xh52c7pmI9p0kNHKeccvCZLR mTfDIA== X-Google-Smtp-Source: AGHT+IEqkCyGg/QTxep/fqv5CqcRvswNVHWV96b7TSvHtcfDnyWeYpeOAf5Az1bAxRJk7mW/W72uWQ== X-Received: by 2002:a17:902:ce0d:b0:215:a179:14ca with SMTP id d9443c01a7336-22103ef5861mr278510175ad.2.1739969490317; Wed, 19 Feb 2025 04:51:30 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:51:29 -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 v10 04/13] ieee802154: 6lowpan: Validate link netns in newlink() of rtnl_link_ops Date: Wed, 19 Feb 2025 20:50:30 +0800 Message-ID: <20250219125039.18024-5-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Device denoted by IFLA_LINK is in link_net (IFLA_LINK_NETNSID) or source netns by design, but 6lowpan uses dev_net. Note dev->netns_local is set to true and currently link_net is implemented via a netns change. These together effectively reject IFLA_LINK_NETNSID. This patch adds a validation to ensure link_net is either NULL or identical to dev_net. Thus it would be fine to continue using dev_net when rtnetlink core begins to create devices directly in target netns. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- net/ieee802154/6lowpan/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c index 704bf9e3f097..ee318d46817d 100644 --- a/net/ieee802154/6lowpan/core.c +++ b/net/ieee802154/6lowpan/core.c @@ -143,6 +143,8 @@ static int lowpan_newlink(struct net_device *ldev, if (!tb[IFLA_LINK]) return -EINVAL; + if (params->link_net && !net_eq(params->link_net, dev_net(ldev))) + return -EINVAL; /* find and hold wpan device */ wdev = dev_get_by_index(dev_net(ldev), nla_get_u32(tb[IFLA_LINK])); if (!wdev) From patchwork Wed Feb 19 12:50:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982139 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 80FBC1E5B89; Wed, 19 Feb 2025 12:51:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969501; cv=none; b=SiEkQKmojiuTDec4hYFRnX8nthpUzKNXcQ24ygQiFTt8VB/+o0o14pWbGopOP7k3Qj/P7I6bQzcIGYi7xHLjyVILtwaJP5lhpiTeRDRLbSQraJ5hr76hKv7v68OaN1GOrR3noqkGBcpF31uEj9UMCpmPyuLJqXNtqAR71RTgX5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969501; c=relaxed/simple; bh=jZGAovV5B1ykmJN882YjcynX9CWKmzmbJdKE/yIxe+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uBHQU7JPN2JKyBY2Ob7H2oD3HIs5SfQY8fsVj0jHMmYpVTsvP5wxTLh1mhPV2qBzy+ONjnoDgGPMo/jgch74kfciznnc2ofsYQdV42J94utB1duCVnBNvjCW71MAonCd0DzP83yLdMgPSw7Op7nshtAg98r6r2J0aW6UxnKi26k= 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=K3Xn67lJ; arc=none smtp.client-ip=209.85.214.171 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="K3Xn67lJ" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2211cd4463cso68153535ad.2; Wed, 19 Feb 2025 04:51:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969499; x=1740574299; 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=RiGtI+5ToMID9TUSdNCghgiM3EXs9/d4cQAhclrcdwo=; b=K3Xn67lJqBF/v6y6nw+wxUqYN11rEXrC1frgwzEHvTuAcbyTmVGrGd8echiwO+RVN9 yZhiQQwOcU0Sgj+QSLuV5zsyZ1Q9VYEyEEpTClUObrYK5eYZgqxjQy77TwnhRc1Q0YBG PSyuL/T7EIzZsj6+uz8/xqwkBMA+g9pmv7tVYJeD4Ctfhh7eKV5j4kVSfaXDL1CAgzz2 of3aebvDvjvrmQAaaKoa2A0dNofRlX4BsZc7JdwhEkINbbHivpU5s9+jduF+VD49IQeQ 592eXsJTa5MH3qhZIF3mz3+TxyO+R9wdEBVCeJQyvS/3BgSZBSkFVuGxuGmD0VLolzZU 3b4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969499; x=1740574299; 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=RiGtI+5ToMID9TUSdNCghgiM3EXs9/d4cQAhclrcdwo=; b=Q+QqXqNuvT5dDVSiPdNpL1bB9mY437qr56Yq9FasdkXTv2Aygkar/3P/gsffROtzaY ePbnZOLLq406GA1tm7H+UI/ZD9XrXfk6BvPmhPYqGgddedfURl9kNoV/k6wb820RhE8x zp56Nomv7sxi/esZ/60Ken6Lk34ezBx0bOxYXuYRePvlQDp8LAMyE21eris/c1Q6mD8u 44x/Pygdk1InJQJJDzR0rd0xNm887TsaSMhf7xBhz7HWx13R1CQ3uDWcQweFhKMlTAfK EKuYBSC5Xkny0+ziwaLEhQ+CbGQyT3WcgnVMZDeo6K5aGd0evZH7Ccdbm29RwE1oZM8l dNIQ== X-Forwarded-Encrypted: i=1; AJvYcCU3f6LkuQ+cV3KYmoKVlKbGmz17hQmp+1MSJBuXzC/UGDpYiLGkSUQjn0ZpSGO4J2JY+8oggYxtGkHSb4Gj2u25@vger.kernel.org, AJvYcCVJBnQ8PAcOcMMVXp8i+lUrk+eWcC8x/rI7GaWjpUdRSi2KFoJa9TfyyiK7B5NGRO90DBfZNJfg67fkQiSj@vger.kernel.org, AJvYcCVSwA6KVDNYTRmArPKQNyU4D+8dJ13svxYdxO6Y63OiJGh4XUBiV3HFFwptmQUHhf8c+whszT4XEK9o@vger.kernel.org, AJvYcCVfZFbfjtfuNHV6WSh6+o/svvHYmcJjXPJWvQdZyLzFwOLR2jVsbRNY03TJllT+D4xaOzjZdUOIClazUQ==@vger.kernel.org, AJvYcCWM78bwSDY8Ppgr/XtUA2zVHXe9kOjwaRirFpkGtiZ93rvyfH/0GvG6WKGOl3Y3reo3orotvLPq2MsZmQ==@vger.kernel.org, AJvYcCX4MEFhFy4vOgYJGyBhybk2pvgFI7I+R0ZbX9I/C/kbVAsqA2iDEZTqErgohwytd94y5ZfQhXC6KLAUSAgtZms=@vger.kernel.org, AJvYcCX6xb5bMM8RqEcYx9vxHqQmBu/ZP58RDX4Emc/kq4t31d76MAfWY78zw45AOMxdxHgSa3Y=@vger.kernel.org, AJvYcCXpkVYzf6TwZNHiFtvyrJ2vFE9/oqApxDlWGBRngd2Jn4u0Uz5/o2CGcc2CRondKAGrvsi2D0h49kOS@vger.kernel.org X-Gm-Message-State: AOJu0YzF4exJ2QHnVcRZH/u7mWSTdTMCd//TvvfRGPPCK3cHSxcVKevT eERGL2WsEXGcYFne9hWt+VqI0DrEVPB/stN3JfOveFImcANEjzBDaFHFl49m7I0= X-Gm-Gg: ASbGncsh2S2eAZvejACFfhqsocjGQtUj89kEx1esvSphnTYyypa8RWO5GLDuLe+rz4p JunK/btFa536s+i/7dIPRBAvhyPxgjphbXIoUUm9UQvzYm/BI/n2XuVT5fRU2F+npEC4GvPAbu6 PNWqJOkMckpm89WWa78/Ja+V1GeVADqaaTumALSnnAhl58PXFTjyhUlkurzcTyljnqsKtNLGwL5 VU9lyTDWXUihKK3eK0dLPeaHUoGBGShCy8A1JK08Y9+ZjINnc0LOSLXusGXQK4AvoVhrmFwH2LP BHIIoA== X-Google-Smtp-Source: AGHT+IFttmTeAFp7rRNlCvGNA6c3f8HloQtXmzYtg/s+sWnJsGTKFqc7jLE1fU4ek1ihZeJfgcA+rA== X-Received: by 2002:a17:902:ec83:b0:21f:5933:b3eb with SMTP id d9443c01a7336-22104087bc1mr237554135ad.31.1739969499276; Wed, 19 Feb 2025 04:51:39 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:51:38 -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 v10 05/13] net: ip_tunnel: Don't set tunnel->net in ip_tunnel_init() Date: Wed, 19 Feb 2025 20:50:31 +0800 Message-ID: <20250219125039.18024-6-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 ip_tunnel_init() is called from register_netdevice(). In all code paths reaching here, tunnel->net should already have been set (either in ip_tunnel_newlink() or __ip_tunnel_create()). So don't set it again. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- net/ipv4/ip_tunnel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 09b73acf037a..dd4b4e5be998 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -1326,7 +1326,6 @@ int ip_tunnel_init(struct net_device *dev) } tunnel->dev = dev; - tunnel->net = dev_net(dev); strscpy(tunnel->parms.name, dev->name); iph->version = 4; iph->ihl = 5; From patchwork Wed Feb 19 12:50:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982140 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 D45391E1A14; Wed, 19 Feb 2025 12:51:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969511; cv=none; b=GIhJLN+fZWZSXXRZhoJGPj9p9wrcSHlNbyTK/DqN70zp1vVufsL2+9ydvqEMFQW3IQ3cpcOcQCr+TTlEMvHT6//jcQw9dYi8dXoRJFG/YdeaBbXBSpkAkNj0Igu6E1aMmFfqiWKLsm/ny3joc0v0dB/ZNVYDOd54pVZ7tshtZ50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969511; c=relaxed/simple; bh=TB+PZXAS/vx8BG7x1KeG79/o2AKkUgqXidM5xP69mA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nvg1Q3OA2dLuBCDemBFpZgbNLMIGWdDFAXUCuMTmS/sSh9eW/B3MYest1Vg0qD8nVFx5YCxVa+w9SJ++Umbl70EhRa5DE9dyLOUv4kb67fJ4Z04ZXakodTQdujt/m3BI2km0wShG7h7rTGvNFtRrdSeMqGAcImLLTXQi0ZAc4WE= 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=lUnL246V; arc=none smtp.client-ip=209.85.214.181 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="lUnL246V" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-220d39a5627so97980375ad.1; Wed, 19 Feb 2025 04:51:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969508; x=1740574308; 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=Y8g2ZzjSkLAnV2rJAeqcq6uVgaF3+M6uyZFMb8BU5Wo=; b=lUnL246V0nSup/DnSHF1uwpze1YPSFu+IKjYijoxO9efDv+Xno8bqofJwSldOGKF14 ANU5yMoA4hBt7yXFedNsnhxQE8/JgRyZL+0qF2Hs7ybxCZBXmZ0TJZ/oFNe6ndUUqwQm AqxT+Zyrj2zZVe1fNsf2eGPx2ldlJf+KV7W704SLBouDJCrF/l9gPKIolMUWWU7qA7a2 zSmiOfQMLZV8BIqGYppIekaDyp7RxMLSm0ef3z1f4TqQygmRTRBFKGWvB6fAcf8SHIn5 TYtSRd35WV265rAYk/wFuo0DRVoW+B9bZuCHw4SMVRJ7BQW+AbQdcHbaNwvLG/pK7hbu jKZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969508; x=1740574308; 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=Y8g2ZzjSkLAnV2rJAeqcq6uVgaF3+M6uyZFMb8BU5Wo=; b=lIYkPz5eBnOJmCtcuy0s1EQSjOgRosNfbOlbNTnXDDO29iypUUhgMJVX0Hy6/RULca Xklm4YrrGFhrmmpKPSLdgnggBeOMKofX0rWnAGhECl0Kquq8Quop8FkSdmhzAciMnyCP Y8iNJ8bhychzUTfopkrNORYMuPrOxazWS2D1N5e8jvecdSMOg5+9rlaRSwBsKYkzOqpl QT4ZZ1vWi81CJRLwj/oBKOWWKhJ28NdY52ZdZ196B43YswpMSMlOhWFNbKA2XtqrMQ4Z gm9aRFwu2Tvyz64fwlrmU8NXnfoY+PfmAKwWvA5eQLBEOXjeesSMhWGrp6cvFy7IS3jJ 4AVA== X-Forwarded-Encrypted: i=1; AJvYcCVFkjzYCO1pt7UkgQRSGbrza3PkcuKpD/dY6rP9xbEoqDXM4WVTdVcHrpigOpaBiOEoUT8mGm3Y+Odz@vger.kernel.org, AJvYcCVaxv9FvMwb1+XyLty7HgVdoaLLOywyttShK+OeShIN0vfiyd0ru4ILpxLYuiL4SqKTBdzAU2O4cED4PvGPsA68@vger.kernel.org, AJvYcCW1NQ01DJcPlDM+PjFtnvjAMNdj3yLP/bMxFknDStqvPLIiyfLBbrV7zbQksgzJAaT3gbnIYQt6gmtf@vger.kernel.org, AJvYcCWCukGYV9pnFhP5DQh2wotPZEtisPOuoKXst/FSJ/i2VULpRimpu4ml7SKMJQpSunCHnOSgF0SSGuyi1I65@vger.kernel.org, AJvYcCWF6Xro3QoOM7aIch9XnwZs22nuGDsRhinX01zSq5RyZlOBXPhpvjX9z7sexSmrU47iUGGJJhw6Jb4mzg==@vger.kernel.org, AJvYcCXCgtlPdJOeuBguoWzrIIh+P93v2CyCsGB/hZegA+6MEG8bXAjZ+5ff87BRVbz+ih2PegM=@vger.kernel.org, AJvYcCXTJEV7MtHhCzEDVxhR4u3Iy19yL5LkkeKDDS/FFv5Tm78eipxhQNy7bJR0FIZXDiGJf3A/hk8CaGbeVwVRm9E=@vger.kernel.org, AJvYcCXUQVXRS8Z8OSfq32JdrSRVPVAUNf1wip4VMRzYQrhlaXahllQP/r3BKElWWINW9XhG8M5GNOHnJWoDlg==@vger.kernel.org X-Gm-Message-State: AOJu0YzrK7NnNI0HljjGkZS1ZlI8YSXLbMTRTdw4t/h+K6Rkh44TiHh0 Vk/WzVdRkgAm1Lpg9w/cTQosS4MrdNkFTw43ZgrcEImHRz0mXt4NN4Wvo6K/yWs= X-Gm-Gg: ASbGncthCU7toCPgGui/PfEFHMHpTVn+R13GRk5QfrQd2wf7AD/r5PpeWxeUlF+5wn2 CNrgsWu5zafKld+qqzvlhtpwdAApSrhEJtFLE6bx48y72/KT/doFER9Eo0zp+qYtkJVJGS7fXpl VDMvRn2fClFGpZUJyo3C3LXj2ONi1Rim9Ldyf+D0pSTCsSGb7OX9pIBpwYbJRdip2dNapBad9L5 b8uCnBD1eXauCWaMGp1nSrN+V4ggopAitSpu8cpOi9d4h0ZkcaBNTQjUnSpX3LB7QpyTzqFDW8q SSQ9LQ== X-Google-Smtp-Source: AGHT+IFYP0H8aiDg7L5uhsGsJLhgqrRsnWJTkGp9h+ijz9vj+qGa0NYcij3UcKBMYCMaV2Zll9Ie8g== X-Received: by 2002:a17:902:ec84:b0:220:d532:834e with SMTP id d9443c01a7336-221040255d9mr276303305ad.19.1739969508267; Wed, 19 Feb 2025 04:51:48 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:51:47 -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 v10 06/13] net: ip_tunnel: Use link netns in newlink() of rtnl_link_ops Date: Wed, 19 Feb 2025 20:50:32 +0800 Message-ID: <20250219125039.18024-7-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- include/net/ip_tunnels.h | 5 +++-- net/ipv4/ip_gre.c | 8 +++++--- net/ipv4/ip_tunnel.c | 6 +++--- net/ipv4/ip_vti.c | 3 ++- net/ipv4/ipip.c | 3 ++- 5 files changed, 15 insertions(+), 10 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 dd4b4e5be998..011f2a5aab3b 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; 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[], From patchwork Wed Feb 19 12:50:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982141 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 6A08A1E8348; Wed, 19 Feb 2025 12:51:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969519; cv=none; b=o5eh1WEH+2lLZbB84uEWBSe9wAmsmxHNMLnew3VjtoIVMnlJtjusXggjQjBx1W0hGtZj398bPUSTkXVtigMRqxZf9kVYZ+CBH3XgN7FUrd7QPFZ9ZOgbVSdOpUwsXTYdO1JXKyz+OaMMU8ydcYeTcFZtFrac/3L2k+xHLxSmbJc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969519; c=relaxed/simple; bh=VA66gTa0Qj/pMCkEuKNn0qYWFCRGp3U7y68sKrY8e1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FHdin1WUg6O/6b7gSmsbkX7J+CuFHfghnn0VzAShbko7ZckKQZkMwUV9ud1ffJ89UIktfRMhdQVZoP2OKEg3GX1wsBr9iQY3qTfTdkJAcOcMvtu0uZldSCGZGu42VkKyPjYZdmd78EnwmRZllWhvwyrQ54eNjNZkvRgCk+Sp2DA= 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=hBdqcVna; arc=none smtp.client-ip=209.85.214.174 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="hBdqcVna" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-221206dbd7eso61495045ad.2; Wed, 19 Feb 2025 04:51:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969517; x=1740574317; 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=B6bozwwxLUJNxVW5ZYXuCA298+o6a+m5Om77EOnyIyg=; b=hBdqcVnap1SvFAmPRCLl21kqRyfCUvsmatnwVX49ev8h/bvNRCRg2tE3+BzxQetcdr S/6lVTYbG+lAJqWAS+9tpj8rsqPc1D70Mxng++jmtwFkxe4YlbQaUTbXv7pPg95pTqze prLivo4vTVi8uZ1W7WMo/eeIg2Hncmo34VQFCpq5Bu+x1W2tlqNut2D4QFF0JREVslQ7 taHuklrS0Wv4MpOcKiShh0a33AGyIKHnTXNy/aTcwdRwfYiwUoDKDBRnpT69knRPg+2v MpGap4nLWmEsZhFYDF+NfjC91Cr/zHnCmdBbfYsbzSg2xdqDiCxRSmIwqe5+rvajHmQa sOgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969517; x=1740574317; 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=B6bozwwxLUJNxVW5ZYXuCA298+o6a+m5Om77EOnyIyg=; b=hszK9pggXwYEzDu8FLNR3cYSJ4uZ/NJehBYrslBfJFL7z2kgnh8o9IJiRKEaq6xNbo XSNSUtsEUOr56KIW9O5GhQaAHAl02C2CPx/FROmNTSrS+s/U+GrK1A7pnN0JL9gq3X+O 3i0jVeu9kgp33LZxy+IevIYgCvnoKopaQyNHp6rxvYyFPwfSHltHVzG1liWMZ5OKL7iZ a9G4f9IGzJQzEU300ATuXAO9TGUfQRUjs1foTlQu04vuo0QpvyYc3mRijQjr1jmAdgSL pBdGW+Wi1lqcD5a+G4SsY5ERAX0pBDVc5ytaL4vCbr8JnnSsImzA0sSkcj6l4i/Djarf OFSg== X-Forwarded-Encrypted: i=1; AJvYcCUxiaeBpc5+bco1sv+IdPY1rAo1M5GRyCRp5mMnjk5hjcBMNeylgr9wpY8kPLwklRnQ70tOmtL5iGdO@vger.kernel.org, AJvYcCVXHnZrqMmedRb+FEgR3GcZDbi0piMxUNDawNBNJieaIRH2pq/Ceb2aFODn7KkhFjGMi3glYPA3KaEJEB9J3A0=@vger.kernel.org, AJvYcCVaKihNMGgeC+WnyZsYC5B0uMvDizm49m7HwZuaVA+UbQAaVPDjCy2gqV2iZow9JshxFNnrLnjFx5BTsN3eFHll@vger.kernel.org, AJvYcCVehEhy3uaJqFNSa7/eZo69aK6MHGT5ghs/1ZiXuQ6kupaa22aR7ZRWCHNSogo9hJmhyETbjyyQ0zsnXg==@vger.kernel.org, AJvYcCW2fplYC9r6KugTvv67GyQjO53GuEBMbaN9k+/o29PUx72cs1BXgxvC40EyxttXqRmC6nQ75MNB5or7@vger.kernel.org, AJvYcCWKoq2B24nfcCbrIY1LfLgSf21wqNl3A4emyVSjcDZ2773ZmP/MtZITNFJFZTe9HFaPWQM=@vger.kernel.org, AJvYcCWkoNb3X69N2ZYk+4SqLd8mPMyGG6UVSTJxxwGr96GwhfT7NX9QM9Ra7heebtZWsEFVfAOBAha5gSoBRQ==@vger.kernel.org, AJvYcCXGJYmrHwWZGKUUaZ0CFRREIwWnQDZM8w7/i3Ngot2vBw3knstlR4ArwnHUtDwPyIc+Wlb7Jbok1NTo2Azd@vger.kernel.org X-Gm-Message-State: AOJu0YzOUdPlKCOSIOofU6wNKoUXyh+gW8aGrciEChlwslCVxB6NgVjv U/S2ffTKwF6HSdBObTbXzqLKD8ILUWiDtw7izO4L83kgVFkFBRGGeeZxcksJCw8= X-Gm-Gg: ASbGncs5jWVP4LxHk2kptM8svHcaijb4wjVBMPlqWoMasU4vOWheXz+SgesjaKZJDx2 KeWb4ddSy0KYMRkYvTE7aE6vNQ3kzt3FICrngKmBE3W+goTggHG5O8xh1XqLVxkdRsBFNusEYS6 t1CaT5C1bpvkYRXn3+6pMsnor/Z3pd1GvCCi4oOQJz0b9p0AinKMbEX42ovayW/DL+3mVWJpnKf 6oWzJRq4WwALTgVJWD4S9bdnInpHJjDPyF6VXU+01sS0YmtA6t6ikVYP1B15JVkpnCUW34U3Mm/ E9wUKA== X-Google-Smtp-Source: AGHT+IGKxW3/SlkXIFQ/R+7OZM2jJGBrIehyvby3inig7425vAO11UDlInuUnZBsT6heGdokKuXecQ== X-Received: by 2002:a17:903:2305:b0:220:fce7:d3b8 with SMTP id d9443c01a7336-221709654admr66486875ad.12.1739969517203; Wed, 19 Feb 2025 04:51:57 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:51:56 -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 v10 07/13] net: ipv6: Init tunnel link-netns before registering dev Date: Wed, 19 Feb 2025 20:50:33 +0800 Message-ID: <20250219125039.18024-8-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently some IPv6 tunnel drivers set tnl->net to dev_net(dev) in ndo_init(), which is called in register_netdevice(). However, it lacks the context of link-netns when we enable cross-net tunnels at device registration time. Let's move the init of tunnel link-netns before register_netdevice(). ip6_gre has already initialized netns, so just remove the redundant assignment. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- net/ipv6/ip6_gre.c | 2 -- net/ipv6/ip6_tunnel.c | 3 ++- net/ipv6/ip6_vti.c | 3 ++- net/ipv6/sit.c | 8 +++++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 863852abe8ea..d9e6b1fd9917 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -1498,7 +1498,6 @@ static int ip6gre_tunnel_init_common(struct net_device *dev) tunnel = netdev_priv(dev); tunnel->dev = dev; - tunnel->net = dev_net(dev); strcpy(tunnel->parms.name, dev->name); ret = dst_cache_init(&tunnel->dst_cache, GFP_KERNEL); @@ -1882,7 +1881,6 @@ static int ip6erspan_tap_init(struct net_device *dev) tunnel = netdev_priv(dev); tunnel->dev = dev; - tunnel->net = dev_net(dev); strcpy(tunnel->parms.name, dev->name); ret = dst_cache_init(&tunnel->dst_cache, GFP_KERNEL); diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 54b843d20870..111a8777c2f7 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1878,7 +1878,6 @@ ip6_tnl_dev_init_gen(struct net_device *dev) int t_hlen; t->dev = dev; - t->net = dev_net(dev); ret = dst_cache_init(&t->dst_cache, GFP_KERNEL); if (ret) @@ -1940,6 +1939,7 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev) struct net *net = dev_net(dev); struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); + t->net = net; t->parms.proto = IPPROTO_IPV6; rcu_assign_pointer(ip6n->tnls_wc[0], t); @@ -2015,6 +2015,7 @@ static int ip6_tnl_newlink(struct net_device *dev, int err; nt = netdev_priv(dev); + nt->net = net; if (ip_tunnel_netlink_encap_parms(data, &ipencap)) { err = ip6_tnl_encap_setup(nt, &ipencap); diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 993f85aeb882..16e0d74f99dd 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -925,7 +925,6 @@ static inline int vti6_dev_init_gen(struct net_device *dev) struct ip6_tnl *t = netdev_priv(dev); t->dev = dev; - t->net = dev_net(dev); netdev_hold(dev, &t->dev_tracker, GFP_KERNEL); netdev_lockdep_set_classes(dev); return 0; @@ -958,6 +957,7 @@ static int __net_init vti6_fb_tnl_dev_init(struct net_device *dev) struct net *net = dev_net(dev); struct vti6_net *ip6n = net_generic(net, vti6_net_id); + t->net = net; t->parms.proto = IPPROTO_IPV6; rcu_assign_pointer(ip6n->tnls_wc[0], t); @@ -1009,6 +1009,7 @@ static int vti6_newlink(struct net_device *dev, vti6_netlink_parms(data, &nt->parms); nt->parms.proto = IPPROTO_IPV6; + nt->net = net; if (vti6_locate(net, &nt->parms, 0)) return -EEXIST; diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index e2bd52cabdee..20453671ac50 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -269,6 +269,7 @@ static struct ip_tunnel *ipip6_tunnel_locate(struct net *net, nt = netdev_priv(dev); + nt->net = net; nt->parms = *parms; if (ipip6_tunnel_create(dev) < 0) goto failed_free; @@ -1449,7 +1450,6 @@ static int ipip6_tunnel_init(struct net_device *dev) int err; tunnel->dev = dev; - tunnel->net = dev_net(dev); strcpy(tunnel->parms.name, dev->name); ipip6_tunnel_bind_dev(dev); @@ -1565,6 +1565,7 @@ static int ipip6_newlink(struct net_device *dev, int err; nt = netdev_priv(dev); + nt->net = net; if (ip_tunnel_netlink_encap_parms(data, &ipencap)) { err = ip_tunnel_encap_setup(nt, &ipencap); @@ -1860,6 +1861,9 @@ static int __net_init sit_init_net(struct net *net) */ sitn->fb_tunnel_dev->netns_local = true; + t = netdev_priv(sitn->fb_tunnel_dev); + t->net = net; + err = register_netdev(sitn->fb_tunnel_dev); if (err) goto err_reg_dev; @@ -1867,8 +1871,6 @@ static int __net_init sit_init_net(struct net *net) ipip6_tunnel_clone_6rd(sitn->fb_tunnel_dev, sitn); ipip6_fb_tunnel_init(sitn->fb_tunnel_dev); - t = netdev_priv(sitn->fb_tunnel_dev); - strcpy(t->parms.name, sitn->fb_tunnel_dev->name); return 0; From patchwork Wed Feb 19 12:50:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982142 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 B37F01E834B; Wed, 19 Feb 2025 12:52:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969529; cv=none; b=aFQv1sLCuBmFDrMhSVoob5I5ZtyNXTX3Ab+VTSHt0JUGgnMMxuOwECfLDqkMUQBQV7tyHHjPsvDTX2/mEa9l+SZ0HTAYSGUfYcZF/BpNNJQzxIokdZShyZBoiq5v22M5Hr07NtzymqNVsjxKKDgKPBT+Hv1PLMzmd9qTm2T+r2c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969529; c=relaxed/simple; bh=WnqzfYihIgH7CnlxbfGoXmbwDyB/yLwFF1VQRuUd9SY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oEDRwJffGduQaL2Ncpu6JE0c4f0iXp2VT5xm1xip3LRal+/UPG5Hij6xG6i414yjw0iT/jw73bC90DXsGoLX0gzSPRhcMm4HmAG9IIZylmp6cTzak3N4xDC5Sq0W2J2RnYayVg7TjMsQO3CmAWsVTeK+Ar6vCX+/YWHutDkAR3A= 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=HWFXqjxw; arc=none smtp.client-ip=209.85.214.181 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="HWFXqjxw" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22101839807so92273015ad.3; Wed, 19 Feb 2025 04:52:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969526; x=1740574326; 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=rsYd7KiB2vQaWNh0ASWhN8pl6PDFq3SaA7EkmHtk6YM=; b=HWFXqjxwR+Fx+mMWPLq85kKQMAr98hYpYLF5PyO3X/EEuuMAbxS5OMh0hVT0U1bVsV H3MqQGzZ28Cey10+iFPoGo/iPUqLHQ5KIOt0Yw5vG8QZbd6EG/tNfw2Sim0H1Bx2ypWO 2N0uBy64v8sKzYiIR8V/5KKX2Nmhli1j7Lj+I316Ft5cr6OmJOlwj7Gy+Lgr/iXvIbvT pNy0G8fqw38Uz7fqzsmsUS5H92EaQhGHcCxTEQikKASTadQQFRbGhwrzHwABTJkHNqR4 10CJIrbbdKdKJaA6IlHSk8F52bUWA+o8bV3JDrz+9yrAv+K4T3uHxwvNRqSFtC3OiqfQ yIKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969526; x=1740574326; 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=rsYd7KiB2vQaWNh0ASWhN8pl6PDFq3SaA7EkmHtk6YM=; b=LS3a/jvUKwmLPyud9jr8bPcnaGB2nEl3xmbxmRWXXRyLWJXXjwLxPiMM8ae63ds1ua ao0itUFBWQedYUllDHUI644nhJt3WXZc/vrQ5F1uoXr2wQOcU0yKZL9KHDp84sPFG535 ugtpJNHFO660Dp3MCmZk6xZ19RZvJS+aI7U6deoUOCEdzv5II55AuYLJwE1jsPBH9Vl1 LqVbJPg/a/Zp9PupcdHgz/zB/jzYMcAdN9E/kMuzhGlFjvgDBSdM83ISNWoU/BwMqsfV /MNUOWbzwXmhvAocZbmzbAefUSwcZA5Nhz8vcTV9rC81WHa2WRpxPj74T5NWGmEhtRNp Z0Lg== X-Forwarded-Encrypted: i=1; AJvYcCU7zDAy3gjJxEflw57PqWeo2/DhnkDIIaQkagDgSPzuVQ/q9WvyRk66PljLiZGGILNmqeUgv7Us3JAg@vger.kernel.org, AJvYcCUvVU2eAd8uoaGqZiesgTVXVxcYa4sg5OP/UMeZzFU+mzLIEXX/aExXTIL+2n0pRDTPSoI=@vger.kernel.org, AJvYcCVCNBAUgOJ+3SKhEDKNGEHdpQEJSQWAaslJAuxPKSn/VQ0z6ym+3LMwyzZPNAIvVIo4yyLHNXmmlOrP9w==@vger.kernel.org, AJvYcCVPpq/3SovDndAYomqoSusDs3Tm91TcRyEjzQ8SO0JohvJmXBuwN5Ta32mltGlFE9HRJtp9rIMJjKfW8dba@vger.kernel.org, AJvYcCVwzeWGsbeuOBuCdWhlZ6Gx8SWiAQXAla6dLuq7+BD/nwJDU0S/U5q2JAEXLxaJgltgaC1FWPUBCo7ktP+8hUHM@vger.kernel.org, AJvYcCW5TElMvRi0ZKoje0D/PM2xNWJWchT82FasB2OcTxovpvVyriVS3BeF+id6pxbSCF8WlTKnJ6fqlt4hZA==@vger.kernel.org, AJvYcCWT6T+/1VJ5rrMeeVgEqtX9n8c4zwbXYqQxUNpBb+GJqSMvm1m7ZWimvsXjENAQu2DFC52qg/Zhurbs@vger.kernel.org, AJvYcCWaqom69t2+UD6x+mUi39muDvcbiwpO5vGqPUOHFAJ3sqXVlcborVTjh1cW3bFv4lvVYCD4XdqFyLvpokwgpIs=@vger.kernel.org X-Gm-Message-State: AOJu0YwvunrFre3Sdt1RHCV1RAAL8wqt6+ZuXhZQcg9aOovms4HdDMFl 9aT6CzAN+pcidL6nmK47ZetXqpkRdUy0sH3saolKwACOfpsMnIMvf72u1WbYHjI= X-Gm-Gg: ASbGnctGEd+AX09VIMaVCTE7LiAhn1TS2wFxK2/3bA04IlE/TEMx9cYqDY1nOfdKMxE a3OXVuQLB+yKZcFnsKuBacuV3bGjPY9belxgem8t42At0udpg/1XtLmeTm0EV/ct5kEW2DtmodF 1Cct3DRtodXvm5e5BW8Gw8vFkzu/EBzxUluwtK/rCqkXCZiI+CyO6lEuRlJql+FsQzynZAUdwAM PnKkzyTHr5kzi/JT0Aw+VocQD6nrhlNHdIQnbquYCj7+J9adLQ9Hw+A0LDIbdt+TcKS8gJq1pLA FrHxAA== X-Google-Smtp-Source: AGHT+IEmzyu5IbJEeeDhw+tXRaZzlcx6HaVQuXOtrNDJjpviTChMhHRF4glLxd0ys0/eE/gPyp4KqQ== X-Received: by 2002:a17:902:db0a:b0:21f:8677:5961 with SMTP id d9443c01a7336-2217119d382mr58688885ad.34.1739969526138; Wed, 19 Feb 2025 04:52:06 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:52:05 -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 v10 08/13] net: ipv6: Use link netns in newlink() of rtnl_link_ops Date: Wed, 19 Feb 2025 20:50:34 +0800 Message-ID: <20250219125039.18024-9-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- net/ipv6/ip6_gre.c | 14 ++++++-------- net/ipv6/ip6_tunnel.c | 9 +++++---- net/ipv6/ip6_vti.c | 6 +++--- net/ipv6/sit.c | 6 +++--- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index d9e6b1fd9917..d31a4ce3b19f 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -1969,7 +1969,7 @@ static bool ip6gre_netlink_encap_parms(struct nlattr *data[], return ret; } -static int ip6gre_newlink_common(struct net *src_net, struct net_device *dev, +static int ip6gre_newlink_common(struct net *link_net, struct net_device *dev, struct nlattr *tb[], struct nlattr *data[], struct netlink_ext_ack *extack) { @@ -1990,7 +1990,7 @@ static int ip6gre_newlink_common(struct net *src_net, struct net_device *dev, eth_hw_addr_random(dev); nt->dev = dev; - nt->net = dev_net(dev); + nt->net = link_net; err = register_netdevice(dev); if (err) @@ -2007,11 +2007,10 @@ static int ip6gre_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *net = params->link_net ? : dev_net(dev); struct ip6_tnl *nt = netdev_priv(dev); struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; - struct net *net = dev_net(dev); struct ip6gre_net *ign; int err; @@ -2026,7 +2025,7 @@ static int ip6gre_newlink(struct net_device *dev, return -EEXIST; } - err = ip6gre_newlink_common(src_net, dev, tb, data, extack); + err = ip6gre_newlink_common(net, dev, tb, data, extack); if (!err) { ip6gre_tnl_link_config(nt, !tb[IFLA_MTU]); ip6gre_tunnel_link_md(ign, nt); @@ -2246,11 +2245,10 @@ static int ip6erspan_newlink(struct net_device *dev, struct rtnl_newlink_params *params, struct netlink_ext_ack *extack) { + struct net *net = params->link_net ? : dev_net(dev); struct ip6_tnl *nt = netdev_priv(dev); struct nlattr **data = params->data; - struct net *src_net = params->net; struct nlattr **tb = params->tb; - struct net *net = dev_net(dev); struct ip6gre_net *ign; int err; @@ -2266,7 +2264,7 @@ static int ip6erspan_newlink(struct net_device *dev, return -EEXIST; } - err = ip6gre_newlink_common(src_net, dev, tb, data, extack); + err = ip6gre_newlink_common(net, dev, tb, data, extack); if (!err) { ip6erspan_tnl_link_config(nt, !tb[IFLA_MTU]); ip6erspan_tunnel_link_md(ign, nt); diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 111a8777c2f7..89d206731af0 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -253,8 +253,7 @@ static void ip6_dev_free(struct net_device *dev) static int ip6_tnl_create2(struct net_device *dev) { struct ip6_tnl *t = netdev_priv(dev); - struct net *net = dev_net(dev); - struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); + struct ip6_tnl_net *ip6n = net_generic(t->net, ip6_tnl_net_id); int err; dev->rtnl_link_ops = &ip6_link_ops; @@ -2008,12 +2007,14 @@ static int ip6_tnl_newlink(struct net_device *dev, { struct nlattr **data = params->data; struct nlattr **tb = params->tb; - struct net *net = dev_net(dev); - struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); struct ip_tunnel_encap ipencap; + struct ip6_tnl_net *ip6n; struct ip6_tnl *nt, *t; + struct net *net; int err; + net = params->link_net ? : dev_net(dev); + ip6n = net_generic(net, ip6_tnl_net_id); nt = netdev_priv(dev); nt->net = net; diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 16e0d74f99dd..83c055996fbb 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -177,8 +177,7 @@ vti6_tnl_unlink(struct vti6_net *ip6n, struct ip6_tnl *t) static int vti6_tnl_create2(struct net_device *dev) { struct ip6_tnl *t = netdev_priv(dev); - struct net *net = dev_net(dev); - struct vti6_net *ip6n = net_generic(net, vti6_net_id); + struct vti6_net *ip6n = net_generic(t->net, vti6_net_id); int err; dev->rtnl_link_ops = &vti6_link_ops; @@ -1002,9 +1001,10 @@ static int vti6_newlink(struct net_device *dev, struct netlink_ext_ack *extack) { struct nlattr **data = params->data; - struct net *net = dev_net(dev); struct ip6_tnl *nt; + struct net *net; + net = params->link_net ? : dev_net(dev); nt = netdev_priv(dev); vti6_netlink_parms(data, &nt->parms); diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 20453671ac50..f7b59bc957d3 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -201,8 +201,7 @@ static void ipip6_tunnel_clone_6rd(struct net_device *dev, struct sit_net *sitn) static int ipip6_tunnel_create(struct net_device *dev) { struct ip_tunnel *t = netdev_priv(dev); - struct net *net = dev_net(dev); - struct sit_net *sitn = net_generic(net, sit_net_id); + struct sit_net *sitn = net_generic(t->net, sit_net_id); int err; __dev_addr_set(dev, &t->parms.iph.saddr, 4); @@ -1556,14 +1555,15 @@ static int ipip6_newlink(struct net_device *dev, { struct nlattr **data = params->data; struct nlattr **tb = params->tb; - struct net *net = dev_net(dev); struct ip_tunnel *nt; struct ip_tunnel_encap ipencap; #ifdef CONFIG_IPV6_SIT_6RD struct ip_tunnel_6rd ip6rd; #endif + struct net *net; int err; + net = params->link_net ? : dev_net(dev); nt = netdev_priv(dev); nt->net = net; From patchwork Wed Feb 19 12:50:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982143 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 A530C1EA7E0; Wed, 19 Feb 2025 12:52:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969540; cv=none; b=I3+s25tRQNnZpz/uJ8RlnX05TkuxZcdvegyMaBQoOGn1Yyq/OGmuuNVGKm0hfh3hC6NxA8uo2K9A1+8osBn6m3AGe9IaEeAED85mpZh/GYBvkwcqKXgxKUOUbk3j4AnVeP9yCARDcUon0lnQ7Wj1JooT9daRfFzASL2Q+lKedL0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969540; c=relaxed/simple; bh=aKbzZxou1uG+4UzTz9mjeL2/4viaECGZ39kotodArQI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i4evghoBhyuibrMjvYsWkA+349BjGCL/Ivr6gFC4A1p32Q6I0mVdq6PiXRmbRU11WbSLB4+pfdZyy9kI/E2GCe82qWZFtwdHEY8yi04L9MUUo/Bg8Edxu3ynQ2o8sUmoAVMDnE3DXGWiwvDR9D0A4//05Jg/bWOmHNsa6FXJHgU= 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=mkW2EAVG; arc=none smtp.client-ip=209.85.214.179 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="mkW2EAVG" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-220c4159f87so88471855ad.0; Wed, 19 Feb 2025 04:52:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969535; x=1740574335; 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=PyZ7Oa5HQm/CyDGlUAOCpKikT+Z0UZAcxIZ482ECX9g=; b=mkW2EAVG2SDFpUc2/3W1ZP13c2TWgVCY0ZlFIZDrllX3jjQIACXrPRQVR0aOaFTM+B hMN9nRun84zs6s5VeESbB7f0AVe3ZTJJ93kacpY27r3G98QGZiWU1kYnnQxlxKc2CoB+ Mkv7MRsVqme/RBQFkLc26BwZZ3UG4BwM+4W4rXjOVEQyllrFR7yWxryli5NCJEby7FNy 9v9O77fAyXC37CXtsGGJn4/8D2DDRYcgQePsZCsY6r2sJnPYpuRqviK/8xrjNt7AqIQA n69qNiPYVfofOLAf4SMl9NCktgfSAZM/BXfMiHpi4W9sof3wMMBCRY8vM/Bx9eqJ6+N+ BNoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969535; x=1740574335; 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=PyZ7Oa5HQm/CyDGlUAOCpKikT+Z0UZAcxIZ482ECX9g=; b=Ws3qFVlkVLpXNnPrGCfA9UbvSW6bdD81ChIvZrRE9bm9Qy6DEFg3CnlZxHRhLc2kXS fe5LCctlNGDwxUlVL9SBaK0YAqjJpt7tiRq6GWCsAjn6agySvhvEpe1ur9UllSja+ySj valMOcpnlAAPi7vOFMX8oVHxO0RgcVB2Jd4xhD1oscGLhvcvXLY7QI4mlnUbgpUe8y0T hXOSU+PWN7xx+mTR1lTv+EBBFLqDWthKpxYjIkv1/8+5UZ2D3umk1YW4s2zuE7DoonXv ONwtrMRhC1jw1YfWp5SicdWWxh0Dw4I/JMcDF5FRpEuG4FxriV5SQwAQDt1yO6qKhMjv covA== X-Forwarded-Encrypted: i=1; AJvYcCUEWVqsA7eMIqEk813crIGzdVEDlSAiNtlTk/HSjwLWozo7LWbN+haIE/2myzS5Jg0JjZZgao0c3Ry2L/jJB1nT@vger.kernel.org, AJvYcCV5RwGCsBFDGzXKZeYESqvbkMLFPah78mW95XUI4BX305x4Ay32V9+vSaSfekI25Rxia2xSoJrHbtUxO5CB@vger.kernel.org, AJvYcCVeCQBYdQPCr6uBLQDApVwCarradWFtdCpkL8EC1N1D3+XR3a95Hbp5B5Gk/hS2h8QJQiT+hytxaPhn@vger.kernel.org, AJvYcCVlc5bbw78DLMnukeAdu64hZ7n+uVYc1r7KeUA9Cw4OQcimwZzQafOrGlusfb0fIDlc1ftlLVuU0Qwbyw==@vger.kernel.org, AJvYcCVv11Ty1dp3aBHteCL80t4f8bzPvW0w+7ciuXxxnNM+88UQjJnkspmqzxvSPAyA6tmxjrXI4bE72Pa9aA==@vger.kernel.org, AJvYcCX7AnxbU8FKvmfwx2IkqBkagunOAJvjq8koDDWBhc8oFabn2iB89ALHf6W7SYLYWdh50EOdd6GXtx2swH2dBjs=@vger.kernel.org, AJvYcCXq3LAhEWDkZ6R3vOllJ2mONkv8tkzlynvXUQeELYy/KTSH0bLrR4FfYyRPWy7QpU63hAY=@vger.kernel.org, AJvYcCXszeWLnxq1cEp+CxFoHKG7PzSHLu7zKymfNnv4sj70wX3nTY7F1TnGlL3C1S8YPjx+qR2H9vl7/ffl@vger.kernel.org X-Gm-Message-State: AOJu0YwyPyJbJLZGPCsxVhvf8eGimNG6rhgPzVeOgLkdkUGXaYesCf2F bnopN3datwS5NaW+F98AKGWnuNuV4zWeZLW2UoW0d1NFHJKvpRDgwvBaoqv40SE= X-Gm-Gg: ASbGncsz7OAkw3aINqEZvx0afovCiECVhu3+OFipUExXqapPECUlUwKSKLprblpR94q g+M8k+k8ZoMeRq8oJU66EsKu8GcEQZHTuK2z04FX/es7dGMLBmRDTDvoPd91bdRIc1DKd/5t2jR uP0dkp6IW5TuFPLfSS8QScEjhI/1Jhc14Tpg2mATHibi8jKpaJCLl+cDkTBV0BUIRo/KN56enJz n/p00fDirCRBl4knCM37McdJp1YtUtWoVMUyhKEmb6PQ3vsIQZIp5Cfq/6V3Om/E3QAU7RlWkdD FKMrVw== X-Google-Smtp-Source: AGHT+IGEFP67zSY2isKHwZ8c/HiTSEQrpqN9J90h0hy0pUrJ6TwQBaUnsvMftR+A8p8DsBy8+Vg8gQ== X-Received: by 2002:a17:902:d502:b0:21f:dc3:890e with SMTP id d9443c01a7336-221040255fcmr244598235ad.18.1739969534802; Wed, 19 Feb 2025 04:52:14 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:52:14 -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 v10 09/13] net: xfrm: Use link netns in newlink() of rtnl_link_ops Date: Wed, 19 Feb 2025 20:50:35 +0800 Message-ID: <20250219125039.18024-10-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- net/xfrm/xfrm_interface_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/xfrm/xfrm_interface_core.c b/net/xfrm/xfrm_interface_core.c index 5659a6cadd51..622445f041d3 100644 --- a/net/xfrm/xfrm_interface_core.c +++ b/net/xfrm/xfrm_interface_core.c @@ -242,10 +242,9 @@ static void xfrmi_dev_free(struct net_device *dev) gro_cells_destroy(&xi->gro_cells); } -static int xfrmi_create(struct net_device *dev) +static int xfrmi_create(struct net *net, struct net_device *dev) { struct xfrm_if *xi = netdev_priv(dev); - struct net *net = dev_net(dev); struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id); int err; @@ -819,11 +818,12 @@ static int xfrmi_newlink(struct net_device *dev, struct netlink_ext_ack *extack) { struct nlattr **data = params->data; - struct net *net = dev_net(dev); struct xfrm_if_parms p = {}; struct xfrm_if *xi; + struct net *net; int err; + net = params->link_net ? : dev_net(dev); xfrmi_netlink_parms(data, &p); if (p.collect_md) { struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id); @@ -852,7 +852,7 @@ static int xfrmi_newlink(struct net_device *dev, xi->net = net; xi->dev = dev; - err = xfrmi_create(dev); + err = xfrmi_create(net, dev); return err; } From patchwork Wed Feb 19 12:50:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982144 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 05A741E834B; Wed, 19 Feb 2025 12:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969546; cv=none; b=umdYnRf4JRrqmPWUFAnsm2sozO7oBA7az6rb9lRIAv39zTFPhe2/XSCsYNHpKQs+qeMXuylMEL59FqmRnBm2avbHNISoUdNe1kIY59HAWH76bzgo3lvLqILOCziokJsOSeb+HitA7Ud5yNdUQVz+2Khi9NFz7y/aCZvNaGMR8uc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969546; c=relaxed/simple; bh=vrqN/QDiEY3adtUjiHJ4zc9O1wCwDFXuoMcSbYrSEaE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nTM8qv3HXLN8y67e7xqntzaR8wstN25PxKRP82XfIRQdrc/08px8gfwuIkR3C+ZHbr2rc+aTZAD1aqX5DJLi6xL7u7gzt+TMV7M6fnvLZ7s6rTPxzM331oNHh6hBF/gmIxxptlec1F8qX7mszavVASfrRzwR/SVXopAO/4u0eic= 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=bbYCuAO/; arc=none smtp.client-ip=209.85.214.169 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="bbYCuAO/" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-220bff984a0so120192085ad.3; Wed, 19 Feb 2025 04:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969544; x=1740574344; 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=HRequyiks98F4TvQO/vmtwESixnPXuO1TfB2/aKs1TA=; b=bbYCuAO/uPM/IAbhFhD0C8uVo+R70cult+/NQ5+tcP77DsIA2Z0vSjQnakXFXInxRc prK96zFSCARaa+l9DWe6xKsPbLZ4N5xQH3XlPMz55x4LpMnCdq0c4w5lpePiegNUr5+H XMmi324sskK0zPQF8C9D6x09yl22+MtHJACNbvri5uNRXFQ4peSl+ku3BKnUgqCbK4ko AzsxsVbdJgwWEbbGCaDuITa6j+//fYBkAj2uQOCvgxTQcYqfRyxtA5UCE163vkFa+c1G Fmbpiaway7M7UVT+zTuPEAt08l6Bdp+0nEJ/YyOOd9nGZeiMbIc5Fvko3whVVZzHYrDY Zf+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969544; x=1740574344; 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=HRequyiks98F4TvQO/vmtwESixnPXuO1TfB2/aKs1TA=; b=L1knVZws6WmJ+dKG/mEM2TdmygUWUANsuStfFhzpbWEM5ODCNAoXreQNQrYl3Eyw6i HEXoqjQwiRbxXSu/9BhO7c5Fj2CukVMkKccOkMj4+hsWD8fbAssNxH3pAMO3uwTIikwb eacC04Q4v9LWb7j/0PMlexcr9NM8OTixMBpYnny7ine1bR4fZAQEz7q7+CLHX/cKUS3Q ivZK6jMBDHATVF+H47Tf8lE3Qpt8A5In1ebCzW1e6EHpC826y3PMN4eONlrnBv9Nyr2C Sxp6wTGimoia3oyEOMUufLUxb+T5//8evrqy0hGW04EFCkvlIO85zH/1grEwCQ1z40He nMoA== X-Forwarded-Encrypted: i=1; AJvYcCUYBBYvDoXQzsOpjJ2b0KGI4RsFBbErEsfDcW7v7fcGG0nHmB7s86iVfPv46SavK20weEUftT0Jo0QO@vger.kernel.org, AJvYcCUbT2/4Bnfn0n46fo2wPL/aQkZieUReQ1M+XrWEHypkMaNQl7xBdt2XYEBPoV5KidtXyFwCkpLwxpCN@vger.kernel.org, AJvYcCUds6RlnyvrQcltWnbFMiiWsUSfTicFMz1wexCRwhwtsFB6urOgfY4uM0/+tOM7g/8pS1Y5gqZkau3Fpg==@vger.kernel.org, AJvYcCUgL1o8xbjUKOatF2Pk7RkDy4FwLfT4m8ThJwjYfQ+CMLBKdxy9APkhE1gdcySZWUYI/SF7AGwpnjOXwlcYmty0@vger.kernel.org, AJvYcCVIQiFK0DShtd6Br6t/jgv2GBfBeHBsFtv7bloSp4Jyabl3WYZks/9GWMgiNG61yGxrYPlVyXXolMREqNTY@vger.kernel.org, AJvYcCWd74sf/8mPC4NRpWuKCrdZikU+fZgkFR/PVCIgzhTONZYQHNJiXohFZIkS0Bqg4pxXUj8=@vger.kernel.org, AJvYcCX8ASXmlI4P/ExrQuHqOhScTRHJepktNI6OkkvfAh0UU3qR595JWGj971Wf45JcNzl5Nsmc4ZWToteyXSAwjgg=@vger.kernel.org, AJvYcCX8BM3yxhSKb4bUO/ihAlNvNhFBzp+ZhCahVWAMy5xMCFm36ntuM/Gd4camEpsxVRL17q25ixQeOhIJOw==@vger.kernel.org X-Gm-Message-State: AOJu0YxLJ6PQk+f1sjekIzH8NY3GVjp+WLHDKm2K51gCSnBMjxftnuSD HGRI0q64MeaytVhRhrGD5/bn4TXOgxyVDKHt582Dq6TWp1y/iDY97VEbL3SWo+c= X-Gm-Gg: ASbGncuKt5MfL2vceU8WtlTDxVgphCFhjuwfsxayDf4znqIyHvOHorGsfAT5h5IlMrb khhZ/dvjFxLYAr7RSLJimD2qGQZDWE/xCj8bFqg69bRlhafIA8FaX5DoO1IovobPZktiqLQtbL+ MbMqTSW7PXh3WvYjwO6M8YguoT53ql0JcjMCEaWIB3TKnTuK0BukniCuTZ3pH+JoA1e/rLE/xcf HyvNyyBIbdnQqLYljtgdjyc7gXhFjYbPtbsQUeCc2GvXf0cDSlI6+PUUAse4WghbMCXlxjzM5uS qw087w== X-Google-Smtp-Source: AGHT+IHnb5v62m0BvDxfIowP9iMNtE/Y7pYhM/eIGIlagffbyppVP0uCqTnvfVFz3C1LICvyxAmpug== X-Received: by 2002:a17:902:e841:b0:21f:564:80a4 with SMTP id d9443c01a7336-221040a9a0emr294098225ad.33.1739969543796; Wed, 19 Feb 2025 04:52:23 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:52:23 -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 v10 10/13] rtnetlink: Remove "net" from newlink params Date: Wed, 19 Feb 2025 20:50:36 +0800 Message-ID: <20250219125039.18024-11-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Now that devices have been converted to use the specific netns instead of ambiguous "net", let's remove it from newlink parameters. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- include/net/rtnetlink.h | 2 -- net/core/rtnetlink.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h index b22a106621fb..ec65a8cebb99 100644 --- a/include/net/rtnetlink.h +++ b/include/net/rtnetlink.h @@ -72,7 +72,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh) /** * struct rtnl_newlink_params - parameters of rtnl_link_ops::newlink() * - * @net: Netns of interest * @src_net: Source netns of rtnetlink socket * @link_net: Link netns by IFLA_LINK_NETNSID, NULL if not specified * @peer_net: Peer netns @@ -80,7 +79,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh) * @data: IFLA_INFO_DATA attributes */ struct rtnl_newlink_params { - struct net *net; struct net *src_net; struct net *link_net; struct net *peer_net; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 9ebbde0d131c..e980481bdd28 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3798,12 +3798,6 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm, dev->ifindex = ifm->ifi_index; - params.net = params.src_net; - if (link_net) - params.net = link_net; - if (peer_net) - params.net = peer_net; - if (ops->newlink) err = ops->newlink(dev, ¶ms, extack); else From patchwork Wed Feb 19 12:50:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982145 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 8606B1EA7FB; Wed, 19 Feb 2025 12:52:34 +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=1739969557; cv=none; b=c4roXaXt4f9TxIUTrcbBQ7FOW3+NGWKPTpqcujAm45dbqTc32r7sh/zKbUyCc6rQsOfg21xANB0PefEWySiXnFG+WhX7nxgK6vp3kDHTMOMAjm2nxRKXV5ZI3VX1i0ifaEMMQameI0yfv466SdP98HCNQK+n3pni7yuja++WWVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969557; c=relaxed/simple; bh=Ued/MDbt2p6tJKKcyAlb084zWv9B8seAzSAzEKvzX0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J7bNhiGzxuMTepNOfd2rGCBos+uTjTwtOjOvZb5noWgd1BgzLX7IFDcTbCZ6Sc01u01oZLGjC6vslXzAt/JSaQ3XbwVkqJDis7wrGB6ezsGD3srapqacwyiqiRKPuDUUYYVM0M7VCWYOHacUfb80JoPtlnDmo0AoASoAcpd204o= 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=NFOUGuoF; 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="NFOUGuoF" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-220c2a87378so94581645ad.1; Wed, 19 Feb 2025 04:52:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969553; x=1740574353; 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=14Wr2OB3TipJqOg2i3ltQmzAxlBlaCt+7msGZ+i4teQ=; b=NFOUGuoF1R0BnFRPOqCzz7ykPhyP6RzETufGkgm65RmPZXD8bqf6UezhEKxtcHBrxd bWDsFMqkVqmM04/19saJNEBubCbUV9928Kb7nOix9MGAqOijTOfLRdDtBnIb4E0Z421Y 5XcR9D+xvtNwV71GcMk3KY9wah1Az8OaPbwVlgJK5UXsZfxia1mFx6hofSaNdbnujZt0 q9VwAMjG3QTdsA8/vpdCQIDPXgv4KXVZh7iFThkM7fz2eC8Ij/QR3vY/BJZLFRRPYe6E G4MsvSEe0UWjPaBrrRKELn5n71l7ZVwmVOUznhcrSs8Xh336OBq6dgvjAGLmKPIVHGSI BEiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969553; x=1740574353; 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=14Wr2OB3TipJqOg2i3ltQmzAxlBlaCt+7msGZ+i4teQ=; b=N7XOtn8uUdBBfCVyuhzskCnvzkTIjRGMrPEswmIoYJAjVl/39/Wv/VFw0Qd9jkc0xN hw7ghbKUlEMvE+g91xRZCaZC05vcD5VSzrXYTHde5qZUI0H8DAI8q5WW0hBw9pN7oTNJ n3n1CffLDaMc/Q77e5ka9dJEHjU0I+mEjzw8kk313Gdqply+2D07f7anPNpKEAZOwa2L A3erLNyuIsVGPVFVPlgiLoQMc97qPwIP6kFoEHTsAa+DjRl+/+oB0LMMDqbpkv2SuEZl 2q30bKXEtUW5iwnwrj7TMSu+fG5MPNAckuV/QBMKCyO9+HU7rYuL8/m5KV9kjpwpe5bo /Yeg== X-Forwarded-Encrypted: i=1; AJvYcCUqx3LtOZmNb3mvgKgIDCDfW9zJ9J/kmGdgdFQqDHcYxG7cufc1+OKlPKDyAtVKedFJVxI8Z8nyMFU077M+0ma/@vger.kernel.org, AJvYcCUvIEKqaFpJ1lPT/Mxe6+8Xa1EMH0nUSUe8VtkO/pGH6/rVEQGi1TOg3P3PUp2+K1eMP75uRumSQI3c5g==@vger.kernel.org, AJvYcCVSXv9qs114vVDDXAHzQp7+tlYV3XvlFOX0yCedzH2J9CBHQ1/pvHlnpcpl3pGepL4MahX7Nu/V2BNhps0w@vger.kernel.org, AJvYcCVm00JFfSrfMrVYU23JyXsDpfZaZ/jhrQKQFRJxIYTWLk8YbXgrnqfeflv+hhD8/xmjxPs=@vger.kernel.org, AJvYcCWgdgVSQ4FgS9LyElKWqCH6XjOkfRNN5lelu1AuHe+cqMynvBHXljmbhY7C777RCqdlS/iWLI5bR6Cg@vger.kernel.org, AJvYcCWthQUgT0+yhupzMitjKVy56o7/d3F2Ohh7z85jgjv6Iv+xhpGzTF6InH9PdyQF/9fMsYd0AkfXJMo4hw==@vger.kernel.org, AJvYcCXSXivTmuf+yELwUuRsz8vmVLTyWeVwYf1Ocs5WsjS2Z2CGrryxiifN1MZNUJ51Qw+GyO8mtg1bX6pQ@vger.kernel.org, AJvYcCXWB6bpBqCU5TfD0Jk17BJ/w07ht4Jw6Yz5tkU8DPTL0/0Wql17e+jvvR6cnhY9iKK4azbYa/hVF7JmjPNKlwg=@vger.kernel.org X-Gm-Message-State: AOJu0YzH71oFzQDYwqHCliQEaHp/4Z8cULGIJNN+1Be7ZzJilw2spd3f JiRdcdkMAuyYcqWDN6kqGsUZKuQl9UIrc40Ds4+H5rnxeA+Qwc30vJm13r9Z X-Gm-Gg: ASbGncuHPH1zV2DMjmiXTaQ8d+0M/rQmFXSl3Zi3dPMktnleeeO9gw0JF8C1gU9HYyg /2szSW/Jr9mmAd6xn1BHWDNQJCeFue48PC83GB/33OllPf+gCmzgEQo6WoRo8BY6u7wxSHhDo0M akD4jo7cBr8m2zltFT+C5qjhvwQKXjfASUngsBzbzWEKgn2FBTLFTo/N5Oq65oNTgPhPtxSdM3x 2bshSU5YoUXXDCbx8HPPhr82VxVmVrHAKY0joN73X+LkGPyR+jG0U2lcyE6F/Iujir7LepbKPfB n3QHiw== X-Google-Smtp-Source: AGHT+IE1TMZXqzhrHhhVSaIMtrPumBVmrpPdtKnId51KbxVQ9NXXxJP9rSJ1kBfk/uhAUxck4sNSxA== X-Received: by 2002:a17:903:1a2d:b0:220:c813:dfd1 with SMTP id d9443c01a7336-221040bd77bmr298031085ad.36.1739969552787; Wed, 19 Feb 2025 04:52:32 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.52.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:52:32 -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 v10 11/13] rtnetlink: Create link directly in target net namespace Date: Wed, 19 Feb 2025 20:50:37 +0800 Message-ID: <20250219125039.18024-12-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Make rtnl_newlink_create() create device in target namespace directly. Avoid extra netns change when link netns is provided. Device drivers has been converted to be aware of link netns, that is not assuming device netns is and link netns is the same when ops->newlink() is called. Signed-off-by: Xiao Liang Reviewed-by: Kuniyuki Iwashima --- net/core/rtnetlink.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index e980481bdd28..b52e610e157e 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3789,8 +3789,8 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm, name_assign_type = NET_NAME_ENUM; } - dev = rtnl_create_link(link_net ? : tgt_net, ifname, - name_assign_type, ops, tb, extack); + dev = rtnl_create_link(tgt_net, ifname, name_assign_type, ops, tb, + extack); if (IS_ERR(dev)) { err = PTR_ERR(dev); goto out; @@ -3810,11 +3810,6 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm, err = rtnl_configure_link(dev, ifm, portid, nlh); if (err < 0) goto out_unregister; - if (link_net) { - err = dev_change_net_namespace(dev, tgt_net, ifname); - if (err < 0) - goto out_unregister; - } if (tb[IFLA_MASTER]) { err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]), extack); if (err) From patchwork Wed Feb 19 12:50:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982146 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 5EB4A1E3DE7; Wed, 19 Feb 2025 12:52:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969565; cv=none; b=CVY9wtKrSm32R/M/dY6VriIGpiSOcAzbL70axbv9StasaEVR7XGagG5xbQzpIRD2+HW6vqI5eMDzgH1cHeEFod0cG/2hqfRggMRY24fx3poTCaqNSRADT8PB2h1sf1WwDl9wBQGdLEG6inhcSDK8Dw9Sz6/Gn1m2Fx2xoCa/Fbk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969565; c=relaxed/simple; bh=d5YqzA1/hOIwxn+aPZBjNIWViPAXuH4DTCUtu2j0BLA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aIkDJDgNmBEOWl0Ypat5/TRHUh7QYmxPpMBa7tCJVu7K2OO2gWCAbka33iZznABQORJ/vy5n4TG7BDnGNE17pLuzFaS6QhpY+YlSTOQfSzBb/3f3hfIZjpwypP7Cx7yeMG7nhcgWaCK+UCH3e+TcHfZkm8QY6lKmJDwfe4Hn3rM= 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=XRoOiMNE; arc=none smtp.client-ip=209.85.216.53 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="XRoOiMNE" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2fcb6c42c47so1358452a91.1; Wed, 19 Feb 2025 04:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969562; x=1740574362; 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=h02RoEg/neSt/B+WrRVdIe6OiEkHR+ibxktqvHMDB4Y=; b=XRoOiMNEA5nlmQjsaluC8FmB83TRr12P3FH9/2uOpeg1O0xdxx+89DNwOViuJggJPw 67LOuu6KoHXBdizFr+mBEwE4j4r9J+aCVCJq9+MtAJ3QeVw7uw/IfPj9uDVeQZPMFw3m X3JwNUriD4UesMyl/gv70l9h2jw/s6uQ+v8i+oOTOQPzi3J4AIkvQbj6s3OXJDqU8/Ip WvaJHBgunrYMbKo9590Ti+WsFNK1VYb0YpwN/NiRYGAZ6wOgf62Y3SeMgBLU/EODJ+ww LJJfLHtspYbaKF3z24XiFeQzQjQXVoBkE+pEMNAZu9FKBAtJKbVkKOFW2Jus0/NHOHYU PNyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969562; x=1740574362; 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=h02RoEg/neSt/B+WrRVdIe6OiEkHR+ibxktqvHMDB4Y=; b=qxTTVaRciIyFxOLYJLBuX27dSDVRk9FguwrJXwxaY5UNWVoAAcub3ookwpdSWsBk4Q s4U+tP6NJOfbNh5Pdah5QpDMbyKErjyX2OnOUEcbT5Gigj//gHBiYJCsqWiWjfuzwpMH 2KEwonwpb6hquEtO2U/1PdXoluUnTQJjjLIq7dHnDvI5/8njGlE27Re9jtfQgaQvnq7d Z303oSqB10niKf5VUuCrFRxXbSeoPmrVw5iUcPVdKDWc2r3sEEDx5pzMwUngTGKzr1+c 0BM0hcXcGJbdHEjlCU9EiBmofSjhlAYcAwXcA7Ychb0KOFK4RKyQZOq1RIYk3vahNgm5 Nuuw== X-Forwarded-Encrypted: i=1; AJvYcCVHbnh4j2UJTE7NnfasZtuqjgTJTY17WmVSxq8s0zJQfPL+RJgdWbvtmDdpoqVAlNZJSkFhpToaMs97xA==@vger.kernel.org, AJvYcCW831ieJxjB68C26RqnP+xhYQIlPJBdqZQg6GP6QChDivhvRezDGUubcV4eP0w80ON6tpyLnT5AGkKFaQ==@vger.kernel.org, AJvYcCWC6D8tTjYzO8+hyqPpHLy189tvILJZ0fomh5c0nn7+oU4gylPcVSUX/ijTakkOD4J9DCRLGzRSit9T3aIG@vger.kernel.org, AJvYcCWu/uqwGbeLqQ+352HoAPZw6oZWQgM9FEN2Zy0xSAYHLKwxp3ieiQnoehWUUrbqw8ZXI8P5aq2yjMQA@vger.kernel.org, AJvYcCX0hyhFsDoVWeoAvUIgurfNG/2gyLsgKLtd+LtZWYnUGJOAFZKg4NBmVQZPee7lOMjOtok=@vger.kernel.org, AJvYcCX9FqNzgL7C+AxkMqiJPKbv8sLubiy4sRXQeWok5QkgwG/mWFGFFfeUpTFs00r77XJJjkbjeE9kkthn@vger.kernel.org, AJvYcCXY6ZwNOhwpRf8Sayq9COebHqI9CVgw8RRatz+qGjKKTftvJPj/2YFsAdtLXrFDe1xc9s7hdGaJeQCBwfZiTM8=@vger.kernel.org, AJvYcCXfnsfPTUuZqk8OK8z/irPrwA3xENfXW/XtRA+RjA3A7pFYImLhIkrAG6CvnnUtgUXCNtIjiVH+x5iSRMtpMved@vger.kernel.org X-Gm-Message-State: AOJu0YxGTyR1kKC/eIQK4OvYpAAI4w560/Y0G2PTJ4IfUP6H8V3YUHUu NeFK0LIqg4PZVFwKBSBDlze4eO3YqJ6BrufYb8AIX6LqxCz6aF6q/QHp8KNp X-Gm-Gg: ASbGnct6pPE++9k3dtjYeoKTxZfNc1C7DXi+YvgeikXDcM83aGCVc3F7hDyNzYHU33d qBMu+85LKDgy9tJHu2b2k/oDjQhRujQcUUC6Z8w8lD6hWi5lKmMdyfR/U14zKfh1F1WQkRPlI9g UZQEW6QSy82wkIqyjUKPf4vsebQJKSnnYVVNgao6FhqparN77oVmq9zANPJU2z1lITkOC9AFq6N 3r5TYBvDjY0GEHsmmq7Ehuyc8zB574PtSnjz+OOxzhpAlCi/yPS0RJjvSzlcI+2s9v81IAJlka8 TmI6Yw== X-Google-Smtp-Source: AGHT+IHPqeS3VaEOgvZ8Tx3PUVaGMIEIbKpPjORqTeM6yeMS+BbAs1PKrGLT5/zDq05f9NI0VnGgXw== X-Received: by 2002:a17:90b:2887:b0:2fa:1a23:c01d with SMTP id 98e67ed59e1d1-2fc40f26600mr24663034a91.21.1739969561721; Wed, 19 Feb 2025 04:52:41 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.52.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:52:41 -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 v10 12/13] selftests: net: Add python context manager for netns entering Date: Wed, 19 Feb 2025 20:50:38 +0800 Message-ID: <20250219125039.18024-13-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Change netns of current thread and switch back on context exit. For example: with NetNSEnter("ns1"): ip("link add dummy0 type dummy") The command be executed in netns "ns1". Signed-off-by: Xiao Liang --- tools/testing/selftests/net/lib/py/__init__.py | 2 +- tools/testing/selftests/net/lib/py/netns.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/lib/py/__init__.py b/tools/testing/selftests/net/lib/py/__init__.py index 729457859316..8697bd27dc30 100644 --- a/tools/testing/selftests/net/lib/py/__init__.py +++ b/tools/testing/selftests/net/lib/py/__init__.py @@ -2,7 +2,7 @@ from .consts import KSRC from .ksft import * -from .netns import NetNS +from .netns import NetNS, NetNSEnter from .nsim import * from .utils import * from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily, RtnlAddrFamily diff --git a/tools/testing/selftests/net/lib/py/netns.py b/tools/testing/selftests/net/lib/py/netns.py index ecff85f9074f..8e9317044eef 100644 --- a/tools/testing/selftests/net/lib/py/netns.py +++ b/tools/testing/selftests/net/lib/py/netns.py @@ -1,9 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 from .utils import ip +import ctypes import random import string +libc = ctypes.cdll.LoadLibrary('libc.so.6') + class NetNS: def __init__(self, name=None): @@ -29,3 +32,18 @@ class NetNS: def __repr__(self): return f"NetNS({self.name})" + + +class NetNSEnter: + def __init__(self, ns_name): + self.ns_path = f"/run/netns/{ns_name}" + + def __enter__(self): + self.saved = open("/proc/thread-self/ns/net") + with open(self.ns_path) as ns_file: + libc.setns(ns_file.fileno(), 0) + return self + + def __exit__(self, exc_type, exc_value, traceback): + libc.setns(self.saved.fileno(), 0) + self.saved.close() From patchwork Wed Feb 19 12:50:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13982147 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 094891EDA1A; Wed, 19 Feb 2025 12:52:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969573; cv=none; b=YHyqw72w0KYiMqtLgsyQTF/pGimH+gRIDU9G2bLkHKSyaH+87z8A4ak6/l1q3OoxR2PXY4Era4JpT9SMxuKQl7r8oJZgSYqrgFq4ohkAjWPEgVrd+76Vjw9OoZURiGl3+HBMnaxkBHzwkgIUD4x5rJECs9SC+Q3DErTqrRF9XJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739969573; c=relaxed/simple; bh=jqz5blGUX5UncrsSac4ngco/AKqB1xIOiCjAuaEMTY0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IC9p6rrHOZP6U5EEm4Fdyom3DVFOBn3JndV+xApaj6ET9nH5ZLd6cvJkeFpsVMd08Ml0Ow9bATiDjL9pyr7U9rdRmvAAiw/UlS7XvGFF/knv+fWRJ0MENgSnOoBi/mmCJ+wOSC75WlDqigGwOdLHj3AxA6KrmyvOUOKi0UhZ7Zk= 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=U4Zhxt4w; arc=none smtp.client-ip=209.85.214.182 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="U4Zhxt4w" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-220c8cf98bbso135197225ad.1; Wed, 19 Feb 2025 04:52:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739969571; x=1740574371; 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=Qx8bg1rA+gp6wNTCNpkIOzYNrMU90JwyPLUIFRVvz8E=; b=U4Zhxt4wkWLZNEUdriEmY4nt1U6QODPGEGdOWFd9SYyAS/nxTfidywYkZ6ubu3DG4+ fxsNNL7dD2aK0EjlUsX6L/LFXNxuKAyahEASlZEzbscVVUnGXU97Q9nx7SM1CKXVxNuh qp0NFRZkXNgB9eNYubxXcpSK2IDla9H/bho2M81Dt7r5QM4IQ16sAf6HirYG5hFzQUxg 3XgiCArjTeOFhXS1Kr0mgA6tmHGEt1t5GxQZxs4UN4sgHSfdUupBMD5X0n38rrds/TBy TVgXloxArrLyXw85Xlwqe8nEIPrwYnNAUmLKQ/0lg6wYNwMYwsUpzGYqmQLaLRbkhKP5 xjjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739969571; x=1740574371; 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=Qx8bg1rA+gp6wNTCNpkIOzYNrMU90JwyPLUIFRVvz8E=; b=do/S6iYXwKn/lAiCEW9jhLeSnJ41LGKqFLz3uhNfP5h+lMx/lwJfhGrzWXzIo3Bgf+ 3Sc1o+r5vCAaXuAR8HDSFjuGhhk7Uwtk5t1dnyBCxBmQ9T3SjL/4aPjX8Y1pit2xpPpZ bZtJVpAcoyw0PCcU68AD4CFzku5gIOK43upSsMUElNv40SDl1LetcvtE35J24w6aJHOp uYsDl2tg3njcVZHHzBokMOT4l3CocGIwSUA4OY2hp43WlwD749NqMk8htsubbT9WuUqW A7xiRJdZx/Ks+wPkBUcG0pgxgKHCSoes9PjOWnaRtwUmqLV7HDdBVnrBQKaTkg1rYaO6 Emqg== X-Forwarded-Encrypted: i=1; AJvYcCUl4CSDdABPIYAP/mZBXAIZ9S+Ne6VZ7cwEuTJ7Xoc4Vj3WE0XRfCn7kbcdCOiFCGZLYJBjxSdCxBRv@vger.kernel.org, AJvYcCVg5ssw7cA5Y4/fYPCcT8jMvfAFCF+ne7zoeGrfjVj3Cc0oK9Zp9lks2k/0ErnL1trt3Puo/YkTROQFithgHExD@vger.kernel.org, AJvYcCVmCJ+TJCazkHIR1TNMvpRAPpkrTa1vcDeQ9PAiylf7sjLpt3POkfiCQie6XyaXo3D69oP6YhUSE4QSfA==@vger.kernel.org, AJvYcCVtaMhJlRGuZe1nY3lj3zQkxKBJq8sUfYnW1X64jFCSOeA+r3rf+7zWm5iop/ApBVZChPB4c/uV6bOmqw==@vger.kernel.org, AJvYcCWMQwUAelExnT2fjXH8vas4yuuZNjqqOfDMpZkWyXWoaJ3OOPsEHPeyuUGeORbMQCcqNXU=@vger.kernel.org, AJvYcCWYEuWdKNnLEq2CBvXkykJNu/TV48GCIjJpOM6gXPEFN6UDbCZfeiwLIz+xlbElz/YJWpX4CYHPZei3@vger.kernel.org, AJvYcCX9j6ndoyepFmcT2VLbLz5XlyXvLr5M493MNsT2Izm/1vZk27b1uwQXLiMiOFgWBSfKUHnWM1xAnvZxtC7T6W8=@vger.kernel.org, AJvYcCXQiX6EVq0pYLKEuooztkPIWwMinVspuRBY+VPA+ZCDUxP6ACMbmWuHK8X/XKGYqaKzxUEOTMolfV+4ZJId@vger.kernel.org X-Gm-Message-State: AOJu0Yx5R2C2JSYpTGvH3Oul56YBFuDCxBOHR5UpEqp5w1qZFUf30C7y Vwn26gm1J73ltiWcIAdr01qIqxsnku/+p5onmTUjJ7UM8xj2EsF8alW6YioT X-Gm-Gg: ASbGnctoOTWBVPFFZYGKrvxQiBahIVCfLhX9XTZrpTR0l7CTKJPbHaeBhjRSBMGoZEt 3cr0GvLuaWxYIXDGjF+fZbig9jG7/ewCUPc2XAfv0BeYkDFhW4khmnCWrWGR6l/IaVysUzrx0wm A74UWwrkicZkVCgxwmRck6MSsy/wLHAydNncAvyJe0VXvi6cyoXH8UKKF/kHWQygkklemlSNH2u hqb0NZ89HHFKKY3dtwUgx/l3o7g767tjmoEHtSvpNR6Cjub1JYJ79kptNT4Q9yzmw+T0PNbhwIU Yejx4g== X-Google-Smtp-Source: AGHT+IFzy5Z/oqAXsIcnrbdGOPINebfA49h4xYVAFBGwVs0inyqERb0A/6qA2oCD1QD2DsUmBu7oEA== X-Received: by 2002:a17:902:f706:b0:21f:35fd:1b57 with SMTP id d9443c01a7336-221040be680mr277312185ad.43.1739969570774; Wed, 19 Feb 2025 04:52:50 -0800 (PST) Received: from ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536436fsm103427175ad.64.2025.02.19.04.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 04:52:50 -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 v10 13/13] selftests: net: Add test cases for link and peer netns Date: Wed, 19 Feb 2025 20:50:39 +0800 Message-ID: <20250219125039.18024-14-shaw.leon@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219125039.18024-1-shaw.leon@gmail.com> References: <20250219125039.18024-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 - Add test for creating link in another netns when a link of the same name and ifindex exists in current netns. - Add test to verify that link is created in target netns directly - no link new/del events should be generated in link netns or current netns. - Add test cases to verify that link-netns is set as expected for various drivers and combination of namespace-related parameters. Signed-off-by: Xiao Liang --- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/config | 5 + tools/testing/selftests/net/link_netns.py | 141 ++++++++++++++++++++++ tools/testing/selftests/net/netns-name.sh | 10 ++ 4 files changed, 157 insertions(+) create mode 100755 tools/testing/selftests/net/link_netns.py diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 8d6116b80cf1..aeb96c085614 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -36,6 +36,7 @@ TEST_PROGS += cmsg_so_priority.sh TEST_PROGS += test_so_rcv.sh TEST_PROGS += cmsg_time.sh cmsg_ipv6.sh TEST_PROGS += netns-name.sh +TEST_PROGS += link_netns.py TEST_PROGS += nl_netdev.py TEST_PROGS += rtnetlink.py TEST_PROGS += srv6_end_dt46_l3vpn_test.sh diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index 5b9baf708950..ab55270669ec 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -107,3 +107,8 @@ CONFIG_XFRM_INTERFACE=m CONFIG_XFRM_USER=m CONFIG_IP_NF_MATCH_RPFILTER=m CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IPVLAN=m +CONFIG_CAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_VXCAN=m +CONFIG_NETKIT=y diff --git a/tools/testing/selftests/net/link_netns.py b/tools/testing/selftests/net/link_netns.py new file mode 100755 index 000000000000..aab043c59d69 --- /dev/null +++ b/tools/testing/selftests/net/link_netns.py @@ -0,0 +1,141 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import time + +from lib.py import ksft_run, ksft_exit, ksft_true +from lib.py import ip +from lib.py import NetNS, NetNSEnter +from lib.py import RtnlFamily + + +LINK_NETNSID = 100 + + +def test_event() -> None: + with NetNS() as ns1, NetNS() as ns2: + with NetNSEnter(str(ns2)): + rtnl = RtnlFamily() + + rtnl.ntf_subscribe("rtnlgrp-link") + + ip(f"netns set {ns2} {LINK_NETNSID}", ns=str(ns1)) + ip(f"link add netns {ns1} link-netnsid {LINK_NETNSID} dummy1 type dummy") + ip(f"link add netns {ns1} dummy2 type dummy", ns=str(ns2)) + + ip("link del dummy1", ns=str(ns1)) + ip("link del dummy2", ns=str(ns1)) + + time.sleep(1) + rtnl.check_ntf() + ksft_true(rtnl.async_msg_queue.empty(), + "Received unexpected link notification") + + +def validate_link_netns(netns, ifname, link_netnsid) -> bool: + link_info = ip(f"-d link show dev {ifname}", ns=netns, json=True) + if not link_info: + return False + return link_info[0].get("link_netnsid") == link_netnsid + + +def test_link_net() -> None: + configs = [ + # type, common args, type args, fallback to dev_net + ("ipvlan", "link dummy1", "", False), + ("macsec", "link dummy1", "", False), + ("macvlan", "link dummy1", "", False), + ("macvtap", "link dummy1", "", False), + ("vlan", "link dummy1", "id 100", False), + ("gre", "", "local 192.0.2.1", True), + ("vti", "", "local 192.0.2.1", True), + ("ipip", "", "local 192.0.2.1", True), + ("ip6gre", "", "local 2001:db8::1", True), + ("ip6tnl", "", "local 2001:db8::1", True), + ("vti6", "", "local 2001:db8::1", True), + ("sit", "", "local 192.0.2.1", True), + ("xfrm", "", "if_id 1", True), + ] + + with NetNS() as ns1, NetNS() as ns2, NetNS() as ns3: + net1, net2, net3 = str(ns1), str(ns2), str(ns3) + + # prepare link netnsid and a dummy link needed by certain drivers + ip(f"netns set {net3} {LINK_NETNSID}", ns=str(net2)) + ip("link add dummy1 type dummy", ns=net3) + + cases = [ + # source, "netns", "link-netns", expected link-netns + (net3, None, None, None, None), + (net3, net2, None, None, LINK_NETNSID), + (net2, None, net3, LINK_NETNSID, LINK_NETNSID), + (net1, net2, net3, LINK_NETNSID, LINK_NETNSID), + ] + + for src_net, netns, link_netns, exp1, exp2 in cases: + tgt_net = netns or src_net + for typ, cargs, targs, fb_dev_net in configs: + cmd = "link add" + if netns: + cmd += f" netns {netns}" + if link_netns: + cmd += f" link-netns {link_netns}" + cmd += f" {cargs} foo type {typ} {targs}" + ip(cmd, ns=src_net) + if fb_dev_net: + ksft_true(validate_link_netns(tgt_net, "foo", exp1), + f"{typ} link_netns validation failed") + else: + ksft_true(validate_link_netns(tgt_net, "foo", exp2), + f"{typ} link_netns validation failed") + ip(f"link del foo", ns=tgt_net) + + +def test_peer_net() -> None: + types = [ + "vxcan", + "netkit", + "veth", + ] + + with NetNS() as ns1, NetNS() as ns2, NetNS() as ns3, NetNS() as ns4: + net1, net2, net3, net4 = str(ns1), str(ns2), str(ns3), str(ns4) + + ip(f"netns set {net3} {LINK_NETNSID}", ns=str(net2)) + + cases = [ + # source, "netns", "link-netns", "peer netns", expected + (net1, None, None, None, None), + (net1, net2, None, None, None), + (net2, None, net3, None, LINK_NETNSID), + (net1, net2, net3, None, None), + (net2, None, None, net3, LINK_NETNSID), + (net1, net2, None, net3, LINK_NETNSID), + (net2, None, net2, net3, LINK_NETNSID), + (net1, net2, net4, net3, LINK_NETNSID), + ] + + for src_net, netns, link_netns, peer_netns, exp in cases: + tgt_net = netns or src_net + for typ in types: + cmd = "link add" + if netns: + cmd += f" netns {netns}" + if link_netns: + cmd += f" link-netns {link_netns}" + cmd += f" foo type {typ}" + if peer_netns: + cmd += f" peer netns {peer_netns}" + ip(cmd, ns=src_net) + ksft_true(validate_link_netns(tgt_net, "foo", exp), + f"{typ} peer_netns validation failed") + ip(f"link del foo", ns=tgt_net) + + +def main() -> None: + ksft_run([test_event, test_link_net, test_peer_net]) + ksft_exit() + + +if __name__ == "__main__": + main() diff --git a/tools/testing/selftests/net/netns-name.sh b/tools/testing/selftests/net/netns-name.sh index 6974474c26f3..0be1905d1f2f 100755 --- a/tools/testing/selftests/net/netns-name.sh +++ b/tools/testing/selftests/net/netns-name.sh @@ -78,6 +78,16 @@ ip -netns $NS link show dev $ALT_NAME 2> /dev/null && fail "Can still find alt-name after move" ip -netns $test_ns link del $DEV || fail +# +# Test no conflict of the same name/ifindex in different netns +# +ip -netns $NS link add name $DEV index 100 type dummy || fail +ip -netns $NS link add netns $test_ns name $DEV index 100 type dummy || + fail "Can create in netns without moving" +ip -netns $test_ns link show dev $DEV >> /dev/null || fail "Device not found" +ip -netns $NS link del $DEV || fail +ip -netns $test_ns link del $DEV || fail + echo -ne "$(basename $0) \t\t\t\t" if [ $RET_CODE -eq 0 ]; then echo "[ OK ]"