mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-07 03:51:34 -04:00
Merge tag 'net-6.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski:
"Including fixes from Bluetooth.
Current release - fix to a fix:
- usb: asix_devices: fix PHY address mask in MDIO bus initialization
Current release - regressions:
- Bluetooth: fixes for the split between BIS_LINK and PA_LINK
- Revert "net: cadence: macb: sama7g5_emac: Remove USARIO CLKEN
flag", breaks compatibility with some existing device tree blobs
- dsa: b53: fix reserved register access in b53_fdb_dump()
Current release - new code bugs:
- sched: dualpi2: run probability update timer in BH to avoid
deadlock
- eth: libwx: fix the size in RSS hash key population
- pse-pd: pd692x0: improve power budget error paths and handling
Previous releases - regressions:
- tls: fix handling of zero-length records on the rx_list
- hsr: reject HSR frame if skb can't hold tag
- bonding: fix negotiation flapping in 802.3ad passive mode
Previous releases - always broken:
- gso: forbid IPv6 TSO with extensions on devices with only IPV6_CSUM
- sched: make cake_enqueue return NET_XMIT_CN when past buffer_limit,
avoid packet drops with low buffer_limit, remove unnecessary WARN()
- sched: fix backlog accounting after modifying config of a qdisc in
the middle of the hierarchy
- mptcp: improve handling of skb extension allocation failures
- eth: mlx5:
- fixes for the "HW Steering" flow management method
- fixes for QoS and device buffer management"
* tag 'net-6.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (81 commits)
netfilter: nf_reject: don't leak dst refcount for loopback packets
net/mlx5e: Preserve shared buffer capacity during headroom updates
net/mlx5e: Query FW for buffer ownership
net/mlx5: Restore missing scheduling node cleanup on vport enable failure
net/mlx5: Fix QoS reference leak in vport enable error path
net/mlx5: Destroy vport QoS element when no configuration remains
net/mlx5e: Preserve tc-bw during parent changes
net/mlx5: Remove default QoS group and attach vports directly to root TSAR
net/mlx5: Base ECVF devlink port attrs from 0
net: pse-pd: pd692x0: Skip power budget configuration when undefined
net: pse-pd: pd692x0: Fix power budget leak in manager setup error path
Octeontx2-af: Skip overlap check for SPI field
selftests: tls: add tests for zero-length records
tls: fix handling of zero-length records on the rx_list
net: airoha: ppe: Do not invalid PPE entries in case of SW hash collision
selftests: bonding: add test for passive LACP mode
bonding: send LACPDUs periodically in passive mode after receiving partner's LACPDU
bonding: update LACP activity flag after setting lacp_active
Revert "net: cadence: macb: sama7g5_emac: Remove USARIO CLKEN flag"
ipv6: sr: Fix MAC comparison to be constant-time
...
This commit is contained in:
Linus Torvalds
@@ -10,7 +10,8 @@ TEST_PROGS := \
|
||||
mode-2-recovery-updelay.sh \
|
||||
bond_options.sh \
|
||||
bond-eth-type-change.sh \
|
||||
bond_macvlan_ipvlan.sh
|
||||
bond_macvlan_ipvlan.sh \
|
||||
bond_passive_lacp.sh
|
||||
|
||||
TEST_FILES := \
|
||||
lag_lib.sh \
|
||||
|
||||
105
tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh
Executable file
105
tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh
Executable file
@@ -0,0 +1,105 @@
|
||||
#!/bin/bash
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Test if a bond interface works with lacp_active=off.
|
||||
|
||||
# shellcheck disable=SC2034
|
||||
REQUIRE_MZ=no
|
||||
NUM_NETIFS=0
|
||||
lib_dir=$(dirname "$0")
|
||||
# shellcheck disable=SC1091
|
||||
source "$lib_dir"/../../../net/forwarding/lib.sh
|
||||
|
||||
# shellcheck disable=SC2317
|
||||
check_port_state()
|
||||
{
|
||||
local netns=$1
|
||||
local port=$2
|
||||
local state=$3
|
||||
|
||||
ip -n "${netns}" -d -j link show "$port" | \
|
||||
jq -e ".[].linkinfo.info_slave_data.ad_actor_oper_port_state_str | index(\"${state}\") != null" > /dev/null
|
||||
}
|
||||
|
||||
check_pkt_count()
|
||||
{
|
||||
RET=0
|
||||
local ns="$1"
|
||||
local iface="$2"
|
||||
|
||||
# wait 65s, one per 30s
|
||||
slowwait_for_counter 65 2 tc_rule_handle_stats_get \
|
||||
"dev ${iface} egress" 101 ".packets" "-n ${ns}" &> /dev/null
|
||||
}
|
||||
|
||||
setup() {
|
||||
setup_ns c_ns s_ns
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
ip -n "${c_ns}" link add eth0 type veth peer name eth0 netns "${s_ns}"
|
||||
ip -n "${c_ns}" link add eth1 type veth peer name eth1 netns "${s_ns}"
|
||||
|
||||
# Add tc filter to count the pkts
|
||||
tc -n "${c_ns}" qdisc add dev eth0 clsact
|
||||
tc -n "${c_ns}" filter add dev eth0 egress handle 101 protocol 0x8809 matchall action pass
|
||||
tc -n "${s_ns}" qdisc add dev eth1 clsact
|
||||
tc -n "${s_ns}" filter add dev eth1 egress handle 101 protocol 0x8809 matchall action pass
|
||||
|
||||
ip -n "${s_ns}" link add bond0 type bond mode 802.3ad lacp_active on lacp_rate fast
|
||||
ip -n "${s_ns}" link set eth0 master bond0
|
||||
ip -n "${s_ns}" link set eth1 master bond0
|
||||
|
||||
ip -n "${c_ns}" link add bond0 type bond mode 802.3ad lacp_active off lacp_rate fast
|
||||
ip -n "${c_ns}" link set eth0 master bond0
|
||||
ip -n "${c_ns}" link set eth1 master bond0
|
||||
|
||||
}
|
||||
|
||||
trap cleanup_all_ns EXIT
|
||||
setup
|
||||
|
||||
# The bond will send 2 lacpdu pkts during init time, let's wait at least 2s
|
||||
# after interface up
|
||||
ip -n "${c_ns}" link set bond0 up
|
||||
sleep 2
|
||||
|
||||
# 1. The passive side shouldn't send LACPDU.
|
||||
check_pkt_count "${c_ns}" "eth0" && RET=1
|
||||
log_test "802.3ad lacp_active off" "init port"
|
||||
|
||||
ip -n "${s_ns}" link set bond0 up
|
||||
# 2. The passive side should not have the 'active' flag.
|
||||
RET=0
|
||||
slowwait 2 check_port_state "${c_ns}" "eth0" "active" && RET=1
|
||||
log_test "802.3ad lacp_active off" "port state active"
|
||||
|
||||
# 3. The active side should have the 'active' flag.
|
||||
RET=0
|
||||
slowwait 2 check_port_state "${s_ns}" "eth0" "active" || RET=1
|
||||
log_test "802.3ad lacp_active on" "port state active"
|
||||
|
||||
# 4. Make sure the connection is not expired.
|
||||
RET=0
|
||||
slowwait 5 check_port_state "${s_ns}" "eth0" "distributing"
|
||||
slowwait 10 check_port_state "${s_ns}" "eth0" "expired" && RET=1
|
||||
log_test "bond 802.3ad lacp_active off" "port connection"
|
||||
|
||||
# After testing, disconnect one port on each side to check the state.
|
||||
ip -n "${s_ns}" link set eth0 nomaster
|
||||
ip -n "${s_ns}" link set eth0 up
|
||||
ip -n "${c_ns}" link set eth1 nomaster
|
||||
ip -n "${c_ns}" link set eth1 up
|
||||
# Due to Periodic Machine and Rx Machine state change, the bond will still
|
||||
# send lacpdu pkts in a few seconds. sleep at lease 5s to make sure
|
||||
# negotiation finished
|
||||
sleep 5
|
||||
|
||||
# 5. The active side should keep sending LACPDU.
|
||||
check_pkt_count "${s_ns}" "eth1" || RET=1
|
||||
log_test "bond 802.3ad lacp_active on" "port pkt after disconnect"
|
||||
|
||||
# 6. The passive side shouldn't send LACPDU anymore.
|
||||
check_pkt_count "${c_ns}" "eth0" && RET=1
|
||||
log_test "bond 802.3ad lacp_active off" "port pkt after disconnect"
|
||||
|
||||
exit "$EXIT_STATUS"
|
||||
@@ -6,6 +6,7 @@ CONFIG_MACVLAN=y
|
||||
CONFIG_IPVLAN=y
|
||||
CONFIG_NET_ACT_GACT=y
|
||||
CONFIG_NET_CLS_FLOWER=y
|
||||
CONFIG_NET_CLS_MATCHALL=m
|
||||
CONFIG_NET_SCH_INGRESS=y
|
||||
CONFIG_NLMON=y
|
||||
CONFIG_VETH=y
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# | 2001:db8:1::1/64 2001:db8:2::1/64 |
|
||||
# | |
|
||||
# +-----------------------------------------------------------------+
|
||||
#
|
||||
#shellcheck disable=SC2034 # SC doesn't see our uses of global variables
|
||||
|
||||
ALL_TESTS="
|
||||
ping_ipv4
|
||||
@@ -27,6 +29,7 @@ ALL_TESTS="
|
||||
ipv4_sip_equal_dip
|
||||
ipv6_sip_equal_dip
|
||||
ipv4_dip_link_local
|
||||
ipv4_sip_link_local
|
||||
"
|
||||
|
||||
NUM_NETIFS=4
|
||||
@@ -330,6 +333,32 @@ ipv4_dip_link_local()
|
||||
tc filter del dev $rp2 egress protocol ip pref 1 handle 101 flower
|
||||
}
|
||||
|
||||
ipv4_sip_link_local()
|
||||
{
|
||||
local sip=169.254.1.1
|
||||
|
||||
RET=0
|
||||
|
||||
# Disable rpfilter to prevent packets to be dropped because of it.
|
||||
sysctl_set net.ipv4.conf.all.rp_filter 0
|
||||
sysctl_set net.ipv4.conf."$rp1".rp_filter 0
|
||||
|
||||
tc filter add dev "$rp2" egress protocol ip pref 1 handle 101 \
|
||||
flower src_ip "$sip" action pass
|
||||
|
||||
$MZ "$h1" -t udp "sp=54321,dp=12345" -c 5 -d 1msec -b "$rp1mac" \
|
||||
-A "$sip" -B 198.51.100.2 -q
|
||||
|
||||
tc_check_packets "dev $rp2 egress" 101 5
|
||||
check_err $? "Packets were dropped"
|
||||
|
||||
log_test "IPv4 source IP is link-local"
|
||||
|
||||
tc filter del dev "$rp2" egress protocol ip pref 1 handle 101 flower
|
||||
sysctl_restore net.ipv4.conf."$rp1".rp_filter
|
||||
sysctl_restore net.ipv4.conf.all.rp_filter
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
setup_prepare
|
||||
|
||||
@@ -183,9 +183,10 @@ static void xgetaddrinfo(const char *node, const char *service,
|
||||
struct addrinfo *hints,
|
||||
struct addrinfo **res)
|
||||
{
|
||||
again:
|
||||
int err = getaddrinfo(node, service, hints, res);
|
||||
int err;
|
||||
|
||||
again:
|
||||
err = getaddrinfo(node, service, hints, res);
|
||||
if (err) {
|
||||
const char *errstr;
|
||||
|
||||
|
||||
@@ -75,9 +75,10 @@ static void xgetaddrinfo(const char *node, const char *service,
|
||||
struct addrinfo *hints,
|
||||
struct addrinfo **res)
|
||||
{
|
||||
again:
|
||||
int err = getaddrinfo(node, service, hints, res);
|
||||
int err;
|
||||
|
||||
again:
|
||||
err = getaddrinfo(node, service, hints, res);
|
||||
if (err) {
|
||||
const char *errstr;
|
||||
|
||||
|
||||
@@ -3842,6 +3842,7 @@ endpoint_tests()
|
||||
# remove and re-add
|
||||
if reset_with_events "delete re-add signal" &&
|
||||
mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
|
||||
ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=0
|
||||
pm_nl_set_limits $ns1 0 3
|
||||
pm_nl_set_limits $ns2 3 3
|
||||
pm_nl_add_endpoint $ns1 10.0.2.1 id 1 flags signal
|
||||
|
||||
@@ -162,9 +162,10 @@ static void xgetaddrinfo(const char *node, const char *service,
|
||||
struct addrinfo *hints,
|
||||
struct addrinfo **res)
|
||||
{
|
||||
again:
|
||||
int err = getaddrinfo(node, service, hints, res);
|
||||
int err;
|
||||
|
||||
again:
|
||||
err = getaddrinfo(node, service, hints, res);
|
||||
if (err) {
|
||||
const char *errstr;
|
||||
|
||||
|
||||
@@ -198,6 +198,7 @@ set_limits 1 9 2>/dev/null
|
||||
check "get_limits" "${default_limits}" "subflows above hard limit"
|
||||
|
||||
set_limits 8 8
|
||||
flush_endpoint ## to make sure it doesn't affect the limits
|
||||
check "get_limits" "$(format_limits 8 8)" "set limits"
|
||||
|
||||
flush_endpoint
|
||||
|
||||
@@ -181,13 +181,12 @@ static int tls_send_cmsg(int fd, unsigned char record_type,
|
||||
return sendmsg(fd, &msg, flags);
|
||||
}
|
||||
|
||||
static int tls_recv_cmsg(struct __test_metadata *_metadata,
|
||||
int fd, unsigned char record_type,
|
||||
void *data, size_t len, int flags)
|
||||
static int __tls_recv_cmsg(struct __test_metadata *_metadata,
|
||||
int fd, unsigned char *ctype,
|
||||
void *data, size_t len, int flags)
|
||||
{
|
||||
char cbuf[CMSG_SPACE(sizeof(char))];
|
||||
struct cmsghdr *cmsg;
|
||||
unsigned char ctype;
|
||||
struct msghdr msg;
|
||||
struct iovec vec;
|
||||
int n;
|
||||
@@ -206,7 +205,20 @@ static int tls_recv_cmsg(struct __test_metadata *_metadata,
|
||||
EXPECT_NE(cmsg, NULL);
|
||||
EXPECT_EQ(cmsg->cmsg_level, SOL_TLS);
|
||||
EXPECT_EQ(cmsg->cmsg_type, TLS_GET_RECORD_TYPE);
|
||||
ctype = *((unsigned char *)CMSG_DATA(cmsg));
|
||||
if (ctype)
|
||||
*ctype = *((unsigned char *)CMSG_DATA(cmsg));
|
||||
|
||||
return n;
|
||||
}
|
||||
|
||||
static int tls_recv_cmsg(struct __test_metadata *_metadata,
|
||||
int fd, unsigned char record_type,
|
||||
void *data, size_t len, int flags)
|
||||
{
|
||||
unsigned char ctype;
|
||||
int n;
|
||||
|
||||
n = __tls_recv_cmsg(_metadata, fd, &ctype, data, len, flags);
|
||||
EXPECT_EQ(ctype, record_type);
|
||||
|
||||
return n;
|
||||
@@ -2164,6 +2176,284 @@ TEST_F(tls, rekey_poll_delay)
|
||||
}
|
||||
}
|
||||
|
||||
struct raw_rec {
|
||||
unsigned int plain_len;
|
||||
unsigned char plain_data[100];
|
||||
unsigned int cipher_len;
|
||||
unsigned char cipher_data[128];
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, data, seqno:0, plaintext: 'Hello world' */
|
||||
static const struct raw_rec id0_data_l11 = {
|
||||
.plain_len = 11,
|
||||
.plain_data = {
|
||||
0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f,
|
||||
0x72, 0x6c, 0x64,
|
||||
},
|
||||
.cipher_len = 40,
|
||||
.cipher_data = {
|
||||
0x17, 0x03, 0x03, 0x00, 0x23, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0xa2, 0x33,
|
||||
0xde, 0x8d, 0x94, 0xf0, 0x29, 0x6c, 0xb1, 0xaf,
|
||||
0x6a, 0x75, 0xb2, 0x93, 0xad, 0x45, 0xd5, 0xfd,
|
||||
0x03, 0x51, 0x57, 0x8f, 0xf9, 0xcc, 0x3b, 0x42,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, ctrl, seqno:0, plaintext: '' */
|
||||
static const struct raw_rec id0_ctrl_l0 = {
|
||||
.plain_len = 0,
|
||||
.plain_data = {
|
||||
},
|
||||
.cipher_len = 29,
|
||||
.cipher_data = {
|
||||
0x16, 0x03, 0x03, 0x00, 0x18, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x38, 0x7b,
|
||||
0xa6, 0x1c, 0xdd, 0xa7, 0x19, 0x33, 0xab, 0xae,
|
||||
0x88, 0xe1, 0xd2, 0x08, 0x4f,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, data, seqno:0, plaintext: '' */
|
||||
static const struct raw_rec id0_data_l0 = {
|
||||
.plain_len = 0,
|
||||
.plain_data = {
|
||||
},
|
||||
.cipher_len = 29,
|
||||
.cipher_data = {
|
||||
0x17, 0x03, 0x03, 0x00, 0x18, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0xc5, 0x37, 0x90,
|
||||
0x70, 0x45, 0x89, 0xfb, 0x5c, 0xc7, 0x89, 0x03,
|
||||
0x68, 0x80, 0xd3, 0xd8, 0xcc,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, data, seqno:1, plaintext: 'Hello world' */
|
||||
static const struct raw_rec id1_data_l11 = {
|
||||
.plain_len = 11,
|
||||
.plain_data = {
|
||||
0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f,
|
||||
0x72, 0x6c, 0x64,
|
||||
},
|
||||
.cipher_len = 40,
|
||||
.cipher_data = {
|
||||
0x17, 0x03, 0x03, 0x00, 0x23, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x01, 0x3a, 0x1a, 0x9c,
|
||||
0xd0, 0xa8, 0x9a, 0xd6, 0x69, 0xd6, 0x1a, 0xe3,
|
||||
0xb5, 0x1f, 0x0d, 0x2c, 0xe2, 0x97, 0x46, 0xff,
|
||||
0x2b, 0xcc, 0x5a, 0xc4, 0xa3, 0xb9, 0xef, 0xba,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, ctrl, seqno:1, plaintext: '' */
|
||||
static const struct raw_rec id1_ctrl_l0 = {
|
||||
.plain_len = 0,
|
||||
.plain_data = {
|
||||
},
|
||||
.cipher_len = 29,
|
||||
.cipher_data = {
|
||||
0x16, 0x03, 0x03, 0x00, 0x18, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xf0, 0xfe,
|
||||
0xee, 0xd9, 0xe2, 0x5d, 0xc7, 0x11, 0x4c, 0xe6,
|
||||
0xb4, 0x7e, 0xef, 0x40, 0x2b,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, data, seqno:1, plaintext: '' */
|
||||
static const struct raw_rec id1_data_l0 = {
|
||||
.plain_len = 0,
|
||||
.plain_data = {
|
||||
},
|
||||
.cipher_len = 29,
|
||||
.cipher_data = {
|
||||
0x17, 0x03, 0x03, 0x00, 0x18, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x01, 0xce, 0xfc, 0x86,
|
||||
0xc8, 0xf0, 0x55, 0xf9, 0x47, 0x3f, 0x74, 0xdc,
|
||||
0xc9, 0xbf, 0xfe, 0x5b, 0xb1,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, ctrl, seqno:2, plaintext: 'Hello world' */
|
||||
static const struct raw_rec id2_ctrl_l11 = {
|
||||
.plain_len = 11,
|
||||
.plain_data = {
|
||||
0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f,
|
||||
0x72, 0x6c, 0x64,
|
||||
},
|
||||
.cipher_len = 40,
|
||||
.cipher_data = {
|
||||
0x16, 0x03, 0x03, 0x00, 0x23, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x02, 0xe5, 0x3d, 0x19,
|
||||
0x3d, 0xca, 0xb8, 0x16, 0xb6, 0xff, 0x79, 0x87,
|
||||
0x2a, 0x04, 0x11, 0x3d, 0xf8, 0x64, 0x5f, 0x36,
|
||||
0x8b, 0xa8, 0xee, 0x4c, 0x6d, 0x62, 0xa5, 0x00,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, data, seqno:2, plaintext: 'Hello world' */
|
||||
static const struct raw_rec id2_data_l11 = {
|
||||
.plain_len = 11,
|
||||
.plain_data = {
|
||||
0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f,
|
||||
0x72, 0x6c, 0x64,
|
||||
},
|
||||
.cipher_len = 40,
|
||||
.cipher_data = {
|
||||
0x17, 0x03, 0x03, 0x00, 0x23, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x02, 0xe5, 0x3d, 0x19,
|
||||
0x3d, 0xca, 0xb8, 0x16, 0xb6, 0xff, 0x79, 0x87,
|
||||
0x8e, 0xa1, 0xd0, 0xcd, 0x33, 0xb5, 0x86, 0x2b,
|
||||
0x17, 0xf1, 0x52, 0x2a, 0x55, 0x62, 0x65, 0x11,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, ctrl, seqno:2, plaintext: '' */
|
||||
static const struct raw_rec id2_ctrl_l0 = {
|
||||
.plain_len = 0,
|
||||
.plain_data = {
|
||||
},
|
||||
.cipher_len = 29,
|
||||
.cipher_data = {
|
||||
0x16, 0x03, 0x03, 0x00, 0x18, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x02, 0xdc, 0x5c, 0x0e,
|
||||
0x41, 0xdd, 0xba, 0xd3, 0xcc, 0xcf, 0x6d, 0xd9,
|
||||
0x06, 0xdb, 0x79, 0xe5, 0x5d,
|
||||
},
|
||||
};
|
||||
|
||||
/* TLS 1.2, AES_CCM, data, seqno:2, plaintext: '' */
|
||||
static const struct raw_rec id2_data_l0 = {
|
||||
.plain_len = 0,
|
||||
.plain_data = {
|
||||
},
|
||||
.cipher_len = 29,
|
||||
.cipher_data = {
|
||||
0x17, 0x03, 0x03, 0x00, 0x18, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x02, 0xc3, 0xca, 0x26,
|
||||
0x22, 0xe4, 0x25, 0xfb, 0x5f, 0x6d, 0xbf, 0x83,
|
||||
0x30, 0x48, 0x69, 0x1a, 0x47,
|
||||
},
|
||||
};
|
||||
|
||||
FIXTURE(zero_len)
|
||||
{
|
||||
int fd, cfd;
|
||||
bool notls;
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT(zero_len)
|
||||
{
|
||||
const struct raw_rec *recs[4];
|
||||
ssize_t recv_ret[4];
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT_ADD(zero_len, data_data_data)
|
||||
{
|
||||
.recs = { &id0_data_l11, &id1_data_l11, &id2_data_l11, },
|
||||
.recv_ret = { 33, -EAGAIN, },
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT_ADD(zero_len, data_0ctrl_data)
|
||||
{
|
||||
.recs = { &id0_data_l11, &id1_ctrl_l0, &id2_data_l11, },
|
||||
.recv_ret = { 11, 0, 11, -EAGAIN, },
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT_ADD(zero_len, 0data_0data_0data)
|
||||
{
|
||||
.recs = { &id0_data_l0, &id1_data_l0, &id2_data_l0, },
|
||||
.recv_ret = { -EAGAIN, },
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT_ADD(zero_len, 0data_0data_ctrl)
|
||||
{
|
||||
.recs = { &id0_data_l0, &id1_data_l0, &id2_ctrl_l11, },
|
||||
.recv_ret = { 0, 11, -EAGAIN, },
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT_ADD(zero_len, 0data_0data_0ctrl)
|
||||
{
|
||||
.recs = { &id0_data_l0, &id1_data_l0, &id2_ctrl_l0, },
|
||||
.recv_ret = { 0, 0, -EAGAIN, },
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT_ADD(zero_len, 0ctrl_0ctrl_0ctrl)
|
||||
{
|
||||
.recs = { &id0_ctrl_l0, &id1_ctrl_l0, &id2_ctrl_l0, },
|
||||
.recv_ret = { 0, 0, 0, -EAGAIN, },
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT_ADD(zero_len, 0data_0data_data)
|
||||
{
|
||||
.recs = { &id0_data_l0, &id1_data_l0, &id2_data_l11, },
|
||||
.recv_ret = { 11, -EAGAIN, },
|
||||
};
|
||||
|
||||
FIXTURE_VARIANT_ADD(zero_len, data_0data_0data)
|
||||
{
|
||||
.recs = { &id0_data_l11, &id1_data_l0, &id2_data_l0, },
|
||||
.recv_ret = { 11, -EAGAIN, },
|
||||
};
|
||||
|
||||
FIXTURE_SETUP(zero_len)
|
||||
{
|
||||
struct tls_crypto_info_keys tls12;
|
||||
int ret;
|
||||
|
||||
tls_crypto_info_init(TLS_1_2_VERSION, TLS_CIPHER_AES_CCM_128,
|
||||
&tls12, 0);
|
||||
|
||||
ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls);
|
||||
if (self->notls)
|
||||
return;
|
||||
|
||||
/* Don't install keys on fd, we'll send raw records */
|
||||
ret = setsockopt(self->cfd, SOL_TLS, TLS_RX, &tls12, tls12.len);
|
||||
ASSERT_EQ(ret, 0);
|
||||
}
|
||||
|
||||
FIXTURE_TEARDOWN(zero_len)
|
||||
{
|
||||
close(self->fd);
|
||||
close(self->cfd);
|
||||
}
|
||||
|
||||
TEST_F(zero_len, test)
|
||||
{
|
||||
const struct raw_rec *const *rec;
|
||||
unsigned char buf[128];
|
||||
int rec_off;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 4 && variant->recs[i]; i++)
|
||||
EXPECT_EQ(send(self->fd, variant->recs[i]->cipher_data,
|
||||
variant->recs[i]->cipher_len, 0),
|
||||
variant->recs[i]->cipher_len);
|
||||
|
||||
rec = &variant->recs[0];
|
||||
rec_off = 0;
|
||||
for (i = 0; i < 4; i++) {
|
||||
int j, ret;
|
||||
|
||||
ret = variant->recv_ret[i] >= 0 ? variant->recv_ret[i] : -1;
|
||||
EXPECT_EQ(__tls_recv_cmsg(_metadata, self->cfd, NULL,
|
||||
buf, sizeof(buf), MSG_DONTWAIT), ret);
|
||||
if (ret == -1)
|
||||
EXPECT_EQ(errno, -variant->recv_ret[i]);
|
||||
if (variant->recv_ret[i] == -EAGAIN)
|
||||
break;
|
||||
|
||||
for (j = 0; j < ret; j++) {
|
||||
while (rec_off == (*rec)->plain_len) {
|
||||
rec++;
|
||||
rec_off = 0;
|
||||
}
|
||||
EXPECT_EQ(buf[j], (*rec)->plain_data[rec_off]);
|
||||
rec_off++;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
FIXTURE(tls_err)
|
||||
{
|
||||
int fd, cfd;
|
||||
@@ -2748,17 +3038,18 @@ TEST(data_steal) {
|
||||
pid = fork();
|
||||
ASSERT_GE(pid, 0);
|
||||
if (!pid) {
|
||||
EXPECT_EQ(recv(cfd, buf, sizeof(buf), MSG_WAITALL),
|
||||
sizeof(buf));
|
||||
EXPECT_EQ(recv(cfd, buf, sizeof(buf) / 2, MSG_WAITALL),
|
||||
sizeof(buf) / 2);
|
||||
exit(!__test_passed(_metadata));
|
||||
}
|
||||
|
||||
usleep(2000);
|
||||
usleep(10000);
|
||||
ASSERT_EQ(setsockopt(fd, SOL_TLS, TLS_TX, &tls, tls.len), 0);
|
||||
ASSERT_EQ(setsockopt(cfd, SOL_TLS, TLS_RX, &tls, tls.len), 0);
|
||||
|
||||
EXPECT_EQ(send(fd, buf, sizeof(buf), 0), sizeof(buf));
|
||||
usleep(2000);
|
||||
EXPECT_EQ(wait(&status), pid);
|
||||
EXPECT_EQ(status, 0);
|
||||
EXPECT_EQ(recv(cfd, buf2, sizeof(buf2), MSG_DONTWAIT), -1);
|
||||
/* Don't check errno, the error will be different depending
|
||||
* on what random bytes TLS interpreted as the record length.
|
||||
@@ -2766,9 +3057,6 @@ TEST(data_steal) {
|
||||
|
||||
close(fd);
|
||||
close(cfd);
|
||||
|
||||
EXPECT_EQ(wait(&status), pid);
|
||||
EXPECT_EQ(status, 0);
|
||||
}
|
||||
|
||||
static void __attribute__((constructor)) fips_check(void) {
|
||||
|
||||
@@ -185,6 +185,204 @@
|
||||
"$IP addr del 10.10.10.10/24 dev $DUMMY || true"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "34c0",
|
||||
"name": "Test TBF with HHF Backlog Accounting in gso_skb case against underflow",
|
||||
"category": [
|
||||
"qdisc",
|
||||
"tbf",
|
||||
"hhf"
|
||||
],
|
||||
"plugins": {
|
||||
"requires": [
|
||||
"nsPlugin"
|
||||
]
|
||||
},
|
||||
"setup": [
|
||||
"$IP link set dev $DUMMY up || true",
|
||||
"$IP addr add 10.10.11.10/24 dev $DUMMY || true",
|
||||
"$TC qdisc add dev $DUMMY root handle 1: tbf rate 8bit burst 100b latency 100ms",
|
||||
"$TC qdisc replace dev $DUMMY handle 2: parent 1:1 hhf limit 1000",
|
||||
[
|
||||
"ping -I $DUMMY -c2 10.10.11.11",
|
||||
1
|
||||
],
|
||||
"$TC qdisc change dev $DUMMY handle 2: parent 1:1 hhf limit 1"
|
||||
],
|
||||
"cmdUnderTest": "$TC qdisc del dev $DUMMY handle 2: parent 1:1",
|
||||
"expExitCode": "0",
|
||||
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
|
||||
"matchPattern": "backlog 0b 0p",
|
||||
"matchCount": "1",
|
||||
"teardown": [
|
||||
"$TC qdisc del dev $DUMMY handle 1: root"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "fd68",
|
||||
"name": "Test TBF with CODEL Backlog Accounting in gso_skb case against underflow",
|
||||
"category": [
|
||||
"qdisc",
|
||||
"tbf",
|
||||
"codel"
|
||||
],
|
||||
"plugins": {
|
||||
"requires": [
|
||||
"nsPlugin"
|
||||
]
|
||||
},
|
||||
"setup": [
|
||||
"$IP link set dev $DUMMY up || true",
|
||||
"$IP addr add 10.10.11.10/24 dev $DUMMY || true",
|
||||
"$TC qdisc add dev $DUMMY root handle 1: tbf rate 8bit burst 100b latency 100ms",
|
||||
"$TC qdisc replace dev $DUMMY handle 2: parent 1:1 codel limit 1000",
|
||||
[
|
||||
"ping -I $DUMMY -c2 10.10.11.11",
|
||||
1
|
||||
],
|
||||
"$TC qdisc change dev $DUMMY handle 2: parent 1:1 codel limit 1"
|
||||
],
|
||||
"cmdUnderTest": "$TC qdisc del dev $DUMMY handle 2: parent 1:1",
|
||||
"expExitCode": "0",
|
||||
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
|
||||
"matchPattern": "backlog 0b 0p",
|
||||
"matchCount": "1",
|
||||
"teardown": [
|
||||
"$TC qdisc del dev $DUMMY handle 1: root"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "514e",
|
||||
"name": "Test TBF with PIE Backlog Accounting in gso_skb case against underflow",
|
||||
"category": [
|
||||
"qdisc",
|
||||
"tbf",
|
||||
"pie"
|
||||
],
|
||||
"plugins": {
|
||||
"requires": [
|
||||
"nsPlugin"
|
||||
]
|
||||
},
|
||||
"setup": [
|
||||
"$IP link set dev $DUMMY up || true",
|
||||
"$IP addr add 10.10.11.10/24 dev $DUMMY || true",
|
||||
"$TC qdisc add dev $DUMMY root handle 1: tbf rate 8bit burst 100b latency 100ms",
|
||||
"$TC qdisc replace dev $DUMMY handle 2: parent 1:1 pie limit 1000",
|
||||
[
|
||||
"ping -I $DUMMY -c2 10.10.11.11",
|
||||
1
|
||||
],
|
||||
"$TC qdisc change dev $DUMMY handle 2: parent 1:1 pie limit 1"
|
||||
],
|
||||
"cmdUnderTest": "$TC qdisc del dev $DUMMY handle 2: parent 1:1",
|
||||
"expExitCode": "0",
|
||||
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
|
||||
"matchPattern": "backlog 0b 0p",
|
||||
"matchCount": "1",
|
||||
"teardown": [
|
||||
"$TC qdisc del dev $DUMMY handle 1: root"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "6c97",
|
||||
"name": "Test TBF with FQ Backlog Accounting in gso_skb case against underflow",
|
||||
"category": [
|
||||
"qdisc",
|
||||
"tbf",
|
||||
"fq"
|
||||
],
|
||||
"plugins": {
|
||||
"requires": [
|
||||
"nsPlugin"
|
||||
]
|
||||
},
|
||||
"setup": [
|
||||
"$IP link set dev $DUMMY up || true",
|
||||
"$IP addr add 10.10.11.10/24 dev $DUMMY || true",
|
||||
"$TC qdisc add dev $DUMMY root handle 1: tbf rate 8bit burst 100b latency 100ms",
|
||||
"$TC qdisc replace dev $DUMMY handle 2: parent 1:1 fq limit 1000",
|
||||
[
|
||||
"ping -I $DUMMY -c2 10.10.11.11",
|
||||
1
|
||||
],
|
||||
"$TC qdisc change dev $DUMMY handle 2: parent 1:1 fq limit 1"
|
||||
],
|
||||
"cmdUnderTest": "$TC qdisc del dev $DUMMY handle 2: parent 1:1",
|
||||
"expExitCode": "0",
|
||||
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
|
||||
"matchPattern": "backlog 0b 0p",
|
||||
"matchCount": "1",
|
||||
"teardown": [
|
||||
"$TC qdisc del dev $DUMMY handle 1: root"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "5d0b",
|
||||
"name": "Test TBF with FQ_CODEL Backlog Accounting in gso_skb case against underflow",
|
||||
"category": [
|
||||
"qdisc",
|
||||
"tbf",
|
||||
"fq_codel"
|
||||
],
|
||||
"plugins": {
|
||||
"requires": [
|
||||
"nsPlugin"
|
||||
]
|
||||
},
|
||||
"setup": [
|
||||
"$IP link set dev $DUMMY up || true",
|
||||
"$IP addr add 10.10.11.10/24 dev $DUMMY || true",
|
||||
"$TC qdisc add dev $DUMMY root handle 1: tbf rate 8bit burst 100b latency 100ms",
|
||||
"$TC qdisc replace dev $DUMMY handle 2: parent 1:1 fq_codel limit 1000",
|
||||
[
|
||||
"ping -I $DUMMY -c2 10.10.11.11",
|
||||
1
|
||||
],
|
||||
"$TC qdisc change dev $DUMMY handle 2: parent 1:1 fq_codel limit 1"
|
||||
],
|
||||
"cmdUnderTest": "$TC qdisc del dev $DUMMY handle 2: parent 1:1",
|
||||
"expExitCode": "0",
|
||||
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
|
||||
"matchPattern": "backlog 0b 0p",
|
||||
"matchCount": "1",
|
||||
"teardown": [
|
||||
"$TC qdisc del dev $DUMMY handle 1: root"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "21c3",
|
||||
"name": "Test TBF with FQ_PIE Backlog Accounting in gso_skb case against underflow",
|
||||
"category": [
|
||||
"qdisc",
|
||||
"tbf",
|
||||
"fq_pie"
|
||||
],
|
||||
"plugins": {
|
||||
"requires": [
|
||||
"nsPlugin"
|
||||
]
|
||||
},
|
||||
"setup": [
|
||||
"$IP link set dev $DUMMY up || true",
|
||||
"$IP addr add 10.10.11.10/24 dev $DUMMY || true",
|
||||
"$TC qdisc add dev $DUMMY root handle 1: tbf rate 8bit burst 100b latency 100ms",
|
||||
"$TC qdisc replace dev $DUMMY handle 2: parent 1:1 fq_pie limit 1000",
|
||||
[
|
||||
"ping -I $DUMMY -c2 10.10.11.11",
|
||||
1
|
||||
],
|
||||
"$TC qdisc change dev $DUMMY handle 2: parent 1:1 fq_pie limit 1"
|
||||
],
|
||||
"cmdUnderTest": "$TC qdisc del dev $DUMMY handle 2: parent 1:1",
|
||||
"expExitCode": "0",
|
||||
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
|
||||
"matchPattern": "backlog 0b 0p",
|
||||
"matchCount": "1",
|
||||
"teardown": [
|
||||
"$TC qdisc del dev $DUMMY handle 1: root"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "a4bb",
|
||||
"name": "Test FQ_CODEL with HTB parent - force packet drop with empty queue",
|
||||
|
||||
Reference in New Issue
Block a user