From: Ben Hutchings <bhutchings@solarflare.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David Miller <davem@davemloft.net>,
Martin Steigerwald <Martin@lichtvoll.de>,
netdev <netdev@vger.kernel.org>
Subject: Re: [PATCH] tcp: avoid a possible divide by zero
Date: Tue, 07 Dec 2010 21:32:43 +0000 [thread overview]
Message-ID: <1291757563.21627.15.camel@bwh-desktop> (raw)
In-Reply-To: <1291757288.5324.18.camel@edumazet-laptop>
On Tue, 2010-12-07 at 22:28 +0100, Eric Dumazet wrote:
[...]
> Thanks
>
> Great, I feel we are going to fix all sysctls, one by one then :(
>
> lkml removed from Cc
>
>
> [PATCH] tcp: avoid a possible divide by zero
>
> sysctl_tcp_tso_win_divisor might be set to zero while one cpu runs in
> tcp_tso_should_defer(). Make sure we dont allow a divide by zero by
> reading sysctl_tcp_tso_win_divisor once.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> ---
> net/ipv4/tcp_output.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
> index 05b1ecf..0281223 100644
> --- a/net/ipv4/tcp_output.c
> +++ b/net/ipv4/tcp_output.c
> @@ -1513,6 +1513,7 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
> struct tcp_sock *tp = tcp_sk(sk);
> const struct inet_connection_sock *icsk = inet_csk(sk);
> u32 send_win, cong_win, limit, in_flight;
> + int win_divisor;
>
> if (TCP_SKB_CB(skb)->flags & TCPHDR_FIN)
> goto send_now;
> @@ -1544,13 +1545,14 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
> if ((skb != tcp_write_queue_tail(sk)) && (limit >= skb->len))
> goto send_now;
>
> - if (sysctl_tcp_tso_win_divisor) {
> + win_divisor = sysctl_tcp_tso_win_divisor;
You need to use ACCESS_ONCE(sysctl_tcp_tso_win_divisor). Otherwise the
compiler may eliminate the local variable and read the global twice.
Ben.
> + if (win_divisor) {
> u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache);
>
> /* If at least some fraction of a window is available,
> * just use it.
> */
> - chunk /= sysctl_tcp_tso_win_divisor;
> + chunk /= win_divisor;
> if (limit >= chunk)
> goto send_now;
> } else {
>
>
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
next prev parent reply other threads:[~2010-12-07 21:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201012071639.58884.Martin@lichtvoll.de>
2010-12-07 16:12 ` bugs/regressions: report in LKML or in bugzilla? Eric Dumazet
2010-12-07 21:02 ` Ben Hutchings
2010-12-07 21:28 ` [PATCH] tcp: avoid a possible divide by zero Eric Dumazet
2010-12-07 21:32 ` Ben Hutchings [this message]
2010-12-07 22:03 ` Eric Dumazet
2010-12-08 8:23 ` Martin Steigerwald
2010-12-08 8:33 ` Eric Dumazet
2010-12-08 20:35 ` David Miller
2010-12-07 22:20 ` [PATCH] tcp: protect sysctl_tcp_cookie_size reads Eric Dumazet
2010-12-08 20:35 ` David Miller
2010-12-07 21:28 ` bugs/regressions: report in LKML or in bugzilla? Martin Steigerwald
2010-12-07 21:11 ` Martin Steigerwald
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=1291757563.21627.15.camel@bwh-desktop \
--to=bhutchings@solarflare.com \
--cc=Martin@lichtvoll.de \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).