Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from David Miller:

 1) Fix cfg80211 deadlock, from Johannes Berg.

 2) RXRPC fails to send norigications, from David Howells.

 3) MPTCP RM_ADDR parsing has an off by one pointer error, fix from
    Geliang Tang.

 4) Fix crash when using MSG_PEEK with sockmap, from Anny Hu.

 5) The ucc_geth driver needs __netdev_watchdog_up exported, from
    Valentin Longchamp.

 6) Fix hashtable memory leak in dccp, from Wang Hai.

 7) Fix how nexthops are marked as FDB nexthops, from David Ahern.

 8) Fix mptcp races between shutdown and recvmsg, from Paolo Abeni.

 9) Fix crashes in tipc_disc_rcv(), from Tuong Lien.

10) Fix link speed reporting in iavf driver, from Brett Creeley.

11) When a channel is used for XSK and then reused again later for XSK,
    we forget to clear out the relevant data structures in mlx5 which
    causes all kinds of problems. Fix from Maxim Mikityanskiy.

12) Fix memory leak in genetlink, from Cong Wang.

13) Disallow sockmap attachments to UDP sockets, it simply won't work.
    From Lorenz Bauer.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (83 commits)
  net: ethernet: ti: ale: fix allmulti for nu type ale
  net: ethernet: ti: am65-cpsw-nuss: fix ale parameters init
  net: atm: Remove the error message according to the atomic context
  bpf: Undo internal BPF_PROBE_MEM in BPF insns dump
  libbpf: Support pre-initializing .bss global variables
  tools/bpftool: Fix skeleton codegen
  bpf: Fix memlock accounting for sock_hash
  bpf: sockmap: Don't attach programs to UDP sockets
  bpf: tcp: Recv() should return 0 when the peer socket is closed
  ibmvnic: Flush existing work items before device removal
  genetlink: clean up family attributes allocations
  net: ipa: header pad field only valid for AP->modem endpoint
  net: ipa: program upper nibbles of sequencer type
  net: ipa: fix modem LAN RX endpoint id
  net: ipa: program metadata mask differently
  ionic: add pcie_print_link_status
  rxrpc: Fix race between incoming ACK parser and retransmitter
  net/mlx5: E-Switch, Fix some error pointer dereferences
  net/mlx5: Don't fail driver on failure to create debugfs
  net/mlx5e: CT: Fix ipv6 nat header rewrite actions
  ...

diff --cc include/linux/netdevice.h
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc net/ipv4/tcp.c
index 27716e4,ecbba0a..810cc16
--- 1/net/ipv4/tcp.c
--- 2/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@@ -1762,7 -1796,9 +1796,9 @@@ static int tcp_zerocopy_receive(struct 
  
        sock_rps_record_flow(sk);
  
 -      down_read(&current->mm->mmap_sem);
+       tp = tcp_sk(sk);
+ 
 +      mmap_read_lock(current->mm);
  
        vma = find_vma(current->mm, address);
        if (!vma || vma->vm_start > address || vma->vm_ops != &tcp_vm_ops) {
@@@ -1817,17 -1863,27 +1863,27 @@@
                        zc->recv_skip_hint -= remaining;
                        break;
                }
-               ret = vm_insert_page(vma, address + length,
-                                    skb_frag_page(frags));
-               if (ret)
-                       break;
+               pages[pg_idx] = skb_frag_page(frags);
+               pg_idx++;
                length += PAGE_SIZE;
-               seq += PAGE_SIZE;
                zc->recv_skip_hint -= PAGE_SIZE;
                frags++;
+               if (pg_idx == PAGE_BATCH_SIZE) {
+                       ret = tcp_zerocopy_vm_insert_batch(vma, pages, pg_idx,
+                                                          &curr_addr, &length,
+                                                          &seq, zc);
+                       if (ret)
+                               goto out;
+                       pg_idx = 0;
+               }
+       }
+       if (pg_idx) {
+               ret = tcp_zerocopy_vm_insert_batch(vma, pages, pg_idx,
+                                                  &curr_addr, &length, &seq,
+                                                  zc);
        }
  out:
 -      up_read(&current->mm->mmap_sem);
 +      mmap_read_unlock(current->mm);
        if (length) {
                WRITE_ONCE(tp->copied_seq, seq);
                tcp_rcv_space_adjust(sk);

diff --cc net/wireless/Kconfig
Simple merge