- tor-commits - lists.torproject.org

[torspec] branch main updated: Prop 324: RTT should only be reset after slow start.
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository torspec. The following commit(s) were added to refs/heads/main by this push: new c2e057a Prop 324: RTT should only be reset after slow start. c2e057a is described below commit c2e057a7c39d0dc63a54fe77dfbefa2f3f86d533 Author: Mike Perry <mikeperry-git(a)torproject.org> AuthorDate: Tue Jan 10 20:53:57 2023 +0000 Prop 324: RTT should only be reset after slow start. --- proposals/324-rtt-congestion-control.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/324-rtt-congestion-control.txt b/proposals/324-rtt-congestion-control.txt index 4937744..fd79cbd 100644 --- a/proposals/324-rtt-congestion-control.txt +++ b/proposals/324-rtt-congestion-control.txt @@ -389,12 +389,12 @@ Simplifying: BDP = cwnd * RTT_min / RTT_current_ewma -The RTT_min for this calculation comes from the minimum RTT_current_ewma -seen in the lifetime of this circuit. If the congestion window falls to -`cc_cwnd_min`, implementations MAY choose to reset RTT_min for use in this -calculation to either the RTT_current_ewma, or a percentile-weighted average -between RTT_min and RTT_current_ewma, specified by `cc_rtt_reset_pct`. This -helps with escaping starvation conditions. +The RTT_min for this calculation comes from the minimum RTT_current_ewma seen +in the lifetime of this circuit. If the congestion window falls to +`cc_cwnd_min` after slow start, implementations MAY choose to reset RTT_min +for use in this calculation to either the RTT_current_ewma, or a +percentile-weighted average between RTT_min and RTT_current_ewma, specified by +`cc_rtt_reset_pct`. This helps with escaping starvation conditions. The net effect of this estimation is to correct for any overshoot of the cwnd over the actual BDP. It will obviously underestimate BDP if cwnd -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch release-0.4.7 updated (c1d8db8ba5 -> edf4887e64)
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from c1d8db8ba5 Merge branch 'maint-0.4.7' into release-0.4.7 new 482cde5931 Do not reset our RTT in slow start. new edf4887e64 Merge branch 'maint-0.4.7' into release-0.4.7 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/core/or/congestion_control_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch maint-0.4.7 updated (c50496036b -> 482cde5931)
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.7 in repository tor. from c50496036b cc: Rename function to avoid confusion new 482cde5931 Do not reset our RTT in slow start. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/core/or/congestion_control_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: Do not reset our RTT in slow start.
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 482cde5931 Do not reset our RTT in slow start. new 5d6e0b8e13 Merge branch 'maint-0.4.7' 482cde5931 is described below commit 482cde5931b537d49dc2535bf7a7771d740f441a Author: Mike Perry <mikeperry-git(a)torproject.org> AuthorDate: Tue Jan 10 20:47:11 2023 +0000 Do not reset our RTT in slow start. If a circuit only sends a tiny amount of data such that its cwnd is not full, it won't increase its cwnd above the minimum. Since slow start circuits should never hit the minimum otherwise, we can just ignore them for RTT reset to handle this. --- src/core/or/congestion_control_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/congestion_control_common.c b/src/core/or/congestion_control_common.c index e96d22cbfa..f5b7740bed 100644 --- a/src/core/or/congestion_control_common.c +++ b/src/core/or/congestion_control_common.c @@ -902,7 +902,7 @@ congestion_control_update_circuit_rtt(congestion_control_t *cc, if (cc->min_rtt_usec == 0) { // If we do not have a min_rtt yet, use current ewma cc->min_rtt_usec = cc->ewma_rtt_usec; - } else if (cc->cwnd == cc->cwnd_min) { + } else if (cc->cwnd == cc->cwnd_min && !cc->in_slow_start) { // Raise min rtt if cwnd hit cwnd_min. This gets us out of a wedge state // if we hit cwnd_min due to an abnormally low rtt. uint64_t new_rtt = percent_max_mix(cc->ewma_rtt_usec, cc->min_rtt_usec, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torspec] branch main updated (578145b -> e9598b1)
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository torspec. from 578145b New proposal 342: Decoupling hs_interval and SRV lifetime new 31c3254 tor-spec: fix ambitious formulation in VERSIONS new ad7091d Merge branch 'tor-gitlab/mr/99' new 4d950a2 Prop#324: Do not increase cwnd if the window is not full. new 529cb00 Merge branch 'tor-gitlab/mr/98' new 28d1f63 Document the extra NL that sometimes comes with a descriptor new 93e2f2f Merge branch 'tor-gitlab/mr/94' new bf877ec dir-spec: Expect authority.z to always be available new d3904cb Merge branch 'tor-gitlab/mr/93' new a2c7812 tor-spec: Fix line exceeding 80 characters new e9598b1 Merge branch 'tor-gitlab/mr/92' The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dir-spec.txt | 17 ++- proposals/324-rtt-congestion-control.txt | 184 +++++++++++++++++++++++-------- tor-spec.txt | 6 +- 3 files changed, 155 insertions(+), 52 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 10

