February 2018 - tor-commits - lists.torproject.org

[tor/master] sched: Avoid adding the same channel twice to the KIST pending list
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit adaf3e9b89f62d68ab631b8f672d9bff996689b9 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 31 13:46:31 2018 -0500 sched: Avoid adding the same channel twice to the KIST pending list This is the quick fix that is keeping the channel in PENDING state so if we ever try to reschedule the same channel, it won't happened. Fixes #24700 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24700 | 4 ++++ src/or/scheduler_kist.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug24700 b/changes/bug24700 new file mode 100644 index 000000000..74dc581a0 --- /dev/null +++ b/changes/bug24700 @@ -0,0 +1,4 @@ + o Minor bugfixes (scheduler, KIST): + - Avoid adding the same channel twice in the KIST scheduler pending list + wasting CPU cycles at handling the same channel twice. Fixes bug 24700; + bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index f50f3aa9e..7b5d138be 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -693,7 +693,6 @@ kist_scheduler_run(void) * after the scheduling loop is over. They can hopefully be taken care of * in the next scheduling round. */ - chan->scheduler_state = SCHED_CHAN_WAITING_TO_WRITE; if (!to_readd) { to_readd = smartlist_new(); }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 77634795b0258f04a31a51d827d45eab40557f65 Merge: 31542cc30 cb5654f30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 16:57:57 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2 changes/bug24700 | 4 ++++ src/or/channel.c | 3 +++ src/or/scheduler.c | 20 ++++++++++++-------- src/or/scheduler_kist.c | 14 ++++++++++---- 4 files changed, 29 insertions(+), 12 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 0fd91772b1ece9e0f8adc270147f5a4164158473 Merge: d40a4e46b 77634795b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 17:05:14 2018 -0500 Merge branch 'maint-0.3.2'

1 0

[tor/release-0.3.2] sched: Avoid adding the same channel twice to the KIST pending list
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit adaf3e9b89f62d68ab631b8f672d9bff996689b9 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 31 13:46:31 2018 -0500 sched: Avoid adding the same channel twice to the KIST pending list This is the quick fix that is keeping the channel in PENDING state so if we ever try to reschedule the same channel, it won't happened. Fixes #24700 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24700 | 4 ++++ src/or/scheduler_kist.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug24700 b/changes/bug24700 new file mode 100644 index 000000000..74dc581a0 --- /dev/null +++ b/changes/bug24700 @@ -0,0 +1,4 @@ + o Minor bugfixes (scheduler, KIST): + - Avoid adding the same channel twice in the KIST scheduler pending list + wasting CPU cycles at handling the same channel twice. Fixes bug 24700; + bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index f50f3aa9e..7b5d138be 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -693,7 +693,6 @@ kist_scheduler_run(void) * after the scheduling loop is over. They can hopefully be taken care of * in the next scheduling round. */ - chan->scheduler_state = SCHED_CHAN_WAITING_TO_WRITE; if (!to_readd) { to_readd = smartlist_new(); }

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 77634795b0258f04a31a51d827d45eab40557f65 Merge: 31542cc30 cb5654f30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 16:57:57 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2 changes/bug24700 | 4 ++++ src/or/channel.c | 3 +++ src/or/scheduler.c | 20 ++++++++++++-------- src/or/scheduler_kist.c | 14 ++++++++++---- 4 files changed, 29 insertions(+), 12 deletions(-)

1 0

