From nobody Mon Nov 25 06:46:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=solinno.co.uk ARC-Seal: i=1; a=rsa-sha256; t=1715204369; cv=none; d=zohomail.com; s=zohoarc; b=LwcztmjC/+1Hn9exd65nSaxeixHOjF9V/SZSPb4CpzmxHc1q95+0azUew+erzK8wobGkHD87kgaoSXEZhO7GoJaGkwVYk5ZUJPDxPE3kOQKRtPEOefTao0NeR6sWl9lwgrDpUhtBQ/xinJWM2pOYPm77aqDHASYp4stO1BoF80I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715204369; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lV+Dk4kHNBS4PcArMTil7LT+dXomGxzw2pxtHH5Sg+A=; b=a4gVkSOWO3glCLbgAQDvBkrnnjpAVUFOxJPFThFSzZsvIVaT8+QlpJYJMUCHb8JNe+9OlnRSDh46+7RvWOVnnwVgMA2RGj2MuwYWBodkKwuSD7m/Oxo0nJiLOAhY7W8ioP7q4Q9IBBLbSlihlbEeVRixu+2YLmJqagCx92wDnIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1715204369794196.1745807915205; Wed, 8 May 2024 14:39:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.718966.1121552 (Exim 4.92) (envelope-from ) id 1s4p0A-00044o-Dn; Wed, 08 May 2024 21:39:02 +0000 Received: by outflank-mailman (output) from mailman id 718966.1121552; Wed, 08 May 2024 21:39:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4p0A-00044h-9M; Wed, 08 May 2024 21:39:02 +0000 Received: by outflank-mailman (input) for mailman id 718966; Wed, 08 May 2024 21:39:01 +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 1s4p09-0003oG-5k for xen-devel@lists.xenproject.org; Wed, 08 May 2024 21:39:01 +0000 Received: from doppler.solinno.uk (doppler.solinno.uk [81.2.106.178]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 61228ae4-0d83-11ef-b4bb-af5377834399; Wed, 08 May 2024 23:38:59 +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 2C084800A4; Wed, 8 May 2024 22:38:59 +0100 (BST) Received: by folly.solinno.co.uk (Postfix, from userid 1000) id F408220174; Wed, 8 May 2024 22:38:58 +0100 (BST) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 61228ae4-0d83-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=solinno.co.uk; s=mail; t=1715204339; bh=tu/eViqs6PEWINbRyoFYh4zDxVMHi/C0o7aOqYaz5Tc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k5+w8Px9oNv5TbaY4ri+l5AsGUbFSwrz1Wa8vA2/fe9HwFiUaR9ZQj6cG55Y2aMkH WKTx2PCeTVvDpRvLRtbcNSadHZ9fkAzziz5raPHnD9oYNIZzYgiKP9SYR8eLYI7fgS w+936cXMqEfkSAVs76rum/DTRlHQSkMHbRwvh4TY= From: Leigh Brown To: xen-devel@lists.xenproject.org Cc: andrew.cooper3@citrix.com, anthony.perard@citrix.com, Leigh Brown Subject: [RFC PATCH v2 3/5] tools/hotplug/Linux: Add bridge VLAN support Date: Wed, 8 May 2024 22:38:22 +0100 Message-Id: <20240508213824.55824-4-leigh@solinno.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240508213824.55824-1-leigh@solinno.co.uk> References: <20240508213824.55824-1-leigh@solinno.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @solinno.co.uk) X-ZM-MESSAGEID: 1715204370769100001 Content-Type: text/plain; charset="utf-8" Update add_to_bridge shell function to read the vlan parameter from xenstore and set the bridge VLAN configuration for the VID. Add additional helper functions to parse the vlan specification, which consists of one or more of the follow: a) single VLAN (e.g. 10). b) contiguous range of VLANs (e.g. 10-15). c) discontiguous range with base, increment and count (e.g. 100+10x9 which gives VLAN IDs 100, 110, ... 190). A single VLAN can be suffixed with "p" to indicate the PVID, or "u" to indicate untagged. A range of VLANs can be suffixed with "u" to indicate untagged. A complex example would be: vlan=3D1p/10-15/20-25u This capability only works when using the iproute2 bridge command, so a warning is issued if the vlan parameter is set and the bridge command is not available, as it will be ignored. Signed-off-by: Leigh Brown --- tools/hotplug/Linux/xen-network-common.sh | 111 ++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linu= x/xen-network-common.sh index 42fa704e8d..d9fb4f7355 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -121,10 +121,113 @@ create_bridge () { fi } =20 +_vif_vlan_add() { + # References vlans, pvid and error variables from the calling function + local -i vid=3D$1 + local flag=3D${2:-} + + if (( vid < 1 || vid > 4094 )) ;then + error=3D"vlan id $vid not between 1 and 4094" + return + fi + if [[ -n "${vlans[$vid]}" ]] ;then + error=3D"vlan id $vid specified more than once" + return + fi + case $flag in + p) if (( pvid !=3D 0 )) ;then + error=3D"more than one pvid specified ($vid and $pvid)" + return + fi + pvid=3D$vid + vlans[$vid]=3Dp ;; + u) vlans[$vid]=3Du ;; + *) vlans[$vid]=3Dt ;; + esac +} + +_vif_vlan_parse_term() { + # References error variable from the calling function + local vid incr last term=3D${1:-} + + if [[ $term =3D~ ^([0-9]+)([pu])?$ ]] ;then + _vif_vlan_add ${BASH_REMATCH[1]} ${BASH_REMATCH[2]} + elif [[ $term =3D~ ^([0-9]+)-([0-9]+)(u)?$ ]] ;then + vid=3D${BASH_REMATCH[1]} + last=3D${BASH_REMATCH[2]} + if (( last >=3D vid )) ;then + for (( ; vid<=3Dlast; vid++ )) ;do + _vif_vlan_add $vid ${BASH_REMATCH[3]} + done + else + error=3D"invalid vlan id range: $term" + fi + elif [[ $term =3D~ ^([0-9]+)\+([0-9]+)x([0-9]+)(u)?$ ]] ;then + vid=3D${BASH_REMATCH[1]} + incr=3D${BASH_REMATCH[2]} + for (( j=3D${BASH_REMATCH[3]}; j>0; --j, vid+=3Dincr )) + do + _vif_vlan_add $vid ${BASH_REMATCH[4]} + done + else + error=3D"invalid vlan specification: $term" + fi +} + +_vif_vlan_validate_pvid() { + # References vlans and pvid variables from the calling function + if (( pvid =3D=3D 0 )) ;then + if (( ${#vlans[@]} =3D=3D 1 )) ;then + vlans[${!vlans[*]}]=3Dp + else + error=3D"pvid required for multiple vlan ids" + fi + fi +} + +_vif_vlan_setup() { + # References vlans and dev variable from the calling function + local vid cmd + + bridge vlan del dev "$dev" vid 1 + for vid in ${!vlans[@]} ;do + cmd=3D"bridge vlan add dev '$dev' vid $vid" + case ${vlans[$vid]} in + p) cmd=3D"$cmd pvid untagged" ;; + u) cmd=3D"$cmd untagged" ;; + t) ;; + esac + eval "$cmd" + done +} + +_vif_vlan_membership() { + # The vlans, pvid, dev and error variables are used by sub-functions + local -A vlans=3D() + local -a terms=3D() + local -i i pvid=3D0 + local dev=3D$1 error=3D"" + + # Split the vlan specification string into its terms + readarray -d / -t terms <<<$2 + for (( i=3D0; i<${#terms[@]}; ++i )) ;do + _vif_vlan_parse_term ${terms[$i]%%[[:space:]]} + [[ -n "$error" ]] && break + done + + [[ -z "$error" ]] && _vif_vlan_validate_pvid + [[ -z "$error" ]] && _vif_vlan_setup + [[ -z "$error" ]] && return 0 + + log error "$error" + return 1 +} + # Usage: add_to_bridge bridge dev add_to_bridge () { local bridge=3D$1 local dev=3D$2 + local vlan=3D$(xenstore_read_default "$XENBUS_PATH/vlan" "") =20 # Don't add $dev to $bridge if it's already on the bridge. if [ ! -e "/sys/class/net/${bridge}/brif/${dev}" ]; then @@ -134,6 +237,14 @@ add_to_bridge () { else ip link set ${dev} master ${bridge} fi + if [ -n "${vlan}" ] ;then + if which bridge >&/dev/null; then + log debug "configuring VLANs for ${dev} on ${bridge}" + _vif_vlan_membership "${dev}" "${vlan}" + else + log warning "bridge command not available, ignoring vlan c= onfig" + fi + fi else log debug "$dev already on bridge $bridge" fi --=20 2.39.2