[ovs-git] [openvswitch/ovs] abfcea: datapath: Remove compat vxlan_src_port().

GitHub noreply at github.com
Thu Feb 19 22:18:15 UTC 2015


  Branch: refs/heads/geneve-backport2
  Home:   https://github.com/openvswitch/ovs
  Commit: abfcea56163f9525508c63ff23b51e246feeca4f
      https://github.com/openvswitch/ovs/commit/abfcea56163f9525508c63ff23b51e246feeca4f
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

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

  Log Message:
  -----------
  datapath: Remove compat vxlan_src_port().

vxlan_src_port() has been replaced with the more generic
udp_flow_src_port() upstream. We already have a backport for this and
it is used everywhere where this is needed, so we can remove the
dead vxlan_src_port() function.

Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: 79c4a02f94b17c66c4ebdd5d362b6e098cd74e3b
      https://github.com/openvswitch/ovs/commit/79c4a02f94b17c66c4ebdd5d362b6e098cd74e3b
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/.gitignore
    M datapath/linux/Modules.mk
    A datapath/linux/compat/include/net/udp_tunnel.h
    A datapath/linux/compat/udp_tunnel.c

  Log Message:
  -----------
  datapath: Account for "udp: Add udp_sock_create for UDP tunnels to open listener socket"

Upstream commit:
    udp: Add udp_sock_create for UDP tunnels to open listener socket

    Added udp_tunnel.c which can contain some common functions for UDP
    tunnels. The first function in this is udp_sock_create which is used
    to open the listener port for a UDP tunnel.

    Signed-off-by: Tom Herbert <therbert at google.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Upstream: 8024e028 ("udp: Add udp_sock_create for UDP tunnels to open listener socket")
Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: 10b3fb49b29b6792b795a6375cbcafe7950ccc62
      https://github.com/openvswitch/ovs/commit/10b3fb49b29b6792b795a6375cbcafe7950ccc62
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/compat/vxlan.c

  Log Message:
  -----------
  datapath: Account for "vxlan: Call udp_sock_create"

Upstream commit:
    vxlan: Call udp_sock_create

    In vxlan driver call common function udp_sock_create to create the
    listener UDP port.

    Signed-off-by: Tom Herbert <therbert at google.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Upstream: 3ee64f39 ("vxlan: Call udp_sock_create")
Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: 3700ca7644f8cd968be38236d5e150d270dcfa03
      https://github.com/openvswitch/ovs/commit/3700ca7644f8cd968be38236d5e150d270dcfa03
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/vport-lisp.c

  Log Message:
  -----------
  datapath: Use udp_sock_create() for LISP.

Use the common udp_sock_create() for LISP, similar to what was
done for VXLAN.

Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: a83166607ba449c07f6e60cfe4edebcbd86922e2
      https://github.com/openvswitch/ovs/commit/a83166607ba449c07f6e60cfe4edebcbd86922e2
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/.gitignore
    M datapath/linux/Modules.mk
    M datapath/linux/compat/include/net/udp.h
    A datapath/linux/compat/udp.c

  Log Message:
  -----------
  datapath: Account for "udp: Generic functions to set checksum"

Upstream commit:
    udp: Generic functions to set checksum

    Added udp_set_csum and udp6_set_csum functions to set UDP checksums
    in packets. These are for simple UDP packets such as those that might
    be created in UDP tunnels.

    Signed-off-by: Tom Herbert <therbert at google.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Upstream: af5fcba7 ("udp: Generic functions to set checksum")
Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: aa8cb43d8166058f0062b94972dac444fc1cbe6a
      https://github.com/openvswitch/ovs/commit/aa8cb43d8166058f0062b94972dac444fc1cbe6a
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/compat/gso.c
    M datapath/linux/compat/gso.h
    M datapath/linux/compat/include/net/ip_tunnels.h
    M datapath/linux/compat/ip_tunnels_core.c

  Log Message:
  -----------
  datapath: Enable OVS GSO to be used up to 3.18 if necessary.

There are two important GSO tunnel features that were introduced
after the 3.12 cutoff for our current out of tree GSO implementation:
 * 3.16 introduced support for outer UDP checksums.
 * 3.18 introduced support for verifying hardware support for protocols
   other than VXLAN.

In cases where these features are used, we should use OVS GSO to
ensure correct behavior. However, we also want to continue to use
kernel GSO or hardware TSO in existing situations. Therefore, this
extends the range of kernels where OVS GSO is available to 3.18 and
makes it easier to select which one to use.

Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: 1b38d787c18237ba40daec9f4d505a5423871f61
      https://github.com/openvswitch/ovs/commit/1b38d787c18237ba40daec9f4d505a5423871f61
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/compat/gso.c
    M datapath/linux/compat/include/net/udp_tunnel.h
    M datapath/linux/compat/udp_tunnel.c

  Log Message:
  -----------
  datapath: Account for "udp-tunnel: Add a few more UDP tunnel APIs"

Upstream commit:
    udp-tunnel: Add a few more UDP tunnel APIs

    Added a few more UDP tunnel APIs that can be shared by UDP based
    tunnel protocol implementation. The main ones are highlighted below.

    setup_udp_tunnel_sock() configures UDP listener socket for
    receiving UDP encapsulated packets.

    udp_tunnel_xmit_skb() and upd_tunnel6_xmit_skb() transmit skb
    using UDP encapsulation.

    udp_tunnel_sock_release() closes the UDP tunnel listener socket.

    Signed-off-by: Andy Zhou <azhou at nicira.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Upstream: 6a93cc90 ("udp-tunnel: Add a few more UDP tunnel APIs")
Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: 3784be1e6bbff0b51f45b69af4c2284583945bd6
      https://github.com/openvswitch/ovs/commit/3784be1e6bbff0b51f45b69af4c2284583945bd6
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/compat/gre.c
    M datapath/linux/compat/ip_tunnels_core.c
    M datapath/linux/compat/vxlan.c
    M datapath/vport-lisp.c

  Log Message:
  -----------
  datapath: Consistently set skb->inner_protocol for tunnels.

