From nobody Mon May 15 10:53:38 2023 X-Original-To: dev-commits-src-all@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 4QKbnt6w5Dz4BTBB; Mon, 15 May 2023 10:53:38 +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 4QKbnt5vyYz41w4; Mon, 15 May 2023 10:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684148018; 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=CzRqwHsAqhSzIrygwdhYHS9qbVjiw4etcvR+9kcoeos=; b=h+UEv4qVdVCzXxLDUXGd4oQufQmOCYMyS48BcRItaJTEH9HP6RfzgVaQZV5dlNviGKiiGy baCmMJxOZ4ey07256A4rS6TsJZNCE3bzn48DO4hoUitGLY1kaR9k6pYj3VoS3/a/wH1WpC byN+Ufd5RkHf39G8r/tq/+x2KBJPIVsgCzzjLIaY1197cEEkyM1TLUDyu+KsCz7nC8KEkq UcaSffTcS6myvfqeTCBDaC+6iE1VLvu2ObvmUv5ntFvGCMTgu/VLmTrfixIjVgSX3NzFxi Z9feWufteFj4zTYZZu5dp0rT6X7/zZN4jFBLzpd3hW8MWXSoH1P2smcRaN4BeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684148018; 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=CzRqwHsAqhSzIrygwdhYHS9qbVjiw4etcvR+9kcoeos=; b=jfyvVzmpPCaNvwcs6DAb5MP7dO9uEm/LB9rRFn6QXTPWPVDRqJw/GhYHzrhnIQQeoaf7fn 8kwr0Y+r++MWtWylmaVL0tn5qv7JEmSU54IKy5nO5st5xDEisc58sIPk1ZnkVHkfUmklyJ ExVV5Jk5TDit92Bxxl1/vznOoEjI2GQ4phfoBOUkF7YMbS4K2x3N6kiiCDfZD8MXGQpveJ DPn67YdGEztFjYkL2Gc83Ggpi4OQPdj9EdO8WjwnIEKj9rxCzn8Q1NxPYrXJGK3BzKxCY6 yXgnCYiRhkyNuaLrVpXl5Fa+Kgtfkm/HMlUuKaK/UfFBBokTqKFwnJOmA/Rgtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684148018; a=rsa-sha256; cv=none; b=XBGW32cCb9woOmLZ6z4n4XkVsqZ4+yVXyZqfPOihvfCjx1zQFtpFiyiVifQxvPJvtyfkXb OXUsY1VGus5E2j5POF//BnZ/a0AbOk61vq1UkSs0U8lrgVnd/65h42a1Nach3DvGICS9PL PVVCAA7IFGxOwnb8dYpopwdI/1t7lc0bymOqbEpgNKtr9mIvjiZHs2sS8P/m7Vl5RNP7rX TVkFByPi5KITq6uqtU8Kq6/y2cH3auqmI/+rCac0vM12xD935ZXQCQhr0HMvc76pLhuzQO RaiPtjTyS28HIQaHnI2OD59mn+w+1Qky+yhrC9Kk7EhTqTDNdc/Em72j4feBHQ== 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 4QKbnt4xhhzcdj; Mon, 15 May 2023 10:53:38 +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 34FArcTV095618; Mon, 15 May 2023 10:53:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FArcu0095617; Mon, 15 May 2023 10:53:38 GMT (envelope-from git) Date: Mon, 15 May 2023 10:53:38 GMT Message-Id: <202305151053.34FArcu0095617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: f0ffe1ce0fba - main - testing: add support for handling Netlink carp messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: f0ffe1ce0fba262b458399dcd4c5e8c84e024606 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ffe1ce0fba262b458399dcd4c5e8c84e024606 commit f0ffe1ce0fba262b458399dcd4c5e8c84e024606 Author: Alexander V. Chernikov AuthorDate: 2023-05-15 10:48:45 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-15 10:48:45 +0000 testing: add support for handling Netlink carp messages MFC after: 2 weeks --- tests/atf_python/sys/netlink/attrs.py | 46 +++++++++++++++++++++ tests/atf_python/sys/netlink/netlink_generic.py | 55 ++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 2 deletions(-) diff --git a/tests/atf_python/sys/netlink/attrs.py b/tests/atf_python/sys/netlink/attrs.py index 9769ef0fc76f..36dd8191df1c 100644 --- a/tests/atf_python/sys/netlink/attrs.py +++ b/tests/atf_python/sys/netlink/attrs.py @@ -81,6 +81,13 @@ class NlAttrNested(NlAttr): super().__init__(nla_type, b"") self.nla_list = val + def get_nla(self, nla_type): + nla_type_raw = enum_or_int(nla_type) + for nla in self.nla_list: + if nla.nla_type == nla_type_raw: + return nla + return None + @property def nla_len(self): return align4(len(b"".join([bytes(nla) for nla in self.nla_list]))) + 4 @@ -130,6 +137,33 @@ class NlAttrU32(NlAttr): return self._to_bytes(struct.pack("@I", self.u32)) +class NlAttrS32(NlAttr): + def __init__(self, nla_type, val): + self.s32 = enum_or_int(val) + super().__init__(nla_type, b"") + + @property + def nla_len(self): + return 8 + + def _print_attr_value(self): + return " val={}".format(self.s32) + + @staticmethod + def _validate(data): + assert len(data) == 8 + nla_len, nla_type = struct.unpack("@HH", data[:4]) + assert nla_len == 8 + + @classmethod + def _parse(cls, data): + nla_len, nla_type, val = struct.unpack("@HHi", data) + return cls(nla_type, val) + + def __bytes__(self): + return self._to_bytes(struct.pack("@i", self.s32)) + + class NlAttrU16(NlAttr): def __init__(self, nla_type, val): self.u16 = enum_or_int(val) @@ -229,6 +263,18 @@ class NlAttrIp(NlAttr): return " addr={}".format(self.addr) +class NlAttrIp4(NlAttrIp): + def __init__(self, nla_type, addr: str): + super().__init__(nla_type, addr) + assert self.family == socket.AF_INET + + +class NlAttrIp6(NlAttrIp): + def __init__(self, nla_type, addr: str): + super().__init__(nla_type, addr) + assert self.family == socket.AF_INET6 + + class NlAttrStr(NlAttr): def __init__(self, nla_type, text): super().__init__(nla_type, b"") diff --git a/tests/atf_python/sys/netlink/netlink_generic.py b/tests/atf_python/sys/netlink/netlink_generic.py index 06dc8704fe07..b49a30c1e8e7 100644 --- a/tests/atf_python/sys/netlink/netlink_generic.py +++ b/tests/atf_python/sys/netlink/netlink_generic.py @@ -1,12 +1,15 @@ #!/usr/local/bin/python3 +import struct from ctypes import c_int64 from ctypes import c_long from ctypes import sizeof from ctypes import Structure from enum import Enum -import struct from atf_python.sys.netlink.attrs import NlAttr +from atf_python.sys.netlink.attrs import NlAttrIp4 +from atf_python.sys.netlink.attrs import NlAttrIp6 +from atf_python.sys.netlink.attrs import NlAttrS32 from atf_python.sys.netlink.attrs import NlAttrStr from atf_python.sys.netlink.attrs import NlAttrU16 from atf_python.sys.netlink.attrs import NlAttrU32 @@ -16,8 +19,8 @@ from atf_python.sys.netlink.message import NlMsgCategory from atf_python.sys.netlink.message import NlMsgProps from atf_python.sys.netlink.message import StdNetlinkMessage from atf_python.sys.netlink.utils import AttrDescr -from atf_python.sys.netlink.utils import prepare_attrs_map from atf_python.sys.netlink.utils import enum_or_int +from atf_python.sys.netlink.utils import prepare_attrs_map class NetlinkGenlMessage(StdNetlinkMessage): @@ -63,6 +66,7 @@ class NetlinkGenlMessage(StdNetlinkMessage): GenlCtrlFamilyName = "nlctrl" + class GenlCtrlMsgType(Enum): CTRL_CMD_UNSPEC = 0 CTRL_CMD_NEWFAMILY = 1 @@ -111,6 +115,52 @@ class NetlinkGenlCtrlMessage(NetlinkGenlMessage): family_name = GenlCtrlFamilyName +CarpFamilyName = "carp" + + +class CarpMsgType(Enum): + CARP_NL_CMD_UNSPEC = 0 + CARP_NL_CMD_GET = 1 + CARP_NL_CMD_SET = 2 + + +class CarpAttrType(Enum): + CARP_NL_UNSPEC = 0 + CARP_NL_VHID = 1 + CARP_NL_STATE = 2 + CARP_NL_ADVBASE = 3 + CARP_NL_ADVSKEW = 4 + CARP_NL_KEY = 5 + CARP_NL_IFINDEX = 6 + CARP_NL_ADDR = 7 + CARP_NL_ADDR6 = 8 + CARP_NL_IFNAME = 9 + + +carp_gen_attrs = prepare_attrs_map( + [ + AttrDescr(CarpAttrType.CARP_NL_VHID, NlAttrU32), + AttrDescr(CarpAttrType.CARP_NL_STATE, NlAttrU32), + AttrDescr(CarpAttrType.CARP_NL_ADVBASE, NlAttrS32), + AttrDescr(CarpAttrType.CARP_NL_ADVSKEW, NlAttrS32), + AttrDescr(CarpAttrType.CARP_NL_KEY, NlAttr), + AttrDescr(CarpAttrType.CARP_NL_IFINDEX, NlAttrU32), + AttrDescr(CarpAttrType.CARP_NL_ADDR, NlAttrIp4), + AttrDescr(CarpAttrType.CARP_NL_ADDR6, NlAttrIp6), + AttrDescr(CarpAttrType.CARP_NL_IFNAME, NlAttrStr), + ] +) + + +class CarpGenMessage(NetlinkGenlMessage): + messages = [ + NlMsgProps(CarpMsgType.CARP_NL_CMD_GET, NlMsgCategory.GET), + NlMsgProps(CarpMsgType.CARP_NL_CMD_SET, NlMsgCategory.NEW), + ] + nl_attrs_map = carp_gen_attrs + family_name = CarpFamilyName + + KtestFamilyName = "ktest" @@ -223,6 +273,7 @@ class KtestMsgMessage(NetlinkGenlMessage): handler_classes = { + CarpFamilyName: [CarpGenMessage], GenlCtrlFamilyName: [NetlinkGenlCtrlMessage], KtestFamilyName: [KtestInfoMessage, KtestMsgMessage], }