From owner-svn-src-head@FreeBSD.ORG  Thu Jan 26 20:02:41 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2A74E106566B;
	Thu, 26 Jan 2012 20:02:41 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 197578FC0A;
	Thu, 26 Jan 2012 20:02:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0QK2eF3003816;
	Thu, 26 Jan 2012 20:02:40 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0QK2eWF003813;
	Thu, 26 Jan 2012 20:02:40 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201201262002.q0QK2eWF003813@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 26 Jan 2012 20:02:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230598 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jan 2012 20:02:41 -0000

Author: kmacy
Date: Thu Jan 26 20:02:40 2012
New Revision: 230598
URL: http://svn.freebsd.org/changeset/base/230598

Log:
  A flowtable entry can continue referencing an llentry indefinitely if the entry is repeatedly
  referenced within its timeout window. This change clears the LLE_VALID flag when an llentry
  is removed from an interface's hash table and adds an extra check to the flowtable code
  for the LLE_VALID flag in llentry to avoid retaining and using a stale reference.
  
  Reviewed by:	qingli@
  MFC after:	2 weeks

Modified:
  head/sys/net/flowtable.c
  head/sys/net/if_llatbl.c

Modified: head/sys/net/flowtable.c
==============================================================================
--- head/sys/net/flowtable.c	Thu Jan 26 19:46:13 2012	(r230597)
+++ head/sys/net/flowtable.c	Thu Jan 26 20:02:40 2012	(r230598)
@@ -1186,12 +1186,14 @@ keycheck:	
 	rt = __DEVOLATILE(struct rtentry *, fle->f_rt);
 	lle = __DEVOLATILE(struct llentry *, fle->f_lle);
 	if ((rt != NULL)
+	    && lle != NULL
 	    && fle->f_fhash == hash
 	    && flowtable_key_equal(fle, key)
 	    && (proto == fle->f_proto)
 	    && (fibnum == fle->f_fibnum)
 	    && (rt->rt_flags & RTF_UP)
-	    && (rt->rt_ifp != NULL)) {
+	    && (rt->rt_ifp != NULL)
+	    && (lle->la_flags & LLE_VALID)) {
 		fs->ft_hits++;
 		fle->f_uptime = time_uptime;
 		fle->f_flags |= flags;

Modified: head/sys/net/if_llatbl.c
==============================================================================
--- head/sys/net/if_llatbl.c	Thu Jan 26 19:46:13 2012	(r230597)
+++ head/sys/net/if_llatbl.c	Thu Jan 26 20:02:40 2012	(r230598)
@@ -122,6 +122,7 @@ llentry_free(struct llentry *lle)
 		("%s: la_numheld %d > 0, pkts_droped %zd", __func__, 
 		 lle->la_numheld, pkts_dropped));
 
+	lle->la_flags &= ~LLE_VALID;
 	LLE_FREE_LOCKED(lle);
 
 	return (pkts_dropped);