[ovs-git] [openvswitch/ovs] 27d09f: Revert "dpif: Ensure ERSPAN GRE support"

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 27d09fbc647901f4edd3c4112595695229c50e8c
      https://github.com/openvswitch/ovs/commit/27d09fbc647901f4edd3c4112595695229c50e8c
  Author: Greg Rose <gvrose8192 at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M lib/dpif-netlink-rtnl.c

  Log Message:
  -----------
  Revert "dpif: Ensure ERSPAN GRE support"

This reverts commit 8929c55287abae37efeac1e8876e6b3c2ccad0b9.

This is the wrong direction for the solution to the ip_gre/gre kernel
module conflicts, as reported by Jiri Benc <jbenc at redhat.com> and others in
https://mail.openvswitch.org/pipermail/ovs-dev/2018-June/347803.html and
elsewhere in the same thread

Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>
Acked-by: William Tu <u9012063 at gmail.com>


  Commit: a94f9524dbc11c78c83d1a49959497f5e73bf949
      https://github.com/openvswitch/ovs/commit/a94f9524dbc11c78c83d1a49959497f5e73bf949
  Author: Greg Rose <gvrose8192 at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M utilities/ovs-lib.in

  Log Message:
  -----------
  Revert "utilities/ovs-ctl: Force removal of ip_gre/gre"

This reverts commit 2bdd1f3d96a86bea6bdb8788f23ec7dd99b289e3.

This is the wrong direction for the solution to the ip_gre/gre kernel
module conflicts, as reported by Jiri Benc <jbenc at redhat.com> and others in
https://mail.openvswitch.org/pipermail/ovs-dev/2018-June/347803.html and
elsewhere in the same thread

Rather than attempting to force the removal of the ip_gre/gre kernel
modules, which often fails because they're in use, we will add a patch that
does not cause the openvswitch kernel module to fail to load when the
ip_gre/gre protocol entry points are already claimed.

Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>
Acked-by: William Tu <u9012063 at gmail.com>


  Commit: 9f4aacc3624abec064a970a9cc038f0ee0942896
      https://github.com/openvswitch/ovs/commit/9f4aacc3624abec064a970a9cc038f0ee0942896
  Author: Greg Rose <gvrose8192 at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M datapath/linux/compat/gre.c
    M datapath/vport.c

  Log Message:
  -----------
  datapath: Do not fail to load on gre protocol conflict

The ERSPAN feature depends on the gre kernel module so on systems where
the ERSPAN feature isn't supported the openvswitch kernel module would
attempt to grab the ipv4 GRE protocol entry point and would fail to load
if it could not.

This patch modifies openvswitch to not fail to load when the gre kernel
module is loaded and instead it will print a warning message to the
kernel system log indicating that the ERSPAN feature may not be
available.

We need this patch because users are experiencing failures due to the
conflicts and high priority bugs are resulting.

Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>
Acked-by: William Tu <u9012063 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/179bc3bdc2ef...9f4aacc3624a
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.