From owner-svn-src-all@FreeBSD.ORG Sat Sep 6 21:23:15 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 250204AA; Sat, 6 Sep 2014 21:23:15 +0000 (UTC) Received: from mail-qc0-x231.google.com (mail-qc0-x231.google.com [IPv6:2607:f8b0:400d:c01::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9CC761886; Sat, 6 Sep 2014 21:23:14 +0000 (UTC) Received: by mail-qc0-f177.google.com with SMTP id i8so13519470qcq.8 for ; Sat, 06 Sep 2014 14:23:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=q8lf2dd0gTaWb94Iq6a6+53ElZIM5YMcajUK85vPGo4=; b=vvrIZGE/chNa3QskC91P4Jf+eu2uB1JaZ9AIvjPsu2IFHawcMYAM81Ii+Ao6FupNvB 3mZu1l3oE4uuCfPaUyyrsJgjZIu/bPKO8D4jG+e1+kB4vr/Ka11Q9owk7Xr/F9aunZwr y+9J6Q0fL7SbjPmj+5x9ukBuzdfJ+5PEEwk1GYrHzFshWLv0qy9XKRk4xgc6rEeiZ0EG 8wV1AwJg0bxjEsAUMjY35bHninpozpgVeC8HJ3YSkNSwlDMIOzcDcwVtkmhbOyBonKHD xYYl2VVdVfC8z6g93ONoUS31WjNOj9TT6NMUUMOlr0b7ZAVxshMegfT5P16xBeJyBkKO F4qA== MIME-Version: 1.0 X-Received: by 10.224.36.4 with SMTP id r4mr29512264qad.69.1410038593753; Sat, 06 Sep 2014 14:23:13 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.39.139 with HTTP; Sat, 6 Sep 2014 14:23:13 -0700 (PDT) In-Reply-To: References: <53e0a76b.5936.428818a9@svn.freebsd.org> Date: Sat, 6 Sep 2014 14:23:13 -0700 X-Google-Sender-Auth: wxxAl1udBQihPZp-iQ6WFObKrOU Message-ID: Subject: Re: svn commit: r269577 - in head/sys: amd64/include arm/arm arm/include conf i386/i386 i386/include kern mips/include mips/mips powerpc/include powerpc/powerpc sparc64/include sparc64/sparc64 sys From: Adrian Chadd To: Gleb Smirnoff Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2014 21:23:15 -0000 . and I've submitted this as a bug: Bug: 193400 Note: this is a mipseb platform, not a mipsel platform. -a On 6 September 2014 14:15, Adrian Chadd wrote: > Hi Gleb! > > This commit has broken mips32 on my 128MB RAM routerstation pro board. > > I've tested the commit before this one (and it works). > > I've also tested today's -HEAD as there was some subsequent fixes to > the sfbuf code. It hasn't completely fixed things - I still see > processes throwing VM errors: > > umass0:0:0: Attached to scbus0 > Trying to mount root from ufs:redboot/rootfs.uzip []... > warning: no time-of-day clock registered, system time will not be set accurately > da0 at umass-sim0 bus 0 scbus0 target 0 lun 0 > da0: Removable Direct Access SCSI-0 device > da0: Serial Number 000000009451 > da0: 40.000MB/s transfers > da0: 3902MB (7991296 512 byte sectors: 255H 63S/T 497C) > da0: quirks=0x3 > Aug 28 08:07:57 init: login_getclass: unknown class 'daemon' > BAD_PAGE_FAULT: pid 27 tid 100045 (mount), uid 0: pc 0x40514dd0 got a > read fault (type 0x2) at 0x4040011c > Trapframe Register Dump: > zero: 0 at: 0x7fffffff v0: 0 v1: 0x404000fc > a0: 0x54 a1: 0x40400000 a2: 0 a3: 0x1 > t0: 0 t1: 0x40c0300c t2: 0x40800168 t3: 0x2f > t4: 0x40c00030 t5: 0 t6: 0x748 t7: 0x402c70 > t8: 0x13 t9: 0x40514d58 s0: 0x3 s1: 0x40418798 > s2: 0 s3: 0x404ec4 s4: 0x40418798 s5: 0x40418798 > s6: 0 s7: 0 k0: 0 k1: 0 > gp: 0x405ec910 sp: 0x7ffee348 s8: 0 ra: 0x4051534c > sr: 0xfc13 mullo: 0x6719 mulhi: 0xc badvaddr: 0x4040011c > cause: 0x8 pc: 0x40514dd0 > Page table info for pc address 0x40514dd0: pde = 0x813da000, pte = 0xa00569da > Dumping 4 words starting at pc address 0x40514dd0: > 8c700020 32030ff0 00032102 240300ff > Page table info for bad address 0x4040011c: pde = 0x813da000, pte = 0 > pid 27 (mount), uid 0: exited on signal 11 > *** Populating /var .. > > .. so how can we debug what's going on? > > > > -a > > > On 5 August 2014 02:44, Gleb Smirnoff wrote: >> Author: glebius >> Date: Tue Aug 5 09:44:10 2014 >> New Revision: 269577 >> URL: http://svnweb.freebsd.org/changeset/base/269577 >> >> Log: >> Merge all MD sf_buf allocators into one MI, residing in kern/subr_sfbuf.c >> The MD allocators were very common, however there were some minor >> differencies. These differencies were all consolidated in the MI allocator, >> under ifdefs. The defines from machine/vmparam.h turn on features required >> for a particular machine. For details look in the comment in sys/sf_buf.h. >> >> As result no MD code left in sys/*/*/vm_machdep.c. Some arches still have >> machine/sf_buf.h, which is usually quite small. >> >> Tested by: glebius (i386), tuexen (arm32), kevlo (arm32) >> Reviewed by: kib >> Sponsored by: Netflix >> Sponsored by: Nginx, Inc. >> >> Added: >> head/sys/kern/subr_sfbuf.c (contents, props changed) >> Deleted: >> head/sys/powerpc/include/sf_buf.h >> head/sys/sparc64/include/sf_buf.h >> Modified: >> head/sys/amd64/include/sf_buf.h >> head/sys/arm/arm/vm_machdep.c >> head/sys/arm/include/sf_buf.h >> head/sys/arm/include/vmparam.h >> head/sys/conf/files.arm >> head/sys/conf/files.i386 >> head/sys/conf/files.mips >> head/sys/conf/files.pc98 >> head/sys/conf/files.powerpc >> head/sys/conf/files.sparc64 >> head/sys/i386/i386/vm_machdep.c >> head/sys/i386/include/sf_buf.h >> head/sys/i386/include/vmparam.h >> head/sys/mips/include/sf_buf.h >> head/sys/mips/include/vmparam.h >> head/sys/mips/mips/vm_machdep.c >> head/sys/powerpc/include/vmparam.h >> head/sys/powerpc/powerpc/vm_machdep.c >> head/sys/sparc64/include/vmparam.h >> head/sys/sparc64/sparc64/vm_machdep.c >> head/sys/sys/sf_buf.h >> >> Modified: head/sys/amd64/include/sf_buf.h >> ============================================================================== >> --- head/sys/amd64/include/sf_buf.h Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/amd64/include/sf_buf.h Tue Aug 5 09:44:10 2014 (r269577) >> @@ -29,42 +29,23 @@ >> #ifndef _MACHINE_SF_BUF_H_ >> #define _MACHINE_SF_BUF_H_ >> >> -#include >> -#include >> -#include >> - >> /* >> * On this machine, the only purpose for which sf_buf is used is to implement >> * an opaque pointer required by the machine-independent parts of the kernel. >> * That pointer references the vm_page that is "mapped" by the sf_buf. The >> * actual mapping is provided by the direct virtual-to-physical mapping. >> */ >> -struct sf_buf; >> - >> -static inline struct sf_buf * >> -sf_buf_alloc(struct vm_page *m, int pri) >> -{ >> - >> - return ((struct sf_buf *)m); >> -} >> - >> -static inline void >> -sf_buf_free(struct sf_buf *sf) >> -{ >> -} >> - >> -static __inline vm_offset_t >> +static inline vm_offset_t >> sf_buf_kva(struct sf_buf *sf) >> { >> >> return (PHYS_TO_DMAP(VM_PAGE_TO_PHYS((vm_page_t)sf))); >> } >> >> -static __inline vm_page_t >> +static inline vm_page_t >> sf_buf_page(struct sf_buf *sf) >> { >> >> return ((vm_page_t)sf); >> } >> - >> #endif /* !_MACHINE_SF_BUF_H_ */ >> >> Modified: head/sys/arm/arm/vm_machdep.c >> ============================================================================== >> --- head/sys/arm/arm/vm_machdep.c Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/arm/arm/vm_machdep.c Tue Aug 5 09:44:10 2014 (r269577) >> @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); >> #include >> #include >> #include >> -#include >> #include >> #include >> #include >> @@ -83,42 +82,6 @@ __FBSDID("$FreeBSD$"); >> CTASSERT(sizeof(struct switchframe) == 24); >> CTASSERT(sizeof(struct trapframe) == 80); >> >> -#ifndef NSFBUFS >> -#define NSFBUFS (512 + maxusers * 16) >> -#endif >> - >> -static int nsfbufs; >> -static int nsfbufspeak; >> -static int nsfbufsused; >> - >> -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RDTUN, &nsfbufs, 0, >> - "Maximum number of sendfile(2) sf_bufs available"); >> -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufspeak, CTLFLAG_RD, &nsfbufspeak, 0, >> - "Number of sendfile(2) sf_bufs at peak usage"); >> -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0, >> - "Number of sendfile(2) sf_bufs in use"); >> - >> -static void sf_buf_init(void *arg); >> -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); >> - >> -LIST_HEAD(sf_head, sf_buf); >> - >> -/* >> - * A hash table of active sendfile(2) buffers >> - */ >> -static struct sf_head *sf_buf_active; >> -static u_long sf_buf_hashmask; >> - >> -#define SF_BUF_HASH(m) (((m) - vm_page_array) & sf_buf_hashmask) >> - >> -static TAILQ_HEAD(, sf_buf) sf_buf_freelist; >> -static u_int sf_buf_alloc_want; >> - >> -/* >> - * A lock used to synchronize access to the hash table and free list >> - */ >> -static struct mtx sf_buf_lock; >> - >> /* >> * Finish a fork operation, with process p2 nearly set up. >> * Copy and update the pcb, set up the stack so that the child >> @@ -184,106 +147,6 @@ cpu_thread_swapout(struct thread *td) >> { >> } >> >> -/* >> - * Detatch mapped page and release resources back to the system. >> - */ >> -void >> -sf_buf_free(struct sf_buf *sf) >> -{ >> - >> - mtx_lock(&sf_buf_lock); >> - sf->ref_count--; >> - if (sf->ref_count == 0) { >> - TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry); >> - nsfbufsused--; >> - pmap_kremove(sf->kva); >> - sf->m = NULL; >> - LIST_REMOVE(sf, list_entry); >> - if (sf_buf_alloc_want > 0) >> - wakeup(&sf_buf_freelist); >> - } >> - mtx_unlock(&sf_buf_lock); >> -} >> - >> -/* >> - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) >> - */ >> -static void >> -sf_buf_init(void *arg) >> -{ >> - struct sf_buf *sf_bufs; >> - vm_offset_t sf_base; >> - int i; >> - >> - nsfbufs = NSFBUFS; >> - TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs); >> - >> - sf_buf_active = hashinit(nsfbufs, M_TEMP, &sf_buf_hashmask); >> - TAILQ_INIT(&sf_buf_freelist); >> - sf_base = kva_alloc(nsfbufs * PAGE_SIZE); >> - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, >> - M_NOWAIT | M_ZERO); >> - for (i = 0; i < nsfbufs; i++) { >> - sf_bufs[i].kva = sf_base + i * PAGE_SIZE; >> - TAILQ_INSERT_TAIL(&sf_buf_freelist, &sf_bufs[i], free_entry); >> - } >> - sf_buf_alloc_want = 0; >> - mtx_init(&sf_buf_lock, "sf_buf", NULL, MTX_DEF); >> -} >> - >> -/* >> - * Get an sf_buf from the freelist. Will block if none are available. >> - */ >> -struct sf_buf * >> -sf_buf_alloc(struct vm_page *m, int flags) >> -{ >> - struct sf_head *hash_list; >> - struct sf_buf *sf; >> - int error; >> - >> - hash_list = &sf_buf_active[SF_BUF_HASH(m)]; >> - mtx_lock(&sf_buf_lock); >> - LIST_FOREACH(sf, hash_list, list_entry) { >> - if (sf->m == m) { >> - sf->ref_count++; >> - if (sf->ref_count == 1) { >> - TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); >> - nsfbufsused++; >> - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); >> - } >> - goto done; >> - } >> - } >> - while ((sf = TAILQ_FIRST(&sf_buf_freelist)) == NULL) { >> - if (flags & SFB_NOWAIT) >> - goto done; >> - sf_buf_alloc_want++; >> - SFSTAT_INC(sf_allocwait); >> - error = msleep(&sf_buf_freelist, &sf_buf_lock, >> - (flags & SFB_CATCH) ? PCATCH | PVM : PVM, "sfbufa", 0); >> - sf_buf_alloc_want--; >> - >> - >> - /* >> - * If we got a signal, don't risk going back to sleep. >> - */ >> - if (error) >> - goto done; >> - } >> - TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); >> - if (sf->m != NULL) >> - LIST_REMOVE(sf, list_entry); >> - LIST_INSERT_HEAD(hash_list, sf, list_entry); >> - sf->ref_count = 1; >> - sf->m = m; >> - nsfbufsused++; >> - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); >> - pmap_kenter(sf->kva, VM_PAGE_TO_PHYS(sf->m)); >> -done: >> - mtx_unlock(&sf_buf_lock); >> - return (sf); >> -} >> - >> void >> cpu_set_syscall_retval(struct thread *td, int error) >> { >> >> Modified: head/sys/arm/include/sf_buf.h >> ============================================================================== >> --- head/sys/arm/include/sf_buf.h Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/arm/include/sf_buf.h Tue Aug 5 09:44:10 2014 (r269577) >> @@ -29,33 +29,18 @@ >> #ifndef _MACHINE_SF_BUF_H_ >> #define _MACHINE_SF_BUF_H_ >> >> -#include >> - >> -struct vm_page; >> - >> -struct sf_buf { >> - LIST_ENTRY(sf_buf) list_entry; /* list of buffers */ >> - TAILQ_ENTRY(sf_buf) free_entry; /* list of buffers */ >> - struct vm_page *m; /* currently mapped page */ >> - vm_offset_t kva; /* va of mapping */ >> - int ref_count; /* usage of this mapping */ >> -}; >> - >> -static __inline vm_offset_t >> -sf_buf_kva(struct sf_buf *sf) >> +static inline void >> +sf_buf_map(struct sf_buf *sf, int flags) >> { >> >> - return (sf->kva); >> + pmap_kenter(sf->kva, VM_PAGE_TO_PHYS(sf->m)); >> } >> >> -static __inline struct vm_page * >> -sf_buf_page(struct sf_buf *sf) >> +static inline int >> +sf_buf_unmap(struct sf_buf *sf) >> { >> >> - return (sf->m); >> + pmap_kremove(sf->kva); >> + return (1); >> } >> - >> -struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags); >> -void sf_buf_free(struct sf_buf *sf); >> - >> #endif /* !_MACHINE_SF_BUF_H_ */ >> >> Modified: head/sys/arm/include/vmparam.h >> ============================================================================== >> --- head/sys/arm/include/vmparam.h Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/arm/include/vmparam.h Tue Aug 5 09:44:10 2014 (r269577) >> @@ -170,4 +170,7 @@ extern vm_offset_t vm_max_kernel_address >> #define VM_MAX_AUTOTUNE_MAXUSERS 384 >> #endif >> >> +#define SFBUF >> +#define SFBUF_MAP >> + >> #endif /* _MACHINE_VMPARAM_H_ */ >> >> Modified: head/sys/conf/files.arm >> ============================================================================== >> --- head/sys/conf/files.arm Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/conf/files.arm Tue Aug 5 09:44:10 2014 (r269577) >> @@ -77,6 +77,7 @@ font.h optional sc \ >> clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" >> kern/subr_busdma_bufalloc.c standard >> kern/subr_dummy_vdso_tc.c standard >> +kern/subr_sfbuf.c standard >> libkern/arm/aeabi_unwind.c standard >> libkern/arm/divsi3.S standard >> libkern/arm/ffs.S standard >> >> Modified: head/sys/conf/files.i386 >> ============================================================================== >> --- head/sys/conf/files.i386 Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/conf/files.i386 Tue Aug 5 09:44:10 2014 (r269577) >> @@ -520,6 +520,7 @@ isa/vga_isa.c optional vga >> kern/kern_clocksource.c standard >> kern/imgact_aout.c optional compat_aout >> kern/imgact_gzip.c optional gzip >> +kern/subr_sfbuf.c standard >> libkern/divdi3.c standard >> libkern/flsll.c standard >> libkern/memmove.c standard >> >> Modified: head/sys/conf/files.mips >> ============================================================================== >> --- head/sys/conf/files.mips Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/conf/files.mips Tue Aug 5 09:44:10 2014 (r269577) >> @@ -51,6 +51,7 @@ mips/mips/vm_machdep.c standard >> kern/kern_clocksource.c standard >> kern/link_elf_obj.c standard >> kern/subr_dummy_vdso_tc.c standard >> +kern/subr_sfbuf.c optional mips | mipsel | mipsn32 >> >> # gcc/clang runtime >> libkern/ffsl.c standard >> >> Modified: head/sys/conf/files.pc98 >> ============================================================================== >> --- head/sys/conf/files.pc98 Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/conf/files.pc98 Tue Aug 5 09:44:10 2014 (r269577) >> @@ -205,6 +205,7 @@ i386/svr4/svr4_machdep.c optional compat >> kern/kern_clocksource.c standard >> kern/imgact_aout.c optional compat_aout >> kern/imgact_gzip.c optional gzip >> +kern/subr_sfbuf.c standard >> libkern/divdi3.c standard >> libkern/flsll.c standard >> libkern/memmove.c standard >> >> Modified: head/sys/conf/files.powerpc >> ============================================================================== >> --- head/sys/conf/files.powerpc Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/conf/files.powerpc Tue Aug 5 09:44:10 2014 (r269577) >> @@ -71,6 +71,7 @@ dev/vt/hw/ofwfb/ofwfb.c optional vt aim >> kern/kern_clocksource.c standard >> kern/subr_dummy_vdso_tc.c standard >> kern/syscalls.c optional ktr >> +kern/subr_sfbuf.c standard >> libkern/ashldi3.c optional powerpc >> libkern/ashrdi3.c optional powerpc >> libkern/bcmp.c standard >> >> Modified: head/sys/conf/files.sparc64 >> ============================================================================== >> --- head/sys/conf/files.sparc64 Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/conf/files.sparc64 Tue Aug 5 09:44:10 2014 (r269577) >> @@ -64,6 +64,7 @@ dev/vt/hw/ofwfb/ofwfb.c optional vt >> kern/kern_clocksource.c standard >> kern/subr_dummy_vdso_tc.c standard >> kern/syscalls.c optional ktr >> +kern/subr_sfbuf.c standard >> libkern/ffs.c standard >> libkern/ffsl.c standard >> libkern/fls.c standard >> >> Modified: head/sys/i386/i386/vm_machdep.c >> ============================================================================== >> --- head/sys/i386/i386/vm_machdep.c Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/i386/i386/vm_machdep.c Tue Aug 5 09:44:10 2014 (r269577) >> @@ -118,38 +118,6 @@ static u_int cpu_reset_proxyid; >> static volatile u_int cpu_reset_proxy_active; >> #endif >> >> -static int nsfbufs; >> -static int nsfbufspeak; >> -static int nsfbufsused; >> - >> -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RDTUN, &nsfbufs, 0, >> - "Maximum number of sendfile(2) sf_bufs available"); >> -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufspeak, CTLFLAG_RD, &nsfbufspeak, 0, >> - "Number of sendfile(2) sf_bufs at peak usage"); >> -SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0, >> - "Number of sendfile(2) sf_bufs in use"); >> - >> -static void sf_buf_init(void *arg); >> -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); >> - >> -LIST_HEAD(sf_head, sf_buf); >> - >> -/* >> - * A hash table of active sendfile(2) buffers >> - */ >> -static struct sf_head *sf_buf_active; >> -static u_long sf_buf_hashmask; >> - >> -#define SF_BUF_HASH(m) (((m) - vm_page_array) & sf_buf_hashmask) >> - >> -static TAILQ_HEAD(, sf_buf) sf_buf_freelist; >> -static u_int sf_buf_alloc_want; >> - >> -/* >> - * A lock used to synchronize access to the hash table and free list >> - */ >> -static struct mtx sf_buf_lock; >> - >> extern int _ucodesel, _udatasel; >> >> /* >> @@ -750,121 +718,12 @@ cpu_reset_real() >> } >> >> /* >> - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) >> - */ >> -static void >> -sf_buf_init(void *arg) >> -{ >> - struct sf_buf *sf_bufs; >> - vm_offset_t sf_base; >> - int i; >> - >> - nsfbufs = NSFBUFS; >> - TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs); >> - >> - sf_buf_active = hashinit(nsfbufs, M_TEMP, &sf_buf_hashmask); >> - TAILQ_INIT(&sf_buf_freelist); >> - sf_base = kva_alloc(nsfbufs * PAGE_SIZE); >> - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, >> - M_NOWAIT | M_ZERO); >> - for (i = 0; i < nsfbufs; i++) { >> - sf_bufs[i].kva = sf_base + i * PAGE_SIZE; >> - TAILQ_INSERT_TAIL(&sf_buf_freelist, &sf_bufs[i], free_entry); >> - } >> - sf_buf_alloc_want = 0; >> - mtx_init(&sf_buf_lock, "sf_buf", NULL, MTX_DEF); >> -} >> - >> -/* >> - * Invalidate the cache lines that may belong to the page, if >> - * (possibly old) mapping of the page by sf buffer exists. Returns >> - * TRUE when mapping was found and cache invalidated. >> - */ >> -boolean_t >> -sf_buf_invalidate_cache(vm_page_t m) >> -{ >> - struct sf_head *hash_list; >> - struct sf_buf *sf; >> - boolean_t ret; >> - >> - hash_list = &sf_buf_active[SF_BUF_HASH(m)]; >> - ret = FALSE; >> - mtx_lock(&sf_buf_lock); >> - LIST_FOREACH(sf, hash_list, list_entry) { >> - if (sf->m == m) { >> - /* >> - * Use pmap_qenter to update the pte for >> - * existing mapping, in particular, the PAT >> - * settings are recalculated. >> - */ >> - pmap_qenter(sf->kva, &m, 1); >> - pmap_invalidate_cache_range(sf->kva, sf->kva + >> - PAGE_SIZE); >> - ret = TRUE; >> - break; >> - } >> - } >> - mtx_unlock(&sf_buf_lock); >> - return (ret); >> -} >> - >> -/* >> * Get an sf_buf from the freelist. May block if none are available. >> */ >> -struct sf_buf * >> -sf_buf_alloc(struct vm_page *m, int flags) >> +void >> +sf_buf_map(struct sf_buf *sf, int flags) >> { >> pt_entry_t opte, *ptep; >> - struct sf_head *hash_list; >> - struct sf_buf *sf; >> -#ifdef SMP >> - cpuset_t other_cpus; >> - u_int cpuid; >> -#endif >> - int error; >> - >> - KASSERT(curthread->td_pinned > 0 || (flags & SFB_CPUPRIVATE) == 0, >> - ("sf_buf_alloc(SFB_CPUPRIVATE): curthread not pinned")); >> - hash_list = &sf_buf_active[SF_BUF_HASH(m)]; >> - mtx_lock(&sf_buf_lock); >> - LIST_FOREACH(sf, hash_list, list_entry) { >> - if (sf->m == m) { >> - sf->ref_count++; >> - if (sf->ref_count == 1) { >> - TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); >> - nsfbufsused++; >> - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); >> - } >> -#ifdef SMP >> - goto shootdown; >> -#else >> - goto done; >> -#endif >> - } >> - } >> - while ((sf = TAILQ_FIRST(&sf_buf_freelist)) == NULL) { >> - if (flags & SFB_NOWAIT) >> - goto done; >> - sf_buf_alloc_want++; >> - SFSTAT_INC(sf_allocwait); >> - error = msleep(&sf_buf_freelist, &sf_buf_lock, >> - (flags & SFB_CATCH) ? PCATCH | PVM : PVM, "sfbufa", 0); >> - sf_buf_alloc_want--; >> - >> - /* >> - * If we got a signal, don't risk going back to sleep. >> - */ >> - if (error) >> - goto done; >> - } >> - TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); >> - if (sf->m != NULL) >> - LIST_REMOVE(sf, list_entry); >> - LIST_INSERT_HEAD(hash_list, sf, list_entry); >> - sf->ref_count = 1; >> - sf->m = m; >> - nsfbufsused++; >> - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); >> >> /* >> * Update the sf_buf's virtual-to-physical mapping, flushing the >> @@ -876,11 +735,11 @@ sf_buf_alloc(struct vm_page *m, int flag >> ptep = vtopte(sf->kva); >> opte = *ptep; >> #ifdef XEN >> - PT_SET_MA(sf->kva, xpmap_ptom(VM_PAGE_TO_PHYS(m)) | pgeflag >> - | PG_RW | PG_V | pmap_cache_bits(m->md.pat_mode, 0)); >> + PT_SET_MA(sf->kva, xpmap_ptom(VM_PAGE_TO_PHYS(sf->m)) | pgeflag >> + | PG_RW | PG_V | pmap_cache_bits(sf->m->md.pat_mode, 0)); >> #else >> - *ptep = VM_PAGE_TO_PHYS(m) | pgeflag | PG_RW | PG_V | >> - pmap_cache_bits(m->md.pat_mode, 0); >> + *ptep = VM_PAGE_TO_PHYS(sf->m) | pgeflag | PG_RW | PG_V | >> + pmap_cache_bits(sf->m->md.pat_mode, 0); >> #endif >> >> /* >> @@ -892,7 +751,21 @@ sf_buf_alloc(struct vm_page *m, int flag >> #ifdef SMP >> if ((opte & (PG_V | PG_A)) == (PG_V | PG_A)) >> CPU_ZERO(&sf->cpumask); >> -shootdown: >> + >> + sf_buf_shootdown(sf, flags); >> +#else >> + if ((opte & (PG_V | PG_A)) == (PG_V | PG_A)) >> + pmap_invalidate_page(kernel_pmap, sf->kva); >> +#endif >> +} >> + >> +#ifdef SMP >> +void >> +sf_buf_shootdown(struct sf_buf *sf, int flags) >> +{ >> + cpuset_t other_cpus; >> + u_int cpuid; >> + >> sched_pin(); >> cpuid = PCPU_GET(cpuid); >> if (!CPU_ISSET(cpuid, &sf->cpumask)) { >> @@ -909,42 +782,50 @@ shootdown: >> } >> } >> sched_unpin(); >> -#else >> - if ((opte & (PG_V | PG_A)) == (PG_V | PG_A)) >> - pmap_invalidate_page(kernel_pmap, sf->kva); >> -#endif >> -done: >> - mtx_unlock(&sf_buf_lock); >> - return (sf); >> } >> +#endif >> >> /* >> - * Remove a reference from the given sf_buf, adding it to the free >> - * list when its reference count reaches zero. A freed sf_buf still, >> - * however, retains its virtual-to-physical mapping until it is >> - * recycled or reactivated by sf_buf_alloc(9). >> + * MD part of sf_buf_free(). >> */ >> -void >> -sf_buf_free(struct sf_buf *sf) >> +int >> +sf_buf_unmap(struct sf_buf *sf) >> { >> - >> - mtx_lock(&sf_buf_lock); >> - sf->ref_count--; >> - if (sf->ref_count == 0) { >> - TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry); >> - nsfbufsused--; >> #ifdef XEN >> + /* >> + * Xen doesn't like having dangling R/W mappings >> + */ >> + pmap_qremove(sf->kva, 1); >> + return (1); >> +#else >> + return (0); >> +#endif >> +} >> + >> +static void >> +sf_buf_invalidate(struct sf_buf *sf) >> +{ >> + vm_page_t m = sf->m; >> + >> + /* >> + * Use pmap_qenter to update the pte for >> + * existing mapping, in particular, the PAT >> + * settings are recalculated. >> + */ >> + pmap_qenter(sf->kva, &m, 1); >> + pmap_invalidate_cache_range(sf->kva, sf->kva + PAGE_SIZE); >> +} >> + >> /* >> - * Xen doesn't like having dangling R/W mappings >> + * Invalidate the cache lines that may belong to the page, if >> + * (possibly old) mapping of the page by sf buffer exists. Returns >> + * TRUE when mapping was found and cache invalidated. >> */ >> - pmap_qremove(sf->kva, 1); >> - sf->m = NULL; >> - LIST_REMOVE(sf, list_entry); >> -#endif >> - if (sf_buf_alloc_want > 0) >> - wakeup(&sf_buf_freelist); >> - } >> - mtx_unlock(&sf_buf_lock); >> +boolean_t >> +sf_buf_invalidate_cache(vm_page_t m) >> +{ >> + >> + return (sf_buf_process_page(m, sf_buf_invalidate)); >> } >> >> /* >> >> Modified: head/sys/i386/include/sf_buf.h >> ============================================================================== >> --- head/sys/i386/include/sf_buf.h Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/i386/include/sf_buf.h Tue Aug 5 09:44:10 2014 (r269577) >> @@ -1,5 +1,5 @@ >> /*- >> - * Copyright (c) 2003, 2005 Alan L. Cox >> + * Copyright (c) 2014 Gleb Smirnoff >> * All rights reserved. >> * >> * Redistribution and use in source and binary forms, with or without >> @@ -29,39 +29,8 @@ >> #ifndef _MACHINE_SF_BUF_H_ >> #define _MACHINE_SF_BUF_H_ >> >> -#include >> -#include >> - >> -struct vm_page; >> - >> -struct sf_buf { >> - LIST_ENTRY(sf_buf) list_entry; /* list of buffers */ >> - TAILQ_ENTRY(sf_buf) free_entry; /* list of buffers */ >> - struct vm_page *m; /* currently mapped page */ >> - vm_offset_t kva; /* va of mapping */ >> - int ref_count; /* usage of this mapping */ >> -#ifdef SMP >> - cpuset_t cpumask; /* cpus on which mapping is valid */ >> -#endif >> -}; >> - >> -struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags); >> -void sf_buf_free(struct sf_buf *sf); >> - >> -static __inline vm_offset_t >> -sf_buf_kva(struct sf_buf *sf) >> -{ >> - >> - return (sf->kva); >> -} >> - >> -static __inline struct vm_page * >> -sf_buf_page(struct sf_buf *sf) >> -{ >> - >> - return (sf->m); >> -} >> - >> -boolean_t sf_buf_invalidate_cache(vm_page_t m); >> +void sf_buf_map(struct sf_buf *, int); >> +int sf_buf_unmap(struct sf_buf *); >> +boolean_t sf_buf_invalidate_cache(vm_page_t); >> >> #endif /* !_MACHINE_SF_BUF_H_ */ >> >> Modified: head/sys/i386/include/vmparam.h >> ============================================================================== >> --- head/sys/i386/include/vmparam.h Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/i386/include/vmparam.h Tue Aug 5 09:44:10 2014 (r269577) >> @@ -198,4 +198,9 @@ >> #define VM_MAX_AUTOTUNE_MAXUSERS 384 >> #endif >> >> +#define SFBUF >> +#define SFBUF_MAP >> +#define SFBUF_CPUSET >> +#define SFBUF_PROCESS_PAGE >> + >> #endif /* _MACHINE_VMPARAM_H_ */ >> >> Added: head/sys/kern/subr_sfbuf.c >> ============================================================================== >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ head/sys/kern/subr_sfbuf.c Tue Aug 5 09:44:10 2014 (r269577) >> @@ -0,0 +1,226 @@ >> +/*- >> + * Copyright (c) 2014 Gleb Smirnoff >> + * Copyright (c) 2003, 2005 Alan L. Cox >> + * All rights reserved. >> + * >> + * Redistribution and use in source and binary forms, with or without >> + * modification, are permitted provided that the following conditions >> + * are met: >> + * 1. Redistributions of source code must retain the above copyright >> + * notice, this list of conditions and the following disclaimer. >> + * 2. Redistributions in binary form must reproduce the above copyright >> + * notice, this list of conditions and the following disclaimer in the >> + * documentation and/or other materials provided with the distribution. >> + * >> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND >> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE >> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE >> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL >> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS >> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT >> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY >> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >> + * SUCH DAMAGE. >> + */ >> + >> +#include >> +__FBSDID("$FreeBSD$"); >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> +#include >> +#include >> + >> +#ifndef NSFBUFS >> +#define NSFBUFS (512 + maxusers * 16) >> +#endif >> + >> +static int nsfbufs; >> +static int nsfbufspeak; >> +static int nsfbufsused; >> + >> +SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RDTUN, &nsfbufs, 0, >> + "Maximum number of sendfile(2) sf_bufs available"); >> +SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufspeak, CTLFLAG_RD, &nsfbufspeak, 0, >> + "Number of sendfile(2) sf_bufs at peak usage"); >> +SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0, >> + "Number of sendfile(2) sf_bufs in use"); >> + >> +static void sf_buf_init(void *arg); >> +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); >> + >> +LIST_HEAD(sf_head, sf_buf); >> + >> +/* >> + * A hash table of active sendfile(2) buffers >> + */ >> +static struct sf_head *sf_buf_active; >> +static u_long sf_buf_hashmask; >> + >> +#define SF_BUF_HASH(m) (((m) - vm_page_array) & sf_buf_hashmask) >> + >> +static TAILQ_HEAD(, sf_buf) sf_buf_freelist; >> +static u_int sf_buf_alloc_want; >> + >> +/* >> + * A lock used to synchronize access to the hash table and free list >> + */ >> +static struct mtx sf_buf_lock; >> + >> +/* >> + * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) >> + */ >> +static void >> +sf_buf_init(void *arg) >> +{ >> + struct sf_buf *sf_bufs; >> + vm_offset_t sf_base; >> + int i; >> + >> +#ifdef SFBUF_OPTIONAL_DIRECT_MAP >> + if (SFBUF_OPTIONAL_DIRECT_MAP) >> + return; >> +#endif >> + >> + nsfbufs = NSFBUFS; >> + TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs); >> + >> + sf_buf_active = hashinit(nsfbufs, M_TEMP, &sf_buf_hashmask); >> + TAILQ_INIT(&sf_buf_freelist); >> + sf_base = kva_alloc(nsfbufs * PAGE_SIZE); >> + sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, >> + M_NOWAIT | M_ZERO); >> + KASSERT(sf_bufs, ("%s: malloc failure", __func__)); >> + for (i = 0; i < nsfbufs; i++) { >> + sf_bufs[i].kva = sf_base + i * PAGE_SIZE; >> + TAILQ_INSERT_TAIL(&sf_buf_freelist, &sf_bufs[i], free_entry); >> + } >> + sf_buf_alloc_want = 0; >> + mtx_init(&sf_buf_lock, "sf_buf", NULL, MTX_DEF); >> +} >> + >> +/* >> + * Get an sf_buf from the freelist. May block if none are available. >> + */ >> +struct sf_buf * >> +sf_buf_alloc(struct vm_page *m, int flags) >> +{ >> + struct sf_head *hash_list; >> + struct sf_buf *sf; >> + int error; >> + >> +#ifdef SFBUF_OPTIONAL_DIRECT_MAP >> + if (SFBUF_OPTIONAL_DIRECT_MAP) >> + return ((struct sf_buf *)m); >> +#endif >> + >> + KASSERT(curthread->td_pinned > 0 || (flags & SFB_CPUPRIVATE) == 0, >> + ("sf_buf_alloc(SFB_CPUPRIVATE): curthread not pinned")); >> + hash_list = &sf_buf_active[SF_BUF_HASH(m)]; >> + mtx_lock(&sf_buf_lock); >> + LIST_FOREACH(sf, hash_list, list_entry) { >> + if (sf->m == m) { >> + sf->ref_count++; >> + if (sf->ref_count == 1) { >> + TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); >> + nsfbufsused++; >> + nsfbufspeak = imax(nsfbufspeak, nsfbufsused); >> + } >> +#if defined(SMP) && defined(SFBUF_CPUSET) >> + sf_buf_shootdown(sf, flags); >> +#endif >> + goto done; >> + } >> + } >> + while ((sf = TAILQ_FIRST(&sf_buf_freelist)) == NULL) { >> + if (flags & SFB_NOWAIT) >> + goto done; >> + sf_buf_alloc_want++; >> + SFSTAT_INC(sf_allocwait); >> + error = msleep(&sf_buf_freelist, &sf_buf_lock, >> + (flags & SFB_CATCH) ? PCATCH | PVM : PVM, "sfbufa", 0); >> + sf_buf_alloc_want--; >> + >> + /* >> + * If we got a signal, don't risk going back to sleep. >> + */ >> + if (error) >> + goto done; >> + } >> + TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); >> + if (sf->m != NULL) >> + LIST_REMOVE(sf, list_entry); >> + LIST_INSERT_HEAD(hash_list, sf, list_entry); >> + sf->ref_count = 1; >> + sf->m = m; >> + nsfbufsused++; >> + nsfbufspeak = imax(nsfbufspeak, nsfbufsused); >> + sf_buf_map(sf, flags); >> +done: >> + mtx_unlock(&sf_buf_lock); >> + return (sf); >> +} >> + >> +/* >> + * Remove a reference from the given sf_buf, adding it to the free >> + * list when its reference count reaches zero. A freed sf_buf still, >> + * however, retains its virtual-to-physical mapping until it is >> + * recycled or reactivated by sf_buf_alloc(9). >> + */ >> +void >> +sf_buf_free(struct sf_buf *sf) >> +{ >> + >> +#ifdef SFBUF_OPTIONAL_DIRECT_MAP >> + if (SFBUF_OPTIONAL_DIRECT_MAP) >> + return; >> +#endif >> + >> + mtx_lock(&sf_buf_lock); >> + sf->ref_count--; >> + if (sf->ref_count == 0) { >> + TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry); >> + nsfbufsused--; >> + if (sf_buf_unmap(sf)) { >> + sf->m = NULL; >> + LIST_REMOVE(sf, list_entry); >> + } >> + if (sf_buf_alloc_want > 0) >> + wakeup(&sf_buf_freelist); >> + } >> + mtx_unlock(&sf_buf_lock); >> +} >> + >> +#ifdef SFBUF_PROCESS_PAGE >> +/* >> + * Run callback function on sf_buf that holds a certain page. >> + */ >> +boolean_t >> +sf_buf_process_page(vm_page_t m, void (*cb)(struct sf_buf *)) >> +{ >> + struct sf_head *hash_list; >> + struct sf_buf *sf; >> + >> + hash_list = &sf_buf_active[SF_BUF_HASH(m)]; >> + mtx_lock(&sf_buf_lock); >> + LIST_FOREACH(sf, hash_list, list_entry) { >> + if (sf->m == m) { >> + cb(sf); >> + mtx_unlock(&sf_buf_lock); >> + return (TRUE); >> + } >> + } >> + mtx_unlock(&sf_buf_lock); >> + return (FALSE); >> +} >> +#endif /* SFBUF_PROCESS_PAGE */ >> >> Modified: head/sys/mips/include/sf_buf.h >> ============================================================================== >> --- head/sys/mips/include/sf_buf.h Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/mips/include/sf_buf.h Tue Aug 5 09:44:10 2014 (r269577) >> @@ -29,31 +29,9 @@ >> #ifndef _MACHINE_SF_BUF_H_ >> #define _MACHINE_SF_BUF_H_ >> >> -#ifdef __mips_n64 >> -#include >> -#include >> -#include >> -#else >> -#include >> -#endif >> - >> -#ifdef __mips_n64 >> -/* In 64 bit the whole memory is directly mapped */ >> -struct sf_buf; >> +#ifdef __mips_n64 /* In 64 bit the whole memory is directly mapped */ >> >> -static inline struct sf_buf * >> -sf_buf_alloc(struct vm_page *m, int pri) >> -{ >> - >> - return ((struct sf_buf *)m); >> -} >> - >> -static inline void >> -sf_buf_free(struct sf_buf *sf) >> -{ >> -} >> - >> -static __inline vm_offset_t >> +static inline vm_offset_t >> sf_buf_kva(struct sf_buf *sf) >> { >> vm_page_t m; >> @@ -62,38 +40,12 @@ sf_buf_kva(struct sf_buf *sf) >> return (MIPS_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m))); >> } >> >> -static __inline struct vm_page * >> +static inline struct vm_page * >> sf_buf_page(struct sf_buf *sf) >> { >> >> return ((vm_page_t)sf); >> } >> >> -#else /* ! __mips_n64 */ >> -struct vm_page; >> - >> -struct sf_buf { >> - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ >> - struct vm_page *m; /* currently mapped page */ >> - vm_offset_t kva; /* va of mapping */ >> -}; >> - >> -struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags); >> -void sf_buf_free(struct sf_buf *sf); >> - >> -static __inline vm_offset_t >> -sf_buf_kva(struct sf_buf *sf) >> -{ >> - >> - return (sf->kva); >> -} >> - >> -static __inline struct vm_page * >> -sf_buf_page(struct sf_buf *sf) >> -{ >> - >> - return (sf->m); >> -} >> #endif /* __mips_n64 */ >> - >> #endif /* !_MACHINE_SF_BUF_H_ */ >> >> Modified: head/sys/mips/include/vmparam.h >> ============================================================================== >> --- head/sys/mips/include/vmparam.h Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/mips/include/vmparam.h Tue Aug 5 09:44:10 2014 (r269577) >> @@ -187,4 +187,8 @@ >> >> #define ZERO_REGION_SIZE (64 * 1024) /* 64KB */ >> >> +#ifndef __mips_n64 >> +#define SFBUF >> +#endif >> + >> #endif /* !_MACHINE_VMPARAM_H_ */ >> >> Modified: head/sys/mips/mips/vm_machdep.c >> ============================================================================== >> --- head/sys/mips/mips/vm_machdep.c Tue Aug 5 09:35:25 2014 (r269576) >> +++ head/sys/mips/mips/vm_machdep.c Tue Aug 5 09:44:10 2014 (r269577) >> @@ -76,9 +76,6 @@ __FBSDID("$FreeBSD$"); >> >> #include >> #include >> -#ifndef __mips_n64 >> -#include >> -#endif >> >> /* Duplicated from asm.h */ >> #if defined(__mips_o32) >> @@ -92,38 +89,6 @@ __FBSDID("$FreeBSD$"); >> #define CALLFRAME_SIZ (SZREG * 4) >> #endif >> >> -#ifndef __mips_n64 >> >> *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** >>