Commit 0c7aecd4 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

netns: add rtnl cmd to add and get peer netns ids 



With this patch, a user can define an id for a peer netns by providing a FD or a
PID. These ids are local to the netns where it is added (ie valid only into this
netns).

The main function (ie the one exported to other module), peernet2id(), allows to
get the id of a peer netns. If no id has been assigned by the user, this
function allocates one.

These ids will be used in netlink messages to point to a peer netns, for example
in case of a x-netns interface.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4de8b413

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -6578,6 +6578,7 @@ F: include/linux/netdevice.h 
F:	include/uapi/linux/in.h

F:	include/uapi/linux/in.h

F:	include/uapi/linux/net.h

F:	include/uapi/linux/net.h

F:	include/uapi/linux/netdevice.h

F:	include/uapi/linux/netdevice.h

F:	include/uapi/linux/net_namespace.h

F:	tools/net/

F:	tools/net/

F:	tools/testing/selftests/net/

F:	tools/testing/selftests/net/

F:	lib/random32.c

F:	lib/random32.c

include/net/net_namespace.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,7 @@ struct net { 
	struct list_head	exit_list;	/* Use only net_mutex */

	struct list_head	exit_list;	/* Use only net_mutex */





	struct user_namespace   *user_ns;	/* Owning user namespace */

	struct user_namespace   *user_ns;	/* Owning user namespace */

	struct idr		netns_ids;





	struct ns_common	ns;

	struct ns_common	ns;
@@ -290,6 +291,9 @@ static inline struct net *read_pnet(struct net * const *pnet) 
#define __net_initconst	__initconst

#define __net_initconst	__initconst

#endif

#endif





int peernet2id(struct net *net, struct net *peer);

struct net *get_net_ns_by_id(struct net *net, int id);



struct pernet_operations {

struct pernet_operations {

	struct list_head list;

	struct list_head list;

	int (*init)(struct net *net);

	int (*init)(struct net *net);

include/uapi/linux/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -283,6 +283,7 @@ header-y += net.h 
header-y += netlink_diag.h

header-y += netlink_diag.h

header-y += netlink.h

header-y += netlink.h

header-y += netrom.h

header-y += netrom.h

header-y += net_namespace.h

header-y += net_tstamp.h

header-y += net_tstamp.h

header-y += nfc.h

header-y += nfc.h

header-y += nfs2.h

header-y += nfs2.h

include/uapi/linux/net_namespace.h

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2015 6WIND S.A.

 * Author: Nicolas Dichtel <nicolas.dichtel@6wind.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 */

#ifndef _UAPI_LINUX_NET_NAMESPACE_H_

#define _UAPI_LINUX_NET_NAMESPACE_H_



/* Attributes of RTM_NEWNSID/RTM_GETNSID messages */

enum {

	NETNSA_NONE,

#define NETNSA_NSID_NOT_ASSIGNED -1

	NETNSA_NSID,

	NETNSA_PID,

	NETNSA_FD,

	__NETNSA_MAX,

};



#define NETNSA_MAX		(__NETNSA_MAX - 1)



#endif /* _UAPI_LINUX_NET_NAMESPACE_H_ */

include/uapi/linux/rtnetlink.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -132,6 +132,11 @@ enum { 
	RTM_GETMDB = 86,

	RTM_GETMDB = 86,

#define RTM_GETMDB RTM_GETMDB

#define RTM_GETMDB RTM_GETMDB





	RTM_NEWNSID = 88,

#define RTM_NEWNSID RTM_NEWNSID

	RTM_GETNSID = 90,

#define RTM_GETNSID RTM_GETNSID



	__RTM_MAX,

	__RTM_MAX,

#define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)

#define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE