nghttp2/nghttp2
1
0
Fork 0
mirror of https://github.com/nghttp2/nghttp2.git synced 2025-12-06 18:18:52 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2168 from nghttp2/nghttpx-gso-failover

Browse Source 
nghttpx: Dynamic GSO failover
This commit is contained in:
Tatsuhiro Tsujikawa
2024-04-26 18:11:22 +09:00
committed by GitHub
parent 062bc696bc 943fba4590
commit c013b36695
5 changed files with 117 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/shrpx_http3_upstream.cc
View File

@@ -120,6 +120,9 @@ Http3Upstream::Http3Upstream(ClientHandler *handler)
!get_config()->http2_proxy},
tx_{
.data = std::unique_ptr<uint8_t[]>(new uint8_t[64_k]),
#ifndef UDP_SEGMENT
.no_gso = true,
#endif // UDP_SEGMENT
} {
auto conn = handler_->get_connection();
conn->conn_ref.get_conn = shrpx::get_conn;
@@ -875,13 +878,13 @@ int Http3Upstream::write_streams() {
auto data = tx_.data.get();
auto datalen = bufpos - data;
rv = send_packet(faddr, prev_ps.path.remote.addr,
prev_ps.path.remote.addrlen, prev_ps.path.local.addr,
prev_ps.path.local.addrlen, prev_pi, data, datalen,
gso_size);
auto [nsent, rv] = send_packet(
faddr, prev_ps.path.remote.addr, prev_ps.path.remote.addrlen,
prev_ps.path.local.addr, prev_ps.path.local.addrlen, prev_pi, data,
datalen, gso_size);
if (rv == SHRPX_ERR_SEND_BLOCKED) {
on_send_blocked(faddr, prev_ps.path.remote, prev_ps.path.local,
prev_pi, data, datalen, gso_size);
prev_pi, data + nsent, datalen - nsent, gso_size);
signal_write_upstream_addr(faddr);
}
@@ -893,12 +896,10 @@ int Http3Upstream::write_streams() {
}
auto first_pkt = bufpos == tx_.data.get();
(void)first_pkt;
bufpos += nwrite;
bufleft -= nwrite;
#ifdef UDP_SEGMENT
if (first_pkt) {
ngtcp2_path_copy(&prev_ps.path, &ps.path);
prev_pi = pi;
@@ -912,14 +913,14 @@ int Http3Upstream::write_streams() {
auto data = tx_.data.get();
auto datalen = bufpos - data - nwrite;
rv = send_packet(faddr, prev_ps.path.remote.addr,
prev_ps.path.remote.addrlen, prev_ps.path.local.addr,
prev_ps.path.local.addrlen, prev_pi, data, datalen,
gso_size);
auto [nsent, rv] = send_packet(
faddr, prev_ps.path.remote.addr, prev_ps.path.remote.addrlen,
prev_ps.path.local.addr, prev_ps.path.local.addrlen, prev_pi, data,
datalen, gso_size);
switch (rv) {
case SHRPX_ERR_SEND_BLOCKED:
on_send_blocked(faddr, prev_ps.path.remote, prev_ps.path.local, prev_pi,
data, datalen, gso_size);
data + nsent, datalen - nsent, gso_size);
on_send_blocked(static_cast<UpstreamAddr *>(ps.path.user_data),
ps.path.remote, ps.path.local, pi, bufpos - nwrite,
@@ -932,10 +933,12 @@ int Http3Upstream::write_streams() {
auto faddr = static_cast<UpstreamAddr *>(ps.path.user_data);
auto data = bufpos - nwrite;
rv = send_packet(faddr, ps.path.remote.addr, ps.path.remote.addrlen,
ps.path.local.addr, ps.path.local.addrlen, pi, data,
nwrite, 0);
auto [nsent, rv] = send_packet(
faddr, ps.path.remote.addr, ps.path.remote.addrlen,
ps.path.local.addr, ps.path.local.addrlen, pi, data, nwrite, 0);
if (rv == SHRPX_ERR_SEND_BLOCKED) {
assert(nsent == 0);
on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data,
nwrite, 0);
@@ -955,12 +958,13 @@ int Http3Upstream::write_streams() {
auto data = tx_.data.get();
auto datalen = bufpos - data;
rv = send_packet(faddr, ps.path.remote.addr, ps.path.remote.addrlen,
auto [nsent, rv] =
send_packet(faddr, ps.path.remote.addr, ps.path.remote.addrlen,
ps.path.local.addr, ps.path.local.addrlen, pi, data,
datalen, gso_size);
if (rv == SHRPX_ERR_SEND_BLOCKED) {
on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data, datalen,
gso_size);
on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data + nsent,
datalen - nsent, gso_size);
signal_write_upstream_addr(faddr);
}
@@ -969,33 +973,6 @@ int Http3Upstream::write_streams() {
return 0;
}
#else // !UDP_SEGMENT
auto faddr = static_cast<UpstreamAddr *>(ps.path.user_data);
auto data = tx_.data.get();
auto datalen = bufpos - data;
rv = send_packet(faddr, ps.path.remote.addr, ps.path.remote.addrlen,
ps.path.local.addr, ps.path.local.addrlen, pi, data,
datalen, 0);
if (rv == SHRPX_ERR_SEND_BLOCKED) {
on_send_blocked(faddr, ps.path.remote, ps.path.local, pi, data, datalen,
0);
ngtcp2_conn_update_pkt_tx_time(conn_, ts);
signal_write_upstream_addr(faddr);
return 0;
}
if (bufleft < path_max_udp_payload_size) {
ngtcp2_conn_update_pkt_tx_time(conn_, ts);
return 0;
}
bufpos = tx_.data.get();
#endif // !UDP_SEGMENT
}
return 0;
@@ -1880,16 +1857,44 @@ int Http3Upstream::on_read(const UpstreamAddr *faddr,
return 0;
}
int Http3Upstream::send_packet(const UpstreamAddr *faddr,
const sockaddr *remote_sa, size_t remote_salen,
const sockaddr *local_sa, size_t local_salen,
const ngtcp2_pkt_info &pi, const uint8_t *data,
size_t datalen, size_t gso_size) {
auto rv = quic_send_packet(faddr, remote_sa, remote_salen, local_sa,
local_salen, pi, data, datalen, gso_size);
std::pair<size_t, int> Http3Upstream::send_packet(
const UpstreamAddr *faddr, const sockaddr *remote_sa, size_t remote_salen,
const sockaddr *local_sa, size_t local_salen, const ngtcp2_pkt_info &pi,
const uint8_t *data, size_t datalen, size_t gso_size) {
if (tx_.no_gso) {
if (gso_size == 0) {
gso_size = datalen;
}
for (auto p = data, end = data + datalen; p != end;) {
auto len = std::min(gso_size, static_cast<size_t>(end - p));
auto [nwrite, rv] =
quic_send_packet(faddr, remote_sa, remote_salen, local_sa,
local_salen, pi, p, len, gso_size);
if (rv != 0) {
switch (rv) {
case -EAGAIN:
#if EAGAIN != EWOULDBLOCK
case -EWOULDBLOCK:
#endif // EAGAIN != EWOULDBLOCK
return {p - data, SHRPX_ERR_SEND_BLOCKED};
default:
return {p - data, -1};
}
}
p += nwrite;
}
return {datalen, 0};
}
auto [nwrite, rv] =
quic_send_packet(faddr, remote_sa, remote_salen, local_sa, local_salen,
pi, data, datalen, gso_size);
switch (rv) {
case 0:
return 0;
return {nwrite, 0};
// With GSO, sendmsg may fail with EINVAL if UDP payload is too
// large.
case -EINVAL:
@@ -1900,12 +1905,21 @@ int Http3Upstream::send_packet(const UpstreamAddr *faddr,
#if EAGAIN != EWOULDBLOCK
case -EWOULDBLOCK:
#endif // EAGAIN != EWOULDBLOCK
return SHRPX_ERR_SEND_BLOCKED;
return {nwrite, SHRPX_ERR_SEND_BLOCKED};
case -EIO:
if (tx_.no_gso) {
break;
}
tx_.no_gso = true;
return send_packet(faddr, remote_sa, remote_salen, local_sa, local_salen,
pi, data, datalen, gso_size);
default:
break;
}
return -1;
return {nwrite, -1};
}
void Http3Upstream::on_send_blocked(const UpstreamAddr *faddr,
@@ -1934,17 +1948,18 @@ void Http3Upstream::on_send_blocked(const UpstreamAddr *faddr,
}
int Http3Upstream::send_blocked_packet() {
int rv;
assert(tx_.send_blocked);
for (; tx_.num_blocked_sent < tx_.num_blocked; ++tx_.num_blocked_sent) {
auto &p = tx_.blocked[tx_.num_blocked_sent];
rv = send_packet(p.faddr, &p.remote_addr.su.sa, p.remote_addr.len,
&p.local_addr.su.sa, p.local_addr.len, p.pi, p.data,
p.datalen, p.gso_size);
auto [nsent, rv] = send_packet(
p.faddr, &p.remote_addr.su.sa, p.remote_addr.len, &p.local_addr.su.sa,
p.local_addr.len, p.pi, p.data, p.datalen, p.gso_size);
if (rv == SHRPX_ERR_SEND_BLOCKED) {
p.data += nsent;
p.datalen -= nsent;
signal_write_upstream_addr(p.faddr);
return 0;

10
src/shrpx_http3_upstream.h
View File

@@ -137,10 +137,11 @@ public:
int check_shutdown();
int start_graceful_shutdown();
int submit_goaway();
int send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
size_t remote_salen, const sockaddr *local_sa,
size_t local_salen, const ngtcp2_pkt_info &pi,
const uint8_t *data, size_t datalen, size_t gso_size);
std::pair<size_t, int>
send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
size_t remote_salen, const sockaddr *local_sa, size_t local_salen,
const ngtcp2_pkt_info &pi, const uint8_t *data, size_t datalen,
size_t gso_size);
void qlog_write(const void *data, size_t datalen, bool fin);
int open_qlog_file(const StringRef &dir, const ngtcp2_cid &scid) const;
@@ -184,6 +185,7 @@ private:
size_t gso_size;
} blocked[2];
std::unique_ptr<uint8_t[]> data;
bool no_gso;
} tx_;
};

7
src/shrpx_quic.cc
View File

@@ -55,7 +55,8 @@ ngtcp2_tstamp quic_timestamp() {
.count();
}
int quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
std::pair<size_t, int>
quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
size_t remote_salen, const sockaddr *local_sa,
size_t local_salen, const ngtcp2_pkt_info &pi,
const uint8_t *data, size_t datalen, size_t gso_size) {
@@ -159,7 +160,7 @@ int quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
LOG(INFO) << "sendmsg failed: errno=" << error;
}
return -errno;
return {0, -errno};
}
if (LOG_ENABLED(INFO)) {
@@ -170,7 +171,7 @@ int quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
<< " bytes";
}
return 0;
return {nwrite, 0};
}
int generate_quic_retry_connection_id(ngtcp2_cid &cid, uint32_t server_id,

3
src/shrpx_quic.h
View File

@@ -112,7 +112,8 @@ struct ConnectionID {
ngtcp2_tstamp quic_timestamp();
int quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
std::pair<size_t, int>
quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,
size_t remote_salen, const sockaddr *local_sa,
size_t local_salen, const ngtcp2_pkt_info &pi,
const uint8_t *data, size_t datalen, size_t gso_size);

38
src/shrpx_quic_connection_handler.cc
View File

@@ -550,9 +550,11 @@ int QUICConnectionHandler::send_version_negotiation(
return -1;
}
return quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
&local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
buf.data(), nwrite, 0);
auto [_, rv] = quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
&local_addr.su.sa, local_addr.len,
ngtcp2_pkt_info{}, buf.data(), nwrite, 0);
return rv;
}
int QUICConnectionHandler::send_stateless_reset(
@@ -572,7 +574,6 @@ int QUICConnectionHandler::send_stateless_reset(
ev_timer_again(worker_->get_loop(), &stateless_reset_bucket_regen_timer_);
}
int rv;
std::array<uint8_t, NGTCP2_STATELESS_RESET_TOKENLEN> token;
ngtcp2_cid cid;
@@ -582,9 +583,9 @@ int QUICConnectionHandler::send_stateless_reset(
auto &qkms = conn_handler->get_quic_keying_materials();
auto &qkm = qkms->keying_materials.front();
rv = generate_quic_stateless_reset_token(token.data(), cid, qkm.secret.data(),
qkm.secret.size());
if (rv != 0) {
if (auto rv = generate_quic_stateless_reset_token(
token.data(), cid, qkm.secret.data(), qkm.secret.size());
rv != 0) {
return -1;
}
@@ -624,9 +625,11 @@ int QUICConnectionHandler::send_stateless_reset(
<< " dcid=" << util::format_hex(std::span{dcid, dcidlen});
}
return quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
&local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
buf.data(), nwrite, 0);
auto [_, rv] = quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
&local_addr.su.sa, local_addr.len,
ngtcp2_pkt_info{}, buf.data(), nwrite, 0);
return rv;
}
int QUICConnectionHandler::send_connection_close(
@@ -655,9 +658,11 @@ int QUICConnectionHandler::send_connection_close(
<< util::format_hex(std::span{ini_dcid.data, ini_dcid.datalen});
}
return quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
&local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
buf.data(), nwrite, 0);
auto [_, rv] = quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
&local_addr.su.sa, local_addr.len,
ngtcp2_pkt_info{}, buf.data(), nwrite, 0);
return rv;
}
void QUICConnectionHandler::add_connection_id(const ngtcp2_cid &cid,
@@ -751,9 +756,10 @@ int CloseWait::handle_packet(const UpstreamAddr *faddr,
return 0;
}
if (quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
&local_addr.su.sa, local_addr.len, ngtcp2_pkt_info{},
pkt.data(), pkt.size(), 0) != 0) {
auto [_, rv] = quic_send_packet(faddr, &remote_addr.su.sa, remote_addr.len,
&local_addr.su.sa, local_addr.len,
ngtcp2_pkt_info{}, pkt.data(), pkt.size(), 0);
if (rv != 0) {
return -1;
}