[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <fba80558-3786-0fc4-b972-a6c2ac49ebce@iogearbox.net>
Date: Wed, 17 May 2023 15:54:18 +0200
From: Daniel Borkmann <daniel@...earbox.net>
To: John Fastabend <john.fastabend@...il.com>, jakub@...udflare.com
Cc: bpf@...r.kernel.org, netdev@...r.kernel.org, edumazet@...gle.com,
ast@...nel.org, andrii@...nel.org, will@...valent.com
Subject: Re: [PATCH bpf v8 00/13] bpf sockmap fixes
On 5/17/23 7:22 AM, John Fastabend wrote:
> This v8 iteration adds another fix suggested by Jakub to always
> check the enable bit is set before rescheduling to avoid trying
> to reschedule backlog queue handler while trying to tear down
> a socket. Also cleaned up one of the tests as suggested by Jakub
> to avoid creating unused pair of sockets.
[...]
> v8: Only schedule backlog when still enabled and cleanup test
> to not create unused sockets.
Looks like this needs a v9 :( The series does not apply to bpf tree,
see here:
[...]
Cmd('git') failed due to: exit code(128)
cmdline: git am --3way
stdout: 'Applying: bpf: sockmap, pass skb ownership through read_skb
Applying: bpf: sockmap, convert schedule_work into delayed_work
Applying: bpf: sockmap, reschedule is now done through backlog
Applying: bpf: sockmap, improved check for empty queue
Applying: bpf: sockmap, handle fin correctly
Applying: bpf: sockmap, TCP data stall on recv before accept
Applying: bpf: sockmap, wake up polling after data copy
Applying: bpf: sockmap, incorrectly handling copied_seq
Applying: bpf: sockmap, pull socket helpers out of listen test for general use
Using index info to reconstruct a base tree...
M tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
Patch failed at 0009 bpf: sockmap, pull socket helpers out of listen test for general use
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'
Powered by blists - more mailing lists