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

Pull networking fixes from David Miller:
 "Yeah I should have sent a pull request last week, so there is a lot
  more here than usual:

   1) Fix memory leak in ebtables compat code, from Wenwen Wang.

   2) Several kTLS bug fixes from Jakub Kicinski (circular close on
      disconnect etc.)

   3) Force slave speed check on link state recovery in bonding 802.3ad
      mode, from Thomas Falcon.

   4) Clear RX descriptor bits before assigning buffers to them in
      stmmac, from Jose Abreu.

   5) Several missing of_node_put() calls, mostly wrt. for_each_*() OF
      loops, from Nishka Dasgupta.

   6) Double kfree_skb() in peak_usb can driver, from Stephane Grosjean.

   7) Need to hold sock across skb->destructor invocation, from Cong
      Wang.

   8) IP header length needs to be validated in ipip tunnel xmit, from
      Haishuang Yan.

   9) Use after free in ip6 tunnel driver, also from Haishuang Yan.

  10) Do not use MSI interrupts on r8169 chips before RTL8168d, from
      Heiner Kallweit.

  11) Upon bridge device init failure, we need to delete the local fdb.
      From Nikolay Aleksandrov.

  12) Handle erros from of_get_mac_address() properly in stmmac, from
      Martin Blumenstingl.

  13) Handle concurrent rename vs. dump in netfilter ipset, from Jozsef
      Kadlecsik.

  14) Setting NETIF_F_LLTX on mac80211 causes complete breakage with
      some devices, so revert. From Johannes Berg.

  15) Fix deadlock in rxrpc, from David Howells.

  16) Fix Kconfig deps of enetc driver, we must have PHYLIB. From Yue
      Haibing.

  17) Fix mvpp2 crash on module removal, from Matteo Croce.

  18) Fix race in genphy_update_link, from Heiner Kallweit.

  19) bpf_xdp_adjust_head() stopped working with generic XDP when we
      fixes generic XDP to support stacked devices properly, fix from
      Jesper Dangaard Brouer.

  20) Unbalanced RCU locking in rt6_update_exception_stamp_rt(), from
      David Ahern.

  21) Several memory leaks in new sja1105 driver, from Vladimir Oltean"

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (214 commits)
  net: dsa: sja1105: Fix memory leak on meta state machine error path
  net: dsa: sja1105: Fix memory leak on meta state machine normal path
  net: dsa: sja1105: Really fix panic on unregistering PTP clock
  net: dsa: sja1105: Use the LOCKEDS bit for SJA1105 E/T as well
  net: dsa: sja1105: Fix broken learning with vlan_filtering disabled
  net: dsa: qca8k: Add of_node_put() in qca8k_setup_mdio_bus()
  net: sched: sample: allow accessing psample_group with rtnl
  net: sched: police: allow accessing police->params with rtnl
  net: hisilicon: Fix dma_map_single failed on arm64
  net: hisilicon: fix hip04-xmit never return TX_BUSY
  net: hisilicon: make hip04_tx_reclaim non-reentrant
  tc-testing: updated vlan action tests with batch create/delete
  net sched: update vlan action for batched events operations
  net: stmmac: tc: Do not return a fragment entry
  net: stmmac: Fix issues when number of Queues >= 4
  net: stmmac: xgmac: Fix XGMAC selftests
  be2net: disable bh with spin_lock in be_process_mcc
  net: cxgb3_main: Fix a resource leak in a error path in 'init_one()'
  net: ethernet: sun4i-emac: Support phy-handle property for finding PHYs
  net: bridge: move default pvid init/deinit to NETDEV_REGISTER/UNREGISTER
  ...

13 files changed, 443 insertions, 48 deletions

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 467224feb43b..d821107f55f9 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
 /* Copyright (c) 2018 Facebook */
 
