{"id":2233000,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2233000/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20260505124957.1239812-2-houminxi@gmail.com/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/1.2/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260505124957.1239812-2-houminxi@gmail.com>","list_archive_url":null,"date":"2026-05-05T12:49:56","name":"[ovs-dev,net-next,v5,1/2] selftests: openvswitch: add vlan() and encap() flow string parsing","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"68c143f3cddec5b86a25c3aea32afb5ed87c6353","submitter":{"id":93141,"url":"http://patchwork.ozlabs.org/api/1.2/people/93141/?format=json","name":"Minxi Hou","email":"houminxi@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20260505124957.1239812-2-houminxi@gmail.com/mbox/","series":[{"id":502837,"url":"http://patchwork.ozlabs.org/api/1.2/series/502837/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=502837","date":"2026-05-05T12:49:55","name":"selftests: openvswitch: add pop_vlan test","version":5,"mbox":"http://patchwork.ozlabs.org/series/502837/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2233000/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2233000/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","ovs-dev@lists.linuxfoundation.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=iS+Ih0Ya;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org)","smtp4.osuosl.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key)\n header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104\n header.b=iS+Ih0Ya","smtp4.osuosl.org;\n dmarc=pass (p=none dis=none) header.from=gmail.com"],"Received":["from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g8yzS1XJHz1yJV\n\tfor ; Tue, 05 May 2026 22:50:28 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 43C91404DE;\n\tTue, 5 May 2026 12:50:26 +0000 (UTC)","from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id FyF4aDmp7SwO; Tue, 5 May 2026 12:50:25 +0000 (UTC)","from lists.linuxfoundation.org (lf-lists.osuosl.org\n [IPv6:2605:bc80:3010:104::8cd3:938])\n\tby smtp4.osuosl.org (Postfix) with ESMTPS id 00AA440330;\n\tTue, 5 May 2026 12:50:25 +0000 (UTC)","from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id C8758C04EA;\n\tTue, 5 May 2026 12:50:24 +0000 (UTC)","from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\n by lists.linuxfoundation.org (Postfix) with ESMTP id E040AC04E9\n for ; Tue, 5 May 2026 12:50:22 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp4.osuosl.org (Postfix) with ESMTP id C6CDF40426\n for ; Tue, 5 May 2026 12:50:22 +0000 (UTC)","from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id JxZgmS5Gwwvg for ;\n Tue, 5 May 2026 12:50:21 +0000 (UTC)","from mail-ot1-x335.google.com (mail-ot1-x335.google.com\n [IPv6:2607:f8b0:4864:20::335])\n by smtp4.osuosl.org (Postfix) with ESMTPS id AAA9640387\n for ; Tue, 5 May 2026 12:50:21 +0000 (UTC)","by mail-ot1-x335.google.com with SMTP id\n 46e09a7af769-7de4e6c5a30so4541703a34.0\n for ; Tue, 05 May 2026 05:50:21 -0700 (PDT)","from houminxi ([72.244.37.221]) by smtp.gmail.com with ESMTPSA id\n 46e09a7af769-7deca7a5e75sm9884812a34.2.2026.05.05.05.50.16\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 05 May 2026 05:50:20 -0700 (PDT)"],"X-Virus-Scanned":["amavis at osuosl.org","amavis at osuosl.org"],"X-Comment":"SPF check N/A for local connections -\n client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver= ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp4.osuosl.org 00AA440330","OpenDKIM Filter v2.11.0 smtp4.osuosl.org AAA9640387"],"Received-SPF":"Pass (mailfrom) identity=mailfrom;\n client-ip=2607:f8b0:4864:20::335; helo=mail-ot1-x335.google.com;\n envelope-from=houminxi@gmail.com; receiver=","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp4.osuosl.org AAA9640387","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1777985420; x=1778590220; darn=openvswitch.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=PpnX0Zb2cz/11NE9nTRDJGh4URSNMBS+mNomaP4pGX0=;\n b=iS+Ih0Yaegp2zGVJsESI1IJQge7+A+AvgvU895CKnx49LaAoUajOqva9lIxR3j7T7W\n 7MlQ3rTcl7MLGO1KsCubJ1hzl4ZKgBP/4qMw5Cd1deXvXZTTWfXmPrr/V3HumlUQy/Qz\n Vs9vrvNz7eehtRP4LtQ1hdQtNtQRbOXFwxJZMijkO4n2lLC5B994WGa/QgZthDQVH+wq\n 16z446ZcWzB3YXIHkZFtf5TpSKkmSMLqyBzynqI0P6Cenwk0D4ZVdcSPp/jvvAsQmRmo\n rVBQtWAr8zjen3r2Hr41DTBiOa2+qOabijYBsgCllUunMOeBkUGMi/SWtnkJHBILYd11\n b8QQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777985420; x=1778590220;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=PpnX0Zb2cz/11NE9nTRDJGh4URSNMBS+mNomaP4pGX0=;\n b=WNXHv6g+rXE+qQ7fXN8kDrkMWPsKvb6l3aqNSVn1E0JDxLKin6x3vuxNZ6mbbddStG\n VGy1a+0lb+Zk07SjVX2Pk7ZvI88jTMzIRlvsVxApf49z8KmsatiyxkTLx2rehSSGh1Sx\n qBFBtcjNLLuWTL4ADeiQlB8qJXfMH7blLU4txnwXlxL/cnN4DkCLpAziI+NUfbNjaPFx\n R9D9OIj69TCHjLiPyAFhurLUt51wGJpQYRGEHJWDFyRUy5aWX1FjfI1OHZkY/tDsMISa\n +Or9ohSke1XH72VTxCjrGUe7IYZHTD0QWULDsXgmcTiXSSw6rqC+CO/V4ABqZsMexAQM\n YNow==","X-Forwarded-Encrypted":"i=1;\n AFNElJ9I6M2d2gqZ0PkM6U5+1ZBtor+9rAm9YGYYTRJ5runF3cLwQ2Fl9A9IbQpbl95rgJw+VEQ=@openvswitch.org","X-Gm-Message-State":"AOJu0Ywa3NXsm1+N3YhqyJ8GnIsXMsVNd+E2PqA7brbYYW71HpsMT8EX\n qmJFHU6nPyMS1OX7cPWXaULXY/8rmnhTLDVykJhFRS0OGd7CIwLKffyC","X-Gm-Gg":"AeBDies+55aB5C1OsQLfh/MjysBfRghMK8bkQMdRDQx3LP5KvjTXiRvqiDS2IZH4A+e\n ReA46UA2P8mpd7iz7bkrLSXNrYbubQshaP43opZVmvzyiCK2YP+U7R74Nnr3Ll7QdwB3crEpMQ9\n 6udw6gJcptezXXmOIyy1S7uybxoTBo50+i+6HKeOKvkbv2nkxY7QqgMXzveLeUE6DvHBH5K7Wf3\n gvxFhLZibOtTpRpmw6u5gR9AXhw2IEG2DKIy7AQeNsC9y6LmpIaNAfnzLd7jiOGd/lU2WqaV80I\n Izr5ixNFQnHUOU9KW41lABJfihe9h0ZqLfzmLS7Fm1PU0ecftPCZ2L770ylLxgXx0jBWBp4NsaR\n 5NRgfqY4eSxf76XWADgIUE2rDdsPTEdsd9d0yMngGRfDg1kaT/4LTesRPLpKn7p56ZW9Eg3jElq\n Hbsa+vjXaSIkY9QQhO2ZvQUl3+7A==","X-Received":"by 2002:a05:6830:7104:b0:7d7:f638:7a03 with SMTP id\n 46e09a7af769-7dee12b34f8mr8515117a34.10.1777985420430;\n Tue, 05 May 2026 05:50:20 -0700 (PDT)","From":"Minxi Hou ","To":"netdev@vger.kernel.org","Date":"Tue, 5 May 2026 20:49:56 +0800","Message-ID":"<20260505124957.1239812-2-houminxi@gmail.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260505124957.1239812-1-houminxi@gmail.com>","References":"<20260505124957.1239812-1-houminxi@gmail.com>","MIME-Version":"1.0","Subject":"[ovs-dev] [PATCH net-next v5 1/2] selftests: openvswitch: add\n vlan() and encap() flow string parsing","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"dev@openvswitch.org, linux-kselftest@vger.kernel.org,\n Minxi Hou , linux-kernel@vger.kernel.org,\n i.maximets@ovn.org, edumazet@google.com, horms@kernel.org, kuba@kernel.org,\n pabeni@redhat.com, shuah@kernel.org, davem@davemloft.net","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"ovs-dev-bounces@openvswitch.org","Sender":"\"dev\" "},"content":"Add VLAN TCI formatting and parsing support to ovs-dpctl.py:\n\n- Add _vlan_dpstr() to decompose TCI into vid/pcp/cfi fields,\n with raw tci=0x%04x fallback when cfi=0 for round-trip safety.\n- Add _parse_vlan_from_flowstr() boundary check for missing ')'.\n- Add encap_ovskey subclass restricting nla_map to L2-L4 attributes\n (slots 0-21) that appear inside 802.1Q ENCAP, with metadata\n attributes set to \"none\".\n- Check parse() return value for unrecognized trailing content.\n- Support callable format functions in dpstr() output.\n- Add push_vlan action class with fields matching kernel struct\n ovs_action_push_vlan (vlan_tpid, vlan_tci as network-order u16).\n- Add push_vlan dpstr format and parse with range validation\n (vid 0-4095, pcp 0-7, tpid 0-0xFFFF) and CFI forced to 1.\n- Remove MAX_ENCAP_DEPTH constant and depth tracking — the\n bracket-depth counter in the encap parser already handles\n nesting; the global depth limit was unnecessary.\n\nSigned-off-by: Minxi Hou \n---\n .../selftests/net/openvswitch/ovs-dpctl.py | 322 +++++++++++++++++-\n 1 file changed, 312 insertions(+), 10 deletions(-)","diff":"diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py\nindex 848f61fdcee0..50551d4fa7c7 100644\n--- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py\n+++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py\n@@ -370,7 +370,7 @@ class ovsactions(nla):\n (\"OVS_ACTION_ATTR_OUTPUT\", \"uint32\"),\n (\"OVS_ACTION_ATTR_USERSPACE\", \"userspace\"),\n (\"OVS_ACTION_ATTR_SET\", \"ovskey\"),\n- (\"OVS_ACTION_ATTR_PUSH_VLAN\", \"none\"),\n+ (\"OVS_ACTION_ATTR_PUSH_VLAN\", \"push_vlan\"),\n (\"OVS_ACTION_ATTR_POP_VLAN\", \"flag\"),\n (\"OVS_ACTION_ATTR_SAMPLE\", \"sample\"),\n (\"OVS_ACTION_ATTR_RECIRC\", \"uint32\"),\n@@ -427,6 +427,9 @@ class ovsactions(nla):\n \n return actstr\n \n+ class push_vlan(nla):\n+ fields = ((\"vlan_tpid\", \"!H\"), (\"vlan_tci\", \"!H\"))\n+\n class sample(nla):\n nla_flags = NLA_F_NESTED\n \n@@ -633,6 +636,14 @@ class ovsactions(nla):\n print_str += \"ct_clear\"\n elif field[0] == \"OVS_ACTION_ATTR_POP_VLAN\":\n print_str += \"pop_vlan\"\n+ elif field[0] == \"OVS_ACTION_ATTR_PUSH_VLAN\":\n+ datum = self.get_attr(field[0])\n+ tpid = datum[\"vlan_tpid\"]\n+ tci = datum[\"vlan_tci\"]\n+ vid = tci & 0x0FFF\n+ pcp = (tci >> 13) & 0x7\n+ print_str += \"push_vlan(vid=%d,pcp=%d\" \\\n+ \",tpid=0x%04x)\" % (vid, pcp, tpid)\n elif field[0] == \"OVS_ACTION_ATTR_POP_ETH\":\n print_str += \"pop_eth\"\n elif field[0] == \"OVS_ACTION_ATTR_POP_NSH\":\n@@ -726,7 +737,57 @@ class ovsactions(nla):\n actstr = actstr[strspn(actstr, \", \") :]\n parsed = True\n \n- if parse_starts_block(actstr, \"clone(\", False):\n+ if parse_starts_block(actstr, \"push_vlan(\", False):\n+ actstr = actstr[len(\"push_vlan(\"):]\n+ vid = 0\n+ pcp = 0\n+ tpid = 0x8100\n+ if \")\" not in actstr:\n+ raise ValueError(\n+ \"push_vlan: missing ')'\")\n+ paren = actstr.index(\")\")\n+ if not actstr[:paren].strip():\n+ raise ValueError(\"push_vlan: no fields\")\n+ for kv in actstr[:paren].split(\",\"):\n+ if \"=\" not in kv:\n+ raise ValueError(\n+ \"push_vlan: bad field '%s'\"\n+ % kv.strip())\n+ k = kv[:kv.index(\"=\")].strip()\n+ v = kv[kv.index(\"=\") + 1:].strip()\n+ if k == \"vid\":\n+ vid = int(v, 0)\n+ if vid < 0 or vid > 0xFFF:\n+ raise ValueError(\n+ \"push_vlan: vid=%d out of \"\n+ \"range (0-4095)\" % vid)\n+ elif k == \"pcp\":\n+ pcp = int(v, 0)\n+ if pcp < 0 or pcp > 7:\n+ raise ValueError(\n+ \"push_vlan: pcp=%d out of \"\n+ \"range (0-7)\" % pcp)\n+ elif k == \"tpid\":\n+ tpid = int(v, 0)\n+ if tpid < 0 or tpid > 0xFFFF:\n+ raise ValueError(\n+ \"push_vlan: tpid=0x%x out \"\n+ \"of range (0-0xffff)\" % tpid)\n+ else:\n+ raise ValueError(\n+ \"push_vlan: unknown key '%s'\"\n+ % k)\n+ tci = (vid & 0x0FFF) | ((pcp & 0x7) << 13) \\\n+ | 0x1000\n+ pvact = self.push_vlan()\n+ pvact[\"vlan_tpid\"] = tpid\n+ pvact[\"vlan_tci\"] = tci\n+ self[\"attrs\"].append(\n+ [\"OVS_ACTION_ATTR_PUSH_VLAN\", pvact])\n+ actstr = actstr[paren + 1:]\n+ parsed = True\n+\n+ elif parse_starts_block(actstr, \"clone(\", False):\n parencount += 1\n subacts = ovsactions()\n actstr = actstr[len(\"clone(\"):]\n@@ -901,11 +962,11 @@ class ovskey(nla):\n nla_flags = NLA_F_NESTED\n nla_map = (\n (\"OVS_KEY_ATTR_UNSPEC\", \"none\"),\n- (\"OVS_KEY_ATTR_ENCAP\", \"none\"),\n+ (\"OVS_KEY_ATTR_ENCAP\", \"encap_ovskey\"),\n (\"OVS_KEY_ATTR_PRIORITY\", \"uint32\"),\n (\"OVS_KEY_ATTR_IN_PORT\", \"uint32\"),\n (\"OVS_KEY_ATTR_ETHERNET\", \"ethaddr\"),\n- (\"OVS_KEY_ATTR_VLAN\", \"uint16\"),\n+ (\"OVS_KEY_ATTR_VLAN\", \"be16\"),\n (\"OVS_KEY_ATTR_ETHERTYPE\", \"be16\"),\n (\"OVS_KEY_ATTR_IPV4\", \"ovs_key_ipv4\"),\n (\"OVS_KEY_ATTR_IPV6\", \"ovs_key_ipv6\"),\n@@ -1636,6 +1697,194 @@ class ovskey(nla):\n class ovs_key_mpls(nla):\n fields = ((\"lse\", \">I\"),)\n \n+ # 802.1Q CFI (Canonical Format Indicator) bit, always set for Ethernet\n+ _VLAN_CFI_MASK = 0x1000\n+\n+ @staticmethod\n+ def _vlan_dpstr(tci):\n+ \"\"\"Format VLAN TCI as vid=X,pcp=Y,cfi=Z or tci=0xNNNN.\n+\n+ When cfi=1 (standard Ethernet VLAN), outputs decomposed\n+ vid/pcp/cfi fields. When cfi=0 (truncated VLAN header),\n+ falls back to raw tci=0x%04x to ensure round-trip\n+ correctness: the parser auto-adds cfi=1 for vid/pcp\n+ format, so cfi=0 would be lost on re-parse.\"\"\"\n+ vid = tci & 0x0FFF\n+ pcp = (tci >> 13) & 0x7\n+ cfi = (tci >> 12) & 0x1\n+ if cfi:\n+ return \"vid=%d,pcp=%d,cfi=%d\" % (vid, pcp, cfi)\n+ return \"tci=0x%04x\" % tci\n+\n+ @staticmethod\n+ def _parse_vlan_from_flowstr(flowstr):\n+ \"\"\"Parse vlan(tci=X) or vlan(vid=X[,pcp=Y,cfi=Z]) from flowstr.\n+\n+ Returns (remaining_flowstr, key_tci, mask_tci).\n+ TCI values use standard bit layout (VID bits 0-11,\n+ CFI bit 12, PCP bits 13-15); byte order conversion to\n+ big-endian happens in pyroute2 be16 NLA serialization.\n+ The mask covers only the fields the caller specified:\n+ vid -> 0x0FFF, pcp -> 0xE000, cfi -> 0x1000, tci -> 0xFFFF.\n+\n+ The tci= key sets the raw TCI bitfield (no CFI validation) to allow\n+ non-Ethernet use cases. Use cfi=1 for standard Ethernet VLAN matching.\n+ \"\"\"\n+ tci = 0\n+ mask = 0\n+ has_tci = False\n+ has_vid = has_pcp = has_cfi = False\n+ _tci_mix_err = \"vlan(): 'tci' cannot be mixed \" \\\n+ \"with 'vid'/'pcp'/'cfi'\"\n+ first = True\n+ while True:\n+ flowstr = flowstr.lstrip()\n+ if not flowstr:\n+ raise ValueError(\"vlan(): missing ')'\")\n+ if flowstr[0] == ')':\n+ break\n+ if not first:\n+ flowstr = flowstr[1:] # skip ','\n+ if not flowstr:\n+ raise ValueError(\"vlan(): missing ')' after trailing comma\")\n+ flowstr = flowstr.lstrip()\n+ if flowstr and flowstr[0] == ')':\n+ break\n+ if flowstr and flowstr[0] == ',':\n+ raise ValueError(\n+ \"vlan(): empty or extra comma in field list\")\n+ first = False\n+\n+ eq = flowstr.find('=')\n+ if eq == -1:\n+ raise ValueError(\n+ \"vlan(): expected key=value, got '%s'\" % flowstr)\n+ key = flowstr[:eq].strip()\n+ flowstr = flowstr[eq + 1:]\n+\n+ end = flowstr.find(',')\n+ end2 = flowstr.find(')')\n+ if end == -1 and end2 == -1:\n+ raise ValueError(\"vlan(): missing ')'\")\n+ if end == -1 or (end2 != -1 and end2 < end):\n+ end = end2\n+ val = flowstr[:end].strip()\n+ flowstr = flowstr[end:]\n+\n+ if not val:\n+ raise ValueError(\"vlan(): empty value for key '%s'\" % key)\n+ try:\n+ v = int(val, 16) if val.startswith(('0x', '0X')) else int(val)\n+ except ValueError as exc:\n+ raise ValueError(\n+ \"vlan(): invalid value '%s' for key '%s'\"\n+ % (val, key)) from exc\n+\n+ if key == 'tci':\n+ if has_tci:\n+ raise ValueError(\"vlan(): duplicate 'tci'\")\n+ if has_vid or has_pcp or has_cfi:\n+ raise ValueError(_tci_mix_err)\n+ if v > 0xFFFF or v < 0:\n+ raise ValueError(\"vlan(): tci=0x%x out of range\" % v)\n+ tci = v\n+ mask = 0xFFFF\n+ has_tci = True\n+ elif key == 'vid':\n+ if has_tci:\n+ raise ValueError(_tci_mix_err)\n+ if has_vid:\n+ raise ValueError(\"vlan(): duplicate 'vid'\")\n+ if v < 0 or v > 0xFFF:\n+ raise ValueError(\"vlan(): vid=%d out of range (0-4095)\" % v)\n+ tci |= v\n+ mask |= 0x0FFF\n+ has_vid = True\n+ elif key == 'pcp':\n+ if has_tci:\n+ raise ValueError(_tci_mix_err)\n+ if has_pcp:\n+ raise ValueError(\"vlan(): duplicate 'pcp'\")\n+ if v < 0 or v > 7:\n+ raise ValueError(\"vlan(): pcp=%d out of range (0-7)\" % v)\n+ tci |= (v & 0x7) << 13\n+ mask |= 0xE000\n+ has_pcp = True\n+ elif key == 'cfi':\n+ if has_tci:\n+ raise ValueError(_tci_mix_err)\n+ if has_cfi:\n+ raise ValueError(\"vlan(): duplicate 'cfi'\")\n+ if v != 1:\n+ raise ValueError(\"vlan(): cfi must be 1 for Ethernet\")\n+ tci |= ovskey._VLAN_CFI_MASK\n+ mask |= ovskey._VLAN_CFI_MASK\n+ has_cfi = True\n+ else:\n+ raise ValueError(\"vlan(): unknown key '%s'\" % key)\n+\n+ flowstr = flowstr[1:] # skip ')'\n+ # Catch immediate '))' (user error). A ')' after ',' is consumed\n+ # by parse()'s strspn(flowstr, \"), \") inter-field separator stripping.\n+ if flowstr.lstrip().startswith(')'):\n+ raise ValueError(\"vlan(): unmatched ')'\")\n+ # parse() strips trailing ',', ')', ' ' as inter-field separators,\n+ # so we do not need to call strspn here.\n+\n+ if mask == 0:\n+ raise ValueError(\"vlan(): no fields specified, \"\n+ \"use vlan(vid=X[,pcp=Y,cfi=Z]) or vlan(tci=X)\")\n+ if not has_tci:\n+ tci |= ovskey._VLAN_CFI_MASK\n+ mask |= ovskey._VLAN_CFI_MASK\n+ return flowstr, tci, mask\n+\n+ @staticmethod\n+ def _parse_encap_from_flowstr(flowstr):\n+ \"\"\"Parse encap(inner_flow) from flowstr.\n+\n+ Returns (remaining_flowstr, inner_key_dict, inner_mask_dict)\n+ where each dict has an 'attrs' key for recursive NLA encoding.\n+ Parenthesis-depth tracking handles nested encap() calls but not\n+ quoted strings containing literal parentheses.\n+ \"\"\"\n+ depth = 1\n+ end = -1\n+ for i, c in enumerate(flowstr):\n+ if c == '(':\n+ depth += 1\n+ elif c == ')':\n+ depth -= 1\n+ if depth < 0:\n+ raise ValueError(\n+ \"encap(): unmatched ')' at position %d\" % i)\n+ if depth == 0:\n+ end = i\n+ break\n+\n+ if end == -1:\n+ if depth > 1:\n+ raise ValueError(\"encap(): missing ')' at end\")\n+ raise ValueError(\"encap(): missing closing ')'\")\n+\n+ inner_str = flowstr[:end].strip()\n+ if not inner_str:\n+ raise ValueError(\"encap(): empty inner flow\")\n+\n+ flowstr = flowstr[end + 1:]\n+ if flowstr.lstrip().startswith(')'):\n+ raise ValueError(\"encap(): unmatched ')' after encap()\")\n+\n+ inner_key = encap_ovskey()\n+ inner_mask = encap_ovskey()\n+ remaining = inner_key.parse(inner_str, inner_mask)\n+ if remaining and re.search(r'[^\\s,)]', remaining):\n+ raise ValueError(\n+ \"encap(): unrecognized trailing \"\n+ \"content '%s'\" % remaining.strip())\n+\n+ return flowstr, inner_key, inner_mask\n+\n def parse(self, flowstr, mask=None):\n for field in (\n (\"OVS_KEY_ATTR_PRIORITY\", \"skb_priority\", intparse),\n@@ -1657,6 +1906,16 @@ class ovskey(nla):\n \"eth_type\",\n lambda x: intparse(x, \"0xffff\"),\n ),\n+ (\n+ \"OVS_KEY_ATTR_VLAN\",\n+ \"vlan\",\n+ ovskey._parse_vlan_from_flowstr,\n+ ),\n+ (\n+ \"OVS_KEY_ATTR_ENCAP\",\n+ \"encap\",\n+ ovskey._parse_encap_from_flowstr,\n+ ),\n (\n \"OVS_KEY_ATTR_IPV4\",\n \"ipv4\",\n@@ -1794,6 +2053,9 @@ class ovskey(nla):\n True,\n ),\n (\"OVS_KEY_ATTR_ETHERNET\", None, None, False, False),\n+ (\"OVS_KEY_ATTR_VLAN\", \"vlan\", ovskey._vlan_dpstr,\n+ lambda x: False, True),\n+ (\"OVS_KEY_ATTR_ENCAP\", None, None, False, False),\n (\n \"OVS_KEY_ATTR_ETHERTYPE\",\n \"eth_type\",\n@@ -1821,22 +2083,61 @@ class ovskey(nla):\n v = self.get_attr(field[0])\n if v is not None:\n m = None if mask is None else mask.get_attr(field[0])\n+ fmt = field[2] # str format or callable\n if field[4] is False:\n print_str += v.dpstr(m, more)\n print_str += \",\"\n else:\n if m is None or field[3](m):\n- print_str += field[1] + \"(\"\n- print_str += field[2] % v\n- print_str += \"),\"\n+ val = fmt(v) if callable(fmt) else fmt % v\n+ print_str += field[1] + \"(\" + val + \"),\"\n elif more or m != 0:\n- print_str += field[1] + \"(\"\n- print_str += (field[2] % v) + \"/\" + (field[2] % m)\n- print_str += \"),\"\n+ if callable(fmt):\n+ val = fmt(v) + \"/\" + fmt(m)\n+ else:\n+ val = (fmt % v) + \"/\" + (fmt % m)\n+ print_str += field[1] + \"(\" + val + \"),\"\n \n return print_str\n \n \n+class encap_ovskey(ovskey):\n+ \"\"\"Inner flow key attributes valid inside 802.1Q ENCAP.\n+\n+ Only L2-L4 key attributes (slots 0-21) appear inside ENCAP.\n+ Metadata-only attributes (SKB_MARK, DP_HASH, RECIRC_ID, etc.)\n+ are set to \"none\" — they never appear inside ENCAP per\n+ ovs_nla_put_vlan() in net/openvswitch/flow_netlink.c.\n+\n+ nla_map indexes must match OVS_KEY_ATTR_* enum values in\n+ include/uapi/linux/openvswitch.h.\n+ \"\"\"\n+ nla_map = (\n+ (\"OVS_KEY_ATTR_UNSPEC\", \"none\"), # 0\n+ (\"OVS_KEY_ATTR_ENCAP\", \"none\"), # 1 — placeholder, no recursion\n+ (\"OVS_KEY_ATTR_PRIORITY\", \"none\"), # 2 — skb metadata, not in ENCAP\n+ (\"OVS_KEY_ATTR_IN_PORT\", \"none\"), # 3 — skb metadata, not in ENCAP\n+ (\"OVS_KEY_ATTR_ETHERNET\", \"ethaddr\"), # 4\n+ (\"OVS_KEY_ATTR_VLAN\", \"be16\"), # 5\n+ (\"OVS_KEY_ATTR_ETHERTYPE\", \"be16\"), # 6\n+ (\"OVS_KEY_ATTR_IPV4\", \"ovs_key_ipv4\"), # 7\n+ (\"OVS_KEY_ATTR_IPV6\", \"ovs_key_ipv6\"), # 8\n+ (\"OVS_KEY_ATTR_TCP\", \"ovs_key_tcp\"), # 9\n+ (\"OVS_KEY_ATTR_UDP\", \"ovs_key_udp\"), # 10\n+ (\"OVS_KEY_ATTR_ICMP\", \"ovs_key_icmp\"), # 11\n+ (\"OVS_KEY_ATTR_ICMPV6\", \"ovs_key_icmpv6\"), # 12\n+ (\"OVS_KEY_ATTR_ARP\", \"ovs_key_arp\"), # 13\n+ (\"OVS_KEY_ATTR_ND\", \"ovs_key_nd\"), # 14\n+ (\"OVS_KEY_ATTR_SKB_MARK\", \"none\"), # 15 — metadata, not in ENCAP\n+ (\"OVS_KEY_ATTR_TUNNEL\", \"none\"), # 16 — tunnel metadata, not in ENCAP\n+ (\"OVS_KEY_ATTR_SCTP\", \"ovs_key_sctp\"), # 17\n+ (\"OVS_KEY_ATTR_TCP_FLAGS\", \"be16\"), # 18\n+ (\"OVS_KEY_ATTR_DP_HASH\", \"none\"), # 19 — metadata, not in ENCAP\n+ (\"OVS_KEY_ATTR_RECIRC_ID\", \"none\"), # 20 — metadata, not in ENCAP\n+ (\"OVS_KEY_ATTR_MPLS\", \"array(ovs_key_mpls)\"), # 21\n+ )\n+\n+\n class OvsPacket(GenericNetlinkSocket):\n OVS_PACKET_CMD_MISS = 1 # Flow table miss\n OVS_PACKET_CMD_ACTION = 2 # USERSPACE action\n@@ -2576,6 +2877,7 @@ def print_ovsdp_full(dp_lookup_rep, ifindex, ndb=NDB(), vpl=OvsVport()):\n \n \n def main(argv):\n+ nlmsg_atoms.encap_ovskey = encap_ovskey\n nlmsg_atoms.ovskey = ovskey\n nlmsg_atoms.ovsactions = ovsactions\n \n","prefixes":["ovs-dev","net-next","v5","1/2"]}