[bpf,0/2] sockmap fix for test_map failure

Message

John Fastabend Nov. 19, 2021, 6:14 p.m. UTC

CI test_map runs started failing because of a regression in the
sockmap tests. The case, caught by test_maps is that progs attached
to sockets are not detatched currently when sockets are removed
from a map. We resolve this in two patches. The first patch
fixes a subtle issue found from code review and the second
patch addresses the reported CI issue. This was recently introduced
by a race fix, see patches for details.

Sorry for the hassle here, seems we missed ./test_maps run before
pushing the offending patch or maybe we just got lucky on the
run we did locally. Either way should be resolved now.

Thanks,
John

John Fastabend (2):
  bpf, sockmap: Attach map progs to psock early for feature probes
  bpf, sockmap: Re-evaluate proto ops when psock is removed from sockmap

 net/core/skmsg.c    |  5 +++++
 net/core/sock_map.c | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

Comments

[e-mail] Nov. 20, 2021, midnight UTC | #1

Hello:

This series was applied to bpf/bpf.git (master)
by Daniel Borkmann <[e-mail]>:

On Fri, 19 Nov 2021 10:14:16 -0800 you wrote:
> CI test_map runs started failing because of a regression in the
> sockmap tests. The case, caught by test_maps is that progs attached
> to sockets are not detatched currently when sockets are removed
> from a map. We resolve this in two patches. The first patch
> fixes a subtle issue found from code review and the second
> patch addresses the reported CI issue. This was recently introduced
> by a race fix, see patches for details.
> 
> [...]

Here is the summary with links:
  - [bpf,1/2] bpf, sockmap: Attach map progs to psock early for feature probes
    https://git.kernel.org/bpf/bpf/c/38207a5e8123
  - [bpf,2/2] bpf, sockmap: Re-evaluate proto ops when psock is removed from sockmap
    https://git.kernel.org/bpf/bpf/c/c0d95d3380ee

You are awesome, thank you!