skb->inner_protocol is used by GSO and TSO for tunnels on new
kernels. Since we are setting up packets to be handled by the
kernel's GSO and not just our own, we need to initialize this
field properly.

Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: 5995ba76411e9432de17f8ae42fe6f404ddc9fad
      https://github.com/openvswitch/ovs/commit/5995ba76411e9432de17f8ae42fe6f404ddc9fad
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/compat/vxlan.c

  Log Message:
  -----------
  datapath: Account for "vxlan: Refactor vxlan driver to make use of the common UDP tunnel functions."

Upstream commit:
    vxlan: Refactor vxlan driver to make use of the common UDP tunnel functions.

    Simplify vxlan implementation using common UDP tunnel APIs.

    Signed-off-by: Andy Zhou <azhou at nicira.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Using the upstream functions where available also has the side effect
of ensuring that we can use hardware offloads. The GBP changes forced
the use of the OVS emulated GSO path on kernels that lack GBP. This
resulted in the loss of VXLAN offload on earlier kernels. This restores
the offload support (for both GBP and non-GBP VXLAN).

Upstream: acbf74a7 ("vxlan: Refactor vxlan driver to make use of the common UDP tunnel functions.")
Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: a1d193e32dc4ac4e843d21a5cd008fb79d891f2d
      https://github.com/openvswitch/ovs/commit/a1d193e32dc4ac4e843d21a5cd008fb79d891f2d
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/vport-lisp.c

  Log Message:
  -----------
  datapath: Use additional common UDP functions for LISP.

LISP can also take advantage of setup_udp_tunnel_sock() and
udp_tunnel_xmit_skb() to increase code reuse.

Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: 23098dcbd4b78c47f45f7a9cdfc2892eb1ee9772
      https://github.com/openvswitch/ovs/commit/23098dcbd4b78c47f45f7a9cdfc2892eb1ee9772
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/compat/include/linux/if_vlan.h
    M datapath/linux/compat/vxlan.c

  Log Message:
  -----------
  datapath: Account for "vlan: introduce *vlan_hwaccel_push_inside helpers"

Upstream commit:
    vlan: introduce *vlan_hwaccel_push_inside helpers

    Use them to push skb->vlan_tci into the payload and avoid code
    duplication.

    Signed-off-by: Jiri Pirko <jiri at resnulli.us>
    Acked-by: Pravin B Shelar <pshelar at nicira.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Upstream: 5968250c ("vlan: introduce *vlan_hwaccel_push_inside helpers")
Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: 3523f0ba166302e6d40c53f9115e90921d57e36f
      https://github.com/openvswitch/ovs/commit/3523f0ba166302e6d40c53f9115e90921d57e36f
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

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

  Log Message:
  -----------
  datapath: Account for "udp: Do not require sock in udp_tunnel_xmit_skb"

Upstream commit:
    udp: Do not require sock in udp_tunnel_xmit_skb

    The UDP tunnel transmit functions udp_tunnel_xmit_skb and
    udp_tunnel6_xmit_skb include a socket argument. The socket being
    passed to the functions (from VXLAN) is a UDP created for receive
    side. The only thing that the socket is used for in the transmit
    functions is to get the setting for checksum (enabled or zero).
    This patch removes the argument and and adds a nocheck argument
    for checksum setting. This eliminates the unnecessary dependency
    on a UDP socket for UDP tunnel transmit.

    Signed-off-by: Tom Herbert <therbert at google.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Upstream: d998f8ef ("udp: Do not require sock in udp_tunnel_xmit_skb")
Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: d35e26f3e3311282efa4a2c53c9f8d02446b1562
      https://github.com/openvswitch/ovs/commit/d35e26f3e3311282efa4a2c53c9f8d02446b1562
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M datapath/linux/.gitignore
    M datapath/linux/Modules.mk
    A datapath/linux/compat/geneve.c
    M datapath/linux/compat/include/net/geneve.h
    M datapath/vport-geneve.c

  Log Message:
  -----------
  datapath: Backport upstream Geneve implementation.

This resolves the differences between the OVS Geneve implementation
and the upstream kernel, particularly in the area of the split
between vport-geneve.c and the generic Geneve data plane.

Signed-off-by: Jesse Gross <jesse at nicira.com>


  Commit: c8eddf81f0056f54d26f11c493f074c3d89f79dc
      https://github.com/openvswitch/ovs/commit/c8eddf81f0056f54d26f11c493f074c3d89f79dc
  Author: Jesse Gross <jesse at nicira.com>
  Date:   2015-02-19 (Thu, 19 Feb 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 "openvswitch: Add support for checksums on UDP tunnels."

Upstream commit:
    openvswitch: Add support for checksums on UDP tunnels.

    Currently, it isn't possible to request checksums on the outer UDP
    header of tunnels - the TUNNEL_CSUM flag is ignored. This adds
    support for requesting that UDP checksums be computed on transmit
    and properly reported if they are present on receive.

    Signed-off-by: Jesse Gross <jesse at nicira.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Upstream: b8693877 ("openvswitch: Add support for checksums on UDP tunnels.")
Signed-off-by: Jesse Gross <jesse at nicira.com>


Compare: https://github.com/openvswitch/ovs/compare/abfcea56163f^...c8eddf81f005


More information about the git mailing list