[ovs-dev] ovs-lib.in: Remove unnecessary conntrack flush

Message ID 1540932445-4832-1-git-send-email-yihung.wei@gmail.com
State Accepted
Headers show
Series
  • [ovs-dev] ovs-lib.in: Remove unnecessary conntrack flush
Related show

Commit Message

Yi-Hung Wei Oct. 30, 2018, 8:47 p.m.
We introduced flush-conntrack in force-reload-kmod script by commit
8bea39b186ca ("datapath: Prevent panic") to prevent kernel panic.
It turns out that the kernel panic is actually triggered by the
IPv4 secret timer, and it is fixed by commit
121905984724 ("compat: Initialize IPv4 reassembly secret timer").

This commit removes the unnecessary conntrack flush in the script.

Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
CC: Greg Rose <gvrose8192@gmail.com>
---
 utilities/ovs-lib.in | 3 ---
 1 file changed, 3 deletions(-)

Comments

Gregory Rose Oct. 30, 2018, 10:03 p.m. | #1
On 10/30/2018 1:47 PM, Yi-Hung Wei wrote:
> We introduced flush-conntrack in force-reload-kmod script by commit
> 8bea39b186ca ("datapath: Prevent panic") to prevent kernel panic.
> It turns out that the kernel panic is actually triggered by the
> IPv4 secret timer, and it is fixed by commit
> 121905984724 ("compat: Initialize IPv4 reassembly secret timer").
>
> This commit removes the unnecessary conntrack flush in the script.
>
> Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
> CC: Greg Rose <gvrose8192@gmail.com>
> ---
>   utilities/ovs-lib.in | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
> index f6b539317a30..7df672c2c7bc 100644
> --- a/utilities/ovs-lib.in
> +++ b/utilities/ovs-lib.in
> @@ -608,9 +608,6 @@ force_reload_kmod () {
>       stop_ovsdb
>       start_ovsdb || return 1
>   
> -    if [ -n "$(ovs-dpctl show)" ]; then
> -        action "Flush old conntrack entries" ovs-appctl dpctl/flush-conntrack
> -    fi
>       stop_forwarding
>   
>       if action "Saving interface configuration" save_interfaces; then

LGTM.

Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Ben Pfaff Oct. 31, 2018, 5:41 p.m. | #2
On Tue, Oct 30, 2018 at 03:03:26PM -0700, Gregory Rose wrote:
> On 10/30/2018 1:47 PM, Yi-Hung Wei wrote:
> >We introduced flush-conntrack in force-reload-kmod script by commit
> >8bea39b186ca ("datapath: Prevent panic") to prevent kernel panic.
> >It turns out that the kernel panic is actually triggered by the
> >IPv4 secret timer, and it is fixed by commit
> >121905984724 ("compat: Initialize IPv4 reassembly secret timer").
> >
> >This commit removes the unnecessary conntrack flush in the script.
> >
> >Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
> >CC: Greg Rose <gvrose8192@gmail.com>
> >---
> >  utilities/ovs-lib.in | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> >diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
> >index f6b539317a30..7df672c2c7bc 100644
> >--- a/utilities/ovs-lib.in
> >+++ b/utilities/ovs-lib.in
> >@@ -608,9 +608,6 @@ force_reload_kmod () {
> >      stop_ovsdb
> >      start_ovsdb || return 1
> >-    if [ -n "$(ovs-dpctl show)" ]; then
> >-        action "Flush old conntrack entries" ovs-appctl dpctl/flush-conntrack
> >-    fi
> >      stop_forwarding
> >      if action "Saving interface configuration" save_interfaces; then
> 
> LGTM.
> 
> Reviewed-by: Greg Rose <gvrose8192@gmail.com>

Thanks Yi-Hung (and Greg).  I applied this to master and branch-2.10.
It doesn't look like 2.9 (and earlier) have the extra flush.

Patch

diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index f6b539317a30..7df672c2c7bc 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -608,9 +608,6 @@  force_reload_kmod () {
     stop_ovsdb
     start_ovsdb || return 1
 
-    if [ -n "$(ovs-dpctl show)" ]; then
-        action "Flush old conntrack entries" ovs-appctl dpctl/flush-conntrack
-    fi
     stop_forwarding
 
     if action "Saving interface configuration" save_interfaces; then