From nobody Thu Oct 17 13:49:54 2024 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 4XTq2p6lN4z5Z2HS; Thu, 17 Oct 2024 13:49:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTq2p4nYvz4lT9; Thu, 17 Oct 2024 13:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729172994; 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=FjcUsVZNirVUVI+CMTwgkOEJIgjqInwZnWstRLzn3Ow=; b=IaZrHHbSQSd0iHlHoAR1TV+vl8+7c56KyaNwWsiD7oRAia1zTApplYHVxy6rx+iq9Gzq0s rytUL4qXw2hMiOpgaaM7FFESHrhBLwXDZx59rtdNVdsWGwyrqh4OXOPzVnoO8Ip1fB8AKI Wn4oicBit87xNLyZz89a274xYF/FJy9Qcx8wn85doxprmOxes7LKUxRvo1UahFgGsSistS JegXqzg6NjKE3T5SNjaOCl5gj1HevmfeNgF22uIP3CN7dbyY3P24lPiLYQn/gOMjmM7LiB qtlXPxfRUwCoDQEo4DIl2gdrFyz/eV82M5CX2sdqvBHBxEvmHQ1IwbBMi+SZUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729172994; 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=FjcUsVZNirVUVI+CMTwgkOEJIgjqInwZnWstRLzn3Ow=; b=pr4olgGizWNUswEGT91pU2KE8lorwyGeEf8B77DZYXGJnTM5KX9a36PHKMmtqivnTAUxFc Mgl27y2nkRODUUNm7Fk95GAJUyjxZxiCw1CacZ4bNkrOoAX+h9yh/UDPV/hSdzZhFbYiIq GKw9I4/XXPz/gd2YhUQbu/sZSwruAG1GN3OpVbG4PH3ZSv9SZgn5YucT8PyB6ppvDDqg2E Hl44oOec+Duj6q7hTuuP8tnBMj3VWWyJvJmk5kmmHeKqfbcic9iocPNiqzLMa791kODiz3 alMrrusRQzWKNfFdBxJ2h+G9kCqx5RK4gdCfAyDWjOv8MjvlT00OMMRPcu/58g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729172994; a=rsa-sha256; cv=none; b=XB78xRN3GtPKBvoXoZeXZJQnkEvU5g1ba4pklX9lrBjeOe+yXALaLyoqd5j4naLFrxgCl+ CKJN7mlhFsfCjxy0smlNbMIG1gwzJJjCiS0EfpjBaaCF+y2TKhZHEP6GH19j5pGq1Ttzaa yhMSk6p5x329eWRt/RAwg+FjcxtuKdFQmR6eBsXocOsp4f31yPhJmVwRdDAsjSARQ7Wjc+ cO0hi8LMLbKDLlZEjBSzQq+ZpqqkhFi79WOQeu0c+dm03qW/DZuVWtXRPuTELOfNvXpUEz 5hU9a7j6/WvhFkqf2gMuRO0gD6qTJsSHV0TFd+d87q7srJniMTkLE3Gx1igC/g== 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 4XTq2p3XQlzsJh; Thu, 17 Oct 2024 13:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49HDnsGS044863; Thu, 17 Oct 2024 13:49:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HDnsYB044860; Thu, 17 Oct 2024 13:49:54 GMT (envelope-from git) Date: Thu, 17 Oct 2024 13:49:54 GMT Message-Id: <202410171349.49HDnsYB044860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Igor Ostapenko Subject: git: 9e6ff43535e4 - stable/14 - netinet tests: Make some tests more reliable when run in parallel 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e6ff43535e4b345202ff9586c2e72eed14e4114 Auto-Submitted: auto-generated The branch stable/14 has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=9e6ff43535e4b345202ff9586c2e72eed14e4114 commit 9e6ff43535e4b345202ff9586c2e72eed14e4114 Author: Mark Johnston AuthorDate: 2024-09-09 15:28:24 +0000 Commit: Igor Ostapenko CommitDate: 2024-10-17 13:45:45 +0000 netinet tests: Make some tests more reliable when run in parallel Many of the modified tests add epair interfaces to the host, though most of the tests themselves run in a VNET jail. scapy in particular becomes unhappy when the list of interfaces changes as it is running, so, to improve reliability of parallel test runs, isolate tests which add epairs to the host. Also serialize arp tests, as they examine the dmesg as part of the test. The list of modified tests is not exhaustive, it was determined by running the test suite with parallelization enabled and looking at failures. It may be easier to just automatically enable VNET jailing of all netinet tests, but let's be more particular for now. Reviewed by: kp MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D46606 (cherry picked from commit b103fc49ae160fdce221c2fffa98dde9bc0ff3b0) Approved by: kp (mentor), markj (mentor) --- tests/sys/netinet/Makefile | 11 +++++++++-- tests/sys/netinet6/Makefile | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index 44f76508bf5c..8fa12378990c 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -25,8 +25,15 @@ ATF_TESTS_SH= arp \ ATF_TESTS_PYTEST+= carp.py -TEST_METADATA.divert+= required_programs="python" -TEST_METADATA.forward+= required_programs="python" +# Some of the arp tests look for log messages in the dmesg buffer, so run them +# serially to avoid problems with interleaved output. +TEST_METADATA.arp+= is_exclusive="true" +TEST_METADATA.divert+= required_programs="python" \ + execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.forward+= required_programs="python" \ + execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" TEST_METADATA.output+= required_programs="python" TEST_METADATA.redirect+= required_programs="python" TEST_METADATA.tcp6_v4mapped_bind_test+= is_exclusive="true" diff --git a/tests/sys/netinet6/Makefile b/tests/sys/netinet6/Makefile index 46f6f26115fe..6af0d13c5f03 100644 --- a/tests/sys/netinet6/Makefile +++ b/tests/sys/netinet6/Makefile @@ -17,7 +17,23 @@ ATF_TESTS_SH= exthdr \ ndp \ proxy_ndp -TEST_METADATA.output6+= required_programs="python" +TEST_METADATA.divert+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.exthdr+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.forward6+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.ndp+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.output6+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" \ + required_programs="python" +TEST_METADATA.proxy_ndp+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.redirect+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.scapyi386+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" ${PACKAGE}FILES+= exthdr.py \ mld.py \