Daniel Ding <[email protected]> writes:
> When I try filter geneve protocol with a vlan, the warning message
> occurs that tell me the kernel can't support this combination.
>
> $ ovs-tcpdump -i eth2 -nne vlan 10 and geneve
> Warning: Kernel filter failed: Invalid argument
>
> The fix is to make a convenience argument that sets the mirror port's
> select_vlan column, and also marks the port as native tagged with VLAN.
>
> Signed-off-by: Daniel Ding <[email protected]>
> ---
Sorry it took so long to get back to this - I seem to have missed this
one.
Given the select_vlan can take a number of vlans, I think perhaps it's
best to put this check in the vlan arg portion itself.
We should probably make the argument for select_vlan be a list and have
the argument append to it. Then a user can do something like:
$ ovs-tcpdump -i eth2 -nne --vlan 10 --vlan 11 --vlan 12 geneve
or
$ ovs-tcpdump -i eth2 -nne --vlan 10,11,12 geneve
WDYT?
> utilities/ovs-tcpdump.in | 35 +++++++++++++++++++++++++++++++----
> 1 file changed, 31 insertions(+), 4 deletions(-)
>
> diff --git a/utilities/ovs-tcpdump.in b/utilities/ovs-tcpdump.in
> index eada803bb..f2fb2f04b 100755
> --- a/utilities/ovs-tcpdump.in
> +++ b/utilities/ovs-tcpdump.in
> @@ -142,6 +142,8 @@ The following options are available:
> --mirror-to The name for the mirror port to use (optional)
> Default 'miINTERFACE'
> --span If specified, mirror all ports (optional)
> + --vlan If specified, mirror vlan traffic and pop
> + its tag (optional)
> """ % {'prog': sys.argv[0]})
> sys.exit(0)
>
> @@ -319,7 +321,7 @@ class OVSDB(object):
> (mirror_name, txn.get_error()))
> self._txn = None
>
> - def make_port(self, port_name, bridge_name):
> + def make_port(self, port_name, bridge_name, vlan=None):
> iface_row = self.make_interface(port_name, False)
> txn = self._txn
>
> @@ -330,6 +332,10 @@ class OVSDB(object):
> port = txn.insert(self.get_table('Port'))
> port.name = port_name
>
> + if vlan is not None:
> + port.verify('tag')
> + port.tag = [vlan]
> +
Then this block could just change to be port.tag = vlan
> br.verify('ports')
> ports = getattr(br, 'ports', [])
> ports.append(port)
> @@ -354,7 +360,7 @@ class OVSDB(object):
> return result
>
> def bridge_mirror(self, intf_name, mirror_intf_name, br_name,
> - mirror_select_all=False):
> + mirror_select_all=False, mirrored_vlan=None):
>
> txn = self._start_txn()
> mirror = txn.insert(self.get_table('Mirror'))
> @@ -374,6 +380,12 @@ class OVSDB(object):
> src_port.append(mirrored_port)
> mirror.select_src_port = src_port
>
> + if mirrored_vlan:
> + mirror.verify('select_vlan')
> + select_vlan = getattr(mirror, 'select_vlan', [])
> + select_vlan.append(mirrored_vlan)
> + mirror.select_vlan = select_vlan
This would just be a .extend() call:
select_vlan.extend(mirrored_vlan)
> +
> output_port = self._find_row_by_name('Port', mirror_intf_name)
>
> mirror.verify('output_port')
> @@ -440,6 +452,7 @@ def main():
> db_sock = 'unix:%s' % os.path.join(rundir, "db.sock")
> interface = None
> tcpdargs = []
> + vlan = None
>
> skip_next = False
> mirror_interface = None
> @@ -474,12 +487,25 @@ def main():
> elif cur in ['--span']:
> mirror_select_all = True
> continue
> + elif cur in ['--vlan']:
> + vlan = nxt
> + skip_next = True
vlan = vlan or []
try:
nxt = int(nxt)
if nxt < 0 or nxt > 4095:
...
vlan.append(nxt)
except:
...
> + continue
> tcpdargs.append(cur)
>
> if interface is None:
> print("Error: must at least specify an interface with '-i' option")
> sys.exit(1)
>
> + if vlan:
> + try:
> + vlan = int(vlan)
> + if vlan < 0 or vlan > 4095:
> + raise ValueError("out of range")
> + except ValueError:
> + print("Error: vlan must be within <0-4095>")
> + sys.exit(1)
> +
> if not py_which(dump_cmd):
> print("Error: unable to execute '%s' (check PATH)" % dump_cmd)
> sys.exit(1)
> @@ -523,10 +549,11 @@ def main():
> teardown(db_sock, interface, mirror_interface, tap_created)
>
> try:
> - ovsdb.make_port(mirror_interface, ovsdb.port_bridge(interface))
> + ovsdb.make_port(mirror_interface,
> + ovsdb.port_bridge(interface), vlan)
> ovsdb.bridge_mirror(interface, mirror_interface,
> ovsdb.port_bridge(interface),
> - mirror_select_all)
> + mirror_select_all, vlan)
> except OVSDBException as oe:
> print("ERROR: Unable to properly setup the mirror: %s." % str(oe))
> sys.exit(1)
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