+#include <endian.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -419,9 +420,9 @@ done:
 
 static bool btf_check_endianness(const GElf_Ehdr *ehdr)
 {
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#if __BYTE_ORDER == __LITTLE_ENDIAN
         return ehdr->e_ident[EI_DATA] == ELFDATA2LSB;
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#elif __BYTE_ORDER == __BIG_ENDIAN
         return ehdr->e_ident[EI_DATA] == ELFDATA2MSB;
 #else
 # error "Unrecognized __BYTE_ORDER__"
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 794dd5064ae8..2586b6cb8f34 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -20,6 +20,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
+#include <endian.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <asm/unistd.h>
@@ -612,10 +613,10 @@ errout:
 
 static int bpf_object__check_endianness(struct bpf_object *obj)
 {
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#if __BYTE_ORDER == __LITTLE_ENDIAN
         if (obj->efile.ehdr.e_ident[EI_DATA] == ELFDATA2LSB)
                 return 0;
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#elif __BYTE_ORDER == __BIG_ENDIAN
         if (obj->efile.ehdr.e_ident[EI_DATA] == ELFDATA2MSB)
                 return 0;
 #else
@@ -1377,8 +1378,13 @@ static void bpf_object__sanitize_btf(struct bpf_object *obj)
                 if (!has_datasec && kind == BTF_KIND_VAR) {
                         /* replace VAR with INT */
                         t->info = BTF_INFO_ENC(BTF_KIND_INT, 0, 0);
-                        t->size = sizeof(int);
-                        *(int *)(t+1) = BTF_INT_ENC(0, 0, 32);
+                        /*
+                         * using size = 1 is the safest choice, 4 will be too
+                         * big and cause kernel BTF validation failure if
+                         * original variable took less than 4 bytes
+                         */
+                        t->size = 1;
+                        *(int *)(t+1) = BTF_INT_ENC(0, 0, 8);
                 } else if (!has_datasec && kind == BTF_KIND_DATASEC) {
                         /* replace DATASEC with STRUCT */
                         struct btf_var_secinfo *v = (void *)(t + 1);
@@ -1500,6 +1506,12 @@ static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj)
                            BTF_ELF_SEC, err);
                 btf__free(obj->btf);
                 obj->btf = NULL;
+                /* btf_ext can't exist without btf, so free it as well */
+                if (obj->btf_ext) {
+                        btf_ext__free(obj->btf_ext);
+                        obj->btf_ext = NULL;
+                }
+
                 if (bpf_object__is_btf_mandatory(obj))
                         return err;
         }
