From patchwork Thu Feb 6 16:50:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 13963341 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f100.google.com (mail-ej1-f100.google.com [209.85.218.100]) (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 0FDB023537C for ; Thu, 6 Feb 2025 16:51:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738860702; cv=none; b=OFudQjtAHbFXlh9EjuanG8Y5b7RKk7wlPut1cvfIpuINi9rq1GsQObnBjBW6IQQ6HTAiCwtX17toD27nkNZYMK7dwcuNykVi3U2le+0SoWanl2FYlq91MYHxC91LB5VAP0Ihwz6fxx2BXZ/rlEnTE4mQEYLlgJJuHQBe39hSbsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738860702; c=relaxed/simple; bh=qhfrF8rOfWi9BMPzEW1K1lhSoKZWMdMKypOVywawQxA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cWW7Gemp/5hvBJf3d2gbraK2dmTQpkY2AEGch0ON83CdKnpA2R7V9w6Cg60tKt+rfDjd6r/XJvTSjbnvL6k7pwMkf3WXVazzCpKDbwD1ihdKt1gx8bxWjXujEosTT+sdG8YG186lj32sPw/tyl0iLVos3F3+XcetOTH933RdyDE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=6wind.com; spf=pass smtp.mailfrom=6wind.com; dkim=pass (2048-bit key) header.d=6wind.com header.i=@6wind.com header.b=EE4+oooB; arc=none smtp.client-ip=209.85.218.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=6wind.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=6wind.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=6wind.com header.i=@6wind.com header.b="EE4+oooB" Received: by mail-ej1-f100.google.com with SMTP id a640c23a62f3a-ab785b76f0aso2676166b.3 for ; Thu, 06 Feb 2025 08:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1738860698; x=1739465498; 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=8uTxvJx8XP29oBONkH9ilUZCu0gHXNxSpo7+j7SmAsw=; b=EE4+oooBS1/xZ4kM6ROhRdy8yyl4D4A9HA7OyKwZCn98r4+ga9PCu060nbnq2IMB+P oQxa3/EZN5335daf1U9sUi1weHi7ZvyLHy07FpHwMN4DwNMDXgFIYjJl2prV3/LqxXSV Kj8tLFLDvbUGSUBWEVQp3HR/vgx/B22z0a1RS2A81my5PnQqBQdfeh3Eg04rSRIsgPUR Tcvz2NF4JrM4pzVbxXxfy1IetFUK8llbXSFlRqfYTgD3921xpEmEm6k8A7ZXSLHHZl2b 04kw2LKb6fAVLg71XSW+9zbHIYGmVrOrdY/9w5nRILIopEzNLmi6exMFoW4zjonrpPIo 82iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738860698; x=1739465498; 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=8uTxvJx8XP29oBONkH9ilUZCu0gHXNxSpo7+j7SmAsw=; b=SX0qdHYcEZdnFx8gl2Ox5pa8DyDrAWOM7/nXDWuQ3oqFrONo6cnGiH+U7pAuwofmdy SJEcD6YwGXIx+Rye2xzSb2dp8sYDZPEph+6dZnzyVyz2LqFAjYeQX8vlTU3fYc9uzV1/ 5JgYqghqbP+ffnNnekkLkJ0Nr5MZhikFhKeoMDBR/fGhWoyg0RP0Ji971qrbJuvxo9Wv hCpZL2cLqmEJdaGbHqJt4fzAYRMA21nORAsUnZMOR0FypG4Cn7otqcHDCh84Mhz7BOcS KYJJEaGJGe0qrjeLDERMH0w4fwR2pdFTHhb6vwC+ufZZS91aqsNG6K8CoNyxy42GAa/E IPmQ== X-Gm-Message-State: AOJu0YwDAMOW+8YIMsYjHeAPLQQAJeRkLMYPPw8dvtngRciB8BgWFMhC 0pYSI43rlQNUxbkHpWPHgG4Kq38BerXDkU5YOghBZSqzg5n692B/EjN2cRfEmamqQ//+EDpNSVe YKkp3sJsLndyt0HN/7LtMvmB0lTKc7A+j X-Gm-Gg: ASbGnct1vQBdiDkoCHLBni0NvVmfn/KF5npB/UmDLSHnmomUdogxjt7uF6yfikieHWE AA3Znf3juwr5h9DQfXwUdmjX4x9EBfscZ0f6u8xVBwdkDMyreP+tQqNBDsY9UD5gzKEJhqyAeJH O/XilA9TmNZrrvS55rx9Xjv7KxzXjfH6kn0ZSoQQmui5k+vBWyBB0ObcUSVLBVZlCL2p4khHQUL wQkzSlImvGZB8kvfrdOcJnh3BNOq5QbXtfALZnEgXXvPCp4FY4TK7BGGAuAHOI0bW75AusYrfJZ qHJe2/gMhcpYit0h8oVVgPmKVDja9GUUM6rxptjGCNTwHKaqMT/cysn4uN0+ X-Google-Smtp-Source: AGHT+IGAx0Q/H2eQHoYeawfbxSgrNNhWSWM7mPVrJrWkJiQzRfOQKr8QsT0MnRmkOORHMt0dDZNv2kJwAjCq X-Received: by 2002:a17:907:d9f:b0:a9e:80ed:5cc6 with SMTP id a640c23a62f3a-ab75e35d3femr321004666b.13.1738860698137; Thu, 06 Feb 2025 08:51:38 -0800 (PST) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id a640c23a62f3a-ab77332cb11sm5164966b.172.2025.02.06.08.51.38; Thu, 06 Feb 2025 08:51:38 -0800 (PST) X-Relaying-Domain: 6wind.com Received: from bretzel (bretzel.dev.6wind.com [10.17.1.57]) by smtpservice.6wind.com (Postfix) with ESMTPS id D26731CD32; Thu, 6 Feb 2025 17:51:37 +0100 (CET) Received: from dichtel by bretzel with local (Exim 4.94.2) (envelope-from ) id 1tg56H-00CA04-JR; Thu, 06 Feb 2025 17:51:37 +0100 From: Nicolas Dichtel To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Alexander Lobakin Cc: netdev@vger.kernel.org, Nicolas Dichtel , stable@vger.kernel.org Subject: [PATCH net 1/2] net: advertise 'netns local' property via netlink Date: Thu, 6 Feb 2025 17:50:26 +0100 Message-ID: <20250206165132.2898347-2-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250206165132.2898347-1-nicolas.dichtel@6wind.com> References: <20250206165132.2898347-1-nicolas.dichtel@6wind.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Since the below commit, there is no way to see if the netns_local property is set on a device. Let's add a netlink attribute to advertise it. CC: stable@vger.kernel.org Fixes: 05c1280a2bcf ("netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local") Signed-off-by: Nicolas Dichtel --- include/uapi/linux/if_link.h | 1 + net/core/rtnetlink.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index bfe880fbbb24..ed4a64e1c8f1 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -378,6 +378,7 @@ enum { IFLA_GRO_IPV4_MAX_SIZE, IFLA_DPLL_PIN, IFLA_MAX_PACING_OFFLOAD_HORIZON, + IFLA_NETNS_LOCAL, __IFLA_MAX }; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index d1e559fce918..5032e65b8faa 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1287,6 +1287,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, + nla_total_size(4) /* IFLA_TSO_MAX_SEGS */ + nla_total_size(1) /* IFLA_OPERSTATE */ + nla_total_size(1) /* IFLA_LINKMODE */ + + nla_total_size(1) /* IFLA_NETNS_LOCAL */ + nla_total_size(4) /* IFLA_CARRIER_CHANGES */ + nla_total_size(4) /* IFLA_LINK_NETNSID */ + nla_total_size(4) /* IFLA_GROUP */ @@ -2041,6 +2042,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, netif_running(dev) ? READ_ONCE(dev->operstate) : IF_OPER_DOWN) || nla_put_u8(skb, IFLA_LINKMODE, READ_ONCE(dev->link_mode)) || + nla_put_u8(skb, IFLA_NETNS_LOCAL, dev->netns_local) || nla_put_u32(skb, IFLA_MTU, READ_ONCE(dev->mtu)) || nla_put_u32(skb, IFLA_MIN_MTU, READ_ONCE(dev->min_mtu)) || nla_put_u32(skb, IFLA_MAX_MTU, READ_ONCE(dev->max_mtu)) || @@ -2229,6 +2231,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = { [IFLA_ALLMULTI] = { .type = NLA_REJECT }, [IFLA_GSO_IPV4_MAX_SIZE] = NLA_POLICY_MIN(NLA_U32, MAX_TCP_HEADER + 1), [IFLA_GRO_IPV4_MAX_SIZE] = { .type = NLA_U32 }, + [IFLA_NETNS_LOCAL] = { .type = NLA_U8 }, }; static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = { From patchwork Thu Feb 6 16:50:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 13963340 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f97.google.com (mail-wm1-f97.google.com [209.85.128.97]) (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 15905235359 for ; Thu, 6 Feb 2025 16:51:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.97 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738860701; cv=none; b=oFFaf05vfc6pMbL04Y1UHg3fEXieC3B1QttFugOoBZB4T45hWzIwuWZ3oagWvmwiMqNh6GG+5yvorL667sHyZSIf2sb4rGsCSH98EWVP5iQ9Wn1VMrzNVGUcB3xajBWY3t/53c+DgFRL4BQ655j2RO/OTeEd3KD0D5lNE4j3VVI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738860701; c=relaxed/simple; bh=C7uZAIgSKoTeGiTKDnQ7yxruXbSRF/2IFcjaFKrPEJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sap8O3YmIzPahGGHIDYDtAbtO5gp0o3UusQTh15emi00VN8JgP8tg+ZVRvahHdVasyvRrIV4REguTGKsTWOYCxEqAYY/ScMicJMqpYxhpIshU3AoZTRK7TDNRMaoaKAToHtd6Yu9Nzuvxi+o3O0FzOkjxJyf+wFUXjvLypUi3KM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=6wind.com; spf=pass smtp.mailfrom=6wind.com; dkim=pass (2048-bit key) header.d=6wind.com header.i=@6wind.com header.b=DitYfYLt; arc=none smtp.client-ip=209.85.128.97 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=6wind.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=6wind.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=6wind.com header.i=@6wind.com header.b="DitYfYLt" Received: by mail-wm1-f97.google.com with SMTP id 5b1f17b1804b1-43616c12d72so1677405e9.2 for ; Thu, 06 Feb 2025 08:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1738860698; x=1739465498; 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=KWLfxsZQyBwYG4PJltfCoD/xQYNBrAmXgMfWeDg+aUc=; b=DitYfYLtYMUNeNafqzAJh74Ak5ecjpo7kezgMJDwj81asYCFz1dEvRda4zKSCPL5AP FDeLDboMV3BL/a8u2FcsR2YsSpsYY4AZtU9f9OfZM+UU2ja8JxSqNkgJy2KKperazdg5 nD+O7jnfWNMRfWR8yfUT5aXDBPqrWLqxCeRnGbQzdcTVwndu8PyP/ayhfk6ceDbEQsfD BhXgkFQGphC7lNsssMiCNfPyB0zVZvfyA4ZsUJdjPID4JI/YsFQqSzB62yJSpqyX+o7P 16DPHAYezopdLCdesFClgIz2guHgMyNaUHG9fTCBEnf4t9wxzoaz2itrdHYwwvRUxcNl 5PeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738860698; x=1739465498; 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=KWLfxsZQyBwYG4PJltfCoD/xQYNBrAmXgMfWeDg+aUc=; b=VkPeZrJ/LqWE9palj5gEWVH1BhYfCdRXpgwqZAnz4tY3Fa1Ispk97GoQbWlAcH2myA CnkXS8lB6WowoF9hbfv3eZiSPEDFjm4I1Nh8MTdduPtPRGBKKXwh6ijXdINFF1omwwET i7+QS6q3hD7kQ0pj1DWB4nQs3s8T1oav32XZWcNXFIIx98jFjv9TF/jyuLCCsmwOb+/q BwlE+aUB74lAexZFX9/3UxXt2nxJ6MkM1BFADCoIj9Wyqc0lJFFWYSWwwb1PCilhxfn4 HYVDvsVGT/gGOoeeofNhMq7PGru6IJIotBC0LUE+HEU45ZPHDNpJIqLKnCOL09dUhpEQ 2VPA== X-Gm-Message-State: AOJu0YyHkJX5lmPzLFhLPReZyI1avyzkeZ86GluMcTTpm77Cf04YnZ2O 7nCt+YEjExbnQ1KYHODZxxyljIAW06Mx8bmWl4SD60X/NuME1zF/9JdMY+szXK6gJrdHwHnHTDU yeV99yW+3S/Vq/UH1gBLLw2tcCG9XyRMe X-Gm-Gg: ASbGnctmPqry6tJ3t88+f880Z1t1LjyszMCuo3I3zhHHaO3sGWc7TztCTL7vte9P8RE pnd6nGCLfm8JnKxC8dfaCUemaRRDP2m/UorFPLfdLf0B8zzV/1cSI/SaWdZlzV5Re0pHgxO9CHM i377wvPKfsOxMLX+k7eMRU+2RqHw4EaEgFi5X0p9/hcCHGG5PIJpPglQZbq3hd2MLxCrVw3vrsk zIHHVmGtSjY+i4bkjD3gDDK/rma1+zfvEW5q67o5LiMJPxwK73+VRck7YniAkQBKQFfYiv7UiJy 7VKo7K74xSxQqst9M9K46WzTHzVy86GFUZszhR3gOV6skpLDM0T8otOHqJku X-Google-Smtp-Source: AGHT+IEl38lSUUQgvvCOUank03kf7DqPvH6MKe2hmtpbBvJRYwvExSdw4yu79kpQbRasXKgmsDcTME3XiOgB X-Received: by 2002:a05:600c:4691:b0:436:fb10:d583 with SMTP id 5b1f17b1804b1-4392497ea09mr512405e9.2.1738860698069; Thu, 06 Feb 2025 08:51:38 -0800 (PST) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id ffacd0b85a97d-38dbdd1b951sm42572f8f.1.2025.02.06.08.51.37; Thu, 06 Feb 2025 08:51:38 -0800 (PST) X-Relaying-Domain: 6wind.com Received: from bretzel (bretzel.dev.6wind.com [10.17.1.57]) by smtpservice.6wind.com (Postfix) with ESMTPS id D636D1CD33; Thu, 6 Feb 2025 17:51:37 +0100 (CET) Received: from dichtel by bretzel with local (Exim 4.94.2) (envelope-from ) id 1tg56H-00CA07-KB; Thu, 06 Feb 2025 17:51:37 +0100 From: Nicolas Dichtel To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Alexander Lobakin Cc: netdev@vger.kernel.org, Nicolas Dichtel Subject: [PATCH net 2/2] net: enhance error message for 'netns local' iface Date: Thu, 6 Feb 2025 17:50:27 +0100 Message-ID: <20250206165132.2898347-3-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250206165132.2898347-1-nicolas.dichtel@6wind.com> References: <20250206165132.2898347-1-nicolas.dichtel@6wind.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The current message is "Invalid argument". Let's help the user by explaining the error. Signed-off-by: Nicolas Dichtel --- net/core/rtnetlink.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 5032e65b8faa..91b358bdfe5c 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3024,8 +3024,12 @@ static int do_setlink(const struct sk_buff *skb, struct net_device *dev, new_ifindex = nla_get_s32_default(tb[IFLA_NEW_IFINDEX], 0); err = __dev_change_net_namespace(dev, tgt_net, pat, new_ifindex); - if (err) + if (err) { + if (dev->netns_local) + NL_SET_ERR_MSG(extack, + "The interface has the 'netns local' property"); goto errout; + } status |= DO_SETLINK_MODIFIED; }