linux-toradex.git/net/openvswitch/flow_table.c, branch v4.4-rc6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-20T13:08:27+00:00

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller

openvswitch: add tunnel protocol to sw_flow_key

2015-10-07T11:17:59+00:00

Store tunnel protocol (AF_INET or AF_INET6) in sw_flow_key. This field now
also acts as an indicator whether the flow contains tunnel data (this was
previously indicated by tun_key.u.ipv4.dst being set but with IPv6 addresses
in an union with IPv4 ones this won't work anymore).

The new field was added to a hole in sw_flow_key.

Signed-off-by: Jiri Benc 
Acked-by: Pravin B Shelar 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller

ovs: do not allocate memory from offline numa node

2015-10-05T13:42:03+00:00

When openvswitch tries allocate memory from offline numa node 0:
stats = kmem_cache_alloc_node(flow_stats_cache, GFP_KERNEL | __GFP_ZERO, 0)
It catches VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES || !node_online(nid))
[ replaced with VM_WARN_ON(!node_online(nid)) recently ] in linux/gfp.h
This patch disables numa affinity in this case.

Signed-off-by: Konstantin Khlebnikov 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Zero flows on allocation.

2015-09-23T00:33:41+00:00

When support for megaflows was introduced, OVS needed to start
installing flows with a mask applied to them. Since masking is an
expensive operation, OVS also had an optimization that would only
take the parts of the flow keys that were covered by a non-zero
mask. The values stored in the remaining pieces should not matter
because they are masked out.

While this works fine for the purposes of matching (which must always
look at the mask), serialization to netlink can be problematic. Since
the flow and the mask are serialized separately, the uninitialized
portions of the flow can be encoded with whatever values happen to be
present.

In terms of functionality, this has little effect since these fields
will be masked out by definition. However, it leaks kernel memory to
userspace, which is a potential security vulnerability. It is also
possible that other code paths could look at the masked key and get
uninitialized data, although this does not currently appear to be an
issue in practice.

This removes the mask optimization for flows that are being installed.
This was always intended to be the case as the mask optimizations were
really targetting per-packet flow operations.

Fixes: 03f0d916 ("openvswitch: Mega flow implementation")
Signed-off-by: Jesse Gross 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

ip_tunnels: add IPv6 addresses to ip_tunnel_key

2015-08-20T22:42:36+00:00

Add the IPv6 addresses as an union with IPv4 ones. When using IPv4, the
newly introduced padding after the IPv4 addresses needs to be zeroed out.

Signed-off-by: Jiri Benc 
Acked-by: Thomas Graf 
Acked-by: Alexei Starovoitov 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-07-23T07:41:16+00:00

Conflicts:
	net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

Signed-off-by: David S. Miller

openvswitch: allocate nr_node_ids flow_stats instead of num_possible_nodes

2015-07-22T05:26:03+00:00

Some architectures like POWER can have a NUMA node_possible_map that
contains sparse entries. This causes memory corruption with openvswitch
since it allocates flow_cache with a multiple of num_possible_nodes() and
assumes the node variable returned by for_each_node will index into
flow->stats[node].

Use nr_node_ids to allocate a maximal sparse array instead of
num_possible_nodes().

The crash was noticed after 3af229f2 was applied as it changed the
node_possible_map to match node_online_map on boot.
Fixes: 3af229f2071f5b5cb31664be6109561fbe19c861

Signed-off-by: Chris J Arges 
Acked-by: Pravin B Shelar 
Acked-by: Nishanth Aravamudan 
Signed-off-by: David S. Miller

openvswitch: Make tunnel set action attach a metadata dst

2015-07-21T17:39:06+00:00

Utilize the new metadata dst to attach encapsulation instructions to
the skb. The existing egress_tun_info via the OVS_CB() is left in
place until all tunnel vports have been converted to the new method.

Signed-off-by: Thomas Graf 
Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Initialize unmasked key and uid len

2015-02-08T08:51:14+00:00

Flow alloc needs to initialize unmasked key pointer. Otherwise
it can crash kernel trying to free random unmasked-key pointer.

general protection fault: 0000 [#1] SMP
3.19.0-rc6-net-next+ #457
Hardware name: Supermicro X7DWU/X7DWU, BIOS  1.1 04/30/2008
RIP: 0010:[] [] kfree+0xac/0x196
Call Trace:
 [] flow_free+0x21/0x59 [openvswitch]
 [] ovs_flow_free+0x21/0x23 [openvswitch]
 [] ovs_packet_cmd_execute+0x2f3/0x35f [openvswitch]
 [] ? ovs_packet_cmd_execute+0x13e/0x35f [openvswitch]
 [] ? nla_parse+0x4f/0xec
 [] genl_family_rcv_msg+0x26d/0x2c9
 [] ? __lock_acquire+0x90e/0x9aa
 [] genl_rcv_msg+0x66/0x89
 [] ? genl_family_rcv_msg+0x2c9/0x2c9
 [] netlink_rcv_skb+0x3e/0x95
 [] ? genl_rcv+0x18/0x37
 [] genl_rcv+0x27/0x37
 [] netlink_unicast+0x103/0x191
 [] netlink_sendmsg+0x2c1/0x310
 [] ? might_fault+0x50/0xa0
 [] do_sock_sendmsg+0x5f/0x7a
 [] sock_sendmsg+0xb/0xd
 [] ___sys_sendmsg+0x1a3/0x218
 [] ? get_close_on_exec+0x86/0x86
 [] ? fsnotify+0x32c/0x348
 [] ? fsnotify+0x7c/0x348
 [] ? __fget+0xaa/0xbf
 [] ? get_close_on_exec+0x86/0x86
 [] __sys_sendmsg+0x3d/0x5e
 [] SyS_sendmsg+0x14/0x16
 [] system_call_fastpath+0x12/0x17

Fixes: 74ed7ab9264("openvswitch: Add support for unique flow IDs.")
CC: Joe Stringer 
Reported-by: Or Gerlitz 
Signed-off-by: Pravin B Shelar 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

openvswitch: Add support for unique flow IDs.

2015-01-26T23:45:50+00:00

Previously, flows were manipulated by userspace specifying a full,
unmasked flow key. This adds significant burden onto flow
serialization/deserialization, particularly when dumping flows.

This patch adds an alternative way to refer to flows using a
variable-length "unique flow identifier" (UFID). At flow setup time,
userspace may specify a UFID for a flow, which is stored with the flow
and inserted into a separate table for lookup, in addition to the
standard flow table. Flows created using a UFID must be fetched or
deleted using the UFID.

All flow dump operations may now be made more terse with OVS_UFID_F_*
flags. For example, the OVS_UFID_F_OMIT_KEY flag allows responses to
omit the flow key from a datapath operation if the flow has a
corresponding UFID. This significantly reduces the time spent assembling
and transacting netlink messages. With all OVS_UFID_F_OMIT_* flags
enabled, the datapath only returns the UFID and statistics for each flow
during flow dump, increasing ovs-vswitchd revalidator performance by 40%
or more.

Signed-off-by: Joe Stringer 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller