[src/trunk]: src/sys/arch/xen/xen xennet_start: don't allocate cluster mbufs ...

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d6a933e12132
branches:  trunk
changeset: 584275:d6a933e12132
user:      yamt <yamt%NetBSD.org@localhost>
date:      Mon Sep 12 12:40:43 2005 +0000

description:
xennet_start: don't allocate cluster mbufs unless needed.

diffstat:

 sys/arch/xen/xen/if_xennet.c |  31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diffs (62 lines):

diff -r 13d30c3a4037 -r d6a933e12132 sys/arch/xen/xen/if_xennet.c
--- a/sys/arch/xen/xen/if_xennet.c      Mon Sep 12 12:07:47 2005 +0000
+++ b/sys/arch/xen/xen/if_xennet.c      Mon Sep 12 12:40:43 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_xennet.c,v 1.33 2005/09/11 13:20:00 bouyer Exp $    */
+/*     $NetBSD: if_xennet.c,v 1.34 2005/09/12 12:40:43 yamt Exp $      */
 
 /*
  *
@@ -33,7 +33,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet.c,v 1.33 2005/09/11 13:20:00 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet.c,v 1.34 2005/09/12 12:40:43 yamt Exp $");
 
 #include "opt_inet.h"
 #include "opt_nfs_boot.h"
@@ -995,11 +995,13 @@
                                printf("xennet: no mbuf\n");
                                break;
                        }
-                       MCLGET(new_m, M_DONTWAIT);
-                       if ((new_m->m_flags & M_EXT) == 0) {
-                               printf("xennet: no mbuf cluster\n");
-                               m_freem(new_m);
-                               break;
+                       if (m->m_pkthdr.len > MHLEN) {
+                               MCLGET(new_m, M_DONTWAIT);
+                               if ((new_m->m_flags & M_EXT) == 0) {
+                                       printf("xennet: no mbuf cluster\n");
+                                       m_freem(new_m);
+                                       break;
+                               }
                        }
                        IFQ_DEQUEUE(&ifp->if_snd, m);
 
@@ -1008,12 +1010,21 @@
 
                        m_freem(m);
                        m = new_m;
-                       KASSERT(m->m_ext.ext_paddr != M_PADDR_INVALID);
-                       KASSERT(m->m_data == m->m_ext.ext_buf);
-                       pa = m->m_ext.ext_paddr;
+                       if ((m->m_flags & M_EXT) != 0) {
+                               pa = m->m_ext.ext_paddr;
+                               KASSERT(m->m_data == m->m_ext.ext_buf);
+                               KASSERT(pa != M_PADDR_INVALID);
+                       } else {
+                               pa = m->m_paddr;
+                               KASSERT(pa != M_PADDR_INVALID);
+                               KASSERT(m->m_data == M_BUFADDR(m));
+                               pa += M_BUFOFFSET(m);
+                       }
                } else
                        IFQ_DEQUEUE(&ifp->if_snd, m);
 
+               KASSERT(((pa ^ (pa + m->m_pkthdr.len)) & PG_FRAME) == 0);
+
                bufid = get_bufarray_entry(sc->sc_tx_bufa);
                KASSERT(bufid < NETIF_TX_RING_SIZE);
                sc->sc_tx_bufa[bufid].xb_tx.xbtx_m = m;