Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m_copyback() doesn't work the way I expexted it: it doesn't update the 

mbuf fields, and it seems it doesn't allocate mbuf clusters for large
packets. So revert to using MCLGET() if needed and memcpy to get the
data in the mbuf.
Should fix panic in m_makewritable() reported by Mike M. Volokhov
and Andreas Wrede on port-xen, patch tested by Andreas Wrede.
This commit is contained in:
bouyer 2006-03-16 23:02:50 +00:00
parent c6b6c1a57b
commit 62b855014e
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/arch/xen/xen/if_xennet.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_xennet.c,v 1.43 2006/03/06 22:04:18 bouyer Exp $ */
/* $NetBSD: if_xennet.c,v 1.44 2006/03/16 23:02:50 bouyer Exp $ */
/*
*
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_xennet.c,v 1.43 2006/03/06 22:04:18 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_xennet.c,v 1.44 2006/03/16 23:02:50 bouyer Exp $");
#include "opt_inet.h"
#include "opt_nfs_boot.h"
@ -787,16 +787,21 @@ xen_network_handler(void *arg)
* memory, copy data and push the receive
* buffer back to the hypervisor.
*/
m->m_len = MHLEN;
m->m_pkthdr.len = 0;
m_copyback(m, 0, rx->status, pktp);
xennet_rx_push_buffer(sc, rx->id);
if (m->m_pkthdr.len < rx->status) {
/* out of memory, just drop packets */
ifp->if_ierrors++;
m_freem(m);
continue;
if (rx->status > MHLEN) {
MCLGET(m, M_DONTWAIT);
if (__predict_false(
(m->m_flags & M_EXT) == 0)) {
/* out of memory, just drop packets */
ifp->if_ierrors++;
m_freem(m);
xennet_rx_push_buffer(sc, rx->id);
continue;
}
}
m->m_len = m->m_pkthdr.len = rx->status;
memcpy(mtod(m, void *), pktp, rx->status);
xennet_rx_push_buffer(sc, rx->id);
}
#ifdef XENNET_DEBUG_DUMP