sock_map: Add a cond_resched() in sock_hash_free()

[ Upstream commit b1339be951 ]

Several syzbot soft lockup reports all have in common sock_hash_free()

If a map with a large number of buckets is destroyed, we need to yield
the cpu when needed.

Fixes: 75e68e5bf2 ("bpf, sockhash: Synchronize delete from bucket list on map free")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Martin KaFai Lau <martin.lau@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20240906154449.3742932-1-edumazet@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

This commit is contained in:

Eric Dumazet

2024-09-06 15:44:49 +00:00

committed by

Greg Kroah-Hartman

parent bf090f4fe9

commit 984648aac8

1 changed files with 1 additions and 0 deletions

									
										net/core/sock_map.c
									
		+1
		
												View File
												
				@@ -1177,6 +1177,7 @@ static void sock_hash_free(struct bpf_map *map)

							sock_put(elem->sk);

							sock_hash_free_elem(htab, elem);

						}

						cond_resched();

					}

					/* wait for psock readers accessing its map link */