[ovs-git] [openvswitch/ovs] 1f649f: datapath: Account for rename to vlan_insert_tag_se...

Wed Jan 7 11:57:28 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 1f649f1c8d4e86e0b28baf1a9508f3ed09bd3d34
      https://github.com/openvswitch/ovs/commit/1f649f1c8d4e86e0b28baf1a9508f3ed09bd3d34
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M acinclude.m4
    M datapath/actions.c
    M datapath/datapath.c
    M datapath/linux/compat/gso.c
    M datapath/linux/compat/include/linux/if_vlan.h
    M datapath/linux/compat/vxlan.c
    M datapath/vport-geneve.c
    M datapath/vport-gre.c
    M datapath/vport-internal_dev.c

  Log Message:
  -----------
  datapath: Account for rename to vlan_insert_tag_set_proto()

__vlan_put_tag() was renamed to vlan_insert_tag_set_proto() with
the argument list kept intact.

Upstream: 62749e ("vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto")
Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>

  Commit: 17e3889fd18078784ad8e49c12ba2806b49c5b53
      https://github.com/openvswitch/ovs/commit/17e3889fd18078784ad8e49c12ba2806b49c5b53
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M acinclude.m4
    M datapath/linux/compat/include/linux/if_vlan.h

  Log Message:
  -----------
  datapath: Add __vlan_insert_tag() compat helper if not available

Since older kernels do not have skb->vlan_proto, it is assumed that
kernels which don't provide their own __vlan_insert_tag() will also
not have skb->vlan_proto. The backwards compat function therefore
only supports ETH_P_8021Q as the protocol type.

Upstream: 15255a43 ("vlan: introduce __vlan_insert_tag helper which does not free skb")
Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>

  Commit: 5cce04b6f6527f4de2a71e22a4dc968a4c147d13
      https://github.com/openvswitch/ovs/commit/5cce04b6f6527f4de2a71e22a4dc968a4c147d13
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M acinclude.m4
    M datapath/actions.c
    M datapath/linux/compat/include/linux/skbuff.h
    M datapath/linux/compat/skbuff-openvswitch.c

  Log Message:
  -----------
  datapath: move make_writable helper into common code

note that skb_make_writable already exists in net/netfilter/core.c
but does something slightly different.

Upstream: e219512 ("net: move make_writable helper into common code")
Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>

  Commit: 97894370f506b0528dc223152bdb72aaa39bfc06
      https://github.com/openvswitch/ovs/commit/97894370f506b0528dc223152bdb72aaa39bfc06
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M acinclude.m4
    M datapath/actions.c
    M datapath/linux/compat/include/linux/skbuff.h
    M datapath/linux/compat/skbuff-openvswitch.c

  Log Message:
  -----------
  datapath: move vlan pop/push functions into common code

So it can be used from out of openvswitch code.
Did couple of cosmetic changes on the way, namely variable naming and
adding support for 8021AD proto.

Note on backwards compatability:
Unlike the upstream version, the backport of skb_vlan_push() does not
support translating a hardware accelerated 8021AD tag to software.
This is not a problem though as it preserves existing behaviour.

Upstream: 93515d53 ("net: move vlan pop/push functions into common code")
Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>

  Commit: 5282e284ac575f52c19c89b1ffc392a181b3fa2b
      https://github.com/openvswitch/ovs/commit/5282e284ac575f52c19c89b1ffc392a181b3fa2b
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M datapath/datapath.c
    M datapath/vport-internal_dev.c
    M datapath/vport-internal_dev.h

  Log Message:
  -----------
  datapath: introduce rtnl ops stub

This stub now allows userspace to see IFLA_INFO_KIND for ovs master and
IFLA_INFO_SLAVE_KIND for slave.

Upstream: 5b9e7e16 ("openvswitch: introduce rtnl ops stub")
Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>

  Commit: 1dfb9f31f33e7e01944163d43a0e095ddd8dd31e
      https://github.com/openvswitch/ovs/commit/1dfb9f31f33e7e01944163d43a0e095ddd8dd31e
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M acinclude.m4
    M datapath/flow_table.c
    M datapath/linux/Modules.mk
    R datapath/linux/compat/hash-x86.c
    R datapath/linux/compat/hash.c
    R datapath/linux/compat/include/asm/hash.h
    R datapath/linux/compat/include/linux/hash.h

  Log Message:
  -----------
  datapath: replace remaining users of arch_fast_hash with jhash

This patch effectively reverts commit 500f80872645 ("net: ovs: use CRC32
accelerated flow hash if available"), and other remaining arch_fast_hash()
users such as from nfsd via commit 6282cd565553 ("NFSD: Don't hand out
delegations for 30 seconds after recalling them.") where it has been used
as a hash function for bloom filtering.

While we think that these users are actually not much of concern, it has
been requested to remove the arch_fast_hash() library bits that arose
from [1] entirely as per recent discussion [2]. The main argument is that
using it as a hash may introduce bias due to its linearity (see avalanche
criterion) and thus makes it less clear (though we tried to document that)
when this security/performance trade-off is actually acceptable for a
general purpose library function.

Lets therefore avoid any further confusion on this matter and remove it to
prevent any future accidental misuse of it. For the time being, this is
going to make hashing of flow keys a bit more expensive in the ovs case,
but future work could reevaluate a different hashing discipline.

  [1] https://patchwork.ozlabs.org/patch/299369/
  [2] https://patchwork.ozlabs.org/patch/418756/

Upstream: 8754589 ("net: replace remaining users of arch_fast_hash with jhash")
Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>

  Commit: 7ab1a0d8e3851067366f2af22b9aec87cd7083bc
      https://github.com/openvswitch/ovs/commit/7ab1a0d8e3851067366f2af22b9aec87cd7083bc
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M datapath/linux/compat/include/net/vxlan.h
    M datapath/linux/compat/vxlan.c
    M datapath/vport-vxlan.c

  Log Message:
  -----------
  datapath: Account for new flags args of vxlan_sock_add()

The upstream commit 359a0ea
("vxlan: Add support for UDP checksums (v4 sending, v6 zero csums)")
has introduced a new flags argument to vxlan_sock_add().

OVS does not pass any flags at this point, thus specyfing 0 will be
compatible with both the old ipv6 bool and the new u32 flags argument.

Upstream: 359a0ea ("vxlan: Add support for UDP checksums (v4 sending, v6 zero csums)")
Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>

  Commit: 0234d90b8bba353b9c17707aa898dfcfec035bd9
      https://github.com/openvswitch/ovs/commit/0234d90b8bba353b9c17707aa898dfcfec035bd9
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis: Update build matrix to include latest stable kernels

Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com>

Compare: https://github.com/openvswitch/ovs/compare/f06642420892...0234d90b8bba