From nobody Mon Sep 14 04:49:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1788805113; cv=none; d=zohomail.com; s=zohoarc; b=POQH1OiwTxmL/Vsxm5p7Ou+KSWxZ7CVqSCYKMctC5p3TVLFvFAWuOtPVh1Kw1dCkKCMzmXTAm1yLSLy6h37B4QHARc7EXNY7Es1maUCSAqZNq68w6Q/f2ZEO6oup0/8ssPkAMEnjkdkGlyepz0Jvml8DgSB2Ic24u/AEPRCbcoA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788805113; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=jmy9ziFeq4BVQByf2e1H88cdWzihu1pby8VPKpsEGt0=; b=CLVwX2JLxNLfN6VCIfFaiFIYZMlwiPXeHaPYAmkIvpiHXJolrRil6XXRnR73A2x6TY+ggFxFCKdwKlMpAG1qqIUThRsfEfqhX72eQiL1HusunXo+JOS+8+DdFcjwskNQ+sAavPMOCwNxKARtqKBHaS6PUN+VwLOTUKNdKl0nTCc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1788805113311853.8632468258979; Mon, 7 Sep 2026 11:18:33 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 932143FA2D; Mon, 7 Sep 2026 14:18:32 -0400 (EDT) Received: from [172.19.199.13] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id C68D241919 for ; Mon, 7 Sep 2026 14:16:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 912983F31F; Mon, 7 Sep 2026 14:16:11 -0400 (EDT) Received: from mail-ej2-x10.google.com (mail-ej2-x10.google.com [IPv6:2a00:1450:4864:34::10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id BA5393F2F7 for ; Mon, 7 Sep 2026 14:16:10 -0400 (EDT) Received: by mail-ej2-x10.google.com with SMTP id a640c23a62f3a-c254f9c60d5so31107166b.1 for ; Mon, 07 Sep 2026 11:16:10 -0700 (PDT) Received: from tulp.my.domain (2001-1c02-1a15-3000-ee82-4536-a8f2-9e22.cable.dynamic.v6.ziggo.nl. [2001:1c02:1a15:3000:ee82:4536:a8f2:9e22]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c260d5ace84sm499501266b.49.2026.09.07.11.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 11:16:08 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788804969; x=1789409769; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jmy9ziFeq4BVQByf2e1H88cdWzihu1pby8VPKpsEGt0=; b=eRq8pmNbK2FTD7HTf7D0QAovneEXZx5o+KT/8Hi0LoGQ8xirhU1cqAQugsSen/v59H jA+RkMevltwWNniEzqCArTw96mpt4JnbMtxUmL++U7YivFwPZbYwYhCqgyQVOmnoW+gW 5+j8HwCcW5+jwljcugEYQ0qORCBtnYPJgDWFJFgvqpzhtoNp2w10BAiVcTvqNsMvlbZm c28mWvQI+FmU7WoqHgCyfMzAl/mqR2ENML4ua6HXNRtbwgIzNDK+TKpapDQo/AqUqHp+ B2P/1E7eUBCRHl2C6C/h8DKss8kyPehM8WPEIX1GaulnhmdFDIOFV2W0JYbqp9GrIs0X 4+wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788804969; x=1789409769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=jmy9ziFeq4BVQByf2e1H88cdWzihu1pby8VPKpsEGt0=; b=KcyYHH9p0FrzrNLGwCmhbB1Efa86ed/ARAC2plK2HHTWY8famQc9SFVf4/8GwzeFec QhrA3dB3w6vF6DGoJKWJ7aks4n53qmO3Bnq+h1Pn3Auk1TrLMoUdJgqUaQnByRpqstQB BHzgH59bbe2uu1PALLNw+tWwGHDeYUOfk2OgMmzrdQewN3x7b6pJj3dJO6x70sJ76sS/ GzJaGO3Pa6DDE3DdJ2OidNtHAY8A28YJCoVtoqr0FjLpVnJt8I12Io9Ggonvdm5dSmil HNudY9G+Qf0LCSW43tYCvak6K5z/iIMhCE2zR5jlJWjpRn7YL9Xq2u8cR2UBkidTQREf 2L2A== X-Gm-Message-State: AFuF++k0Eio0eMGcTk0L4d2QXnnmHvlii6jZJDcpscHp8jlDigs8rqnN cy6W90QLwlnvsivvZ8KXR7F3e4oi5e91jAZKFQagBZTFpo/1p7NFhMA7q5ORy89t X-Gm-Gg: AYBFou23y5VV0E+n5WrfUjAf74FkN32gtPssrpgzu1w6QiDMEe8isEqwWIQdPyMy/zJ GIHBnNJ6/xN687IzNPC7YFwMlZ3394SbCs1XlfvvDxNYmCUzUK16mBvmeqrYtAMmIIZ6bQ4e0a1 SMXGkBeb5fwVATaijyV+sxZ3kxL1xGSQFpsXa1Ka84CZq93ySi/PSnfyH5CotQPnfFf9vjPhKlW Tb1zabSJRNCzVfolclkBDKncr6V0csrIxUZY2VNy5sDyh/1k+yZM2RMzuaQa0+WpNOac1L1Gqbm Nx7u1Yzqol+WhqZiZbGW8ovKzR9scZCHltXyZE6S4Gsh1b9u8g1HRPgKKDtCBw8a6Lfgp7iI35r 0KXvLLIEH39QwVzRTbDsAuNVYAmD+GmH91Y7Bby3MNvFivKIrNstZzgBWgwjufo18nHFLO+f4BA IChIfBYekxRLhTZuPyqO5t0xnQSPV4lwrG9eQHl+8pwxeJcOvofbZhK+q2gMZXL1IHZ/zTaMR1U DQIPqvtmAZM7LQSmGV9HyLdWYeEDjiO6Y2QfAkYG4EbgvqEcDF/pjp9AHKK5fUH0zt3s316Cts= X-Received: by 2002:a17:906:c111:b0:c24:6382:2648 with SMTP id a640c23a62f3a-c29042b6f67mr97739866b.5.1788804969102; Mon, 07 Sep 2026 11:16:09 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 1/2] virnetdevbridge: support VLAN filtering setting on FreeBSD Date: Mon, 7 Sep 2026 20:15:12 +0200 Message-ID: <20260907181513.23417-2-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260907181513.23417-1-bogorodskiy@gmail.com> References: <20260907181513.23417-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: A3QDRY76CTSHWB74XLCCBSFIZSFFA55J X-Message-ID-Hash: A3QDRY76CTSHWB74XLCCBSFIZSFFA55J X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1788805113905154100 Content-Type: text/plain; charset="utf-8" FreeBSD 15.0+ and newer support VLAN filtering for bridges. It is controlled by the IFBRF_VLANFILTER flag. Implement virNetDevBridgeGetVlanFiltering() and virNetDevBridgeSetVlanFiltering() for systems that have this flag defined. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/util/virnetdevbridge.c | 56 ++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 20c7a25585..c8da3f11ee 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -53,7 +53,8 @@ VIR_LOG_INIT("util.netdevbridge"); static int virNetDevBridgeCmd(const char *brname, u_long op, void *arg, - size_t argsize) + size_t argsize, + bool set) { struct ifdrv ifd =3D { 0 }; VIR_AUTOCLOSE s =3D -1; @@ -75,7 +76,7 @@ static int virNetDevBridgeCmd(const char *brname, ifd.ifd_len =3D argsize; ifd.ifd_data =3D arg; =20 - return ioctl(s, SIOCSDRVSPEC, &ifd); + return ioctl(s, set ? SIOCSDRVSPEC : SIOCGDRVSPEC, &ifd); } #endif =20 @@ -693,7 +694,7 @@ int virNetDevBridgeAddPort(const char *brname, return -1; } =20 - if (virNetDevBridgeCmd(brname, BRDGADD, &req, sizeof(req)) < 0) { + if (virNetDevBridgeCmd(brname, BRDGADD, &req, sizeof(req), true) < 0) { virReportSystemError(errno, _("Unable to add bridge %1$s port %2$s"), brn= ame, ifname); return -1; @@ -759,7 +760,7 @@ int virNetDevBridgeRemovePort(const char *brname, return -1; } =20 - if (virNetDevBridgeCmd(brname, BRDGDEL, &req, sizeof(req)) < 0) { + if (virNetDevBridgeCmd(brname, BRDGDEL, &req, sizeof(req), true) < 0) { virReportSystemError(errno, _("Unable to remove bridge %1$s port %2$s"), = brname, ifname); return -1; @@ -883,7 +884,7 @@ int virNetDevBridgeSetSTPDelay(const char *brname, delay_seconds =3D delay_seconds < 4 ? 4 : delay_seconds; param.ifbrp_fwddelay =3D delay_seconds & 0xff; =20 - if (virNetDevBridgeCmd(brname, BRDGSFD, ¶m, sizeof(param)) < 0) { + if (virNetDevBridgeCmd(brname, BRDGSFD, ¶m, sizeof(param), true) <= 0) { virReportSystemError(errno, _("Unable to set STP delay on %1$s"), brname); return -1; @@ -996,6 +997,51 @@ virNetDevBridgeSetVlanFiltering(const char *brname, } =20 =20 +#elif defined(WITH_BSD_BRIDGE_MGMT) && defined(IFBRF_VLANFILTER) +int +virNetDevBridgeGetVlanFiltering(const char *brname, + bool *enable) +{ + struct ifbrparam req; + + if (virNetDevBridgeCmd(brname, BRDGGFLAGS, &req, sizeof(req), false) <= 0) { + virReportSystemError(errno, + _("Unable to get bridge %1$s flags"), brname); + return -1; + } + + *enable =3D !!(req.ifbrp_flags & IFBRF_VLANFILTER); + return 0; +} + + +int +virNetDevBridgeSetVlanFiltering(const char *brname, + bool enable) +{ + struct ifbrparam req; + + if (virNetDevBridgeCmd(brname, BRDGGFLAGS, &req, sizeof(req), false) <= 0) { + virReportSystemError(errno, + _("Unable to get bridge %1$s flag"), brname); + return -1; + } + + if (enable) + req.ifbrp_flags |=3D IFBRF_VLANFILTER; + else + req.ifbrp_flags &=3D ~IFBRF_VLANFILTER; + + if (virNetDevBridgeCmd(brname, BRDGSFLAGS, &req, sizeof(req), true) < = 0) { + virReportSystemError(errno, + _("Unable to set bridge %1$s flag"), brname); + return -1; + } + + return 0; +} + + #else int virNetDevBridgeGetVlanFiltering(const char *brname G_GNUC_UNUSED, --=20 2.55.0 From nobody Mon Sep 14 04:49:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1788805176; cv=none; d=zohomail.com; s=zohoarc; b=YvtGJi9IAl8ZTx8E38LGGgqob0P3R4vyYzf5SQD3862TRWxkfZqe2+FDWtZaI9FOUuZKK+N/ihMIR6gp7TV+oxxbkYtlDSefQN23cTBYjDEgE76Zaay5yNWXZ75m/2aAePPglOatW4+yrp6X1OrNYQyyTggAbXoyXLfN0PtNDf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788805176; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=Tgq26BaHBvjoiL2XYC09oHdCf8kznuyXXJ8LzF31IC8=; b=fr6nLHa08BiXz7lZvp28HG29iWQm8AMjYnxWmZjpzx/HPDN1MTn17s8tHczlfHz7pp4PuCTw+dyPI6gSw8AYH01Tu95OkmkW28T+Y0hHL+eGA5lE4bjn8blsyvAOhIJRlWNmwHOxP/OKNdR8rI4eTHhZxxwoxDWjar8d9CQ9dgk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1788805176495473.0649132568086; Mon, 7 Sep 2026 11:19:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 345F03F8AA; Mon, 7 Sep 2026 14:19:35 -0400 (EDT) Received: from [172.19.199.13] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 78BAD419A4 for ; Mon, 7 Sep 2026 14:16:32 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BA16B3F2F6; Mon, 7 Sep 2026 14:16:11 -0400 (EDT) Received: from mail-ej2-x10.google.com (mail-ej2-x10.google.com [IPv6:2a00:1450:4864:34::10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 02FFB3F31C for ; Mon, 7 Sep 2026 14:16:11 -0400 (EDT) Received: by mail-ej2-x10.google.com with SMTP id a640c23a62f3a-c254f8694a7so33502466b.1 for ; Mon, 07 Sep 2026 11:16:10 -0700 (PDT) Received: from tulp.my.domain (2001-1c02-1a15-3000-ee82-4536-a8f2-9e22.cable.dynamic.v6.ziggo.nl. [2001:1c02:1a15:3000:ee82:4536:a8f2:9e22]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c260d5ace84sm499501266b.49.2026.09.07.11.16.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 11:16:09 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788804970; x=1789409770; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Tgq26BaHBvjoiL2XYC09oHdCf8kznuyXXJ8LzF31IC8=; b=AACzVEqKBAMvaQRS8Q3fJQtJQNRk8Rzf/szOfb5Jc/5FA6oiAwNXcCpXsZTnUK2W1U tXus+5/+WzAelgQgFFM0YsP8oBMhqtmSQ0IjNSZRxKprZpfuPpdnJxItRRPGcOHv5p9+ l9QZGEiXiLEf+l4199l0Qv7o8A0C1SKq5xXt7JRRTXYv5ZZth3quols2UO9yfzBpbBsW JoJ+879jZIjM7YBCULTMAx8zqD3/cSmjzuz9mqosRy/4Zm14xFhkNWj8LeAxiSMCupo2 ib+MHuz8MrXlyG/jiPY0GdzQ1kh5qV8C0eWXY3xsApkrJYRnNh0ira7pN71mIF6ehyjG NL9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788804970; x=1789409770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Tgq26BaHBvjoiL2XYC09oHdCf8kznuyXXJ8LzF31IC8=; b=ssq+sJTYjq3xcGPESX4lOazElfFjo/4YxsnQrSTCBZXoSwfsC7/tQuUmV0FPsxipbq Vqmfpq5JwOgQWfVB3ABbsi0ZRHCk3RM7pPeH9CDsPn4ZC3XoUGR1aYkVQko4bRRJcHMp NnfHNVaq4bcOFq1FoQ1GN+ajnsH2n298uvarKyuf7cT7F1OR1XuWDbKl9/A3T9QOy1lg aquTLGDpkDOm1fgrFGORjynw0EWW9LHOpjv9YTNmGLXRTaiadKkFy7PelIqciPlKPuq6 +eBVyNzXtVWjp+A1zGlG40GuBqbWEBfn1o8JwGke1pIvSQmHG5EC06k50IJOVSgCGmtB 5huA== X-Gm-Message-State: AFuF++nVdHVsiHuWeFsP8nq8zrphSTTFAmb4qEgPQ9BWiuVWH0iWOA9F TjyGZi5jtFd52N57bCwW15eM/q1gGa17ovIIYPv64afLy6sgQoujGMcqAz3rX12U X-Gm-Gg: AYBFou2x7IeQbXuy9yPCtcx5tR7OUn8uYV3NGhrLbhxiP6IztuX2GXFeD6RlLffz2IO ibYEA/lQaYkufIsbrX2Zgw3+gN+ueO6K4XfVyd6a+bBaqj+2VV2hjc+vpbtLKJlTn4eEB0yD64x 4pm8J1iRpJfEM2CpK+lpOwG+C4/+BbcoRPgTsyDeWHWiYiqbTdLvSnFSaYOiMYvS/1e2FHhHmP4 pxzCOv8G+3Eomd7NsgGF5ByGNRG4JWORe5Gm18ePF7RSMDpNoTvMM5FmPW8uBrLuuF8JAN9mnw3 taC26t33HQo61GbtlpAj/JV3tVY/GIP3Muht6j+iI0o/TzNqgcGAMdCh9P4p9/iXI5w8F6k2UTJ FIuoFAve4shUUfeuvQXtxIQy7UhXk7lz8fGGhSgyRvBOlZUCKDEW7kpL0373h9xrni7yaLkOCbO xl9iUSJfmZlCdRid/TpXL8dLznHKjU9klzbapmIdFT/10o8iBWT6U4L9mlD2dgSChgwZUzeg5vD BHv31ZOF3L7pdukrpm09pU2CUpAj1RlmsceWlrj42a+hSHx6aHHwU+wpYMDwSPvmxvX+rH4tcU= X-Received: by 2002:a17:907:3cc3:b0:c25:f7db:4bed with SMTP id a640c23a62f3a-c2904471b68mr104433366b.19.1788804969539; Mon, 07 Sep 2026 11:16:09 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 2/2] virnetdevbridge: support VLAN configuration on FreeBSD Date: Mon, 7 Sep 2026 20:15:13 +0200 Message-ID: <20260907181513.23417-3-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260907181513.23417-1-bogorodskiy@gmail.com> References: <20260907181513.23417-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EPI5TSNI24IFCU6KP2EUWB7MMM7HFC76 X-Message-ID-Hash: EPI5TSNI24IFCU6KP2EUWB7MMM7HFC76 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1788805178820154100 Content-Type: text/plain; charset="utf-8" Implement VLAN configuration for FreeBSD bridges. The following configurations are supported: In this mode untagged traffic from the guest will be tagged with VLAN 42, and VLAN 42 traffic will reach the guest untagged. Trunk configuration: In this mode bridge passes the VLAN 42 and 43 tagged traffic from and to the guest. Trunk configuration with nativeMode=3D'untagged'. In this mode the untagged traffic from the guest will be tagged with VLAN 42. And the bridge will allow traffic tagged with VLAN 43. This implementation does not allow nativeMode=3D'tagged' as it is not supported by the FreeBSD bridges. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/util/virnetdevbridge.c | 54 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index c8da3f11ee..4b804e4faa 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -681,10 +681,48 @@ int virNetDevBridgeAddPort(const char *brname, const virNetDevVlan *virtVlan) { struct ifbreq req =3D { 0 }; +# if defined(BRDG_VLAN_OP_SET) + struct ifbif_vlan_req vlreq =3D { 0 }; +# endif + + if (virtVlan && + virtVlan->nativeMode =3D=3D VIR_NATIVE_VLAN_MODE_TAGGED) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("native tagged VLAN mode is not supported on this= platform")); + return -1; + } =20 if (virtVlan) { +# if defined(BRDG_VLAN_OP_SET) + size_t i; + + for (i =3D 0; i < virtVlan->nTags; i++) { + if (virtVlan->tag[i] < DOT1Q_VID_MIN || + virtVlan->tag[i] > DOT1Q_VID_MAX) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("VLAN tag %1$u is not supported on this p= latform"), + virtVlan->tag[i]); + return -1; + } + } + + if (virtVlan->trunk) { + for (i =3D 0; i < virtVlan->nTags; i++) { + vlreq.bv_op =3D BRDG_VLAN_OP_SET; + strlcpy(vlreq.bv_ifname, ifname, sizeof(vlreq.bv_ifname)); + + if (virtVlan->tag[i] !=3D virtVlan->nativeTag) + BRVLAN_SET(&vlreq.bv_set, virtVlan->tag[i]); + else + req.ifbr_pvid =3D virtVlan->tag[i]; + } + } else { + req.ifbr_pvid =3D virtVlan->tag[0]; + } +# else virReportSystemError(ENOSYS, "%s", _("Not supported on this platfo= rm")); return -1; +# endif /* defined(BRDG_VLAN_OP_SET) */ } =20 if (virStrcpyStatic(req.ifbr_ifsname, ifname) < 0) { @@ -700,6 +738,22 @@ int virNetDevBridgeAddPort(const char *brname, return -1; } =20 +# if defined(BRDG_VLAN_OP_SET) + if (req.ifbr_pvid !=3D 0 && + virNetDevBridgeCmd(brname, BRDGSIFPVID, &req, sizeof(req), true) <= 0) { + virReportSystemError(errno, + _("Unable to set VLAN for bridge %1$s port %2= $s"), brname, ifname); + return -1; + } + + if (vlreq.bv_op !=3D 0 && + virNetDevBridgeCmd(brname, BRDGSIFVLANSET, &vlreq, sizeof(vlreq), = true) < 0) { + virReportSystemError(errno, + _("Unable to set VLAN for bridge %1$s port %2= $s"), brname, ifname); + return -1; + } +# endif /* defined(BRDG_VLAN_OP_SET) */ + return 0; } #else --=20 2.55.0