This is an automated email from the git hooks/post-receive script.
dgoulet pushed a change to branch main in repository tor.
from 863428d753 Merge branch 'tor-gitlab/mr/627' new d634a5ebc7 relay: Remove unused conn->ext_or_conn_id new fb206d284c Merge branch 'maint-0.4.7' new 87e820a0c5 metrics: Add stats for num circ reaching max cell outq new c565ef9c58 metrics: Add running average of CC cwnd when exiting slow start new a0e72fcb97 metrics: Add running average of CC cwnd when closing circuit new 62ce557b0b metrics: Add stats when reaching vegas delta or ss_cwnd_max new f270d20cb0 changes: Add file for ticket 40708 new 83fdaff7c0 metrics: Add running average of CC cwnd in slow start when closing circuit new 2f7e05d89d metrics: Add stats when the clock stalls. new fec9757a37 metrics: Add flow control metrics. new 2066e0494c math: Replace naughty macro by an inline function new fde87096c3 Merge branch 'tor-gitlab/mr/650' into maint-0.4.7 new 2adc73afdb Merge branch 'maint-0.4.7' new 00633bc619 metrics: Report amount of cwnd drop from delta and gamma new 56ee2131f1 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/ticket40708 | 3 + src/core/or/circuitlist.c | 34 +++++++++ src/core/or/circuitlist.h | 4 ++ src/core/or/congestion_control_common.c | 11 +++ src/core/or/congestion_control_common.h | 1 + src/core/or/congestion_control_flow.c | 25 +++++++ src/core/or/congestion_control_flow.h | 6 ++ src/core/or/congestion_control_vegas.c | 47 +++++++++++++ src/core/or/congestion_control_vegas.h | 6 ++ src/core/or/relay.c | 2 + src/core/or/relay.h | 1 + src/feature/relay/relay_metrics.c | 119 +++++++++++++++++++++++++++++++- src/lib/math/include.am | 3 +- src/lib/math/stats.h | 22 ++++++ 14 files changed, 281 insertions(+), 3 deletions(-) create mode 100644 changes/ticket40708 create mode 100644 src/lib/math/stats.h
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 87e820a0c54e57fc282bb5d2472ef775504be8e0 Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Nov 3 09:37:38 2022 -0400
metrics: Add stats for num circ reaching max cell outq
Part of #40708
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/relay.c | 2 ++ src/core/or/relay.h | 1 + src/feature/relay/relay_metrics.c | 6 ++++++ 3 files changed, 9 insertions(+)
diff --git a/src/core/or/relay.c b/src/core/or/relay.c index d77c47100a..39a7b783ab 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -128,6 +128,7 @@ uint64_t stats_n_relay_cells_delivered = 0; /** Stats: how many circuits have we closed due to the cell queue limit being * reached (see append_cell_to_circuit_queue()) */ uint64_t stats_n_circ_max_cell_reached = 0; +uint64_t stats_n_circ_max_cell_outq_reached = 0;
/** * Update channel usage state based on the type of relay cell and @@ -3252,6 +3253,7 @@ append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, /* This DoS defense only applies at the Guard as in the p_chan is likely * a client IP attacking the network. */ if (exitward && CIRCUIT_IS_ORCIRC(circ)) { + stats_n_circ_max_cell_outq_reached++; dos_note_circ_max_outq(CONST_TO_OR_CIRCUIT(circ)->p_chan); }
diff --git a/src/core/or/relay.h b/src/core/or/relay.h index 24466bccd0..3a1f3b0ae5 100644 --- a/src/core/or/relay.h +++ b/src/core/or/relay.h @@ -15,6 +15,7 @@ extern uint64_t stats_n_relay_cells_relayed; extern uint64_t stats_n_relay_cells_delivered; extern uint64_t stats_n_circ_max_cell_reached; +extern uint64_t stats_n_circ_max_cell_outq_reached;
const char *relay_command_to_string(uint8_t command);
diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index cc36736831..c7f6fe8846 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -314,6 +314,12 @@ fill_dos_values(void) metrics_format_label("type", "circuit_killed_max_cell")); metrics_store_entry_update(sentry, stats_n_circ_max_cell_reached);
+ sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("type", "circuit_killed_max_cell_outq")); + metrics_store_entry_update(sentry, stats_n_circ_max_cell_outq_reached); + sentry = metrics_store_add(the_store, rentry->type, rentry->name, rentry->help); metrics_store_entry_add_label(sentry,
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit c565ef9c58546a815431d575c9ad16fb0bf2dc22 Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Nov 3 10:43:37 2022 -0400
metrics: Add running average of CC cwnd when exiting slow start
Part of #40708
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/congestion_control_vegas.c | 11 +++++++++++ src/core/or/congestion_control_vegas.h | 2 ++ src/feature/relay/relay_metrics.c | 16 ++++++++++++++-- src/lib/math/include.am | 3 ++- src/lib/math/stats.h | 19 +++++++++++++++++++ 5 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/src/core/or/congestion_control_vegas.c b/src/core/or/congestion_control_vegas.c index f129ecadd6..de89f294aa 100644 --- a/src/core/or/congestion_control_vegas.c +++ b/src/core/or/congestion_control_vegas.c @@ -23,6 +23,7 @@ #include "core/or/channel.h" #include "feature/nodelist/networkstatus.h" #include "feature/control/control_events.h" +#include "lib/math/stats.h"
#define OUTBUF_CELLS (2*TLS_RECORD_MAX_CELLS)
@@ -49,6 +50,11 @@ #define VEGAS_DELTA_ONION_DFLT (9*OUTBUF_CELLS) #define VEGAS_SSCAP_ONION_DFLT (600)
+/** Moving average of the cc->cwnd from each circuit exiting slowstart. */ +double cc_stats_vegas_exit_ss_cwnd_ma = 0; +/* Running count of this moving average. Needed so we can update it. */ +static double stats_cwnd_exit_ss_ma_count = 0; + /** * The original TCP Vegas congestion window BDP estimator. */ @@ -243,6 +249,11 @@ congestion_control_vegas_exit_slow_start(const circuit_t *circ, cc->next_cc_event = CWND_UPDATE_RATE(cc); congestion_control_vegas_log(circ, cc);
+ /* Update running cc->cwnd average for metrics. */ + stats_cwnd_exit_ss_ma_count++; + STATS_UPDATE_AVG(cc_stats_vegas_exit_ss_cwnd_ma, + cc->cwnd, stats_cwnd_exit_ss_ma_count); + /* We need to report that slow start has exited ASAP, * for sbws bandwidth measurement. */ if (CIRCUIT_IS_ORIGIN(circ)) { diff --git a/src/core/or/congestion_control_vegas.h b/src/core/or/congestion_control_vegas.h index 95fcea5722..71f0ea571d 100644 --- a/src/core/or/congestion_control_vegas.h +++ b/src/core/or/congestion_control_vegas.h @@ -12,6 +12,8 @@ #include "core/or/crypt_path_st.h" #include "core/or/circuit_st.h"
+extern double cc_stats_vegas_exit_ss_cwnd_ma; + /* Processing SENDME cell. */ int congestion_control_vegas_process_sendme(struct congestion_control_t *cc, const circuit_t *circ, diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index c7f6fe8846..1bfbfbd898 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -14,16 +14,18 @@ #include "core/mainloop/connection.h" #include "core/mainloop/mainloop.h" #include "core/or/congestion_control_common.h" +#include "core/or/congestion_control_vegas.h" #include "core/or/circuitlist.h" #include "core/or/dos.h" #include "core/or/relay.h"
#include "app/config/config.h"
-#include "lib/malloc/malloc.h" #include "lib/container/smartlist.h" -#include "lib/metrics/metrics_store.h" #include "lib/log/util_bug.h" +#include "lib/malloc/malloc.h" +#include "lib/math/fp.h" +#include "lib/metrics/metrics_store.h"
#include "feature/hs/hs_dos.h" #include "feature/nodelist/nodelist.h" @@ -370,6 +372,16 @@ fill_cc_values(void) metrics_store_entry_add_label(sentry, metrics_format_label("action", "rtt_reset")); metrics_store_entry_update(sentry, congestion_control_get_num_rtt_reset()); + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "slow_start_exit")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "cwnd")); + metrics_store_entry_update(sentry, + tor_llround(cc_stats_vegas_exit_ss_cwnd_ma)); }
/** Helper: Fill in single stream metrics output. */ diff --git a/src/lib/math/include.am b/src/lib/math/include.am index b2ca280f47..f68b265da7 100644 --- a/src/lib/math/include.am +++ b/src/lib/math/include.am @@ -20,4 +20,5 @@ src_lib_libtor_math_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/math/fp.h \ src/lib/math/laplace.h \ - src/lib/math/prob_distr.h + src/lib/math/prob_distr.h \ + src/lib/math/stats.h diff --git a/src/lib/math/stats.h b/src/lib/math/stats.h new file mode 100644 index 0000000000..fae93c6213 --- /dev/null +++ b/src/lib/math/stats.h @@ -0,0 +1,19 @@ +/* Copyright (c) 2022, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file stats.h + * + * \brief Header for stats.c + **/ + +#ifndef TOR_STATS_H +#define TOR_STATS_H + +/** Update an average making it a "running average". The "avg" is the current + * value that will be updated to the new one. The "value" is the new value to + * add to the average and "n" is the new count as in including the "value". */ +#define STATS_UPDATE_AVG(avg, value, n) \ + avg = ((avg) * ((n) - 1) + (value)) / (n) + +#endif /* !defined(TOR_STATS_H) */
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit a0e72fcb976e38de20bf53629c96a489dc626096 Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Nov 3 12:41:21 2022 -0400
metrics: Add running average of CC cwnd when closing circuit
Part of #40708
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/circuitlist.c | 14 ++++++++++++++ src/core/or/circuitlist.h | 3 +++ src/feature/relay/relay_metrics.c | 10 ++++++++++ 3 files changed, 27 insertions(+)
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index 4dbf4d4549..b21d95ade7 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -102,6 +102,8 @@ #include "lib/compress/compress_zstd.h" #include "lib/buf/buffers.h" #include "core/or/congestion_control_common.h" +#include "core/or/congestion_control_st.h" +#include "lib/math/stats.h"
#include "core/or/ocirc_event.h"
@@ -147,6 +149,11 @@ static void circuit_about_to_free(circuit_t *circ); */ static int any_opened_circs_cached_val = 0;
+/** Moving average of the cc->cwnd from each closed circuit. */ +double cc_stats_circ_close_cwnd_ma = 0; +/* Running count of this moving average. Needed so we can update it. */ +static double stats_circ_close_cwnd_ma_count = 0; + /********* END VARIABLES ************/
/* Implement circuit handle helpers. */ @@ -2225,6 +2232,13 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line, /* Notify the HS subsystem that this circuit is closing. */ hs_circ_cleanup_on_close(circ);
+ /* Update stats. */ + if (circ->ccontrol) { + stats_circ_close_cwnd_ma_count++; + STATS_UPDATE_AVG(cc_stats_circ_close_cwnd_ma, + circ->ccontrol->cwnd, stats_circ_close_cwnd_ma_count); + } + if (circuits_pending_close == NULL) circuits_pending_close = smartlist_new();
diff --git a/src/core/or/circuitlist.h b/src/core/or/circuitlist.h index 147e2cb2f8..1a99083bc6 100644 --- a/src/core/or/circuitlist.h +++ b/src/core/or/circuitlist.h @@ -161,6 +161,9 @@ ((p) == CIRCUIT_PURPOSE_C_GENERAL || \ (p) == CIRCUIT_PURPOSE_C_HSDIR_GET)
+/** Stats. */ +extern double cc_stats_circ_close_cwnd_ma; + /** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert * if the cast is impossible. */ or_circuit_t *TO_OR_CIRCUIT(circuit_t *); diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index 1bfbfbd898..c034ca02bd 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -382,6 +382,16 @@ fill_cc_values(void) metrics_format_label("action", "cwnd")); metrics_store_entry_update(sentry, tor_llround(cc_stats_vegas_exit_ss_cwnd_ma)); + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "on_circ_close")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "cwnd")); + metrics_store_entry_update(sentry, + tor_llround(cc_stats_circ_close_cwnd_ma)); }
/** Helper: Fill in single stream metrics output. */
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 62ce557b0baaa463c523c71eb640cc4f4cff590f Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Nov 3 13:12:47 2022 -0400
metrics: Add stats when reaching vegas delta or ss_cwnd_max
Part of #40708
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/congestion_control_vegas.c | 7 +++++++ src/core/or/congestion_control_vegas.h | 2 ++ src/feature/relay/relay_metrics.c | 16 ++++++++++++++++ 3 files changed, 25 insertions(+)
diff --git a/src/core/or/congestion_control_vegas.c b/src/core/or/congestion_control_vegas.c index de89f294aa..0aecf592aa 100644 --- a/src/core/or/congestion_control_vegas.c +++ b/src/core/or/congestion_control_vegas.c @@ -55,6 +55,11 @@ double cc_stats_vegas_exit_ss_cwnd_ma = 0; /* Running count of this moving average. Needed so we can update it. */ static double stats_cwnd_exit_ss_ma_count = 0;
+/** Stats on how many times we reached "delta" param. */ +uint64_t cc_stats_vegas_above_delta = 0; +/** Stats on how many times we reached "ss_cwnd_max" param. */ +uint64_t cc_stats_vegas_above_ss_cwnd_max = 0; + /** * The original TCP Vegas congestion window BDP estimator. */ @@ -333,11 +338,13 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc, if (cc->cwnd >= cc->vegas_params.ss_cwnd_max) { cc->cwnd = cc->vegas_params.ss_cwnd_max; congestion_control_vegas_exit_slow_start(circ, cc); + cc_stats_vegas_above_ss_cwnd_max++; } /* After slow start, We only update once per window */ } else if (cc->next_cc_event == 0) { if (queue_use > cc->vegas_params.delta) { cc->cwnd = vegas_bdp(cc) + cc->vegas_params.delta - CWND_INC(cc); + cc_stats_vegas_above_delta++; } else if (queue_use > cc->vegas_params.beta || cc->blocked_chan) { cc->cwnd -= CWND_INC(cc); } else if (queue_use < cc->vegas_params.alpha) { diff --git a/src/core/or/congestion_control_vegas.h b/src/core/or/congestion_control_vegas.h index 71f0ea571d..5aced07a8f 100644 --- a/src/core/or/congestion_control_vegas.h +++ b/src/core/or/congestion_control_vegas.h @@ -13,6 +13,8 @@ #include "core/or/circuit_st.h"
extern double cc_stats_vegas_exit_ss_cwnd_ma; +extern uint64_t cc_stats_vegas_above_delta; +extern uint64_t cc_stats_vegas_above_ss_cwnd_max;
/* Processing SENDME cell. */ int congestion_control_vegas_process_sendme(struct congestion_control_t *cc, diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index c034ca02bd..b95ca4ba06 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -392,6 +392,22 @@ fill_cc_values(void) metrics_format_label("action", "cwnd")); metrics_store_entry_update(sentry, tor_llround(cc_stats_circ_close_cwnd_ma)); + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "process_sendme")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "above_delta")); + metrics_store_entry_update(sentry, cc_stats_vegas_above_delta); + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "process_sendme")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "above_ss_cwnd_max")); + metrics_store_entry_update(sentry, cc_stats_vegas_above_ss_cwnd_max); }
/** Helper: Fill in single stream metrics output. */
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit f270d20cb0a29ffb3e33434f353cbf315a4d1a52 Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Nov 3 13:14:04 2022 -0400
changes: Add file for ticket 40708
Closes #40708
Signed-off-by: David Goulet dgoulet@torproject.org --- changes/ticket40708 | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/changes/ticket40708 b/changes/ticket40708 new file mode 100644 index 0000000000..1c4a044a0b --- /dev/null +++ b/changes/ticket40708 @@ -0,0 +1,3 @@ + o Minor feature (metrics): + - Add various congestion control counters to the MetricsPort. Closes ticket + 40708.
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 83fdaff7c0920c8943b483e4146d2762b8e6ca94 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Thu Nov 3 19:48:16 2022 +0000
metrics: Add running average of CC cwnd in slow start when closing circuit
Count slow start separately.
Part of #40708
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/circuitlist.c | 24 ++++++++++++++++++++---- src/core/or/circuitlist.h | 1 + src/feature/relay/relay_metrics.c | 11 +++++++++-- 3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index b21d95ade7..ddcb9bebe4 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -151,8 +151,12 @@ static int any_opened_circs_cached_val = 0;
/** Moving average of the cc->cwnd from each closed circuit. */ double cc_stats_circ_close_cwnd_ma = 0; -/* Running count of this moving average. Needed so we can update it. */ +/** Moving average of the cc->cwnd from each closed slow-start circuit. */ +double cc_stats_circ_close_ss_cwnd_ma = 0; + +/* Running count of the above moving averages. Needed so we can update it. */ static double stats_circ_close_cwnd_ma_count = 0; +static double stats_circ_close_ss_cwnd_ma_count = 0;
/********* END VARIABLES ************/
@@ -2234,9 +2238,21 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line,
/* Update stats. */ if (circ->ccontrol) { - stats_circ_close_cwnd_ma_count++; - STATS_UPDATE_AVG(cc_stats_circ_close_cwnd_ma, - circ->ccontrol->cwnd, stats_circ_close_cwnd_ma_count); + if (circ->ccontrol->in_slow_start) { + /* If we are in slow start, only count the ss cwnd if we've sent + * enough data to get RTT measurements such that we have a min + * and a max RTT, and they are not the same. This prevents us from + * averaging and reporting unused and low-use circuits here */ + if (circ->ccontrol->max_rtt_usec != circ->ccontrol->min_rtt_usec) { + stats_circ_close_ss_cwnd_ma_count++; + STATS_UPDATE_AVG(cc_stats_circ_close_ss_cwnd_ma, + circ->ccontrol->cwnd, stats_circ_close_ss_cwnd_ma_count); + } + } else { + stats_circ_close_cwnd_ma_count++; + STATS_UPDATE_AVG(cc_stats_circ_close_cwnd_ma, + circ->ccontrol->cwnd, stats_circ_close_cwnd_ma_count); + } }
if (circuits_pending_close == NULL) diff --git a/src/core/or/circuitlist.h b/src/core/or/circuitlist.h index 1a99083bc6..281ea1f76f 100644 --- a/src/core/or/circuitlist.h +++ b/src/core/or/circuitlist.h @@ -163,6 +163,7 @@
/** Stats. */ extern double cc_stats_circ_close_cwnd_ma; +extern double cc_stats_circ_close_ss_cwnd_ma;
/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert * if the cast is impossible. */ diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index b95ca4ba06..9ceb61836e 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -375,7 +375,6 @@ fill_cc_values(void)
sentry = metrics_store_add(the_store, rentry->type, rentry->name, rentry->help); - metrics_store_entry_add_label(sentry, metrics_format_label("state", "slow_start_exit")); metrics_store_entry_add_label(sentry, @@ -385,7 +384,6 @@ fill_cc_values(void)
sentry = metrics_store_add(the_store, rentry->type, rentry->name, rentry->help); - metrics_store_entry_add_label(sentry, metrics_format_label("state", "on_circ_close")); metrics_store_entry_add_label(sentry, @@ -393,6 +391,15 @@ fill_cc_values(void) metrics_store_entry_update(sentry, tor_llround(cc_stats_circ_close_cwnd_ma));
+ sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "on_circ_close")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "ss_cwnd")); + metrics_store_entry_update(sentry, + tor_llround(cc_stats_circ_close_ss_cwnd_ma)); + sentry = metrics_store_add(the_store, rentry->type, rentry->name, rentry->help); metrics_store_entry_add_label(sentry,
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 2f7e05d89d710f09bff9377edfb6d30e78163084 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Thu Nov 3 20:08:01 2022 +0000
metrics: Add stats when the clock stalls.
Part of #40708. --- src/core/or/congestion_control_common.c | 11 +++++++++++ src/core/or/congestion_control_common.h | 1 + src/feature/relay/relay_metrics.c | 9 +++++++++ 3 files changed, 21 insertions(+)
diff --git a/src/core/or/congestion_control_common.c b/src/core/or/congestion_control_common.c index 09d1d501da..c27eb2fca8 100644 --- a/src/core/or/congestion_control_common.c +++ b/src/core/or/congestion_control_common.c @@ -94,6 +94,9 @@ void congestion_control_set_cc_enabled(void); /* Number of times the RTT value was reset. For MetricsPort. */ static uint64_t num_rtt_reset;
+/* Number of times the clock was stalled. For MetricsPort. */ +static uint64_t num_clock_stalls; + /* Consensus parameters cached. The non static ones are extern. */ static uint32_t cwnd_max = CWND_MAX_DFLT; int32_t cell_queue_high = CELL_QUEUE_HIGH_DFLT; @@ -136,6 +139,13 @@ congestion_control_get_num_rtt_reset(void) return num_rtt_reset; }
+/** Return the number of clock stalls that have been done. */ +uint64_t +congestion_control_get_num_clock_stalls(void) +{ + return num_clock_stalls; +} + /** * Update global congestion control related consensus parameter values, * every consensus update. @@ -872,6 +882,7 @@ congestion_control_update_circuit_rtt(congestion_control_t *cc,
/* Do not update RTT at all if it looks fishy */ if (time_delta_stalled_or_jumped(cc, cc->ewma_rtt_usec, rtt)) { + num_clock_stalls++; /* Accounting */ return 0; }
diff --git a/src/core/or/congestion_control_common.h b/src/core/or/congestion_control_common.h index e62775ecce..a2740fb0b6 100644 --- a/src/core/or/congestion_control_common.h +++ b/src/core/or/congestion_control_common.h @@ -83,6 +83,7 @@ bool congestion_control_validate_sendme_increment(uint8_t sendme_inc); char *congestion_control_get_control_port_fields(const origin_circuit_t *);
uint64_t congestion_control_get_num_rtt_reset(void); +uint64_t congestion_control_get_num_clock_stalls(void);
/* Ugh, C.. these are private. Use the getter instead, when * external to the congestion control code. */ diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index 9ceb61836e..af59eb3dcc 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -373,6 +373,15 @@ fill_cc_values(void) metrics_format_label("action", "rtt_reset")); metrics_store_entry_update(sentry, congestion_control_get_num_rtt_reset());
+ sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "clock_stalls")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "rtt_skipped")); + metrics_store_entry_update(sentry, + congestion_control_get_num_clock_stalls()); + sentry = metrics_store_add(the_store, rentry->type, rentry->name, rentry->help); metrics_store_entry_add_label(sentry,
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit fec9757a37d9e2700802a7ebfc87b4fd33070983 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Thu Nov 3 21:27:08 2022 +0000
metrics: Add flow control metrics.
Part of #40708. --- src/core/or/congestion_control_flow.c | 21 ++++++++++++++++++++ src/core/or/congestion_control_flow.h | 6 ++++++ src/feature/relay/relay_metrics.c | 37 +++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+)
diff --git a/src/core/or/congestion_control_flow.c b/src/core/or/congestion_control_flow.c index ea2c0df42c..cc120acd29 100644 --- a/src/core/or/congestion_control_flow.c +++ b/src/core/or/congestion_control_flow.c @@ -23,6 +23,7 @@ #include "feature/nodelist/networkstatus.h" #include "trunnel/flow_control_cells.h" #include "feature/control/control_events.h" +#include "lib/math/stats.h"
#include "core/or/connection_st.h" #include "core/or/cell_st.h" @@ -36,6 +37,14 @@ static uint32_t xon_change_pct; static uint32_t xon_ewma_cnt; static uint32_t xon_rate_bytes;
+/** Metricsport stats */ +uint64_t cc_stats_flow_num_xoff_sent; +uint64_t cc_stats_flow_num_xon_sent; +double cc_stats_flow_xoff_outbuf_ma = 0; +static double cc_stats_flow_xoff_outbuf_ma_count = 0; +double cc_stats_flow_xon_outbuf_ma = 0; +static double cc_stats_flow_xon_outbuf_ma_count = 0; + /* In normal operation, we can get a burst of up to 32 cells before returning * to libevent to flush the outbuf. This is a heuristic from hardcoded values * and strange logic in connection_bucket_get_share(). */ @@ -148,6 +157,7 @@ circuit_send_stream_xoff(edge_connection_t *stream) if (connection_edge_send_command(stream, RELAY_COMMAND_XOFF, (char*)payload, (size_t)xoff_size) == 0) { stream->xoff_sent = true; + cc_stats_flow_num_xoff_sent++;
/* If this is an entry conn, notify control port */ if (TO_CONN(stream)->type == CONN_TYPE_AP) { @@ -222,6 +232,8 @@ circuit_send_stream_xon(edge_connection_t *stream) /* Revert the xoff sent status, so we can send another one if need be */ stream->xoff_sent = false;
+ cc_stats_flow_num_xon_sent++; + /* If it's an entry conn, notify control port */ if (TO_CONN(stream)->type == CONN_TYPE_AP) { control_event_stream_status(TO_ENTRY_CONN(TO_CONN(stream)), @@ -473,6 +485,10 @@ flow_control_decide_xoff(edge_connection_t *stream) total_buffered, buffer_limit_xoff); tor_trace(TR_SUBSYS(cc), TR_EV(flow_decide_xoff_sending), stream);
+ cc_stats_flow_xoff_outbuf_ma_count++; + STATS_UPDATE_AVG(cc_stats_flow_xoff_outbuf_ma, + total_buffered, cc_stats_flow_xoff_outbuf_ma_count); + circuit_send_stream_xoff(stream);
/* Clear the drain rate. It is considered wrong if we @@ -627,6 +643,11 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) stream->ewma_drain_rate, total_buffered); tor_trace(TR_SUBSYS(cc), TR_EV(flow_decide_xon_rate_change), stream); + + cc_stats_flow_xon_outbuf_ma_count++; + STATS_UPDATE_AVG(cc_stats_flow_xon_outbuf_ma, + total_buffered, cc_stats_flow_xon_outbuf_ma_count); + circuit_send_stream_xon(stream); } } else if (total_buffered == 0) { diff --git a/src/core/or/congestion_control_flow.h b/src/core/or/congestion_control_flow.h index 6c318027ea..5c735cce23 100644 --- a/src/core/or/congestion_control_flow.h +++ b/src/core/or/congestion_control_flow.h @@ -33,6 +33,12 @@ bool conn_uses_flow_control(connection_t *stream);
uint64_t edge_get_max_rtt(const edge_connection_t *);
+/** Metricsport externs */ +extern uint64_t cc_stats_flow_num_xoff_sent; +extern uint64_t cc_stats_flow_num_xon_sent; +extern double cc_stats_flow_xoff_outbuf_ma; +extern double cc_stats_flow_xon_outbuf_ma; + /* Private section starts. */ #ifdef TOR_CONGESTION_CONTROL_FLOW_PRIVATE
diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index af59eb3dcc..076ac68618 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -15,6 +15,7 @@ #include "core/mainloop/mainloop.h" #include "core/or/congestion_control_common.h" #include "core/or/congestion_control_vegas.h" +#include "core/or/congestion_control_flow.h" #include "core/or/circuitlist.h" #include "core/or/dos.h" #include "core/or/relay.h" @@ -409,6 +410,42 @@ fill_cc_values(void) metrics_store_entry_update(sentry, tor_llround(cc_stats_circ_close_ss_cwnd_ma));
+ sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "xoff")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "outbuf")); + metrics_store_entry_update(sentry, + tor_llround(cc_stats_flow_xoff_outbuf_ma)); + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "xoff")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "num_sent")); + metrics_store_entry_update(sentry, + cc_stats_flow_num_xoff_sent); + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "xon")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "outbuf")); + metrics_store_entry_update(sentry, + tor_llround(cc_stats_flow_xon_outbuf_ma)); + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "xon")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "num_sent")); + metrics_store_entry_update(sentry, + cc_stats_flow_num_xon_sent); + sentry = metrics_store_add(the_store, rentry->type, rentry->name, rentry->help); metrics_store_entry_add_label(sentry,
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 2066e0494c5ddb51af6decbe6941ea3495603fe2 Author: David Goulet dgoulet@torproject.org AuthorDate: Mon Nov 7 10:01:47 2022 -0500
math: Replace naughty macro by an inline function
Part of #40708
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/circuitlist.c | 12 ++++++++---- src/core/or/congestion_control_flow.c | 12 ++++++++---- src/core/or/congestion_control_vegas.c | 5 +++-- src/lib/math/stats.h | 7 +++++-- 4 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index ddcb9bebe4..d1c734bdd2 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -2245,13 +2245,17 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line, * averaging and reporting unused and low-use circuits here */ if (circ->ccontrol->max_rtt_usec != circ->ccontrol->min_rtt_usec) { stats_circ_close_ss_cwnd_ma_count++; - STATS_UPDATE_AVG(cc_stats_circ_close_ss_cwnd_ma, - circ->ccontrol->cwnd, stats_circ_close_ss_cwnd_ma_count); + cc_stats_circ_close_ss_cwnd_ma = + stats_update_running_avg(cc_stats_circ_close_ss_cwnd_ma, + circ->ccontrol->cwnd, + stats_circ_close_ss_cwnd_ma_count); } } else { stats_circ_close_cwnd_ma_count++; - STATS_UPDATE_AVG(cc_stats_circ_close_cwnd_ma, - circ->ccontrol->cwnd, stats_circ_close_cwnd_ma_count); + cc_stats_circ_close_cwnd_ma = + stats_update_running_avg(cc_stats_circ_close_cwnd_ma, + circ->ccontrol->cwnd, + stats_circ_close_cwnd_ma_count); } }
diff --git a/src/core/or/congestion_control_flow.c b/src/core/or/congestion_control_flow.c index cc120acd29..729e67b9a3 100644 --- a/src/core/or/congestion_control_flow.c +++ b/src/core/or/congestion_control_flow.c @@ -486,8 +486,10 @@ flow_control_decide_xoff(edge_connection_t *stream) tor_trace(TR_SUBSYS(cc), TR_EV(flow_decide_xoff_sending), stream);
cc_stats_flow_xoff_outbuf_ma_count++; - STATS_UPDATE_AVG(cc_stats_flow_xoff_outbuf_ma, - total_buffered, cc_stats_flow_xoff_outbuf_ma_count); + cc_stats_flow_xoff_outbuf_ma = + stats_update_running_avg(cc_stats_flow_xoff_outbuf_ma, + total_buffered, + cc_stats_flow_xoff_outbuf_ma_count);
circuit_send_stream_xoff(stream);
@@ -645,8 +647,10 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) tor_trace(TR_SUBSYS(cc), TR_EV(flow_decide_xon_rate_change), stream);
cc_stats_flow_xon_outbuf_ma_count++; - STATS_UPDATE_AVG(cc_stats_flow_xon_outbuf_ma, - total_buffered, cc_stats_flow_xon_outbuf_ma_count); + cc_stats_flow_xon_outbuf_ma = + stats_update_running_avg(cc_stats_flow_xon_outbuf_ma, + total_buffered, + cc_stats_flow_xon_outbuf_ma_count);
circuit_send_stream_xon(stream); } diff --git a/src/core/or/congestion_control_vegas.c b/src/core/or/congestion_control_vegas.c index 0aecf592aa..87f59d12fd 100644 --- a/src/core/or/congestion_control_vegas.c +++ b/src/core/or/congestion_control_vegas.c @@ -256,8 +256,9 @@ congestion_control_vegas_exit_slow_start(const circuit_t *circ,
/* Update running cc->cwnd average for metrics. */ stats_cwnd_exit_ss_ma_count++; - STATS_UPDATE_AVG(cc_stats_vegas_exit_ss_cwnd_ma, - cc->cwnd, stats_cwnd_exit_ss_ma_count); + cc_stats_vegas_exit_ss_cwnd_ma = + stats_update_running_avg(cc_stats_vegas_exit_ss_cwnd_ma, + cc->cwnd, stats_cwnd_exit_ss_ma_count);
/* We need to report that slow start has exited ASAP, * for sbws bandwidth measurement. */ diff --git a/src/lib/math/stats.h b/src/lib/math/stats.h index fae93c6213..328d61a9d6 100644 --- a/src/lib/math/stats.h +++ b/src/lib/math/stats.h @@ -13,7 +13,10 @@ /** Update an average making it a "running average". The "avg" is the current * value that will be updated to the new one. The "value" is the new value to * add to the average and "n" is the new count as in including the "value". */ -#define STATS_UPDATE_AVG(avg, value, n) \ - avg = ((avg) * ((n) - 1) + (value)) / (n) +static inline double +stats_update_running_avg(double avg, double value, double n) +{ + return ((avg * (n - 1)) + value) / n; +}
#endif /* !defined(TOR_STATS_H) */
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit d634a5ebc75728b5b9cce1772713ed14fcb4fd52 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Jul 26 11:18:15 2022 -0400
relay: Remove unused conn->ext_or_conn_id
This also incidently removes a use of uninitialized stack data from the connection_or_set_ext_or_identifier() function.
Fixes #40648
Signed-off-by: David Goulet dgoulet@torproject.org --- changes/ticket40648 | 3 +++ src/core/mainloop/connection.c | 2 -- src/core/or/or_connection_st.h | 2 -- src/feature/relay/ext_orport.c | 13 ------------- src/feature/relay/ext_orport.h | 4 ---- 5 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/changes/ticket40648 b/changes/ticket40648 new file mode 100644 index 0000000000..a891e30204 --- /dev/null +++ b/changes/ticket40648 @@ -0,0 +1,3 @@ + o Code simplification and refactoring (bridges): + - Remove unused code related to ExtPort connection ID. Fixes bug 40648; + bugfix on 0.3.5.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 8bb3534b28..0a39a7b1ff 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -590,7 +590,6 @@ or_connection_new(int type, int socket_family) /* If we aren't told an address for this connection, we should * presume it isn't local, and should be rate-limited. */ TO_CONN(or_conn)->always_rate_limit_as_remote = 1; - connection_or_set_ext_or_identifier(or_conn); }
return or_conn; @@ -960,7 +959,6 @@ connection_free_minimal(connection_t *conn) connection_or_clear_identity(TO_OR_CONN(conn)); } if (conn->type == CONN_TYPE_OR || conn->type == CONN_TYPE_EXT_OR) { - tor_free(TO_OR_CONN(conn)->ext_or_conn_id); tor_free(TO_OR_CONN(conn)->ext_or_auth_correct_client_hash); tor_free(TO_OR_CONN(conn)->ext_or_transport); } diff --git a/src/core/or/or_connection_st.h b/src/core/or/or_connection_st.h index 81ba2091ec..aceed4d2c4 100644 --- a/src/core/or/or_connection_st.h +++ b/src/core/or/or_connection_st.h @@ -26,8 +26,6 @@ struct or_connection_t { * if the other side hasn't shown us a valid identity key. */ char identity_digest[DIGEST_LEN];
- /** Extended ORPort connection identifier. */ - char *ext_or_conn_id; /** This is the ClientHash value we expect to receive from the * client during the Extended ORPort authentication protocol. We * compute it upon receiving the ClientNoce from the client, and we diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 3dd884932e..89b287b0b4 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -656,19 +656,6 @@ connection_ext_or_start_auth(or_connection_t *or_conn) return 0; }
-/** Creates an Extended ORPort identifier for <b>conn</b> and deposits - * it into the global list of identifiers. */ -void -connection_or_set_ext_or_identifier(or_connection_t *conn) -{ - char random_id[EXT_OR_CONN_ID_LEN]; - - if (!conn->ext_or_conn_id) - conn->ext_or_conn_id = tor_malloc_zero(EXT_OR_CONN_ID_LEN); - - memcpy(conn->ext_or_conn_id, random_id, EXT_OR_CONN_ID_LEN); -} - /** Free any leftover allocated memory of the ext_orport.c subsystem. */ void ext_orport_free_all(void) diff --git a/src/feature/relay/ext_orport.h b/src/feature/relay/ext_orport.h index 722dc3787c..5a9063d005 100644 --- a/src/feature/relay/ext_orport.h +++ b/src/feature/relay/ext_orport.h @@ -35,7 +35,6 @@
int connection_ext_or_start_auth(or_connection_t *or_conn);
-void connection_or_set_ext_or_identifier(or_connection_t *conn); int connection_ext_or_finished_flushing(or_connection_t *conn); int connection_ext_or_process_inbuf(or_connection_t *or_conn); char *get_ext_or_auth_cookie_file_name(void); @@ -67,9 +66,6 @@ connection_ext_or_process_inbuf(or_connection_t *conn) tor_assert_nonfatal_unreached(); return -1; } -#define connection_or_set_ext_or_identifier(conn) \ - ((void)(conn)) - #define get_ext_or_auth_cookie_file_name() \ (NULL)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit fb206d284cdba8bd68691a531aba4c7a7362c7c1 Merge: 863428d753 d634a5ebc7 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Nov 8 12:35:48 2022 -0500
Merge branch 'maint-0.4.7'
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit fde87096c35259f9cda42fc5cc812b0bb122a82e Merge: d634a5ebc7 2066e0494c Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Nov 8 12:36:19 2022 -0500
Merge branch 'tor-gitlab/mr/650' into maint-0.4.7
changes/ticket40708 | 3 + src/core/or/circuitlist.c | 34 +++++++++++ src/core/or/circuitlist.h | 4 ++ src/core/or/congestion_control_common.c | 11 ++++ src/core/or/congestion_control_common.h | 1 + src/core/or/congestion_control_flow.c | 25 ++++++++ src/core/or/congestion_control_flow.h | 6 ++ src/core/or/congestion_control_vegas.c | 19 ++++++ src/core/or/congestion_control_vegas.h | 4 ++ src/core/or/relay.c | 2 + src/core/or/relay.h | 1 + src/feature/relay/relay_metrics.c | 101 +++++++++++++++++++++++++++++++- src/lib/math/include.am | 3 +- src/lib/math/stats.h | 22 +++++++ 14 files changed, 233 insertions(+), 3 deletions(-)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 2adc73afdb0d7beeeb086e276c409d7cc5904a91 Merge: fb206d284c fde87096c3 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Nov 8 12:36:44 2022 -0500
Merge branch 'maint-0.4.7'
changes/ticket40708 | 3 + src/core/or/circuitlist.c | 34 +++++++++++ src/core/or/circuitlist.h | 4 ++ src/core/or/congestion_control_common.c | 11 ++++ src/core/or/congestion_control_common.h | 1 + src/core/or/congestion_control_flow.c | 25 ++++++++ src/core/or/congestion_control_flow.h | 6 ++ src/core/or/congestion_control_vegas.c | 19 ++++++ src/core/or/congestion_control_vegas.h | 4 ++ src/core/or/relay.c | 2 + src/core/or/relay.h | 1 + src/feature/relay/relay_metrics.c | 101 +++++++++++++++++++++++++++++++- src/lib/math/include.am | 3 +- src/lib/math/stats.h | 22 +++++++ 14 files changed, 233 insertions(+), 3 deletions(-)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 00633bc619046e09536d742e5f862d75c35e476f Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Tue Nov 8 17:39:34 2022 +0000
metrics: Report amount of cwnd drop from delta and gamma
Part of #40708. --- src/core/or/congestion_control_vegas.c | 28 ++++++++++++++++++++++++++++ src/core/or/congestion_control_vegas.h | 2 ++ src/feature/relay/relay_metrics.c | 18 ++++++++++++++++++ 3 files changed, 48 insertions(+)
diff --git a/src/core/or/congestion_control_vegas.c b/src/core/or/congestion_control_vegas.c index 87f59d12fd..8351aa6e27 100644 --- a/src/core/or/congestion_control_vegas.c +++ b/src/core/or/congestion_control_vegas.c @@ -52,8 +52,12 @@
/** Moving average of the cc->cwnd from each circuit exiting slowstart. */ double cc_stats_vegas_exit_ss_cwnd_ma = 0; +double cc_stats_vegas_gamma_drop_ma = 0; +double cc_stats_vegas_delta_drop_ma = 0; /* Running count of this moving average. Needed so we can update it. */ static double stats_cwnd_exit_ss_ma_count = 0; +static double stats_cwnd_gamma_drop_ma_count = 0; +static double stats_cwnd_delta_drop_ma_count = 0;
/** Stats on how many times we reached "delta" param. */ uint64_t cc_stats_vegas_above_delta = 0; @@ -331,8 +335,19 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc, cc->next_cc_event = 1; // Technically irellevant, but for consistency } } else { + uint64_t old_cwnd = cc->cwnd; + uint64_t cwnd_diff; + /* Congestion signal: Set cwnd to gamma threshhold */ cc->cwnd = vegas_bdp(cc) + cc->vegas_params.gamma; + + /* Account the amount we reduced the cwnd by for the gamma cutoff */ + cwnd_diff = (old_cwnd > cc->cwnd ? old_cwnd - cc->cwnd : 0); + stats_cwnd_gamma_drop_ma_count++; + cc_stats_vegas_gamma_drop_ma = + stats_update_running_avg(cc_stats_vegas_gamma_drop_ma, + cwnd_diff, stats_cwnd_gamma_drop_ma_count); + congestion_control_vegas_exit_slow_start(circ, cc); }
@@ -344,7 +359,20 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc, /* After slow start, We only update once per window */ } else if (cc->next_cc_event == 0) { if (queue_use > cc->vegas_params.delta) { + uint64_t old_cwnd = cc->cwnd; + uint64_t cwnd_diff; + + /* If we are above the delta threshhold, drop cwnd down to the + * delta threshhold. */ cc->cwnd = vegas_bdp(cc) + cc->vegas_params.delta - CWND_INC(cc); + + /* Account the amount we reduced the cwnd by for the gamma cutoff */ + cwnd_diff = (old_cwnd > cc->cwnd ? old_cwnd - cc->cwnd : 0); + stats_cwnd_delta_drop_ma_count++; + cc_stats_vegas_delta_drop_ma = + stats_update_running_avg(cc_stats_vegas_delta_drop_ma, + cwnd_diff, stats_cwnd_delta_drop_ma_count); + cc_stats_vegas_above_delta++; } else if (queue_use > cc->vegas_params.beta || cc->blocked_chan) { cc->cwnd -= CWND_INC(cc); diff --git a/src/core/or/congestion_control_vegas.h b/src/core/or/congestion_control_vegas.h index 5aced07a8f..6048b1e26d 100644 --- a/src/core/or/congestion_control_vegas.h +++ b/src/core/or/congestion_control_vegas.h @@ -13,6 +13,8 @@ #include "core/or/circuit_st.h"
extern double cc_stats_vegas_exit_ss_cwnd_ma; +extern double cc_stats_vegas_gamma_drop_ma; +extern double cc_stats_vegas_delta_drop_ma; extern uint64_t cc_stats_vegas_above_delta; extern uint64_t cc_stats_vegas_above_ss_cwnd_max;
diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index 076ac68618..cd80c5e95e 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -392,6 +392,15 @@ fill_cc_values(void) metrics_store_entry_update(sentry, tor_llround(cc_stats_vegas_exit_ss_cwnd_ma));
+ sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "slow_start_exit")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "gamma_drop")); + metrics_store_entry_update(sentry, + tor_llround(cc_stats_vegas_gamma_drop_ma)); + sentry = metrics_store_add(the_store, rentry->type, rentry->name, rentry->help); metrics_store_entry_add_label(sentry, @@ -461,6 +470,15 @@ fill_cc_values(void) metrics_store_entry_add_label(sentry, metrics_format_label("action", "above_ss_cwnd_max")); metrics_store_entry_update(sentry, cc_stats_vegas_above_ss_cwnd_max); + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_add_label(sentry, + metrics_format_label("state", "process_sendme")); + metrics_store_entry_add_label(sentry, + metrics_format_label("action", "delta_drop")); + metrics_store_entry_update(sentry, + tor_llround(cc_stats_vegas_delta_drop_ma)); }
/** Helper: Fill in single stream metrics output. */
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 56ee2131f19c462e2e4be294b61128a10b8ce374 Merge: 2adc73afdb 00633bc619 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Nov 8 12:47:17 2022 -0500
Merge branch 'maint-0.4.7'
src/core/or/congestion_control_vegas.c | 28 ++++++++++++++++++++++++++++ src/core/or/congestion_control_vegas.h | 2 ++ src/feature/relay/relay_metrics.c | 18 ++++++++++++++++++ 3 files changed, 48 insertions(+)
tor-commits@lists.torproject.org
-
gitolite role