linux-kernel - Re: linux-next: manual merge of the net tree with the net-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTinsNEeTK=SrGpqEjF8VtZZWpiWydgSc+3M854pD@mail.gmail.com>
Date:	Thu, 30 Sep 2010 20:27:05 -0700
From:	Jerry Chu <hkchu@...gle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Damian Lukowski <damian@....rwth-aachen.de>
Subject: Re: linux-next: manual merge of the net tree with the net-current tree

In tcp_write_timeout():

if (retransmits_timed_out(sk, retry_until,
            (1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV) ? 0 :
            icsk->icsk_user_timeout, syn_set)) {

should be simplified to

if (retransmits_timed_out(sk, retry_until,
    syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {


Thanks,

Jerry

On Thu, Sep 30, 2010 at 7:48 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> net/ipv4/tcp_timer.c between commit
> 4d22f7d372f5769c6c0149e427ed6353e2dcfe61 ("net-2.6: SYN retransmits: Add
> new parameter to retransmits_timed_out()") from the net-current tree and
> commit dca43c75e7e545694a9dd6288553f55c53e2a3a3 ("tcp: Add
> TCP_USER_TIMEOUT socket option") from the net tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
>
> diff --cc net/ipv4/tcp_timer.c
> index 74c54b3,baea4a1..0000000
> --- a/net/ipv4/tcp_timer.c
> +++ b/net/ipv4/tcp_timer.c
> @@@ -140,11 -139,9 +140,11 @@@ static void tcp_mtu_probing(struct inet
>   */
>  static bool retransmits_timed_out(struct sock *sk,
>                                  unsigned int boundary,
>  -                                unsigned int timeout)
> ++                                unsigned int timeout,
>  +                                bool syn_set)
>  {
> -       unsigned int timeout, linear_backoff_thresh;
> -       unsigned int start_ts;
> +       unsigned int linear_backoff_thresh, start_ts;
>  +      unsigned int rto_base = syn_set ? TCP_TIMEOUT_INIT : TCP_RTO_MIN;
>
>        if (!inet_csk(sk)->icsk_retransmits)
>                return false;
> @@@ -154,14 -151,15 +154,16 @@@
>        else
>                start_ts = tcp_sk(sk)->retrans_stamp;
>
> -       linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base);
> +       if (likely(timeout == 0)) {
>  -              linear_backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN);
> ++              linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base);
>
> -       if (boundary <= linear_backoff_thresh)
> -               timeout = ((2 << boundary) - 1) * rto_base;
> -       else
> -               timeout = ((2 << linear_backoff_thresh) - 1) * rto_base +
> -                         (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
> +               if (boundary <= linear_backoff_thresh)
>  -                      timeout = ((2 << boundary) - 1) * TCP_RTO_MIN;
> ++                      timeout = ((2 << boundary) - 1) * rto_base;
> +               else
>  -                      timeout = ((2 << linear_backoff_thresh) - 1) * TCP_RTO_MIN +
> ++                      timeout = ((2 << linear_backoff_thresh) - 1) * rto_base +
> +                               (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
>  +
> +       }
>        return (tcp_time_stamp - start_ts) >= timeout;
>  }
>
> @@@ -176,9 -174,8 +178,9 @@@ static int tcp_write_timeout(struct soc
>                if (icsk->icsk_retransmits)
>                        dst_negative_advice(sk);
>                retry_until = icsk->icsk_syn_retries ? : sysctl_tcp_syn_retries;
>  +              syn_set = 1;
>        } else {
> --              if (retransmits_timed_out(sk, sysctl_tcp_retries1, 0)) {
> ++              if (retransmits_timed_out(sk, sysctl_tcp_retries1, 0, 0)) {
>                        /* Black hole detection */
>                        tcp_mtu_probing(icsk, sk);
>
> @@@ -191,14 -188,16 +193,16 @@@
>
>                        retry_until = tcp_orphan_retries(sk, alive);
>                        do_reset = alive ||
> --                                 !retransmits_timed_out(sk, retry_until, 0);
> ++                                 !retransmits_timed_out(sk, retry_until, 0, 0);
>
>                        if (tcp_out_of_resources(sk, do_reset))
>                                return 1;
>                }
>        }
>
> -       if (retransmits_timed_out(sk, retry_until, syn_set)) {
> +       if (retransmits_timed_out(sk, retry_until,
> +           (1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV) ? 0 :
>  -          icsk->icsk_user_timeout)) {
> ++          icsk->icsk_user_timeout, syn_set)) {
>                /* Has it gone just too far? */
>                tcp_write_err(sk);
>                return 1;
> @@@ -440,7 -439,7 +444,7 @@@ out_reset_timer
>                icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX);
>        }
>        inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto, TCP_RTO_MAX);
> --      if (retransmits_timed_out(sk, sysctl_tcp_retries1 + 1, 0))
> ++      if (retransmits_timed_out(sk, sysctl_tcp_retries1 + 1, 0, 0))
>                __sk_dst_reset(sk);
>
>  out:;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/