From nobody Sat Apr 08 19:45:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pv5L91GJWz44nmh; Sat, 8 Apr 2023 19:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pv5L85HcHz44g8; Sat, 8 Apr 2023 19:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fC5jyFN3D90y9tlEpPTxwwOXNv+bBdKBG57dd4lIg38=; b=iKFttDQX17ZRep6nMUFShS8usRWQ1Rxr+KZ8ZsqyWQvnxnyFsrcEZSjy1WR9RIjluwhU/F m7E5C1ss30NIdUuiB+qebU2Mgwb93jHoIjSVen2r7NPBab/kNA4mRSe1WTfTEQzUMseohS 8u9pSWZh0ImoJMzJfcelumMVp+z4NBvPqGfwaFfHDC94xcggpvnDf4O44q0hQAXt48KO7J XvRiDVTpvQsgEU+xc6/3GI9eDXk/cbOgG4Uv/JlxWfBKE2GduhHxBuQLSe6qRu3/3Pb3Pw URwUqchaJzzmIn6TVyrUhwG6SVsA7SYacy5h7ONJirOWGMYuCHEU6xQIeJabxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fC5jyFN3D90y9tlEpPTxwwOXNv+bBdKBG57dd4lIg38=; b=jFS0YuAc+uGnrOG6l0lOLppTUkf7RN8mm6hpBSQg6sxf1i/IMnW7IYU8kvp8diiV36dmm0 VTzQIK1CaBLPJ3U1bziDKlQA7PGt7ol/fxAPB869fMIDV+DZqb24dqe2skYXXvvf+io1ok 4t9caJ8lO35GDhjgnKsTIHB7nB1ev2qka5mZOIckXMBcjBklEYZisFJVav2DQw1V66gUHh Mg8ff7/scXwWoRdJ5l5hyX5gOxe/gyhpH5FGWRsNKzfn89AeUgungRW7eiuU+PKpYYLhL1 0PWEvc2BshxKlJHsYbWAnX1Bgn/E8RxY9NuCHIyxc7d2Ff3uvDWbGYnYqgG+yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680983104; a=rsa-sha256; cv=none; b=yoLxXysT6oZKEyUyTjWkL1BoDX/y5et0OR50R77r+ECaabMUpvrh6qlRKH+mxV0Cztksol u/rp5LdcG1cpflbocRoXsdwgrqNY/i7praSwaHYNBLo3afwPbC0tiYsOZEvjjSEddPXsiG TS23sjBLRqB2A3gF0oNdjqmZL3WKEpjY0YzcWnYtK3XdMY0/b7xtA0bhk3h1MBknsSRn8h j7nc3F0SJaw2VYAnm2qQKdQlxxktX+C3/UoCQJcjZ1XdQSTrLiTqyc2BWSTYEHvqIEYXqV YUTD6pTYmsjCxMPRccuo5xUNS46jYBjVQCQVi2RpmsoQN0ePm2EEnapNpczXnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pv5L84NH1zg3N; Sat, 8 Apr 2023 19:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 338Jj44V018965; Sat, 8 Apr 2023 19:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338Jj4KR018964; Sat, 8 Apr 2023 19:45:04 GMT (envelope-from git) Date: Sat, 8 Apr 2023 19:45:04 GMT Message-Id: <202304081945.338Jj4KR018964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 0276eb664724 - stable/13 - tests: add netlink large dump buffer check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0276eb66472412d6fe93614a3e9d1a2a5e1f20c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=0276eb66472412d6fe93614a3e9d1a2a5e1f20c0 commit 0276eb66472412d6fe93614a3e9d1a2a5e1f20c0 Author: Alexander V. Chernikov AuthorDate: 2023-02-20 10:20:23 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-08 19:14:49 +0000 tests: add netlink large dump buffer check Differential Revision: https://reviews.freebsd.org/D38665 MFC after: 2 weeks (cherry picked from commit 828d3c6c4cc0b782e16abb1ae18023734a0b710f) --- tests/atf_python/sys/net/netlink.py | 20 +++++----- tests/sys/netlink/Makefile | 1 + tests/sys/netlink/test_rtnl_route.py | 76 ++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 9 deletions(-) diff --git a/tests/atf_python/sys/net/netlink.py b/tests/atf_python/sys/net/netlink.py index 16cb746157cc..ec5a7feef317 100644 --- a/tests/atf_python/sys/net/netlink.py +++ b/tests/atf_python/sys/net/netlink.py @@ -1609,18 +1609,20 @@ class NetlinkTestTemplate(object): self.helper = NlHelper() self.nlsock = Nlsock(netlink_family, self.helper) - def write_message(self, msg): - print("") - print("============= >> TX MESSAGE =============") - msg.print_message() + def write_message(self, msg, silent=False): + if not silent: + print("") + print("============= >> TX MESSAGE =============") + msg.print_message() + msg.print_as_bytes(bytes(msg), "-- DATA --") self.nlsock.write_data(bytes(msg)) - msg.print_as_bytes(bytes(msg), "-- DATA --") - def read_message(self): + def read_message(self, silent=False): msg = self.nlsock.read_message() - print("") - print("============= << RX MESSAGE =============") - msg.print_message() + if not silent: + print("") + print("============= << RX MESSAGE =============") + msg.print_message() return msg def get_reply(self, tx_msg): diff --git a/tests/sys/netlink/Makefile b/tests/sys/netlink/Makefile index 656582be33b6..cbec7b2d8b5d 100644 --- a/tests/sys/netlink/Makefile +++ b/tests/sys/netlink/Makefile @@ -9,6 +9,7 @@ ATF_TESTS_C += test_snl test_snl_generic ATF_TESTS_PYTEST += test_nl_core.py ATF_TESTS_PYTEST += test_rtnl_iface.py ATF_TESTS_PYTEST += test_rtnl_ifaddr.py +ATF_TESTS_PYTEST += test_rtnl_route.py CFLAGS+= -I${.CURDIR:H:H:H} diff --git a/tests/sys/netlink/test_rtnl_route.py b/tests/sys/netlink/test_rtnl_route.py new file mode 100644 index 000000000000..71125343166a --- /dev/null +++ b/tests/sys/netlink/test_rtnl_route.py @@ -0,0 +1,76 @@ +import ipaddress +import socket + +import pytest +from atf_python.sys.net.netlink import NetlinkRtMessage +from atf_python.sys.net.netlink import NetlinkTestTemplate +from atf_python.sys.net.netlink import NlAttrIp +from atf_python.sys.net.netlink import NlConst +from atf_python.sys.net.netlink import NlmBaseFlags +from atf_python.sys.net.netlink import NlmGetFlags +from atf_python.sys.net.netlink import NlmNewFlags +from atf_python.sys.net.netlink import NlMsgType +from atf_python.sys.net.netlink import NlRtMsgType +from atf_python.sys.net.netlink import RtattrType +from atf_python.sys.net.vnet import SingleVnetTestTemplate + + +class TestRtNlRoute(NetlinkTestTemplate, SingleVnetTestTemplate): + IPV6_PREFIXES = ["2001:db8::1/64"] + + def setup_method(self, method): + super().setup_method(method) + self.setup_netlink(NlConst.NETLINK_ROUTE) + + @pytest.mark.timeout(20) + def test_buffer_override(self): + msg_flags = ( + NlmBaseFlags.NLM_F_ACK.value + | NlmBaseFlags.NLM_F_REQUEST.value + | NlmNewFlags.NLM_F_CREATE.value + ) + + num_routes = 1000 + base_address = bytearray(ipaddress.ip_address("2001:db8:ffff::").packed) + for i in range(num_routes): + base_address[7] = i % 256 + base_address[6] = i // 256 + prefix_address = ipaddress.IPv6Address(bytes(base_address)) + + msg = NetlinkRtMessage(self.helper, NlRtMsgType.RTM_NEWROUTE.value) + msg.nl_hdr.nlmsg_flags = msg_flags + msg.base_hdr.rtm_family = socket.AF_INET6 + msg.base_hdr.rtm_dst_len = 65 + msg.add_nla(NlAttrIp(RtattrType.RTA_DST, str(prefix_address))) + msg.add_nla(NlAttrIp(RtattrType.RTA_GATEWAY, "2001:db8::2")) + + self.write_message(msg, silent=True) + rx_msg = self.read_message(silent=True) + assert rx_msg.is_type(NlMsgType.NLMSG_ERROR) + assert msg.nl_hdr.nlmsg_seq == rx_msg.nl_hdr.nlmsg_seq + assert rx_msg.error_code == 0 + # Now, dump + msg = NetlinkRtMessage(self.helper, NlRtMsgType.RTM_GETROUTE.value) + msg.nl_hdr.nlmsg_flags = ( + NlmBaseFlags.NLM_F_ACK.value + | NlmBaseFlags.NLM_F_REQUEST.value + | NlmGetFlags.NLM_F_ROOT.value + | NlmGetFlags.NLM_F_MATCH.value + ) + msg.base_hdr.rtm_family = socket.AF_INET6 + self.write_message(msg) + num_received = 0 + while True: + rx_msg = self.read_message(silent=True) + if msg.nl_hdr.nlmsg_seq == rx_msg.nl_hdr.nlmsg_seq: + if rx_msg.is_type(NlMsgType.NLMSG_ERROR): + if rx_msg.error_code != 0: + raise ValueError( + "unable to dump routes: error {}".format(rx_msg.error_code) + ) + if rx_msg.is_type(NlMsgType.NLMSG_DONE): + break + if rx_msg.is_type(NlRtMsgType.RTM_NEWROUTE): + if rx_msg.base_hdr.rtm_dst_len == 65: + num_received += 1 + assert num_routes == num_received