[ovs-git] [openvswitch/ovs] 06478c: datapath: compat: Use udp-checksum function for co...

GitHub noreply at github.com
Wed Aug 3 22:19:09 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 06478ca06a109b87894abfd2ed53c1ba5d7ef0fd
      https://github.com/openvswitch/ovs/commit/06478ca06a109b87894abfd2ed53c1ba5d7ef0fd
  Author: Pravin B Shelar <pshelar at ovn.org>
  Date:   2016-08-03 (Wed, 03 Aug 2016)

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

  Log Message:
  -----------
  datapath: compat: Use udp-checksum function for compat case.

udp_set_csum() has bug fix that is not relevant for upstream
(commit c77d947191b0).
So OVS need to use compat function. This function is also
used from UDP xmit path so we have to check USE_UPSTREAM_TUNNEL.
Following patch couple this function to USE_UPSTREAM_TUNNEL symbol
rather than kernel version.
This is not bug, This patch help in code readability.

Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>


  Commit: dfe999407a09cfa7052ab873fdebd4e910ac1312
      https://github.com/openvswitch/ovs/commit/dfe999407a09cfa7052ab873fdebd4e910ac1312
  Author: Pravin B Shelar <pshelar at ovn.org>
  Date:   2016-08-03 (Wed, 03 Aug 2016)

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

  Log Message:
  -----------
  datapath: fix size of struct ovs_gso_cb

struct ovs_gso_cb is stored in skb->cd. avoid going beyond size
of skb->cb.

Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>


  Commit: db4b6975c32829a1c6498055dd4366ab83fda5cf
      https://github.com/openvswitch/ovs/commit/db4b6975c32829a1c6498055dd4366ab83fda5cf
  Author: Pravin B Shelar <pshelar at ovn.org>
  Date:   2016-08-03 (Wed, 03 Aug 2016)

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

  Log Message:
  -----------
  datapath: compat: vxlan: fix udp-csum typo

Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>


  Commit: f325530e3990f969f665b20e8aa312d10c2ebbef
      https://github.com/openvswitch/ovs/commit/f325530e3990f969f665b20e8aa312d10c2ebbef
  Author: Pravin B Shelar <pshelar at ovn.org>
  Date:   2016-08-03 (Wed, 03 Aug 2016)

  Changed paths:
    M datapath/conntrack.c

  Log Message:
  -----------
  datapath: backport: openvswitch: fix conntrack netlink event delivery

Upstream commit:

    commit d913d3a763a6f66a862a6eafcf6da89a7905832a
    Author: Samuel Gauthier <samuel.gauthier at 6wind.com>
    Date:   Tue Jun 28 17:22:26 2016 +0200

    openvswitch: fix conntrack netlink event delivery

    Only the first and last netlink message for a particular conntrack are
    actually sent. The first message is sent through nf_conntrack_confirm when
    the conntrack is committed. The last one is sent when the conntrack is
    destroyed on timeout. The other conntrack state change messages are not
    advertised.

    When the conntrack subsystem is used from netfilter, nf_conntrack_confirm
    is called for each packet, from the postrouting hook, which in turn calls
    nf_ct_deliver_cached_events to send the state change netlink messages.

    This commit fixes the problem by calling nf_ct_deliver_cached_events in the
    non-commit case as well.

    Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
    CC: Joe Stringer <joestringer at nicira.com>
    CC: Justin Pettit <jpettit at nicira.com>
    CC: Andy Zhou <azhou at nicira.com>
    CC: Thomas Graf <tgraf at suug.ch>
    Signed-off-by: Samuel Gauthier <samuel.gauthier at 6wind.com>
    Acked-by: Joe Stringer <joe at ovn.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>


  Commit: 2255777604359f6414f86d8f2fccb67246f5b4f1
      https://github.com/openvswitch/ovs/commit/2255777604359f6414f86d8f2fccb67246f5b4f1
  Author: Pravin B Shelar <pshelar at ovn.org>
  Date:   2016-08-03 (Wed, 03 Aug 2016)

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

  Log Message:
  -----------
  datapath: backport: geneve: fix max_mtu setting

Upstream commit:
    commit d5d5e8d55732c7c35c354e45e3b0af2795978a57
    Author: Haishuang Yan <yanhaishuang at cmss.chinamobile.com>
    Date:   Sat Jul 2 15:02:48 2016 +0800

    geneve: fix max_mtu setting

    For ipv6+udp+geneve encapsulation data, the max_mtu should subtract
    sizeof(ipv6hdr), instead of sizeof(iphdr).

    Signed-off-by: Haishuang Yan <yanhaishuang at cmss.chinamobile.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>


  Commit: b416d16357345ad25b3d0e8ac478c59b27858d59
      https://github.com/openvswitch/ovs/commit/b416d16357345ad25b3d0e8ac478c59b27858d59
  Author: Pravin B Shelar <pshelar at ovn.org>
  Date:   2016-08-03 (Wed, 03 Aug 2016)

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

  Log Message:
  -----------
  datapath: compat: gso: tighen checks for compat GSO code.

Few function can be compiled out for non GSO case. This
patch make it bit cleaner to understand GSO compat code.

Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>


  Commit: aad4ff6a40c0e99bad5cc3c21458101b0894c1c4
      https://github.com/openvswitch/ovs/commit/aad4ff6a40c0e99bad5cc3c21458101b0894c1c4
  Author: Pravin B Shelar <pshelar at ovn.org>
  Date:   2016-08-03 (Wed, 03 Aug 2016)

  Changed paths:
    M datapath/linux/compat/udp.c
    M datapath/linux/compat/udp_tunnel.c

  Log Message:
  -----------
  datapath: compat: Use checksum offload for outer header.

Following patch simplifies UDP-checksum routine by unconditionally
using checksum offload for non GSO packets. We might get some
performance improvement due to code simplification.

Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>


Compare: https://github.com/openvswitch/ovs/compare/b4409ed6d3ae...aad4ff6a40c0


More information about the git mailing list