ping: support ipv6 ping socket flow labels
Subsystems (3)
PATCH v2 1/1 ping: support ipv6 ping socket flow labels
Ping sockets don't appear to make any attempt to preserve flow labels created and set by userspace using IPV6_FLOWINFO_SEND. Instead they are clobbered by autolabels (if enabled) or zero.
Grab the flowlabel out of the msghdr similar to how rawv6_sendmsg does it and move the memset up so it doesn't get zeroed after.
Signed-off-by Alan Brady <[email protected]>
Tested-by Gurucharan <[email protected]>
---
v2: change 'fix' to 'support' and add some selftests
--- net/ipv6/ping.c | 6 +- tools/testing/selftests/net/ipv6_flowlabel.c | 75 +++++++++++++++---- tools/testing/selftests/net/ipv6_flowlabel.sh | 16 ++++ 3 files changed, 81 insertions(+), 16 deletions(-)
net/ipv6/ping.c +5 -1
@@ -64,6 +64,8 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (err)return err; +memset (&fl6,0 ,sizeof (fl6)); +if (msg->msg_name) { DECLARE_SOCKADDR(struct sockaddr_in6 *, u, msg->msg_name);if (msg->msg_namelen <sizeof (*u))
@@ -72,12 +74,15 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)return -EAFNOSUPPORT ; } daddr = &(u->sin6_addr); +if (np->sndflow) + fl6.flowlabel = u->sin6_flowinfo &IPV6_FLOWINFO_MASK ;if (__ipv6_addr_needs_scope_id (ipv6_addr_type (daddr))) oif = u->sin6_scope_id; }else {if (sk->sk_state !=TCP_ESTABLISHED )return -EDESTADDRREQ ; daddr = &sk->sk_v6_daddr; + fl6.flowlabel = np->flow_label; }if (!oif)
@@ -101,7 +106,6 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) ipc6.sockc.tsflags = sk->sk_tsflags; ipc6.sockc.mark = sk->sk_mark; -memset (&fl6,0 ,sizeof (fl6)); fl6.flowi6_oif = oif;if (msg->msg_controllen) {
tools/testing/selftests/net/ipv6_flowlabel.c +60 -15
164 lines not on this page · raw message
tools/testing/selftests/net/ipv6_flowlabel.sh +16 -0
@@ -18,4 +18,20 @@ echo "TEST datapath (with auto-flowlabels)" ./in_netns.sh \ sh -c 'sysctl -q -w net.ipv6.auto_flowlabels=1 && ./ipv6_flowlabel -l 1' +echo "TEST datapath (with ping-sockets)" +./in_netns.sh \ + sh -c 'sysctl -q -w net.ipv6.flowlabel_reflect=4 && \ + sysctl -q -w net.ipv4.ping_group_range="0 2147483647" && \ + ./ipv6_flowlabel -l 1 -p' + +echo "TEST datapath (with flowinfo-send)" +./in_netns.sh \ + sh -c './ipv6_flowlabel -l 1 -s' + +echo "TEST datapath (with ping-sockets flowinfo-send)" +./in_netns.sh \ + sh -c 'sysctl -q -w net.ipv6.flowlabel_reflect=4 && \ + sysctl -q -w net.ipv4.ping_group_range="0 2147483647" && \ + ./ipv6_flowlabel -l 1 -p -s' + echo OK. All tests passed
Signature · 6 lines
2.37.1 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan