From owner-p4-projects@FreeBSD.ORG Tue Nov 30 01:12:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 972FA16A4D0; Tue, 30 Nov 2004 01:12:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71B4416A4CE for ; Tue, 30 Nov 2004 01:12:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 446E643D39 for ; Tue, 30 Nov 2004 01:12:47 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU1Clfk048992 for ; Tue, 30 Nov 2004 01:12:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU1CkoB048989 for perforce@freebsd.org; Tue, 30 Nov 2004 01:12:46 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 01:12:46 GMT Message-Id: <200411300112.iAU1CkoB048989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 01:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=66080 Change 66080 by sam@sam_ebb on 2004/11/30 01:12:35 save mbuf guard word hack Affected files ... .. //depot/projects/wifi/sys/conf/options#5 edit .. //depot/projects/wifi/sys/kern/kern_mbuf.c#2 edit .. //depot/projects/wifi/sys/sys/mbuf.h#3 edit Differences ... ==== //depot/projects/wifi/sys/conf/options#5 (text+ko) ==== @@ -491,6 +491,7 @@ INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h LOOKUP_SHARED opt_global.h +MBUF_GUARD opt_global.h MCLSHIFT opt_global.h MUTEX_DEBUG opt_global.h MUTEX_NOINLINE opt_global.h ==== //depot/projects/wifi/sys/kern/kern_mbuf.c#2 (text+ko) ==== @@ -216,6 +216,9 @@ #endif } else m->m_data = m->m_dat; +#ifdef MBUF_GUARD + *(uint32_t *)(m+1) = MBUF_GUARDWORD; +#endif mbstat.m_mbufs += 1; /* XXX */ return (0); } @@ -229,6 +232,7 @@ struct mbuf *m; m = (struct mbuf *)mem; + MBUF_GUARDCHECK(m); if ((m->m_flags & M_PKTHDR) != 0) m_tag_delete_chain(m, NULL); mbstat.m_mbufs -= 1; /* XXX */ @@ -241,6 +245,7 @@ struct mbuf *m; m = (struct mbuf *)mem; + MBUF_GUARDCHECK(m); if ((m->m_flags & M_PKTHDR) != 0) m_tag_delete_chain(m, NULL); mbstat.m_mbufs -= 1; /* XXX */ @@ -354,6 +359,9 @@ return (error); #endif } +#ifdef MBUF_GUARD + *(uint32_t *)(m+1) = MBUF_GUARDWORD; +#endif mbstat.m_mbufs += 1; /* XXX */ mbstat.m_mclusts += 1; /* XXX */ return (0); ==== //depot/projects/wifi/sys/sys/mbuf.h#3 (text+ko) ==== @@ -52,7 +52,16 @@ * to allocate a separate buffer externally and attach it to the mbuf in * a way similar to that of mbuf clusters. */ +#ifdef MBUF_GUARD +#define MLEN (MSIZE - sizeof(struct m_hdr) - sizeof(uint32_t)) +#define MBUF_GUARDWORD 0x99118822 +#define MBUF_GUARDCHECK(m) do { \ + KASSERT(*(uint32_t *)(m+1) == MBUF_GUARDWORD, \ + ("mbuf guardword clobbered, found 0x%x", *(uint32_t *)(m+1))); \ +} while (0) +#else #define MLEN (MSIZE - sizeof(struct m_hdr)) /* normal data len */ +#endif #define MHLEN (MLEN - sizeof(struct pkthdr)) /* data len w/pkthdr */ #define MINCLSIZE (MHLEN + 1) /* smallest amount to put in cluster */ #define M_MAXCOMPRESS (MHLEN / 2) /* max amount to copy for compression */