Date: Thu, 13 Jul 2017 07:08:40 +0100 From: tj <tj@enoti.me> To: freebsd-transport@freebsd.org, freebsd-net@freebsd.org Subject: Re: [patch] Add support for TCP ABE draft-khademi-tcpm-alternativebackoff-ecn Message-ID: <20170713060839.GB30194@tom-desk.erg.abdn.ac.uk> In-Reply-To: <20170712143649.GD25989@tom-desk.erg.abdn.ac.uk> References: <20170712143649.GD25989@tom-desk.erg.abdn.ac.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
--5vNYLRcllDrimb99 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline > This patch is a port of the same functionality implemented by Naeem Khademi and > is available here: > http://heim.ifi.uio.no/~naeemk/research/ABE/diff-0d38090e881d-newrenoVB-7jan15.txt Pointed out offline, the early work was done by Grenville Armitage garmitage@swin.edu.au and not Naeem. I have also included the patch which is attached to the bug here inline. - [tj] --5vNYLRcllDrimb99 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: inline; filename="abe.diff" diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 392a2f21cd8..5dbf84a0eed 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -68,11 +68,23 @@ __FBSDID("$FreeBSD$"); #include <netinet/cc/cc.h> #include <netinet/cc/cc_module.h> +#define CAST_PTR_INT(X) (*((int*)(X))) + +#ifndef VIMAGE +#define vnet_sysctl_handle_uint(oidp, arg1, arg2, req) \ + sysctl_handle_int(oidp, arg1, arg2, req) +#endif + static void newreno_ack_received(struct cc_var *ccv, uint16_t type); static void newreno_after_idle(struct cc_var *ccv); static void newreno_cong_signal(struct cc_var *ccv, uint32_t type); static void newreno_post_recovery(struct cc_var *ccv); +static VNET_DEFINE(uint32_t, newreno_beta_loss) = 50; +static VNET_DEFINE(uint32_t, newreno_beta_ecn) = 80; +#define V_newreno_beta_loss VNET(newreno_beta_loss) +#define V_newreno_beta_ecn VNET(newreno_beta_ecn) + struct cc_algo newreno_cc_algo = { .name = "newreno", .ack_received = newreno_ack_received, @@ -195,10 +207,14 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type) KASSERT((type & CC_SIGPRIVMASK) == 0, ("%s: congestion signal type 0x%08x is private\n", __func__, type)); - cwin = max(cwin / 2 / mss, 2) * mss; switch (type) { case CC_NDUPACK: + if (V_tcp_do_abe) + cwin = max((cwin * V_newreno_beta_loss)/100 / mss, 2) * mss; + else + cwin = max(cwin / 2 / mss, 2) * mss; + if (!IN_FASTRECOVERY(CCV(ccv, t_flags))) { if (!IN_CONGRECOVERY(CCV(ccv, t_flags))) { CCV(ccv, snd_ssthresh) = ssthresh_on_loss; @@ -208,6 +224,11 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type) } break; case CC_ECN: + if (V_tcp_do_abe) + cwin = max((cwin * V_newreno_beta_ecn)/100 / mss, 2) * mss; + else + cwin = max(cwin / 2 / mss, 2) * mss; + if (!IN_CONGRECOVERY(CCV(ccv, t_flags))) { CCV(ccv, snd_ssthresh) = ssthresh_on_loss; CCV(ccv, snd_cwnd) = cwin; @@ -252,5 +273,28 @@ newreno_post_recovery(struct cc_var *ccv) } } +static int +newreno_beta_handler(SYSCTL_HANDLER_ARGS) +{ + if (req->newptr != NULL && + (CAST_PTR_INT(req->newptr) <= 0 || CAST_PTR_INT(req->newptr) > 100)) + return (EINVAL); + + return (vnet_sysctl_handle_uint(oidp, arg1, arg2, req)); +} + +SYSCTL_DECL(_net_inet_tcp_cc_newreno); +SYSCTL_NODE(_net_inet_tcp_cc, OID_AUTO, newreno, CTLFLAG_RW, NULL, + "New Reno related settings"); + +SYSCTL_PROC(_net_inet_tcp_cc_newreno, OID_AUTO, beta_loss, + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, + &VNET_NAME(newreno_beta_loss), 3, &newreno_beta_handler, "IU", + "newreno beta loss, specified as number between 0 and 100"); + +SYSCTL_PROC(_net_inet_tcp_cc_newreno, OID_AUTO, beta_ecn, + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, + &VNET_NAME(newreno_beta_ecn), 3, &newreno_beta_handler, "IU", + "newreno beta ecn, specified as number between 0 and 100"); DECLARE_CC_MODULE(newreno, &newreno_cc_algo); diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 15e5afffc48..40c0f638ff5 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -181,6 +181,11 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, abc_l_var, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_abc_l_var), 2, "Cap the max cwnd increment during slow-start to this number of segments"); +VNET_DEFINE(int, tcp_do_abe) = 0; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, abe, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(tcp_do_abe), 0, + "Enable ABE for NewReno (Alternative Backoff with ECN)"); + static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); VNET_DEFINE(int, tcp_do_ecn) = 2; diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index d298c9dd6c6..f59c67f294a 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -708,6 +708,7 @@ VNET_DECLARE(int, tcp_recvspace); VNET_DECLARE(int, path_mtu_discovery); VNET_DECLARE(int, tcp_do_rfc3465); VNET_DECLARE(int, tcp_abc_l_var); +VNET_DECLARE(int, tcp_do_abe); #define V_tcb VNET(tcb) #define V_tcbinfo VNET(tcbinfo) #define V_tcp_mssdflt VNET(tcp_mssdflt) @@ -720,6 +721,7 @@ VNET_DECLARE(int, tcp_abc_l_var); #define V_path_mtu_discovery VNET(path_mtu_discovery) #define V_tcp_do_rfc3465 VNET(tcp_do_rfc3465) #define V_tcp_abc_l_var VNET(tcp_abc_l_var) +#define V_tcp_do_abe VNET(tcp_do_abe) VNET_DECLARE(int, tcp_do_sack); /* SACK enabled/disabled */ VNET_DECLARE(int, tcp_sc_rst_sock_fail); /* RST on sock alloc failure */ --5vNYLRcllDrimb99--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170713060839.GB30194>