From: Natale Patriciello <natale.patriciello@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
Eric Dumazet <eric.dumazet@gmail.com>
Cc: netdev <netdev@vger.kernel.org>,
Ahmed Said <ahmed.said@uniroma2.it>,
Natale Patriciello <natale.patriciello@gmail.com>,
Francesco Zampognaro <zampognaro@ing.uniroma2.it>,
Cesare Roseti <roseti@ing.uniroma2.it>
Subject: [RFC PATCH v2 4/5] tcp: added segment sent
Date: Sat, 14 Oct 2017 13:47:13 +0200 [thread overview]
Message-ID: <20171014114714.3694-5-natale.patriciello@gmail.com> (raw)
In-Reply-To: <20171014114714.3694-1-natale.patriciello@gmail.com>
Inform the congestion control of the number of segment sent in normal
conditions, it means segments that left the node without involving
recovery or retransmission procedures.
Signed-off-by: Natale Patriciello <natale.patriciello@gmail.com>
---
include/net/tcp.h | 2 ++
net/ipv4/tcp_output.c | 10 +++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 3561eca5a61f..aebe225ab8b1 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1021,6 +1021,8 @@ struct tcp_congestion_ops {
void (*pacing_timer_expired)(struct sock *sk);
/* get the # segs to send out when the timer expires (optional) */
u32 (*get_segs_per_round)(struct sock *sk);
+ /* the TCP has sent some segments (optional) */
+ void (*segments_sent)(struct sock *sk, u32 sent);
char name[TCP_CA_NAME_MAX];
struct module *owner;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index e37941e4328b..ef50202659da 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2250,6 +2250,7 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
bool is_cwnd_limited = false, is_rwnd_limited = false;
u32 max_segs;
u32 pacing_allowed_segs = 0;
+ bool notify = false;
sent_pkts = 0;
@@ -2268,8 +2269,12 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
if (!tcp_pacing_timer_check(sk)) {
pacing_allowed_segs = 1;
- if (ca_ops && ca_ops->pacing_timer_expired)
+
+ if (ca_ops && ca_ops->pacing_timer_expired) {
ca_ops->pacing_timer_expired(sk);
+ notify = true;
+ }
+
if (ca_ops && ca_ops->get_segs_per_round)
pacing_allowed_segs = ca_ops->get_segs_per_round(sk);
}
@@ -2348,6 +2353,9 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
break;
}
+ if (ca_ops && notify && ca_ops->segments_sent)
+ ca_ops->segments_sent(sk, sent_pkts);
+
if (is_rwnd_limited)
tcp_chrono_start(sk, TCP_CHRONO_RWND_LIMITED);
else
--
2.14.2
next prev parent reply other threads:[~2017-10-14 11:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-14 11:47 [RFC PATCH v2 0/5] TCP Wave Natale Patriciello
2017-10-14 11:47 ` [RFC PATCH v2 1/5] tcp: Added a function to retrieve pacing timer Natale Patriciello
2017-10-14 11:47 ` [RFC PATCH v2 2/5] tcp: implemented pacing_expired Natale Patriciello
2017-10-15 17:30 ` Eric Dumazet
2017-10-14 11:47 ` [RFC PATCH v2 3/5] tcp: added get_segs_per_round Natale Patriciello
2017-10-15 17:32 ` Eric Dumazet
2017-10-14 11:47 ` Natale Patriciello [this message]
2017-10-14 11:47 ` [RFC PATCH v2 5/5] wave: Added TCP Wave Natale Patriciello
2017-10-15 17:43 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171014114714.3694-5-natale.patriciello@gmail.com \
--to=natale.patriciello@gmail.com \
--cc=ahmed.said@uniroma2.it \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=roseti@ing.uniroma2.it \
--cc=zampognaro@ing.uniroma2.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox