Skip to content

Commit

Permalink
tipc: introduce jumbo frame support for broadcast
Browse files Browse the repository at this point in the history
Until now, we have only been supporting a fix MTU size of 1500 bytes
for all broadcast media, irrespective of their actual capability.

We now make the broadcast MTU adaptable to the carrying media, i.e.,
we use the smallest MTU supported by any of the interfaces attached
to TIPC.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jon Paul Maloy authored and davem330 committed Oct 24, 2015
1 parent b06b281 commit 959e178
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 6 deletions.
15 changes: 11 additions & 4 deletions net/tipc/bcast.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ void tipc_bclink_input(struct net *net)
tipc_sk_mcast_rcv(net, &tn->bcbase->arrvq, &tn->bcbase->inputq);
}

uint tipc_bcast_get_mtu(void)
int tipc_bcast_get_mtu(struct net *net)
{
return MAX_PKT_DEFAULT_MCAST;
return tipc_link_mtu(tipc_bc_sndlink(net));
}

static u16 bcbuf_acks(struct sk_buff *skb)
Expand All @@ -175,14 +175,21 @@ static void tipc_bcbase_select_primary(struct net *net)
{
struct tipc_bc_base *bb = tipc_bc_base(net);
int all_dests = tipc_link_bc_peers(bb->link);
int i;
int i, mtu;

bb->primary_bearer = INVALID_BEARER_ID;

if (!all_dests)
return;

for (i = 0; i < MAX_BEARERS; i++) {
if (!bb->dests[i])
continue;

mtu = tipc_bearer_mtu(net, i);
if (mtu < tipc_link_mtu(bb->link))
tipc_link_set_mtu(bb->link, mtu);

if (bb->dests[i] < all_dests)
continue;

Expand Down Expand Up @@ -1220,7 +1227,7 @@ int tipc_bcast_init(struct net *net)
bb->node.net = net;

if (!tipc_link_bc_create(&bb->node, 0, 0,
MAX_PKT_DEFAULT_MCAST,
U16_MAX,
BCLINK_WIN_DEFAULT,
0,
&bb->inputq,
Expand Down
2 changes: 1 addition & 1 deletion net/tipc/bcast.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void tipc_bcbearer_sort(struct net *net, struct tipc_node_map *nm_ptr,
u32 node, bool action);
int tipc_bclink_reset_stats(struct net *net);
int tipc_bclink_set_queue_limits(struct net *net, u32 limit);
uint tipc_bcast_get_mtu(void);
int tipc_bcast_get_mtu(struct net *net);
int tipc_bcast_xmit(struct net *net, struct sk_buff_head *list);
int tipc_bcast_rcv(struct net *net, struct tipc_link *l, struct sk_buff *skb);
void tipc_bcast_ack_rcv(struct net *net, struct tipc_link *l, u32 acked);
Expand Down
13 changes: 13 additions & 0 deletions net/tipc/bearer.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,19 @@ void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf,
rcu_read_unlock();
}

int tipc_bearer_mtu(struct net *net, u32 bearer_id)
{
int mtu = 0;
struct tipc_bearer *b;

rcu_read_lock();
b = rcu_dereference_rtnl(tipc_net(net)->bearer_list[bearer_id]);
if (b)
mtu = b->mtu;
rcu_read_unlock();
return mtu;
}

/* tipc_bearer_xmit() -send buffer to destination over bearer
*/
void tipc_bearer_xmit(struct net *net, u32 bearer_id,
Expand Down
1 change: 1 addition & 0 deletions net/tipc/bearer.h
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ void tipc_bearer_cleanup(void);
void tipc_bearer_stop(struct net *net);
void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf,
struct tipc_media_addr *dest);
int tipc_bearer_mtu(struct net *net, u32 bearer_id);
void tipc_bearer_xmit(struct net *net, u32 bearer_id,
struct sk_buff_head *xmitq,
struct tipc_media_addr *dst);
Expand Down
10 changes: 10 additions & 0 deletions net/tipc/link.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,16 @@ int tipc_link_bc_peers(struct tipc_link *l)
return l->ackers;
}

void tipc_link_set_mtu(struct tipc_link *l, int mtu)
{
l->mtu = mtu;
}

int tipc_link_mtu(struct tipc_link *l)
{
return l->mtu;
}

static u32 link_own_addr(struct tipc_link *l)
{
return msg_prevnode(l->pmsg);
Expand Down
2 changes: 2 additions & 0 deletions net/tipc/link.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,8 @@ void tipc_link_remove_bc_peer(struct tipc_link *snd_l,
struct tipc_link *rcv_l,
struct sk_buff_head *xmitq);
int tipc_link_bc_peers(struct tipc_link *l);
void tipc_link_set_mtu(struct tipc_link *l, int mtu);
int tipc_link_mtu(struct tipc_link *l);
void tipc_link_bc_ack_rcv(struct tipc_link *l, u16 acked,
struct sk_buff_head *xmitq);
void tipc_link_build_bc_sync_msg(struct tipc_link *l,
Expand Down
2 changes: 1 addition & 1 deletion net/tipc/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_name_seq *seq,
msg_set_hdr_sz(mhdr, MCAST_H_SIZE);

new_mtu:
mtu = tipc_bcast_get_mtu();
mtu = tipc_bcast_get_mtu(net);
rc = tipc_msg_build(mhdr, msg, 0, dsz, mtu, pktchain);
if (unlikely(rc < 0))
return rc;
Expand Down

0 comments on commit 959e178

Please sign in to comment.