net: tcp: Use net_buf pointer directly for out-of-order recv queue
Using net_pkt for TCP out-of-order recv queue was an overshot, as the
mechanism mostly used net_buf operations directly anyway. It can be
easily replaced with a direct net_buf pointer, so that it's not longer
needed to hog one net_pkt per TCP context anymore.
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit aca511c91fce1ffb75ccb3c6119f79e3755b90d4)
diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c
index 3a59190..607b4a3 100644
--- a/subsys/net/ip/tcp.c
+++ b/subsys/net/ip/tcp.c
@@ -797,7 +797,10 @@
tcp_pkt_unref(conn->send_data);
if (CONFIG_NET_TCP_RECV_QUEUE_TIMEOUT) {
- tcp_pkt_unref(conn->queue_recv_data);
+ if (conn->queue_recv_data != NULL) {
+ net_buf_unref(conn->queue_recv_data);
+ conn->queue_recv_data = NULL;
+ }
}
(void)k_work_cancel_delayable(&conn->timewait_timer);
@@ -1136,8 +1139,7 @@
{
size_t pending_len = 0;
- if (CONFIG_NET_TCP_RECV_QUEUE_TIMEOUT &&
- !net_pkt_is_empty(conn->queue_recv_data)) {
+ if (CONFIG_NET_TCP_RECV_QUEUE_TIMEOUT && conn->queue_recv_data != NULL) {
/* Some potentential cases:
* Note: MI = MAX_INT
* Packet | Queued| End off | Gap size | Required handling
@@ -1159,10 +1161,10 @@
int32_t gap_size;
uint32_t end_offset;
- pending_seq = tcp_get_seq(conn->queue_recv_data->buffer);
+ pending_seq = tcp_get_seq(conn->queue_recv_data);
end_offset = expected_seq - pending_seq;
gap_size = (int32_t)(pending_seq - th_seq(th) - ((uint32_t)len));
- pending_len = net_pkt_get_len(conn->queue_recv_data);
+ pending_len = net_buf_frags_len(conn->queue_recv_data);
if (end_offset < pending_len) {
if (end_offset) {
net_pkt_remove_tail(pkt, end_offset);
@@ -1173,15 +1175,15 @@
expected_seq, pending_len);
net_buf_frag_add(pkt->buffer,
- conn->queue_recv_data->buffer);
- conn->queue_recv_data->buffer = NULL;
+ conn->queue_recv_data);
+ conn->queue_recv_data = NULL;
k_work_cancel_delayable(&conn->recv_queue_timer);
} else {
/* Check if the queued data is just a section of the incoming data */
if (gap_size <= 0) {
- net_buf_unref(conn->queue_recv_data->buffer);
- conn->queue_recv_data->buffer = NULL;
+ net_buf_unref(conn->queue_recv_data);
+ conn->queue_recv_data = NULL;
k_work_cancel_delayable(&conn->recv_queue_timer);
}
@@ -1770,11 +1772,11 @@
k_mutex_lock(&conn->lock, K_FOREVER);
NET_DBG("Cleanup recv queue conn %p len %zd seq %u", conn,
- net_pkt_get_len(conn->queue_recv_data),
- tcp_get_seq(conn->queue_recv_data->buffer));
+ net_buf_frags_len(conn->queue_recv_data),
+ tcp_get_seq(conn->queue_recv_data));
- net_buf_unref(conn->queue_recv_data->buffer);
- conn->queue_recv_data->buffer = NULL;
+ net_buf_unref(conn->queue_recv_data);
+ conn->queue_recv_data = NULL;
k_mutex_unlock(&conn->lock);
}
@@ -2022,15 +2024,6 @@
memset(conn, 0, sizeof(*conn));
- if (CONFIG_NET_TCP_RECV_QUEUE_TIMEOUT) {
- conn->queue_recv_data = tcp_rx_pkt_alloc(conn, 0);
- if (conn->queue_recv_data == NULL) {
- NET_ERR("Cannot allocate %s queue for conn %p", "recv",
- conn);
- goto fail;
- }
- }
-
conn->send_data = tcp_pkt_alloc(conn, 0);
if (conn->send_data == NULL) {
NET_ERR("Cannot allocate %s queue for conn %p", "send", conn);
@@ -2089,11 +2082,6 @@
return conn;
fail:
- if (CONFIG_NET_TCP_RECV_QUEUE_TIMEOUT && conn->queue_recv_data) {
- tcp_pkt_unref(conn->queue_recv_data);
- conn->queue_recv_data = NULL;
- }
-
k_mem_slab_free(&tcp_conns_slab, (void *)conn);
return NULL;
}
@@ -2545,7 +2533,7 @@
NET_DBG("Queuing data: conn %p", conn);
}
- if (!net_pkt_is_empty(conn->queue_recv_data)) {
+ if (conn->queue_recv_data != NULL) {
/* Place the data to correct place in the list. If the data
* would not be sequential, then drop this packet.
*
@@ -2575,9 +2563,9 @@
uint32_t end_offset;
size_t pending_len;
- pending_seq = tcp_get_seq(conn->queue_recv_data->buffer);
+ pending_seq = tcp_get_seq(conn->queue_recv_data);
end_offset = seq - pending_seq;
- pending_len = net_pkt_get_len(conn->queue_recv_data);
+ pending_len = net_buf_frags_len(conn->queue_recv_data);
if (end_offset < pending_len) {
if (end_offset < len) {
if (end_offset) {
@@ -2586,16 +2574,16 @@
/* Put new data before the pending data */
net_buf_frag_add(pkt->buffer,
- conn->queue_recv_data->buffer);
+ conn->queue_recv_data);
NET_DBG("Adding at before queue, end_offset %i, pending_len %zu",
end_offset, pending_len);
- conn->queue_recv_data->buffer = pkt->buffer;
+ conn->queue_recv_data = pkt->buffer;
inserted = true;
}
} else {
struct net_buf *last;
- last = net_buf_frag_last(conn->queue_recv_data->buffer);
+ last = net_buf_frag_last(conn->queue_recv_data);
pending_seq = tcp_get_seq(last);
start_offset = pending_seq - seq_start;
@@ -2607,20 +2595,20 @@
/* The queued data is irrelevant since the new packet overlaps the
* new packet, take the new packet as contents
*/
- net_buf_unref(conn->queue_recv_data->buffer);
- conn->queue_recv_data->buffer = pkt->buffer;
+ net_buf_unref(conn->queue_recv_data);
+ conn->queue_recv_data = pkt->buffer;
inserted = true;
} else {
if (end_offset < len) {
if (end_offset) {
- net_pkt_remove_tail(conn->queue_recv_data,
- end_offset);
+ net_buf_remove_mem(conn->queue_recv_data,
+ end_offset);
}
/* Put new data after pending data */
NET_DBG("Adding at end of queue, start %i, end %i, len %zu",
start_offset, end_offset, len);
- net_buf_frag_add(conn->queue_recv_data->buffer,
+ net_buf_frag_add(conn->queue_recv_data,
pkt->buffer);
inserted = true;
}
@@ -2629,18 +2617,18 @@
if (inserted) {
NET_DBG("All pending data: conn %p", conn);
- if (check_seq_list(conn->queue_recv_data->buffer) == false) {
+ if (check_seq_list(conn->queue_recv_data) == false) {
NET_ERR("Incorrect order in out of order sequence for conn %p",
conn);
/* error in sequence list, drop it */
- net_buf_unref(conn->queue_recv_data->buffer);
- conn->queue_recv_data->buffer = NULL;
+ net_buf_unref(conn->queue_recv_data);
+ conn->queue_recv_data = NULL;
}
} else {
NET_DBG("Cannot add new data to queue");
}
} else {
- net_pkt_append_buffer(conn->queue_recv_data, pkt->buffer);
+ conn->queue_recv_data = pkt->buffer;
inserted = true;
}
diff --git a/subsys/net/ip/tcp_private.h b/subsys/net/ip/tcp_private.h
index 6c4d44b..466910f 100644
--- a/subsys/net/ip/tcp_private.h
+++ b/subsys/net/ip/tcp_private.h
@@ -259,7 +259,7 @@
sys_snode_t next;
struct net_context *context;
struct net_pkt *send_data;
- struct net_pkt *queue_recv_data;
+ struct net_buf *queue_recv_data;
struct net_if *iface;
void *recv_user_data;
sys_slist_t send_queue;
