[ovs-dev] Revert "Revert "utilities/ovs-ctl: Force removal of ip_gre/gre""

[Gregory Rose]

On 9/12/2018 3:09 PM, Ben Pfaff wrote:
> On Tue, Sep 11, 2018 at 06:52:35AM -0700, Yifeng Sun wrote:
>> Please backport this patch to upstream OVS down to 2.10.
>>
>> Author: Greg Rose <roseg at vmware.com>
>> Date:   Wed Jun 6 15:34:44 2018 -0700
>>
>> This reverts commit a94f9524dbc11c78c83d1a49959497f5e73bf949.
>>
>> Signed-off-by: Greg Rose <roseg at vmware.com>
> The log message should explain why the commit is being reverted.
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Ben,

Here's a patch with a better commit messsage:

From: Yifeng Sun <pkusunyifeng at gmail.com>
Date: Tue, 11 Sep 2018 06:52:35 -0700
Subject: [PATCH] Revert "Revert "utilities/ovs-ctl: Force removal of
  ip_gre/gre""

Please backport this patch to upstream OVS down to 2.10.

Author: Greg Rose <roseg at vmware.com>
Date:   Wed Jun 6 15:34:44 2018 -0700

This reverts commit a94f9524dbc11c78c83d1a49959497f5e73bf949.

This is a revert of a previously reverted commit
2bdd1f3d96a86bea6bdb8788f23ec7dd99b289e3.

When we originally added commit 2bdd1f3d96 it was part of an
effort to work around gre module conflicts found while enabling
the ERSPAN feature. Testing at the time did not show any benefit
so in commit a94f9524db we reverted it.  However, further
developments showed that in some corner cases it did have a
benefit and it did not do any harm so we reverted the original
revert to restore the code.

Signed-off-by: Greg Rose <roseg at vmware.com>
---
  utilities/ovs-lib.in | 8 ++++++++
  1 file changed, 8 insertions(+)

diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index 090a144..f6b5393 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -627,6 +627,14 @@ force_reload_kmod () {
          action "Removing datapath: $dp" ovs-dpctl del-dp "$dp"
      done

+    if test -e /sys/module/ip_gre; then
+        action "Forcing removal of ip_gre module" rmmod ip_gre
+    fi
+
+    if test -e /sys/module/gre; then
+        action "Forcing removal of gre module" rmmod gre
+    fi
+
      ovs_kmod_ctl remove

      # Start vswitchd by asking it to wait till flow restore is finished.
--
1.8.3.1