Commit 08c80e9a authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

tipc: Remove prototype code for supporting slave nodes 



Simplifies routines and data structures that were intended to allow
TIPC to support slave nodes (i.e. nodes that did not have links to
all of the other nodes in its cluster, forcing TIPC to route messages
that it could not deliver directly through a non-slave node).

Currently, TIPC supports only networks containing non-slave nodes,
so this code is unnecessary.

Note: The latest edition of the TIPC 2.0 Specification has eliminated
the concept of slave nodes entirely.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51f98a8d

include/linux/tipc_config.h

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
#define  TIPC_CMD_GET_MAX_ZONES     0x4007    /* obsoleted */

#define  TIPC_CMD_GET_MAX_CLUSTERS  0x4008    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_NODES     0x4009    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_SLAVES    0x400A    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_SLAVES    0x400A    /* obsoleted */

#define  TIPC_CMD_GET_NETID         0x400B    /* tx none, rx unsigned */



#define  TIPC_CMD_ENABLE_BEARER     0x4101    /* tx bearer_config, rx none */
@@ -133,7 +133,7 @@ 
#define  TIPC_CMD_SET_MAX_ZONES     0x8007    /* obsoleted */

#define  TIPC_CMD_SET_MAX_CLUSTERS  0x8008    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_NODES     0x8009    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_SLAVES    0x800A    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_SLAVES    0x800A    /* obsoleted */

#define  TIPC_CMD_SET_NETID         0x800B    /* tx unsigned, rx none */



