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

Pull networking fixes from David Miller:

 1) BPF sample build fixes from Björn Töpel

 2) Fix powerpc bpf tail call implementation, from Eric Dumazet.

 3) DCCP leaks jiffies on the wire, fix also from Eric Dumazet.

 4) Fix crash in ebtables when using dnat target, from Florian Westphal.

 5) Fix port disable handling whne removing bcm_sf2 driver, from Florian
    Fainelli.

 6) Fix kTLS sk_msg trim on fallback to copy mode, from Jakub Kicinski.

 7) Various KCSAN fixes all over the networking, from Eric Dumazet.

 8) Memory leaks in mlx5 driver, from Alex Vesker.

 9) SMC interface refcounting fix, from Ursula Braun.

10) TSO descriptor handling fixes in stmmac driver, from Jose Abreu.

11) Add a TX lock to synchonize the kTLS TX path properly with crypto
    operations. From Jakub Kicinski.

12) Sock refcount during shutdown fix in vsock/virtio code, from Stefano
    Garzarella.

13) Infinite loop in Intel ice driver, from Colin Ian King.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (108 commits)
  ixgbe: need_wakeup flag might not be set for Tx
  i40e: need_wakeup flag might not be set for Tx
  igb/igc: use ktime accessors for skb->tstamp
  i40e: Fix for ethtool -m issue on X722 NIC
  iavf: initialize ITRN registers with correct values
  ice: fix potential infinite loop because loop counter being too small
  qede: fix NULL pointer deref in __qede_remove()
  net: fix data-race in neigh_event_send()
  vsock/virtio: fix sock refcnt holding during the shutdown
  net: ethernet: octeon_mgmt: Account for second possible VLAN header
  mac80211: fix station inactive_time shortly after boot
  net/fq_impl: Switch to kvmalloc() for memory allocation
  mac80211: fix ieee80211_txq_setup_flows() failure path
  ipv4: Fix table id reference in fib_sync_down_addr
  ipv6: fixes rt6_probe() and fib6_nh->last_probe init
  net: hns: Fix the stray netpoll locks causing deadlock in NAPI path
  net: usb: qmi_wwan: add support for DW5821e with eSIM support
  CDC-NCM: handle incomplete transfer of MTU
  nfc: netlink: fix double device reference drop
  NFC: st21nfca: fix double free
  ...

2 files changed, 115 insertions, 1 deletions

diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/test_sysctl.c
index a320e3844b17..7c6e5b173f33 100644
--- a/tools/testing/selftests/bpf/test_sysctl.c
+++ b/tools/testing/selftests/bpf/test_sysctl.c
@@ -161,9 +161,14 @@ static struct sysctl_test tests[] = {
                 .descr = "ctx:file_pos sysctl:read read ok narrow",
                 .insns = {
                         /* If (file_pos == X) */
+#if __BYTE_ORDER == __LITTLE_ENDIAN
                         BPF_LDX_MEM(BPF_B, BPF_REG_7, BPF_REG_1,
                                     offsetof(struct bpf_sysctl, file_pos)),
-                        BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0, 2),
+#else
+                        BPF_LDX_MEM(BPF_B, BPF_REG_7, BPF_REG_1,
+                                    offsetof(struct bpf_sysctl, file_pos) + 3),
+#endif
+                        BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 4, 2),
 
                         /* return ALLOW; */
                         BPF_MOV64_IMM(BPF_REG_0, 1),
@@ -176,6 +181,7 @@ static struct sysctl_test tests[] = {
                 .attach_type = BPF_CGROUP_SYSCTL,
                 .sysctl = "kernel/ostype",
                 .open_flags = O_RDONLY,
+                .seek = 4,
                 .result = SUCCESS,
         },
         {
diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c
index 4c285b6e1db8..1c8f194d6556 100644
--- a/tools/testing/selftests/net/tls.c
+++ b/tools/testing/selftests/net/tls.c
@@ -898,6 +898,114 @@ TEST_F(tls, nonblocking)
         }
 }
 
+static void
+test_mutliproc(struct __test_metadata *_metadata, struct _test_data_tls *self,
+               bool sendpg, unsigned int n_readers, unsigned int n_writers)
+{
+        const unsigned int n_children = n_readers + n_writers;
+        const size_t data = 6 * 1000 * 1000;
+        const size_t file_sz = data / 100;
+        size_t read_bias, write_bias;
+        int i, fd, child_id;
+        char buf[file_sz];
+        pid_t pid;
+
+        /* Only allow multiples for simplicity */
+        ASSERT_EQ(!(n_readers % n_writers) || !(n_writers % n_readers), true);
+        read_bias = n_writers / n_readers ?: 1;
+        write_bias = n_readers / n_writers ?: 1;
+
+        /* prep a file to send */
+        fd = open("/tmp/", O_TMPFILE | O_RDWR, 0600);
+        ASSERT_GE(fd, 0);
+
+        memset(buf, 0xac, file_sz);
+        ASSERT_EQ(write(fd, buf, file_sz), file_sz);
+
+        /* spawn children */
+        for (child_id = 0; child_id < n_children; child_id++) {
+                pid = fork();
+                ASSERT_NE(pid, -1);
+                if (!pid)
+                        break;
+        }
+
+        /* parent waits for all children */
+        if (pid) {
+                for (i = 0; i < n_children; i++) {
+                        int status;
+
+                        wait(&status);
+                        EXPECT_EQ(status, 0);
+                }
+
+                return;
+        }
+
+        /* Split threads for reading and writing */
+        if (child_id < n_readers) {
+                size_t left = data * read_bias;
+                char rb[8001];
+
+                while (left) {
+                        int res;
+
+                        res = recv(self->cfd, rb,
+                                   left > sizeof(rb) ? sizeof(rb) : left, 0);
+
+                        EXPECT_GE(res, 0);
+                        left -= res;
+                }
+        } else {
+                size_t left = data * write_bias;
+
+                while (left) {
+                        int res;
+
+                        ASSERT_EQ(lseek(fd, 0, SEEK_SET), 0);
+                        if (sendpg)
+                                res = sendfile(self->fd, fd, NULL,
+                                               left > file_sz ? file_sz : left);
+                        else
+                                res = send(self->fd, buf,
+                                           left > file_sz ? file_sz : left, 0);
+
+                        EXPECT_GE(res, 0);
+                        left -= res;
+                }
+        }
+}
+
+TEST_F(tls, mutliproc_even)
+{
+        test_mutliproc(_metadata, self, false, 6, 6);
+}
+
+TEST_F(tls, mutliproc_readers)
+{
+        test_mutliproc(_metadata, self, false, 4, 12);
+}
+
+TEST_F(tls, mutliproc_writers)
+{
+        test_mutliproc(_metadata, self, false, 10, 2);
+}
+
+TEST_F(tls, mutliproc_sendpage_even)
+{
+        test_mutliproc(_metadata, self, true, 6, 6);
+}
+
+TEST_F(tls, mutliproc_sendpage_readers)
+{
+        test_mutliproc(_metadata, self, true, 4, 12);
+}
+
+TEST_F(tls, mutliproc_sendpage_writers)
+{
+        test_mutliproc(_metadata, self, true, 10, 2);
+}
+
 TEST_F(tls, control_msg)
 {
         if (self->notls)