Commit bb9d8454 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tipc-introduce-variable-window-congestion-control' 



Jon Maloy says:

====================
tipc: introduce variable window congestion control

We improve thoughput greatly by introducing a variety of the Reno
congestion control algorithm at the link level.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 08cbc75f 16ad3f40

net/tipc/bcast.c

+6 −5
Original line number Diff line number Diff line
@@ -562,18 +562,18 @@ int tipc_bclink_reset_stats(struct net *net) 
	return 0;

}



static int tipc_bc_link_set_queue_limits(struct net *net, u32 limit)

static int tipc_bc_link_set_queue_limits(struct net *net, u32 max_win)

{

	struct tipc_link *l = tipc_bc_sndlink(net);



	if (!l)

		return -ENOPROTOOPT;

	if (limit < BCLINK_WIN_MIN)

		limit = BCLINK_WIN_MIN;

	if (limit > TIPC_MAX_LINK_WIN)

	if (max_win < BCLINK_WIN_MIN)

		max_win = BCLINK_WIN_MIN;

	if (max_win > TIPC_MAX_LINK_WIN)

		return -EINVAL;

	tipc_bcast_lock(net);

	tipc_link_set_queue_limits(l, limit);

	tipc_link_set_queue_limits(l, BCLINK_WIN_MIN, max_win);

	tipc_bcast_unlock(net);

	return 0;

}
@@ -683,6 +683,7 @@ int tipc_bcast_init(struct net *net) 
	if (!tipc_link_bc_create(net, 0, 0,

				 FB_MTU,

				 BCLINK_WIN_DEFAULT,

				 BCLINK_WIN_DEFAULT,

				 0,

				 &bb->inputq,

				 NULL,

net/tipc/bearer.c

+6 −5
Original line number Diff line number Diff line
@@ -311,7 +311,8 @@ static int tipc_enable_bearer(struct net *net, const char *name, 


	b->identity = bearer_id;

	b->tolerance = m->tolerance;

	b->window = m->window;

	b->min_win = m->min_win;

	b->max_win = m->max_win;

	b->domain = disc_domain;

	b->net_plane = bearer_id + 'A';

	b->priority = prio;
@@ -796,7 +797,7 @@ static int __tipc_nl_add_bearer(struct tipc_nl_msg *msg, 
		goto prop_msg_full;

	if (nla_put_u32(msg->skb, TIPC_NLA_PROP_TOL, bearer->tolerance))

		goto prop_msg_full;

	if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, bearer->window))

	if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, bearer->max_win))

		goto prop_msg_full;

	if (bearer->media->type_id == TIPC_MEDIA_TYPE_UDP)

		if (nla_put_u32(msg->skb, TIPC_NLA_PROP_MTU, bearer->mtu))
@@ -1088,7 +1089,7 @@ int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info) 
		if (props[TIPC_NLA_PROP_PRIO])

			b->priority = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);

		if (props[TIPC_NLA_PROP_WIN])

			b->window = nla_get_u32(props[TIPC_NLA_PROP_WIN]);

			b->max_win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);

		if (props[TIPC_NLA_PROP_MTU]) {

			if (b->media->type_id != TIPC_MEDIA_TYPE_UDP)

				return -EINVAL;
@@ -1142,7 +1143,7 @@ static int __tipc_nl_add_media(struct tipc_nl_msg *msg, 
		goto prop_msg_full;

	if (nla_put_u32(msg->skb, TIPC_NLA_PROP_TOL, media->tolerance))

		goto prop_msg_full;

	if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, media->window))

	if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, media->max_win))

		goto prop_msg_full;

	if (media->type_id == TIPC_MEDIA_TYPE_UDP)

		if (nla_put_u32(msg->skb, TIPC_NLA_PROP_MTU, media->mtu))
@@ -1275,7 +1276,7 @@ int __tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info) 
		if (props[TIPC_NLA_PROP_PRIO])

			m->priority = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);

		if (props[TIPC_NLA_PROP_WIN])

			m->window = nla_get_u32(props[TIPC_NLA_PROP_WIN]);

			m->max_win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);

		if (props[TIPC_NLA_PROP_MTU]) {

			if (m->type_id != TIPC_MEDIA_TYPE_UDP)

				return -EINVAL;

net/tipc/bearer.h

+4 −2
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ struct tipc_media { 
			char *raw);

	u32 priority;

	u32 tolerance;

	u32 window;

	u32 min_win;

	u32 max_win;

	u32 mtu;

	u32 type_id;

	u32 hwaddr_len;
@@ -158,7 +159,8 @@ struct tipc_bearer { 
	struct packet_type pt;

	struct rcu_head rcu;

	u32 priority;

	u32 window;

	u32 min_win;

	u32 max_win;

	u32 tolerance;

	u32 domain;

	u32 identity;

net/tipc/eth_media.c

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ struct tipc_media eth_media_info = { 
	.raw2addr	= tipc_eth_raw2addr,

	.priority	= TIPC_DEF_LINK_PRI,

	.tolerance	= TIPC_DEF_LINK_TOL,

	.window		= TIPC_DEF_LINK_WIN,

	.min_win	= TIPC_DEF_LINK_WIN,

	.max_win	= TIPC_MAX_LINK_WIN,

	.type_id	= TIPC_MEDIA_TYPE_ETH,

	.hwaddr_len	= ETH_ALEN,

	.name		= "eth"

net/tipc/ib_media.c

+4 −1
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include "core.h"

#include "bearer.h"



#define TIPC_MAX_IB_LINK_WIN 500



/* convert InfiniBand address (media address format) media address to string */

static int tipc_ib_addr2str(struct tipc_media_addr *a, char *str_buf,

			    int str_size)
@@ -94,7 +96,8 @@ struct tipc_media ib_media_info = { 
	.raw2addr	= tipc_ib_raw2addr,

	.priority	= TIPC_DEF_LINK_PRI,

	.tolerance	= TIPC_DEF_LINK_TOL,

	.window		= TIPC_DEF_LINK_WIN,

	.min_win	= TIPC_DEF_LINK_WIN,

	.max_win	= TIPC_MAX_IB_LINK_WIN,

	.type_id	= TIPC_MEDIA_TYPE_IB,

	.hwaddr_len	= INFINIBAND_ALEN,

	.name		= "ib"