Commit 4bfc4714 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 



Daniel Borkmann says:

====================
pull-request: bpf 2020-12-28

The following pull-request contains BPF updates for your *net* tree.

There is a small merge conflict between bpf tree commit 69ca310f
("bpf: Save correct stopping point in file seq iteration") and net tree
commit 66ed5944 ("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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1fef7359 a61daaf3

include/net/xdp_sock.h

+0 −4
Original line number Diff line number Diff line
@@ -58,10 +58,6 @@ struct xdp_sock { 


	struct xsk_queue *tx ____cacheline_aligned_in_smp;

	struct list_head tx_list;

	/* Mutual exclusion of NAPI TX thread and sendmsg error paths

	 * in the SKB destructor callback.

	 */

	spinlock_t tx_completion_lock;

	/* Protects generic receive. */

	spinlock_t rx_lock;

include/net/xsk_buff_pool.h

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ struct xsk_buff_pool { 
	bool dma_need_sync;

	bool unaligned;

	void *addrs;

	/* Mutual exclusion of the completion ring in the SKB mode. Two cases to protect:

	 * NAPI TX thread and sendmsg error paths in the SKB destructor callback and when

	 * sockets share a single cq when the same netdev and queue id is shared.

	 */

	spinlock_t cq_lock;

	struct xdp_buff_xsk *free_heads[];

};

kernel/bpf/hashtab.c

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static void htab_init_buckets(struct bpf_htab *htab) 
			lockdep_set_class(&htab->buckets[i].lock,

					  &htab->lockdep_key);

		}

		cond_resched();

	}

}

kernel/bpf/syscall.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/fs.h>

#include <linux/license.h>

#include <linux/filter.h>

#include <linux/version.h>

#include <linux/kernel.h>

#include <linux/idr.h>

#include <linux/cred.h>

kernel/bpf/task_iter.c

+9 −9
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static struct task_struct *task_seq_get_next(struct pid_namespace *ns, 
		if (!task) {

			++*tid;

			goto retry;

		} else if (skip_if_dup_files && task->tgid != task->pid &&

		} else if (skip_if_dup_files && !thread_group_leader(task) &&

			   task->files == task->group_leader->files) {

			put_task_struct(task);

			task = NULL;
@@ -154,11 +154,11 @@ task_file_seq_get_next(struct bpf_iter_seq_task_file_info *info) 
                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 */

		info->task = curr_task;

		if (curr_tid == info->tid) {

			curr_fd = info->fd;

		} else {