Expand tunnel IDs from 32 to 64 bits.
authorBen Pfaff <blp@nicira.com>
Fri, 10 Dec 2010 18:42:42 +0000 (10:42 -0800)
committerBen Pfaff <blp@nicira.com>
Fri, 10 Dec 2010 19:14:13 +0000 (11:14 -0800)
commitb9298d3f825703063c9538aa37407da43e1e4781
treeb17463dd7194e5fd41cf79ce1115c93861450bd0
parentff9d38264c74e2e807ba0fd759e44116d1203670
Expand tunnel IDs from 32 to 64 bits.

We have a need to identify tunnels with keys longer than 32 bits.  This
commit adds basic datapath and OpenFlow support for such keys.  It doesn't
actually add any tunnel protocols that support 64-bit keys, so this is not
very useful yet.

The 'arg' member of struct odp_msg had to be expanded to 64-bits also,
because it sometimes contains a tunnel ID.  This member also contains the
argument passed to ODPAT_CONTROLLER, so I expanded that action's argument
to 64 bits also so that it can use the full width of the expanded 'arg'.
Userspace doesn't take advantage of the new space though (it was only
using 16 bits anyhow).

This commit has been tested only to the extent that it doesn't disrupt
basic Open vSwitch operation.  I have not tested it with tunnel traffic.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Feature #3976.
25 files changed:
datapath/actions.c
datapath/datapath.c
datapath/datapath.h
datapath/tunnel.c
datapath/tunnel.h
datapath/vport-gre.c
include/openflow/nicira-ext.h
include/openvswitch/datapath-protocol.h
include/openvswitch/tunnel.h
lib/classifier.c
lib/classifier.h
lib/dpif-netdev.c
lib/dpif.h
lib/flow.c
lib/flow.h
lib/netdev-vport.c
lib/nx-match.c
lib/odp-util.c
lib/ofp-parse.c
lib/ofp-print.c
lib/ofp-util.c
ofproto/ofproto.c
tests/ovs-ofctl.at
tests/test-classifier.c
utilities/ovs-ofctl.8.in