Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Jun 2014 23:22:25 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r267244 - stable/10/sys/dev/cxgbe
Message-ID:  <201406082322.s58NMPOd018317@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: np
Date: Sun Jun  8 23:22:25 2014
New Revision: 267244
URL: http://svnweb.freebsd.org/changeset/base/267244

Log:
  MFC r267082:
  cxgbe(4):  Properly account for the freelist buffers used when returning
  early from service_iq due to a budget restriction.  This fixes a potential
  rx hang when using INTx.

Modified:
  stable/10/sys/dev/cxgbe/t4_sge.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- stable/10/sys/dev/cxgbe/t4_sge.c	Sun Jun  8 21:21:54 2014	(r267243)
+++ stable/10/sys/dev/cxgbe/t4_sge.c	Sun Jun  8 23:22:25 2014	(r267244)
@@ -1361,8 +1361,15 @@ service_iq(struct sge_iq *iq, int budget
 				}
 #endif
 
-				if (budget)
+				if (budget) {
+					if (fl_bufs_used) {
+						FL_LOCK(fl);
+						fl->needed += fl_bufs_used;
+						refill_fl(sc, fl, 32);
+						FL_UNLOCK(fl);
+					}
 					return (EINPROGRESS);
+				}
 			}
 		}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406082322.s58NMPOd018317>