From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v2 09/10] tcp: Move deferred handling functions later in tcp.c
Date: Fri, 13 Sep 2024 14:32:13 +1000 [thread overview]
Message-ID: <20240913043214.1753014-10-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20240913043214.1753014-1-david@gibson.dropbear.id.au>
Future changes will want these functions to call things that are
currently below them in the file, so move them later. Code motion only,
no change to logic for now.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
tcp.c | 58 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/tcp.c b/tcp.c
index 4b478432..78f546db 100644
--- a/tcp.c
+++ b/tcp.c
@@ -853,35 +853,6 @@ static int tcp_opt_get(const char *opts, size_t len, uint8_t type_find,
return -1;
}
-/**
- * tcp_flow_defer() - Deferred per-flow handling (clean up closed connections)
- * @conn: Connection to handle
- *
- * Return: true if the connection is ready to free, false otherwise
- */
-bool tcp_flow_defer(const struct tcp_tap_conn *conn)
-{
- if (conn->events != CLOSED)
- return false;
-
- close(conn->sock);
- if (conn->timer != -1)
- close(conn->timer);
-
- return true;
-}
-
-/**
- * tcp_defer_handler() - Handler for TCP deferred tasks
- * @c: Execution context
- */
-/* cppcheck-suppress [constParameterPointer, unmatchedSuppression] */
-void tcp_defer_handler(struct ctx *c)
-{
- tcp_flags_flush(c);
- tcp_payload_flush(c);
-}
-
/**
* tcp_fill_header() - Fill the TCP header fields for a given TCP segment.
*
@@ -2272,6 +2243,35 @@ void tcp_sock_handler(const struct ctx *c, union epoll_ref ref,
}
}
+/**
+ * tcp_flow_defer() - Deferred per-flow handling (clean up closed connections)
+ * @conn: Connection to handle
+ *
+ * Return: true if the connection is ready to free, false otherwise
+ */
+bool tcp_flow_defer(const struct tcp_tap_conn *conn)
+{
+ if (conn->events != CLOSED)
+ return false;
+
+ close(conn->sock);
+ if (conn->timer != -1)
+ close(conn->timer);
+
+ return true;
+}
+
+/**
+ * tcp_defer_handler() - Handler for TCP deferred tasks
+ * @c: Execution context
+ */
+/* cppcheck-suppress [constParameterPointer, unmatchedSuppression] */
+void tcp_defer_handler(struct ctx *c)
+{
+ tcp_flags_flush(c);
+ tcp_payload_flush(c);
+}
+
/**
* tcp_sock_init_af() - Initialise listening socket for a given af and port
* @c: Execution context
--
@@ -853,35 +853,6 @@ static int tcp_opt_get(const char *opts, size_t len, uint8_t type_find,
return -1;
}
-/**
- * tcp_flow_defer() - Deferred per-flow handling (clean up closed connections)
- * @conn: Connection to handle
- *
- * Return: true if the connection is ready to free, false otherwise
- */
-bool tcp_flow_defer(const struct tcp_tap_conn *conn)
-{
- if (conn->events != CLOSED)
- return false;
-
- close(conn->sock);
- if (conn->timer != -1)
- close(conn->timer);
-
- return true;
-}
-
-/**
- * tcp_defer_handler() - Handler for TCP deferred tasks
- * @c: Execution context
- */
-/* cppcheck-suppress [constParameterPointer, unmatchedSuppression] */
-void tcp_defer_handler(struct ctx *c)
-{
- tcp_flags_flush(c);
- tcp_payload_flush(c);
-}
-
/**
* tcp_fill_header() - Fill the TCP header fields for a given TCP segment.
*
@@ -2272,6 +2243,35 @@ void tcp_sock_handler(const struct ctx *c, union epoll_ref ref,
}
}
+/**
+ * tcp_flow_defer() - Deferred per-flow handling (clean up closed connections)
+ * @conn: Connection to handle
+ *
+ * Return: true if the connection is ready to free, false otherwise
+ */
+bool tcp_flow_defer(const struct tcp_tap_conn *conn)
+{
+ if (conn->events != CLOSED)
+ return false;
+
+ close(conn->sock);
+ if (conn->timer != -1)
+ close(conn->timer);
+
+ return true;
+}
+
+/**
+ * tcp_defer_handler() - Handler for TCP deferred tasks
+ * @c: Execution context
+ */
+/* cppcheck-suppress [constParameterPointer, unmatchedSuppression] */
+void tcp_defer_handler(struct ctx *c)
+{
+ tcp_flags_flush(c);
+ tcp_payload_flush(c);
+}
+
/**
* tcp_sock_init_af() - Initialise listening socket for a given af and port
* @c: Execution context
--
2.46.0
next prev parent reply other threads:[~2024-09-13 4:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-13 4:32 [PATCH v2 00/10] RFC: Clean up TCP epoll mask handling David Gibson
2024-09-13 4:32 ` [PATCH v2 01/10] tcp: Make some extra functions private David Gibson
2024-09-13 4:32 ` [PATCH v2 02/10] tcp: Clean up tcpi_snd_wnd probing David Gibson
2024-09-17 21:54 ` Stefano Brivio
2024-09-18 1:27 ` David Gibson
2024-09-13 4:32 ` [PATCH v2 03/10] tcp: Simplify ifdef logic in tcp_update_seqack_wnd() David Gibson
2024-09-17 21:54 ` Stefano Brivio
2024-09-18 1:31 ` David Gibson
2024-09-13 4:32 ` [PATCH v2 04/10] tcp: Make tcp_update_seqack_wnd()s force_seq parameter explicitly boolean David Gibson
2024-09-13 4:32 ` [PATCH v2 05/10] tcp: On socket EPOLLOUT, send new ACK to tap immediately David Gibson
2024-09-13 4:32 ` [PATCH v2 06/10] tap: Re-introduce EPOLLET for tap connections David Gibson
2024-09-13 4:32 ` [PATCH v2 07/10] tap: Keep track of whether there might be space in the tap buffers David Gibson
2024-09-13 4:32 ` [PATCH v2 08/10] tcp: Keep track of connections blocked due to a full tap interface David Gibson
2024-09-13 4:32 ` David Gibson [this message]
2024-09-13 4:32 ` [PATCH v2 10/10] tcp: Simplify epoll event mask management David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240913043214.1753014-10-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).