> -----Original Message-----
> From: Tuong Lien Tong <tuong.t.l...@dektech.com.au>
> Sent: 18-Nov-19 20:57
> To: Jon Maloy <jon.ma...@ericsson.com>; 'Jon Maloy' <ma...@donjonn.com>
> Cc: Mohan Krishna Ghanta Krishnamurthy
> <mohan.krishna.ghanta.krishnamur...@ericsson.com>;
> parthasarathy.bhuvara...@gmail.com; Tung Quang Nguyen
> <tung.q.ngu...@dektech.com.au>; Hoang
> Huu Le <hoang.h...@dektech.com.au>; Gordan Mihaljevic
> <gordan.mihalje...@dektech.com.au>;
> ying....@windriver.com; tipc-discussion@lists.sourceforge.net
> Subject: RE: [net-next v3 1/1] tipc: introduce variable window congestion
> control
>
> Hi Jon,
>
> @@ -1045,7 +1056,13 @@ static void tipc_link_advance_backlog(struct
> tipc_link *l,
> u16 bc_ack = l->bc_rcvlink->rcv_nxt - 1;
> u32 imp;
>
> - while (skb_queue_len(&l->transmq) < l->window) {
> + qlen = skb_queue_len(txq);
> + if (qlen >= cwin && (l->snd_nxt - buf_seqno(skb_peek(txq)) == qlen))
> {
>
> [Tuong]: now it should be: 'qlen + backlogq_len >= cwin' instead since we
> might have released some packets from the transmq just before calling this
> function...?
I guess you are right, although it won't make any difference for max throughput.
When we are sending long messages at full speed the transmit queue is almost
always > window limit anyway.
But the change will have the effect that the window won't grow during low
traffic, which I think is a correct behavior.
I make this change.
///jon
>
> + add = l->cong_acks++ % 32 ? 0 : 1;
> + cwin = min_t(u16, cwin + add, l->max_win);
> + l->window = cwin;
> + }
> + while (skb_queue_len(txq) < cwin) {
>
> BR/Tuong
>
> -----Original Message-----
> From: Jon Maloy <jon.ma...@ericsson.com>
> Sent: Tuesday, November 19, 2019 6:33 AM
> To: Jon Maloy <jon.ma...@ericsson.com>; Jon Maloy <ma...@donjonn.com>
> Cc: mohan.krishna.ghanta.krishnamur...@ericsson.com;
> parthasarathy.bhuvara...@gmail.com; tung.q.ngu...@dektech.com.au;
> hoang.h...@dektech.com.au; tuong.t.l...@dektech.com.au;
> gordan.mihalje...@dektech.com.au; ying....@windriver.com;
> tipc-discussion@lists.sourceforge.net
> Subject: [net-next v3 1/1] tipc: introduce variable window congestion
> control
>
> We introduce a simple variable window congestion control for links.
> The algorithm is inspired by the Reno algorithm, and can best be
> descibed as working in permanent "congestion avoidance" mode, within
> strict limits.
>
> - We introduce hard lower and upper window limits per link, still
> different and configurable per bearer type.
>
> - Next, we let a link start at the minimum window, and then slowly
> increment it for each 32 received non-duplicate ACK. This goes on
> until it either reaches the upper limit, or until it receives a
> NACK message.
>
> - For each non-duplicate NACK received, we let the window decrease by
> intervals of 1/2 of the current window, but not below the minimum
> window.
>
> The change does in reality have effect only on unicast ethernet
> transport, as we have seen that there is no room whatsoever for
> increasing the window max size for the UDP bearer.
> For now, we also choose to keep the limits for the broadcast link
> unchanged and equal.
>
> This algorithm seems to give a ~25% throughput improvement for large
> messages, while it has no effect on throughput for small messages.
>
> Suggested-by: Xin Long <lucien....@gmail.com>
> Acked-by: Xin Long <lucien....@gmail.com>
> Signed-off-by: Jon Maloy <jon.ma...@ericsson.com>
>
> ---
> v2: - Moved window increment in tipc_advance_backlogq() to before
> the transfer loop, as suggested Tuong.
> - Introduced logic for incrementing the window even for the
> broadcast send link, also suggested by Tuong.
> v3: - Rebased to latest net-next
> ---
> net/tipc/bcast.c | 11 ++++----
> net/tipc/bearer.c | 11 ++++----
> net/tipc/bearer.h | 6 +++--
> net/tipc/eth_media.c | 6 ++++-
> net/tipc/ib_media.c | 5 +++-
> net/tipc/link.c | 76
> ++++++++++++++++++++++++++++++++++------------------
> net/tipc/link.h | 9 ++++---
> net/tipc/node.c | 13 +++++----
> net/tipc/udp_media.c | 3 ++-
> 9 files changed, 90 insertions(+), 50 deletions(-)
>
> diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
> index f41096a..84da317 100644
> --- a/net/tipc/bcast.c
> +++ b/net/tipc/bcast.c
> @@ -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,
> diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
> index d7ec26b..34ca7b7 100644
> --- a/net/tipc/bearer.c
> +++ b/net/tipc/bearer.c
> @@ -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;
> diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
> index d0c79cc..bc00231 100644
> --- a/net/tipc/bearer.h
> +++ b/net/tipc/bearer.h
> @@ -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;
> diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
> index f69a2fd..38cdcab 100644
> --- a/net/tipc/eth_media.c
> +++ b/net/tipc/eth_media.c
> @@ -37,6 +37,9 @@
> #include "core.h"
> #include "bearer.h"
>
> +#define TIPC_MIN_ETH_LINK_WIN 50
> +#define TIPC_MAX_ETH_LINK_WIN 500
> +
> /* Convert Ethernet address (media address format) to string */
> static int tipc_eth_addr2str(struct tipc_media_addr *addr,
> char *strbuf, int bufsz)
> @@ -92,7 +95,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_MIN_ETH_LINK_WIN,
> + .max_win = TIPC_MAX_ETH_LINK_WIN,
> .type_id = TIPC_MEDIA_TYPE_ETH,
> .hwaddr_len = ETH_ALEN,
> .name = "eth"
> diff --git a/net/tipc/ib_media.c b/net/tipc/ib_media.c
> index e8c1671..7aa9ff8 100644
> --- a/net/tipc/ib_media.c
> +++ b/net/tipc/ib_media.c
> @@ -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"
> diff --git a/net/tipc/link.c b/net/tipc/link.c
> index fb72031..a88950b 100644
> --- a/net/tipc/link.c
> +++ b/net/tipc/link.c
> @@ -164,7 +164,6 @@ struct tipc_link {
> struct sk_buff *target_bskb;
> } backlog[5];
> u16 snd_nxt;
> - u16 window;
>
> /* Reception */
> u16 rcv_nxt;
> @@ -175,6 +174,10 @@ struct tipc_link {
>
> /* Congestion handling */
> struct sk_buff_head wakeupq;
> + u16 window;
> + u16 min_win;
> + u16 max_win;
> + u16 cong_acks;
>
> /* Fragmentation/reassembly */
> struct sk_buff *reasm_buf;
> @@ -308,9 +311,14 @@ u32 tipc_link_id(struct tipc_link *l)
> return l->peer_bearer_id << 16 | l->bearer_id;
> }
>
> -int tipc_link_window(struct tipc_link *l)
> +int tipc_link_min_win(struct tipc_link *l)
> +{
> + return l->min_win;
> +}
> +
> +int tipc_link_max_win(struct tipc_link *l)
> {
> - return l->window;
> + return l->max_win;
> }
>
> int tipc_link_prio(struct tipc_link *l)
> @@ -436,7 +444,8 @@ u32 tipc_link_state(struct tipc_link *l)
> * @net_plane: network plane (A,B,c..) this link belongs to
> * @mtu: mtu to be advertised by link
> * @priority: priority to be used by link
> - * @window: send window to be used by link
> + * @min_win: minimal send window to be used by link
> + * @max_win: maximal send window to be used by link
> * @session: session to be used by link
> * @ownnode: identity of own node
> * @peer: node id of peer node
> @@ -451,7 +460,7 @@ u32 tipc_link_state(struct tipc_link *l)
> */
> bool tipc_link_create(struct net *net, char *if_name, int bearer_id,
> int tolerance, char net_plane, u32 mtu, int priority,
> - int window, u32 session, u32 self,
> + u32 min_win, u32 max_win, u32 session, u32 self,
> u32 peer, u8 *peer_id, u16 peer_caps,
> struct tipc_link *bc_sndlink,
> struct tipc_link *bc_rcvlink,
> @@ -495,7 +504,7 @@ bool tipc_link_create(struct net *net, char *if_name,
> int bearer_id,
> l->advertised_mtu = mtu;
> l->mtu = mtu;
> l->priority = priority;
> - tipc_link_set_queue_limits(l, window);
> + tipc_link_set_queue_limits(l, min_win, max_win);
> l->ackers = 1;
> l->bc_sndlink = bc_sndlink;
> l->bc_rcvlink = bc_rcvlink;
> @@ -523,7 +532,7 @@ bool tipc_link_create(struct net *net, char *if_name,
> int bearer_id,
> * Returns true if link was created, otherwise false
> */
> bool tipc_link_bc_create(struct net *net, u32 ownnode, u32 peer,
> - int mtu, int window, u16 peer_caps,
> + int mtu, u32 min_win, u32 max_win, u16 peer_caps,
> struct sk_buff_head *inputq,
> struct sk_buff_head *namedq,
> struct tipc_link *bc_sndlink,
> @@ -531,9 +540,9 @@ bool tipc_link_bc_create(struct net *net, u32 ownnode,
> u32 peer,
> {
> struct tipc_link *l;
>
> - if (!tipc_link_create(net, "", MAX_BEARERS, 0, 'Z', mtu, 0, window,
> - 0, ownnode, peer, NULL, peer_caps, bc_sndlink,
> - NULL, inputq, namedq, link))
> + if (!tipc_link_create(net, "", MAX_BEARERS, 0, 'Z', mtu, 0, min_win,
> + max_win, 0, ownnode, peer, NULL, peer_caps,
> + bc_sndlink, NULL, inputq, namedq, link))
> return false;
>
> l = *link;
> @@ -959,7 +968,7 @@ int tipc_link_xmit(struct tipc_link *l, struct
> sk_buff_head *list,
> int pkt_cnt = skb_queue_len(list);
> int imp = msg_importance(hdr);
> unsigned int mss = tipc_link_mss(l);
> - unsigned int maxwin = l->window;
> + unsigned int cwin = l->window;
> unsigned int mtu = l->mtu;
> bool new_bundle;
> int rc = 0;
> @@ -988,7 +997,7 @@ int tipc_link_xmit(struct tipc_link *l, struct
> sk_buff_head *list,
>
> /* Prepare each packet for sending, and add to relevant queue: */
> while ((skb = __skb_dequeue(list))) {
> - if (likely(skb_queue_len(transmq) < maxwin)) {
> + if (likely(skb_queue_len(transmq) < cwin)) {
> hdr = buf_msg(skb);
> msg_set_seqno(hdr, seqno);
> msg_set_ack(hdr, ack);
> @@ -1038,6 +1047,8 @@ int tipc_link_xmit(struct tipc_link *l, struct
> sk_buff_head *list,
> static void tipc_link_advance_backlog(struct tipc_link *l,
> struct sk_buff_head *xmitq)
> {
> + struct sk_buff_head *txq = &l->transmq;
> + u16 qlen, add, cwin = l->window;
> struct sk_buff *skb, *_skb;
> struct tipc_msg *hdr;
> u16 seqno = l->snd_nxt;
> @@ -1045,7 +1056,13 @@ static void tipc_link_advance_backlog(struct
> tipc_link *l,
> u16 bc_ack = l->bc_rcvlink->rcv_nxt - 1;
> u32 imp;
>
> - while (skb_queue_len(&l->transmq) < l->window) {
> + qlen = skb_queue_len(txq);
> + if (qlen >= cwin && (l->snd_nxt - buf_seqno(skb_peek(txq)) == qlen))
> {
> + add = l->cong_acks++ % 32 ? 0 : 1;
> + cwin = min_t(u16, cwin + add, l->max_win);
> + l->window = cwin;
> + }
> + while (skb_queue_len(txq) < cwin) {
> skb = skb_peek(&l->backlogq);
> if (!skb)
> break;
> @@ -1140,6 +1157,7 @@ static int tipc_link_bc_retrans(struct tipc_link *l,
> struct tipc_link *r,
> {
> struct sk_buff *_skb, *skb = skb_peek(&l->transmq);
> u16 bc_ack = l->bc_rcvlink->rcv_nxt - 1;
> + bool retransmitted = false;
> u16 ack = l->rcv_nxt - 1;
> struct tipc_msg *hdr;
> int rc = 0;
> @@ -1173,11 +1191,13 @@ static int tipc_link_bc_retrans(struct tipc_link *l,
> struct tipc_link *r,
> _skb->priority = TC_PRIO_CONTROL;
> __skb_queue_tail(xmitq, _skb);
> l->stats.retransmitted++;
> -
> + retransmitted = true;
> /* Increase actual retrans counter & mark first time */
> if (!TIPC_SKB_CB(skb)->retr_cnt++)
> TIPC_SKB_CB(skb)->retr_stamp = jiffies;
> }
> + if (retransmitted)
> + l->window = l->min_win + (l->window - l->min_win) / 2;
> return 0;
> }
>
> @@ -1417,6 +1437,7 @@ static int tipc_link_advance_transmq(struct tipc_link
> *l, u16 acked, u16 gap,
> struct sk_buff *skb, *_skb, *tmp;
> struct tipc_msg *hdr;
> u16 bc_ack = l->bc_rcvlink->rcv_nxt - 1;
> + bool retransmitted = false;
> u16 ack = l->rcv_nxt - 1;
> bool passed = false;
> u16 seqno, n = 0;
> @@ -1449,7 +1470,7 @@ static int tipc_link_advance_transmq(struct tipc_link
> *l, u16 acked, u16 gap,
> _skb->priority = TC_PRIO_CONTROL;
> __skb_queue_tail(xmitq, _skb);
> l->stats.retransmitted++;
> -
> + retransmitted = true;
> /* Increase actual retrans counter & mark first time
> */
> if (!TIPC_SKB_CB(skb)->retr_cnt++)
> TIPC_SKB_CB(skb)->retr_stamp = jiffies;
> @@ -1463,7 +1484,8 @@ static int tipc_link_advance_transmq(struct tipc_link
> *l, u16 acked, u16 gap,
> goto next_gap_ack;
> }
> }
> -
> + if (retransmitted)
> + l->window = l->min_win + (l->window - l->min_win) / 2;
> return 0;
> }
>
> @@ -2305,15 +2327,17 @@ int tipc_link_bc_nack_rcv(struct tipc_link *l,
> struct sk_buff *skb,
> return 0;
> }
>
> -void tipc_link_set_queue_limits(struct tipc_link *l, u32 win)
> +void tipc_link_set_queue_limits(struct tipc_link *l, u32 min_win, u32
> max_win)
> {
> int max_bulk = TIPC_MAX_PUBL / (l->mtu / ITEM_SIZE);
>
> - l->window = win;
> - l->backlog[TIPC_LOW_IMPORTANCE].limit = max_t(u16, 50, win);
> - l->backlog[TIPC_MEDIUM_IMPORTANCE].limit = max_t(u16, 100, win *
> 2);
> - l->backlog[TIPC_HIGH_IMPORTANCE].limit = max_t(u16, 150, win *
> 3);
> - l->backlog[TIPC_CRITICAL_IMPORTANCE].limit = max_t(u16, 200, win *
> 4);
> + l->window = min_win;
> + l->min_win = min_win;
> + l->max_win = max_win;
> + l->backlog[TIPC_LOW_IMPORTANCE].limit = min_win * 2;
> + l->backlog[TIPC_MEDIUM_IMPORTANCE].limit = min_win * 4;
> + l->backlog[TIPC_HIGH_IMPORTANCE].limit = min_win * 6;
> + l->backlog[TIPC_CRITICAL_IMPORTANCE].limit = min_win * 8;
> l->backlog[TIPC_SYSTEM_IMPORTANCE].limit = max_bulk;
> }
>
> @@ -2366,10 +2390,10 @@ int tipc_nl_parse_link_prop(struct nlattr *prop,
> struct nlattr *props[])
> }
>
> if (props[TIPC_NLA_PROP_WIN]) {
> - u32 win;
> + u32 max_win;
>
> - win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
> - if ((win < TIPC_MIN_LINK_WIN) || (win > TIPC_MAX_LINK_WIN))
> + max_win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
> + if (max_win < TIPC_MIN_LINK_WIN || max_win >
> TIPC_MAX_LINK_WIN)
> return -EINVAL;
> }
>
> @@ -2605,7 +2629,7 @@ int tipc_nl_add_bc_link(struct net *net, struct
> tipc_nl_msg *msg)
> prop = nla_nest_start_noflag(msg->skb, TIPC_NLA_LINK_PROP);
> if (!prop)
> goto attr_msg_full;
> - if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, bcl->window))
> + if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, bcl->max_win))
> goto prop_msg_full;
> if (nla_put_u32(msg->skb, TIPC_NLA_PROP_BROADCAST, bc_mode))
> goto prop_msg_full;
> diff --git a/net/tipc/link.h b/net/tipc/link.h
> index c09e9d4..d3c1c3f 100644
> --- a/net/tipc/link.h
> +++ b/net/tipc/link.h
> @@ -73,7 +73,7 @@ enum {
>
> bool tipc_link_create(struct net *net, char *if_name, int bearer_id,
> int tolerance, char net_plane, u32 mtu, int priority,
> - int window, u32 session, u32 ownnode,
> + u32 min_win, u32 max_win, u32 session, u32 ownnode,
> u32 peer, u8 *peer_id, u16 peer_caps,
> struct tipc_link *bc_sndlink,
> struct tipc_link *bc_rcvlink,
> @@ -81,7 +81,7 @@ bool tipc_link_create(struct net *net, char *if_name, int
> bearer_id,
> struct sk_buff_head *namedq,
> struct tipc_link **link);
> bool tipc_link_bc_create(struct net *net, u32 ownnode, u32 peer,
> - int mtu, int window, u16 peer_caps,
> + int mtu, u32 min_win, u32 max_win, u16 peer_caps,
> struct sk_buff_head *inputq,
> struct sk_buff_head *namedq,
> struct tipc_link *bc_sndlink,
> @@ -115,7 +115,8 @@ char *tipc_link_name_ext(struct tipc_link *l, char
> *buf);
> u32 tipc_link_state(struct tipc_link *l);
> char tipc_link_plane(struct tipc_link *l);
> int tipc_link_prio(struct tipc_link *l);
> -int tipc_link_window(struct tipc_link *l);
> +int tipc_link_min_win(struct tipc_link *l);
> +int tipc_link_max_win(struct tipc_link *l);
> void tipc_link_update_caps(struct tipc_link *l, u16 capabilities);
> bool tipc_link_validate_msg(struct tipc_link *l, struct tipc_msg *hdr);
> unsigned long tipc_link_tolerance(struct tipc_link *l);
> @@ -124,7 +125,7 @@ void tipc_link_set_tolerance(struct tipc_link *l, u32
> tol,
> void tipc_link_set_prio(struct tipc_link *l, u32 prio,
> struct sk_buff_head *xmitq);
> void tipc_link_set_abort_limit(struct tipc_link *l, u32 limit);
> -void tipc_link_set_queue_limits(struct tipc_link *l, u32 window);
> +void tipc_link_set_queue_limits(struct tipc_link *l, u32 min_win, u32
> max_win);
> int __tipc_nl_add_link(struct net *net, struct tipc_nl_msg *msg,
> struct tipc_link *link, int nlflags);
> int tipc_nl_parse_link_prop(struct nlattr *prop, struct nlattr *props[]);
> diff --git a/net/tipc/node.c b/net/tipc/node.c
> index aaf5956..970c780 100644
> --- a/net/tipc/node.c
> +++ b/net/tipc/node.c
> @@ -1134,7 +1134,8 @@ void tipc_node_check_dest(struct net *net, u32 addr,
> snd_l = tipc_bc_sndlink(net);
> if (!tipc_link_bc_create(net, tipc_own_addr(net),
> addr, U16_MAX,
> - tipc_link_window(snd_l),
> + tipc_link_min_win(snd_l),
> + tipc_link_max_win(snd_l),
> n->capabilities,
> &n->bc_entry.inputq1,
> &n->bc_entry.namedq, snd_l,
> @@ -1228,7 +1229,7 @@ void tipc_node_check_dest(struct net *net, u32 addr,
> get_random_bytes(&session, sizeof(u16));
> if (!tipc_link_create(net, if_name, b->identity,
> b->tolerance,
> b->net_plane, b->mtu, b->priority,
> - b->window, session,
> + b->min_win, b->max_win, session,
> tipc_own_addr(net), addr, peer_id,
> n->capabilities,
> tipc_bc_sndlink(n->net),
> n->bc_entry.link,
> @@ -2374,10 +2375,12 @@ int tipc_nl_node_set_link(struct sk_buff *skb,
> struct genl_info *info)
> tipc_link_set_prio(link, prio, &xmitq);
> }
> if (props[TIPC_NLA_PROP_WIN]) {
> - u32 win;
> + u32 max_win;
>
> - win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
> - tipc_link_set_queue_limits(link, win);
> + max_win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
> + tipc_link_set_queue_limits(link,
> + tipc_link_min_win(link),
> + max_win);
> }
> }
>
> diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
> index 86aaa4d..7d9dcbb 100644
> --- a/net/tipc/udp_media.c
> +++ b/net/tipc/udp_media.c
> @@ -825,7 +825,8 @@ struct tipc_media udp_media_info = {
> .msg2addr = tipc_udp_msg2addr,
> .priority = TIPC_DEF_LINK_PRI,
> .tolerance = TIPC_DEF_LINK_TOL,
> - .window = TIPC_DEF_LINK_WIN,
> + .min_win = TIPC_DEF_LINK_WIN,
> + .max_win = TIPC_DEF_LINK_WIN,
> .mtu = TIPC_DEF_LINK_UDP_MTU,
> .type_id = TIPC_MEDIA_TYPE_UDP,
> .hwaddr_len = 0,
> --
> 2.1.4
>
_______________________________________________
tipc-discussion mailing list
tipc-discussion@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tipc-discussion
Re: [tipc-discussion] [net-next v3 1/1] tipc: introduce variable window congestion control
Jon Maloy via tipc-discussion Mon, 25 Nov 2019 14:17:24 -0800
- Re: [tipc-discussion] [net-next v3 1/1] tipc... Tuong Lien Tong
- Re: [tipc-discussion] [net-next v3 1/1]... Jon Maloy via tipc-discussion
- Re: [tipc-discussion] [net-next v3 1/1]... Xue, Ying
- Re: [tipc-discussion] [net-next v3 ... Jon Maloy via tipc-discussion
- Re: [tipc-discussion] [net-next... Ying Xue
