Merge branch 'ondrej/always-track-netmgr-sockets-and-handles' into 'main'

Simplify tracing the reference counting in isc_netmgr

See merge request isc-projects/bind9!7292

Author: oerdnj

lib/isc/include/isc/netmgr.h

@@ -24,6 +24,8 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
+#undef ISC_NETMGR_TRACE
+
 #if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__))
 #define HAVE_SO_REUSEPORT_LB 1
 #endif
@@ -146,7 +148,7 @@ isc_nmsocket_set_max_streams(isc_nmsocket_t *listener,
  * \li	'listener' is a pointer to a valid network manager listener socket.
  */
 
-#ifdef NETMGR_TRACE
+#ifdef ISC_NETMGR_TRACE
 #define isc_nmhandle_attach(handle, dest) \
 	isc__nmhandle_attach(handle, dest, __FILE__, __LINE__, __func__)
 #define isc_nmhandle_detach(handlep) \

lib/isc/netmgr/http.c

@@ -1470,7 +1470,7 @@ isc_nm_httpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
 	}
 
 	sock = isc_mem_get(worker->mctx, sizeof(*sock));
-	isc__nmsocket_init(sock, worker, isc_nm_httpsocket, local);
+	isc__nmsocket_init(sock, worker, isc_nm_httpsocket, local, NULL);
 
 	sock->connect_timeout = timeout;
 	sock->connect_cb = cb;