@@ -4507,13 +4519,13 @@ struct perf_buffer *perf_buffer__new(int map_fd, size_t page_cnt,
                                      const struct perf_buffer_opts *opts)
 {
         struct perf_buffer_params p = {};
-        struct perf_event_attr attr = {
-                .config = PERF_COUNT_SW_BPF_OUTPUT,
-                .type = PERF_TYPE_SOFTWARE,
-                .sample_type = PERF_SAMPLE_RAW,
-                .sample_period = 1,
-                .wakeup_events = 1,
-        };
+        struct perf_event_attr attr = { 0, };
+
+        attr.config = PERF_COUNT_SW_BPF_OUTPUT,
+        attr.type = PERF_TYPE_SOFTWARE;
+        attr.sample_type = PERF_SAMPLE_RAW;
+        attr.sample_period = 1;
+        attr.wakeup_events = 1;
 
         p.attr = &attr;
         p.sample_cb = opts ? opts->sample_cb : NULL;
diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
index 5007b5d4fd2c..680e63066cf3 100644
--- a/tools/lib/bpf/xsk.c
+++ b/tools/lib/bpf/xsk.c
@@ -317,17 +317,16 @@ static int xsk_load_xdp_prog(struct xsk_socket *xsk)
 
 static int xsk_get_max_queues(struct xsk_socket *xsk)
 {
-        struct ethtool_channels channels;
-        struct ifreq ifr;
+        struct ethtool_channels channels = { .cmd = ETHTOOL_GCHANNELS };
+        struct ifreq ifr = {};
         int fd, err, ret;
 
         fd = socket(AF_INET, SOCK_DGRAM, 0);
         if (fd < 0)
                 return -errno;
 
-        channels.cmd = ETHTOOL_GCHANNELS;
         ifr.ifr_data = (void *)&channels;
-        strncpy(ifr.ifr_name, xsk->ifname, IFNAMSIZ - 1);
+        memcpy(ifr.ifr_name, xsk->ifname, IFNAMSIZ - 1);
         ifr.ifr_name[IFNAMSIZ - 1] = '\0';
         err = ioctl(fd, SIOCETHTOOL, &ifr);
         if (err && errno != EOPNOTSUPP) {
@@ -335,7 +334,7 @@ static int xsk_get_max_queues(struct xsk_socket *xsk)
                 goto out;
         }
 
-        if (channels.max_combined == 0 || errno == EOPNOTSUPP)
+        if (err || channels.max_combined == 0)
                 /* If the device says it has no channels, then all traffic
                  * is sent to a single stream, so max queues = 1.
                  */
@@ -517,7 +516,7 @@ int xsk_socket__create(struct xsk_socket **xsk_ptr, const char *ifname,
                 err = -errno;
                 goto out_socket;
         }
-        strncpy(xsk->ifname, ifname, IFNAMSIZ - 1);
+        memcpy(xsk->ifname, ifname, IFNAMSIZ - 1);
         xsk->ifname[IFNAMSIZ - 1] = '\0';
 
         err = xsk_set_xdp_socket_config(&xsk->config, usr_config);
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 11c9c62c3362..c085964e1d05 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -57,7 +57,8 @@ TEST_PROGS := test_kmod.sh \
         test_lirc_mode2.sh \
         test_skb_cgroup_id.sh \
         test_flow_dissector.sh \
-        test_xdp_vlan.sh \
+        test_xdp_vlan_mode_generic.sh \
+        test_xdp_vlan_mode_native.sh \
         test_lwt_ip_encap.sh \
         test_tcp_check_syncookie.sh \
         test_tc_tunnel.sh \
diff --git a/tools/testing/selftests/bpf/progs/sendmsg6_prog.c b/tools/testing/selftests/bpf/progs/sendmsg6_prog.c
index 5aeaa284fc47..a68062820410 100644
--- a/tools/testing/selftests/bpf/progs/sendmsg6_prog.c
+++ b/tools/testing/selftests/bpf/progs/sendmsg6_prog.c
@@ -41,8 +41,7 @@ int sendmsg_v6_prog(struct bpf_sock_addr *ctx)
         }
 
         /* Rewrite destination. */
-        if ((ctx->user_ip6[0] & 0xFFFF) == bpf_htons(0xFACE) &&
-             ctx->user_ip6[0] >> 16 == bpf_htons(0xB00C)) {
+        if (ctx->user_ip6[0] == bpf_htonl(0xFACEB00C)) {
                 ctx->user_ip6[0] = bpf_htonl(DST_REWRITE_IP6_0);
                 ctx->user_ip6[1] = bpf_htonl(DST_REWRITE_IP6_1);
                 ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2);
diff --git a/tools/testing/selftests/bpf/test_xdp_vlan.sh b/tools/testing/selftests/bpf/test_xdp_vlan.sh
index 51a3a31d1aac..bb8b0da91686 100755
--- a/tools/testing/selftests/bpf/test_xdp_vlan.sh
+++ b/tools/testing/selftests/bpf/test_xdp_vlan.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Author: Jesper Dangaard Brouer <hawk@kernel.org>
 
-TESTNAME=xdp_vlan
+# Allow wrapper scripts to name test
+if [ -z "$TESTNAME" ]; then
+    TESTNAME=xdp_vlan
+fi
+
+# Default XDP mode
+XDP_MODE=xdpgeneric
 
 usage() {
   echo "Testing XDP + TC eBPF VLAN manipulations: $TESTNAME"
@@ -9,9 +17,23 @@ usage() {
   echo "  -v | --verbose : Verbose"
   echo "  --flush        : Flush before starting (e.g. after --interactive)"
   echo "  --interactive  : Keep netns setup running after test-run"
+  echo "  --mode=XXX     : Choose XDP mode (xdp | xdpgeneric | xdpdrv)"
   echo ""
 }
 
+valid_xdp_mode()
+{
+        local mode=$1
+
+        case "$mode" in
+                xdpgeneric | xdpdrv | xdp)
+                        return 0
+                        ;;
+                *)
+                        return 1
+        esac
+}
+
 cleanup()
 {
         local status=$?
@@ -37,7 +59,7 @@ cleanup()
 
 # Using external program "getopt" to get --long-options
 OPTIONS=$(getopt -o hvfi: \
-    --long verbose,flush,help,interactive,debug -- "$@")
+    --long verbose,flush,help,interactive,debug,mode: -- "$@")
 if (( $? != 0 )); then
     usage
     echo "selftests: $TESTNAME [FAILED] Error calling getopt, unknown option?"
@@ -60,6 +82,11 @@ while true; do
                 cleanup
                 shift
                 ;;
+            --mode )
+                shift
+                XDP_MODE=$1
+                shift
+                ;;
             -- )
                 shift
                 break
