Skip to content
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

Deprecate quic_receive_ecn #38100

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −47
Open

Deprecate quic_receive_ecn #38100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f4bc6c
Deprecate quic_receive_ecn
martinduke Jan 17, 2025
4380b3f
test failure
martinduke Jan 18, 2025
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
18 changes: 7 additions & 11 deletions source/common/network/io_socket_handle_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,9 @@ Api::IoCallUint64Result IoSocketHandleImpl::recvmsg(Buffer::RawSlice* slices,
}
}
#endif
if (receive_ecn_) {
absl::optional<uint8_t> maybe_tos = maybeGetTosFromHeader(*cmsg);
if (maybe_tos) {
output.msg_[0].tos_ = *maybe_tos;
}
absl::optional<uint8_t> maybe_tos = maybeGetTosFromHeader(*cmsg);
if (maybe_tos) {
output.msg_[0].tos_ = *maybe_tos;
}
}
}
Expand Down Expand Up @@ -502,12 +500,10 @@ Api::IoCallUint64Result IoSocketHandleImpl::recvmmsg(RawSliceArrays& slices, uin
output.msg_[0].saved_cmsg_ = cmsg_slice;
}
Address::InstanceConstSharedPtr addr = maybeGetDstAddressFromHeader(*cmsg, self_port);
if (receive_ecn_) {
absl::optional<uint8_t> maybe_tos = maybeGetTosFromHeader(*cmsg);
if (maybe_tos) {
output.msg_[0].tos_ = *maybe_tos;
continue;
}
absl::optional<uint8_t> maybe_tos = maybeGetTosFromHeader(*cmsg);
if (maybe_tos) {
output.msg_[0].tos_ = *maybe_tos;
continue;
}
if (addr != nullptr) {
// This is a IP packet info message.
Expand Down
4 changes: 0 additions & 4 deletions source/common/network/io_socket_handle_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class IoSocketHandleImpl : public IoSocketHandleBaseImpl {
absl::optional<int> domain = absl::nullopt,
size_t address_cache_max_capacity = 0)
: IoSocketHandleBaseImpl(fd, socket_v6only, domain),
receive_ecn_(Runtime::runtimeFeatureEnabled("envoy.reloadable_features.quic_receive_ecn")),
address_cache_max_capacity_(address_cache_max_capacity) {
if (address_cache_max_capacity > 0) {
recent_received_addresses_ = std::vector<QuicEnvoyAddressPair>();
Expand Down Expand Up @@ -106,9 +105,6 @@ class IoSocketHandleImpl : public IoSocketHandleBaseImpl {
const size_t cmsg_space_{CMSG_SPACE(sizeof(int)) + CMSG_SPACE(sizeof(struct in_pktinfo)) +
CMSG_SPACE(sizeof(struct in6_pktinfo)) + CMSG_SPACE(sizeof(uint16_t))};

// Latches a copy of the runtime feature "envoy.reloadable_features.quic_receive_ecn".
const bool receive_ecn_;

size_t addressCacheMaxSize() const { return address_cache_max_capacity_; }

private:
Expand Down
35 changes: 16 additions & 19 deletions source/common/quic/active_quic_listener.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ActiveQuicListener::ActiveQuicListener(
Network::SocketSharedPtr&& listen_socket, Network::ListenerConfig& listener_config,
const quic::QuicConfig& quic_config, bool kernel_worker_routing,
const envoy::config::core::v3::RuntimeFeatureFlag& enabled, QuicStatNames& quic_stat_names,
uint32_t packets_to_read_to_connection_count_ratio, bool receive_ecn,
uint32_t packets_to_read_to_connection_count_ratio,
EnvoyQuicCryptoServerStreamFactoryInterface& crypto_server_stream_factory,
EnvoyQuicProofSourceFactoryInterface& proof_source_factory,
QuicConnectionIdGeneratorPtr&& cid_generator, QuicConnectionIdWorkerSelector worker_selector,
Expand Down Expand Up @@ -72,25 +72,23 @@ ActiveQuicListener::ActiveQuicListener(
auto alarm_factory =
std::make_unique<EnvoyQuicAlarmFactory>(dispatcher_, *connection_helper->GetClock());
// Set the socket to report incoming ECN.
if (receive_ecn) {
if (udp_listener_->localAddress() == nullptr ||
udp_listener_->localAddress()->ip() == nullptr) {
IS_ENVOY_BUG("UDP Listener does not have local IP address");
} else {
int optval = 1;
socklen_t optlen = sizeof(optval);
if (udp_listener_->localAddress()->ip()->ipv6() != nullptr) {
listen_socket_.setSocketOption(IPPROTO_IPV6, IPV6_RECVTCLASS, &optval, optlen);
if (udp_listener_->localAddress() == nullptr ||
udp_listener_->localAddress()->ip() == nullptr) {
IS_ENVOY_BUG("UDP Listener does not have local IP address");
} else {
int optval = 1;
socklen_t optlen = sizeof(optval);
if (udp_listener_->localAddress()->ip()->ipv6() != nullptr) {
listen_socket_.setSocketOption(IPPROTO_IPV6, IPV6_RECVTCLASS, &optval, optlen);
#ifndef __APPLE__
// Linux dual-stack sockets require setting IP_RECVTOS separately. Apple
// sockets will return an error.
if (!udp_listener_->localAddress()->ip()->ipv6()->v6only()) {
listen_socket_.setSocketOption(IPPROTO_IP, IP_RECVTOS, &optval, optlen);
}
#endif // __APPLE__
} else {
// Linux dual-stack sockets require setting IP_RECVTOS separately. Apple
// sockets will return an error.
if (!udp_listener_->localAddress()->ip()->ipv6()->v6only()) {
listen_socket_.setSocketOption(IPPROTO_IP, IP_RECVTOS, &optval, optlen);
}
#endif // __APPLE__
} else {
listen_socket_.setSocketOption(IPPROTO_IP, IP_RECVTOS, &optval, optlen);
}
}
quic_dispatcher_ = std::make_unique<EnvoyQuicDispatcher>(
Expand Down Expand Up @@ -266,7 +264,6 @@ ActiveQuicListenerFactory::ActiveQuicListenerFactory(
packets_to_read_to_connection_count_ratio_(
PROTOBUF_GET_WRAPPED_OR_DEFAULT(config, packets_to_read_to_connection_count_ratio,
DEFAULT_PACKETS_TO_READ_PER_CONNECTION)),
receive_ecn_(Runtime::runtimeFeatureEnabled("envoy.reloadable_features.quic_receive_ecn")),
context_(context), reject_new_connections_(config.reject_new_connections()) {
const int64_t idle_network_timeout_ms =
config.has_idle_timeout() ? DurationUtil::durationToMilliseconds(config.idle_timeout())
Expand Down Expand Up @@ -436,7 +433,7 @@ ActiveQuicListenerFactory::createActiveQuicListener(
return std::make_unique<ActiveQuicListener>(
runtime, worker_index, concurrency, dispatcher, parent, std::move(listen_socket),
listener_config, quic_config, kernel_worker_routing, enabled, quic_stat_names,
packets_to_read_to_connection_count_ratio, receive_ecn_, crypto_server_stream_factory,
packets_to_read_to_connection_count_ratio, crypto_server_stream_factory,
proof_source_factory, std::move(cid_generator), worker_selector_,
makeOptRefFromPtr(connection_debug_visitor_factory_.get()), reject_new_connections_);
}
Expand Down
3 changes: 1 addition & 2 deletions source/common/quic/active_quic_listener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ActiveQuicListener : public Envoy::Server::ActiveUdpListenerBase,
bool kernel_worker_routing,
const envoy::config::core::v3::RuntimeFeatureFlag& enabled,
QuicStatNames& quic_stat_names,
uint32_t packets_to_read_to_connection_count_ratio, bool receive_ecn,
uint32_t packets_to_read_to_connection_count_ratio,
EnvoyQuicCryptoServerStreamFactoryInterface& crypto_server_stream_factory,
EnvoyQuicProofSourceFactoryInterface& proof_source_factory,
QuicConnectionIdGeneratorPtr&& cid_generator,
Expand Down Expand Up @@ -155,7 +155,6 @@ class ActiveQuicListenerFactory : public Network::ActiveUdpListenerFactory,
envoy::config::core::v3::RuntimeFeatureFlag enabled_;
QuicStatNames& quic_stat_names_;
const uint32_t packets_to_read_to_connection_count_ratio_;
bool receive_ecn_;
const Network::Socket::OptionsSharedPtr options_{std::make_shared<Network::Socket::Options>()};
QuicConnectionIdWorkerSelector worker_selector_;
bool kernel_worker_routing_{};
Expand Down
4 changes: 1 addition & 3 deletions source/common/quic/envoy_quic_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,7 @@ createConnectionSocket(const Network::Address::InstanceConstSharedPtr& peer_addr
}
connection_socket->addOptions(Network::SocketOptionFactory::buildIpPacketInfoOptions());
connection_socket->addOptions(Network::SocketOptionFactory::buildRxQueueOverFlowOptions());
if (Runtime::runtimeFeatureEnabled("envoy.reloadable_features.quic_receive_ecn")) {
connection_socket->addOptions(Network::SocketOptionFactory::buildIpRecvTosOptions());
}
connection_socket->addOptions(Network::SocketOptionFactory::buildIpRecvTosOptions());
if (prefer_gro && Api::OsSysCallsSingleton::get().supportsUdpGro()) {
connection_socket->addOptions(Network::SocketOptionFactory::buildUdpGroOptions());
}
Expand Down
1 change: 0 additions & 1 deletion source/common/runtime/runtime_features.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ RUNTIME_GUARD(envoy_reloadable_features_proxy_104);
RUNTIME_GUARD(envoy_reloadable_features_proxy_ssl_port);
RUNTIME_GUARD(envoy_reloadable_features_proxy_status_mapping_more_core_response_flags);
RUNTIME_GUARD(envoy_reloadable_features_quic_connect_client_udp_sockets);
RUNTIME_GUARD(envoy_reloadable_features_quic_receive_ecn);
// Ignore the automated "remove this flag" issue: we should keep this for 1 year. Confirm with
// @danzh2010 or @RyanTheOptimist before removing.
RUNTIME_GUARD(envoy_reloadable_features_quic_send_server_preferred_address_to_all_clients);
Expand Down
8 changes: 2 additions & 6 deletions test/common/quic/active_quic_listener_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,8 @@ class TestActiveQuicListenerFactory : public ActiveQuicListenerFactory {
return std::make_unique<TestActiveQuicListener>(
runtime, worker_index, concurrency, dispatcher, parent, std::move(listen_socket),
listener_config, quic_config, kernel_worker_routing, enabled, quic_stat_names,
packets_to_read_to_connection_count_ratio, /*receive_ecn=*/true,
crypto_server_stream_factory, proof_source_factory, std::move(cid_generator),
testWorkerSelector, std::nullopt);
packets_to_read_to_connection_count_ratio, crypto_server_stream_factory,
proof_source_factory, std::move(cid_generator), testWorkerSelector, std::nullopt);
}
};

Expand Down Expand Up @@ -141,7 +140,6 @@ class ActiveQuicListenerTest : public testing::TestWithParam<Network::Address::I
}

void SetUp() override {
Runtime::maybeSetRuntimeGuard("envoy.reloadable_features.quic_receive_ecn", true);
envoy::config::bootstrap::v3::LayeredRuntime config;
config.add_layers()->mutable_admin_layer();
listen_socket_ =
Expand Down Expand Up @@ -647,7 +645,6 @@ TEST_P(ActiveQuicListenerTest, EcnReportingIsEnabled) {
}

TEST_P(ActiveQuicListenerTest, EcnReporting) {
Runtime::maybeSetRuntimeGuard("envoy.reloadable_features.quic_receive_ecn", true);
initialize();
maybeConfigureMocks(/* connection_count = */ 1);
quic::QuicConnectionId connection_id = quic::test::TestConnectionId(1);
Expand All @@ -665,7 +662,6 @@ TEST_P(ActiveQuicListenerTest, EcnReportingDualStack) {
if (local_address_->ip()->version() == Network::Address::IpVersion::v4) {
return;
}
Runtime::maybeSetRuntimeGuard("envoy.reloadable_features.quic_receive_ecn", true);
initialize();
maybeConfigureMocks(/* connection_count = */ 1);
quic::QuicConnectionId connection_id = quic::test::TestConnectionId(1);
Expand Down
Loading