From nobody Tue Feb 15 07:53:54 2022 X-Original-To: dev-commits-src-main@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 9B97E19B74E9; Tue, 15 Feb 2022 07:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JyYJ23z0Pz3hfQ; Tue, 15 Feb 2022 07:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644911634; 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=DBtTrR7Nm50OoQoe7QaVj+cLzaz3/8DT3XnVkykDydo=; b=O0jgT/cdwGQWPGrwvv+/Ck3SqBLoy0S5wf2Uy3KIlO10DUe7ZrnIoKrj3qzCVqQaXl3bMf sWWVjKqQBVjjMj4NjCLAuAjs5w4IemIAcbpM7o/Xu5qm4aYF0XavNJuGMkDm4+NNSgY4dQ xX+RH7lO/YN/gP9RUaoLMjyA5QIIX29U9JK4ohn4p3aHFS+OjTtpcxnwDjrPQiQn3D9KNn 8ih+sz1WtyilzAQ4uzi/Cys1/q4UTm9MZHtVshoO07tU7Gf/qHFgV29TikuFbEe2sEopRk 93Osy18hKkGcC4zhzNesutmzBjxYXLMEd6P1BRRlDE0G/+Q3+pcxjaXjyXlSBQ== 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 682681E8F3; Tue, 15 Feb 2022 07:53:54 +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 21F7rsGp015640; Tue, 15 Feb 2022 07:53:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21F7rsGK015639; Tue, 15 Feb 2022 07:53:54 GMT (envelope-from git) Date: Tue, 15 Feb 2022 07:53:54 GMT Message-Id: <202202150753.21F7rsGK015639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 31566b98b859 - main - vlan tests: fix bpf_pcp test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31566b98b8593f2fc51e4e86d764fae4accdff1a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644911634; 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=DBtTrR7Nm50OoQoe7QaVj+cLzaz3/8DT3XnVkykDydo=; b=vWTJkFXj8XdDZKgy2LxYFHmyl2YL/3z8J2aJPb21ERBTlPe9doSKSGFRWCp2YIn0lRABr9 x/AXC98R4y8teMqJce+tB9xpW/ORUtNpMiLCfhn0t1GLTsXwg8nGv30r6p7/4j/8LV/ntk /utCZPnk07SY+WHL+T20I1n9b/Tde8hRoih0oqjCTMS3HaZaFjP0QGUSeIpIob+LrCaLtH N7eJb7mYmWpzmFXMIqAz08tQ89qvmRq4Wk727ety1C32Hm2WvRlF9FisTW+sDQIP3Q2xJ8 2RZWoE5rKLTn8DLkoPrKqpj1xfqY+ZZa/0uLkzAiLWRfG3PhkH042pQYPs/Xwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644911634; a=rsa-sha256; cv=none; b=RfmmVQKvxIaDYNyG2znsLmN1+moqQHH6r8JmYvr7tBgkwOxZBgt6CIN3Oa5Fk+Y8bdbwyO 9UQs5Ft9U2q3q9FHWdXUb6H0Mbp9DSLN9mYG+CNSDfBVcYO1bODTy4ldtHlTKqeGxEzNpS yFWAjm5a22OJw/hi7juB97qkHY8RAIg1fqOm49FWvxlVMQ5elLkZCSj1LJz5IvkycHUL0p uvi2mLiQp6vi65Ivja8oX9DVzP00DojdbcwzWyCgfs1Y0HTTs4bM0tI7J0S15XkQIp2Tk9 h0KhbWRspy74fvzRVQl+pz231q6nJlnnP5vd2xAaS8JwaKyer1V10tQt6/MMkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=31566b98b8593f2fc51e4e86d764fae4accdff1a commit 31566b98b8593f2fc51e4e86d764fae4accdff1a Author: Kristof Provost AuthorDate: 2022-02-15 06:52:45 +0000 Commit: Kristof Provost CommitDate: 2022-02-15 06:53:30 +0000 vlan tests: fix bpf_pcp test We now allow net.link.vlan.mtag_pcp to be set per-vnet, so we must set it in the correct vnet, not on the host. --- tests/sys/net/if_vlan.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/sys/net/if_vlan.sh b/tests/sys/net/if_vlan.sh index 517206cb55c7..be1ec788c11d 100755 --- a/tests/sys/net/if_vlan.sh +++ b/tests/sys/net/if_vlan.sh @@ -214,7 +214,6 @@ atf_test_case "bpf_pcp" "cleanup" bpf_pcp_head() { atf_set descr 'Set VLAN PCP through BPF' - atf_set require.config 'allow_sysctl_side_effects' atf_set require.user root atf_set require.progs scapy } @@ -233,7 +232,7 @@ bpf_pcp_body() jexec alcatraz ifconfig ${vlan} up jexec alcatraz ifconfig ${epair}b up - sysctl net.link.vlan.mtag_pcp=1 + jexec alcatraz sysctl net.link.vlan.mtag_pcp=1 jexec alcatraz dhclient ${vlan} & atf_check -s exit:1 -o ignore -e ignore $(atf_get_srcdir)/pcp.py \