Jiayuan Chen
05a571ee23
bpf: Fix wrong copied_seq calculation
...
[ Upstream commit 36b62df568 ]
'sk->copied_seq' was updated in the tcp_eat_skb() function when the action
of a BPF program was SK_REDIRECT. For other actions, like SK_PASS, the
update logic for 'sk->copied_seq' was moved to tcp_bpf_recvmsg_parser()
to ensure the accuracy of the 'fionread' feature.
It works for a single stream_verdict scenario, as it also modified
sk_data_ready->sk_psock_verdict_data_ready->tcp_read_skb
to remove updating 'sk->copied_seq'.
However, for programs where both stream_parser and stream_verdict are
active (strparser purpose), tcp_read_sock() was used instead of
tcp_read_skb() (sk_data_ready->strp_data_ready->tcp_read_sock).
tcp_read_sock() now still updates 'sk->copied_seq', leading to duplicate
updates.
In summary, for strparser + SK_PASS, copied_seq is redundantly calculated
in both tcp_read_sock() and tcp_bpf_recvmsg_parser().
The issue causes incorrect copied_seq calculations, which prevent
correct data reads from the recv() interface in user-land.
We do not want to add new proto_ops to implement a new version of
tcp_read_sock, as this would introduce code complexity [1].
We could have added noack and copied_seq to desc, and then called
ops->read_sock. However, unfortunately, other modules didn’t fully
initialize desc to zero. So, for now, we are directly calling
tcp_read_sock_noack() in tcp_bpf.c.
[1]: https://lore.kernel.org/bpf/20241218053408.437295-1-mrpre@163.com
Fixes: e5c6de5fa0 ("bpf, sockmap: Incorrectly handling copied_seq")
Suggested-by: Jakub Sitnicki <jakub@cloudflare.com >
Signed-off-by: Jiayuan Chen <mrpre@163.com >
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org >
Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com >
Acked-by: John Fastabend <john.fastabend@gmail.com >
Link: https://patch.msgid.link/20250122100917.49845-3-mrpre@163.com
Signed-off-by: Sasha Levin <sashal@kernel.org >
2025-02-27 04:10:50 -08:00
..
2024-06-27 13:49:11 +02:00
2024-12-09 10:32:02 +01:00
2025-01-02 10:31:59 +01:00
2024-12-19 18:11:29 +01:00
2024-06-12 11:12:23 +02:00
2024-10-22 15:46:19 +02:00
2024-04-27 17:11:33 +02:00
2024-12-14 19:59:46 +01:00
2024-06-12 11:12:21 +02:00
2024-10-22 15:46:35 +02:00
2025-02-08 09:51:57 +01:00
2025-02-17 09:40:08 +01:00
2024-12-14 20:00:00 +01:00
2024-04-03 15:28:58 +02:00
2024-02-23 09:25:18 +01:00
2024-04-03 15:28:28 +02:00
2025-02-08 09:51:54 +01:00
2024-06-21 14:38:34 +02:00
2024-09-12 11:11:32 +02:00
2025-02-21 13:57:17 +01:00
2024-09-08 07:54:43 +02:00
2024-01-31 16:18:47 -08:00
2024-07-25 09:50:47 +02:00
2024-08-19 06:04:23 +02:00
2025-02-08 09:52:37 +01:00
2024-06-12 11:11:37 +02:00
2024-09-12 11:11:40 +02:00
2024-11-14 13:19:38 +01:00
2024-01-31 16:18:49 -08:00
2024-02-23 09:25:16 +01:00
2025-02-17 09:40:03 +01:00
2024-01-25 15:35:46 -08:00
2024-10-04 16:29:59 +02:00
2024-06-12 11:11:38 +02:00
2024-01-20 11:51:38 +01:00
2024-08-14 13:59:02 +02:00
2025-02-21 13:57:09 +01:00
2024-12-09 10:32:56 +01:00
2024-04-27 17:11:43 +02:00
2024-01-25 15:35:28 -08:00
2024-05-25 16:22:53 +02:00
2025-01-09 13:32:06 +01:00
2024-09-12 11:11:34 +02:00
2024-12-19 18:11:25 +01:00
2025-02-08 09:52:26 +01:00
2024-03-06 14:48:44 +00:00
2024-07-25 09:50:40 +02:00
2025-02-21 13:57:17 +01:00
2025-01-09 13:31:53 +01:00
2024-01-25 15:35:38 -08:00
2024-08-14 13:58:56 +02:00
2024-07-05 09:34:04 +02:00
2024-12-09 10:32:46 +01:00
2024-12-09 10:32:46 +01:00
2024-11-08 16:28:20 +01:00
2024-12-19 18:11:36 +01:00
2024-06-12 11:12:14 +02:00
2024-06-12 11:11:24 +02:00
2024-10-10 11:57:58 +02:00
2024-08-29 17:33:14 +02:00
2024-11-22 15:38:35 +01:00
2024-01-10 17:16:53 +01:00
2024-06-12 11:11:57 +02:00
2024-11-08 16:28:24 +01:00
2024-03-26 18:20:13 -04:00
2024-05-17 12:02:27 +02:00
2024-09-04 13:28:24 +02:00
2024-02-16 19:10:42 +01:00
2024-12-14 20:00:16 +01:00
2025-02-21 13:57:17 +01:00
2024-05-02 16:32:46 +02:00
2024-12-14 19:59:58 +01:00
2024-08-29 17:33:31 +02:00
2024-01-05 15:19:41 +01:00
2024-10-04 16:29:37 +02:00
2024-12-14 20:00:05 +01:00
2024-06-12 11:11:56 +02:00
2024-10-10 11:58:00 +02:00
2024-07-09 11:44:29 +02:00
2024-06-12 11:12:51 +02:00
2025-02-01 18:37:54 +01:00
2024-07-25 09:50:57 +02:00
2024-09-08 07:54:44 +02:00
2024-07-11 12:49:16 +02:00
2024-12-14 19:59:45 +01:00
2024-05-17 12:02:15 +02:00
2024-04-03 15:28:44 +02:00
2025-02-08 09:51:56 +01:00
2024-12-09 10:31:48 +01:00
2025-01-23 17:21:17 +01:00
2024-11-08 16:28:27 +01:00
2025-01-17 13:36:26 +01:00
2024-09-08 07:54:43 +02:00
2024-12-27 13:58:54 +01:00
2024-10-10 11:58:01 +02:00
2025-02-21 13:57:27 +01:00
2025-02-08 09:51:58 +01:00
2025-01-09 13:32:02 +01:00
2024-12-09 10:32:59 +01:00
2024-04-03 15:28:19 +02:00
2024-04-03 15:28:18 +02:00
2024-10-17 15:24:26 +02:00
2024-04-10 16:36:02 +02:00
2024-12-27 13:58:55 +01:00
2024-11-08 16:28:19 +01:00
2024-06-21 14:38:30 +02:00
2024-02-05 20:14:17 +00:00
2024-04-17 11:19:36 +02:00
2024-10-17 15:24:13 +02:00
2024-12-09 10:31:50 +01:00
2025-02-08 09:52:27 +01:00
2024-06-27 13:49:13 +02:00
2024-04-13 13:07:38 +02:00
2024-01-01 12:42:33 +00:00
2024-06-27 13:49:03 +02:00
2024-06-16 13:47:41 +02:00
2024-06-12 11:12:52 +02:00
2025-02-17 09:40:16 +01:00
2024-12-14 20:00:12 +01:00
2024-07-05 09:33:57 +02:00
2024-12-09 10:32:45 +01:00
2024-07-11 12:49:18 +02:00
2024-01-31 16:18:56 -08:00
2025-01-09 13:31:40 +01:00
2024-11-01 01:58:25 +01:00
2024-10-17 15:24:10 +02:00
2024-02-05 20:14:21 +00:00
2025-01-17 13:36:26 +01:00
2025-01-17 13:36:26 +01:00
2024-11-22 15:38:37 +01:00
2024-12-09 10:32:59 +01:00
2024-07-18 13:21:10 +02:00
2024-06-27 13:49:14 +02:00
2024-03-26 18:19:55 -04:00
2025-02-08 09:52:02 +01:00
2025-01-09 13:31:41 +01:00
2025-02-27 04:10:49 -08:00
2024-01-25 15:35:59 -08:00
2024-03-06 14:48:36 +00:00
2024-10-17 15:24:29 +02:00
2024-12-09 10:32:12 +01:00
2024-10-17 15:24:23 +02:00
2024-04-03 15:28:29 +02:00
2025-01-17 13:36:09 +01:00
2024-06-12 11:12:53 +02:00
2024-07-05 09:33:53 +02:00
2024-09-18 19:24:04 +02:00
2025-02-27 04:10:47 -08:00
2024-08-03 08:53:38 +02:00
2023-12-20 17:02:06 +01:00
2024-12-09 10:31:56 +01:00
2025-02-08 09:51:51 +01:00
2024-12-09 10:32:59 +01:00
2024-12-09 10:32:59 +01:00
2024-04-13 13:07:32 +02:00
2024-07-25 09:50:56 +02:00
2024-05-02 16:32:47 +02:00
2024-07-18 13:21:20 +02:00
2024-10-17 15:24:22 +02:00
2024-12-14 20:00:14 +01:00
2025-02-08 09:51:44 +01:00
2024-09-12 11:11:40 +02:00
2024-07-11 12:49:11 +02:00
2024-01-31 16:19:09 -08:00
2025-01-23 17:21:14 +01:00
2025-02-08 09:52:38 +01:00
2024-06-12 11:11:56 +02:00
2024-08-14 13:58:47 +02:00
2024-09-18 19:24:03 +02:00
2025-01-23 17:21:12 +01:00
2024-02-23 09:24:53 +01:00
2024-06-12 11:12:24 +02:00
2024-04-13 13:07:40 +02:00
2024-12-09 10:32:59 +01:00
2024-05-17 12:01:59 +02:00
2024-04-03 15:28:32 +02:00
2024-01-31 16:18:56 -08:00
2025-01-09 13:31:41 +01:00
2024-10-04 16:29:38 +02:00
2024-12-14 19:59:50 +01:00
2025-02-08 09:51:44 +01:00
2024-08-11 12:47:16 +02:00
2025-02-01 18:37:51 +01:00
2024-04-10 16:36:04 +02:00
2024-07-11 12:49:18 +02:00
2025-01-09 13:32:05 +01:00
2024-12-09 10:31:51 +01:00
2024-07-05 09:34:00 +02:00
2025-02-27 04:10:45 -08:00
2024-04-27 17:11:42 +02:00
2024-05-17 12:02:20 +02:00
2025-02-27 04:10:50 -08:00
2024-08-29 17:33:23 +02:00
2024-06-16 13:47:49 +02:00
2024-12-09 10:32:10 +01:00
2024-11-22 15:38:32 +01:00
2025-01-09 13:31:41 +01:00
2024-01-25 15:35:49 -08:00
2024-12-19 18:11:37 +01:00
2024-10-10 11:58:08 +02:00
2024-03-01 13:35:00 +01:00
2024-04-27 17:11:42 +02:00
2024-07-05 09:34:04 +02:00
2024-08-11 12:47:13 +02:00
2024-11-01 01:58:20 +01:00
2024-10-17 15:24:23 +02:00
2024-11-08 16:28:16 +01:00
2024-11-14 13:19:37 +01:00
2025-01-09 13:31:55 +01:00
2025-01-09 13:31:55 +01:00
2024-06-12 11:12:35 +02:00
2024-06-27 13:49:05 +02:00
2024-04-17 11:19:28 +02:00
2024-11-08 16:28:26 +01:00
2024-04-27 17:11:32 +02:00
2024-10-10 11:57:36 +02:00
2024-11-14 13:19:39 +01:00
2024-12-09 10:33:06 +01:00
2024-04-03 15:28:49 +02:00
2024-10-10 11:57:17 +02:00
2024-01-25 15:35:26 -08:00
2025-01-02 10:32:00 +01:00
2024-12-27 13:58:57 +01:00
2024-07-05 09:33:45 +02:00
2024-10-04 16:30:02 +02:00