From nobody Fri Jun 26 16:59:36 2026 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 4gn22w45ZQz6jmtb for ; Fri, 26 Jun 2026 16:59:36 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn22w39bxz4Cvq for ; Fri, 26 Jun 2026 16:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493176; 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=9dImUYettxIMndv4JGNccWUPQW+KXU179i4xy50w1gc=; b=eyr+d8LbJQICuEp4/e/NwrKsvhyzhcET7x8zoYxzSCrM0Ut1dOWsUDQcmwp/0s4UM/rVjC qF5n70tfw9DX1WIOJZdPzwSSEkslJwhFQK20YZ8AIOkrhsV49BGd+3h66bfJW7rjStfiS/ xNFNz6jCjEk/RIYKSqFG0iSPojjvg5v8ft1OrRxi0ewZ1F2m6CpeUW2fJhsjuSw8mtJMDy UgnkwUfODXiFqfW2VB6bsQ5R6PwPSt0kC+MwDmRdF7OtEYbky6E/p0NaKB4tANvk8F0ZAk Wmcj2hZjhxWtn/2qF8/2GJLFmMiKeHdG3wBQjcqX/BsooT19x4aX9nAbVr+W8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493176; a=rsa-sha256; cv=none; b=AtkilEFqXnqzsB8tyCbzfmRZpIx9HPCrZNGVyff+c74zwc6VnU8XMQ7I71ybYymUkfQVPn bhpvKvodvaoMesap8wgYhuFvaeE/D6SV6kdf18TcyG4SuuNS6rV6Tl+Ks9DqXgAgeTiuIV peFpScTUAjgGD3+AxPJDgSv4qMCs0XMdHBZltQgRgRxLkAlYgE9ADXrXa2yi7//5bTdu8I pIDNSFsrrJm8tRo14gUwXtRxJSw8nkmBhn7geBcp5SISw0/U0HsqAIUk5XbsIo8TT+cTDB 39JBFVbwUfEQghhGvXVLz11ErSzA93x6jdxLzfe+idwd2BY+TLNHQ7EyVzGf8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493176; 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=9dImUYettxIMndv4JGNccWUPQW+KXU179i4xy50w1gc=; b=J2GPDnMrXg/n0dHl5LDsyHJycmGBGo/qwx7JoozsfxEvFkDFj+B2X90RbFZf0LwsuvdHZS uMMtf4MQGJf/QB7yk4Tusk9u4D0ZufWsoq7twLE4JnDlqpx0IWfH4Gd/N1WtYL7SK8pX1c y/hfo3TTQaqV0mWaQtcJZToyXFb/wEMO/DRxeQ7gEbswBiau9gFqEAtHCx4qa3ZPX2zD55 Kzs9QtdCoukw65jZZVfNPBEEuzWYw71PqbKYXkpE3wq1U/OBv35W/GbeOYxNEbV3hvmCLA GZxhgV/sKn/vtXOjkIzOGgH0E8VMEjPIJCczZY4PKvD/2NEhx4ej27nv/kpi5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn22w1vSczmNH for ; Fri, 26 Jun 2026 16:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: ae7241e7d08b - stable/14 - tests/ktest_netlink_message_writer: remove INVARIANTS requirement 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae7241e7d08b2193b0370d16b3d8b6a82423d9ef Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:36 +0000 Message-Id: <6a3eaff8.35e42.4ec59b64@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=ae7241e7d08b2193b0370d16b3d8b6a82423d9ef commit ae7241e7d08b2193b0370d16b3d8b6a82423d9ef Author: Siva Mahadevan AuthorDate: 2026-01-22 19:49:51 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:28:18 +0000 tests/ktest_netlink_message_writer: remove INVARIANTS requirement INVARIANTS is meant to be used to enable extra sanity checking for internal structures, not enable/disable tests in the freebsd kyua test suite. STABLE branches include a GENERIC kernconf without INVARIANTS, so ktest_netlink_message_writer is broken on such branches: https://ci.freebsd.org/job/FreeBSD-stable-15-amd64-test/253/testReport/sys.netlink.test_netlink_message_writer/py/__test_cases_list__/ Reviewed by: lwhsu, imp Approved by: lwhsu (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1889 MFC after: 3 days Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation (cherry picked from commit 8352e24d0bc59f9730980986600bde7d8cdce21d) --- sys/netlink/ktest_netlink_message_writer.c | 5 ----- sys/netlink/ktest_netlink_message_writer.h | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/netlink/ktest_netlink_message_writer.c b/sys/netlink/ktest_netlink_message_writer.c index e46065dd4bd2..4f894d5e070a 100644 --- a/sys/netlink/ktest_netlink_message_writer.c +++ b/sys/netlink/ktest_netlink_message_writer.c @@ -37,8 +37,6 @@ #define KTEST_CALLER #include -#ifdef INVARIANTS - struct test_mbuf_attrs { uint32_t size; uint32_t expected_avail; @@ -146,10 +144,8 @@ test_mbuf_chain_allocation(struct ktest_test_context *ctx) return (0); } -#endif static const struct ktest_test_info tests[] = { -#ifdef INVARIANTS { .name = "test_mbuf_writer_allocation", .desc = "test different mbuf sizes in the mbuf writer", @@ -162,6 +158,5 @@ static const struct ktest_test_info tests[] = { .func = &test_mbuf_chain_allocation, .parse = &test_mbuf_parser, }, -#endif }; KTEST_MODULE_DECLARE(ktest_netlink_message_writer, tests); diff --git a/sys/netlink/ktest_netlink_message_writer.h b/sys/netlink/ktest_netlink_message_writer.h index b7864bea59c9..8a4c4c481d18 100644 --- a/sys/netlink/ktest_netlink_message_writer.h +++ b/sys/netlink/ktest_netlink_message_writer.h @@ -28,7 +28,7 @@ #ifndef _NETLINK_KTEST_NETLINK_MESSAGE_WRITER_H_ #define _NETLINK_KTEST_NETLINK_MESSAGE_WRITER_H_ -#if defined(_KERNEL) && defined(INVARIANTS) +#if defined(_KERNEL) bool nlmsg_get_buf_type_wrapper(struct nl_writer *nw, int size, int type, bool waitok); void nlmsg_set_callback_wrapper(struct nl_writer *nw);