@@ -81,8 +108,14 @@ if [ "$EUID" -ne 0 ]; then
         exit 1
 fi
 
-ip link set dev lo xdp off 2>/dev/null > /dev/null
-if [ $? -ne 0 ];then
+valid_xdp_mode $XDP_MODE
+if [ $? -ne 0 ]; then
+        echo "selftests: $TESTNAME [FAILED] unknown XDP mode ($XDP_MODE)"
+        exit 1
+fi
+
+ip link set dev lo xdpgeneric off 2>/dev/null > /dev/null
+if [ $? -ne 0 ]; then
         echo "selftests: $TESTNAME [SKIP] need ip xdp support"
         exit 0
 fi
@@ -155,7 +188,7 @@ ip netns exec ns2 ip link set lo up
 # At this point, the hosts cannot reach each-other,
 # because ns2 are using VLAN tags on the packets.
 
-ip netns exec ns2 sh -c 'ping -W 1 -c 1 100.64.41.1 || echo "Okay ping fails"'
+ip netns exec ns2 sh -c 'ping -W 1 -c 1 100.64.41.1 || echo "Success: First ping must fail"'
 
 
 # Now we can use the test_xdp_vlan.c program to pop/push these VLAN tags
@@ -166,7 +199,7 @@ export FILE=test_xdp_vlan.o
 
 # First test: Remove VLAN by setting VLAN ID 0, using "xdp_vlan_change"
 export XDP_PROG=xdp_vlan_change
-ip netns exec ns1 ip link set $DEVNS1 xdp object $FILE section $XDP_PROG
+ip netns exec ns1 ip link set $DEVNS1 $XDP_MODE object $FILE section $XDP_PROG
 
 # In ns1: egress use TC to add back VLAN tag 4011
 #  (del cmd)
@@ -177,8 +210,8 @@ ip netns exec ns1 tc filter add dev $DEVNS1 egress \
   prio 1 handle 1 bpf da obj $FILE sec tc_vlan_push
 
 # Now the namespaces can reach each-other, test with ping:
-ip netns exec ns2 ping -W 2 -c 3 $IPADDR1
-ip netns exec ns1 ping -W 2 -c 3 $IPADDR2
+ip netns exec ns2 ping -i 0.2 -W 2 -c 2 $IPADDR1
+ip netns exec ns1 ping -i 0.2 -W 2 -c 2 $IPADDR2
 
 # Second test: Replace xdp prog, that fully remove vlan header
 #
@@ -187,9 +220,9 @@ ip netns exec ns1 ping -W 2 -c 3 $IPADDR2
 # ETH_P_8021Q indication, and this cause overwriting of our changes.
 #
 export XDP_PROG=xdp_vlan_remove_outer2
-ip netns exec ns1 ip link set $DEVNS1 xdp off
-ip netns exec ns1 ip link set $DEVNS1 xdp object $FILE section $XDP_PROG
+ip netns exec ns1 ip link set $DEVNS1 $XDP_MODE off
+ip netns exec ns1 ip link set $DEVNS1 $XDP_MODE object $FILE section $XDP_PROG
 
 # Now the namespaces should still be able reach each-other, test with ping:
