Skip to content

Commit 2e5584e

Browse files
wdebruijkuba-moo
wdebruij
authored and
kuba-moo
committed
selftests/net: expand cmsg_ipv6.sh with ipv4
Expand IPV6_TCLASS to also cover IP_TOS. Expand IPV6_HOPLIMIT to also cover IP_TTL. Expand csmg_sender.c to allow setting IPv4 setsockopts. Also rename struct v6 to cmsg to match its expanded scope. Don't bother updating all occurrences of tclass and hoplimit. Rename cmsg_ipv6.sh to cmsg_ip.sh to match the expanded scope. Be careful around the subtle API difference between TCLASS and TOS. IP_TOS includes ECN bits. Add a test to verify that these are masked when making routing decisions. Diff is more concise with --word-diff Signed-off-by: Willem de Bruijn <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent c1d6d62 commit 2e5584e

File tree

3 files changed

+96
-55
lines changed

3 files changed

+96
-55
lines changed

‎tools/testing/selftests/net/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ TEST_PROGS += gre_gso.sh
3434
TEST_PROGS += cmsg_so_mark.sh
3535
TEST_PROGS += cmsg_so_priority.sh
3636
TEST_PROGS += test_so_rcv.sh
37-
TEST_PROGS += cmsg_time.sh cmsg_ipv6.sh
37+
TEST_PROGS += cmsg_time.sh cmsg_ip.sh
3838
TEST_PROGS += netns-name.sh
3939
TEST_PROGS += link_netns.py
4040
TEST_PROGS += nl_netdev.py

‎tools/testing/selftests/net/cmsg_ipv6.sh renamed to ‎tools/testing/selftests/net/cmsg_ip.sh

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
source lib.sh
55

6+
IP4=172.16.0.1/24
7+
TGT4=172.16.0.2
68
IP6=2001:db8:1::1/64
79
TGT6=2001:db8:1::2
810
TMPF=$(mktemp --suffix ".pcap")
@@ -30,6 +32,7 @@ $NSEXE sysctl -w net.ipv4.ping_group_range='0 2147483647' > /dev/null
3032
# Connectivity
3133
ip -netns $NS link add type dummy
3234
ip -netns $NS link set dev dummy0 up
35+
ip -netns $NS addr add $IP4 dev dummy0
3336
ip -netns $NS addr add $IP6 dev dummy0
3437

3538
# Test
@@ -63,14 +66,19 @@ for ovr in setsock cmsg both diff; do
6366
done
6467
done
6568

66-
# IPV6_TCLASS
69+
# IP_TOS + IPV6_TCLASS
6770

