From: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
Date: Mon, 28 Dec 2020 22:28:30 +0100
> Hi David, hi Jakub,
>
> The following pull-request contains BPF updates for your *net* tree.
>
> There is a small merge conflict between bpf tree commit 69ca310f3416
> ("bpf: Save correct stopping point in file seq iteration") and net tree
> commit 66ed594409a1 ("bpf/task_iter: In task_file_seq_get_next use
> task_lookup_next_fd_rcu"). The get_files_struct() does not exist anymore
> in net, so take the hunk in HEAD and add the `info->tid = curr_tid` to
> the error path:
>
> [...]
> curr_task = task_seq_get_next(ns, &curr_tid, true);
> if (!curr_task) {
> info->task = NULL;
> info->tid = curr_tid;
> return NULL;
> }
>
> /* set info->task and info->tid */
> [...]
>
> We've added 10 non-merge commits during the last 9 day(s) which contain
> a total of 11 files changed, 75 insertions(+), 20 deletions(-).
>
> The main changes are:
>
> 1) Various AF_XDP fixes such as fill/completion ring leak on failed bind and
> fixing a race in skb mode's backpressure mechanism, from Magnus Karlsson.
>
> 2) Fix latency spikes on lockdep enabled kernels by adding a rescheduling
> point to BPF hashtab initialization, from Eric Dumazet.
>
> 3) Fix a splat in task iterator by saving the correct stopping point in the
> seq file iteration, from Jonathan Lemon.
>
> 4) Fix BPF maps selftest by adding retries in case hashtab returns EBUSY
> errors on update/deletes, from Andrii Nakryiko.
>
> 5) Fix BPF selftest error reporting to something more user friendly if the
> vmlinux BTF cannot be found, from Kamal Mostafa.
>
> Please consider pulling these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
>
> Thanks a lot!
>
> Also thanks to reporters, reviewers and testers of commits in this pull-request:
>
> Andrii Nakryiko, Björn Töpel, John Sperbeck, Song Liu, Xuan Zhuo
>
> ----------------------------------------------------------------
>
> The following changes since commit 3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9:
>
> Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging (2020-12-15 14:18:40 -0800)
>
> are available in the Git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
>
Pulled, thanks. Please double check my conflict resolution.
