Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Nov 2010 09:41:49 +0100
From:      Fabien Thomas <fabien.thomas@netasq.com>
To:        Jack Vogel <jfvogel@gmail.com>
Cc:        FreeBSD Net <freebsd-net@freebsd.org>, Vlad Galu <dudu@dudu.ro>, Eugene Grosbein <egrosbein@rdtc.ru>
Subject:   Re: request for MFC of em/igb drivers
Message-ID:  <F557684C-949D-4C8B-B1F0-C33D2C9B142D@netasq.com>
In-Reply-To: <4CEB567C.9000906@rdtc.ru>
References:  <20101117070422.GA45678@cabstand.com>	<4CE3D097.7030204@grosbein.pp.ru>	<AANLkTinVugN-6dDvdfByq1eCevqcayusK_LECi2kdREJ@mail.gmail.com> <AANLkTimS7pu1zobeen1_%2BaaSZ7ojaWO0nsG%2BJ89nxK8v@mail.gmail.com> <4CEB567C.9000906@rdtc.ru>

next in thread | previous in thread | raw e-mail | index | archive | help

--Apple-Mail-18-809381120
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

That fix on ixgbe would also be great to commit on ixgbe before release.
This fix a crash on high packet load with bpf (mbuf freed behind bpf =
analysis).

Fabien


--Apple-Mail-18-809381120
Content-Disposition: attachment;
	filename=patch-ixgbe-bpfcrash
Content-Type: application/octet-stream;
	name="patch-ixgbe-bpfcrash"
Content-Transfer-Encoding: 7bit

diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c
index 174c08d..073818e 100644
--- a/sys/dev/ixgbe/ixgbe.c
+++ b/sys/dev/ixgbe/ixgbe.c
@@ -1591,6 +1702,10 @@ ixgbe_xmit(struct tx_ring *txr, struct mbuf **m_headp)
 
 	m_head = *m_headp;
 
+	/* Do a clean if descriptors are low */
+	if (txr->tx_avail <= IXGBE_TX_CLEANUP_THRESHOLD)
+		ixgbe_txeof(txr);
+
 	/* Basic descriptor defines */
         cmd_type_len = (IXGBE_ADVTXD_DTYP_DATA |
 	    IXGBE_ADVTXD_DCMD_IFCS | IXGBE_ADVTXD_DCMD_DEXT);
@@ -1740,10 +1855,6 @@ ixgbe_xmit(struct tx_ring *txr, struct mbuf **m_headp)
 	++txr->total_packets;
 	IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDT(txr->me), i);
 
-	/* Do a clean if descriptors are low */
-	if (txr->tx_avail <= IXGBE_TX_CLEANUP_THRESHOLD)
-		ixgbe_txeof(txr);
-
 	return (0);
 
 xmit_fail:

--Apple-Mail-18-809381120
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

> 

> On 17.11.2010 23:39, Jack Vogel wrote:
>> Yes, everyone, I plan on updating all the drivers, there has been no
>> activity
>> because I've tracking down a couple bugs that are tough, involving days
>> of testing to reproduce. I know we're getting close and I appreciate any
>> reports like this before.
>> 
>> Stay tuned....
>> 
>> Jack
> 
> Thanks for response. Do you play to MFC fixes before 8.2-RELEASE?
> We are in PRERELEASE state already :-)
> _______________________________________________
> freebsd-net@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-net
> To unsubscribe, send any mail to "freebsd-net-unsubscribe@freebsd.org"


--Apple-Mail-18-809381120--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F557684C-949D-4C8B-B1F0-C33D2C9B142D>