Skip to content

Fix control frames not marked as lost on old path after migration (#2452) #2454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
birneee wants to merge 2 commits into
base: master
Choose a base branch
from
+395 −63
Open

Fix control frames not marked as lost on old path after migration (#2452) #2454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0381610
unit tests: control frame not lost (#2452)
birneee Apr 28, 2026
79af741
fix: control frame not lost (#2452)
birneee Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions quiche/src/recovery/congestion/recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,48 +664,48 @@ impl RecoveryOps for LegacyRecovery {
(self.congestion.cc_ops.rollback)(&mut self.congestion);
}

if self.newly_acked.is_empty() {
return Ok(OnAckReceivedOutcome::default());
}

let largest_newly_acked = self.newly_acked.last().unwrap();
let largest_ack_received = peer_sent_ack_ranges.last().unwrap();

// Update `largest_acked_packet` based on the validated `newly_acked`
// Update `largest_acked_packet` based on the `peer_sent_ack_ranges`
// value.
let largest_acked_pkt_num = self.epochs[epoch]
.largest_acked_packet
.unwrap_or(0)
.max(largest_newly_acked.pkt_num);
.max(largest_ack_received);
self.epochs[epoch].largest_acked_packet = Some(largest_acked_pkt_num);

// Check if largest packet is newly acked.
if largest_newly_acked.pkt_num == largest_acked_pkt_num &&
has_ack_eliciting
{
let latest_rtt = now - largest_newly_acked.time_sent;
self.rtt_stats.update_rtt(
latest_rtt,
Duration::from_micros(ack_delay),
now,
handshake_status.completed,
);
if let Some(largest_newly_acked) = self.newly_acked.last() {
// Check if largest packet is newly acked.
if largest_newly_acked.pkt_num == largest_acked_pkt_num &&
has_ack_eliciting
{
let latest_rtt = now - largest_newly_acked.time_sent;
self.rtt_stats.update_rtt(
latest_rtt,
Duration::from_micros(ack_delay),
now,
handshake_status.completed,
);
}
}

// Detect and mark lost packets without removing them from the sent
// packets list.
let (lost_packets, lost_bytes) =
self.detect_lost_packets(epoch, now, trace_id);

self.congestion.on_packets_acked(
self.bytes_in_flight.get(),
&mut self.newly_acked,
&self.rtt_stats,
now,
);
if !self.newly_acked.is_empty() {
self.congestion.on_packets_acked(
self.bytes_in_flight.get(),
&mut self.newly_acked,
&self.rtt_stats,
now,
);

self.bytes_in_flight.saturating_subtract(acked_bytes, now);
self.bytes_in_flight.saturating_subtract(acked_bytes, now);

self.pto_count = 0;
self.pto_count = 0;
}

self.set_loss_detection_timer(handshake_status, now);

Expand Down
66 changes: 32 additions & 34 deletions quiche/src/recovery/gcongestion/recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,55 +793,53 @@ impl RecoveryOps for GRecovery {
self.loss_thresh.on_spurious_loss(thresh);
}

if self.newly_acked.is_empty() {
return Ok(OnAckReceivedOutcome {
acked_bytes,
spurious_losses,
..Default::default()
});
}
let largest_ack_received = peer_sent_ack_ranges.last().unwrap();

self.bytes_in_flight.saturating_subtract(acked_bytes, now);

let largest_newly_acked = self.newly_acked.last().unwrap();

// Update `largest_acked_packet` based on the validated `newly_acked`
// Update `largest_acked_packet` based on the `peer_sent_ack_ranges`
// value.
let largest_acked_pkt_num = self.epochs[epoch]
.largest_acked_packet
.unwrap_or(0)
.max(largest_newly_acked.pkt_num);
.max(largest_ack_received);
self.epochs[epoch].largest_acked_packet = Some(largest_acked_pkt_num);

// Check if largest packet is newly acked.
let update_rtt = largest_newly_acked.pkt_num == largest_acked_pkt_num &&
has_ack_eliciting;
if update_rtt {
let latest_rtt = now - largest_newly_acked.time_sent;
self.rtt_stats.update_rtt(
latest_rtt,
Duration::from_micros(ack_delay),
now,
handshake_status.completed,
);
let mut update_rtt = false;

if let Some(largest_newly_acked) = self.newly_acked.last() {
// Check if largest packet is newly acked.
update_rtt = largest_newly_acked.pkt_num == largest_acked_pkt_num &&
has_ack_eliciting;
if update_rtt {
let latest_rtt = now - largest_newly_acked.time_sent;
self.rtt_stats.update_rtt(
latest_rtt,
Duration::from_micros(ack_delay),
now,
handshake_status.completed,
);
}
}

let (lost_bytes, lost_packets) =
self.detect_and_remove_lost_packets(epoch, now);

self.pacer.on_congestion_event(
update_rtt,
prior_in_flight,
self.bytes_in_flight.get(),
now,
&self.newly_acked,
&self.lost_reuse,
self.epochs[epoch].least_unacked(),
&self.rtt_stats,
&mut self.recovery_stats,
);
if !self.newly_acked.is_empty() {
self.pacer.on_congestion_event(
update_rtt,
prior_in_flight,
self.bytes_in_flight.get(),
now,
&self.newly_acked,
&self.lost_reuse,
self.epochs[epoch].least_unacked(),
&self.rtt_stats,
&mut self.recovery_stats,
);

self.pto_count = 0;
self.pto_count = 0;
}
self.lost_count += lost_packets;

self.set_loss_detection_timer(handshake_status, now);
Expand Down
2 changes: 1 addition & 1 deletion quiche/src/recovery/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2373,7 +2373,7 @@ mod tests {
assert_eq!(r.sent_packets_len(epoch), 0);
assert_eq!(r.bytes_in_flight(), 0);

assert_eq!(r.get_largest_acked_on_epoch(epoch).unwrap(), 3);
assert_eq!(r.get_largest_acked_on_epoch(epoch).unwrap(), 9);
assert_eq!(r.largest_sent_pkt_num_on_path(epoch).unwrap(), 3);
}

Expand Down
Loading
Loading