6871
test_dscp() {
72+
local -r IPVER=$1
73+
local -r TGT=$2
74+
local -r MATCH=$3
75+
6976
local -r TOS=0x10
7077
local -r TOS2=0x20
78+
local -r ECN=0x3
7179

72-
ip -6 -netns $NS rule add tos $TOS lookup 300
73-
ip -6 -netns $NS route add table 300 prohibit any
80+
ip $IPVER -netns $NS rule add tos $TOS lookup 300
81+
ip $IPVER -netns $NS route add table 300 prohibit any
7482

7583
for ovr in setsock cmsg both diff; do
7684
for p in u i r; do
@@ -87,30 +95,42 @@ test_dscp() {
8795
BG=$!
8896
sleep 0.05
8997

90-
$NSEXE ./cmsg_sender -6 -p $p $m $((TOS2)) $TGT6 1234
91-
check_result $? 0 "TCLASS $prot $ovr - pass"
98+
$NSEXE ./cmsg_sender $IPVER -p $p $m $((TOS2)) $TGT 1234
99+
check_result $? 0 "$MATCH $prot $ovr - pass"
92100

93101
while [ -d /proc/$BG ]; do
94-
$NSEXE ./cmsg_sender -6 -p $p $m $((TOS2)) $TGT6 1234
102+
$NSEXE ./cmsg_sender $IPVER -p $p $m $((TOS2)) $TGT 1234
95103
done
96104

97-
tcpdump -r $TMPF -v 2>&1 | grep "class $TOS2" >> /dev/null
98-
check_result $? 0 "TCLASS $prot $ovr - packet data"
105+
tcpdump -r $TMPF -v 2>&1 | grep "$MATCH $TOS2" >> /dev/null
106+
check_result $? 0 "$MATCH $prot $ovr - packet data"
99107
rm $TMPF
100108

101109
[ $ovr == "both" ] && m="-C $((TOS )) -c"
102110
[ $ovr == "diff" ] && m="-C $((TOS2)) -c"
103111

104-
$NSEXE ./cmsg_sender -6 -p $p $m $((TOS)) -s $TGT6 1234
105-
check_result $? 1 "TCLASS $prot $ovr - rejection"
112+
# Match prohibit rule: expect failure
113+
$NSEXE ./cmsg_sender $IPVER -p $p $m $((TOS)) -s $TGT 1234
114+
check_result $? 1 "$MATCH $prot $ovr - rejection"
115+
116+
# Match prohibit rule: IPv4 masks ECN: expect failure
117+
if [[ "$IPVER" == "-4" ]]; then
118+
$NSEXE ./cmsg_sender $IPVER -p $p $m "$((TOS | ECN))" -s $TGT 1234
119+
check_result $? 1 "$MATCH $prot $ovr - rejection (ECN)"
120+
fi
106121
done
107122
done
108123
}
109124

110-
test_dscp
125+
test_dscp -4 $TGT4 tos
126+
test_dscp -6 $TGT6 class
127+
128+
# IP_TTL + IPV6_HOPLIMIT
129+
test_ttl_hoplimit() {
130+
local -r IPVER=$1
131+
local -r TGT=$2
132+
local -r MATCH=$3
111133

112-
# IPV6_HOPLIMIT
113-
test_hoplimit() {
114134
local -r LIM=4
115135

116136
for ovr in setsock cmsg both diff; do
@@ -128,21 +148,22 @@ test_hoplimit() {
128148
BG=$!
129149
sleep 0.05
130150

131-
$NSEXE ./cmsg_sender -6 -p $p $m $LIM $TGT6 1234
132-
check_result $? 0 "HOPLIMIT $prot $ovr - pass"
151+
$NSEXE ./cmsg_sender $IPVER -p $p $m $LIM $TGT 1234
152+
check_result $? 0 "$MATCH $prot $ovr - pass"
133153

134154
while [ -d /proc/$BG ]; do
135-
$NSEXE ./cmsg_sender -6 -p $p $m $LIM $TGT6 1234
155+
$NSEXE ./cmsg_sender $IPVER -p $p $m $LIM $TGT 1234
136156
done
137157

138-
tcpdump -r $TMPF -v 2>&1 | grep "hlim $LIM[^0-9]" >> /dev/null
139-
check_result $? 0 "HOPLIMIT $prot $ovr - packet data"
158+
tcpdump -r $TMPF -v 2>&1 | grep "$MATCH $LIM[^0-9]" >> /dev/null
159+
check_result $? 0 "$MATCH $prot $ovr - packet data"
140160
rm $TMPF
141161
done
142162
done
143163
}
144164

145-
test_hoplimit
165+
test_ttl_hoplimit -4 $TGT4 ttl
166+
test_ttl_hoplimit -6 $TGT6 hlim
146167

147168
# IPV6 exthdr
148169
for p in u i r; do

‎tools/testing/selftests/net/cmsg_sender.c

Lines changed: 55 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct options {
7272
struct option_cmsg_u32 tclass;
7373
struct option_cmsg_u32 hlimit;
7474
struct option_cmsg_u32 exthdr;
75-
} v6;
75+
} cmsg;
7676
} opt = {
7777
.size = 13,
7878
.num_pkt = 1,
@@ -104,10 +104,10 @@ static void __attribute__((noreturn)) cs_usage(const char *bin)
104104
"\t\t-t Enable time stamp reporting\n"
105105
"\t\t-f val Set don't fragment via cmsg\n"
106106
"\t\t-F val Set don't fragment via setsockopt\n"
107-
"\t\t-c val Set TCLASS via cmsg\n"
108-
"\t\t-C val Set TCLASS via setsockopt\n"
109-
"\t\t-l val Set HOPLIMIT via cmsg\n"
110-
"\t\t-L val Set HOPLIMIT via setsockopt\n"
107+
"\t\t-c val Set TOS/TCLASS via cmsg\n"
108+
"\t\t-C val Set TOS/TCLASS via setsockopt\n"
109+
"\t\t-l val Set TTL/HOPLIMIT via cmsg\n"
110+
"\t\t-L val Set TTL/HOPLIMIT via setsockopt\n"
111111
"\t\t-H type Add an IPv6 header option\n"
112112
"\t\t (h = HOP; d = DST; r = RTDST)"
113113
"");
@@ -169,37 +169,37 @@ static void cs_parse_args(int argc, char *argv[])
169169
opt.ts.ena = true;
170170
break;
171171
case 'f':
172-
opt.v6.dontfrag.ena = true;
173-
opt.v6.dontfrag.val = atoi(optarg);
172+
opt.cmsg.dontfrag.ena = true;
173+
opt.cmsg.dontfrag.val = atoi(optarg);
174174
break;
175175
case 'F':
176176
opt.sockopt.dontfrag = atoi(optarg);
177177
break;
178178
case 'c':
179-
opt.v6.tclass.ena = true;
180-
opt.v6.tclass.val = atoi(optarg);
179+
opt.cmsg.tclass.ena = true;
180+
opt.cmsg.tclass.val = atoi(optarg);
181181
break;
182182
case 'C':
183183
opt.sockopt.tclass = atoi(optarg);
184184
break;
185185
case 'l':
186-
opt.v6.hlimit.ena = true;
187-
opt.v6.hlimit.val = atoi(optarg);
186+
opt.cmsg.hlimit.ena = true;
187+
opt.cmsg.hlimit.val = atoi(optarg);
188188
break;
189189
case 'L':
190190
opt.sockopt.hlimit = atoi(optarg);
191191
break;
192192
case 'H':
193-
opt.v6.exthdr.ena = true;
193+
opt.cmsg.exthdr.ena = true;
194194
switch (optarg[0]) {
195195
case 'h':
196-
opt.v6.exthdr.val = IPV6_HOPOPTS;
196+
opt.cmsg.exthdr.val = IPV6_HOPOPTS;
197197
break;
198198
case 'd':
199-
opt.v6.exthdr.val = IPV6_DSTOPTS;
199+
opt.cmsg.exthdr.val = IPV6_DSTOPTS;
200200
break;
201201
case 'r':
202-
opt.v6.exthdr.val = IPV6_RTHDRDSTOPTS;
202+
opt.cmsg.exthdr.val = IPV6_RTHDRDSTOPTS;
203203
break;
204204
default:
205205
printf("Error: hdr type: %s\n", optarg);
@@ -261,12 +261,20 @@ cs_write_cmsg(int fd, struct msghdr *msg, char *cbuf, size_t cbuf_sz)
261261
SOL_SOCKET, SO_MARK, &opt.mark);
262262
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
263263
SOL_SOCKET, SO_PRIORITY, &opt.priority);
264-
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
265-
SOL_IPV6, IPV6_DONTFRAG, &opt.v6.dontfrag);
266-
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
267-
SOL_IPV6, IPV6_TCLASS, &opt.v6.tclass);
268-
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
269-
SOL_IPV6, IPV6_HOPLIMIT, &opt.v6.hlimit);
264+
265+
if (opt.sock.family == AF_INET) {
266+
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
267+
SOL_IP, IP_TOS, &opt.cmsg.tclass);
268+
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
269+
SOL_IP, IP_TTL, &opt.cmsg.hlimit);
270+
} else {
271+
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
272+
SOL_IPV6, IPV6_DONTFRAG, &opt.cmsg.dontfrag);
273+
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
274+
SOL_IPV6, IPV6_TCLASS, &opt.cmsg.tclass);
275+
ca_write_cmsg_u32(cbuf, cbuf_sz, &cmsg_len,
276+
SOL_IPV6, IPV6_HOPLIMIT, &opt.cmsg.hlimit);
277+
}
270278