-ip netns exec ns2 ping -W 2 -c 3 $IPADDR1
-ip netns exec ns1 ping -W 2 -c 3 $IPADDR2
+ip netns exec ns2 ping -i 0.2 -W 2 -c 2 $IPADDR1
+ip netns exec ns1 ping -i 0.2 -W 2 -c 2 $IPADDR2
diff --git a/tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh b/tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh
new file mode 100755
index 000000000000..c515326d6d59
--- /dev/null
+++ b/tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+# Exit on failure
+set -e
+
+# Wrapper script to test generic-XDP
+export TESTNAME=xdp_vlan_mode_generic
+./test_xdp_vlan.sh --mode=xdpgeneric
diff --git a/tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh b/tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh
new file mode 100755
index 000000000000..5cf7ce1f16c1
--- /dev/null
+++ b/tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+# Exit on failure
+set -e
+
+# Wrapper script to test native-XDP
+export TESTNAME=xdp_vlan_mode_native
+./test_xdp_vlan.sh --mode=xdpdrv
diff --git a/tools/testing/selftests/bpf/verifier/ctx_skb.c b/tools/testing/selftests/bpf/verifier/ctx_skb.c
index b0fda2877119..d438193804b2 100644
--- a/tools/testing/selftests/bpf/verifier/ctx_skb.c
+++ b/tools/testing/selftests/bpf/verifier/ctx_skb.c
@@ -975,6 +975,17 @@
         .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
 },
 {
+        "read gso_segs from CGROUP_SKB",
+        .insns = {
+        BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_1,
+                    offsetof(struct __sk_buff, gso_segs)),
+        BPF_MOV64_IMM(BPF_REG_0, 0),
+        BPF_EXIT_INSN(),
+        },
+        .result = ACCEPT,
+        .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
+},
+{
         "write gso_segs from CGROUP_SKB",
         .insns = {
         BPF_MOV64_IMM(BPF_REG_0, 0),
diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore
index 4ce0bc1612f5..c7cced739c34 100644
--- a/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@ -17,7 +17,7 @@ tcp_inq
 tls
 txring_overwrite
 ip_defrag
+ipv6_flowlabel
+ipv6_flowlabel_mgr
 so_txtime
-flowlabel
-flowlabel_mgr
 tcp_fastopen_backup_key
diff --git a/tools/testing/selftests/net/forwarding/gre_multipath.sh b/tools/testing/selftests/net/forwarding/gre_multipath.sh
index cca2baa03fb8..a8d8e8b3dc81 100755
--- a/tools/testing/selftests/net/forwarding/gre_multipath.sh
+++ b/tools/testing/selftests/net/forwarding/gre_multipath.sh
@@ -93,18 +93,10 @@ sw1_create()
         ip route add vrf v$ol1 192.0.2.16/28 \
            nexthop dev g1a \
            nexthop dev g1b
-
-        tc qdisc add dev $ul1 clsact
-        tc filter add dev $ul1 egress pref 111 prot ipv4 \
-           flower dst_ip 192.0.2.66 action pass
-        tc filter add dev $ul1 egress pref 222 prot ipv4 \
-           flower dst_ip 192.0.2.82 action pass
 }
 
 sw1_destroy()
 {
-        tc qdisc del dev $ul1 clsact
-
         ip route del vrf v$ol1 192.0.2.16/28
 
         ip route del vrf v$ol1 192.0.2.82/32 via 192.0.2.146
@@ -139,10 +131,18 @@ sw2_create()
         ip route add vrf v$ol2 192.0.2.0/28 \
            nexthop dev g2a \
            nexthop dev g2b
+
+        tc qdisc add dev $ul2 clsact
+        tc filter add dev $ul2 ingress pref 111 prot 802.1Q \
+           flower vlan_id 111 action pass
+        tc filter add dev $ul2 ingress pref 222 prot 802.1Q \
+           flower vlan_id 222 action pass
 }
 
 sw2_destroy()
 {
+        tc qdisc del dev $ul2 clsact
+
         ip route del vrf v$ol2 192.0.2.0/28
 
         ip route del vrf v$ol2 192.0.2.81/32 via 192.0.2.145
@@ -187,12 +187,16 @@ setup_prepare()
         sw1_create
         sw2_create
         h2_create
+
+        forwarding_enable
 }
 
 cleanup()
 {
         pre_cleanup
 
+        forwarding_restore
+
         h2_destroy
         sw2_destroy
         sw1_destroy
@@ -211,15 +215,15 @@ multipath4_test()
            nexthop dev g1a weight $weight1 \
            nexthop dev g1b weight $weight2
 
-        local t0_111=$(tc_rule_stats_get $ul1 111 egress)
-        local t0_222=$(tc_rule_stats_get $ul1 222 egress)
+        local t0_111=$(tc_rule_stats_get $ul2 111 ingress)
+        local t0_222=$(tc_rule_stats_get $ul2 222 ingress)
 
         ip vrf exec v$h1 \
            $MZ $h1 -q -p 64 -A 192.0.2.1 -B 192.0.2.18 \
                -d 1msec -t udp "sp=1024,dp=0-32768"
 
-        local t1_111=$(tc_rule_stats_get $ul1 111 egress)
-        local t1_222=$(tc_rule_stats_get $ul1 222 egress)
+        local t1_111=$(tc_rule_stats_get $ul2 111 ingress)
+        local t1_222=$(tc_rule_stats_get $ul2 222 ingress)
 
         local d111=$((t1_111 - t0_111))
         local d222=$((t1_222 - t0_222))
diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c
index 090fff9dbc48..4c285b6e1db8 100644
--- a/tools/testing/selftests/net/tls.c
+++ b/tools/testing/selftests/net/tls.c
@@ -25,6 +25,80 @@
 #define TLS_PAYLOAD_MAX_LEN 16384
 #define SOL_TLS 282
 
+#ifndef ENOTSUPP
+#define ENOTSUPP 524
+#endif
+
+FIXTURE(tls_basic)
+{
+        int fd, cfd;
+        bool notls;
+};
+
+FIXTURE_SETUP(tls_basic)
+{
+        struct sockaddr_in addr;
+        socklen_t len;
+        int sfd, ret;
+
+        self->notls = false;
+        len = sizeof(addr);
+
+        addr.sin_family = AF_INET;
+        addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        addr.sin_port = 0;
+
+        self->fd = socket(AF_INET, SOCK_STREAM, 0);
+        sfd = socket(AF_INET, SOCK_STREAM, 0);
+
+        ret = bind(sfd, &addr, sizeof(addr));
+        ASSERT_EQ(ret, 0);
+        ret = listen(sfd, 10);
+        ASSERT_EQ(ret, 0);
+
+        ret = getsockname(sfd, &addr, &len);
+        ASSERT_EQ(ret, 0);
+
+        ret = connect(self->fd, &addr, sizeof(addr));
+        ASSERT_EQ(ret, 0);
+
+        self->cfd = accept(sfd, &addr, &len);
+        ASSERT_GE(self->cfd, 0);
+
+        close(sfd);
+
+        ret = setsockopt(self->fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+        if (ret != 0) {
+                ASSERT_EQ(errno, ENOENT);
+                self->notls = true;
+                printf("Failure setting TCP_ULP, testing without tls\n");
+                return;
+        }
+
+        ret = setsockopt(self->cfd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+        ASSERT_EQ(ret, 0);
+}
+
+FIXTURE_TEARDOWN(tls_basic)
+{
+        close(self->fd);
+        close(self->cfd);
+}
+
+/* Send some data through with ULP but no keys */
+TEST_F(tls_basic, base_base)
+{
+        char const *test_str = "test_read";
+        int send_len = 10;
+        char buf[10];
+
+        ASSERT_EQ(strlen(test_str) + 1, send_len);
+
+        EXPECT_EQ(send(self->fd, test_str, send_len, 0), send_len);
+        EXPECT_NE(recv(self->cfd, buf, send_len, 0), -1);
+        EXPECT_EQ(memcmp(buf, test_str, send_len), 0);
+};
+
 FIXTURE(tls)
 {
         int fd, cfd;
@@ -165,6 +239,16 @@ TEST_F(tls, msg_more)
         EXPECT_EQ(memcmp(buf, test_str, send_len), 0);
 }
 
+TEST_F(tls, msg_more_unsent)
+{
+        char const *test_str = "test_read";
+        int send_len = 10;
+        char buf[10];
+
+        EXPECT_EQ(send(self->fd, test_str, send_len, MSG_MORE), send_len);
+        EXPECT_EQ(recv(self->cfd, buf, send_len, MSG_DONTWAIT), -1);
+}
+
 TEST_F(tls, sendmsg_single)
 {
         struct msghdr msg;
@@ -610,6 +694,42 @@ TEST_F(tls, recv_lowat)
         EXPECT_EQ(memcmp(send_mem, recv_mem + 10, 5), 0);
 }
 
+TEST_F(tls, bidir)
+{
+        char const *test_str = "test_read";
+        int send_len = 10;
+        char buf[10];
+        int ret;
+
+        if (!self->notls) {
+                struct tls12_crypto_info_aes_gcm_128 tls12;
+
+                memset(&tls12, 0, sizeof(tls12));
+                tls12.info.version = TLS_1_3_VERSION;
+                tls12.info.cipher_type = TLS_CIPHER_AES_GCM_128;
+
+                ret = setsockopt(self->fd, SOL_TLS, TLS_RX, &tls12,
+                                 sizeof(tls12));
+                ASSERT_EQ(ret, 0);
+
+                ret = setsockopt(self->cfd, SOL_TLS, TLS_TX, &tls12,
+                                 sizeof(tls12));
+                ASSERT_EQ(ret, 0);
+        }
+
+        ASSERT_EQ(strlen(test_str) + 1, send_len);
+
+        EXPECT_EQ(send(self->fd, test_str, send_len, 0), send_len);
+        EXPECT_NE(recv(self->cfd, buf, send_len, 0), -1);
+        EXPECT_EQ(memcmp(buf, test_str, send_len), 0);
+
+        memset(buf, 0, sizeof(buf));
+
+        EXPECT_EQ(send(self->cfd, test_str, send_len, 0), send_len);
+        EXPECT_NE(recv(self->fd, buf, send_len, 0), -1);
+        EXPECT_EQ(memcmp(buf, test_str, send_len), 0);
+};
+
 TEST_F(tls, pollin)
 {
         char const *test_str = "test_poll";
@@ -837,6 +957,109 @@ TEST_F(tls, control_msg)
         EXPECT_EQ(memcmp(buf, test_str, send_len), 0);
 }
 
+TEST_F(tls, shutdown)
+{
+        char const *test_str = "test_read";
+        int send_len = 10;
+        char buf[10];
+
+        ASSERT_EQ(strlen(test_str) + 1, send_len);
+
+        EXPECT_EQ(send(self->fd, test_str, send_len, 0), send_len);
+        EXPECT_NE(recv(self->cfd, buf, send_len, 0), -1);
+        EXPECT_EQ(memcmp(buf, test_str, send_len), 0);
+
+        shutdown(self->fd, SHUT_RDWR);
+        shutdown(self->cfd, SHUT_RDWR);
+}
+
+TEST_F(tls, shutdown_unsent)
+{
+        char const *test_str = "test_read";
+        int send_len = 10;
+
+        EXPECT_EQ(send(self->fd, test_str, send_len, MSG_MORE), send_len);
+
+        shutdown(self->fd, SHUT_RDWR);
+        shutdown(self->cfd, SHUT_RDWR);
+}
+
+TEST_F(tls, shutdown_reuse)
+{
+        struct sockaddr_in addr;
+        int ret;
+
+        shutdown(self->fd, SHUT_RDWR);
+        shutdown(self->cfd, SHUT_RDWR);
+        close(self->cfd);
+
+        addr.sin_family = AF_INET;
+        addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        addr.sin_port = 0;
+
+        ret = bind(self->fd, &addr, sizeof(addr));
+        EXPECT_EQ(ret, 0);
+        ret = listen(self->fd, 10);
+        EXPECT_EQ(ret, -1);
+        EXPECT_EQ(errno, EINVAL);
+
+        ret = connect(self->fd, &addr, sizeof(addr));
+        EXPECT_EQ(ret, -1);
+        EXPECT_EQ(errno, EISCONN);
+}
+
+TEST(non_established) {
+        struct tls12_crypto_info_aes_gcm_256 tls12;
+        struct sockaddr_in addr;
+        int sfd, ret, fd;
+        socklen_t len;
+
+        len = sizeof(addr);
+
+        memset(&tls12, 0, sizeof(tls12));
+        tls12.info.version = TLS_1_2_VERSION;
+        tls12.info.cipher_type = TLS_CIPHER_AES_GCM_256;
+
+        addr.sin_family = AF_INET;
+        addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        addr.sin_port = 0;
+
+        fd = socket(AF_INET, SOCK_STREAM, 0);
+        sfd = socket(AF_INET, SOCK_STREAM, 0);
+
+        ret = bind(sfd, &addr, sizeof(addr));
+        ASSERT_EQ(ret, 0);
+        ret = listen(sfd, 10);
+        ASSERT_EQ(ret, 0);
+
+        ret = setsockopt(fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+        EXPECT_EQ(ret, -1);
+        /* TLS ULP not supported */
+        if (errno == ENOENT)
+                return;
+        EXPECT_EQ(errno, ENOTSUPP);
+
+        ret = setsockopt(sfd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+        EXPECT_EQ(ret, -1);
+        EXPECT_EQ(errno, ENOTSUPP);
+
+        ret = getsockname(sfd, &addr, &len);
+        ASSERT_EQ(ret, 0);
+
+        ret = connect(fd, &addr, sizeof(addr));
+        ASSERT_EQ(ret, 0);
+
+        ret = setsockopt(fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+        ASSERT_EQ(ret, 0);
+
+        ret = setsockopt(fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+        EXPECT_EQ(ret, -1);
+        EXPECT_EQ(errno, EEXIST);
+
+        close(fd);
+        close(sfd);
+}
+
 TEST(keysizes) {
         struct tls12_crypto_info_aes_gcm_256 tls12;
         struct sockaddr_in addr;
diff --git a/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json b/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json
index cc7c7d758008..6503b1ce091f 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json
@@ -713,5 +713,99 @@
         "teardown": [
             "$TC actions flush action vlan"
         ]
+    },
+    {
+        "id": "294e",
+        "name": "Add batch of 32 vlan push actions with cookie",
+        "category": [
+            "actions",
+            "vlan"
+        ],
+        "setup": [
+            [
+                "$TC actions flush action vlan",
+                0,
+                1,
+                255
+            ]
+        ],
+        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action vlan push protocol 802.1q id 4094 priority 7 pipe index \\$i cookie aabbccddeeff112233445566778800a1 \\\"; args=\"\\$args\\$cmd\"; done && $TC actions add \\$args\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions list action vlan",
+        "matchPattern": "^[ \t]+index [0-9]+ ref",
+        "matchCount": "32",
+        "teardown": [
+            "$TC actions flush action vlan"
+        ]
+    },
+    {
+        "id": "56f7",
+        "name": "Delete batch of 32 vlan push actions",
+        "category": [
+            "actions",
+            "vlan"
+        ],
+        "setup": [
+            [
+                "$TC actions flush action vlan",
+                0,
+                1,
+                255
+            ],
+            "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action vlan push protocol 802.1q id 4094 priority 7 pipe index \\$i \\\"; args=\\\"\\$args\\$cmd\\\"; done && $TC actions add \\$args\""
+        ],
+        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action vlan index \\$i \\\"; args=\"\\$args\\$cmd\"; done && $TC actions del \\$args\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions list action vlan",
+        "matchPattern": "^[ \t]+index [0-9]+ ref",
+        "matchCount": "0",
+        "teardown": []
+    },
+    {
+        "id": "759f",
+        "name": "Add batch of 32 vlan pop actions with cookie",
+        "category": [
+            "actions",
+            "vlan"
+        ],
+        "setup": [
+            [
+                "$TC actions flush action vlan",
+                0,
+                1,
+                255
+            ]
+        ],
+        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action vlan pop continue index \\$i cookie aabbccddeeff112233445566778800a1 \\\"; args=\"\\$args\\$cmd\"; done && $TC actions add \\$args\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions list action vlan",
+        "matchPattern": "^[ \t]+index [0-9]+ ref",
+        "matchCount": "32",
+        "teardown": [
+            "$TC actions flush action vlan"
+        ]
+    },
+    {
+        "id": "c84a",
+        "name": "Delete batch of 32 vlan pop actions",
+        "category": [
+            "actions",
+            "vlan"
+        ],
+        "setup": [
+            [
+                "$TC actions flush action vlan",
+                0,
+                1,
+                255
+            ],
+            "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action vlan pop index \\$i \\\"; args=\\\"\\$args\\$cmd\\\"; done && $TC actions add \\$args\""
+        ],
+        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action vlan index \\$i \\\"; args=\"\\$args\\$cmd\"; done && $TC actions del \\$args\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions list action vlan",
+        "matchPattern": "^[ \t]+index [0-9]+ ref",
+        "matchCount": "0",
+        "teardown": []
     }
 ]