@@ -1655,7 +1655,8 @@ server_on_begin_headers_callback(nghttp2_session *ngsession,
 	worker = session->handle->sock->worker;
 	socket = isc_mem_get(worker->mctx, sizeof(isc_nmsocket_t));
 	isc__nmsocket_init(socket, worker, isc_nm_httpsocket,
-			   (isc_sockaddr_t *)&session->handle->sock->iface);
+			   (isc_sockaddr_t *)&session->handle->sock->iface,
+			   NULL);
 	socket->peer = session->handle->sock->peer;
 	socket->h2 = (isc_nmsocket_h2_t){
 		.psock = socket,
@@ -2501,7 +2502,7 @@ isc_nm_listenhttp(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface,
 	REQUIRE(isc_tid() == 0);
 
 	sock = isc_mem_get(worker->mctx, sizeof(*sock));
-	isc__nmsocket_init(sock, worker, isc_nm_httplistener, iface);
+	isc__nmsocket_init(sock, worker, isc_nm_httplistener, iface, NULL);
 	atomic_init(&sock->h2.max_concurrent_streams,
 		    NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS);
 

lib/isc/netmgr/netmgr-int.h

@@ -111,34 +111,24 @@ STATIC_ASSERT(ISC_NETMGR_TCP_RECVBUF_SIZE <= ISC_NETMGR_RECVBUF_SIZE,
 #define NM_MAXSEG (1280 - 20 - 40)
 
 /*
- * Define NETMGR_TRACE to activate tracing of handles and sockets.
+ * Define ISC_NETMGR_TRACE to activate tracing of handles and sockets.
  * This will impair performance but enables us to quickly determine,
  * if netmgr resources haven't been cleaned up on shutdown, which ones
  * are still in use.
  */
-#ifdef NETMGR_TRACE
+#if ISC_NETMGR_TRACE
 #define TRACE_SIZE 8
 
-void
-isc__nm_dump_active(isc_nm_t *nm);
-
 #if defined(__linux__)
 #include <syscall.h>
 #define gettid() (uint32_t) syscall(SYS_gettid)
 #else
 #define gettid() (uint32_t) pthread_self()
 #endif
 
-#ifdef NETMGR_TRACE_VERBOSE
 #define NETMGR_TRACE_LOG(format, ...)                                \
 	fprintf(stderr, "%" PRIu32 ":%d:%s:%u:%s:" format, gettid(), \
 		isc_tid(), file, line, func, __VA_ARGS__)
-#else
-#define NETMGR_TRACE_LOG(format, ...) \
-	(void)file;                   \
-	(void)line;                   \
-	(void)func;
-#endif
 
 #define FLARG_PASS , file, line, func
 #define FLARG                                              \
@@ -157,9 +147,9 @@ isc__nm_dump_active(isc_nm_t *nm);
 	isc___nm_uvreq_get(req, sock, __FILE__, __LINE__, __func__)
 #define isc__nm_uvreq_put(req, sock) \
 	isc___nm_uvreq_put(req, sock, __FILE__, __LINE__, __func__)
-#define isc__nmsocket_init(sock, mgr, type, iface)                      \
-	isc___nmsocket_init(sock, mgr, type, iface, __FILE__, __LINE__, \
-			    __func__)
+#define isc__nmsocket_init(sock, mgr, type, iface, parent)            \
+	isc___nmsocket_init(sock, mgr, type, iface, parent, __FILE__, \
+			    __LINE__, __func__)
 #define isc__nmsocket_put(sockp) \
 	isc___nmsocket_put(sockp, __FILE__, __LINE__, __func__)
 #define isc__nmsocket_attach(sock, target) \
@@ -181,8 +171,8 @@ isc__nm_dump_active(isc_nm_t *nm);
 #define FLARG_IEVENT_PASS(ievent)
 #define isc__nm_uvreq_get(req, sock) isc___nm_uvreq_get(req, sock)
 #define isc__nm_uvreq_put(req, sock) isc___nm_uvreq_put(req, sock)
-#define isc__nmsocket_init(sock, mgr, type, iface) \
-	isc___nmsocket_init(sock, mgr, type, iface)
+#define isc__nmsocket_init(sock, mgr, type, iface, parent) \
+	isc___nmsocket_init(sock, mgr, type, iface, parent)
 #define isc__nmsocket_put(sockp)	   isc___nmsocket_put(sockp)
 #define isc__nmsocket_attach(sock, target) isc___nmsocket_attach(sock, target)
 #define isc__nmsocket_detach(socketp)	   isc___nmsocket_detach(socketp)
@@ -208,10 +198,16 @@ typedef struct isc__networker {
 	char *recvbuf;
 	char *sendbuf;
 	bool recvbuf_inuse;
+
+	ISC_LIST(isc_nmsocket_t) active_sockets;
+
 } isc__networker_t;
 
 ISC_REFCOUNT_DECL(isc__networker);
 
+void
+isc__nm_dump_active(isc__networker_t *worker);
+
 /*
  * A general handle for a connection bound to a networker.  For UDP
  * connections we have peer address here, so both TCP and UDP can be
@@ -244,11 +240,11 @@ struct isc_nmhandle {
 	isc_sockaddr_t local;
 	isc_nm_opaquecb_t doreset; /* reset extra callback, external */
 	isc_nm_opaquecb_t dofree;  /* free extra callback, external */
-#ifdef NETMGR_TRACE
+#if ISC_NETMGR_TRACE
 	void *backtrace[TRACE_SIZE];
 	int backtrace_size;
-	LINK(isc_nmhandle_t) active_link;
 #endif
+	LINK(isc_nmhandle_t) active_link;
 	void *opaque;
 };
 
@@ -700,10 +696,6 @@ struct isc_nm {
 	atomic_int_fast32_t send_udp_buffer_size;
 	atomic_int_fast32_t recv_tcp_buffer_size;
 	atomic_int_fast32_t send_tcp_buffer_size;
-
-#ifdef NETMGR_TRACE
-	ISC_LIST(isc_nmsocket_t) active_sockets;
-#endif
 };
 
 /*%
@@ -1030,13 +1022,12 @@ struct isc_nmsocket {
 
 	bool barriers_initialised;
 	bool manual_read_timer;
-#ifdef NETMGR_TRACE
+#if ISC_NETMGR_TRACE
 	void *backtrace[TRACE_SIZE];
 	int backtrace_size;
+#endif
 	LINK(isc_nmsocket_t) active_link;
 	ISC_LIST(isc_nmhandle_t) active_handles;
-	isc_mutex_t tracelock;
-#endif
 };
 
 void
@@ -1070,8 +1061,8 @@ isc__nm_free_uvbuf(isc_nmsocket_t *sock, const uv_buf_t *buf);
  */
 
 isc_nmhandle_t *
-isc___nmhandle_get(isc_nmsocket_t *sock, isc_sockaddr_t *peer,
-		   isc_sockaddr_t *local FLARG);
+isc___nmhandle_get(isc_nmsocket_t *sock, isc_sockaddr_t const *peer,
+		   isc_sockaddr_t const *local FLARG);
 /*%<
  * Get a handle for the socket 'sock', allocating a new one
  * if there isn't one available in 'sock->inactivehandles'.
@@ -1104,7 +1095,8 @@ isc___nm_uvreq_put(isc__nm_uvreq_t **req, isc_nmsocket_t *sock FLARG);
 
 void
 isc___nmsocket_init(isc_nmsocket_t *sock, isc__networker_t *worker,
-		    isc_nmsocket_type type, isc_sockaddr_t *iface FLARG);
+		    isc_nmsocket_type type, isc_sockaddr_t *iface,
+		    isc_nmsocket_t *parent FLARG);
 /*%<
  * Initialize socket 'sock', attach it to 'mgr', and set it to type 'type'
  * and its interface to 'iface'.