From: Pavel Emelyanov <xemul@parallels•com>
To: David Miller <davem@davemloft•net>,
Eric Dumazet <eric.dumazet@gmail•com>,
"Eric W. Biederman" <ebiederm@xmission•com>,
Linux Netdev List <netdev@vger•kernel.org>,
Ben Hutchings <bhutchings@solarflare•com>
Subject: [PATCH 2/5] net: Allow to create links with given ifindex
Date: Thu, 09 Aug 2012 11:52:46 +0400 [thread overview]
Message-ID: <50236C4E.3070500@parallels.com> (raw)
In-Reply-To: <50236C20.4050108@parallels.com>
Currently the RTM_NEWLINK results in -EOPNOTSUPP if the ifinfomsg->ifi_index
is not zero. I propose to allow requesting ifindices on link creation. This
is required by the checkpoint-restore to correctly restore a net namespace
(i.e. -- a container).
Signed-off-by: Pavel Emelyanov <xemul@parallels•com>
Acked-by: Eric Dumazet <edumazet@google•com>
---
net/core/dev.c | 7 ++++++-
net/core/rtnetlink.c | 12 +++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index f91abf8..3ca300d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5579,7 +5579,12 @@ int register_netdevice(struct net_device *dev)
}
}
- dev->ifindex = dev_new_index(net);
+ ret = -EBUSY;
+ if (!dev->ifindex)
+ dev->ifindex = dev_new_index(net);
+ else if (__dev_get_by_index(net, dev->ifindex))
+ goto err_uninit;
+
if (dev->iflink == -1)
dev->iflink = dev->ifindex;
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2c5a0a0..1aa1456 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1812,8 +1812,6 @@ replay:
return -ENODEV;
}
- if (ifm->ifi_index)
- return -EOPNOTSUPP;
if (tb[IFLA_MAP] || tb[IFLA_MASTER] || tb[IFLA_PROTINFO])
return -EOPNOTSUPP;
@@ -1839,10 +1837,14 @@ replay:
return PTR_ERR(dest_net);
dev = rtnl_create_link(net, dest_net, ifname, ops, tb);
-
- if (IS_ERR(dev))
+ if (IS_ERR(dev)) {
err = PTR_ERR(dev);
- else if (ops->newlink)
+ goto out;
+ }
+
+ dev->ifindex = ifm->ifi_index;
+
+ if (ops->newlink)
err = ops->newlink(net, dev, tb, data);
else
err = register_netdevice(dev);
--
1.7.6.5
next prev parent reply other threads:[~2012-08-09 7:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-09 7:52 [PATCH net-next 0/5] Per-net and on-demand link indices (and related) v3 Pavel Emelyanov
2012-08-09 7:52 ` [PATCH 1/5] net: Dont use ifindices in hash fns Pavel Emelyanov
2012-08-09 7:52 ` Pavel Emelyanov [this message]
2012-08-09 7:53 ` [PATCH 3/5] veth: Allow to create peer link with given ifindex Pavel Emelyanov
2012-08-09 7:53 ` [PATCH 4/5] net: Make ifindex generation per-net namespace Pavel Emelyanov
2012-08-09 7:53 ` [PATCH 5/5] net: Loopback ifindex is constant now Pavel Emelyanov
2012-08-09 23:18 ` [PATCH net-next 0/5] Per-net and on-demand link indices (and related) v3 David Miller
-- strict thread matches above, loose matches on Subject: below --
2012-08-06 10:30 [PATCH net-next 0/5] Per-net and on-demand link indices (and related) Pavel Emelyanov
2012-08-06 10:31 ` [PATCH 2/5] net: Allow to create links with given ifindex Pavel Emelyanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50236C4E.3070500@parallels.com \
--to=xemul@parallels$(echo .)com \
--cc=bhutchings@solarflare$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=ebiederm@xmission$(echo .)com \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox