Fix some memory bugs with regard to jumbo buffers. I made a mistake when

converting from the old external mbuf buffer code to the new (with the
MEXTADD() macro). Also free free list memory correctly in
foo_free_jumbo_mem() routines: grab the head of the list, then
remove it, _then_ free() it.

This fixes the memory corruption problem I've been chasing in the level 1
driver.

2 files changed, 5 insertions, 8 deletions

diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index ea91f9b..d6f9e80 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -791,12 +791,12 @@ static int lge_newbuf(sc, c, m)
 		}
 		/* Attach the buffer to the mbuf */
 		m_new->m_data = (void *)buf;
-		m_new->m_len = m_new->m_pkthdr.len = LGE_MCLBYTES;
-		MEXTADD(m_new, buf, LGE_MCLBYTES, lge_jfree,
+		m_new->m_len = m_new->m_pkthdr.len = LGE_JUMBO_FRAMELEN;
+		MEXTADD(m_new, buf, LGE_JUMBO_FRAMELEN, lge_jfree,
 		    (struct lge_softc *)sc, 0, EXT_NET_DRV);
 	} else {
 		m_new = m;
-		m_new->m_len = m_new->m_pkthdr.len = LGE_MCLBYTES;
+		m_new->m_len = m_new->m_pkthdr.len = LGE_JUMBO_FRAMELEN;
 		m_new->m_data = m_new->m_ext.ext_buf;
 	}
 
@@ -857,12 +857,10 @@ static int lge_alloc_jumbo_mem(sc)
 	ptr = sc->lge_cdata.lge_jumbo_buf;
 	for (i = 0; i < LGE_JSLOTS; i++) {
 		sc->lge_cdata.lge_jslots[i] = ptr;
-		ptr += LGE_MCLBYTES;
+		ptr += LGE_JLEN;
 		entry = malloc(sizeof(struct lge_jpool_entry), 
 		    M_DEVBUF, M_NOWAIT);
 		if (entry == NULL) {
-			free(sc->lge_cdata.lge_jumbo_buf, M_DEVBUF);
-			sc->lge_cdata.lge_jumbo_buf = NULL;
 			printf("lge%d: no memory for jumbo "
 			    "buffer queue!\n", sc->lge_unit);
 			return(ENOBUFS);
@@ -883,8 +881,8 @@ static void lge_free_jumbo_mem(sc)
 
 	for (i = 0; i < LGE_JSLOTS; i++) {
 		entry = SLIST_FIRST(&sc->lge_jfree_listhead);
-		free(entry, M_DEVBUF);
 		SLIST_REMOVE_HEAD(&sc->lge_jfree_listhead, jpool_entries);
+		free(entry, M_DEVBUF);
 	}
 
 	contigfree(sc->lge_cdata.lge_jumbo_buf, LGE_JMEM, M_DEVBUF);
diff --git a/sys/dev/lge/if_lgereg.h b/sys/dev/lge/if_lgereg.h
index 7815675..f0254b1 100644
--- a/sys/dev/lge/if_lgereg.h
+++ b/sys/dev/lge/if_lgereg.h
@@ -502,7 +502,6 @@ struct lge_mii_frame {
 #define LGE_JRAWLEN (LGE_JUMBO_FRAMELEN + ETHER_ALIGN)
 #define LGE_JLEN (LGE_JRAWLEN + (sizeof(u_int64_t) - \
 	(LGE_JRAWLEN % sizeof(u_int64_t))))
-#define LGE_MCLBYTES (LGE_JLEN - sizeof(u_int64_t))
 #define LGE_JPAGESZ PAGE_SIZE
 #define LGE_RESID (LGE_JPAGESZ - (LGE_JLEN * LGE_JSLOTS) % LGE_JPAGESZ)
 #define LGE_JMEM ((LGE_JLEN * LGE_JSLOTS) + LGE_RESID)