271279
if (opt.txtime.ena) {
272280
__u64 txtime;
@@ -297,14 +305,14 @@ cs_write_cmsg(int fd, struct msghdr *msg, char *cbuf, size_t cbuf_sz)
297305
*(__u32 *)CMSG_DATA(cmsg) = SOF_TIMESTAMPING_TX_SCHED |
298306
SOF_TIMESTAMPING_TX_SOFTWARE;
299307
}
300-
if (opt.v6.exthdr.ena) {
308+
if (opt.cmsg.exthdr.ena) {
301309
cmsg = (struct cmsghdr *)(cbuf + cmsg_len);
302310
cmsg_len += CMSG_SPACE(8);
303311
if (cbuf_sz < cmsg_len)
304312
error(ERN_CMSG_WR, EFAULT, "cmsg buffer too small");
305313

306314
cmsg->cmsg_level = SOL_IPV6;
307-
cmsg->cmsg_type = opt.v6.exthdr.val;
315+
cmsg->cmsg_type = opt.cmsg.exthdr.val;
308316
cmsg->cmsg_len = CMSG_LEN(8);
309317
*(__u64 *)CMSG_DATA(cmsg) = 0;
310318
}
@@ -405,23 +413,35 @@ static void ca_set_sockopts(int fd)
405413
setsockopt(fd, SOL_SOCKET, SO_MARK,
406414
&opt.sockopt.mark, sizeof(opt.sockopt.mark)))
407415
error(ERN_SOCKOPT, errno, "setsockopt SO_MARK");
408-
if (opt.sockopt.dontfrag &&
409-
setsockopt(fd, SOL_IPV6, IPV6_DONTFRAG,
410-
&opt.sockopt.dontfrag, sizeof(opt.sockopt.dontfrag)))
411-
error(ERN_SOCKOPT, errno, "setsockopt IPV6_DONTFRAG");
412-
if (opt.sockopt.tclass &&
413-
setsockopt(fd, SOL_IPV6, IPV6_TCLASS,
414-
&opt.sockopt.tclass, sizeof(opt.sockopt.tclass)))
415-
error(ERN_SOCKOPT, errno, "setsockopt IPV6_TCLASS");
416-
if (opt.sockopt.hlimit &&
417-
setsockopt(fd, SOL_IPV6, IPV6_UNICAST_HOPS,
418-
&opt.sockopt.hlimit, sizeof(opt.sockopt.hlimit)))
419-
error(ERN_SOCKOPT, errno, "setsockopt IPV6_HOPLIMIT");
420416
if (opt.sockopt.priority &&
421417
setsockopt(fd, SOL_SOCKET, SO_PRIORITY,
422418
&opt.sockopt.priority, sizeof(opt.sockopt.priority)))
423419
error(ERN_SOCKOPT, errno, "setsockopt SO_PRIORITY");
424420

