Commit 4c6722fb authored by Sebastien Buisson's avatar Sebastien Buisson Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lnet: check if ni is in current net namespace 



Add new 'ni_net_ns' field to struct lnet_ni to hold a reference
to original net namespace in which ni is created.
In LNetDist(), check if ni was created in same net namespace as
current's one. If not, assign order above 0xffff0000, to make
this ni not a priority.

Signed-off-by: default avatarSebastien Buisson <sbuisson@ddn.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7845
Reviewed-on: http://review.whamcloud.com/21884


Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2d928f9

drivers/staging/lustre/include/linux/lnet/lib-types.h

+2 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ typedef struct lnet_ni { 
	struct lnet_ioctl_config_lnd_tunables *ni_lnd_tunables;

	/* equivalent interfaces to use */

	char			 *ni_interfaces[LNET_MAX_INTERFACES];

	/* original net namespace */

	struct net		 *ni_net_ns;

} lnet_ni_t;



#define LNET_PROTO_PING_MATCHBITS	0x8000000000000000LL

drivers/staging/lustre/lnet/lnet/config.c

+14 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
 */



#define DEBUG_SUBSYSTEM S_LNET

#include <linux/nsproxy.h>

#include <net/net_namespace.h>

#include "../../include/linux/lnet/lib-lnet.h"



struct lnet_text_buf {	    /* tmp struct for parsing routes */
@@ -110,6 +112,11 @@ lnet_ni_free(struct lnet_ni *ni) 
		LIBCFS_FREE(ni->ni_interfaces[i],

			    strlen(ni->ni_interfaces[i]) + 1);

	}



	/* release reference to net namespace */

	if (ni->ni_net_ns)

		put_net(ni->ni_net_ns);



	LIBCFS_FREE(ni, sizeof(*ni));

}
@@ -171,6 +178,13 @@ lnet_ni_alloc(__u32 net, struct cfs_expr_list *el, struct list_head *nilist) 


	/* LND will fill in the address part of the NID */

	ni->ni_nid = LNET_MKNID(net, 0);



	/* Store net namespace in which current ni is being created */

	if (current->nsproxy->net_ns)

		ni->ni_net_ns = get_net(current->nsproxy->net_ns);

	else

		ni->ni_net_ns = NULL;



	ni->ni_last_alive = ktime_get_real_seconds();

	list_add_tail(&ni->ni_list, nilist);

	return ni;

drivers/staging/lustre/lnet/lnet/lib-move.c

+11 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
#define DEBUG_SUBSYSTEM S_LNET



#include "../../include/linux/lnet/lib-lnet.h"

#include <linux/nsproxy.h>

#include <net/net_namespace.h>



static int local_nid_dist_zero = 1;

module_param(local_nid_dist_zero, int, 0444);
@@ -2320,6 +2322,15 @@ LNetDist(lnet_nid_t dstnid, lnet_nid_t *srcnidp, __u32 *orderp) 
		}



		if (LNET_NIDNET(ni->ni_nid) == dstnet) {

			/*

			 * Check if ni was originally created in

			 * current net namespace.

			 * If not, assign order above 0xffff0000,

			 * to make this ni not a priority.

			 */

			if (!net_eq(ni->ni_net_ns, current->nsproxy->net_ns))

				order += 0xffff0000;



			if (srcnidp)

				*srcnidp = ni->ni_nid;

			if (orderp)