[GIT] Networking

From: David Miller
Date: Sat Aug 11 2018 - 16:45:40 EST

Last bit of straggler fixes...

1) Fix btf library licensing to LGPL, from Martin KaFai lau.

2) Fix error handling in bpf sockmap code, from Daniel Borkmann.

3) XDP cpumap teardown handling wrt. execution contexts, from
Jesper Dangaard Brouer.

4) Fix loss of runtime PM on failed vlan add/del, from Ivan

5) xen-netfront caches skb_shinfo(skb) across a __pskb_pull_tail()
call, which potentially changes the skb's data buffer, and thus
skb_shinfo(). Fix from Juergen Gross.

Please pull, thanks a lot!

The following changes since commit 112cbae26d18e75098d95cc234cfa5059de8d479:

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (2018-08-09 10:00:15 -0700)

are available in the Git repository at:


for you to fetch changes up to d472b3a6cf63cd31cae1ed61930f07e6cd6671b5:

xen/netfront: don't cache skb_shinfo() (2018-08-11 09:41:58 -0700)

Alexei Starovoitov (1):
Merge branch 'sockmap-fixes'

Daniel Borkmann (4):
bpf, sockmap: fix bpf_tcp_sendmsg sock error handling
bpf, sockmap: fix leak in bpf_tcp_sendmsg wait for mem path
bpf, sockmap: fix cork timeout for select due to epipe
Merge branch 'bpf-fix-cpu-and-devmap-teardown'

David S. Miller (2):
Merge git://git.kernel.org/.../bpf/bpf
Merge branch 'cpsw-runtime-pm-fix'

Ivan Khoronzhuk (2):
net: ethernet: ti: cpsw: clear all entries when delete vid
net: ethernet: ti: cpsw: fix runtime_pm while add/kill vlan

Jesper Dangaard Brouer (3):
xdp: fix bug in cpumap teardown code path
samples/bpf: xdp_redirect_cpu adjustment to reproduce teardown race easier
xdp: fix bug in devmap teardown code path

Juergen Gross (1):
xen/netfront: don't cache skb_shinfo()

Martin KaFai Lau (1):
bpf: btf: Change tools/lib/bpf/btf to LGPL

drivers/net/ethernet/ti/cpsw.c | 25 +++++++++++--------------
drivers/net/ethernet/ti/cpsw_ale.c | 2 +-
drivers/net/xen-netfront.c | 8 ++++----
kernel/bpf/cpumap.c | 15 +++++++++------
kernel/bpf/devmap.c | 14 +++++++++-----
kernel/bpf/sockmap.c | 9 ++++++---
samples/bpf/xdp_redirect_cpu_kern.c | 2 +-
samples/bpf/xdp_redirect_cpu_user.c | 4 ++--
tools/lib/bpf/btf.c | 2 +-
tools/lib/bpf/btf.h | 2 +-
tools/testing/selftests/bpf/test_sockmap.c | 2 +-
11 files changed, 46 insertions(+), 39 deletions(-)