[tor] branch release-0.4.7 updated (80748f41af -> c1d8db8ba5)
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from 80748f41af Merge branch 'maint-0.4.7' into release-0.4.7 new 48de1a392e Avoid increasing the congestion window if it is not full. new f4499bb5e2 Clean up next_cc_event handling. new a9a27ffa3a Reduce size of congestion control next_*_event fields. new 5ddd3a9069 Safety fixes to RFC3742 new 894ddb837c Changes file for bug 40732 new c50496036b cc: Rename function to avoid confusion new c1d8db8ba5 Merge branch 'maint-0.4.7' into release-0.4.7 The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/bug40732 | 7 ++ src/core/or/congestion_control_nola.c | 4 +- src/core/or/congestion_control_st.h | 11 +- src/core/or/congestion_control_vegas.c | 162 ++++++++++++++++++++++++++---- src/core/or/congestion_control_westwood.c | 4 +- 5 files changed, 160 insertions(+), 28 deletions(-) create mode 100644 changes/bug40732 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch maint-0.4.7 updated (35e221688b -> c50496036b)
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.7 in repository tor. from 35e221688b Merge branch 'tor-gitlab/mr/675' into maint-0.4.7 new 48de1a392e Avoid increasing the congestion window if it is not full. new f4499bb5e2 Clean up next_cc_event handling. new a9a27ffa3a Reduce size of congestion control next_*_event fields. new 5ddd3a9069 Safety fixes to RFC3742 new 894ddb837c Changes file for bug 40732 new c50496036b cc: Rename function to avoid confusion The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/bug40732 | 7 ++ src/core/or/congestion_control_nola.c | 4 +- src/core/or/congestion_control_st.h | 11 +- src/core/or/congestion_control_vegas.c | 162 ++++++++++++++++++++++++++---- src/core/or/congestion_control_westwood.c | 4 +- 5 files changed, 160 insertions(+), 28 deletions(-) create mode 100644 changes/bug40732 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (c420667a2e -> 33657037a1)
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from c420667a2e Merge branch 'tor-gitlab/mr/676' new 7a06763b22 Avoid increasing the congestion window if it is not full. new 967ae3ab0e Clean up next_cc_event handling. new b7759403bf Reduce size of congestion control next_*_event fields. new 90e67f34a7 Safety fixes to RFC3742 new 5745370666 Changes file for bug 40732 new fd86420d96 cc: Rename function to avoid confusion new 8c017e9cff Merge branch 'mr-674-fixup' into main+mr-674-fixup new d6cf3ca5c1 Merge branch 'tor-gitlab/mr/678' new 48de1a392e Avoid increasing the congestion window if it is not full. new f4499bb5e2 Clean up next_cc_event handling. new a9a27ffa3a Reduce size of congestion control next_*_event fields. new 5ddd3a9069 Safety fixes to RFC3742 new 894ddb837c Changes file for bug 40732 new c50496036b cc: Rename function to avoid confusion new 33657037a1 Merge branch 'maint-0.4.7' The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/bug40732 | 7 ++ src/core/or/congestion_control_nola.c | 4 +- src/core/or/congestion_control_st.h | 11 +- src/core/or/congestion_control_vegas.c | 162 ++++++++++++++++++++++++++---- src/core/or/congestion_control_westwood.c | 4 +- 5 files changed, 160 insertions(+), 28 deletions(-) create mode 100644 changes/bug40732 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 15

[tor] branch main updated: state: Fix segfault on malformed file
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 4db610d6d9 state: Fix segfault on malformed file new c420667a2e Merge branch 'tor-gitlab/mr/676' 4db610d6d9 is described below commit 4db610d6d96f711d3bd1e8f2a0080d83f1f5fcd0 Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Tue Jan 10 09:24:09 2023 -0500 state: Fix segfault on malformed file Having no TotalBuildTimes along a positive CircuitBuildAbandonedCount count lead to a segfault. We check for that condition and then BUG + log warn if that is the case. It should never happened in theory but if someone modified their state file, it can lead to this problem so instead of segfaulting, warn. Fixes #40437 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40437 | 4 ++++ src/core/or/circuitstats.c | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/changes/ticket40437 b/changes/ticket40437 new file mode 100644 index 0000000000..85ba49583c --- /dev/null +++ b/changes/ticket40437 @@ -0,0 +1,4 @@ + o Minor bugfixes (state file): + - Avoid a segfault if the state file doesn't contains TotalBuildTimes along + CircuitBuildAbandonedCount being above 0. Fixes bug 40437; bugfix on + 0.3.5.1-alpha. diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c index c759ddf281..7a6c2014bf 100644 --- a/src/core/or/circuitstats.c +++ b/src/core/or/circuitstats.c @@ -1018,6 +1018,18 @@ circuit_build_times_parse_state(circuit_build_times_t *cbt, return 0; } + /* We had a case where someone removed their TotalBuildTimes from the state + * files while having CircuitBuildAbandonedCount above 0 leading to a + * segfault (#40437). Simply bug on it and return an error so at least the + * user will learn that they broke the state file. */ + if (BUG(state->TotalBuildTimes <= 0 && + state->CircuitBuildAbandonedCount > 0)) { + log_warn(LD_GENERAL, "CircuitBuildAbandonedCount count is above 0 but " + "no TotalBuildTimes have been found. Unable to " + "parse broken state file"); + return -1; + } + /* build_time_t 0 means uninitialized */ loaded_times = tor_calloc(state->TotalBuildTimes, sizeof(build_time_t)); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch release-0.4.7 updated (695066856c -> 80748f41af)
by gitolite role 10 Jan '23

10 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from 695066856c Merge branch 'maint-0.4.7' into release-0.4.7 new 726e9ec0a3 sandbox: Allow my-consensus-* files for an authority new 35e221688b Merge branch 'tor-gitlab/mr/675' into maint-0.4.7 new 80748f41af Merge branch 'maint-0.4.7' into release-0.4.7 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40729 | 3 +++ src/app/main/main.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 changes/ticket40729 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1