421+
if (opt.sock.family == AF_INET) {
422+
if (opt.sockopt.tclass &&
423+
setsockopt(fd, SOL_IP, IP_TOS,
424+
&opt.sockopt.tclass, sizeof(opt.sockopt.tclass)))
425+
error(ERN_SOCKOPT, errno, "setsockopt IP_TOS");
426+
if (opt.sockopt.hlimit &&
427+
setsockopt(fd, SOL_IP, IP_TTL,
428+
&opt.sockopt.hlimit, sizeof(opt.sockopt.hlimit)))
429+
error(ERN_SOCKOPT, errno, "setsockopt IP_TTL");
430+
} else {
431+
if (opt.sockopt.dontfrag &&
432+
setsockopt(fd, SOL_IPV6, IPV6_DONTFRAG,
433+
&opt.sockopt.dontfrag, sizeof(opt.sockopt.dontfrag)))
434+
error(ERN_SOCKOPT, errno, "setsockopt IPV6_DONTFRAG");
435+
if (opt.sockopt.tclass &&
436+
setsockopt(fd, SOL_IPV6, IPV6_TCLASS,
437+
&opt.sockopt.tclass, sizeof(opt.sockopt.tclass)))
438+
error(ERN_SOCKOPT, errno, "setsockopt IPV6_TCLASS");
439+
if (opt.sockopt.hlimit &&
440+
setsockopt(fd, SOL_IPV6, IPV6_UNICAST_HOPS,
441+
&opt.sockopt.hlimit, sizeof(opt.sockopt.hlimit)))
442+
error(ERN_SOCKOPT, errno, "setsockopt IPV6_HOPLIMIT");
443+
}
444+
425445
if (opt.txtime.ena) {
426446
struct sock_txtime so_txtime = {
427447
.clockid = CLOCK_MONOTONIC,

0 commit comments

Comments
 (0)