From patchwork Wed May 8 21:38:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leigh Brown X-Patchwork-Id: 13659182 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ABD22C04FFE for ; Wed, 8 May 2024 21:39:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.718965.1121541 (Exim 4.92) (envelope-from ) id 1s4ozz-0003oT-5g; Wed, 08 May 2024 21:38:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 718965.1121541; Wed, 08 May 2024 21:38:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4ozz-0003oM-2x; Wed, 08 May 2024 21:38:51 +0000 Received: by outflank-mailman (input) for mailman id 718965; Wed, 08 May 2024 21:38:50 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4ozx-0003oG-QA for xen-devel@lists.xenproject.org; Wed, 08 May 2024 21:38:50 +0000 Received: from doppler.solinno.uk (doppler.solinno.uk [81.2.106.178]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 59e204b1-0d83-11ef-b4bb-af5377834399; Wed, 08 May 2024 23:38:47 +0200 (CEST) Received: from folly.solinno.co.uk (folly.dyn.solinno.co.uk [192.168.2.135]) by doppler.solinno.uk (Postfix) with ESMTPSA id B8C968007B; Wed, 8 May 2024 22:38:46 +0100 (BST) Received: by folly.solinno.co.uk (Postfix, from userid 1000) id 8E19520166; Wed, 8 May 2024 22:38:46 +0100 (BST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 59e204b1-0d83-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=solinno.co.uk; s=mail; t=1715204326; bh=dzK53Up7iGU4Nhei0LzAbBYnoantiYERlMzBBwEAOiI=; h=From:To:Cc:Subject:Date:From; b=lLiS2XU8pLls9rdCTM73I+hGi7o7kCWmOZzWEa/w18nEb0L43gmFLTWhBn9McNu6K XTmYx7dcfeTUP5CfztVHDd/7lhN+txeiFnr42AAwYbjvet3CYFs0Z6ev3H7SP4rlVr R6Dam92xOJYPFKbZsROMCtLJ2WOV47CDCxoLeVi4= From: Leigh Brown To: xen-devel@lists.xenproject.org Cc: andrew.cooper3@citrix.com, anthony.perard@citrix.com, Leigh Brown Subject: [RFC PATCH v2 0/5] Add bridge VLAN support Date: Wed, 8 May 2024 22:38:19 +0100 Message-Id: <20240508213824.55824-1-leigh@solinno.co.uk> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Hello all, I realised over the weekend that there is a valid use case for providing a VIF to a domain that has access to multiple VLANs, e.g. a router. Yes, you can create a VIF per VLAN, but if you start having several VLANs (as I do), it would be nicer to create a single interface that has access to all the relevant VLANs (e.g. enX0.10, enX0.20, etc.). So, version 2 changes the name and type of the parameter from an integer called `vid' to a string called `vlan'. The vlan parameter is then parsed by the vif-bridge script (actually, the functions called by it in xen-network-common.sh). As it quite a common practice to allocate VLANs in round numbers, I also implemented the ability to specify contiguous or non-contiguous ranges. You can specify whether a VLAN is tagged or untagged, and which VLAN is the PVID (only one PVID is allowed). For example, vif = [ 'mac=xx:xx:xx:xx:xx:xx, bridge=br0, vlan=10p/20-29' ] will setup the VIF so that 10 is the PVID and VLAN IDs 20 through 29 are permitted with tags. Another example: vif = [ 'mac=xx:xx:xx:xx:xx:xx, bridge=br0, vlan=1p/10+10x9' ] will setup the bridge to set 1 as the PVID and permit access with tags for VLAN IDs 10, 20, 30, 40, 50, 60, 70, 80 and 90. This patch set enables this capability as follows: 1. Adds `vlan' as a new member of the libxl_device_nic structure; 2. Adds support to read and write the vlan parameter from the xenstore; 3. Adds `vlan' as a new keyword for the vif configuration option; 4. Adds support to assign the bridge VLANs in the Linux hotplug scripts; 5. Updated xl-network-configuration(5) manpage and example configs. Original blurb below: For many years I have been configuring VLANs on my Linux Dom0 by creating VLAN interfaces for each VLAN I wanted to connect a domain to and then a corresponding bridge. So I would tend to have things like: enp0s0 -> br0 -> vif1, vif2 enp0s0.10 -> br0vl10 -> vif3, vif4 enp0s0.20 -> br0vl20 -> vif5 dummy0 -> br1 -> vif6 I recently discovered that iproute2 supports creating bridge VLANs that allows you to assign a VLAN to each of the interfaces associated to a bridge. This allows a greatly simplified configuration where a single bridge can support all the domains, and the iproute2 bridge command can assign each VIF to the required VLAN. This looks like this: # bridge vlan port vlan-id enp0s0 1 PVID Egress Untagged 10 20 br0 1 PVID Egress Untagged vif1.0 1 PVID Egress Untagged vif2.0 1 PVID Egress Untagged vif3.0 10 PVID Egress Untagged vif4.0 10 PVID Egress Untagged vif5.0 20 PVID Egress Untagged vif6.0 30 PVID Egress Untagged This patch set enables this capability as follows: 1. Adds `vid' as a new member of the libxl_device_nic structure; 2. Adds support to read and write vid from the xenstore; 3. Adds `vid' as a new keyword for the vif configuration option; 4. Adds support for assign the bridge VLAN in the Linux hotplug scripts. I don't believe NetBSD or FreeBSD support this capability, but if they do please point me in the direction of some documentation and/or examples. NB: I'm not very familiar with Xen code base so may have missed something important, although I have tested it and it is working well for me. Cheers, Leigh. Leigh Brown (5): tools/libs/light: Add vlan field to libxl_device_nic tools/xl: add vlan keyword to vif option tools/hotplug/Linux: Add bridge VLAN support docs/man: document VIF vlan keyword tools/examples: Example Linux bridge VLAN config docs/man/xl-network-configuration.5.pod.in | 38 ++++++ tools/examples/linux-bridge-vlan/README | 68 +++++++++++ tools/examples/linux-bridge-vlan/br0.netdev | 7 ++ tools/examples/linux-bridge-vlan/br0.network | 8 ++ .../examples/linux-bridge-vlan/enp0s0.network | 16 +++ tools/hotplug/Linux/xen-network-common.sh | 111 ++++++++++++++++++ tools/libs/light/libxl_nic.c | 10 ++ tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 2 + 9 files changed, 261 insertions(+) create mode 100644 tools/examples/linux-bridge-vlan/README create mode 100644 tools/examples/linux-bridge-vlan/br0.netdev create mode 100644 tools/examples/linux-bridge-vlan/br0.network create mode 100644 tools/examples/linux-bridge-vlan/enp0s0.network