From patchwork Fri Apr 21 07:47:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 13219612 X-Patchwork-Delegate: stephen@networkplumber.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B87B8C77B75 for ; Fri, 21 Apr 2023 07:47:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231352AbjDUHra (ORCPT ); Fri, 21 Apr 2023 03:47:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231345AbjDUHr3 (ORCPT ); Fri, 21 Apr 2023 03:47:29 -0400 Received: from mail-ed1-x564.google.com (mail-ed1-x564.google.com [IPv6:2a00:1450:4864:20::564]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98C522D57 for ; Fri, 21 Apr 2023 00:47:24 -0700 (PDT) Received: by mail-ed1-x564.google.com with SMTP id 4fb4d7f45d1cf-5067736607fso2277694a12.0 for ; Fri, 21 Apr 2023 00:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1682063243; x=1684655243; 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=GptZ9S2v2iuA/K48gnra10lLb8nRLcNTkLUfYfYQWOM=; b=dsSsvjGTK3MbZkaHgdf0EpNe7c1qbLnurBz9luyhtyAJjnEk7/v0dLJyVvcqbp3VsF SzoSFYjtKopyhtaL5LtovQzoVXZMakGQWthqGWYdTSIdcxO7r/JRH9f36K6JwZeZ3ALa epBQZCtZLt/KajFAVnKc497dhr2vFpZbOzomAn8A0uYTCsvFzm2UItmKdnaGmtmy11aK BBVLf7rRILG87ybmx7qBAK3pR6tfFqkqrSXSHGZl1rVvIGARlNj8HHVuqv9wVG8il0uE dZI4/1Wy/7KZZjnEQSiRL4nQc7/dcRqysRdJ1N8aHoqHsCTCCLc06noQSW8e4Ocq+VX6 aU6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682063243; x=1684655243; 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=GptZ9S2v2iuA/K48gnra10lLb8nRLcNTkLUfYfYQWOM=; b=B+iemTNY1r6/0DY/tIITGSf8mG2CWFpidEh+W+1NQWNPeSLTXXrGs5AfeqA1Fs5mUl rhx1IJrfgo14s+Sz8+HJ+JJI80Cpy+hwLZoguyOLZFC6MkBxU4xk6h6M42KMCxGbxmaM wPrgFzuDt3ufOWTxMCIRs4Z7IkysJVZBL0RiCimIf24dmkib14mt4ozp/hFf3ukDCfwI 1CJidCtniAdQ06059EcjLdE6hVUEitgJfurxyry4R5CDma2+UCNC8OQnufnOY05zp06f RdFegZ53VkGSVDbTNgee2vHP7rxq8oJIdHwBuljhVVM2yqnJi4KKek77uWPqPyiTuPnt 4FoA== X-Gm-Message-State: AAQBX9cX0Bz6hzxRozKzsbrAsOeIn+8yHr9YBUGaYxzA4B9lbzIezj9d 9keMU3xOwxaD7JufHyLKvzBUL1FcQpF5zDanPIi7e53uvTYiYw== X-Google-Smtp-Source: AKy350YM+foqPNpJpjvQ9tDKUQjwztWvFHjBWY2e2l3T1Foy1R0eOFYH8jzpcQclO/yirpsb+LBIOEFpptq/ X-Received: by 2002:a17:906:1814:b0:957:1292:6726 with SMTP id v20-20020a170906181400b0095712926726mr1591229eje.55.1682063242893; Fri, 21 Apr 2023 00:47:22 -0700 (PDT) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id t22-20020a17090616d600b0095372072492sm614187ejd.287.2023.04.21.00.47.22; Fri, 21 Apr 2023 00:47:22 -0700 (PDT) X-Relaying-Domain: 6wind.com Received: from bretzel (bretzel.dev.6wind.com [10.17.1.57]) by smtpservice.6wind.com (Postfix) with ESMTPS id 91EA6601C5; Fri, 21 Apr 2023 09:47:22 +0200 (CEST) Received: from dichtel by bretzel with local (Exim 4.92) (envelope-from ) id 1pplUI-00089d-FP; Fri, 21 Apr 2023 09:47:22 +0200 From: Nicolas Dichtel To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, dsahern@gmail.com, Simon Horman , Nicolas Dichtel Subject: [PATCH iproute2 v3 1/2] iplink: use the same token NETNSNAME everywhere Date: Fri, 21 Apr 2023 09:47:19 +0200 Message-Id: <20230421074720.31004-2-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230421074720.31004-1-nicolas.dichtel@6wind.com> References: <20230421074720.31004-1-nicolas.dichtel@6wind.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com Use NETNSNAME everywhere to ensure consistency between man pages and help of the 'ip' command. Signed-off-by: Nicolas Dichtel Reviewed-by: Simon Horman --- ip/iplink.c | 4 ++-- man/man8/ip-link.8.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ip/iplink.c b/ip/iplink.c index a8da52f9f7ca..8755fa076dab 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -63,7 +63,7 @@ void iplink_usage(void) " [ mtu MTU ] [index IDX ]\n" " [ numtxqueues QUEUE_COUNT ]\n" " [ numrxqueues QUEUE_COUNT ]\n" - " [ netns { PID | NAME } ]\n" + " [ netns { PID | NETNSNAME } ]\n" " type TYPE [ ARGS ]\n" "\n" " ip link delete { DEVICE | dev DEVICE | group DEVGROUP } type TYPE [ ARGS ]\n" @@ -88,7 +88,7 @@ void iplink_usage(void) " [ address LLADDR ]\n" " [ broadcast LLADDR ]\n" " [ mtu MTU ]\n" - " [ netns { PID | NAME } ]\n" + " [ netns { PID | NETNSNAME } ]\n" " [ link-netns NAME | link-netnsid ID ]\n" " [ alias NAME ]\n" " [ vf NUM [ mac LLADDR ]\n" diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index c8c656579364..a4e0c4030363 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -465,7 +465,7 @@ specifies the desired index of the new virtual device. The link creation fails, if the index is busy. .TP -.BI netns " { PID | NAME } " +.BI netns " { PID | NETNSNAME } " specifies the desired network namespace to create interface in. .TP From patchwork Fri Apr 21 07:47:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 13219611 X-Patchwork-Delegate: stephen@networkplumber.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55E11C7618E for ; Fri, 21 Apr 2023 07:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231346AbjDUHr3 (ORCPT ); Fri, 21 Apr 2023 03:47:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229580AbjDUHr1 (ORCPT ); Fri, 21 Apr 2023 03:47:27 -0400 Received: from mail-wr1-x464.google.com (mail-wr1-x464.google.com [IPv6:2a00:1450:4864:20::464]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F3E9272C for ; Fri, 21 Apr 2023 00:47:24 -0700 (PDT) Received: by mail-wr1-x464.google.com with SMTP id ffacd0b85a97d-2febac9cacdso866530f8f.1 for ; Fri, 21 Apr 2023 00:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1682063243; x=1684655243; 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=tiVGHCxBrB3tms7HTTeWNZRDkGRhXAhNxfchi233Bdc=; b=UBy66uHmC1ehI08Yf/U6K9zkSXho/15j5avJnhRpMlZjn3jvB1z+XYMpd8eYTVMtCL 3q4A5x1RqEGvWz5jivX5s8Wp+6OP79iGuy85nsuOueA2dM6o1DOqCogamk5VJMNQvb4G +4O4xfLdfBVJbXcB/zkbZo7JnUnrKGB6vKVyZDjDtUT6ufL23uVENsJ5OfIrpfit1mja Mq/UBgg+NW7adooGhIXkjMGsqWr7EIulI08EdxksQISuzx08W6nEYtUVaWVlE6lI6y3C SSQ//3gOp8l3rtYJp3r7xhJfs6EBMfNOwm3cxZhPXX5JDJseACcM5OfU1SsFAPxhAqFk nAYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682063243; x=1684655243; 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=tiVGHCxBrB3tms7HTTeWNZRDkGRhXAhNxfchi233Bdc=; b=WNSg8H/0RNVssoBURoYgKYkDDwwAoJ/hr+CbNuxcZFAwJ67yT/h2PMdtSJkotMhZsn o3JyY1+Sn8l0pIw7mc5vSAD4FY7+z88TyoGJsX8pSIhfneGaPg10l5DOdR+xxFp0m0jV w/Su/b9old945LZdrSKu+iEoiQ3jkMnJMyShN6xUeJkAWVtvI04oFepsvkZFh5troWg8 hr1IfM/77jajMthwVH+cDUJ1TV6Khr+6/eLY/k2sWpso7zJusAlZ6MvT5Jbwuil+XLSV tAzqdxyyHEGRYmIdIf5ndEWb62WGvyuf4iNUsHQgqvwpPYF3R33s3ARPzIEPwUVQWQUP Qceg== X-Gm-Message-State: AAQBX9ct2WMuFbtw6mSJ/yti6rVOKp0HCQpfj+YRsEszvbEs4PPvCQMi nFbSWCJROsd1QVlb6kb0nP5ZmZlplYnphrvxZyvtZtUYFd3rDA== X-Google-Smtp-Source: AKy350YMWDDFM8ikeSzRrdcL00UR4xGltuSbhaBE4fqLKM6MdhwRjCG4CztI7VDflK3ZUfltppGcReR2miaR X-Received: by 2002:adf:f7c6:0:b0:2ff:c0c0:532a with SMTP id a6-20020adff7c6000000b002ffc0c0532amr3089587wrq.25.1682063242846; Fri, 21 Apr 2023 00:47:22 -0700 (PDT) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id m1-20020a5d56c1000000b002fe882d1e52sm537230wrw.114.2023.04.21.00.47.22; Fri, 21 Apr 2023 00:47:22 -0700 (PDT) X-Relaying-Domain: 6wind.com Received: from bretzel (bretzel.dev.6wind.com [10.17.1.57]) by smtpservice.6wind.com (Postfix) with ESMTPS id 96CF8601D3; Fri, 21 Apr 2023 09:47:22 +0200 (CEST) Received: from dichtel by bretzel with local (Exim 4.92) (envelope-from ) id 1pplUI-00089g-Fo; Fri, 21 Apr 2023 09:47:22 +0200 From: Nicolas Dichtel To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, dsahern@gmail.com, Simon Horman , Nicolas Dichtel Subject: [PATCH iproute2 v3 2/2] iplink: fix help of 'netns' arg Date: Fri, 21 Apr 2023 09:47:20 +0200 Message-Id: <20230421074720.31004-3-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230421074720.31004-1-nicolas.dichtel@6wind.com> References: <20230421074720.31004-1-nicolas.dichtel@6wind.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com 'ip link set foo netns /proc/1/ns/net' is a valid command. Let's update the doc accordingly. Fixes: 0dc34c7713bb ("iproute2: Add processless network namespace support") Signed-off-by: Nicolas Dichtel Reviewed-by: Simon Horman Reviewed-by: David Marchand --- ip/iplink.c | 4 ++-- man/man8/ip-link.8.in | 26 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ip/iplink.c b/ip/iplink.c index 8755fa076dab..9ac3b8cb2ad5 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -63,7 +63,7 @@ void iplink_usage(void) " [ mtu MTU ] [index IDX ]\n" " [ numtxqueues QUEUE_COUNT ]\n" " [ numrxqueues QUEUE_COUNT ]\n" - " [ netns { PID | NETNSNAME } ]\n" + " [ netns { PID | NETNSNAME | NETNSFILE } ]\n" " type TYPE [ ARGS ]\n" "\n" " ip link delete { DEVICE | dev DEVICE | group DEVGROUP } type TYPE [ ARGS ]\n" @@ -88,7 +88,7 @@ void iplink_usage(void) " [ address LLADDR ]\n" " [ broadcast LLADDR ]\n" " [ mtu MTU ]\n" - " [ netns { PID | NETNSNAME } ]\n" + " [ netns { PID | NETNSNAME | NETNSFILE } ]\n" " [ link-netns NAME | link-netnsid ID ]\n" " [ alias NAME ]\n" " [ vf NUM [ mac LLADDR ]\n" diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index a4e0c4030363..e23474b3589c 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -49,7 +49,7 @@ ip-link \- network device configuration .IR BYTES " ]" .br .RB "[ " netns " {" -.IR PID " | " NETNSNAME " } ]" +.IR PID " | " NETNSNAME " | " NETNSFILE " } ]" .br .BI type " TYPE" .RI "[ " ARGS " ]" @@ -118,7 +118,7 @@ ip-link \- network device configuration .IR MTU " ]" .br .RB "[ " netns " {" -.IR PID " | " NETNSNAME " } ]" +.IR PID " | " NETNSNAME " | " NETNSFILE " } ]" .br .RB "[ " link-netnsid .IR ID " ]" @@ -465,8 +465,15 @@ specifies the desired index of the new virtual device. The link creation fails, if the index is busy. .TP -.BI netns " { PID | NETNSNAME } " -specifies the desired network namespace to create interface in. +.B netns +.RI "{ " PID " | " NETNSNAME " | " NETNSFILE " }" +.br +create the device in the network namespace associated with process +.IR "PID " or +the name +.IR "NETNSNAME " or +the file +.IR "NETNSFILE". .TP VLAN Type Support @@ -2188,10 +2195,15 @@ the interface is .IR "POINTOPOINT" . .TP -.BI netns " NETNSNAME " \fR| " PID" -move the device to the network namespace associated with name +.B netns +.RI "{ " PID " | " NETNSNAME " | " NETNSFILE " }" +.br +move the device to the network namespace associated with process +.IR "PID " or +the name .IR "NETNSNAME " or -.RI process " PID". +the file +.IR "NETNSFILE". Some devices are not allowed to change network namespace: loopback, bridge, wireless. These are network namespace local devices. In such case