Commit 028c99fa 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 2018-10-14

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

The main changes are:

1) Fix xsk map update and delete operation to not call synchronize_net()
   but to piggy back on SOCK_RCU_FREE for sockets instead as we are not
   allowed to sleep under RCU, from Björn.

2) Do not change RLIMIT_MEMLOCK in reuseport_bpf selftest if the process
   already has unlimited RLIMIT_MEMLOCK, from Eric.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bab5c80b cee27167

kernel/bpf/xskmap.c

+2 −8
Original line number Diff line number Diff line
@@ -192,11 +192,8 @@ static int xsk_map_update_elem(struct bpf_map *map, void *key, void *value, 
	sock_hold(sock->sk);



	old_xs = xchg(&m->xsk_map[i], xs);

	if (old_xs) {

		/* Make sure we've flushed everything. */

		synchronize_net();

	if (old_xs)

		sock_put((struct sock *)old_xs);

	}



	sockfd_put(sock);

	return 0;
@@ -212,11 +209,8 @@ static int xsk_map_delete_elem(struct bpf_map *map, void *key) 
		return -EINVAL;



	old_xs = xchg(&m->xsk_map[k], NULL);

	if (old_xs) {

		/* Make sure we've flushed everything. */

		synchronize_net();

	if (old_xs)

		sock_put((struct sock *)old_xs);

	}



	return 0;

}

net/xdp/xsk.c

+2 −0
Original line number Diff line number Diff line
@@ -744,6 +744,8 @@ static int xsk_create(struct net *net, struct socket *sock, int protocol, 
	sk->sk_destruct = xsk_destruct;

	sk_refcnt_debug_inc(sk);



	sock_set_flag(sk, SOCK_RCU_FREE);



	xs = xdp_sk(sk);

	mutex_init(&xs->mutex);

	spin_lock_init(&xs->tx_completion_lock);

tools/testing/selftests/net/reuseport_bpf.c

+9 −4
Original line number Diff line number Diff line
@@ -437,15 +437,20 @@ void enable_fastopen(void) 
	}

}



static struct rlimit rlim_old, rlim_new;

static struct rlimit rlim_old;



static  __attribute__((constructor)) void main_ctor(void)

{

	getrlimit(RLIMIT_MEMLOCK, &rlim_old);



	if (rlim_old.rlim_cur != RLIM_INFINITY) {

		struct rlimit rlim_new;



		rlim_new.rlim_cur = rlim_old.rlim_cur + (1UL << 20);

		rlim_new.rlim_max = rlim_old.rlim_max + (1UL << 20);

		setrlimit(RLIMIT_MEMLOCK, &rlim_new);

	}

}



static __attribute__((destructor)) void main_dtor(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE