[PATCH net] openvswitch: Remove incorrect WARN_ONCE().

[PATCH net] openvswitch: Remove incorrect WARN_ONCE().

[Jarno Rajahalme]

ovs_ct_find_existing() issues a warning if an existing conntrack entry
classified as IP_CT_NEW is found, with the premise that this should
not happen.  However, a newly confirmed, non-expected conntrack entry
remains IP_CT_NEW as long as no reply direction traffic is seen.  This
has resulted into somewhat confusing kernel log messages.  This patch
removes this check and warning.

Fixes: 289f2253 ("openvswitch: Find existing conntrack entry after upcall.")
Suggested-by: Joe Stringer <joe@ovn.org>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
---
 net/openvswitch/conntrack.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index c644c78..e054a74 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -433,7 +433,6 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone,
 	struct nf_conntrack_l4proto *l4proto;
 	struct nf_conntrack_tuple tuple;
 	struct nf_conntrack_tuple_hash *h;
-	enum ip_conntrack_info ctinfo;
 	struct nf_conn *ct;
 	unsigned int dataoff;
 	u8 protonum;
@@ -458,13 +457,8 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone,
 
 	ct = nf_ct_tuplehash_to_ctrack(h);
 
-	ctinfo = ovs_ct_get_info(h);
-	if (ctinfo == IP_CT_NEW) {
-		/* This should not happen. */
-		WARN_ONCE(1, "ovs_ct_find_existing: new packet for %p\n", ct);
-	}
 	skb->nfct = &ct->ct_general;
-	skb->nfctinfo = ctinfo;
+	skb->nfctinfo = ovs_ct_get_info(h);
 	return ct;
 }
 
-- 
2.1.4

Re: [PATCH net] openvswitch: Remove incorrect WARN_ONCE().

[Joe Stringer]

On 1 August 2016 at 19:36, Jarno Rajahalme <jarno@ovn.org> wrote:
> ovs_ct_find_existing() issues a warning if an existing conntrack entry
> classified as IP_CT_NEW is found, with the premise that this should
> not happen.  However, a newly confirmed, non-expected conntrack entry
> remains IP_CT_NEW as long as no reply direction traffic is seen.  This
> has resulted into somewhat confusing kernel log messages.  This patch
> removes this check and warning.
>
> Fixes: 289f2253 ("openvswitch: Find existing conntrack entry after upcall.")
> Suggested-by: Joe Stringer <joe@ovn.org>
> Signed-off-by: Jarno Rajahalme <jarno@ovn.org>

Thanks for the patch, this will remove a false positive kernel log
from a common case in OVS with stateful processing.

Acked-by: Joe Stringer <joe@ovn.org>

Re: [PATCH net] openvswitch: Remove incorrect WARN_ONCE().

[David Miller]

From: Jarno Rajahalme <jarno@ovn.org>
Date: Mon,  1 Aug 2016 19:36:07 -0700

> ovs_ct_find_existing() issues a warning if an existing conntrack entry
> classified as IP_CT_NEW is found, with the premise that this should
> not happen.  However, a newly confirmed, non-expected conntrack entry
> remains IP_CT_NEW as long as no reply direction traffic is seen.  This
> has resulted into somewhat confusing kernel log messages.  This patch
> removes this check and warning.
> 
> Fixes: 289f2253 ("openvswitch: Find existing conntrack entry after upcall.")
> Suggested-by: Joe Stringer <joe@ovn.org>
> Signed-off-by: Jarno Rajahalme <jarno@ovn.org>

Applied, thanks.