Maciej Fijalkowski
82ee4781b8
xsk: fix usage of multi-buffer BPF helpers for ZC XDP
[ Upstream commit c5114710c8ce86b8317e9b448f4fd15c711c2a82 ]
Currently when packet is shrunk via bpf_xdp_adjust_tail() and memory
type is set to MEM_TYPE_XSK_BUFF_POOL, null ptr dereference happens:
[1136314.192256] BUG: kernel NULL pointer dereference, address:
0000000000000034
[1136314.203943] #PF: supervisor read access in kernel mode
[1136314.213768] #PF: error_code(0x0000) - not-present page
[1136314.223550] PGD 0 P4D 0
[1136314.230684] Oops: 0000 [#1] PREEMPT SMP NOPTI
[1136314.239621] CPU: 8 PID: 54203 Comm: xdpsock Not tainted 6.6.0+ #257
[1136314.250469] Hardware name: Intel Corporation S2600WFT/S2600WFT,
BIOS SE5C620.86B.02.01.0008.031920191559 03/19/2019
[1136314.265615] RIP: 0010:__xdp_return+0x6c/0x210
[1136314.274653] Code: ad 00 48 8b 47 08 49 89 f8 a8 01 0f 85 9b 01 00 00 0f 1f 44 00 00 f0 41 ff 48 34 75 32 4c 89 c7 e9 79 cd 80 ff 83 fe 03 75 17 <f6> 41 34 01 0f 85 02 01 00 00 48 89 cf e9 22 cc 1e 00 e9 3d d2 86
[1136314.302907] RSP: 0018:ffffc900089f8db0 EFLAGS: 00010246
[1136314.312967] RAX: ffffc9003168aed0 RBX: ffff8881c3300000 RCX:
0000000000000000
[1136314.324953] RDX: 0000000000000000 RSI: 0000000000000003 RDI:
ffffc9003168c000
[1136314.336929] RBP: 0000000000000ae0 R08: 0000000000000002 R09:
0000000000010000
[1136314.348844] R10: ffffc9000e495000 R11: 0000000000000040 R12:
0000000000000001
[1136314.360706] R13: 0000000000000524 R14: ffffc9003168aec0 R15:
0000000000000001
[1136314.373298] FS: 00007f8df8bbcb80(0000) GS:ffff8897e0e00000(0000)
knlGS:0000000000000000
[1136314.386105] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[1136314.396532] CR2: 0000000000000034 CR3: 00000001aa912002 CR4:
00000000007706f0
[1136314.408377] DR0: 0000000000000000 DR1: 0000000000000000 DR2:
0000000000000000
[1136314.420173] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7:
0000000000000400
[1136314.431890] PKRU: 55555554
[1136314.439143] Call Trace:
[1136314.446058] <IRQ>
[1136314.452465] ? __die+0x20/0x70
[1136314.459881] ? page_fault_oops+0x15b/0x440
[1136314.468305] ? exc_page_fault+0x6a/0x150
[1136314.476491] ? asm_exc_page_fault+0x22/0x30
[1136314.484927] ? __xdp_return+0x6c/0x210
[1136314.492863] bpf_xdp_adjust_tail+0x155/0x1d0
[1136314.501269] bpf_prog_ccc47ae29d3b6570_xdp_sock_prog+0x15/0x60
[1136314.511263] ice_clean_rx_irq_zc+0x206/0xc60 [ice]
[1136314.520222] ? ice_xmit_zc+0x6e/0x150 [ice]
[1136314.528506] ice_napi_poll+0x467/0x670 [ice]
[1136314.536858] ? ttwu_do_activate.constprop.0+0x8f/0x1a0
[1136314.546010] __napi_poll+0x29/0x1b0
[1136314.553462] net_rx_action+0x133/0x270
[1136314.561619] __do_softirq+0xbe/0x28e
[1136314.569303] do_softirq+0x3f/0x60
This comes from __xdp_return() call with xdp_buff argument passed as
NULL which is supposed to be consumed by xsk_buff_free() call.
To address this properly, in ZC case, a node that represents the frag
being removed has to be pulled out of xskb_list. Introduce
appropriate xsk helpers to do such node operation and use them
accordingly within bpf_xdp_adjust_tail().
Fixes: 24ea50127e ("xsk: support mbuf on ZC RX")
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com> # For the xsk header part
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/r/20240124191602.566724-4-maciej.fijalkowski@intel.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-01-31 16:19:04 -08:00
..
2023-03-27 02:33:48 +00:00
2024-01-25 15:35:29 -08:00
2023-08-10 18:24:48 -07:00
2021-11-19 11:52:25 +00:00
2023-10-05 11:45:06 +02:00
2024-01-10 17:16:47 +01:00
2023-09-13 09:20:28 +02:00
2021-11-17 20:17:05 -08:00
2023-10-04 14:22:27 -07:00
2023-06-15 22:33:26 -07:00
2023-08-10 19:31:52 -07:00
2023-11-28 17:19:54 +00:00
2020-02-28 14:51:30 +01:00
2023-02-20 16:46:10 -08:00
2023-12-20 17:01:45 +01:00
2019-05-30 11:26:41 -07:00
2023-05-01 07:43:19 +01:00
2023-12-08 08:52:23 +01:00
2024-01-25 15:35:26 -08:00
2022-07-22 12:53:22 +01:00
2023-03-21 21:32:18 -07:00
2023-03-18 12:23:34 +00:00
2022-08-09 22:14:02 -07:00
2021-12-13 12:34:09 +00:00
2023-07-28 18:06:30 -07:00
2022-11-02 20:38:13 -07:00
2022-07-22 12:53:22 +01:00
2023-08-24 10:07:13 +02:00
2021-03-26 17:43:55 +01:00
2023-08-03 08:38:07 -07:00
2019-05-21 11:28:45 +02:00
2022-11-16 11:31:47 +02:00
2023-11-20 11:58:55 +01:00
2023-07-14 20:39:29 -07:00
2023-01-27 11:19:46 +00:00
2020-07-15 07:45:24 -07:00
2020-03-27 19:40:38 -07:00
2021-12-22 15:03:47 -08:00
2022-07-22 12:53:22 +01:00
2023-07-14 20:39:29 -07:00
2022-07-24 18:39:17 -06:00
2023-07-27 17:17:32 -07:00
2022-07-22 12:53:22 +01:00
2023-01-20 09:33:22 +00:00
2023-08-27 17:08:45 -07:00
2023-08-19 15:30:15 +01:00
2023-08-14 08:01:06 +01:00
2023-04-09 15:35:49 +01:00
2023-07-18 09:47:08 +02:00
2019-12-16 16:09:44 -08:00
2021-11-29 19:50:45 -08:00
2022-12-05 21:58:27 -08:00
2023-08-22 13:19:02 +02:00
2023-03-28 18:52:28 -07:00
2022-07-22 12:53:22 +01:00
2022-07-22 12:53:22 +01:00
2020-04-20 07:34:16 +02:00
2022-07-22 12:53:22 +01:00
2021-12-06 16:06:02 -08:00
2019-12-24 22:37:30 -08:00
2021-12-16 07:18:35 -08:00
2022-07-28 22:21:54 -07:00
2023-08-02 10:09:31 +01:00
2023-08-02 10:09:32 +01:00
2023-11-20 11:59:34 +01:00
2023-04-12 16:40:39 -07:00
2022-12-01 15:09:10 +01:00
2023-08-08 15:58:23 -07:00
2022-07-22 12:53:22 +01:00
2021-10-18 12:54:41 +01:00
2023-12-13 18:45:10 +01:00
2022-10-31 10:43:04 +00:00
2021-01-29 20:39:14 -08:00
2023-07-29 17:10:27 +01:00
2023-06-10 00:11:41 -07:00
2022-07-22 12:53:22 +01:00
2022-07-22 12:53:22 +01:00
2023-07-28 14:07:59 -07:00
2022-07-22 12:53:22 +01:00
2021-06-28 14:29:45 -07:00
2023-08-22 21:40:40 +02:00
2023-03-23 21:51:30 +01:00
2023-12-20 17:01:45 +01:00
2019-04-22 21:50:53 -07:00
2022-07-22 12:53:22 +01:00
2023-08-15 13:57:51 -07:00
2023-08-14 07:06:13 +01:00
2024-01-31 16:19:00 -08:00
2022-02-07 20:12:45 -08:00
2021-10-15 11:33:08 +01:00
2023-07-14 20:39:29 -07:00
2023-08-15 13:57:51 -07:00
2024-01-31 16:19:01 -08:00
2022-12-30 07:25:52 +00:00
2019-02-08 21:50:15 -08:00
2022-02-17 07:00:39 -06:00
2021-11-16 13:16:54 +00:00
2024-01-01 12:42:33 +00:00
2023-07-28 11:01:56 +01:00
2022-04-25 11:40:45 +01:00
2023-10-03 09:00:40 +02:00
2023-09-06 06:05:59 +01:00
2023-04-22 01:39:41 +02:00
2023-09-01 08:11:51 +01:00
2022-09-29 07:18:00 +02:00
2022-07-22 12:53:22 +01:00
2022-10-31 20:14:27 -07:00
2022-09-02 20:34:32 -07:00
2023-09-13 07:18:04 +01:00
2023-08-22 21:40:40 +02:00
2023-06-12 21:13:23 -07:00
2020-06-20 17:22:22 -07:00
2018-07-11 23:10:19 -07:00
2021-03-23 14:14:50 -07:00
2023-08-04 15:33:17 -07:00
2023-08-04 15:33:17 -07:00
2022-07-22 12:53:22 +01:00
2023-07-20 10:46:28 +02:00
2021-10-13 09:40:46 -07:00
2024-01-31 16:19:01 -08:00
2022-07-22 12:53:22 +01:00
2022-07-22 12:53:22 +01:00
2022-07-28 11:29:36 +02:00
2021-11-07 19:25:29 +00:00
2023-08-18 16:05:26 +02:00
2023-08-25 18:35:09 -07:00
2022-10-12 12:57:19 +02:00
2023-10-10 10:30:30 +02:00
2023-06-20 20:06:16 -07:00
2021-10-29 13:23:51 +01:00
2020-03-02 11:16:27 -08:00
2021-03-26 15:14:56 -07:00
2022-07-22 12:53:22 +01:00
2020-05-29 21:20:20 -07:00
2023-08-22 17:31:18 -07:00
2022-11-18 12:14:55 +00:00
2022-07-22 12:53:22 +01:00
2023-08-07 08:53:55 +01:00
2023-12-08 08:52:23 +01:00
2022-05-11 12:43:10 +01:00
2018-05-28 22:59:54 -04:00
2023-08-29 17:39:15 -07:00
2021-12-10 06:38:26 -08:00
2024-01-25 15:35:57 -08:00
2023-08-03 08:38:07 -07:00
2022-07-22 12:53:22 +01:00
2019-05-21 11:28:45 +02:00
2023-07-27 13:45:51 +02:00
2019-11-12 08:18:03 -08:00
2022-07-22 12:53:22 +01:00
2023-05-11 18:07:05 -07:00
2023-01-28 13:51:22 +01:00
2023-07-14 20:39:29 -07:00
2023-08-04 15:33:50 -07:00
2023-07-14 20:39:30 -07:00
2023-06-02 09:55:22 +01:00
2023-08-07 08:53:54 +01:00
2023-07-12 15:59:33 -07:00
2022-07-22 12:53:22 +01:00
2022-07-15 18:50:35 -07:00
2021-08-09 15:34:21 -07:00
2022-07-22 12:53:22 +01:00
2023-04-06 12:01:20 -07:00
2023-03-17 08:56:37 +00:00
2022-10-11 17:42:58 -06:00
2023-06-19 12:05:29 +02:00
2022-02-02 14:45:18 +00:00
2022-08-01 11:59:23 -07:00
2023-08-16 11:09:17 +01:00
2023-06-19 11:32:58 -07:00
2023-07-14 20:39:30 -07:00
2023-08-20 11:40:03 +01:00
2019-04-22 21:47:25 -07:00
2024-01-31 16:19:02 -08:00
2023-09-04 11:00:17 +01:00
2022-07-22 12:53:22 +01:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2022-01-04 12:17:35 +00:00
2021-04-28 14:06:45 -07:00
2023-03-15 08:18:35 +00:00
2019-10-05 16:29:00 -07:00
2022-10-25 11:35:16 +02:00
2024-01-31 16:19:01 -08:00
2023-08-03 18:10:10 -07:00
2022-07-22 12:53:22 +01:00
2022-07-18 11:24:10 +01:00
2023-08-09 13:12:15 -07:00
2023-02-16 09:27:07 +01:00
2019-05-30 11:26:32 -07:00
2024-01-10 17:16:54 +01:00
2023-07-19 10:07:27 -07:00
2019-05-30 11:26:32 -07:00
2018-05-08 00:02:41 -04:00
2023-07-28 14:07:59 -07:00
2019-10-04 14:07:07 -07:00
2023-08-27 17:17:41 -07:00
2023-08-01 15:06:27 -07:00
2022-12-12 15:04:39 -08:00
2022-07-22 12:53:22 +01:00
2023-11-20 11:58:56 +01:00
2023-08-07 08:53:55 +01:00
2023-11-20 11:58:56 +01:00
2019-11-14 18:12:17 -08:00
2023-08-02 10:58:26 +01:00
2023-03-18 12:23:34 +00:00
2022-07-22 12:53:22 +01:00
2024-01-31 16:19:04 -08:00
2024-01-10 17:16:54 +01:00
2023-08-03 08:38:07 -07:00
2023-08-01 12:04:43 +02:00
2023-07-19 09:56:49 -07:00