/*

net/tipc/addr.c

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ int tipc_addr_domain_valid(u32 addr) 
	u32 z = tipc_zone(addr);

	u32 max_nodes = tipc_max_nodes;



	if (is_slave(addr))

		max_nodes = LOWEST_SLAVE + tipc_max_slaves;

	if (n > max_nodes)

		return 0;

	if (c > tipc_max_clusters)

net/tipc/addr.h

+0 −10
Original line number Diff line number Diff line
@@ -57,16 +57,6 @@ static inline int in_own_cluster(u32 addr) 
	return !((addr ^ tipc_own_addr) >> 12);

}



static inline int is_slave(u32 addr)

{

	return addr & 0x800;

}



static inline int may_route(u32 addr)

{

	return(addr ^ tipc_own_addr) >> 11;

}



/**

 * addr_domain - convert 2-bit scope value to equivalent message lookup domain

 *

net/tipc/cluster.c

+20 −146
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf, 


struct tipc_node **tipc_local_nodes = NULL;

struct tipc_node_map tipc_cltr_bcast_nodes = {0,{0,}};

u32 tipc_highest_allowed_slave = 0;



struct cluster *tipc_cltr_create(u32 addr)

{
@@ -57,9 +56,6 @@ struct cluster *tipc_cltr_create(u32 addr) 
	}



	c_ptr->addr = tipc_addr(tipc_zone(addr), tipc_cluster(addr), 0);

	if (in_own_cluster(addr))

		max_nodes = LOWEST_SLAVE + tipc_max_slaves;

	else

	max_nodes = tipc_max_nodes + 1;



	c_ptr->nodes = kcalloc(max_nodes + 1, sizeof(void*), GFP_ATOMIC);
@@ -71,7 +67,6 @@ struct cluster *tipc_cltr_create(u32 addr) 


	if (in_own_cluster(addr))

		tipc_local_nodes = c_ptr->nodes;

	c_ptr->highest_slave = LOWEST_SLAVE - 1;

	c_ptr->highest_node = 0;



	tipc_net.clusters[1] = c_ptr;
@@ -87,9 +82,6 @@ void tipc_cltr_delete(struct cluster *c_ptr) 
	for (n_num = 1; n_num <= c_ptr->highest_node; n_num++) {

		tipc_node_delete(c_ptr->nodes[n_num]);

	}

	for (n_num = LOWEST_SLAVE; n_num <= c_ptr->highest_slave; n_num++) {

		tipc_node_delete(c_ptr->nodes[n_num]);

	}

	kfree(c_ptr->nodes);

	kfree(c_ptr);

}
@@ -100,8 +92,6 @@ void tipc_cltr_attach_node(struct cluster *c_ptr, struct tipc_node *n_ptr) 
	u32 n_num = tipc_node(n_ptr->addr);

	u32 max_n_num = tipc_max_nodes;



	if (in_own_cluster(n_ptr->addr))

		max_n_num = tipc_highest_allowed_slave;

	assert(n_num > 0);

	assert(n_num <= max_n_num);

	assert(c_ptr->nodes[n_num] == NULL);
@@ -237,41 +227,6 @@ void tipc_cltr_bcast_lost_route(struct cluster *c_ptr, u32 dest, 
	}

}



void tipc_cltr_send_slave_routes(struct cluster *c_ptr, u32 dest)

{

	struct sk_buff *buf;

	struct tipc_msg *msg;

	u32 highest = c_ptr->highest_slave;

	u32 n_num;

	int send = 0;



	assert(!is_slave(dest));

	assert(in_own_cluster(dest));

	assert(in_own_cluster(c_ptr->addr));

	if (highest <= LOWEST_SLAVE)

		return;

	buf = tipc_cltr_prepare_routing_msg(highest - LOWEST_SLAVE + 1,

					    c_ptr->addr);

	if (buf) {

		msg = buf_msg(buf);

		msg_set_remote_node(msg, c_ptr->addr);

		msg_set_type(msg, SLAVE_ROUTING_TABLE);

		for (n_num = LOWEST_SLAVE; n_num <= highest; n_num++) {

			if (c_ptr->nodes[n_num] &&

			    tipc_node_has_active_links(c_ptr->nodes[n_num])) {

				send = 1;

				msg_set_dataoctet(msg, n_num);

			}

		}

		if (send)

			tipc_link_send(buf, dest, dest);

		else

			buf_discard(buf);

	} else {

		warn("Memory squeeze: broadcast of lost route failed\n");

	}

}



void tipc_cltr_send_ext_routes(struct cluster *c_ptr, u32 dest)

{

	struct sk_buff *buf;
@@ -282,7 +237,6 @@ void tipc_cltr_send_ext_routes(struct cluster *c_ptr, u32 dest) 


	if (in_own_cluster(c_ptr->addr))

		return;

	assert(!is_slave(dest));

	assert(in_own_cluster(dest));

	highest = c_ptr->highest_node;

	buf = tipc_cltr_prepare_routing_msg(highest + 1, c_ptr->addr);
@@ -306,37 +260,6 @@ void tipc_cltr_send_ext_routes(struct cluster *c_ptr, u32 dest) 
	}

}



void tipc_cltr_send_local_routes(struct cluster *c_ptr, u32 dest)

{

	struct sk_buff *buf;

	struct tipc_msg *msg;

	u32 highest = c_ptr->highest_node;

	u32 n_num;

	int send = 0;



	assert(is_slave(dest));

	assert(in_own_cluster(c_ptr->addr));

	buf = tipc_cltr_prepare_routing_msg(highest, c_ptr->addr);

	if (buf) {

		msg = buf_msg(buf);

		msg_set_remote_node(msg, c_ptr->addr);

		msg_set_type(msg, LOCAL_ROUTING_TABLE);

		for (n_num = 1; n_num <= highest; n_num++) {

			if (c_ptr->nodes[n_num] &&

			    tipc_node_has_active_links(c_ptr->nodes[n_num])) {

				send = 1;

				msg_set_dataoctet(msg, n_num);

			}

		}

		if (send)

			tipc_link_send(buf, dest, dest);

		else

			buf_discard(buf);

	} else {

		warn("Memory squeeze: broadcast of local route failed\n");

	}

}



void tipc_cltr_recv_routing_table(struct sk_buff *buf)

{

	struct tipc_msg *msg = buf_msg(buf);
@@ -366,8 +289,6 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf) 
	c_num = tipc_cluster(rem_node);



	switch (msg_type(msg)) {

	case LOCAL_ROUTING_TABLE:

		assert(is_slave(tipc_own_addr));

	case EXT_ROUTING_TABLE:

		for (n_num = 1; n_num < table_size; n_num++) {

			if (node_table[n_num]) {
@@ -382,29 +303,10 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf) 
		}

		break;

	case SLAVE_ROUTING_TABLE:

		assert(!is_slave(tipc_own_addr));

		assert(in_own_cluster(c_ptr->addr));

		for (n_num = 1; n_num < table_size; n_num++) {

			if (node_table[n_num]) {

				u32 slave_num = n_num + LOWEST_SLAVE;

				u32 addr = tipc_addr(z_num, c_num, slave_num);

				n_ptr = c_ptr->nodes[slave_num];

				if (!n_ptr) {

					n_ptr = tipc_node_create(addr);

				}

				if (n_ptr)

					tipc_node_add_router(n_ptr, router);

			}

		}

		break;

	case ROUTE_ADDITION:

		if (!is_slave(tipc_own_addr)) {

			assert(!in_own_cluster(c_ptr->addr) ||

			       is_slave(rem_node));

		} else {

			assert(in_own_cluster(c_ptr->addr) &&

			       !is_slave(rem_node));

		}

		assert(!in_own_cluster(c_ptr->addr));

		n_ptr = c_ptr->nodes[tipc_node(rem_node)];

		if (!n_ptr)

			n_ptr = tipc_node_create(rem_node);
@@ -412,13 +314,7 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf) 
			tipc_node_add_router(n_ptr, router);

		break;

	case ROUTE_REMOVAL:

		if (!is_slave(tipc_own_addr)) {

			assert(!in_own_cluster(c_ptr->addr) ||

			       is_slave(rem_node));

		} else {

			assert(in_own_cluster(c_ptr->addr) &&

			       !is_slave(rem_node));

		}

		assert(!in_own_cluster(c_ptr->addr));

		n_ptr = c_ptr->nodes[tipc_node(rem_node)];

		if (n_ptr)

			tipc_node_remove_router(n_ptr, router);
@@ -431,22 +327,12 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf) 


void tipc_cltr_remove_as_router(struct cluster *c_ptr, u32 router)

{

	u32 start_entry;

	u32 tstop;

	u32 n_num;



	if (is_slave(router))

		return;	/* Slave nodes can not be routers */



	if (in_own_cluster(c_ptr->addr)) {

		start_entry = LOWEST_SLAVE;

		tstop = c_ptr->highest_slave;

	} else {

		start_entry = 1;

		tstop = c_ptr->highest_node;

	}

	if (in_own_cluster(c_ptr->addr))

		return;



	for (n_num = start_entry; n_num <= tstop; n_num++) {

	for (n_num = 1; n_num <= c_ptr->highest_node; n_num++) {

		if (c_ptr->nodes[n_num]) {

			tipc_node_remove_router(c_ptr->nodes[n_num], router);

		}
@@ -466,13 +352,11 @@ static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf, 
	u32 tstop;



	assert(lower <= upper);

	assert(((lower >= 1) && (lower <= tipc_max_nodes)) ||

	       ((lower >= LOWEST_SLAVE) && (lower <= tipc_highest_allowed_slave)));

	assert(((upper >= 1) && (upper <= tipc_max_nodes)) ||

	       ((upper >= LOWEST_SLAVE) && (upper <= tipc_highest_allowed_slave)));

	assert((lower >= 1) && (lower <= tipc_max_nodes));

	assert((upper >= 1) && (upper <= tipc_max_nodes));

	assert(in_own_cluster(c_ptr->addr));



	tstop = is_slave(upper) ? c_ptr->highest_slave : c_ptr->highest_node;

	tstop = c_ptr->highest_node;

	if (tstop > upper)

		tstop = upper;

	for (n_num = lower; n_num <= tstop; n_num++) {
@@ -498,19 +382,13 @@ void tipc_cltr_broadcast(struct sk_buff *buf) 
	struct cluster *c_ptr;

	struct tipc_node *n_ptr;

	u32 n_num;

	u32 tstart;

	u32 tstop;

	u32 node_type;



	if (tipc_mode == TIPC_NET_MODE) {

		c_ptr = tipc_cltr_find(tipc_own_addr);

		assert(in_own_cluster(c_ptr->addr));	/* For now */



		/* Send to standard nodes, then repeat loop sending to slaves */

		tstart = 1;

		tstop = c_ptr->highest_node;

		for (node_type = 1; node_type <= 2; node_type++) {

			for (n_num = tstart; n_num <= tstop; n_num++) {

		/* Send to nodes */

		for (n_num = 1; n_num <= c_ptr->highest_node; n_num++) {

			n_ptr = c_ptr->nodes[n_num];

			if (n_ptr && tipc_node_has_active_links(n_ptr)) {

				buf_copy = skb_copy(buf, GFP_ATOMIC);
@@ -522,9 +400,6 @@ void tipc_cltr_broadcast(struct sk_buff *buf) 
					       n_ptr->addr);

			}

		}

			tstart = LOWEST_SLAVE;

			tstop = c_ptr->highest_slave;

		}

	}

exit:

	buf_discard(buf);
@@ -532,7 +407,6 @@ exit: 


int tipc_cltr_init(void)

{

	tipc_highest_allowed_slave = LOWEST_SLAVE + tipc_max_slaves;

	return tipc_cltr_create(tipc_own_addr) ? 0 : -ENOMEM;

}

net/tipc/cluster.h

+0 −7
Original line number Diff line number Diff line
@@ -40,26 +40,21 @@ 
#include "addr.h"

#include "net.h"



#define LOWEST_SLAVE  2048u



/**

 * struct cluster - TIPC cluster structure

 * @addr: network address of cluster

 * @nodes: array of pointers to all nodes within cluster

 * @highest_node: id of highest numbered node within cluster

 * @highest_slave: (used for secondary node support)

 */



struct cluster {

	u32 addr;

	struct tipc_node **nodes;

	u32 highest_node;

	u32 highest_slave;

};





extern struct tipc_node **tipc_local_nodes;

extern u32 tipc_highest_allowed_slave;

extern struct tipc_node_map tipc_cltr_bcast_nodes;



void tipc_cltr_remove_as_router(struct cluster *c_ptr, u32 router);
@@ -70,12 +65,10 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf); 
struct cluster *tipc_cltr_create(u32 addr);

void tipc_cltr_delete(struct cluster *c_ptr);

void tipc_cltr_attach_node(struct cluster *c_ptr, struct tipc_node *n_ptr);

void tipc_cltr_send_slave_routes(struct cluster *c_ptr, u32 dest);

void tipc_cltr_broadcast(struct sk_buff *buf);

int tipc_cltr_init(void);



void tipc_cltr_bcast_new_route(struct cluster *c_ptr, u32 dest, u32 lo, u32 hi);

void tipc_cltr_send_local_routes(struct cluster *c_ptr, u32 dest);

void tipc_cltr_bcast_lost_route(struct cluster *c_ptr, u32 dest, u32 lo, u32 hi);



static inline struct cluster *tipc_cltr_find(u32 addr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE