Geliang Tang 18d82cde74
mptcp: add last time fields in mptcp_info ...
This patch adds "last time" fields last_data_sent, last_data_recv and
last_ack_recv in struct mptcp_sock to record the last time data_sent,
data_recv and ack_recv happened. They all are initialized as
tcp_jiffies32 in __mptcp_init_sock(), and updated as tcp_jiffies32 too
when data is sent in __subflow_push_pending(), data is received in
__mptcp_move_skbs_from_subflow(), and ack is received in ack_update_msk().
Similar to tcpi_last_data_sent, tcpi_last_data_recv and tcpi_last_ack_recv
exposed with TCP, this patch exposes the last time "an action happened" for
MPTCP in mptcp_info, named mptcpi_last_data_sent, mptcpi_last_data_recv and
mptcpi_last_ack_recv, calculated in mptcp_diag_fill_info() as the time
deltas between now and the newly added last time fields in mptcp_sock.
Since msk->last_ack_recv needs to be protected by mptcp_data_lock/unlock,
and lock_sock_fast can sleep and be quite slow, move the entire
mptcp_data_lock/unlock block after the lock/unlock_sock_fast block.
Then mptcpi_last_data_sent and mptcpi_last_data_recv are set in
lock/unlock_sock_fast block, while mptcpi_last_ack_recv is set in
mptcp_data_lock/unlock block, which is protected by a spinlock and
should not block for too long.
Also add three reserved bytes in struct mptcp_info not to have holes in
this structure exposed to userspace.
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/446
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn >
Reviewed-by: Mat Martineau <martineau@kernel.org >
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org >
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org >
Link: https://lore.kernel.org/r/20240410-upstream-net-next-20240405-mptcp-last-time-info-v2-1-f95bd6b33e51@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
2024-04-11 08:19:54 -07:00
2023-12-15 17:06:45 +01:00
2024-02-13 11:47:13 +01:00
2023-05-14 16:05:28 +01:00
2022-11-17 22:49:39 +01:00
2024-01-28 13:40:19 +00:00
2024-02-08 15:30:33 -08:00
2023-08-22 15:13:20 +02:00
2022-08-09 19:51:05 +02:00
2023-04-27 18:49:24 -04:00
2023-12-19 10:37:50 -08:00
2023-10-02 20:48:16 +02:00
2023-05-30 15:20:08 +01:00
2024-02-19 10:58:24 +00:00
2024-02-17 17:00:09 +01:00
2022-11-23 19:55:22 +01:00
2023-06-20 14:28:17 -06:00
2022-11-04 16:56:41 +01:00
2022-08-11 10:31:19 -07:00
2022-12-22 18:18:37 -08:00
2023-03-10 21:05:16 +01:00
2022-10-31 07:29:47 -04:00
2023-05-30 16:42:00 -07:00
2024-02-16 12:42:59 +11:00
2023-11-14 08:16:34 +01:00
2024-02-08 08:41:03 -05:00
2023-07-24 20:11:54 -06:00
2024-03-19 23:05:34 -07:00
2023-11-09 14:02:12 +01:00
2024-03-05 17:13:24 +01:00
2024-02-13 11:47:13 +01:00
2023-06-06 17:05:54 -04:00
2022-09-24 08:50:04 +02:00
2022-09-24 08:50:04 +02:00
2023-07-14 08:43:49 -10:00
2023-07-23 11:34:22 +01:00
2023-04-18 16:39:34 -07:00
2023-10-16 11:38:56 -04:00
2023-12-07 12:44:19 -08:00
2023-01-20 09:33:22 +00:00
2024-04-08 14:10:45 +01:00
2023-07-20 17:24:57 -05:00
2023-03-06 15:49:07 -06:00
2023-03-06 15:49:07 -06:00
2023-03-30 15:57:50 -04:00
2024-02-01 15:39:44 +01:00
2022-08-29 15:32:13 +02:00
2023-08-23 14:17:42 -07:00
2024-03-07 17:14:53 +00:00
2024-04-10 19:30:01 -07:00
2024-04-06 18:25:14 +01:00
2023-06-15 14:55:15 +02:00
2024-02-14 11:01:01 +00:00
2023-04-19 23:39:42 -04:00
2022-11-28 12:46:23 -08:00
2024-03-06 13:13:05 +01:00
2024-01-27 18:08:54 -08:00
2023-11-18 14:54:07 +01:00
2023-06-06 07:54:00 +09:00
2023-03-16 21:20:32 -07:00
2024-03-11 11:02:06 -07:00
2023-09-25 22:34:33 -07:00
2023-08-09 15:43:27 +09:30
2024-03-06 09:56:35 +01:00
2023-09-21 19:22:05 +02:00
2022-08-10 13:49:50 +01:00
2024-02-15 08:44:57 +01:00
2023-10-27 09:21:13 +02:00
2023-10-24 12:02:02 +02:00
2023-05-24 22:05:24 -07:00
2023-10-27 18:04:30 +08:00
2022-09-20 11:53:32 +01:00
2023-03-10 21:05:16 +01:00
2023-10-04 13:00:34 +05:30
2022-10-28 12:36:34 +08:00
2023-12-20 11:27:20 +00:00
2022-09-15 09:08:09 +02:00
2024-02-06 13:17:54 +01:00
2022-08-18 20:37:35 -07:00
2023-10-12 09:15:15 +02:00
2024-04-02 18:24:33 -07:00
2022-12-12 09:29:56 +00:00
2024-04-01 10:49:28 +01:00
2023-11-29 14:59:40 -08:00
2024-02-27 18:22:49 -08:00
2023-05-23 15:38:59 +02:00
2024-03-06 13:13:00 +01:00
2024-03-12 12:43:53 +02:00
2022-07-17 07:52:46 -07:00
2024-02-09 11:54:32 -07:00
2024-02-28 11:19:41 +00:00
2023-01-06 19:22:53 -08:00
2024-01-11 13:01:25 -04:00
2023-08-15 10:06:49 -06:00
2023-02-06 09:01:00 +00:00
2022-10-17 09:51:26 -05:00
2023-07-28 13:30:51 -07:00
2023-03-16 15:18:02 +01:00
2023-01-19 16:28:57 +01:00
2023-12-20 15:02:57 -08:00
2024-03-27 08:53:02 -04:00
2023-06-09 12:34:45 -04:00
2024-02-08 08:41:06 -05:00
2022-09-20 09:13:38 +02:00
2023-10-26 21:07:15 +02:00
2024-02-15 23:43:47 -05:00
2022-08-29 10:44:08 +02:00
2024-03-01 12:23:37 +01:00
2024-02-22 13:32:55 +01:00
2024-02-21 14:56:58 -08:00
2023-10-16 11:47:43 +02:00
2023-05-25 16:21:22 +02:00
2023-03-23 17:25:46 +01:00
2023-12-15 17:01:30 +01:00
2023-01-07 11:29:29 +01:00
2023-01-18 17:12:37 -08:00
2024-02-22 10:24:46 -08:00
2023-06-09 16:25:16 -07:00
2023-12-14 11:49:17 +01:00
2023-12-15 12:17:16 +00:00
2024-04-11 08:19:54 -07:00
2023-04-27 19:15:11 -06:00
2022-11-03 20:46:32 -07:00
2023-11-18 18:42:37 -08:00
2024-03-07 21:13:26 -08:00
2022-09-07 16:46:03 +02:00
2023-10-20 11:43:35 +01:00
2024-03-08 10:35:47 +00:00
2023-11-06 09:03:46 +00:00
2024-03-25 15:36:56 +01:00
2023-09-27 09:40:02 +02:00
2023-11-28 19:05:16 +00:00
2023-08-14 08:01:06 +01:00
2023-03-23 12:22:19 +09:00
2023-10-28 13:31:05 -05:00
2023-12-18 11:55:56 +01:00
2023-10-27 15:05:11 +02:00
2024-02-21 09:46:08 +01:00
2024-04-01 10:49:28 +01:00
2024-01-02 14:25:51 +00:00
2023-06-07 14:26:09 -06:00
2022-12-01 03:22:20 +00:00
2023-10-06 14:44:11 -07:00
2023-01-06 17:12:39 +00:00
2023-07-20 22:14:21 +12:00
2024-01-29 20:34:19 +01:00
2024-01-29 13:00:23 +00:00
2023-04-16 14:23:07 +02:00
2023-08-09 09:15:39 +02:00
2023-12-20 19:26:31 -05:00
2024-02-23 14:23:23 +02:00
2023-01-06 19:28:01 -08:00
2023-07-15 11:35:02 -07:00
2022-12-27 12:52:12 +01:00
2023-10-25 18:04:29 -07:00
2023-03-09 11:31:44 +01:00
2023-07-17 16:08:08 -07:00
2023-08-22 11:10:26 -06:00
2022-08-03 16:29:08 -07:00
2022-09-20 12:33:22 +02:00
2023-10-10 08:51:10 +02:00
2023-09-18 11:14:42 +02:00
2024-01-27 18:15:24 -08:00
2023-10-19 18:11:49 -07:00
2023-12-26 20:24:33 +00:00
2023-12-26 20:24:33 +00:00
2023-10-27 10:35:45 +01:00
2023-11-18 14:56:16 +01:00
2023-11-27 16:24:56 -08:00
2022-11-09 14:06:51 +01:00
2023-12-02 01:17:48 +02:00
2023-03-24 16:59:09 -04:00
2023-04-18 16:39:34 -07:00
2023-10-27 10:35:46 +01:00
2022-11-17 11:04:23 -08:00
2023-12-04 10:37:46 +01:00
2022-09-27 17:29:09 -07:00
2023-06-15 13:41:53 +02:00
2023-06-05 09:36:35 +02:00
2024-02-28 18:47:08 -07:00
2022-08-31 09:07:53 +02:00
2024-03-18 10:13:03 -04:00
2023-12-29 11:58:24 -08:00
2023-03-23 17:25:46 +01:00
2023-01-15 23:45:15 +02:00
2022-12-07 17:58:46 +01:00
2023-12-04 10:37:46 +01:00
2022-12-07 17:58:46 +01:00
2022-12-07 17:58:46 +01:00
2023-12-13 16:52:35 +01:00
2024-03-19 02:45:51 -04:00
2022-08-11 04:26:08 -04:00
2024-01-27 18:08:54 -08:00
2022-07-11 09:54:37 +02:00
2023-12-04 14:29:08 -07:00
2023-11-01 09:20:00 -04:00
2024-03-19 02:45:49 -04:00
2024-02-05 12:57:45 +01:00
2023-04-04 11:01:57 -04:00
2022-12-12 14:19:23 -08:00
2023-12-19 11:51:31 -07:00
2023-12-15 19:30:00 +03:00
2023-08-01 21:02:00 -07:00
2024-03-19 02:45:49 -04:00
2024-01-10 13:01:37 -05:00
2022-08-16 01:40:24 -04:00
2024-02-09 14:01:15 +01:00
2023-10-15 13:19:42 +01:00
2023-05-28 19:07:48 -06:00
2023-10-05 08:18:19 +02:00
18d82cde74