mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-27 20:25:55 -04:00
Do not set SO_INCOMING_CPU
We currently set SO_INCOMING_CPU incorrectly, and testing by Ondrej
shows that fixing the issue and setting affinities is worse than letting
the kernel schedule threads without constraints. So we should not set
SO_INCOMING_CPU anymore.
(cherry picked from commit 8b8149cdd2)
This commit is contained in:
parent
0b386fc34c
commit
01e3567243
6 changed files with 0 additions and 26 deletions
|
|
@ -1978,12 +1978,6 @@ isc__nm_socket_reuse_lb(uv_os_sock_t fd);
|
|||
* Set the SO_REUSEPORT_LB (or equivalent) socket option on the fd
|
||||
*/
|
||||
|
||||
isc_result_t
|
||||
isc__nm_socket_incoming_cpu(uv_os_sock_t fd);
|
||||
/*%<
|
||||
* Set the SO_INCOMING_CPU socket option on the fd if available
|
||||
*/
|
||||
|
||||
isc_result_t
|
||||
isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_family_t sa_family);
|
||||
/*%<
|
||||
|
|
|
|||
|
|
@ -3340,20 +3340,6 @@ isc__nm_socket_reuse_lb(uv_os_sock_t fd) {
|
|||
#endif
|
||||
}
|
||||
|
||||
isc_result_t
|
||||
isc__nm_socket_incoming_cpu(uv_os_sock_t fd) {
|
||||
#ifdef SO_INCOMING_CPU
|
||||
if (setsockopt_on(fd, SOL_SOCKET, SO_INCOMING_CPU) == -1) {
|
||||
return (ISC_R_FAILURE);
|
||||
} else {
|
||||
return (ISC_R_SUCCESS);
|
||||
}
|
||||
#else
|
||||
UNUSED(fd);
|
||||
#endif
|
||||
return (ISC_R_NOTIMPLEMENTED);
|
||||
}
|
||||
|
||||
isc_result_t
|
||||
isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_family_t sa_family) {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -383,7 +383,6 @@ isc__nm_tcp_lb_socket(isc_nm_t *mgr, sa_family_t sa_family) {
|
|||
result = isc__nm_socket(sa_family, SOCK_STREAM, 0, &sock);
|
||||
RUNTIME_CHECK(result == ISC_R_SUCCESS);
|
||||
|
||||
(void)isc__nm_socket_incoming_cpu(sock);
|
||||
(void)isc__nm_socket_v6only(sock, sa_family);
|
||||
|
||||
/* FIXME: set mss */
|
||||
|
|
|
|||
|
|
@ -346,7 +346,6 @@ isc__nm_tcpdns_lb_socket(isc_nm_t *mgr, sa_family_t sa_family) {
|
|||
result = isc__nm_socket(sa_family, SOCK_STREAM, 0, &sock);
|
||||
RUNTIME_CHECK(result == ISC_R_SUCCESS);
|
||||
|
||||
(void)isc__nm_socket_incoming_cpu(sock);
|
||||
(void)isc__nm_socket_v6only(sock, sa_family);
|
||||
|
||||
/* FIXME: set mss */
|
||||
|
|
|
|||
|
|
@ -456,7 +456,6 @@ isc__nm_tlsdns_lb_socket(isc_nm_t *mgr, sa_family_t sa_family) {
|
|||
result = isc__nm_socket(sa_family, SOCK_STREAM, 0, &sock);
|
||||
RUNTIME_CHECK(result == ISC_R_SUCCESS);
|
||||
|
||||
(void)isc__nm_socket_incoming_cpu(sock);
|
||||
(void)isc__nm_socket_v6only(sock, sa_family);
|
||||
|
||||
/* FIXME: set mss */
|
||||
|
|
|
|||
|
|
@ -94,7 +94,6 @@ isc__nm_udp_lb_socket(isc_nm_t *mgr, sa_family_t sa_family) {
|
|||
result = isc__nm_socket(sa_family, SOCK_DGRAM, 0, &sock);
|
||||
RUNTIME_CHECK(result == ISC_R_SUCCESS);
|
||||
|
||||
(void)isc__nm_socket_incoming_cpu(sock);
|
||||
(void)isc__nm_socket_disable_pmtud(sock, sa_family);
|
||||
(void)isc__nm_socket_v6only(sock, sa_family);
|
||||
|
||||
|
|
@ -1064,8 +1063,6 @@ isc_nm_udpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
|
|||
RUNTIME_CHECK(result == ISC_R_SUCCESS ||
|
||||
result == ISC_R_NOTIMPLEMENTED);
|
||||
|
||||
(void)isc__nm_socket_incoming_cpu(sock->fd);
|
||||
|
||||
(void)isc__nm_socket_disable_pmtud(sock->fd, sa_family);
|
||||
|
||||
(void)isc__nm_socket_min_mtu(sock->fd, sa_family);
|
||||
|
|
|
|||
Loading…
Reference in a new issue