Author: gallatin
Date: Mon Apr 30 23:53:27 2018
New Revision: 333131
URL: https://svnweb.freebsd.org/changeset/base/333131
Log:
Fix iflib_encap() EFBIG handling bugs
1) Don't give up if m_collapse() fails. Rather than giving up, try
m_defrag() immediately.
2) Fix a leak where, if the NIC driver rejected the defrag'ed chain
as having too many segments, we would fail to free the chain.
Reviewed by: Matthew Macy <mm...@mattmacy.io> (this version of patch)
Submitted by: Matthew Macy <mm...@mattmacy.io> (early version of leak fix)
Modified:
head/sys/net/iflib.c
Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c Mon Apr 30 23:05:57 2018 (r333130)
+++ head/sys/net/iflib.c Mon Apr 30 23:53:27 2018 (r333131)
@@ -3244,8 +3244,12 @@ defrag:
switch (err) {
case EFBIG:
/* try collapse once and defrag once */
- if (remap == 0)
+ if (remap == 0) {
m_head = m_collapse(*m_headp, M_NOWAIT,
max_segs);
+ /* try defrag if collapsing fails */
+ if (m_head == NULL)
+ remap++;
+ }
if (remap == 1)
m_head = m_defrag(*m_headp, M_NOWAIT);
remap++;
@@ -3333,13 +3337,18 @@ defrag:
*/
txq->ift_pidx = pi.ipi_new_pidx;
txq->ift_npending += pi.ipi_ndescs;
- } else if (__predict_false(err == EFBIG && remap < 2)) {
+ } else {
*m_headp = m_head = iflib_remove_mbuf(txq);
- remap = 1;
- txq->ift_txd_encap_efbig++;
- goto defrag;
- } else
+ if (err == EFBIG) {
+ txq->ift_txd_encap_efbig++;
+ if (remap < 2) {
+ remap = 1;
+ goto defrag;
+ }
+ }
DBG_COUNTER_INC(encap_txd_encap_fail);
+ goto defrag_failed;
+ }
return (err);
defrag_failed:
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
