Jesse Gross [Sat, 4 Dec 2010 21:49:50 +0000 (13:49 -0800)]
capwap: Bind address should be big endian.
CAPWAP creates a UDP socket that accepts packets from any address using
INADDR_ANY. IP addresses should be in network byte order but that
constant is in host byte order, so use htonl. However, this is not a
real bug since the value of INADDR_ANY is 0.
Found with sparse.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Tue, 7 Dec 2010 02:03:37 +0000 (18:03 -0800)]
datapath: Try to avoid custom checksum update function.
Our update_csum() function was exactly the same as
inet_proto_csum_replace4() with the one exception that it uses our
checksum status fields on older kernels that need it. Unfortunately,
we can't completely move the code to the compat directory because it
relies on fields in OVS CB but we can at least exile it to checksum.h.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Tue, 7 Dec 2010 03:02:14 +0000 (19:02 -0800)]
datapath: Compatibility code for inet_proto_csum_replace2.
Kernels earlier than 2.6.25 did not define inet_proto_csum_replace2,
so implement it ourselves.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Jesse Gross [Tue, 7 Dec 2010 01:51:33 +0000 (17:51 -0800)]
datapath: Correctly update IP checksum with actions.
The update_csum() function that we currently use to update
checksums on actions is really intended for L4 checksums. In
particular, if the packet has a partial checksum and the field
is not in the pseudo header, it doesn't do anything at all.
This doesn't make sense for the IP header because Linux doesn't
use hardware offload for it, so we always need to recompute the
checksum. Instead, we can use the kernel function csum_replace4(),
which will always do the right thing.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Tue, 7 Dec 2010 02:58:30 +0000 (18:58 -0800)]
datapath: Compatibility code for csum_replace4.
Kernels ealier than 2.6.25 did not define csum_replace4, so
implement it ourselves.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Sun, 5 Dec 2010 20:16:40 +0000 (12:16 -0800)]
tunneling: Update port pools on config change.
We keep track of the number of tunnels using the different types of
matching in order to avoid doing the lookup when there are no ports
of that type. However, when updating the configuration we weren't
changing the port pool counts, which could lead to incorrectly not
finding a tunnel on receive.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Jesse Gross [Mon, 6 Dec 2010 23:50:16 +0000 (15:50 -0800)]
datapath: Fix indentation in patch-vport.c.
Convert spaces to tabs in indents.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Sat, 4 Dec 2010 17:43:35 +0000 (09:43 -0800)]
datapath: Convert patch vport to use call_rcu() on destruction.
Since patch ports are virtual devices, we can potentially have many
of them in a datapath. Currently we have a call to synchronize_rcu()
each time we destroy one, which can be expensive if we are deleting a
datapath with many ports. This converts it to use call_rcu() instead,
which allows us to wait for only a single RCU grace period independent
of the number of ports.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Sat, 4 Dec 2010 03:17:20 +0000 (19:17 -0800)]
tunneling: Access correct IP header when processing ECN.
We attempt to copy the ECN bits from the outside of the tunnel to
the inside on receive if we are encapsulating IP traffic. However,
we were previously looking at the inner IP header as the source of
the ECN bits, when it should have been the outer header. This
corrects that and cleans up the function a little bit.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Sat, 4 Dec 2010 02:06:23 +0000 (18:06 -0800)]
tunneling: Remove call to eth_type_trans() on receive.
On receive we call eth_type_trans() to set skb->protocol. However,
that function also sets skb->pkt_type, which requires several
comparisons to MAC addresses. Nothing in OVS cares about pkt_type,
so this is wasteful. If we actually do egress to the IP stack
through an internal device then we'll call eth_type_trans() to get
everything correctly setup. It's possible for device drivers to
see an incorrect pkt_type or not correctly parse legacy IPX (which
eth_type_trans() also handles) but it's highly unlikely that they
will care.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Thu, 9 Dec 2010 23:00:36 +0000 (15:00 -0800)]
ofproto: Add "ofproto/trace" command to help debugging flow tables.
With an appropriate flow table, output from a command like this:
ovs-appctl ofproto/trace system@dp0 0 0
ffffffffffff000c29f49d5c080600010
80006040001000c29f49d5cac10008a000000000000ac1004df00000000000000000000000000000
0000000
resembles the following:
Packet: -8:00:00.000000 00:0c:29:f4:9d:5c > ff:ff:ff:ff:ff:ff, ethertype ARP (0x
0806), length 60: arp who-has 172.16.4.223 tell 172.16.0.138
Flow: tunnel0:in_port0000:tci(0) mac00:0c:29:f4:9d:5c->ff:ff:ff:ff:ff:ff type080
6 proto1 tos0 ip172.16.0.138->172.16.4.223 port0->0
Rule: cookie=0 in_port=65534
OpenFlow actions=resubmit:1,mod_vlan_vid:5,resubmit:2,mod_vlan_pcp:6,strip_vlan
Resubmitted flow: unchanged
Rule: cookie=0 in_port=1
OpenFlow actions=resubmit:3,resubmit:4
Resubmitted flow: unchanged
No match
Resubmitted flow: unchanged
No match
Resubmitted flow: tunnel0:in_port0000:tci(vlan5,pcp0) mac00:0c:29:f4:9d:
5c->ff:ff:ff:ff:ff:ff type0806 proto1 tos0 ip172.16.0.138->172.16.4.223 port0->0
No match
Final flow: tunnel0:in_port0000:tci(0) mac00:0c:29:f4:9d:5c->ff:ff:ff:ff:ff:ff t
ype0806 proto1 tos0 ip172.16.0.138->172.16.4.223 port0->0
Datapath actions: set_tci(vid=5,pcp=0),set_tci(vid=5,pcp=6),strip_vlan
Ben Pfaff [Thu, 9 Dec 2010 22:52:44 +0000 (14:52 -0800)]
ofproto: Change xlate_actions() to take a structure.
An upcoming commit has a need to give xlate_actions() another parameter,
but it already has too many. This commit improves the situation by making
xlate_actions()'s caller fill in a structure instead.
The action_xlate_ctx structure is kind of big and unwieldy because it
include a struct odp_actions, which is about 16 kB. But work underway will
change that to a "struct ofpbuf", which is much more reasonable.
Ben Pfaff [Wed, 8 Dec 2010 21:09:59 +0000 (13:09 -0800)]
ofpbuf: New function ofpbuf_put_hex().
This commit converts nx_match_from_string() to use this new function. The
new function will also have another user in an upcoming commit.
Ben Pfaff [Thu, 9 Dec 2010 20:31:31 +0000 (12:31 -0800)]
ofp-print: Print every flow on a new line for NXST_FLOW replies too.
This makes NXST_FLOW formatting consistent with OFPST_FLOW.
Suggested-by: Justin Pettit <jpettit@nicira.com>
Ben Pfaff [Thu, 9 Dec 2010 19:03:35 +0000 (11:03 -0800)]
ofp-print, ofp-parse: Add support for NXAST_REG_MOVE and NXAST_REG_LOAD.
Ben Pfaff [Wed, 8 Dec 2010 00:57:12 +0000 (16:57 -0800)]
ofp-util: Group everything related to actions together in header file.
Cleanup.
Ben Pfaff [Thu, 9 Dec 2010 18:41:32 +0000 (10:41 -0800)]
Make compiler complain about unhandled OpenFlow and Nicira action types.
This should help avoid forgetting about them in the future, because the
compiler will complain about unhandled values in switch statements.
Ben Pfaff [Wed, 8 Dec 2010 00:17:14 +0000 (16:17 -0800)]
nicira-ext: Remove unused macro NICIRA_OUI_STR.
I don't know what this is good for.
Ben Pfaff [Thu, 9 Dec 2010 18:31:49 +0000 (10:31 -0800)]
ofp-print: Print OFPUTIL_NXT_FLOW_REMOVED.
Ben Pfaff [Tue, 7 Dec 2010 23:34:35 +0000 (15:34 -0800)]
ofp-util: Fix byte order of ofputil_cls_rule_from_match() parameter.
This doesn't change any generated code so it is not a bug fix, but it
makes the byte order of the 'cookie' argument clear.
Ben Pfaff [Tue, 7 Dec 2010 23:07:54 +0000 (15:07 -0800)]
ofp-print: Print OFPUTIL_NXST_AGGREGATE_REPLY.
Ben Pfaff [Tue, 7 Dec 2010 22:52:26 +0000 (14:52 -0800)]
ofp-print: Print NXST_FLOW_REQUEST and NXST_AGGREGATE_REQUEST.
This takes advantage of ofputil_decode_flow_stats_request() to get rid of
some code.
Ben Pfaff [Tue, 7 Dec 2010 22:41:19 +0000 (14:41 -0800)]
ofp-print: Print OFPUTIL_NXT_STATUS_REQUEST and OFPUTIL_NXT_STATUS_REPLY.
Ben Pfaff [Tue, 7 Dec 2010 22:36:18 +0000 (14:36 -0800)]
ofp-print: Print OFPUTIL_NXT_ROLE_REQUEST and OFPUTIL_NXT_ROLE_REPLY.
Ben Pfaff [Tue, 7 Dec 2010 22:30:07 +0000 (14:30 -0800)]
ovs-ofctl: Fix del-flows command parsing bugs.
"ovs-ofctl del-flows br0" segfaulted because do_flow_mod__() assumed that
it always had a "flow" argument, which is not true for the del-flows
command.
Beyond that, parse_ofp_flow_mod_str() rejected "ovs-ofctl del-flows
br0" because no actions were supplied, even though supplying actions
doesn't make sense for deleting flows.
This commit fixes both problems and adds a simple test that would have
caught both problems.
Bug #4112.
Ben Pfaff [Tue, 7 Dec 2010 23:45:10 +0000 (15:45 -0800)]
ofp-print: Print durations more readably.
It's easier to read "duration=1.75s" than "duration_sec=1s
duration_nsec=750000000ns".
Ben Pfaff [Tue, 7 Dec 2010 22:21:38 +0000 (14:21 -0800)]
ofp-print: Print NXST_FLOW replies.
Jean Tourrilhes [Thu, 9 Dec 2010 06:05:07 +0000 (22:05 -0800)]
dpif-netdev: Handle ECN bits when updating IP checksum.
When recalculating the checksum after a set ToS action, we were
not taking into account the ECN bits copied from the original header.
Ben Pfaff [Thu, 25 Nov 2010 00:10:11 +0000 (16:10 -0800)]
ofp-print: Improve OFPST_FLOW stats reply printing.
This fixes the spacing and prints the priority included in the message
instead of the implicit priority.
Ben Pfaff [Tue, 7 Dec 2010 23:49:36 +0000 (15:49 -0800)]
Use ofpbuf_pull() instead of ofpbuf_try_pull() where it is valid.
In each of these cases, we know that the buffer is long enough to pull
the header because ofputil_decode_msg_type() already checked for us.
Ben Pfaff [Tue, 7 Dec 2010 23:47:19 +0000 (15:47 -0800)]
ofp-util: Use ofpbuf_use_const() in a few more places.
Ben Pfaff [Wed, 8 Dec 2010 00:58:41 +0000 (16:58 -0800)]
ofp-print: Verify size of OFPAT_ENQUEUE actions.
This fixes a bug, although not a very serious one.
Ben Pfaff [Wed, 8 Dec 2010 22:27:05 +0000 (14:27 -0800)]
ovs-appctl: On failure, print the error message output by the server.
Otherwise failures are much more mysterious.
Ben Pfaff [Wed, 8 Dec 2010 22:26:37 +0000 (14:26 -0800)]
ovsdb-idl: Check prerequisites for ovsdb_idl_txn_verify() also.
The IDL can only verify prerequisites for columns that it is monitoring,
but it didn't check for that. This assertion (which is the same as one in
ovsdb_idl_txn_write()) should alert us to such problems.
This would have found the problem fixed by the previous commit.
Ben Pfaff [Wed, 8 Dec 2010 22:24:59 +0000 (14:24 -0800)]
ovs-vsctl: Fix controller command prerequisites.
The controller commands use the "target" column of the Controller table,
but they don't supply it as a prerequisite, which makes those commands
hang. This commit fixes the problem.
Ben Pfaff [Wed, 8 Dec 2010 22:23:54 +0000 (14:23 -0800)]
Avoid using "grep -q" outside of GNU/Linux specific utilities.
According to the Autoconf manual, "grep -q" is not portable, so instead
redirect stdout to /dev/null.
Ben Pfaff [Thu, 9 Dec 2010 01:08:46 +0000 (17:08 -0800)]
ofp-print: Fix typos.
Justin Pettit [Wed, 8 Dec 2010 05:57:09 +0000 (21:57 -0800)]
ofp-print: Print Nicira error extension messages.
Currently, Nicira error messages are non-overlapping with the OpenFlow
error definitions. This commit takes advantage of that by not taking
into account the vendor id. Printing error messages is likely to be
overhauled before long, and a more general approach can be taken then.
Justin Pettit [Wed, 8 Dec 2010 23:35:54 +0000 (15:35 -0800)]
ofp-util: Fix starting offset of OpenFlow error messages.
Ben Pfaff [Wed, 8 Dec 2010 20:05:20 +0000 (12:05 -0800)]
ofp-print: Print each flow at the start of a line.
Before this commit, the first flow in "ovs-ofctl dump-flows" output was
printed on the same line as the OpenFlow message type name and the xid.
With this commit, that flow is put on a line of its own, like all of the
other flows in the output.
Requested-by: Paul Ingram <paul@nicira.com>
CC: Paul Ingram <paul@nicira.com>
Justin Pettit [Wed, 8 Dec 2010 05:58:30 +0000 (21:58 -0800)]
ofp-util: Fix offset when making Nicira extension error messages.
Ben Pfaff [Thu, 2 Dec 2010 22:53:12 +0000 (14:53 -0800)]
ofpbuf: New function ofpbuf_use_const().
This is a code cleanup.
Suggested-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Thu, 2 Dec 2010 22:54:47 +0000 (14:54 -0800)]
dpif-netdev: Use ofpbuf functions instead of their out-of-line expansions.
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Thu, 2 Dec 2010 22:53:54 +0000 (14:53 -0800)]
cfm: Use ofpbuf_new() instead of its out-of-line expansion.
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Tue, 7 Dec 2010 20:17:03 +0000 (12:17 -0800)]
odp-util: Bump up maximum number of ODP actions.
The kernel supports more than a single page of actions now, so userspace
should be able to take advantage of this.
Upcoming commits will completely replace this data structure but this
commit makes the bug fix clear and is suitable for cherry-picking to
long-term support branches.
Ben Pfaff [Tue, 7 Dec 2010 00:11:55 +0000 (16:11 -0800)]
ofp-util: Fully initialize flow_wildcards in ofputil_cls_rule_from_match().
The new 'zero' member was not being properly initialized. One approach
would be to add an assignment, but it seems more future-proof to let
flow_wildcards_init_catchall() do the right thing.
Noticed by valgrind.
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Thu, 2 Dec 2010 19:16:30 +0000 (11:16 -0800)]
datapath: Fix odp-compat definition of struct compat_odp_execute.
The in_port member and padding were removed from struct odp_execute some
time ago, but the compat definition didn't reflect this.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Tue, 23 Nov 2010 22:34:21 +0000 (14:34 -0800)]
ovs-ofctl: Add --more option to increase OpenFlow message verbosity.
This is useful for seeing the raw NXM data instead of just the parsed
cls_rules.
Ben Pfaff [Tue, 7 Dec 2010 21:32:01 +0000 (13:32 -0800)]
ovs-ofctl: Add NXM support.
Ben Pfaff [Tue, 7 Dec 2010 21:22:46 +0000 (13:22 -0800)]
ofp-print: Implement printing for OFPUTIL_NXT_FLOW_MOD.
Ben Pfaff [Tue, 23 Nov 2010 21:33:48 +0000 (13:33 -0800)]
ofp-parse: Add support for registers.
This updates the ovs-ofctl manpage even though ovs-ofctl doesn't really
support registers yet.
Ben Pfaff [Tue, 7 Dec 2010 20:47:40 +0000 (12:47 -0800)]
ofp-parse: Add support for tun_id.
This updates the ovs-ofctl manpage even though ovs-ofctl doesn't really
support tun_id yet.
Ben Pfaff [Tue, 23 Nov 2010 20:31:50 +0000 (12:31 -0800)]
classifier: Implement better classifier rule formatting.
The old formatting was only good enough for debugging, but now we need to
be able to format cls_rules as part of ofp-print.c. This new code is
modeled after ofp_match_to_string().
Ben Pfaff [Tue, 7 Dec 2010 20:45:24 +0000 (12:45 -0800)]
ofp-util: New abstractions for flow_mod, flow_stats_request.
These will be useful for adding Nicira Extended Match support to ovs-ofctl.
This commit makes ofproto use the new flow_mod abstraction, but not the
new flow and aggregate stats abstraction. The latter takes a bit more
infrastructure that I haven't finished yet.
Ben Pfaff [Tue, 7 Dec 2010 19:04:15 +0000 (11:04 -0800)]
nx-match: Add tests for error return values for unknown NXM fields.
Ben Pfaff [Thu, 2 Dec 2010 22:18:11 +0000 (14:18 -0800)]
nicira-ext: Clarify comments about 'src' and 'dst' in NXAST_REG actions.
Ben Pfaff [Thu, 2 Dec 2010 22:15:33 +0000 (14:15 -0800)]
nicira-ext: Clarify and fix macros to check for NXM metadata registers.
The NXM_IS_NX_REG macro didn't check the "hasmask" bit, which meant that it
looked like it was supposed to match both exact and wildcarded NXM headers,
e.g. both NXM_NX_REG0 and NXM_NX_REG0_W. But exact and wildcarded NXM
headers differ not just in the "hasmask" bit but in the "length" value
also (the wildcarded version's length is twice the exact version's length),
so this was not what it actually did.
The only current users of NXM_IS_NX_REG actually only want to match exact
versions, so this commit makes it only match those. It also adds a new
NXM_IS_NX_REG_W macro that matches only wildcarded versions. This new
macro has no users yet, but its existence should help to make it clear that
NXM_IS_NX_REG only matches exact NXM headers.
Reported-by: Natasha Gude <natasha@nicira.com>
Ben Pfaff [Tue, 7 Dec 2010 18:41:05 +0000 (10:41 -0800)]
netdev-vport: Properly initialize tnl_port_config structure to 0.
Otherwise the configuration starts out indeterminate and tends to be
rejected by the kernel.
Bug #4195.
Ethan Jackson [Sat, 4 Dec 2010 00:41:34 +0000 (16:41 -0800)]
vswitchd: Incorporate vlan into bond hash.
With this patch vlan tags are incorporated into bond hashes in
addition to the source mac address.
NIC-294
Ethan Jackson [Sat, 4 Dec 2010 00:49:02 +0000 (16:49 -0800)]
vswitchd: Remove bond/migrate MAC argument.
Before this patch one could specify a mac address as part of the
bond/migrate command. This will no longer make sense as bond
hashing becomes more complicated.
Ethan Jackson [Sat, 4 Dec 2010 01:09:01 +0000 (17:09 -0800)]
vswitchd: Correct indentation in bridge.
The "bond_unixctl_hash" function was using tabs instead of spaces.
Ben Pfaff [Mon, 6 Dec 2010 18:29:04 +0000 (10:29 -0800)]
Fix "make dist" by adding include/linux/types.h to distribution.
Ben Pfaff [Tue, 23 Nov 2010 21:31:07 +0000 (13:31 -0800)]
ofp-util: New functions for creating Nicira extension messages.
Ben Pfaff [Mon, 6 Dec 2010 18:20:20 +0000 (10:20 -0800)]
Refactor and centralize basic OpenFlow message decoding and validation.
Open vSwitch contains a few different chunks of code that need to decode
an OpenFlow message to determine its type and then validate that it is
long enough. Until now, the code for doing this has been more or less
scattered across the tree. Whenever a new piece of code needed to do this,
it generally needed to reimplement at least part of it.
This commit centralizes all of that work into a single function,
ofputil_decode_msg_type(), and helper functions, and converts all of the
code that was decoding messages by hand to use the new function.
Ben Pfaff [Wed, 17 Nov 2010 23:17:31 +0000 (15:17 -0800)]
port-array: Remove.
This code had no remaining users.
Ben Pfaff [Tue, 23 Nov 2010 21:20:17 +0000 (13:20 -0800)]
pinsched: Use hmap instead of port_array.
This is the last remaining use of port_array in the tree. It wasn't really
taking advantage of any of the special features of port_arrays, so it's
better to save some time and memory by using an hmap instead.
(In addition, OpenFlow 1.1, which we may eventually want to support, has
changed from 16-bit to 32-bit port numbers, which would require the
port_array code to be rewritten anyhow.)
Ben Pfaff [Tue, 23 Nov 2010 21:19:50 +0000 (13:19 -0800)]
vconn: New function vconn_transact_multiple_noreply().
This will be useful for sending a bunch of flow_mod messages all at once.
Ben Pfaff [Mon, 6 Dec 2010 18:03:31 +0000 (10:03 -0800)]
queue: Get rid of ovs_queue data structure.
ovs_queue doesn't seem very useful; it's just a singly-linked list. It's
more generally useful to use a general-purpose "struct list" for lists of
packets, so this commit adds such a member to "struct ofpbuf" and shifts
the existing users to use it.
Ben Pfaff [Wed, 17 Nov 2010 22:25:33 +0000 (14:25 -0800)]
util: Introduce ASSIGN_CONTAINER to make iteration macros easier to read.
Ben Pfaff [Mon, 6 Dec 2010 17:56:38 +0000 (09:56 -0800)]
docs: Only regenerate vswitch.pic when the schema really changes.
Until now, vswitch.pic has been rebuilt whenever the schema changed. This
is OK when the E-R diagram would really change, but many changes to the
schema don't change the E-R diagram, and it surprises people when
vswitch.pic changes in such a situation. This commit fixes the problem.
Requested-by: Justin Pettit <jpettit@nicira.com>
Jesse Gross [Mon, 6 Dec 2010 16:27:13 +0000 (08:27 -0800)]
datapath: Update 32/64 bit compat ioctl to match new names.
ODP_PORT_LIST32 is now ODP_VPORT_LIST32.
Reported-by: CS Lee <geek00l@gmail.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Jesse Gross [Mon, 22 Nov 2010 22:17:24 +0000 (14:17 -0800)]
datapath: Consolidate checksum compatibility code.
Checksum offloading has changed quite a bit across different kernel
and Xen versions. Since it is part of the skb data structure it is
unfortunately difficult to separate out into compatibility code.
This consolidates all of the checksum code in one place which makes
it easier read and remove as we prepare for upstreaming. On newer
kernels it also puts everything in inline functions, eliminating the
need to run through the compat code or make extra function calls.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Ethan Jackson [Fri, 3 Dec 2010 23:43:24 +0000 (15:43 -0800)]
lib: Add zero padding field to flow_wildcards.
Before this commit, the compiler would add two bytes of padding to
the 'flow_wildcards' structure to achieve 32bit alignment. These
two bytes had inconsistent values which caused 'flow_wildcards_hash'
to behave inconsistently. This commit explicitly 32bit aligns
'flow_wildcards' with zero padding.
This commit also fixes an issue where in-band rules were not
getting deleted when in-band control was disabled.
Ben Pfaff [Fri, 3 Dec 2010 23:44:51 +0000 (15:44 -0800)]
datapath: Merge vport "attach" into "create" and "detach" into "destroy".
These steps are sequentially in lockstep, so we might as well combine them.
This expands the region over which the vport_lock is held. I didn't
carefully verify that this was OK.
This also eliminates the synchronize_rcu() call from destruction of tunnel
vports, since they didn't appear to me to need it.
It should be possible to eliminate the synchronize_rcu() from the netdev,
patch, and internal_dev vports, but this commit does not do that.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Fri, 3 Dec 2010 21:09:26 +0000 (13:09 -0800)]
datapath: Merge "struct dp_port" into "struct vport".
After the previous commit, which changed the datapath to always create and
attach a vport at the same time, and to always detach and delete a vport
at the same time, there is no longer any real distinction between a dp_port
and a vport. This commit, therefore, merges the two together to simplify
code. It might even improve performance, although I have not checked.
I wasn't sure at first whether the merged structure should be "struct
dp_port" or "struct vport". I went with the latter since the "v" prefix
sounds cool.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Fri, 3 Dec 2010 20:54:08 +0000 (12:54 -0800)]
netdev-linux: Don't treat "system" devices as vports for setting stats.
Linux kernel datapath vports have a "set_stats" method. Until now,
internal vports have been handled in the userspace netdev library as
type "system", so the "system" netdevs would try to use the vport
"set_stats" method. Now, however, internal netdevs have been broken out
as a separate netdev type, so only that new type of netdev has to be able
to call into "set_stats". This commit, therefore, removes it from the
"system" netdevs.
Ben Pfaff [Fri, 3 Dec 2010 22:42:28 +0000 (14:42 -0800)]
dpif: Log port number of deleted port in dpif_port_del().
This made tracking down a particular bug easier for me. (It's too bad that
we can't log the port name, but we don't have it here.)
Ben Pfaff [Fri, 3 Dec 2010 22:41:38 +0000 (14:41 -0800)]
datapath: Make adding and attaching a vport a single step.
For some time now, Open vSwitch datapaths have internally made a
distinction between adding a vport and attaching it to a datapath. Adding
a vport just means to create it, as an entity detached from any datapath.
Attaching it gives it a port number and a datapath. Similarly, a vport
could be detached and deleted separately.
After some study, I think I understand why this distinction exists. It is
because ovs-vswitchd tries to open all the datapath ports before it tries
to create them. However, changing it to create them before it tries to
open them is not difficult, so this commit does this.
The bulk of this commit, however, changes the datapath interface to one
that always creates a vport and attaches it to a datapath in a single step,
and similarly detaches a vport and deletes it in a single step.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Thu, 4 Nov 2010 23:32:57 +0000 (16:32 -0700)]
datapath: Encapsulate parameters for new vports in new struct vport_parms.
Upcoming commits will keep needing to pass more information to the vport
'create' member function. It's annoying to have to modify a dozen pieces
of code every time just to do this, so this commit encapsulates all of the
parameters in a new struct and passes that instead.
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Wed, 17 Nov 2010 20:34:42 +0000 (12:34 -0800)]
util: Improve type-safety of OBJECT_CONTAINING.
Ben Pfaff [Thu, 18 Nov 2010 19:33:04 +0000 (11:33 -0800)]
ovs-ofctl: Demote common log messages from INFO to DBG level.
These log messages were useful long ago, but I have not found them helpful
in a long time. Also noticed by Paul Ingram <paul@nicira.com>.
Ben Pfaff [Fri, 3 Dec 2010 18:32:38 +0000 (10:32 -0800)]
ovs-ofctl: Reimplement dumping particular tables.
"dump-flows" and "dump-aggregate" are documented to accept a "table"
value to dump only a particular OpenFlow table, but commit
8050b31d6
"ofp-parse: Refactor flow parsing" broke this, by always dumping table
0. This commit should fix it (though I haven't tested it).
Ben Pfaff [Wed, 17 Nov 2010 18:07:48 +0000 (10:07 -0800)]
classifier: New cls_rule functions for setting registers and tun_id.
Ben Pfaff [Wed, 17 Nov 2010 18:06:37 +0000 (10:06 -0800)]
nicira-ext: Name the enum used for flow formats, to clarify code.
Ben Pfaff [Wed, 1 Dec 2010 00:49:10 +0000 (16:49 -0800)]
datapath: Add __aligned_u64 compat support for user and kernel headers.
__aligned_u64 is a 64-bit integer type that is guaranteed to be aligned on
a 64-bit boundary. It is used in ABI structures to allow them to be shared
between 32- and 64-bit userspace without the need for kernel compat code.
The first use in OVS is coming up in this series of patches.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Tue, 30 Nov 2010 23:58:55 +0000 (15:58 -0800)]
datapath: Change vals[] in struct port_lookup_key into discrete members.
The 'vals' array is only convenient for use by port_hash(). It's a
liability otherwise, since it makes the code wider and harder to read and
seems to me less amenable to compiler optimization.
In an upcoming patch the key needed in struct port_lookup_key will
increase in size to 64 bits, so that using an array of u32 becomes even
more problematic. Therefore, this commit gets rid of the array in favor
of discrete named members that carry the same information.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Ben Pfaff [Wed, 1 Dec 2010 00:54:50 +0000 (16:54 -0800)]
Format tunnel IDs consistently.
Some code failed to convert tunnel IDs to host byte order for printing,
so this fixes that. Some code printed tunnel IDs with a 0x prefix and
other code didn't, so this code uses the '#' flag consistently (which
prints 0x for nonzero values and omits it for zero).
This commit also stops always printing all 8 digits. When tunnel IDs
are expanded to 64 bits, as they will be soon, printing 16 digits all the
time wastes too much space.
Acked-by: Jesse Gross <jesse@nicira.com>
Jesse Gross [Wed, 24 Nov 2010 01:03:16 +0000 (17:03 -0800)]
datapath: Allow skbs with a frag list.
We can already receive packets with a frag list due to reassembly
in CAPWAP tunneling. Since we can handle it, we might as well open
it up to internal devices as well to prevent linearization.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Wed, 24 Nov 2010 00:46:47 +0000 (16:46 -0800)]
datapath: Don't set dev->last_rx on kernels >= 2.6.29.
dev->last_rx is used for rebalancing in Linux bonding. However,
on a SMP machine it quickly becomes a very hot cacheline. On
kernels 2.6.29 and later the networking core will update last_rx
only if bonding is in use, so drivers do not need to set it at all.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Wed, 24 Nov 2010 17:31:49 +0000 (09:31 -0800)]
tunnels: Mark tnl_ops as static.
Both GRE and CAPWAP have tnl_ops that are only accessed inside of
their respective files. Therefore mark these structures as static.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Wed, 24 Nov 2010 06:08:27 +0000 (22:08 -0800)]
datapath: Constify ops structures.
vport_ops, tunnel_ops, and ethtool_ops should not change at runtime.
Therefore, mark them as const to keep them out of the hotpath and to
prevent them from getting trampled.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Wed, 24 Nov 2010 17:27:10 +0000 (09:27 -0800)]
datapath: Provide compatibility code for SET_ETHTOOL_OPS constness.
On 2.6.18 dev->ethtool_ops was not marked as const. This adds a
compatibility macro that casts away the constness so we can mark
our ethtool ops as const on later kernels.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Wed, 24 Nov 2010 06:35:15 +0000 (22:35 -0800)]
datapath: Add compatibility code for inet_add_protocol().
Kernels earlier than 2.6.32 did not mark struct net_protocol as const
in inet_add_protcol() and inet_del_protocol(). This provides compatibility
code to cast away the constness on these kernels so we can have them be
const on newer kernels.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Wed, 24 Nov 2010 00:34:22 +0000 (16:34 -0800)]
datapath: Use __read_mostly annotations where appropriate.
Variables which are changed only infrequently should be annotated
with __read_mostly, which will group them together in a special
linker section. This prevents them from sharing cache lines with
data on the hot path.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Sat, 20 Nov 2010 01:20:34 +0000 (17:20 -0800)]
datapath: Don't unnecessarily set skb mac header.
We currently call skb_reset_mac_header() in a few places when a
packet is received. However, this is not needed because flow_extract()
will set all of the protocol headers during parsing and nothing needs
the packet headers before that time.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Fri, 19 Nov 2010 21:55:18 +0000 (13:55 -0800)]
datapath: Remove share check for internal devices.
When transmitting on a device, dev_hard_start_xmit() always provides
a private clone. The skb_share_check() in internal_dev_xmit() is
therefore unnecessary, so remove it.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Fri, 19 Nov 2010 21:49:54 +0000 (13:49 -0800)]
vport: Remove unused error types.
We currently track rx_over_errors, rx_crc_errors, rx_frame_errors,
and collisions but never increment these counters. It seems likely
that we will never use them since they are primarily hardware errors
and we pull hardware stats directly from the NIC. This removes those
counters, saving 32 bytes per port.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Fri, 19 Nov 2010 21:19:55 +0000 (13:19 -0800)]
datapath: Drop obsolete comment.
The comment above flow_extract() refers to setting OVS_CB(skb)->is_frag
but that member no longer exists. The correct way to set is_frag is
already documented, so just drop the incorrect comment.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Jesse Gross [Thu, 2 Dec 2010 21:07:36 +0000 (13:07 -0800)]
tunneling: Clear IP control block in one memset.
We currently clear both the members of the IPCB individually before
entering the IP stack. It's simpler and more robust to just clear
the entire structure.
Suggested-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Jesse Gross [Fri, 19 Nov 2010 21:10:14 +0000 (13:10 -0800)]
tunneling: Clear OVS_CB after call to update_header().
If a packet is traversing the IP stack we need to clear some pieces
of the skb CB beforehand. We currently do this before the call to
update_header() but header generation may need some members of the
CB, such as the key. Therefore, zero out the CB only after the
header is complete.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>