[tor/release-0.3.2] sched: Use the sched_heap_idx field to double-check our fix for 24700.
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit cb5654f300312a8f4c777378d68696667eff427b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 11:05:50 2018 -0500 sched: Use the sched_heap_idx field to double-check our fix for 24700. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/channel.c | 3 +++ src/or/scheduler.c | 20 ++++++++++++-------- src/or/scheduler_kist.c | 13 ++++++++++--- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 0b5a7fde9..049a5290d 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -951,6 +951,9 @@ channel_init(channel_t *chan) /* Scheduler state is idle */ chan->scheduler_state = SCHED_CHAN_IDLE; + + /* Channel is not in the scheduler heap. */ + chan->sched_heap_idx = -1; } /** diff --git a/src/or/scheduler.c b/src/or/scheduler.c index cbf51447b..26f927fd8 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -538,10 +538,12 @@ scheduler_channel_has_waiting_cells,(channel_t *chan)) * channels_pending. */ chan->scheduler_state = SCHED_CHAN_PENDING; - smartlist_pqueue_add(channels_pending, - scheduler_compare_channels, - offsetof(channel_t, sched_heap_idx), - chan); + if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + smartlist_pqueue_add(channels_pending, + scheduler_compare_channels, + offsetof(channel_t, sched_heap_idx), + chan); + } log_debug(LD_SCHED, "Channel " U64_FORMAT " at %p went from waiting_for_cells " "to pending", @@ -665,10 +667,12 @@ scheduler_channel_wants_writes(channel_t *chan) */ log_debug(LD_SCHED, "chan=%" PRIu64 " became pending", chan->global_identifier); - smartlist_pqueue_add(channels_pending, - scheduler_compare_channels, - offsetof(channel_t, sched_heap_idx), - chan); + if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + smartlist_pqueue_add(channels_pending, + scheduler_compare_channels, + offsetof(channel_t, sched_heap_idx), + chan); + } chan->scheduler_state = SCHED_CHAN_PENDING; log_debug(LD_SCHED, "Channel " U64_FORMAT " at %p went from waiting_to_write " diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 7b5d138be..d2878437c 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -704,8 +704,10 @@ kist_scheduler_run(void) /* Case 4: cells to send, and still open for writes */ chan->scheduler_state = SCHED_CHAN_PENDING; - smartlist_pqueue_add(cp, scheduler_compare_channels, - offsetof(channel_t, sched_heap_idx), chan); + if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + smartlist_pqueue_add(cp, scheduler_compare_channels, + offsetof(channel_t, sched_heap_idx), chan); + } } } /* End of main scheduling loop */ @@ -725,8 +727,13 @@ kist_scheduler_run(void) SMARTLIST_FOREACH_BEGIN(to_readd, channel_t *, readd_chan) { readd_chan->scheduler_state = SCHED_CHAN_PENDING; if (!smartlist_contains(cp, readd_chan)) { - smartlist_pqueue_add(cp, scheduler_compare_channels, + if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + /* XXXX Note that the check above is in theory redundant with + * the smartlist_contains check. But let's make sure we're + * not messing anything up, and leave them both for now. */ + smartlist_pqueue_add(cp, scheduler_compare_channels, offsetof(channel_t, sched_heap_idx), readd_chan); + } } } SMARTLIST_FOREACH_END(readd_chan); smartlist_free(to_readd);

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 90716e3f9ce3d5316d6d38323e2cc7c3125b576f Merge: 1a4876587 77634795b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 16:58:03 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24700 | 4 ++++ src/or/channel.c | 3 +++ src/or/scheduler.c | 20 ++++++++++++-------- src/or/scheduler_kist.c | 14 ++++++++++---- 4 files changed, 29 insertions(+), 12 deletions(-)

1 0

[user-manual/alpha] Fixing ar images
by colin＠torproject.org 01 Feb '18

01 Feb '18

commit 1cac2ccf8666572fc8f7a7cb157b20b1ce1d0bbe Author: Colin Childs <colin(a)torproject.org> Date: Thu Feb 1 14:58:22 2018 -0600 Fixing ar images --- ar/media/circumvention/bridges.png | Bin 184785 -> 122083 bytes ar/media/circumvention/configure.png | Bin 176245 -> 156823 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ar/media/circumvention/bridges.png b/ar/media/circumvention/bridges.png index 3333afe..9fc02e6 100644 Binary files a/ar/media/circumvention/bridges.png and b/ar/media/circumvention/bridges.png differ diff --git a/ar/media/circumvention/configure.png b/ar/media/circumvention/configure.png index 43a260d..468a31f 100644 Binary files a/ar/media/circumvention/configure.png and b/ar/media/circumvention/configure.png differ

1 0

[user-manual/alpha] Uploading updated ar images
by colin＠torproject.org 01 Feb '18

01 Feb '18

commit db7bb573ad7e879211608d87f56f6d5bd6f6f045 Author: Colin Childs <colin(a)torproject.org> Date: Thu Feb 1 14:34:12 2018 -0600 Uploading updated ar images --- ar/media/circumvention/bridges.png | Bin 87651 -> 184785 bytes ar/media/circumvention/configure.png | Bin 55442 -> 176245 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ar/media/circumvention/bridges.png b/ar/media/circumvention/bridges.png index 57d46df..3333afe 100644 Binary files a/ar/media/circumvention/bridges.png and b/ar/media/circumvention/bridges.png differ diff --git a/ar/media/circumvention/configure.png b/ar/media/circumvention/configure.png index 2e04c39..43a260d 100644 Binary files a/ar/media/circumvention/configure.png and b/ar/media/circumvention/configure.png differ

1 0

[tor/maint-0.3.1] Changes file for 25070
by nickm＠torproject.org 01 Feb '18

01 Feb '18

commit 9656ad32329f24d9d93e3e7067eb07cbe4ed0002 Author: teor <teor2345(a)gmail.com> Date: Tue Jan 30 01:55:56 2018 +1100 Changes file for 25070 --- changes/bug25070 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug25070 b/changes/bug25070 new file mode 100644 index 000000000..c2f4e58c4 --- /dev/null +++ b/changes/bug25070 @@ -0,0 +1,3 @@ + o Major bugfixes (protocol versions): + - Add Link protocol version 5 to the supported protocols list. + Fixes bug 25070; bugfix on 0.3.1.1-alpha.

1 0