From owner-p4-projects@FreeBSD.ORG Sun Aug 15 17:48:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0B1D1065673; Sun, 15 Aug 2010 17:48:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73494106566B for ; Sun, 15 Aug 2010 17:48:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6098D8FC13 for ; Sun, 15 Aug 2010 17:48:42 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7FHmgEB003664 for ; Sun, 15 Aug 2010 17:48:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7FHmgWO003661 for perforce@freebsd.org; Sun, 15 Aug 2010 17:48:42 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 15 Aug 2010 17:48:42 GMT Message-Id: <201008151748.o7FHmgWO003661@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Aug 2010 17:48:42 -0000 http://p4web.freebsd.org/@@182430?ac=10 Change 182430 by hselasky@hselasky_laptop001 on 2010/08/15 17:47:47 USB serial: - fix forwarding of Line Register Status changes to TTY layer. PR: usb/149675 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#19 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#19 (text+ko) ==== @@ -942,6 +942,7 @@ uint8_t new_msr; uint8_t new_lsr; uint8_t onoff; + uint8_t lsr_delta; tp = sc->sc_tty; @@ -965,6 +966,7 @@ return; } onoff = ((sc->sc_msr ^ new_msr) & SER_DCD); + lsr_delta = (sc->sc_lsr ^ new_lsr); sc->sc_msr = new_msr; sc->sc_lsr = new_lsr; @@ -977,6 +979,27 @@ ttydisc_modem(tp, onoff); } + + if ((lsr_delta & ULSR_BI) && (sc->sc_lsr & ULSR_BI)) { + + DPRINTF("BREAK detected\n"); + + ttydisc_rint(tp, 0, TRE_BREAK); + } + + if ((lsr_delta & ULSR_FE) && (sc->sc_lsr & ULSR_FE)) { + + DPRINTF("Frame error detected\n"); + + ttydisc_rint(tp, 0, TRE_FRAMING); + } + + if ((lsr_delta & ULSR_PE) && (sc->sc_lsr & ULSR_PE)) { + + DPRINTF("Parity error detected\n"); + + ttydisc_rint(tp, 0, TRE_PARITY); + } } void From owner-p4-projects@FreeBSD.ORG Sun Aug 15 17:57:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9964910656A7; Sun, 15 Aug 2010 17:57:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A33B1065696 for ; Sun, 15 Aug 2010 17:57:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 476898FC12 for ; Sun, 15 Aug 2010 17:57:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7FHvT9M005924 for ; Sun, 15 Aug 2010 17:57:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7FHvTTY005921 for perforce@freebsd.org; Sun, 15 Aug 2010 17:57:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 15 Aug 2010 17:57:29 GMT Message-Id: <201008151757.o7FHvTTY005921@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Aug 2010 17:57:29 -0000 http://p4web.freebsd.org/@@182431?ac=10 Change 182431 by hselasky@hselasky_laptop001 on 2010/08/15 17:57:02 USB serial: - add possibly missing ttydisc_rint_done() call. PR: usb/149675 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#20 (text+ko) ==== @@ -985,6 +985,7 @@ DPRINTF("BREAK detected\n"); ttydisc_rint(tp, 0, TRE_BREAK); + ttydisc_rint_done(tp); } if ((lsr_delta & ULSR_FE) && (sc->sc_lsr & ULSR_FE)) { @@ -992,6 +993,7 @@ DPRINTF("Frame error detected\n"); ttydisc_rint(tp, 0, TRE_FRAMING); + ttydisc_rint_done(tp); } if ((lsr_delta & ULSR_PE) && (sc->sc_lsr & ULSR_PE)) { @@ -999,6 +1001,7 @@ DPRINTF("Parity error detected\n"); ttydisc_rint(tp, 0, TRE_PARITY); + ttydisc_rint_done(tp); } } From owner-p4-projects@FreeBSD.ORG Sun Aug 15 20:30:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E13051065679; Sun, 15 Aug 2010 20:30:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A293A106564A for ; Sun, 15 Aug 2010 20:30:03 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8F3EC8FC17 for ; Sun, 15 Aug 2010 20:30:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7FKU3Ee047213 for ; Sun, 15 Aug 2010 20:30:03 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7FKU3nG047210 for perforce@freebsd.org; Sun, 15 Aug 2010 20:30:03 GMT (envelope-from kibab@FreeBSD.org) Date: Sun, 15 Aug 2010 20:30:03 GMT Message-Id: <201008152030.o7FKU3nG047210@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Aug 2010 20:30:04 -0000 http://p4web.freebsd.org/@@182435?ac=10 Change 182435 by kibab@kibab_kibab-nb on 2010/08/15 20:29:20 - Some TCP features; - Disk quotas & POSIX1003.1B stuff; - MAC and AUDIT options. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/ksched.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_cow.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_mqueue.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_sem.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/ip_mroute.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/ip_options.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/tcp_syncache.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/security/audit/audit.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/security/mac/mac_syscalls.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ufs/ufs_vnops.c#4 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/ksched.c#2 (text+ko) ==== @@ -41,12 +41,15 @@ #include #include #include +#include #include #include #include #include #include +FEATURE(_kposix_priority_scheduling, "POSIX P1003.1B realtime extensions"); + /* ksched: Real-time extension to support POSIX priority scheduling. */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_cow.c#3 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include +FEATURE(zero_copy_sockets, "Zero copy sockets support"); struct netsend_cow_stats { int attempted; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_mqueue.c#3 (text+ko) ==== @@ -82,6 +82,8 @@ #include #include +FEATURE(p1003_1b_mqueue, "POSIX P1003.1B message queues support"); + /* * Limits and constants */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_sem.c#3 (text+ko) ==== @@ -65,6 +65,7 @@ #include +FEATURE(p1003_1b_semaphores, "POSIX1003.1B semaphores support"); /* * TODO * ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/ip_mroute.c#3 (text+ko) ==== @@ -114,6 +114,8 @@ #include +FEATURE(mrouting, "Multicast routing support"); + #ifndef KTR_IPMF #define KTR_IPMF KTR_INET #endif ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/ip_options.c#3 (text+ko) ==== @@ -65,6 +65,10 @@ #include +#ifdef IPSTEALTH +FEATURE(ipstealth, "Support for stealth forwarding"); +#endif + static int ip_dosourceroute = 0; SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourceroute, CTLFLAG_RW, &ip_dosourceroute, 0, "Enable forwarding source routed IP packets"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/tcp_syncache.c#2 (text+ko) ==== @@ -97,6 +97,10 @@ #include +#ifdef TCP_SIGNATURE +FEATURE(tcp_signature, "Support for TCP signatures (RFC 2385)"); +#endif + static VNET_DEFINE(int, tcp_syncookies) = 1; #define V_tcp_syncookies VNET(tcp_syncookies) SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, syncookies, CTLFLAG_RW, ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/security/audit/audit.c#2 (text) ==== @@ -72,6 +72,8 @@ #include +FEATURE(audit, "BSM audit support"); + static uma_zone_t audit_record_zone; static MALLOC_DEFINE(M_AUDITCRED, "audit_cred", "Audit cred storage"); MALLOC_DEFINE(M_AUDITDATA, "audit_data", "Audit data storage"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/security/mac/mac_syscalls.c#2 (text+ko) ==== @@ -72,6 +72,8 @@ #ifdef MAC +FEATURE(mac, "Mandatory Access Control support"); + int __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ufs/ufs_vnops.c#4 (text+ko) ==== @@ -87,6 +87,15 @@ FEATURE(ufs_gjournal, "Journaling support through GEOM for UFS"); #endif +#ifdef QUOTA +FEATURE(quota, "UFS disk quotas support"); +#endif + +#ifdef SUIDDIR +FEATURE(suiddir, "Give all new files in directory the same ownership as the directory"); +#endif + + #include static vop_accessx_t ufs_accessx; From owner-p4-projects@FreeBSD.ORG Sun Aug 15 20:40:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30D2710656A3; Sun, 15 Aug 2010 20:40:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D20F11065693 for ; Sun, 15 Aug 2010 20:40:46 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BF0868FC1C for ; Sun, 15 Aug 2010 20:40:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7FKekiB051655 for ; Sun, 15 Aug 2010 20:40:46 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7FKekrJ051648 for perforce@freebsd.org; Sun, 15 Aug 2010 20:40:46 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Sun, 15 Aug 2010 20:40:46 GMT Message-Id: <201008152040.o7FKekrJ051648@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Aug 2010 20:40:47 -0000 http://p4web.freebsd.org/@@182438?ac=10 Change 182438 by jlaffaye@jlaffaye-chulak on 2010/08/15 20:40:27 Cleanup: - style(9) - remove `ENSURE_THAT_ALL_REQUIREMENTS_ARE_MET' conditional code: we are doing the same logic (install dependencies if missing) two lines after... Affected files ... .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/add.h#8 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#17 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#16 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/add.h#8 (text+ko) ==== @@ -41,7 +41,8 @@ extern Boolean KeepPackage; extern Boolean IgnoreDeps; extern add_mode_t AddMode; -extern char PkgTopDir[PATH_MAX]; +extern char PkgTopDir[]; +extern char db_dir_tmp[]; int mkdirs(char *path); int extract_package(struct archive *, Package *, const char *); ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#17 (text+ko) ==== @@ -32,7 +32,7 @@ #include "add.h" /* Global used by cleanup() */ -char db_dir_tmp[FILENAME_MAX]; +char db_dir_tmp[PATH_MAX]; /* * Extract and parse the plist of a package archive. @@ -88,7 +88,7 @@ Boolean conflictsfound = FALSE; int code = 0; int errcode = 0; - char db_dir[FILENAME_MAX]; + char db_dir[PATH_MAX]; char cmd[FILENAME_MAX]; char pre_script[FILENAME_MAX] = INSTALL_FNAME; char post_script[FILENAME_MAX]; @@ -164,48 +164,6 @@ warnx("-f specified; proceeding anyway"); } -#if ENSURE_THAT_ALL_REQUIREMENTS_ARE_MET - /* - * Before attempting to do the slave mode bit, ensure that we've - * downloaded & processed everything we need. - * It's possible that we haven't already installed all of our - * dependencies if the dependency list was misgenerated due to - * other dynamic dependencies or if a dependency was added to a - * package without all REQUIRED_BY packages being regenerated. - */ - for (p = pkg ? pkg->head : NULL; p; p = p->next) { - const char *ext; - char *deporigin; - - if (p->type != PLIST_PKGDEP) - continue; - - if (p->next->type == PLIST_DEPORIGIN) - deporigin = p->next->name; - else - deporigin = NULL; - - if (isinstalledpkg(p->name) <= 0 && - !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)){ - char subpkg[FILENAME_MAX], *sep; - - strlcpy(subpkg, pkg, sizeof subpkg); - if ((sep = strrchr(subpkg, '/')) != NULL) { - *sep = '\0'; - if ((sep = strrchr(subpkg, '/')) != NULL) { - *sep = '\0'; - strlcat(subpkg, "/All/", sizeof subpkg); - strlcat(subpkg, p->name, sizeof subpkg); - if ((ext = strrchr(pkg, '.')) == NULL) - ext = ".tbz"; - strlcat(subpkg, ext, sizeof subpkg); - pkg_do(subpkg); - } - } - } - } -#endif - /* Now check the packing list for dependencies */ for (p = pkg->head; p ; p = p->next) { char *deporigin; ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#16 (text+ko) ==== @@ -34,10 +34,6 @@ void cleanup(void); -extern int extract_state; -extern char db_dir_tmp[FILENAME_MAX]; -extern char db_dir[FILENAME_MAX]; - char PkgTopDir[PATH_MAX]; int @@ -52,13 +48,12 @@ if (AddMode == SLAVE) { PkgTopDir[0] = '\0'; err_cnt = pkg_do(NULL); - } - else + } else for (i = 0; pkgs[i]; i++) { PkgTopDir[0] = '\0'; err_cnt += pkg_do(pkgs[i]); } - return err_cnt; + return (err_cnt); } /* From owner-p4-projects@FreeBSD.ORG Mon Aug 16 00:01:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24A131065670; Mon, 16 Aug 2010 00:01:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB1A0106564A for ; Mon, 16 Aug 2010 00:01:33 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C7AD78FC1E for ; Mon, 16 Aug 2010 00:01:33 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7G01Xsu008818 for ; Mon, 16 Aug 2010 00:01:33 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7G01XTN008811 for perforce@freebsd.org; Mon, 16 Aug 2010 00:01:33 GMT (envelope-from ivoras@FreeBSD.org) Date: Mon, 16 Aug 2010 00:01:33 GMT Message-Id: <201008160001.o7G01XTN008811@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 00:01:34 -0000 http://p4web.freebsd.org/@@182448?ac=10 Change 182448 by ivoras@ursaminor on 2010/08/16 00:01:00 Avoid shuffling dependancies if already shuffled, add more optional verbose messages. Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#37 edit .. //depot/projects/soc2010/pkg_patch/src/patch/Notes.txt#7 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#27 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#27 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#36 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#36 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#38 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#35 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#35 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.c#20 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.h#19 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.1#9 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#35 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#34 edit .. //depot/projects/soc2010/pkg_patch/src/patch/updateweb.c#15 edit .. //depot/projects/soc2010/pkg_patch/src/patch/updateweb.h#15 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#37 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/Notes.txt#7 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#27 (text+ko) ==== @@ -307,7 +307,7 @@ if (access(fpatch, R_OK) != 0) err(1, "Access error reading file: %s", fpatch); snprintf(dpatch, PATH_MAX, "%s/patch", my_tmp); - if (access(dpatch, R_OK) != 0) + if (access(dpatch, R_OK) == 0) rm_rf(dpatch); if (mkdir(dpatch, 0700) != 0) err(1, "Cannot create directory: %s", dpatch); @@ -346,6 +346,9 @@ * Step 2 - read the existing (live system) package data and the new * package data. */ + memset(&pkg_live, 0, sizeof(pkg_live)); + memset(&pkg_new, 0, sizeof(pkg_new)); + memset(&xpatch, 0, sizeof(xpatch)); if (read_package_by_name(pp.source, &pkg_live) != 0) err(1, "Cannot read package information for %s", pp.source); snprintf(tmp, PATH_MAX, "%s/%s", dpatch, CONTENTS_FNAME); @@ -360,6 +363,9 @@ printf("Verifying live system and patch data consistency...\n"); /* Check that files to be added don't exist already. */ STAILQ_FOREACH(pl, &pp.pp_add, linkage) { + snprintf(tmp, PATH_MAX, "%s/%s", dpatch, pl->filename); + if (isdir(tmp)) + continue; if (pkg_to_live_filename(tmp, pl->filename, &pkg_new, "pp_add") != 0) { err_count++; @@ -435,6 +441,8 @@ baton_twirl(); /* Step 4 - backup the existing package */ + if (Verbose > 1) + printf("Backing up the old package to %s...\n", backup_pkg); if (pkg_backup(pp.source, backup_pkg) != 0) err(1, "Cannot backup package: %s", pp.source); @@ -443,6 +451,8 @@ * existing files and patches, then verifying all of them match expected * checksum, then rename()-ing them to the expected files. */ + if (Verbose > 1) + printf("Applying patches...\n"); snprintf(pext, sizeof(pext), ".p%u", getpid()); fpvect = calloc(pplist_count(&pp.pp_patch), sizeof(*fpvect)); n_patched_files = 0; @@ -492,6 +502,8 @@ if (pclose(fpvect[i]) != 0) err(1, "pclose() failed"); /* Verify patched files are correct */ + if (Verbose > 1) + printf("Verifying patched files...\n"); STAILQ_FOREACH(pl, &pp.pp_patch, linkage) { char live_md5[33], target_md5[33], newfile[PATH_MAX]; @@ -534,6 +546,8 @@ baton_twirl(); } /* All is well, we can rename() the new files to the live ones. */ + if (Verbose > 1) + printf("Finishing...\n"); STAILQ_FOREACH(pl, &pp.pp_patch, linkage) { char newfile[PATH_MAX], livefile[PATH_MAX]; ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#27 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#36 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#36 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#38 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#35 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#35 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.c#20 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.h#19 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.1#9 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#35 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#34 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/updateweb.c#15 (text+ko) ==== @@ -45,6 +45,7 @@ Package *plist; Boolean match; Boolean found_deps; + Boolean shuffled; TAILQ_ENTRY(patchrec) linkage; }; @@ -401,15 +402,18 @@ pl = pl->next; continue; } - /* Reshuffle the found (depended-on) package to - * the front. */ assert(pr2 != NULL); - if (Verbose > 2) - printf("Shuffling %s to head of queue\n", - pr2->target); - TAILQ_REMOVE(&pindex.prlist, pr2, linkage); - TAILQ_INSERT_HEAD(&pindex.prlist, pr2, linkage); - scount++; + if (!pr2->shuffled) { + if (Verbose > 2) + printf("Shuffling %s to head " + "of queue\n", pr2->target); + TAILQ_REMOVE(&pindex.prlist, pr2, + linkage); + TAILQ_INSERT_HEAD(&pindex.prlist, pr2, + linkage); + pr2->shuffled = TRUE; + scount++; + } pl = pl->next; } } ==== //depot/projects/soc2010/pkg_patch/src/patch/updateweb.h#15 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 16 00:22:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0F331065694; Mon, 16 Aug 2010 00:22:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B09F1065670 for ; Mon, 16 Aug 2010 00:22:26 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 66FC58FC15 for ; Mon, 16 Aug 2010 00:22:26 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7G0MQon014826 for ; Mon, 16 Aug 2010 00:22:26 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7G0MQPx014823 for perforce@freebsd.org; Mon, 16 Aug 2010 00:22:26 GMT (envelope-from ligregni@FreeBSD.org) Date: Mon, 16 Aug 2010 00:22:26 GMT Message-Id: <201008160022.o7G0MQPx014823@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 00:22:27 -0000 http://p4web.freebsd.org/@@182451?ac=10 Change 182451 by ligregni@ligPhenom on 2010/08/16 00:21:50 The FINAL deliverable of the project (at GSoC), still pending some integration issues that will be reviewed with my mentor and the administrators of the project, in order to get it implemented in the next version of FreeBSD. Affected files ... .. //depot/projects/soc2010/disaudit/Makefile#4 edit .. //depot/projects/soc2010/disaudit/audit_warn#1 add .. //depot/projects/soc2010/disaudit/damasterd.c#8 edit .. //depot/projects/soc2010/disaudit/damasterd_control#2 edit .. //depot/projects/soc2010/disaudit/msocket_work.c#9 edit .. //depot/projects/soc2010/disaudit/msocket_work.h#10 edit .. //depot/projects/soc2010/disaudit/server-key.pem#1 add .. //depot/projects/soc2010/disaudit/server-req.pem#1 add .. //depot/projects/soc2010/disaudit/shipd.c#11 edit .. //depot/projects/soc2010/disaudit/shipd_control#2 edit .. //depot/projects/soc2010/disaudit/ssocket_work.c#9 edit .. //depot/projects/soc2010/disaudit/ssocket_work.h#11 edit .. //depot/projects/soc2010/disaudit/utils.c#4 edit .. //depot/projects/soc2010/disaudit/utils.h#4 edit Differences ... ==== //depot/projects/soc2010/disaudit/Makefile#4 (text+ko) ==== @@ -1,11 +1,12 @@ # CC = cc -CFLAGS = -Wall -O2 -g +CFLAGS = -Wall -O2 -g -D_SSL_ TARGETS = shipd damasterd -DOBJ = damasterd.o msocket_work.o utils.o -SOBJ = shipd.o ssocket_work.o utils.o -LIBS = -lmd +DOBJ = damasterd.o msocket_work.o utils.o sha_utils.o +SOBJ = shipd.o ssocket_work.o utils.o sha_utils.o +LIBS = -lmd -lssl -lcrypto +#LIBS = -lssl -lcrypto all: $(TARGETS) ==== //depot/projects/soc2010/disaudit/damasterd.c#8 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include -#include #include #include @@ -51,12 +50,29 @@ #include +#ifdef _SSL_ +/* OpenSSL headers */ +#include /* SSLeay stuff */ +#include +#include +#include +#include +#include +#else +#include +#endif /* _SSL_ */ + #define AUDIT_DAMASTERD_FILE "/etc/security/damasterd_control" +/* define HOME to be dir for key and cert files... */ +#define HOME "./" +/* Make these what you want for cert & key files */ +#define CERTF HOME "server-req.pem" +#define KEYF HOME "server-key.pem" /*** DECLARATIONS ***/ /* local prototypes */ -static int +static int check_files_equal(char *pathslave, char *sha256slave, char *hostname, char *path, char *fullpath); static int do_master_daemon(); @@ -65,9 +81,13 @@ static int receive_trail(int sfd, struct sockaddr *clientinfo); static int search_trail(int sfd, struct sockaddr *clientinfo); +/* extern prototypes */ +void get_SHA256_File(char *, char *); + +/* Global variables */ + /* Directory settings took from audit_control */ char slave_trails_dir[MAX_DIR_SIZE + 1]; -char *ptr_std; int slave_dirs; /* The level of trust the shipping process will have (0 means disabled) */ @@ -87,6 +107,16 @@ */ int lookup_host; +#ifdef _SSL_ +/* SSL Enabled */ +char ssl_enabled; + +SSL_CTX *ctx; +SSL *ssl; +SSL_METHOD *meth; +#endif /* _SSL_ */ + + /* * DAMasterD Distributed Audit Master Daemon * @@ -119,8 +149,6 @@ to_log("Can't get the parameters to work!"); exit(1); } - ptr_std = slave_trails_dir + strlen(slave_trails_dir); - /* * There is no shipd enabled and it wasn't called by AUDIT (normally * the unique way to get 'last' on). @@ -129,6 +157,31 @@ to_log("DAMasterd disabled"); exit(0); } +#ifdef _SSL_ + if (ssl_enabled) { + SSL_load_error_strings(); + SSLeay_add_ssl_algorithms(); + meth = SSLv23_server_method(); + ctx = SSL_CTX_new(meth); + if (!ctx) { + ERR_print_errors_fp(stderr); + exit(2); + } + if (SSL_CTX_use_certificate_file(ctx, CERTF, SSL_FILETYPE_PEM) <= 0) { + ERR_print_errors_fp(stderr); + exit(3); + } + if (SSL_CTX_use_PrivateKey_file(ctx, KEYF, SSL_FILETYPE_PEM) <= 0) { + ERR_print_errors_fp(stderr); + exit(4); + } + if (!SSL_CTX_check_private_key(ctx)) { + fprintf(stderr, "Private key does not match the certificate public key\n"); + exit(5); + } + } +#endif /* _SSL_ */ + if (do_master_daemon() == -1) exit(1); @@ -138,7 +191,7 @@ static int do_master_daemon() { - int socketfd , newsockfd, childpid; + int socketfd , newsockfd, childpid, res; char message [256]; struct sockaddr clientinfo; @@ -156,6 +209,16 @@ to_log(message); return (-1); } +#ifdef _SSL_ + else if (ssl_enabled) { + ssl = SSL_new(ctx); + CHK_NULL(ssl); + SSL_set_fd(ssl, newsockfd); + res = SSL_accept(ssl); + CHK_SSL(res); + } +#endif /* _SSL_ */ + if (!debug && (childpid = fork()) < 0) { to_log("Error forking the process"); return (-1); @@ -165,9 +228,9 @@ return (-1); } if (!debug) - close(socketfd); + close_socket(socketfd); } - close(newsockfd); + close_socket(newsockfd); usleep(1000); } @@ -186,6 +249,7 @@ char sslave_dirs[10]; char lkup_host [10]; + char opt [4]; /* yes / no */ if (!fpars) return (-1); @@ -198,6 +262,10 @@ fscanf(fpars, "%d", &panic_level); fscanf(fpars, "%d", &port_number); fscanf(fpars, "%s", lkup_host); +#ifdef _SSL_ + fscanf(fpars, "%s", opt); + ssl_enabled = strcmp(opt, "no"); +#endif if (strcmp(sslave_dirs, "no")) slave_dirs = 1; @@ -241,7 +309,7 @@ get_from_socket(sfd, opt, sizeof(opt)); } - close(sfd); + close_socket(sfd); return (res); } @@ -347,7 +415,7 @@ } if (!strncmp(path, path_to_find, strlen(path_to_find))) { char *sha256 = (char *)malloc(sizeof(char) * SHA256_SIZE); - sha256 = SHA256_File(fullpath, sha256); + get_SHA256_File(fullpath, sha256); if (!strcmp(sha256, sha256slave)) return (1); @@ -370,6 +438,8 @@ char dirpath [MAX_DIR_SIZE + 1]; char buffer [MAX_BUF_SIZE + 1]; int brecv; + uint32_t file_size_net; + uint16_t bytes_net; time_t mtime; struct tm *ltime; unsigned file_size; @@ -426,7 +496,13 @@ to_log(message); /* We get the trail size */ - recv(sfd, &file_size, sizeof(file_size), 0); +#ifdef _SSL_ + if (ssl_enabled) + SSL_read(ssl, &file_size_net, sizeof(file_size_net)); + else +#endif /* _SSL */ + recv(sfd, &file_size_net, sizeof(file_size_net), 0); + file_size = ntohl(file_size_net); fd = open(fullpath, O_CREAT | O_WRONLY); if (fd < 0) { @@ -434,12 +510,24 @@ return (-1); } while (file_size) { - brecv = recv(sfd, &bread, sizeof(bread), 0); +#ifdef _SSL_ + if (ssl_enabled) + brecv = SSL_read(ssl, &bytes_net, sizeof(bytes_net)); + else +#endif /* _SSL */ + brecv = recv(sfd, &bytes_net, sizeof(bytes_net), 0); if (brecv < 0) { to_log("Error receiving the file"); return (-1); } - brecv = recv(sfd, buffer, bread, 0); + bread = ntohs(bytes_net); + +#ifdef _SSL_ + if (ssl_enabled) + brecv = SSL_read(ssl, buffer, bread); + else +#endif /* _SSL */ + brecv = recv(sfd, buffer, bread, 0); if (brecv < 0) { to_log("Error receiving the file"); ==== //depot/projects/soc2010/disaudit/damasterd_control#2 (text+ko) ==== @@ -3,3 +3,4 @@ 2 53686 yes +yes ==== //depot/projects/soc2010/disaudit/msocket_work.c#9 (text+ko) ==== @@ -40,6 +40,23 @@ #include +#ifdef _SSL_ +/* OpenSSL headers */ +#include +#include +#include +#include +#include +#endif /* _SSL_ */ + +/* Globals declared at damasterd.c */ +#ifdef _SSL_ +extern SSL_CTX *ctx; +extern SSL *ssl; +extern X509 *server_cert; +extern SSL_METHOD *meth; +#endif /* _SSL_ */ + int init_socket(int port) { @@ -81,3 +98,19 @@ return (retval); } + +void +close_socket(int sockfd) +{ +#ifdef _SSL_ + if (ssl_enabled) + SSL_shutdown(ssl); /* send SSL/TLS close_notify */ +#endif /* _SSL_ */ + + close(sockfd); + +#ifdef _SSL_ + if (ssl_enabled) + SSL_free(ssl); +#endif /* _SSL_ */ +} ==== //depot/projects/soc2010/disaudit/msocket_work.h#10 (text+ko) ==== @@ -30,7 +30,8 @@ #include -int init_socket(int); -int accept_connection(int, struct sockaddr *); +int init_socket(int); +int accept_connection(int, struct sockaddr *); +void close_socket(int); #endif ==== //depot/projects/soc2010/disaudit/shipd.c#11 (text+ko) ==== @@ -31,17 +31,29 @@ #include "utils.h" #include +#include #include #include #include +#include #include #include #include #include #include +#include + +#ifdef _SSL_ +/* OpenSSL headers */ +#include +#include +#include +#include +#include +#else #include -#include +#endif /* _SSL_ */ #define PANIC_DATE 2 #define PANIC_ALL 3 @@ -92,6 +104,11 @@ static void delete_audit_dir_entry(audit_dir_entry ** root); static void set_dir_id(audit_dir_entry ** temp, unsigned id); +/* extern prototypes */ +void get_SHA256_File(char *, char *); + +/* Global variables */ + /* Directory settings took from audit_control */ char master_host[MAX_HOST_SIZE + 1]; audit_dir_entry *audit_dir_root; @@ -105,6 +122,16 @@ /* Port number */ int port_number; +#ifdef _SSL_ +/* SSL Enabled */ +char ssl_enabled; + +SSL_CTX *ctx; +SSL *ssl; +SSL_METHOD *meth; +#endif /* _SSL_ */ + + /* * ShipD Shipping Daemon * @@ -147,13 +174,23 @@ exit(1); } /* - * There is no shipd enabled and it wasn't called by AUDIT (normally - * the unique way to get 'last' on). + * There is no shipd enabled and it wasn't called by AUDIT_WARN + * (normally the unique way to get 'last' on). */ if (panic_level < 2 && last == 0) { to_log("Shipd disabled"); exit(0); } +#ifdef _SSL_ + if (ssl_enabled) { + SSLeay_add_ssl_algorithms(); + meth = SSLv2_client_method(); + SSL_load_error_strings(); + ctx = SSL_CTX_new(meth); + CHK_NULL(ctx); + } +#endif /* _SSL_ */ + /* * This means that the daemon will only search for the last closed * trail and send to the master system. @@ -185,6 +222,10 @@ char audit_trails_dir[MAX_DIR_SIZE + 1]; +#ifdef _SSL_ + char opt [4]; /* yes / no */ +#endif /* _SSL_ */ + unsigned dir_id = 0; if (!fpars) @@ -207,6 +248,10 @@ fscanf(fpars, "%d", &panic_level); fscanf(fpars, "%d", &msec_freq); fscanf(fpars, "%d", &port_number); +#ifdef _SSL_ + fscanf(fpars, "%s", opt); + ssl_enabled = strcmp(opt, "no"); +#endif fclose(fpars); @@ -410,7 +455,7 @@ /* Here we tell master we are done for now */ do_socket_check_file(sockfd, NULL, NULL); - close(sockfd); + close_socket(sockfd); return (ret_val); } @@ -576,12 +621,6 @@ int sockfd; audit_dir_entry *trail_directory; - /* - * XXX replaced with aspsrintf()... strlcpy(fullpath, - * audit_trails_dir, sizeof (fullpath)); ptr = fullpath + - * strlen(fullpath); ptr = '/'; (++ptr) = 0; - */ - if (init_socket(master_host, port_number, &sockfd) == -1) return (0); @@ -594,7 +633,7 @@ * use the fullpath). */ asprintf(&ptr, "%s/%s", trail_directory ? trail_directory->name : "NULL", cur->name); - sha256 = SHA256_File(ptr, sha256); + get_SHA256_File(ptr, sha256); sprintf(message, "The SHA256 checksum for %s is %s", cur->name, sha256); to_log(message); @@ -618,7 +657,7 @@ /* Here we tell master we are done for now */ do_socket_check_file(sockfd, NULL, NULL); - close(sockfd); + close_socket(sockfd); if (first_found != NULL) *first_found = counter; ==== //depot/projects/soc2010/disaudit/shipd_control#2 (text+ko) ==== @@ -1,5 +1,8 @@ /var/audit +/var/audit2 +/var/audit3 master -2 +3 10000 53686 +yes ==== //depot/projects/soc2010/disaudit/ssocket_work.c#9 (text+ko) ==== @@ -44,6 +44,23 @@ #include +#ifdef _SSL_ +/* OpenSSL headers */ +#include +#include +#include +#include +#include +#endif /* _SSL_ */ + +/* Globals declared at shipd.c */ +#ifdef _SSL_ +extern SSL_CTX *ctx; +extern SSL *ssl; +extern X509 *server_cert; +extern SSL_METHOD *meth; +#endif /* _SSL_ */ + int do_socket_check_file(int sockfd, char *path, char *sha256) { @@ -74,8 +91,10 @@ send_to_socket(sockfd, path ? "2" : "0"); if (path) { int fd = open(fullpath, O_RDONLY); - unsigned file_size; - int bread; + unsigned long file_size; + uint16_t bytes_net; + uint32_t file_size_net; + int bread , bsend; struct stat statbuf; /* If there is a file to send through the socket */ @@ -91,8 +110,19 @@ return -1; } file_size = statbuf.st_size; - send(sockfd, &file_size, sizeof(file_size), 0); + file_size_net = htonl(file_size); + +#ifdef _SSL_ + if (ssl_enabled) + bsend = SSL_write(ssl, &file_size_net, sizeof(file_size_net)); + else +#endif /* _SSL_ */ + bsend = send(sockfd, &file_size_net, sizeof(file_size_net), 0); + if (bsend <= 0) { + to_log("Sending trail size"); + return -1; + } while (file_size) { bread = read(fd, buffer, min(file_size, MAX_BUF_SIZE)); @@ -102,9 +132,27 @@ } else if (bread == 0) break; - send(sockfd, &bread, sizeof(bread), 0); - send(sockfd, buffer, bread, 0); - + bytes_net = htons((unsigned)bread); +#ifdef _SSL_ + if (ssl_enabled) + bsend = SSL_write(ssl, &bytes_net, sizeof(bytes_net)); + else +#endif /* _SSL_ */ + bsend = send(sockfd, &bytes_net, sizeof(bytes_net), 0); + if (bsend <= 0) { + to_log("Sending bytes to send"); + return -1; + } +#ifdef _SSL_ + if (ssl_enabled) + bsend = SSL_write(ssl, buffer, bread); + else +#endif /* _SSL_ */ + bsend = send(sockfd, buffer, bread, 0); + if (bsend <= 0) { + to_log("Sending trail contents"); + return -1; + } file_size -= bread; } } @@ -187,5 +235,34 @@ to_log(message); *sfd = sockfd; + +#ifdef _SSL_ + if (ssl_enabled) { + ssl = SSL_new(ctx); + CHK_NULL(ssl); + SSL_set_fd(ssl, sockfd); + res = SSL_connect(ssl); + CHK_SSL(res); + snprintf(message, sizeof(message), "SSL connection using %s\n", SSL_get_cipher(ssl)); + to_log(message); + } +#endif /* _SSL_ */ + return (0); } + +void +close_socket(int sockfd) +{ +#ifdef _SSL_ + if (ssl_enabled) + SSL_shutdown(ssl); /* send SSL/TLS close_notify */ +#endif /* _SSL_ */ + + close(sockfd); + +#ifdef _SSL_ + if (ssl_enabled) + SSL_free(ssl); +#endif /* _SSL_ */ +} ==== //depot/projects/soc2010/disaudit/ssocket_work.h#11 (text+ko) ==== @@ -28,9 +28,9 @@ #ifndef _SSOCKET_WORK_H_ #define _SSOCKET_WORK_H_ -int do_socket_check_file(int, char *, char *); -int do_socket_send_file(int, char *, char *); -int init_socket(char *, int, int *); +int do_socket_check_file(int, char *, char *); +int do_socket_send_file(int, char *, char *); +int init_socket(char *, int, int *); +void close_socket(int); #endif - ==== //depot/projects/soc2010/disaudit/utils.c#4 (text+ko) ==== @@ -8,7 +8,24 @@ #include #include +#include + +#ifdef _SSL_ +/* OpenSSL headers */ +#include +#include +#include +#include +#include +#endif /* _SSL_ */ + int debug; +char ssl_enabled; + +/* To be declared at shipd.c or damasterd.c */ +#ifdef _SSL_ +SSL *ssl; +#endif /* _SSL_ */ void to_log(char *message) @@ -26,19 +43,29 @@ void get_from_socket(int sfd, char *dest, size_t dest_size) { - int len , left; + int left; int brecv; + uint16_t bytes_net; unsigned char buffer[MAX_BUF_SIZE + 1]; - brecv = recv(sfd, buffer, sizeof(int), 0); +#ifdef _SSL_ + if (ssl_enabled) + brecv = SSL_read(ssl, &bytes_net, sizeof(bytes_net)); + else +#endif /* _SSL_ */ + brecv = recv(sfd, &bytes_net, sizeof(bytes_net), 0); - memcpy(&len, buffer, sizeof(int)); + left = ntohs(bytes_net); - left = len; dest[0] = '\0'; while (left > 0) { - brecv = recv(sfd, buffer, min(MAX_BUF_SIZE, left), 0); +#ifdef _SSL_ + if (ssl_enabled) + brecv = SSL_read(ssl, buffer, min(MAX_BUF_SIZE, left)); + else +#endif /* _SSL_ */ + brecv = recv(sfd, buffer, min(MAX_BUF_SIZE, left), 0); buffer[brecv] = 0; strlcat(dest, (char *)buffer, dest_size); @@ -53,7 +80,21 @@ send_to_socket(int sfd, char *data) { int len = strlen(data); + uint16_t bytes_net; - send(sfd, &len, sizeof(int), 0); - send(sfd, data, len, 0); + bytes_net = htons((unsigned)len); + +#ifdef _SSL_ + if (ssl_enabled) + SSL_write(ssl, &bytes_net, sizeof(bytes_net)); + else +#endif /* _SSL_ */ + send(sfd, &bytes_net, sizeof(bytes_net), 0); + +#ifdef _SSL_ + if (ssl_enabled) + SSL_write(ssl, data, len); + else +#endif /* _SSL_ */ + send(sfd, data, len, 0); } ==== //depot/projects/soc2010/disaudit/utils.h#4 (text+ko) ==== @@ -32,6 +32,10 @@ #include +#ifdef _SSL_ +#include +#endif /* _SSL_ */ + #define MAX_DIR_SIZE 255 #define MAX_PATH_SIZE MAX_DIR_SIZE + 50 #define MAX_HOST_SIZE 255 @@ -39,7 +43,13 @@ #define MAX_BUF_SIZE 1024 #define MESSAGE_DESC_SIZE 50 #define SHA256_SIZE 66 -#define CHAR_ID_SIZE 10 + +#define CHK_NULL(x) if ((x)==NULL) { to_log("Reached NULL"); exit (1); } +#define CHK_ERR(err,s) if ((err)==-1) { to_log(s); exit(1); } + +#ifdef _SSL_ +#define CHK_SSL(err) if ((err)==-1) { ERR_print_errors_fp(stderr); exit(2); } +#endif /* _SSL_ */ #define min(a,b) (a < b ? a : b) @@ -47,10 +57,15 @@ * Two main things to be set by this variable, if daemonize or not, and the * destination of the messages. */ -extern int debug; +extern int debug; +extern char ssl_enabled; +/* To be declared at shipd.c or damasterd.c */ +#ifdef _SSL_ +extern SSL *ssl; +#endif /* _SSL_ */ -void get_from_socket(int std, char *dest, size_t dest_size); -void send_to_socket(int sfd, char *data); -void to_log(char *message); +void get_from_socket(int std, char *dest, size_t dest_size); +void send_to_socket(int sfd, char *data); +void to_log (char *message); -#endif /* ! _UTILS_H_ */ +#endif /* ! _UTILS_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Aug 16 01:06:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FA1310656A5; Mon, 16 Aug 2010 01:06:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCFA51065696 for ; Mon, 16 Aug 2010 01:06:20 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8E2218FC08 for ; Mon, 16 Aug 2010 01:06:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7G16Ki2024187 for ; Mon, 16 Aug 2010 01:06:20 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7G16Kp8024184 for perforce@freebsd.org; Mon, 16 Aug 2010 01:06:20 GMT (envelope-from ivoras@FreeBSD.org) Date: Mon, 16 Aug 2010 01:06:20 GMT Message-Id: <201008160106.o7G16Kp8024184@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 01:06:21 -0000 http://p4web.freebsd.org/@@182452?ac=10 Change 182452 by ivoras@ursaminor on 2010/08/16 01:05:16 Fix directory name translation and handling Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#28 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#28 (text+ko) ==== @@ -153,6 +153,7 @@ int pdirlen; Boolean found = FALSE; + *adirname = '\0'; pdirlen = strlen(pdirname); pli = pkg->head; while (pli != NULL) { @@ -175,7 +176,7 @@ warnx("Failure to detect package cwd info [%s]", msg); return (-1); } - snprintf(adirname, PATH_MAX, "%s/%s", last_cwd, pli->name); + snprintf(adirname, PATH_MAX, "%s/%s", last_cwd, pdirname); return (0); } @@ -373,7 +374,7 @@ } if (access(tmp, F_OK) == 0) { warnx("File exists but shouldn't: %s", tmp); - err_count++; + /* err_count++; */ } } /* Check that files to be removed actually exist. */ @@ -442,7 +443,7 @@ baton_twirl(); /* Step 4 - backup the existing package */ if (Verbose > 1) - printf("Backing up the old package to %s...\n", backup_pkg); + printf("Backing up the old package...\n"); if (pkg_backup(pp.source, backup_pkg) != 0) err(1, "Cannot backup package: %s", pp.source); @@ -493,7 +494,7 @@ err(1, "Cannot symlink %s to %s", patchfile, newfile); } else { - if (cp(patchfile, newfile) != 0) + if (copy_file_absolute(patchfile, newfile) != 0) err(1, "Cannot copy %s to %s", patchfile, newfile); } @@ -566,15 +567,21 @@ /* Step 6 - apply other cases - files to add, remove, dirs to rmdir */ STAILQ_FOREACH(pl, &pp.pp_add, linkage) { char livefile[PATH_MAX]; + int er; snprintf(tmp, PATH_MAX, "%s/%s", dpatch, pl->filename); - if (pkg_to_live_filename(livefile, pl->filename, &pkg_new, - "pp_add2") != 0) { + if (!isdir(tmp)) + er = pkg_to_live_filename(livefile, pl->filename, + &pkg_new, "pp_add2"); + else + er = pkg_to_live_dirname(livefile, pl->filename, + &pkg_new, "pp_add2"); + if (er != 0) { warnx("Cannot resolve %s in new pkg", pl->filename); goto error_cleanup; } if (copy_file_absolute(tmp, livefile) != 0) { - warn("Cannot copy %s to %s", tmp, livefile); + warn("Cannot copy %s to %s [pp_add]", tmp, livefile); goto error_cleanup; } } From owner-p4-projects@FreeBSD.ORG Mon Aug 16 03:19:01 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95DAE10656A7; Mon, 16 Aug 2010 03:19:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 585441065696 for ; Mon, 16 Aug 2010 03:19:01 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2BF128FC15 for ; Mon, 16 Aug 2010 03:19:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7G3J16q061764 for ; Mon, 16 Aug 2010 03:19:01 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7G3J1i3061761 for perforce@freebsd.org; Mon, 16 Aug 2010 03:19:01 GMT (envelope-from ligregni@FreeBSD.org) Date: Mon, 16 Aug 2010 03:19:01 GMT Message-Id: <201008160319.o7G3J1i3061761@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 03:19:01 -0000 http://p4web.freebsd.org/@@182453?ac=10 Change 182453 by ligregni@ligPhenom on 2010/08/16 03:18:50 Some manual pages Affected files ... .. //depot/projects/soc2010/disaudit/damasterd.8#1 add .. //depot/projects/soc2010/disaudit/damasterd_control.5#1 add .. //depot/projects/soc2010/disaudit/shipd.8#1 add .. //depot/projects/soc2010/disaudit/shipd_control.5#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 16 07:23:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1761710656A3; Mon, 16 Aug 2010 07:23:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6D391065694 for ; Mon, 16 Aug 2010 07:23:32 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id AA9DE8FC0A for ; Mon, 16 Aug 2010 07:23:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7G7NWij029226 for ; Mon, 16 Aug 2010 07:23:32 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7G7NWQU029223 for perforce@freebsd.org; Mon, 16 Aug 2010 07:23:32 GMT (envelope-from bfiedler@FreeBSD.org) Date: Mon, 16 Aug 2010 07:23:32 GMT Message-Id: <201008160723.o7G7NWQU029223@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 07:23:33 -0000 http://p4web.freebsd.org/@@182457?ac=10 Change 182457 by bfiedler@freebsd-home on 2010/08/16 07:23:18 Extend sdiff args; create a pipe between sdiff and diff when diff called first Affected files ... .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#13 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/pathnames.h#3 edit .. //depot/projects/soc2010/bsdtextproc/sdiff/sdiff.c#3 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#13 (text+ko) ==== @@ -74,8 +74,7 @@ SUPCL_OPT, LF_OPT, -/* the following groupings must be in sequence -*/ +/* the following groupings must be in sequence */ OLDGF_OPT, NEWGF_OPT, UNCGF_OPT, @@ -84,8 +83,7 @@ OLDLF_OPT, NEWLF_OPT, UNCLF_OPT, -/* end order-sensitive enums -*/ +/* end order-sensitive enums */ TSIZE_OPT, HLINES_OPT, @@ -94,7 +92,7 @@ }; -#define OPTIONS "0123456789abBC:cdD:eEfhI:iL:lnNPpqrS:sTtU:uvwX:x:y" +#define OPTIONS "0123456789abBC:cdD:eEfhI:iL:lnNPpqrS:sTtU:uvwW:X:x:y" static struct option longopts[] = { { "ignore-file-name-case", no_argument, NULL, FCASE_IGNORE_OPT }, { "no-ignore-file-name-case", no_argument, NULL, FCASE_SENSITIVE_OPT }, @@ -138,7 +136,7 @@ /* options to be forwarded to sdiff */ { "side-by-side", no_argument, NULL, 'y' }, - { "width", optional_argument, NULL, 'W' }, + { "width", required_argument, NULL, 'W' }, { "left-column", no_argument, NULL, LEFTC_OPT }, { "suppress-common-lines", no_argument, NULL, SUPCL_OPT }, @@ -181,7 +179,13 @@ { char *ep, *fromfile = NULL, *tofile = NULL, **oargv, *src, *dst; int ch, lastch, gotstdin, prevoptind, newarg, oargc, flags = 0; + char **sdiffargv; int sdiffargc=1; int width=-1; + /* sdiff gets at most 8 args if called*/ + if (!(sdiffargv = calloc(argc, sizeof(char **) * 8))) + err(2, "main"); + pid_t pid = getpid(); + setlocale(LC_ALL, ""); oargv = argv; @@ -310,12 +314,29 @@ case 'x': push_excludes(optarg); break; + case 'y': - oargv[0] = _PATH_SDIFF; - execv(_PATH_SDIFF, oargv); - _exit(127); - + sdiffargv[0] = _PATH_SDIFF; + break; + case 'W': + sdiffargv[0] = _PATH_SDIFF; + + if (optarg != NULL) { + context = strtol(optarg, &ep, 10); + if (*ep != '\0' || context < 0 || context >=ULLONG_MAX) + err(2, "context out of range\n"); + width = (int)context; + } + break; + case LEFTC_OPT: + sdiffargv[0] = _PATH_SDIFF; + sdiffargv[sdiffargc++] = "-l"; + break; + case SUPCL_OPT: + sdiffargv[0] = _PATH_SDIFF; + sdiffargv[sdiffargc++] = "-s"; break; + case FROMFILE_OPT: if (tofile != NULL) err(2, "--from-file and --to-file are both specified"); @@ -460,6 +481,42 @@ if (stat(dst, &stb2) < 0) err(2, "%s", dst); } + + if( strcmp(sdiffargv[0], _PATH_SDIFF) == 0 ) + { + /* give sdiff the parent process to wait on */ + asprintf( &sdiffargv[sdiffargc++], "--diff-pid=%d", pid); + sdiffargv[sdiffargc++]= src; + sdiffargv[sdiffargc++] = dst; + + int fd[2]; + if (pipe(fd)) + err(2, "pipe"); + + pid_t newpid; + + switch(newpid = fork()) { + case 0: + /* child */ + /* We don't write to the pipe. */ + close(fd[1]); + if (dup2(fd[0], STDIN_FILENO) == -1) + err(2, "child could not duplicate descriptor"); + /* Free unused descriptor. */ + close(fd[0]); + + execvp(_PATH_SDIFF, sdiffargv); + err(2, "could not execute sdiff: %s", _PATH_SDIFF); + break; + case -1: + err(2, "could not fork"); + break; + } + + /* We don't read from the pipe. */ + close(fd[0]); + + } print_status(diffreg(src, dst, flags), src, dst, NULL); } ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/pathnames.h#3 (text+ko) ==== @@ -23,4 +23,5 @@ #include #define _PATH_PR "/usr/bin/pr" -#define _PATH_SDIFF "/usr/bin/sdiff" +/*#define _PATH_SDIFF "/usr/bin/sdiff" */ +#define _PATH_SDIFF "../sdiff/sdiff" ==== //depot/projects/soc2010/bsdtextproc/sdiff/sdiff.c#3 (text+ko) ==== @@ -75,26 +75,68 @@ FILE *outfp; /* file to save changes to */ const char *tmpdir; /* TMPDIR or /tmp */ +enum { + HELP_OPT = CHAR_MAX + 1, + NORMAL_OPT, + FCASE_SENSITIVE_OPT, + FCASE_IGNORE_OPT, + FROMFILE_OPT, + TOFILE_OPT, + UNIDIR_OPT, + STRIPCR_OPT, + HORIZ_OPT, + LEFTC_OPT, + SUPCL_OPT, + LF_OPT, +/* the following groupings must be in sequence */ + OLDGF_OPT, + NEWGF_OPT, + UNCGF_OPT, + CHGF_OPT, + OLDLF_OPT, + NEWLF_OPT, + UNCLF_OPT, +/* end order-sensitive enums */ + TSIZE_OPT, + HLINES_OPT, + LFILES_OPT, + DIFFPROG_OPT, + +/* pid from the diff parent (if applicable) */ + DIFF_PID, + + NOOP_OPT, +}; + static struct option longopts[] = { - { "text", no_argument, NULL, 'a' }, - { "ignore-blank-lines", no_argument, NULL, 'B' }, - { "ignore-space-change", no_argument, NULL, 'b' }, - { "minimal", no_argument, NULL, 'd' }, - { "ignore-tab-expansion", no_argument, NULL, 'E' }, - { "diff-program", required_argument, NULL, 'F' }, - { "speed-large-files", no_argument, NULL, 'H' }, - { "ignore-matching-lines", required_argument, NULL, 'I' }, - { "ignore-case", no_argument, NULL, 'i' }, - { "left-column", no_argument, NULL, 'l' }, - { "output", required_argument, NULL, 'o' }, - { "strip-trailing-cr", no_argument, NULL, 'S' }, - { "suppress-common-lines", no_argument, NULL, 's' }, - { "expand-tabs", no_argument, NULL, 't' }, - { "ignore-all-space", no_argument, NULL, 'W' }, - { "width", required_argument, NULL, 'w' }, - { NULL, 0, NULL, 0 } + /* options only processed in sdiff */ + { "left-column", no_argument, NULL, LEFTC_OPT }, + { "suppress-common-lines", no_argument, NULL, 's' }, + { "width", required_argument, NULL, 'w' }, + { "ignore-all-space", no_argument, NULL, 'W' }, + { "output", required_argument, NULL, 'o' }, + { "diff-program", required_argument, NULL, DIFFPROG_OPT }, + + { "pipe-fd", required_argument, NULL, PIPE_FD }, + { "diff-pid", required_argument, NULL, DIFF_PID }, + + { "ignore-file-name-case", no_argument, NULL, FCASE_IGNORE_OPT }, + { "no-ignore-file-name-case", no_argument, NULL, FCASE_SENSITIVE_OPT }, + { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT }, + { "tabsize", required_argument, NULL, TSIZE_OPT }, + { "help", no_argument, NULL, HELP_OPT }, + { "text", no_argument, NULL, 'a' }, + { "ignore-blank-lines", no_argument, NULL, 'B' }, + { "ignore-space-change", no_argument, NULL, 'b' }, + { "minimal", no_argument, NULL, 'd' }, + { "ignore-tab-expansion", no_argument, NULL, 'E' }, + { "ignore-matching-lines", required_argument, NULL, 'I' }, + { "ignore-case", no_argument, NULL, 'i' }, + { "expand-tabs", no_argument, NULL, 't' }, + { "speed-large-files", no_argument, NULL, 'H' }, + + { NULL, 0, NULL, '\0'} }; - /* * Create temporary file if source_file is not a regular file. * Returns temporary file name if one was malloced, NULL if unnecessary. @@ -163,11 +205,12 @@ int main(int argc, char **argv) { - FILE *diffpipe, *file1, *file2; + FILE *diffpipe=NULL, *file1, *file2; size_t diffargc = 0, wflag = WIDTH; - int ch, fd[2], status; - pid_t pid; + int ch, fd[2] = {-1}, status; + pid_t pid=0; pid_t ppid =-1; const char *outfile = NULL; + struct option *popt; char **diffargv, *diffprog = "diff", *filename1, *filename2, *tmp1, *tmp2, *s1, *s2; @@ -187,70 +230,97 @@ /* Add first argument, the program name. */ diffargv[diffargc++] = diffprog; + + /* create a dynamic string for merging single-switch options */ + if ( asprintf(&diffargv[diffargc++], "-") < 0 ) + err(2, "main"); while ((ch = getopt_long(argc, argv, "aBbdEHI:ilo:stWw:", longopts, NULL)) != -1) { const char *errstr; switch (ch) { + + /* only compatible --long-name-form with diff */ + case FCASE_IGNORE_OPT: + case FCASE_SENSITIVE_OPT: + case STRIPCR_OPT: + case TSIZE_OPT: + case 'S': + case 'W': + for(popt = longopts; ch != popt->val && popt->name != NULL; popt++); + asprintf(&diffargv[diffargc++], "%s", popt->name ); + break; + + /* combine no-arg single switches */ case 'a': - diffargv[diffargc++] = "-a"; - break; case 'B': - diffargv[diffargc++] = "-B"; - break; case 'b': - diffargv[diffargc++] = "-b"; - break; case 'd': - diffargv[diffargc++] = "-d"; - break; case 'E': - diffargv[diffargc++] = "-E"; + case 'i': + case 't': + case 'H': + for(popt = longopts; ch != popt->val && popt->name != NULL; popt++); + diffargv[1] = realloc( diffargv[1], sizeof(char) * strlen(diffargv[1]) + 2 ); + sprintf(diffargv[1], "%s%c", diffargv[1], ch); break; - case 'F': + + case DIFFPROG_OPT: diffargv[0] = diffprog = optarg; break; - case 'H': - diffargv[diffargc++] = "-H"; - break; case 'I': Iflag = 1; diffargv[diffargc++] = "-I"; diffargv[diffargc++] = optarg; break; - case 'i': - diffargv[diffargc++] = "-i"; - break; case 'l': lflag = 1; break; case 'o': outfile = optarg; break; - case 'S': - diffargv[diffargc++] = "--strip-trailing-cr"; - break; case 's': sflag = 1; break; - case 't': - diffargv[diffargc++] = "-t"; - break; - case 'W': - diffargv[diffargc++] = "-w"; - break; case 'w': wflag = strtonum(optarg, WIDTH_MIN, INT_MAX, &errstr); if (errstr) errx(2, "width is %s: %s", errstr, optarg); break; + + case DIFF_PID: + ppid = strtonum(optarg, 0, INT_MAX, &errstr); + if (errstr) + errx(2, "diff pid value is %s: %s", errstr, optarg); + break; + + case HELP_OPT: + usage(); + break; + default: usage(); + break; } + + + } + + /* no single switches were used */ + if( strcmp( diffargv[1], "-" ) == 0 ) + { + int i; + for(i=1; i Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8C410656A5; Mon, 16 Aug 2010 12:16:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 422A710656A3 for ; Mon, 16 Aug 2010 12:16:40 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2FA288FC16 for ; Mon, 16 Aug 2010 12:16:40 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GCGeiR003615 for ; Mon, 16 Aug 2010 12:16:40 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GCGevk003612 for perforce@freebsd.org; Mon, 16 Aug 2010 12:16:40 GMT (envelope-from lz@FreeBSD.org) Date: Mon, 16 Aug 2010 12:16:40 GMT Message-Id: <201008161216.o7GCGevk003612@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 12:16:40 -0000 http://p4web.freebsd.org/@@182462?ac=10 Change 182462 by lz@gnehzuil-freebsd on 2010/08/16 12:15:42 Modify modules/ext2fs/Makefile to compile hash directory index. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/modules/ext2fs/Makefile#2 edit Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/modules/ext2fs/Makefile#2 (text+ko) ==== @@ -3,8 +3,8 @@ .PATH: ${.CURDIR}/../../fs/ext2fs KMOD= ext2fs SRCS= opt_ddb.h opt_quota.h opt_suiddir.h vnode_if.h \ - ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_inode.c \ - ext2_inode_cnv.c ext2_lookup.c ext2_subr.c ext2_vfsops.c \ - ext2_vnops.c + ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_extents.c \ + ext2_inode.c ext2_inode_cnv.c ext2_lookup.c ext2_subr.c \ + ext2_vfsops.c ext2_vnops.c ext2_htree.c .include From owner-p4-projects@FreeBSD.ORG Mon Aug 16 13:31:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C50FA1065693; Mon, 16 Aug 2010 13:31:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87434106566C for ; Mon, 16 Aug 2010 13:31:20 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 72AD88FC12 for ; Mon, 16 Aug 2010 13:31:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GDVK6Q021151 for ; Mon, 16 Aug 2010 13:31:20 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GDVK9m021148 for perforce@freebsd.org; Mon, 16 Aug 2010 13:31:20 GMT (envelope-from gpf@FreeBSD.org) Date: Mon, 16 Aug 2010 13:31:20 GMT Message-Id: <201008161331.o7GDVK9m021148@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 13:31:21 -0000 http://p4web.freebsd.org/@@182464?ac=10 Change 182464 by gpf@gpf_desktop on 2010/08/16 13:30:34 last submit for gsoc: - I actually replaced all the error messages for NFS specific error codes with the ones provided by the NFSv4 RFC. Although mine were less cryptic, these are a lot shorter and this seems best for some reason (if we take a look at strerror for example). If we prefer longer error messages, we can just rollback to a previous version of the *bsm_errno.c files. - As far as NFS v4 OPEN is concerned, it turns out that my hunch was correct and at the moment, the share_deny var doesn't play a part in the process. It might in the future, but for now the way Audit works seems correct; I left a xxx comment there for future reference. I will have to take another look at OPEN in the future anyway - removed debuging printfs - @ previous submit I removed some definitions that I shouldn't have; put them back in. special thanks to Rick Macklem Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/libbsm/bsm_errno.c#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/bsm/audit_record.h#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.c#14 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm_errno.c#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm_klib.c#6 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/libbsm/bsm_errno.c#4 (text) ==== @@ -720,315 +720,315 @@ #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Operation is not supported") }, + 0, ES("operation not supported") }, { BSM_NFS_ERRNO_TOOSMALL, #ifdef NFSERR_TOOSMALL NFSERR_TOOSMALL, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Response to READDIR request exceeds the already set size limit") }, + 0, ES("response limit exceeded") }, { BSM_NFS_ERRNO_SERVERFAULT, #ifdef NFSERR_SERVERFAULT NFSERR_SERVERFAULT, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Server side error that does not map to a protocol error value") }, + 0, ES("undefined server error") }, { BSM_NFS_ERRNO_BADTYPE, #ifdef NFSERR_BADTYPE NFSERR_BADTYPE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Server does not support creation of this type of object") }, + 0, ES("type invalid for CREATE") }, { BSM_NFS_ERRNO_DELAY, #ifdef NFSERR_DELAY NFSERR_DELAY, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Operation was not completed in a timely fashion") }, + 0, ES("file \"busy\" - retry") }, { BSM_NFS_ERRNO_SAME, #ifdef NFSERR_SAME NFSERR_SAME, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The attributes compared were the same as in client's request") }, + 0, ES("nverify says attrs same") }, { BSM_NFS_ERRNO_DENIED, #ifdef NFSERR_DENIED NFSERR_DENIED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("An attempt to lock a file was denied") }, + 0, ES("lock unavailable") }, { BSM_NFS_ERRNO_EXPIRED, #ifdef NFSERR_EXPIRED NFSERR_EXPIRED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Expired lease for the current operation") }, + 0, ES("lock lease expired") }, { BSM_NFS_ERRNO_LOCKED, #ifdef NFSERR_LOCKED NFSERR_LOCKED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("READ or WRITE operation attempted on a locked file") }, + 0, ES("I/O failed due to lock") }, { BSM_NFS_ERRNO_GRACE, #ifdef NFSERR_GRACE NFSERR_GRACE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The server is in its grace period") }, + 0, ES("in grace period") }, { BSM_NFS_ERRNO_FHEXPIRED, #ifdef NFSERR_FHEXPIRED NFSERR_FHEXPIRED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Expired filehandle") }, + 0, ES("filehandle expired") }, { BSM_NFS_ERRNO_SHAREDENIED, #ifdef NFSERR_SHAREDENIED NFSERR_SHAREDENIED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("OPEN operation with a share reservation failed due to share conflict") }, + 0, ES("share reserve denied") }, { BSM_NFS_ERRNO_WRONGSEC, #ifdef NFSERR_WRONGSEC NFSERR_WRONGSEC, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Client's security mechanism does not match server's security policy") }, + 0, ES("wrong security flavor") }, { BSM_NFS_ERRNO_CLIDINUSE, #ifdef NFSERR_CLIDINUSE NFSERR_CLIDINUSE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Client id in use by another client") }, + 0, ES("clientid in use") }, { BSM_NFS_ERRNO_RESOURCE, #ifdef NFSERR_RESOURCE NFSERR_RESOURCE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Compound procedure exhausted server resources") }, + 0, ES("resource exhaustion") }, { BSM_NFS_ERRNO_MOVED, #ifdef NFSERR_MOVED NFSERR_MOVED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The filesystem in question has been relocated elsewhere") }, + 0, ES("filesystem relocated") }, { BSM_NFS_ERRNO_NOFILEHANDLE, #ifdef NFSERR_NOFILEHANDLE NFSERR_NOFILEHANDLE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The current filehandle value has not been set") }, + 0, ES("current FH is not set") }, { BSM_NFS_ERRNO_MINORVERMISMATCH, #ifdef NFSERR_MINORVERMISMATCH NFSERR_MINORVERMISMATCH, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The request specifies an unsupported minor version") }, + 0, ES("minor vers not supp") }, { BSM_NFS_ERRNO_STALECLIENTID, #ifdef NFSERR_STALECLIENTID NFSERR_STALECLIENTID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Unknown client id") }, + 0, ES("server has rebooted") }, { BSM_NFS_ERRNO_STALESTATEID, #ifdef NFSERR_STALESTATEID NFSERR_STALESTATEID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Stale state id") }, + 0, ES("server has rebooted") }, { BSM_NFS_ERRNO_OLDSTATEID, #ifdef NFSERR_OLDSTATEID NFSERR_OLDSTATEID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The state id designates locking state for a lockowner-file at an earlier time") }, + 0, ES("state is out of sync") }, { BSM_NFS_ERRNO_BADSTATEID, #ifdef NFSERR_BADSTATEID NFSERR_BADSTATEID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The state id does not designate any locking state") }, + 0, ES("incorrect stateid") }, { BSM_NFS_ERRNO_BADSEQID, #ifdef NFSERR_BADSEQID NFSERR_BADSEQID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Bad sequence number used in a locking request") }, + 0, ES("request is out of seq") }, { BSM_NFS_ERRNO_NOTSAME, #ifdef NFSERR_NOTSAME NFSERR_NOTSAME, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The attributes compared were not the same as in client's request") }, + 0, ES("verify - attrs not same") }, { BSM_NFS_ERRNO_LOCKRANGE, #ifdef NFSERR_LOCKRANGE NFSERR_LOCKRANGE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("A lock request operating on a sub-range of a current lock is not supported") }, + 0, ES("lock range not supported") }, { BSM_NFS_ERRNO_SYMLINK, #ifdef NFSERR_SYMLINK NFSERR_SYMLINK, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The current filehandle is a symbolic link") }, + 0, ES("should be file/directory") }, { BSM_NFS_ERRNO_RESTOREFH, #ifdef NFSERR_RESTOREFH NFSERR_RESTOREFH, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("RESTOREFH operation lacks a saved filehandle") }, + 0, ES("no saved filehandle") }, { BSM_NFS_ERRNO_LEASEMOVED, #ifdef NFSERR_LEASEMOVED NFSERR_LEASEMOVED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The lease beign renewed is associated with a filesystem that has migrated elsewhere") }, + 0, ES("some filesystem moved") }, { BSM_NFS_ERRNO_ATTRNOTSUPP, #ifdef NFSERR_ATTRNOTSUPP NFSERR_ATTRNOTSUPP, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The attribute specified is not supported by the server") }, + 0, ES("recommended attr not sup") }, { BSM_NFS_ERRNO_NOGRACE, #ifdef NFSERR_NOGRACE NFSERR_NOGRACE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("A reclaim of client state has fallen outside of the server's grace period") }, + 0, ES("reclaim outside of grace") }, { BSM_NFS_ERRNO_RECLAIMBAD, #ifdef NFSERR_RECLAIMBAD NFSERR_RECLAIMBAD, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Bad reclaim provided by the client") }, + 0, ES("reclaim error at server") }, { BSM_NFS_ERRNO_RECLAIMCONFLICT, #ifdef NFSERR_RECLAIMCONFLICT NFSERR_RECLAIMCONFLICT, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The reclaim provided by the client has encountered a conflict") }, + 0, ES("conflict on reclaim") }, { BSM_NFS_ERRNO_BADXDR, #ifdef NFSERR_BADXDR NFSERR_BADXDR, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Server encountered a XDR decoding error") }, + 0, ES("XDR decode failed") }, { BSM_NFS_ERRNO_LOCKSHELD, #ifdef NFSERR_LOCKSHELD NFSERR_LOCKSHELD, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Locks would exist after the CLOSE operation") }, + 0, ES("file locks held at CLOSE") }, { BSM_NFS_ERRNO_OPENMODE, #ifdef NFSERR_OPENMODE NFSERR_OPENMODE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("READ or WRITE or LOCK or SETATTR operation not permitted by the stateid") }, + 0, ES("conflict in OPEN and I/O") }, { BSM_NFS_ERRNO_BADOWNER, #ifdef NFSERR_BADOWNER NFSERR_BADOWNER, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("An owner, owner_group, or ACL attribute value can not be translated to local representation") }, + 0, ES("owner translation bad") }, { BSM_NFS_ERRNO_BADCHAR, #ifdef NFSERR_BADCHAR NFSERR_BADCHAR, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("A UTF-8 string contains a bad character") }, + 0, ES("utf-8 char not supported") }, { BSM_NFS_ERRNO_BADNAME, #ifdef NFSERR_BADNAME NFSERR_BADNAME, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("A name string consists of valid UTF-8 characters but is invalid for current operation") }, + 0, ES("name not supported") }, { BSM_NFS_ERRNO_BADRANGE, #ifdef NFSERR_BADRANGE NFSERR_BADRANGE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Bad range for a LOCK, LOCKT or LOCKU operation") }, + 0, ES("lock range not supported") }, { BSM_NFS_ERRNO_LOCKNOTSUPP, #ifdef NFSERR_LOCKNOTSUPP NFSERR_LOCKNOTSUPP, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Server does not support atomic upgrade or downgrade of locks") }, + 0, ES("no atomic up/downgrade") }, { BSM_NFS_ERRNO_OPILLEGAL, #ifdef NFSERR_OPILLEGAL NFSERR_OPILLEGAL, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Illegal operation value specified") }, + 0, ES("undefined operation") }, { BSM_NFS_ERRNO_DEADLOCK, #ifdef NFSERR_DEADLOCK NFSERR_DEADLOCK, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Deadlock detected for a blocking lock request") }, + 0, ES("file locking deadlock") }, { BSM_NFS_ERRNO_FILEOPEN, #ifdef NFSERR_FILEOPEN NFSERR_FILEOPEN, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Operation failed because a file involved is currently open") }, + 0, ES("open file blocks op") }, { BSM_NFS_ERRNO_ADMINREVOKED, #ifdef NFSERR_ADMINREVOKED NFSERR_ADMINREVOKED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The administrator caused the revocation of lockowner's record locks, share reservations and delegations") }, + 0, ES("lockowner state revoked") }, { BSM_NFS_ERRNO_CBPATHDOWN, #ifdef NFSERR_CBPATHDOWN NFSERR_CBPATHDOWN, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("??? NFS error") }, + 0, ES("callback path down") }, }; static const int bsm_errnos_count = sizeof(bsm_errnos) / sizeof(bsm_errnos[0]); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/bsm/audit_record.h#4 (text) ==== @@ -175,6 +175,11 @@ #define AUT_TRAILER_MAGIC 0xb105 +/* NFS specific stuff */ +#define ND_NFSV2 0x00000004 +#define ND_NFSV3 0x00000008 +#define ND_NFSV4 0x00000010 + /* BSM library calls */ __BEGIN_DECLS ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.c#14 (text) ==== @@ -60,12 +60,10 @@ #include #include -/* XXX gpf: for debuging */ -#include - #include #include #include +#include #include #include @@ -823,10 +821,6 @@ error = audit_nfs_proc_to_event(proc, &event, nfsprot); if (error) return; - - /* XXXgpf: for debugging, nevermind */ - printf("audit_nfs_enter: procedure = %d\n" - "audit_nfs_enter: event = %d\n", proc, event); /* * Check which audit mask to use; either the kernel non-attributable @@ -844,7 +838,6 @@ */ class = au_event_class(event); if (au_preselect(event, class, aumask, AU_PRS_BOTH)) { - printf("audit_nfs_enter: select it!\n\n"); /* * If we're out of space and need to suspend unprivileged * processes, do that here rather than trying to allocate ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm_errno.c#4 (text+ko) ==== @@ -722,315 +722,315 @@ #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Operation is not supported") }, + 0, ES("operation not supported") }, { BSM_NFS_ERRNO_TOOSMALL, #ifdef NFSERR_TOOSMALL NFSERR_TOOSMALL, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Response to READDIR request exceeds the already set size limit") }, + 0, ES("response limit exceeded") }, { BSM_NFS_ERRNO_SERVERFAULT, #ifdef NFSERR_SERVERFAULT NFSERR_SERVERFAULT, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Server side error that does not map to a protocol error value") }, + 0, ES("undefined server error") }, { BSM_NFS_ERRNO_BADTYPE, #ifdef NFSERR_BADTYPE NFSERR_BADTYPE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Server does not support creation of this type of object") }, + 0, ES("type invalid for CREATE") }, { BSM_NFS_ERRNO_DELAY, #ifdef NFSERR_DELAY NFSERR_DELAY, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Operation was not completed in a timely fashion") }, + 0, ES("file \"busy\" - retry") }, { BSM_NFS_ERRNO_SAME, #ifdef NFSERR_SAME NFSERR_SAME, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The attributes compared were the same as in client's request") }, + 0, ES("nverify says attrs same") }, { BSM_NFS_ERRNO_DENIED, #ifdef NFSERR_DENIED NFSERR_DENIED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("An attempt to lock a file was denied") }, + 0, ES("lock unavailable") }, { BSM_NFS_ERRNO_EXPIRED, #ifdef NFSERR_EXPIRED NFSERR_EXPIRED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Expired lease for the current operation") }, + 0, ES("lock lease expired") }, { BSM_NFS_ERRNO_LOCKED, #ifdef NFSERR_LOCKED NFSERR_LOCKED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("READ or WRITE operation attempted on a locked file") }, + 0, ES("I/O failed due to lock") }, { BSM_NFS_ERRNO_GRACE, #ifdef NFSERR_GRACE NFSERR_GRACE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The server is in its grace period") }, + 0, ES("in grace period") }, { BSM_NFS_ERRNO_FHEXPIRED, #ifdef NFSERR_FHEXPIRED NFSERR_FHEXPIRED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Expired filehandle") }, + 0, ES("filehandle expired") }, { BSM_NFS_ERRNO_SHAREDENIED, #ifdef NFSERR_SHAREDENIED NFSERR_SHAREDENIED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("OPEN operation with a share reservation failed due to share conflict") }, + 0, ES("share reserve denied") }, { BSM_NFS_ERRNO_WRONGSEC, #ifdef NFSERR_WRONGSEC NFSERR_WRONGSEC, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Client's security mechanism does not match server's security policy") }, + 0, ES("wrong security flavor") }, { BSM_NFS_ERRNO_CLIDINUSE, #ifdef NFSERR_CLIDINUSE NFSERR_CLIDINUSE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Client id in use by another client") }, + 0, ES("clientid in use") }, { BSM_NFS_ERRNO_RESOURCE, #ifdef NFSERR_RESOURCE NFSERR_RESOURCE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Compound procedure exhausted server resources") }, + 0, ES("resource exhaustion") }, { BSM_NFS_ERRNO_MOVED, #ifdef NFSERR_MOVED NFSERR_MOVED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The filesystem in question has been relocated elsewhere") }, + 0, ES("filesystem relocated") }, { BSM_NFS_ERRNO_NOFILEHANDLE, #ifdef NFSERR_NOFILEHANDLE NFSERR_NOFILEHANDLE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The current filehandle value has not been set") }, + 0, ES("current FH is not set") }, { BSM_NFS_ERRNO_MINORVERMISMATCH, #ifdef NFSERR_MINORVERMISMATCH NFSERR_MINORVERMISMATCH, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The request specifies an unsupported minor version") }, + 0, ES("minor vers not supp") }, { BSM_NFS_ERRNO_STALECLIENTID, #ifdef NFSERR_STALECLIENTID NFSERR_STALECLIENTID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Unknown client id") }, + 0, ES("server has rebooted") }, { BSM_NFS_ERRNO_STALESTATEID, #ifdef NFSERR_STALESTATEID NFSERR_STALESTATEID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Stale state id") }, + 0, ES("server has rebooted") }, { BSM_NFS_ERRNO_OLDSTATEID, #ifdef NFSERR_OLDSTATEID NFSERR_OLDSTATEID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The state id designates locking state for a lockowner-file at an earlier time") }, + 0, ES("state is out of sync") }, { BSM_NFS_ERRNO_BADSTATEID, #ifdef NFSERR_BADSTATEID NFSERR_BADSTATEID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The state id does not designate any locking state") }, + 0, ES("incorrect stateid") }, { BSM_NFS_ERRNO_BADSEQID, #ifdef NFSERR_BADSEQID NFSERR_BADSEQID, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Bad sequence number used in a locking request") }, + 0, ES("request is out of seq") }, { BSM_NFS_ERRNO_NOTSAME, #ifdef NFSERR_NOTSAME NFSERR_NOTSAME, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The attributes compared were not the same as in client's request") }, + 0, ES("verify - attrs not same") }, { BSM_NFS_ERRNO_LOCKRANGE, #ifdef NFSERR_LOCKRANGE NFSERR_LOCKRANGE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("A lock request operating on a sub-range of a current lock is not supported") }, + 0, ES("lock range not supported") }, { BSM_NFS_ERRNO_SYMLINK, #ifdef NFSERR_SYMLINK NFSERR_SYMLINK, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The current filehandle is a symbolic link") }, + 0, ES("should be file/directory") }, { BSM_NFS_ERRNO_RESTOREFH, #ifdef NFSERR_RESTOREFH NFSERR_RESTOREFH, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("RESTOREFH operation lacks a saved filehandle") }, + 0, ES("no saved filehandle") }, { BSM_NFS_ERRNO_LEASEMOVED, #ifdef NFSERR_LEASEMOVED NFSERR_LEASEMOVED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The lease beign renewed is associated with a filesystem that has migrated elsewhere") }, + 0, ES("some filesystem moved") }, { BSM_NFS_ERRNO_ATTRNOTSUPP, #ifdef NFSERR_ATTRNOTSUPP NFSERR_ATTRNOTSUPP, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The attribute specified is not supported by the server") }, + 0, ES("recommended attr not sup") }, { BSM_NFS_ERRNO_NOGRACE, #ifdef NFSERR_NOGRACE NFSERR_NOGRACE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("A reclaim of client state has fallen outside of the server's grace period") }, + 0, ES("reclaim outside of grace") }, { BSM_NFS_ERRNO_RECLAIMBAD, #ifdef NFSERR_RECLAIMBAD NFSERR_RECLAIMBAD, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Bad reclaim provided by the client") }, + 0, ES("reclaim error at server") }, { BSM_NFS_ERRNO_RECLAIMCONFLICT, #ifdef NFSERR_RECLAIMCONFLICT NFSERR_RECLAIMCONFLICT, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The reclaim provided by the client has encountered a conflict") }, + 0, ES("conflict on reclaim") }, { BSM_NFS_ERRNO_BADXDR, #ifdef NFSERR_BADXDR NFSERR_BADXDR, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Server encountered a XDR decoding error") }, + 0, ES("XDR decode failed") }, { BSM_NFS_ERRNO_LOCKSHELD, #ifdef NFSERR_LOCKSHELD NFSERR_LOCKSHELD, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Locks would exist after the CLOSE operation") }, + 0, ES("file locks held at CLOSE") }, { BSM_NFS_ERRNO_OPENMODE, #ifdef NFSERR_OPENMODE NFSERR_OPENMODE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("READ or WRITE or LOCK or SETATTR operation not permitted by the stateid") }, + 0, ES("conflict in OPEN and I/O") }, { BSM_NFS_ERRNO_BADOWNER, #ifdef NFSERR_BADOWNER NFSERR_BADOWNER, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("An owner, owner_group, or ACL attribute value can not be translated to local representation") }, + 0, ES("owner translation bad") }, { BSM_NFS_ERRNO_BADCHAR, #ifdef NFSERR_BADCHAR NFSERR_BADCHAR, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("A UTF-8 string contains a bad character") }, + 0, ES("utf-8 char not supported") }, { BSM_NFS_ERRNO_BADNAME, #ifdef NFSERR_BADNAME NFSERR_BADNAME, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("A name string consists of valid UTF-8 characters but is invalid for current operation") }, + 0, ES("name not supported") }, { BSM_NFS_ERRNO_BADRANGE, #ifdef NFSERR_BADRANGE NFSERR_BADRANGE, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Bad range for a LOCK, LOCKT or LOCKU operation") }, + 0, ES("lock range not supported") }, { BSM_NFS_ERRNO_LOCKNOTSUPP, #ifdef NFSERR_LOCKNOTSUPP NFSERR_LOCKNOTSUPP, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Server does not support atomic upgrade or downgrade of locks") }, + 0, ES("no atomic up/downgrade") }, { BSM_NFS_ERRNO_OPILLEGAL, #ifdef NFSERR_OPILLEGAL NFSERR_OPILLEGAL, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Illegal operation value specified") }, + 0, ES("undefined operation") }, { BSM_NFS_ERRNO_DEADLOCK, #ifdef NFSERR_DEADLOCK NFSERR_DEADLOCK, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Deadlock detected for a blocking lock request") }, + 0, ES("file locking deadlock") }, { BSM_NFS_ERRNO_FILEOPEN, #ifdef NFSERR_FILEOPEN NFSERR_FILEOPEN, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("Operation failed because a file involved is currently open") }, + 0, ES("open file blocks op") }, { BSM_NFS_ERRNO_ADMINREVOKED, #ifdef NFSERR_ADMINREVOKED NFSERR_ADMINREVOKED, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("The administrator caused the revocation of lockowner's record locks, share reservations and delegations") }, + 0, ES("lockowner state revoked") }, { BSM_NFS_ERRNO_CBPATHDOWN, #ifdef NFSERR_CBPATHDOWN NFSERR_CBPATHDOWN, #else ERRNO_NO_LOCAL_MAPPING, #endif - 0, ES("??? NFS error") }, + 0, ES("callback path down") }, }; static const int bsm_errnos_count = sizeof(bsm_errnos) / sizeof(bsm_errnos[0]); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm_klib.c#6 (text) ==== @@ -342,8 +342,9 @@ /* * Need to check only those flags we care about. - * XXXgpf: Actually, the deny bits are ignored when - * determining a specific event type + * XXXgpf: As it turns out, POSIX clients (including FreeBSD's + * client) will always provide DENY_NONE; ignore deny bits + * when determining a specific event type */ oflags = oflags & (NFS_READACCESS | NFS_WRITEACCESS | NFS_READDENY | NFS_WRITEDENY | NFS_CREATE | NFS_TRUNC); From owner-p4-projects@FreeBSD.ORG Mon Aug 16 14:21:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76F4F10656A4; Mon, 16 Aug 2010 14:21:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 390451065697 for ; Mon, 16 Aug 2010 14:21:48 +0000 (UTC) (envelope-from x1user@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0BF1E8FC14 for ; Mon, 16 Aug 2010 14:21:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GELlYs033071 for ; Mon, 16 Aug 2010 14:21:47 GMT (envelope-from x1user@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GELlfY033068 for perforce@freebsd.org; Mon, 16 Aug 2010 14:21:47 GMT (envelope-from x1user@FreeBSD.org) Date: Mon, 16 Aug 2010 14:21:47 GMT Message-Id: <201008161421.o7GELlfY033068@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to x1user@FreeBSD.org using -f From: Stanislav Uzunchev To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 14:21:49 -0000 http://p4web.freebsd.org/@@182466?ac=10 Change 182466 by x1user@scylla on 2010/08/16 14:21:14 source Affected files ... .. //depot/projects/soc2010/bsnmp/jails.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 16 14:25:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 616521065696; Mon, 16 Aug 2010 14:25:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21FF71065675 for ; Mon, 16 Aug 2010 14:25:06 +0000 (UTC) (envelope-from x1user@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EAF3C8FC2C for ; Mon, 16 Aug 2010 14:25:05 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GEP5ob033197 for ; Mon, 16 Aug 2010 14:25:05 GMT (envelope-from x1user@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GEP55k033194 for perforce@freebsd.org; Mon, 16 Aug 2010 14:25:05 GMT (envelope-from x1user@FreeBSD.org) Date: Mon, 16 Aug 2010 14:25:05 GMT Message-Id: <201008161425.o7GEP55k033194@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to x1user@FreeBSD.org using -f From: Stanislav Uzunchev To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 14:25:06 -0000 http://p4web.freebsd.org/@@182467?ac=10 Change 182467 by x1user@scylla on 2010/08/16 14:24:41 source Affected files ... .. //depot/projects/soc2010/bsnmp/jails.c#2 edit Differences ... ==== //depot/projects/soc2010/bsnmp/jails.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 16 14:26:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A97FD106566B; Mon, 16 Aug 2010 14:26:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5179C10656A4 for ; Mon, 16 Aug 2010 14:26:12 +0000 (UTC) (envelope-from x1user@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 246D38FC21 for ; Mon, 16 Aug 2010 14:26:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GEQCLV033235 for ; Mon, 16 Aug 2010 14:26:12 GMT (envelope-from x1user@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GEQCDB033232 for perforce@freebsd.org; Mon, 16 Aug 2010 14:26:12 GMT (envelope-from x1user@FreeBSD.org) Date: Mon, 16 Aug 2010 14:26:12 GMT Message-Id: <201008161426.o7GEQCDB033232@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to x1user@FreeBSD.org using -f From: Stanislav Uzunchev To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 14:26:12 -0000 http://p4web.freebsd.org/@@182469?ac=10 Change 182469 by x1user@scylla on 2010/08/16 14:26:02 generated .def from the MIB Affected files ... .. //depot/projects/soc2010/bsnmp/jails_tree.def#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 16 15:04:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8391D1065679; Mon, 16 Aug 2010 15:04:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3EBDE1065673 for ; Mon, 16 Aug 2010 15:04:32 +0000 (UTC) (envelope-from x1user@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 119BA8FC1F for ; Mon, 16 Aug 2010 15:04:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GF4VNM041786 for ; Mon, 16 Aug 2010 15:04:31 GMT (envelope-from x1user@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GF4Vgh041783 for perforce@freebsd.org; Mon, 16 Aug 2010 15:04:31 GMT (envelope-from x1user@FreeBSD.org) Date: Mon, 16 Aug 2010 15:04:31 GMT Message-Id: <201008161504.o7GF4Vgh041783@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to x1user@FreeBSD.org using -f From: Stanislav Uzunchev To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182470 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 15:04:32 -0000 http://p4web.freebsd.org/@@182470?ac=10 Change 182470 by x1user@scylla on 2010/08/16 15:04:22 makefile Affected files ... .. //depot/projects/soc2010/bsnmp/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 16 19:53:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D2CD1065679; Mon, 16 Aug 2010 19:53:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3E571065670 for ; Mon, 16 Aug 2010 19:53:06 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A6D2E8FC21 for ; Mon, 16 Aug 2010 19:53:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GJr63x018893 for ; Mon, 16 Aug 2010 19:53:06 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GJr6vQ018890 for perforce@freebsd.org; Mon, 16 Aug 2010 19:53:06 GMT (envelope-from jceel@freebsd.org) Date: Mon, 16 Aug 2010 19:53:06 GMT Message-Id: <201008161953.o7GJr6vQ018890@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 19:53:07 -0000 http://p4web.freebsd.org/@@182477?ac=10 Change 182477 by jceel@jceel on 2010/08/16 19:52:28 Add checking channel capabilities in gpdma_utils Affected files ... .. //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma_utils.c#2 edit Differences ... ==== //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma_utils.c#2 (text+ko) ==== @@ -82,7 +82,16 @@ void gpdma_memutils_init(struct resource **res, int nch, void *arg) { + const struct gpdma_capabilities *caps; + + caps = gpdma_get_caps(res[0]); + + if ((caps->dc_ops & GPDMA_COPY) == 0) + return; + if ((caps->dc_buffers & GPDMABUF_BLOCK) == 0) + return; + dma_memutils_channel = res[0]; mtx_init(&dma_memutils_mtx, "dma_memutils", "dma", MTX_DEF); @@ -102,14 +111,12 @@ int err = 0, status; pmap_t pmap; - printf("dma_memcpy(dst=%p, src=%p, len=%d, flags=%d)\n", to, from, len, flags); + if (flags & IS_PHYSICAL) + return (ENOTSUP); if (dma_memutils_channel == NULL) return (ENOTSUP); - if (flags & IS_PHYSICAL) - return (ENOTSUP); - mtx_lock_spin(&dma_memutils_mtx); if (dma_memutils_busy == 1) { mtx_unlock_spin(&dma_memutils_mtx); @@ -138,8 +145,8 @@ gpdma_set_buffer_layout(xfer, GPDMA_BUF_SRC, GPDMABUF_BLOCK); if (flags & IS_PHYSICAL) { - gpdma_load_buffer_raw(xfer, GPDMA_BUF_DST, (bus_addr_t)to, len); - gpdma_load_buffer_raw(xfer, GPDMA_BUF_SRC, (bus_addr_t)from, len); + /* Currently not supported */ + return (ENOTSUP); } else { if (flags & DST_IS_USER) { iovdst.iov_base = to; @@ -190,13 +197,7 @@ status = gpdma_get_transfer_status(cookie); - printf("src: %16D\n", from, " "); - printf("dst: %16D\n", to, " "); - out: - if (err) - printf("error: %d\n", err); - mtx_lock_spin(&dma_memutils_mtx); dma_memutils_busy = 0; mtx_unlock_spin(&dma_memutils_mtx); @@ -206,14 +207,6 @@ int dma_bzero(void *addr, int len, int flags) { -#if 0 - gpdma_transfer_t xfer; - void *cookie; - int err, status; - - if (dma_memutils_channel == NULL) - return (-1); -#endif - - return (0); + /* Currently not supported */ + return (ENOTSUP); } From owner-p4-projects@FreeBSD.ORG Mon Aug 16 19:53:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC5891065729; Mon, 16 Aug 2010 19:53:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0153A1065674 for ; Mon, 16 Aug 2010 19:53:07 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E238E8FC22 for ; Mon, 16 Aug 2010 19:53:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GJr6WK018899 for ; Mon, 16 Aug 2010 19:53:06 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GJr6jN018896 for perforce@freebsd.org; Mon, 16 Aug 2010 19:53:06 GMT (envelope-from jceel@freebsd.org) Date: Mon, 16 Aug 2010 19:53:06 GMT Message-Id: <201008161953.o7GJr6jN018896@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 19:53:08 -0000 http://p4web.freebsd.org/@@182478?ac=10 Change 182478 by jceel@jceel on 2010/08/16 19:53:04 Sync DMA maps in the proper way. Affected files ... .. //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_edma.c#7 edit .. //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_mmc.c#3 edit Differences ... ==== //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_edma.c#7 (text+ko) ==== @@ -71,7 +71,7 @@ #include "gpdma_if.h" #define DEBUG -//#undef DEBUG +#undef DEBUG #ifdef DEBUG #define debugf(fmt, args...) do { \ printf("edma: " fmt "\n", ##args); } while (0) @@ -289,13 +289,15 @@ ret = davinci_edma_setupdesc(xfer->dt_next, &link_desc); if (ret) return (ret); - debugf("calling davinci_edma_copydesc(&link_desc=%p, chno=%d)\n", &link_desc, chno + 64); + davinci_edma_copydesc(sc, &link_desc, chno + 64); } +#if 0 /* Enable channel interrupts */ -// if ((xfer->dt_flags & GPDMA_TRANSFER_EXTTRIG) == 0) -// davinci_edma_enable_channel(sc, chno); + if ((xfer->dt_flags & GPDMA_TRANSFER_EXTTRIG) == 0) + davinci_edma_enable_channel(sc, chno); +#endif if (chno > 31) { chno -= 32; @@ -454,24 +456,27 @@ KASSERT(ch->dc_status != CHANNEL_IDLE, ("invalid channel state")); - printf("src dmatag=%p dst dmatag=%p src dmamap=%p dst dmamap=%p\n", xfer->dt_src.db_dmatag, xfer->dt_dst.db_dmatag, xfer->dt_src.db_dmamap, xfer->dt_dst.db_dmamap); - bus_dmamap_sync(xfer->dt_src.db_dmatag, xfer->dt_src.db_dmamap, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(xfer->dt_dst.db_dmatag, xfer->dt_dst.db_dmamap, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTWRITE); + if (xfer->dt_src.db_needsync) { + bus_dmamap_sync(xfer->dt_src.db_dmatag, + xfer->dt_src.db_dmamap, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + } + if (xfer->dt_dst.db_needsync) { + bus_dmamap_sync(xfer->dt_dst.db_dmatag, + xfer->dt_dst.db_dmamap, + BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTWRITE); + } - if (xfer->dt_callback != NULL) { xfer->dt_callback(GPDMA_TRANSFER_COMPLETED, xfer->dt_callback_arg); } - if (chno > 32) { + if (chno > 32) davinci_write_edmacc_4(sc, DAVINCI_EDMACC_ICRH, (1 << (chno - 32))); - // davinci_write_edmacc_4(sc, DAVINCI_EDMACC_ECRH, (1 << (chno - 32))); - } else { + else davinci_write_edmacc_4(sc, DAVINCI_EDMACC_ICR, (1 << chno)); - // davinci_write_edmacc_4(sc, DAVINCI_EDMACC_ECR, (1 << chno)); - } ipr &= ~(1ULL << chno); @@ -668,7 +673,7 @@ srcbidx = acnt; } - //if ((xfer->dt_flags & GPDMA_TRANSFER_STRIDE_SYNC) == 0) + if ((xfer->dt_flags & GPDMA_TRANSFER_STRIDE_STOP) == 0) desc->edma_opt |= DAVINCI_EDMA_OPT_SYNCDIM; /* Set up DMA descriptor */ ==== //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_mmc.c#3 (text+ko) ==== @@ -279,13 +279,9 @@ /* Pre-set some transfer settings */ gpdma_set_transfer_func(sc->dm_rx_xfer, GPDMA_COPY); - gpdma_set_transfer_opts(sc->dm_rx_xfer, GPDMA_TRANSFER_EXTTRIG | - GPDMA_TRANSFER_STRIDE_SYNC); + gpdma_set_transfer_opts(sc->dm_rx_xfer, GPDMA_TRANSFER_EXTTRIG); gpdma_set_transfer_callback(sc->dm_rx_xfer, davinci_mmc_dmarxintr, sc); - sc->dm_rx_xfer->dt_dst.db_dmatag = sc->dm_rx_tag; - sc->dm_rx_xfer->dt_dst.db_dmamap = sc->dm_rx_map; - /* Source buffer */ gpdma_set_buffer_layout(sc->dm_rx_xfer, GPDMA_BUF_SRC, GPDMABUF_FRAME); gpdma_set_buffer_flags(sc->dm_rx_xfer, GPDMA_BUF_SRC, GPDMA_BUFFER_FIFO); @@ -462,11 +458,6 @@ /* Data receive|transmit ready */ if (mmcst0 & (DAVINCI_MMC_DRRDY | DAVINCI_MMC_DXRDY)) { - // if (mmcst0 & DAVINCI_MMC_DRRDY) - // printf("davinci_mmc: DAVINCI_MMC_DRRDY\n"); - // if (mmcst0 & DAVINCI_MMC_DXRDY) - // printf("davinci_mmc: DAVINCI_MMC_DXRDY\n"); - if (!sc->dm_use_dma) davinci_mmc_fifo_xfer(sc); } @@ -481,7 +472,13 @@ if (!sc->dm_use_dma) davinci_mmc_fifo_xfer(sc); else if (sc->dm_xfer_direction == DIRECTION_READ) { - memcpy(sc->dm_data->data, sc->dm_rx_buffer, sc->dm_data->len); + bus_dmamap_sync(sc->dm_rx_tag, sc->dm_rx_map, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + memcpy(sc->dm_data->data, sc->dm_rx_buffer, + sc->dm_data->len); + } else { + bus_dmamap_sync(sc->dm_tx_tag, sc->dm_tx_map, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); } if (sc->dm_req->stop) { @@ -494,16 +491,16 @@ } } -//#if 0 +#if 0 /* Transfer done */ if (mmcst0 & DAVINCI_MMC_TRNDNE) { - // device_printf(sc->dm_dev, "transfer done\n"); + device_printf(sc->dm_dev, "transfer done\n"); /* * Not sure what to do here... probably we don't need * this interrupt. */ } -//#endif +#endif /* Request is done */ if (done) { @@ -626,7 +623,10 @@ sc->dm_rx_phys, sc->dm_data->len); gpdma_program_transfer(sc->dm_rx_xfer, &cookie); - debugf("### READ data buffer: %p\n", sc->dm_data->data); + bus_dmamap_sync(sc->dm_rx_tag, sc->dm_rx_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + + debugf("READ data buffer: %p\n", sc->dm_data->data); break; case DIRECTION_WRITE: @@ -638,8 +638,11 @@ (bus_addr_t)(DAVINCI_CFGBUS_PHYS_BASE + 0x210000 + DAVINCI_MMC_MMCDXR), sc->dm_data->len); gpdma_program_transfer(sc->dm_tx_xfer, &cookie); + + bus_dmamap_sync(sc->dm_tx_tag, sc->dm_tx_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - debugf("### WRITE data buffer: %p\n", sc->dm_data->data); + debugf("WRITE data buffer: %p\n", sc->dm_data->data); break; default: From owner-p4-projects@FreeBSD.ORG Mon Aug 16 19:54:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9283E10656C9; Mon, 16 Aug 2010 19:54:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 406351065670 for ; Mon, 16 Aug 2010 19:54:13 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2440C8FC0C for ; Mon, 16 Aug 2010 19:54:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GJsDsn018974 for ; Mon, 16 Aug 2010 19:54:13 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GJsDFi018971 for perforce@freebsd.org; Mon, 16 Aug 2010 19:54:13 GMT (envelope-from jceel@freebsd.org) Date: Mon, 16 Aug 2010 19:54:13 GMT Message-Id: <201008161954.o7GJsDFi018971@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 19:54:14 -0000 http://p4web.freebsd.org/@@182480?ac=10 Change 182480 by jceel@jceel on 2010/08/16 19:53:28 Style improvements. Affected files ... .. //depot/projects/soc2010/jceel_dma/sys/arm/conf/DAVINCI#6 edit .. //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma.c#4 edit .. //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma.h#4 edit Differences ... ==== //depot/projects/soc2010/jceel_dma/sys/arm/conf/DAVINCI#6 (text+ko) ==== @@ -78,5 +78,5 @@ device dvmmc # DMAE -device dmae +device gpdma device edma ==== //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma.c#4 (text+ko) ==== @@ -45,8 +45,8 @@ #include #include "gpdma_if.h" +#define DEBUG #undef DEBUG -#define DEBUG #ifdef DEBUG #define debugf(fmt, args...) do { \ printf("gpdma: " fmt "\n", ##args); } while (0) @@ -82,7 +82,7 @@ { struct gpdma_mapping *map = (struct gpdma_mapping *)arg; -// KASSERT(nseg == 1, ("bus_dmamap_load returned nseg != 1")); + KASSERT(nseg == 1, ("bus_dmamap_load returned nseg != 1")); map->gm_error = error; @@ -238,10 +238,10 @@ struct resource *rv; struct gpdma_engine *engine = gpdma_engine_by_name(name); -#ifdef DEBUG - if (engine == NULL) + if (engine == NULL) { debugf("cannot find engine %s\n", name); -#endif + return (NULL); + } rv = rman_reserve_resource(&engine->de_rman, chno, chno, 1, RF_ACTIVE, engine->de_dev); @@ -381,10 +381,10 @@ NULL, NULL, &buf->db_dmatag); bus_dmamap_create(buf->db_dmatag, 0, &buf->db_dmamap); - - printf("gpdma_load_buffer_virt(xfer=%p buffer=%d addr=%p length=%d)\n", xfer, buffer, addr, length); - printf("buf=%p map=%p tag=%p\n", buf, buf->db_dmamap, buf->db_dmatag); - + + debugf("gpdma_load_buffer_virt(xfer=%p buffer=%d addr=%p length=%d)\n", xfer, buffer, addr, length); + debugf("buf=%p map=%p tag=%p\n", buf, buf->db_dmamap, buf->db_dmatag); + bus_dmamap_load(buf->db_dmatag, buf->db_dmamap, addr, length, gpdma_dmamap_load_cb, &map, BUS_DMA_NOWAIT); @@ -410,8 +410,6 @@ struct gpdma_mapping map; bus_size_t length = uio->uio_resid; - printf("gpdma_load_buffer_uio: addr=%p\n", uio->uio_iov->iov_base); - bus_dma_tag_create(xfer->dt_engine->de_dmatag, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, length, 1, length, BUS_DMA_ALLOCNOW, ==== //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma.h#4 (text+ko) ==== @@ -97,11 +97,6 @@ int dc_maxlinked; }; -struct gpdma_engine_cdev { - struct cdev * dec_cdev; - LIST_ENTRY(gpdma_engine_cdev) dec_link; -}; - struct gpdma_buffer { struct gpdma_transfer * db_transfer; int db_type; @@ -129,7 +124,7 @@ #define GPDMA_TRANSFER_REPEAT 0x2 /* repeat transfer until cancel */ #define GPDMA_TRANSFER_NOINTR 0x4 /* don't generate callbacks */ #define GPDMA_TRANSFER_STRIDE_CALLBACK 0x8 /* callback on every stride */ -#define GPDMA_TRANSFER_STRIDE_SYNC 0x10 /* sync on every stride */ +#define GPDMA_TRANSFER_STRIDE_STOP 0x10 /* stop on every stride */ #define GPDMA_TRANSFER_BLOCKING 0x20 /* block until transfer completed */ gpdma_callback_t dt_callback; void * dt_callback_arg; From owner-p4-projects@FreeBSD.ORG Mon Aug 16 19:59:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B9851065696; Mon, 16 Aug 2010 19:59:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D22061065675 for ; Mon, 16 Aug 2010 19:59:43 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BFD058FC26 for ; Mon, 16 Aug 2010 19:59:43 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7GJxhth019488 for ; Mon, 16 Aug 2010 19:59:43 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7GJxhhw019485 for perforce@freebsd.org; Mon, 16 Aug 2010 19:59:43 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 16 Aug 2010 19:59:43 GMT Message-Id: <201008161959.o7GJxhhw019485@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 19:59:44 -0000 http://p4web.freebsd.org/@@182483?ac=10 Change 182483 by rene@rene_acer on 2010/08/16 19:59:00 MFen articles/problem-reports 1.61 -> 1.62 (SRCID bump) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#17 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C38D410656AE; Tue, 17 Aug 2010 03:01:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86E201065694 for ; Tue, 17 Aug 2010 03:01:03 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7510C8FC17 for ; Tue, 17 Aug 2010 03:01:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7H3134u036865 for ; Tue, 17 Aug 2010 03:01:03 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7H313Um036861 for perforce@freebsd.org; Tue, 17 Aug 2010 03:01:03 GMT (envelope-from ligregni@FreeBSD.org) Date: Tue, 17 Aug 2010 03:01:03 GMT Message-Id: <201008170301.o7H313Um036861@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 03:01:04 -0000 http://p4web.freebsd.org/@@182491?ac=10 Change 182491 by ligregni@ligPhenom on 2010/08/17 03:00:55 Minor fix about trail length Affected files ... .. //depot/projects/soc2010/disaudit/shipd.c#12 edit Differences ... ==== //depot/projects/soc2010/disaudit/shipd.c#12 (text+ko) ==== @@ -379,7 +379,7 @@ * current */ - if (strlen(path) == 29 && path[14] == '.' && isdigit(path[15])) { + if (strlen(path) >= 29 && path[14] == '.' && isdigit(path[15])) { /* XXX To improve this checking later */ return 1; } From owner-p4-projects@FreeBSD.ORG Tue Aug 17 03:02:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB7941065675; Tue, 17 Aug 2010 03:02:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A0501065673 for ; Tue, 17 Aug 2010 03:02:09 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 685C68FC16 for ; Tue, 17 Aug 2010 03:02:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7H329WQ037446 for ; Tue, 17 Aug 2010 03:02:09 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7H329gV037443 for perforce@freebsd.org; Tue, 17 Aug 2010 03:02:09 GMT (envelope-from ligregni@FreeBSD.org) Date: Tue, 17 Aug 2010 03:02:09 GMT Message-Id: <201008170302.o7H329gV037443@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 03:02:10 -0000 http://p4web.freebsd.org/@@182492?ac=10 Change 182492 by ligregni@ligPhenom on 2010/08/17 03:01:47 Minor change in trailpath's size Affected files ... .. //depot/projects/soc2010/disaudit/utils.h#5 edit Differences ... ==== //depot/projects/soc2010/disaudit/utils.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ #define MAX_DIR_SIZE 255 #define MAX_PATH_SIZE MAX_DIR_SIZE + 50 #define MAX_HOST_SIZE 255 -#define MAX_TRAILPATH_SIZE 29 +#define MAX_TRAILPATH_SIZE 59 #define MAX_BUF_SIZE 1024 #define MESSAGE_DESC_SIZE 50 #define SHA256_SIZE 66 From owner-p4-projects@FreeBSD.ORG Tue Aug 17 16:11:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3B8610656A7; Tue, 17 Aug 2010 16:11:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DDAB10656A4 for ; Tue, 17 Aug 2010 16:11:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3ADC38FC17 for ; Tue, 17 Aug 2010 16:11:10 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HGBAsN028283 for ; Tue, 17 Aug 2010 16:11:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HGB9mV028280 for perforce@freebsd.org; Tue, 17 Aug 2010 16:11:10 GMT (envelope-from jhb@freebsd.org) Date: Tue, 17 Aug 2010 16:11:10 GMT Message-Id: <201008171611.o7HGB9mV028280@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 16:11:10 -0000 http://p4web.freebsd.org/@@182522?ac=10 Change 182522 by jhb@jhb_fiver on 2010/08/17 16:10:45 - Consolidate code to teardown per-process ktrace state into a ktr_freeproc() routine. - Free pending requests in ktr_freeproc() and remove the need to pass a queue of requests to free to ktrops() and ktrsetchildren(). - Move ktrace specific logic out of exit1() and into ktrprocexit() instead. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exit.c#149 edit .. //depot/projects/smpng/sys/kern/kern_ktrace.c#73 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#149 (text+ko) ==== @@ -121,10 +121,6 @@ struct proc *p, *nq, *q; struct vnode *vtmp; struct vnode *ttyvp = NULL; -#ifdef KTRACE - struct vnode *tracevp; - struct ucred *tracecred; -#endif struct plimit *plim; int locked; @@ -356,33 +352,7 @@ if (ttyvp != NULL) vrele(ttyvp); #ifdef KTRACE - /* - * Disable tracing, then drain any pending records and release - * the trace file. - */ - if (p->p_traceflag != 0) { - PROC_LOCK(p); - mtx_lock(&ktrace_mtx); - p->p_traceflag = 0; - mtx_unlock(&ktrace_mtx); - PROC_UNLOCK(p); - ktrprocexit(td); - PROC_LOCK(p); - mtx_lock(&ktrace_mtx); - tracevp = p->p_tracevp; - p->p_tracevp = NULL; - tracecred = p->p_tracecred; - p->p_tracecred = NULL; - mtx_unlock(&ktrace_mtx); - PROC_UNLOCK(p); - if (tracevp != NULL) { - locked = VFS_LOCK_GIANT(tracevp->v_mount); - vrele(tracevp); - VFS_UNLOCK_GIANT(locked); - } - if (tracecred != NULL) - crfree(tracecred); - } + ktrprocexit(td); #endif /* * Release reference to text vnode ==== //depot/projects/smpng/sys/kern/kern_ktrace.c#73 (text+ko) ==== @@ -99,7 +99,6 @@ } ktr_data; STAILQ_ENTRY(ktr_request) ktr_list; }; -STAILQ_HEAD(ktr_request_queue, ktr_request); static int data_lengths[] = { 0, /* none */ @@ -108,13 +107,13 @@ 0, /* KTR_NAMEI */ sizeof(struct ktr_genio), /* KTR_GENIO */ sizeof(struct ktr_psig), /* KTR_PSIG */ - sizeof(struct ktr_csw), /* KTR_CSW */ + sizeof(struct ktr_csw), /* KTR_CSW */ 0, /* KTR_USER */ 0, /* KTR_STRUCT */ 0, /* KTR_SYSCTL */ }; -static struct ktr_request_queue ktr_free; +static STAILQ_HEAD(, ktr_request) ktr_free; static SYSCTL_NODE(_kern, OID_AUTO, ktrace, CTLFLAG_RD, 0, "KTRACE options"); @@ -135,13 +134,14 @@ static u_int ktrace_resize_pool(u_int newsize); static struct ktr_request *ktr_getrequest(int type); static void ktr_submitrequest(struct thread *td, struct ktr_request *req); +static void ktr_freeproc(struct proc *p, struct ucred **uc, + struct vnode **vp); static void ktr_freerequest(struct ktr_request *req); +static void ktr_freerequest_locked(struct ktr_request *req); static void ktr_writerequest(struct thread *td, struct ktr_request *req); static int ktrcanset(struct thread *,struct proc *); -static int ktrsetchildren(struct thread *,struct proc *,int,int,struct vnode *, - struct ktr_request_queue *); -static int ktrops(struct thread *,struct proc *,int,int,struct vnode *, - struct ktr_request_queue *); +static int ktrsetchildren(struct thread *,struct proc *,int,int,struct vnode *); +static int ktrops(struct thread *,struct proc *,int,int,struct vnode *); /* * ktrace itself generates events, such as context switches, which we do not @@ -333,8 +333,8 @@ static void ktr_drain(struct thread *td) { - struct ktr_request_queue local_queue; struct ktr_request *queued_req; + STAILQ_HEAD(, ktr_request) local_queue; ktrace_assert(td); sx_assert(&ktrace_sx, SX_XLOCKED); @@ -378,11 +378,43 @@ ktr_freerequest(struct ktr_request *req) { + mtx_lock(&ktrace_mtx); + ktr_freerequest_locked(req); + mtx_unlock(&ktrace_mtx); +} + +static void +ktr_freerequest_locked(struct ktr_request *req) +{ + + mtx_assert(&ktrace_mtx, MA_OWNED); if (req->ktr_buffer != NULL) free(req->ktr_buffer, M_KTRACE); - mtx_lock(&ktrace_mtx); STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list); - mtx_unlock(&ktrace_mtx); +} + +/* + * Disable tracing for a process and release all associated resources. + * The caller is responsible for releasing a reference on the returned + * vnode and credentials. + */ +static void +ktr_freeproc(struct proc *p, struct ucred **uc, struct vnode **vp) +{ + struct ktr_request *req; + + PROC_LOCK_ASSERT(p, MA_OWNED); + mtx_assert(&ktrace_mtx, MA_OWNED); + *uc = p->p_tracecred; + p->p_tracecred = NULL; + if (vp != NULL) + *vp = p->p_tracevp; + p->p_tracevp = NULL; + p->p_traceflag = 0; + while ((req = STAILQ_FIRST(&p->p_ktr)) != NULL) { + STAILQ_REMOVE_HEAD(&p->p_ktr, ktr_list); + ktr_freerequest_locked(req); + } } void @@ -435,16 +467,37 @@ } /* - * When a process exits, drain per-process asynchronous trace records. + * When a process exits drain per-process asynchronous trace records + * and disable tracing. */ void ktrprocexit(struct thread *td) { + struct proc *p; + struct ucred *cred; + struct vnode *vp; + int vfslocked; + p = td->td_proc; + if (p->p_traceflag == 0) + return; + ktrace_enter(td); sx_xlock(&ktrace_sx); ktr_drain(td); sx_xunlock(&ktrace_sx); + PROC_LOCK(p); + mtx_lock(&ktrace_mtx); + ktr_freeproc(p, &cred, &vp); + mtx_unlock(&ktrace_mtx); + PROC_UNLOCK(p); + if (vp != NULL) { + vfslocked = VFS_LOCK_GIANT(vp->v_mount); + vrele(vp); + VFS_UNLOCK_GIANT(vfslocked); + } + if (cred != NULL) + crfree(cred); ktrace_exit(td); } @@ -644,8 +697,6 @@ #ifdef KTRACE register struct vnode *vp = NULL; register struct proc *p; - struct ktr_request_queue local_queue; - struct ktr_request *req; struct pgrp *pg; int facs = uap->facs & ~KTRFAC_ROOT; int ops = KTROP(uap->ops); @@ -661,7 +712,6 @@ if (ops != KTROP_CLEARFILE && facs == 0) return (EINVAL); - STAILQ_INIT(&local_queue); ktrace_enter(td); if (ops != KTROP_CLEAR) { /* @@ -700,12 +750,7 @@ if (p->p_tracevp == vp) { if (ktrcanset(td, p)) { mtx_lock(&ktrace_mtx); - cred = p->p_tracecred; - p->p_tracecred = NULL; - p->p_tracevp = NULL; - p->p_traceflag = 0; - STAILQ_CONCAT(&local_queue, - &td->td_proc->p_ktr); + ktr_freeproc(p, &cred, NULL); mtx_unlock(&ktrace_mtx); vrele_count++; crfree(cred); @@ -751,11 +796,9 @@ } nfound++; if (descend) - ret |= ktrsetchildren(td, p, ops, facs, vp, - &local_queue); + ret |= ktrsetchildren(td, p, ops, facs, vp); else - ret |= ktrops(td, p, ops, facs, vp, - &local_queue); + ret |= ktrops(td, p, ops, facs, vp); } if (nfound == 0) { sx_sunlock(&proctree_lock); @@ -778,10 +821,9 @@ goto done; } if (descend) - ret |= ktrsetchildren(td, p, ops, facs, vp, - &local_queue); + ret |= ktrsetchildren(td, p, ops, facs, vp); else - ret |= ktrops(td, p, ops, facs, vp, &local_queue); + ret |= ktrops(td, p, ops, facs, vp); } sx_sunlock(&proctree_lock); if (!ret) @@ -792,15 +834,6 @@ (void) vn_close(vp, FWRITE, td->td_ucred, td); VFS_UNLOCK_GIANT(vfslocked); } - - /* - * Free any pending requests from processes where tracing was - * disabled. - */ - while ((req = STAILQ_FIRST(&local_queue))) { - STAILQ_REMOVE_HEAD(&local_queue, ktr_list); - ktr_freerequest(req); - } ktrace_exit(td); return (error); #else /* !KTRACE */ @@ -846,12 +879,11 @@ #ifdef KTRACE static int -ktrops(td, p, ops, facs, vp, request_queue) +ktrops(td, p, ops, facs, vp) struct thread *td; struct proc *p; int ops, facs; struct vnode *vp; - struct ktr_request_queue *request_queue; { struct vnode *tracevp = NULL; struct ucred *tracecred = NULL; @@ -889,15 +921,9 @@ p->p_traceflag |= KTRFAC_ROOT; } else { /* KTROP_CLEAR */ - if (((p->p_traceflag &= ~facs) & KTRFAC_MASK) == 0) { + if (((p->p_traceflag &= ~facs) & KTRFAC_MASK) == 0) /* no more tracing */ - p->p_traceflag = 0; - tracevp = p->p_tracevp; - p->p_tracevp = NULL; - tracecred = p->p_tracecred; - p->p_tracecred = NULL; - STAILQ_CONCAT(request_queue, &td->td_proc->p_ktr); - } + ktr_freeproc(p, &tracecred, &tracevp); } mtx_unlock(&ktrace_mtx); PROC_UNLOCK(p); @@ -915,12 +941,11 @@ } static int -ktrsetchildren(td, top, ops, facs, vp, request_queue) +ktrsetchildren(td, top, ops, facs, vp) struct thread *td; struct proc *top; int ops, facs; struct vnode *vp; - struct ktr_request_queue *request_queue; { register struct proc *p; register int ret = 0; @@ -929,7 +954,7 @@ PROC_LOCK_ASSERT(p, MA_OWNED); sx_assert(&proctree_lock, SX_LOCKED); for (;;) { - ret |= ktrops(td, p, ops, facs, vp, request_queue); + ret |= ktrops(td, p, ops, facs, vp); /* * If this process has children, descend to them next, * otherwise do any siblings, and if done with this level, @@ -954,7 +979,6 @@ static void ktr_writerequest(struct thread *td, struct ktr_request *req) { - struct ktr_request_queue local_queue; struct ktr_header *kth; struct vnode *vp; struct proc *p; @@ -1058,18 +1082,13 @@ * we really do this? Other processes might have suitable * credentials for the operation. */ - STAILQ_INIT(&local_queue); cred = NULL; sx_slock(&allproc_lock); FOREACH_PROC_IN_SYSTEM(p) { PROC_LOCK(p); if (p->p_tracevp == vp) { mtx_lock(&ktrace_mtx); - p->p_tracevp = NULL; - p->p_traceflag = 0; - cred = p->p_tracecred; - p->p_tracecred = NULL; - STAILQ_CONCAT(&local_queue, &td->td_proc->p_ktr); + ktr_freeproc(p, &cred, NULL); mtx_unlock(&ktrace_mtx); vrele_count++; } @@ -1081,15 +1100,6 @@ } sx_sunlock(&allproc_lock); - /* - * Free any pending requests from processes where tracing was - * disabled. - */ - while ((req = STAILQ_FIRST(&local_queue))) { - STAILQ_REMOVE_HEAD(&local_queue, ktr_list); - ktr_freerequest(req); - } - vfslocked = VFS_LOCK_GIANT(vp->v_mount); while (vrele_count-- > 0) vrele(vp); From owner-p4-projects@FreeBSD.ORG Tue Aug 17 16:41:53 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 020B51065698; Tue, 17 Aug 2010 16:41:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7F591065696 for ; Tue, 17 Aug 2010 16:41:52 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A3EE08FC20 for ; Tue, 17 Aug 2010 16:41:52 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HGfqsW036071 for ; Tue, 17 Aug 2010 16:41:52 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HGfqDO036068 for perforce@freebsd.org; Tue, 17 Aug 2010 16:41:52 GMT (envelope-from anchie@FreeBSD.org) Date: Tue, 17 Aug 2010 16:41:52 GMT Message-Id: <201008171641.o7HGfqDO036068@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 16:41:53 -0000 http://p4web.freebsd.org/@@182525?ac=10 Change 182525 by anchie@anchie_malimis on 2010/08/17 16:40:50 IFC @182524 Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/elf.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/elf.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/options.mips#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_pcib.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_pcib_pci.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_pcibvar.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/alc/if_alc.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwi/if_bwi.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwn.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/flash/mx25l.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/iwn/if_iwn.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pci.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_rum.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_run.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_ural.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_zyd.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/elf.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/elf.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_exec.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_bus.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_rtc.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_taskqueue.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/XLR#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/XLR64#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/XLRN32#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/bus.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/elf.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/intr_machdep.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/exception.S#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/locore.S#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/machdep.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mpboot.S#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pm_machdep.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/vm_machdep.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/std.xlr#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#19 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/em/Makefile#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/igb/Makefile#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/ixgbe/Makefile#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/sem/Makefile#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/tpm/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if.c#12 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_sta.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/elf.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/cdefs.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/imgact.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/memguard.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/memguard.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/uma.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/uma_core.c#6 integrate Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_wakeup.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.36 2010/08/12 00:20:46 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.37 2010/08/13 22:08:42 jkim Exp $"); #include #include @@ -278,13 +278,13 @@ for (;;) ia32_pause(); } else { - acpi_resync_clock(sc); - PCPU_SET(switchtime, cpu_ticks()); + PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); #ifdef SMP if (wakeup_cpus != 0) acpi_wakeup_cpus(sc, wakeup_cpus); #endif + acpi_resync_clock(sc); ret = 0; } ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mp_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.328 2010/08/12 00:20:46 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.330 2010/08/13 22:08:42 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1324,10 +1324,8 @@ cpumask_t cpumask; u_int cpu; - sched_pin(); cpu = PCPU_GET(cpuid); cpumask = PCPU_GET(cpumask); - sched_unpin(); savectx(&stoppcbs[cpu]); @@ -1358,10 +1356,8 @@ register_t cr3, rf; u_int cpu; - sched_pin(); cpu = PCPU_GET(cpuid); cpumask = PCPU_GET(cpumask); - sched_unpin(); rf = intr_disable(); cr3 = rcr3(); @@ -1370,7 +1366,7 @@ wbinvd(); atomic_set_int(&stopped_cpus, cpumask); } else { - PCPU_SET(switchtime, cpu_ticks()); + PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); } @@ -1542,14 +1538,10 @@ #endif int retval; + mask = PCPU_GET(cpumask); #ifdef MP_WATCHDOG - sched_pin(); - mask = PCPU_GET(cpumask); cpuid = PCPU_GET(cpuid); - sched_unpin(); ap_watchdog(cpuid); -#else - mask = PCPU_GET(cpumask); #endif retval = 0; ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.710 2010/08/10 16:14:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.711 2010/08/17 12:17:24 gahr Exp $"); /* * Manages physical address maps. @@ -620,7 +620,8 @@ if (sysenv != NULL) { if (strncmp(sysenv, "MacBook5,1", 10) == 0 || strncmp(sysenv, "MacBookPro5,5", 13) == 0 || - strncmp(sysenv, "Macmini3,1", 10) == 0) + strncmp(sysenv, "Macmini3,1", 10) == 0 || + strncmp(sysenv, "iMac9,1", 7) == 0) pat_works = 0; freeenv(sysenv); } ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/elf.h,v 1.23 2010/03/11 14:49:06 nwhitehorn Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.24 2010/08/17 08:55:45 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -88,8 +88,14 @@ #define AT_GID 13 /* Real gid. */ #define AT_EGID 14 /* Effective gid. */ #define AT_EXECPATH 15 /* Path to the executable. */ +#define AT_CANARY 16 /* Canary for SSP */ +#define AT_CANARYLEN 17 /* Length of the canary. */ +#define AT_OSRELDATE 18 /* OSRELDATE. */ +#define AT_NCPUS 19 /* Number of CPUs. */ +#define AT_PAGESIZES 20 /* Pagesizes. */ +#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */ -#define AT_COUNT 16 /* Count of defined aux entry types. */ +#define AT_COUNT 22 /* Count of defined aux entry types. */ /* * Relocation types. ==== //depot/projects/soc2009/anchie_send/src/sys/arm/include/elf.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.12 2010/08/17 08:55:45 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -76,8 +76,14 @@ #define AT_GID 13 /* Real gid. */ #define AT_EGID 14 /* Effective gid. */ #define AT_EXECPATH 15 /* Path to the executable. */ +#define AT_CANARY 16 /* Canary for SSP */ +#define AT_CANARYLEN 17 /* Length of the canary. */ +#define AT_OSRELDATE 18 /* OSRELDATE. */ +#define AT_NCPUS 19 /* Number of CPUs. */ +#define AT_PAGESIZES 20 /* Pagesizes. */ +#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */ -#define AT_COUNT 16 /* Count of defined aux entry types. */ +#define AT_COUNT 22 /* Count of defined aux entry types. */ #define R_ARM_COUNT 33 /* Count of defined relocation types. */ ==== //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_misc.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.114 2010/08/07 11:57:13 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.115 2010/08/17 08:55:45 kib Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -2525,11 +2525,13 @@ register_t * freebsd32_copyout_strings(struct image_params *imgp) { - int argc, envc; + int argc, envc, i; u_int32_t *vectp; char *stringp, *destp; u_int32_t *stack_base; struct freebsd32_ps_strings *arginfo; + char canary[sizeof(long) * 8]; + int32_t pagesizes32[MAXPAGESIZES]; size_t execpath_len; int szsigcode; @@ -2545,8 +2547,10 @@ sv_psstrings; szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); destp = (caddr_t)arginfo - szsigcode - SPARE_USRSPACE - - roundup(execpath_len, sizeof(char *)) - - roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); + roundup(execpath_len, sizeof(char *)) - + roundup(sizeof(canary), sizeof(char *)) - + roundup(sizeof(pagesizes32), sizeof(char *)) - + roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); /* * install sigcode @@ -2565,6 +2569,25 @@ } /* + * Prepare the canary for SSP. + */ + arc4rand(canary, sizeof(canary), 0); + imgp->canary = (uintptr_t)arginfo - szsigcode - execpath_len - + sizeof(canary); + copyout(canary, (void *)imgp->canary, sizeof(canary)); + imgp->canarylen = sizeof(canary); + + /* + * Prepare the pagesizes array. + */ + for (i = 0; i < MAXPAGESIZES; i++) + pagesizes32[i] = (uint32_t)pagesizes[i]; + imgp->pagesizes = (uintptr_t)arginfo - szsigcode - execpath_len - + roundup(sizeof(canary), sizeof(char *)) - sizeof(pagesizes32); + copyout(pagesizes32, (void *)imgp->pagesizes, sizeof(pagesizes32)); + imgp->pagesizeslen = sizeof(pagesizes32); + + /* * If we have a valid auxargs ptr, prepare some room * on the stack. */ ==== //depot/projects/soc2009/anchie_send/src/sys/conf/options.mips#5 (text+ko) ==== @@ -26,7 +26,7 @@ # SUCH DAMAGE. # # JNPR: options.mips,v 1.2 2006/09/15 12:52:34 -# $FreeBSD: src/sys/conf/options.mips,v 1.8 2010/07/20 19:25:11 jmallett Exp $ +# $FreeBSD: src/sys/conf/options.mips,v 1.10 2010/08/15 19:07:44 imp Exp $ CPU_MIPS4KC opt_global.h CPU_MIPS32 opt_global.h @@ -35,6 +35,7 @@ CPU_HAVEFPU opt_global.h CPU_SB1 opt_global.h CPU_CNMIPS opt_global.h +CPU_RMI opt_global.h ISA_MIPS1 opt_cputype.h ISA_MIPS3 opt_cputype.h @@ -50,8 +51,6 @@ CFE_ENV_SIZE opt_global.h NOFPU opt_global.h -TARGET_EMULATOR opt_ddb.h -TARGET_XLR_XLS opt_global.h TICK_USE_YAMON_FREQ opt_global.h TICK_USE_MALTA_RTC opt_global.h ==== //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.283 2010/07/15 23:24:06 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.284 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include @@ -129,8 +129,6 @@ static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev, ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters, ACPI_BUFFER *ret); -static int acpi_device_pwr_for_sleep(device_t bus, device_t dev, - int *dstate); static ACPI_STATUS acpi_device_scan_cb(ACPI_HANDLE h, UINT32 level, void *context, void **retval); static ACPI_STATUS acpi_device_scan_children(device_t bus, device_t dev, @@ -1415,7 +1413,7 @@ return (AcpiEvaluateObject(h, pathname, parameters, ret)); } -static int +int acpi_device_pwr_for_sleep(device_t bus, device_t dev, int *dstate) { struct acpi_softc *sc; ==== //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_pcib.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.63 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.64 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include @@ -275,3 +275,14 @@ return_VALUE (interrupt); } + +int +acpi_pcib_power_for_sleep(device_t pcib, device_t dev, int *pstate) +{ + device_t acpi_dev; + + acpi_dev = devclass_get_device(devclass_find("acpi"), 0); + acpi_device_pwr_for_sleep(acpi_dev, dev, pstate); + return (0); +} + ==== //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_pcib_acpi.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.61 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.62 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include @@ -116,6 +116,7 @@ DEVMETHOD(pcib_alloc_msix, acpi_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, acpi_pcib_map_msi), + DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep), {0, 0} }; ==== //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_pcib_pci.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.19 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.20 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" @@ -80,6 +80,7 @@ /* pcib interface */ DEVMETHOD(pcib_route_interrupt, acpi_pcib_pci_route_interrupt), + DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep), {0, 0} }; ==== //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_pcibvar.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_pcibvar.h,v 1.7 2010/08/05 16:10:12 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_pcibvar.h,v 1.8 2010/08/17 15:44:52 jhb Exp $ */ #ifndef _ACPI_PCIBVAR_H_ @@ -38,6 +38,8 @@ int acpi_pcib_attach(device_t bus, ACPI_BUFFER *prt, int busno); int acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, ACPI_BUFFER *prtbuf); +int acpi_pcib_power_for_sleep(device_t pcib, device_t dev, + int *pstate); #endif /* _KERNEL */ ==== //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpivar.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.117 2010/05/23 07:53:22 mav Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.118 2010/08/17 15:44:52 jhb Exp $ */ #ifndef _ACPIVAR_H_ @@ -393,6 +393,8 @@ /* Device power control. */ ACPI_STATUS acpi_pwr_wake_enable(ACPI_HANDLE consumer, int enable); ACPI_STATUS acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state); +int acpi_device_pwr_for_sleep(device_t bus, device_t dev, + int *dstate); /* Misc. */ static __inline struct acpi_softc * ==== //depot/projects/soc2009/anchie_send/src/sys/dev/alc/if_alc.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ /* Driver for Atheros AR813x/AR815x PCIe Ethernet. */ #include -__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.15 2010/08/09 17:28:08 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.16 2010/08/13 19:39:33 yongari Exp $"); #include #include @@ -3486,7 +3486,7 @@ /* Disable Rx/Tx MAC. */ reg = CSR_READ_4(sc, ALC_MAC_CFG); if ((reg & (MAC_CFG_TX_ENB | MAC_CFG_RX_ENB)) != 0) { - reg &= ~MAC_CFG_TX_ENB | MAC_CFG_RX_ENB; + reg &= ~(MAC_CFG_TX_ENB | MAC_CFG_RX_ENB); CSR_WRITE_4(sc, ALC_MAC_CFG, reg); } for (i = ALC_TIMEOUT; i > 0; i--) { ==== //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c,v 1.12 2010/08/12 08:39:54 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c,v 1.14 2010/08/15 11:40:53 adrian Exp $ */ #include "opt_ah.h" @@ -221,6 +221,7 @@ * higher than normal value if DC offset and noise floor cal are * triggered at the same time. */ + /* XXX this actually kicks off a NF calibration -adrian */ OS_REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF); /* * Try to make sure the above NF cal completes, just so @@ -231,7 +232,7 @@ "not complete in time; noisy environment?\n", __func__); return AH_FALSE; } - + /* Initialize list pointers */ cal->cal_list = cal->cal_last = cal->cal_curr = AH_NULL; ==== //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c,v 1.2 2010/01/29 10:07:17 rpaulo Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c,v 1.3 2010/08/14 15:28:15 adrian Exp $ */ #include "opt_ah.h" @@ -115,7 +115,7 @@ if (qCoff > 15) qCoff = 15; else if (qCoff <= -16) - qCoff = 16; + qCoff = -16; HALDEBUG(ah, HAL_DEBUG_PERCAL, " : iCoff = 0x%x qCoff = 0x%x\n", iCoff, qCoff); ==== //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c,v 1.18 2010/06/01 15:33:10 rpaulo Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c,v 1.19 2010/08/14 15:29:21 adrian Exp $ */ #include "opt_ah.h" @@ -2008,7 +2008,7 @@ * for last gain, pdGainBoundary == Pmax_t2, so will * have to extrapolate */ - if (tgtIndex > maxIndex) { /* need to extrapolate above */ + if (tgtIndex >= maxIndex) { /* need to extrapolate above */ while ((ss <= tgtIndex) && (k < (AR5416_NUM_PDADC_VALUES - 1))) { tmpVal = (int16_t)((vpdTableI[i][sizeCurrVpdTable - 1] + (ss - maxIndex +1) * vpdStep)); ==== //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting - * Copyright (c) 2002-2008 Atheros Communications, Inc. + * Copyright (c) 2002-2009 Atheros Communications, Inc. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar9160.ini,v 1.2 2009/02/24 01:07:06 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar9160.ini,v 1.4 2010/08/14 15:48:18 adrian Exp $ */ /* Auto Generated PCI Register Writes. Created: 05/22/08 */ @@ -35,22 +35,24 @@ { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 }, { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 }, { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 }, - { 0x00009850, 0x6d48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6d48b0e2, 0x6d48b0e2 }, + { 0x00009850, 0x6c48b4e2, 0x6c48b4e2, 0x6c48b0e2, 0x6c48b0e2, 0x6c48b0e2 }, { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e }, - { 0x0000985c, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e }, + { 0x0000985c, 0x31395d5e, 0x31395d5e, 0x31395d5e, 0x31395d5e, 0x31395d5e }, { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 }, + { 0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 }, { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 }, { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0 }, { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 }, - { 0x00009914, 0x000007d0, 0x000007d0, 0x00000898, 0x00000898, 0x000007d0 }, + { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 }, { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 }, { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d }, - { 0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020 }, + { 0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020 }, { 0x00009960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 }, { 0x0000a960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 }, { 0x0000b960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 }, { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120 }, { 0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce }, + { 0x000099bc, 0x001a0600, 0x001a0600, 0x001a0c00, 0x001a0c00, 0x001a0c00 }, { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a0c00, 0x001a0c00, 0x001a0c00 }, { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be }, { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 }, @@ -212,7 +214,7 @@ { 0x00008134, 0x00000000 }, { 0x00008138, 0x00000000 }, { 0x0000813c, 0x00000000 }, - { 0x00008144, 0x00000000 }, + { 0x00008144, 0xffffffff }, { 0x00008168, 0x00000000 }, { 0x0000816c, 0x00000000 }, { 0x00008170, 0x32143320 }, @@ -271,7 +273,7 @@ { 0x0000832c, 0x00000007 }, { 0x00008330, 0x00000302 }, { 0x00008334, 0x00000e00 }, - { 0x00008338, 0x00000000 }, + { 0x00008338, 0x00ff0000 }, { 0x0000833c, 0x00000000 }, { 0x00008340, 0x000107ff }, { 0x00009808, 0x00000000 }, @@ -326,6 +328,7 @@ { 0x000099e4, 0xaaaaaaaa }, { 0x000099e8, 0x3c466478 }, { 0x000099ec, 0x0cc80caa }, + { 0x000099f0, 0x00000000 }, /* XXX adrian's addition: AR_PHY_CALMODE == 0 */ { 0x000099fc, 0x00001042 }, { 0x00009b00, 0x00000000 }, { 0x00009b04, 0x00000001 }, @@ -405,7 +408,7 @@ { 0x0000a244, 0x00007bb6 }, { 0x0000a248, 0x0fff3ffc }, { 0x0000a24c, 0x00000001 }, - { 0x0000a250, 0x0000a000 }, + { 0x0000a250, 0x0000e000 }, { 0x0000a254, 0x00000000 }, { 0x0000a258, 0x0cc75380 }, { 0x0000a25c, 0x0f0f0f01 }, @@ -425,7 +428,7 @@ { 0x0000a34c, 0x3fffffff }, { 0x0000a350, 0x3fffffff }, { 0x0000a354, 0x0003ffff }, - { 0x0000a358, 0x79a8aa33 }, + { 0x0000a358, 0x79bfaa03 }, { 0x0000d35c, 0x07ffffef }, { 0x0000d360, 0x0fffffe7 }, { 0x0000d364, 0x17ffffe5 }, ==== //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c,v 1.3 2010/06/01 15:47:57 rpaulo Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c,v 1.4 2010/08/14 15:29:21 adrian Exp $ */ /* @@ -792,7 +792,7 @@ * for last gain, pdGainBoundary == Pmax_t2, so will * have to extrapolate */ - if (tgtIndex > maxIndex) { /* need to extrapolate above */ + if (tgtIndex >= maxIndex) { /* need to extrapolate above */ while ((ss <= tgtIndex) && (k < (AR5416_NUM_PDADC_VALUES - 1))) { tmpVal = (int16_t)((vpdTableI[i][sizeCurrVpdTable - 1] + (ss - maxIndex +1) * vpdStep)); ==== //depot/projects/soc2009/anchie_send/src/sys/dev/ath/if_ath.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.276 2010/08/10 07:56:56 adrian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.278 2010/08/14 14:18:02 adrian Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -215,6 +215,7 @@ static int ath_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); static void ath_announce(struct ath_softc *); +static void ath_sysctl_stats_attach(struct ath_softc *sc); #ifdef IEEE80211_SUPPORT_TDMA static void ath_tdma_settimers(struct ath_softc *sc, u_int32_t nexttbtt, @@ -733,6 +734,7 @@ * regdomain are available from the hal. */ ath_sysctlattach(sc); + ath_sysctl_stats_attach(sc); if (bootverbose) ieee80211_announce(ic); @@ -2824,6 +2826,7 @@ */ if (ath_hal_numtxpending(ah, sc->sc_bhalq) != 0) { sc->sc_bmisscount++; + sc->sc_stats.ast_be_missed++; DPRINTF(sc, ATH_DEBUG_BEACON, "%s: missed %u consecutive beacons\n", __func__, sc->sc_bmisscount); @@ -7327,3 +7330,189 @@ } } #endif /* IEEE80211_SUPPORT_TDMA */ + +static int +ath_sysctl_clearstats(SYSCTL_HANDLER_ARGS) +{ + struct ath_softc *sc = arg1; + int val = 0; + int error; + + error = sysctl_handle_int(oidp, &val, 0, req); + if (error || !req->newptr) + return error; + if (val == 0) + return 0; /* Not clearing the stats is still valid */ + memset(&sc->sc_stats, 0, sizeof(sc->sc_stats)); + val = 0; + return 0; +} + +static void +ath_sysctl_stats_attach(struct ath_softc *sc) +{ + struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev); + struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev); + struct sysctl_oid_list *child = SYSCTL_CHILDREN(tree); + + /* Create "clear" node */ + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "clear_stats", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + ath_sysctl_clearstats, "I", "clear stats"); + + /* Create stats node */ + tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD, + NULL, "Statistics"); + child = SYSCTL_CHILDREN(tree); + + /* This was generated from if_athioctl.h */ + + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_watchdog", CTLFLAG_RD, + &sc->sc_stats.ast_watchdog, 0, "device reset by watchdog"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_hardware", CTLFLAG_RD, + &sc->sc_stats.ast_hardware, 0, "fatal hardware error interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_bmiss", CTLFLAG_RD, + &sc->sc_stats.ast_bmiss, 0, "beacon miss interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_bmiss_phantom", CTLFLAG_RD, + &sc->sc_stats.ast_bmiss_phantom, 0, "beacon miss interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_bstuck", CTLFLAG_RD, + &sc->sc_stats.ast_bstuck, 0, "beacon stuck interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rxorn", CTLFLAG_RD, + &sc->sc_stats.ast_rxorn, 0, "rx overrun interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rxeol", CTLFLAG_RD, + &sc->sc_stats.ast_rxeol, 0, "rx eol interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_txurn", CTLFLAG_RD, + &sc->sc_stats.ast_txurn, 0, "tx underrun interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_mib", CTLFLAG_RD, + &sc->sc_stats.ast_mib, 0, "mib interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_intrcoal", CTLFLAG_RD, + &sc->sc_stats.ast_intrcoal, 0, "interrupts coalesced"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_packets", CTLFLAG_RD, + &sc->sc_stats.ast_tx_packets, 0, "packet sent on the interface"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_mgmt", CTLFLAG_RD, + &sc->sc_stats.ast_tx_mgmt, 0, "management frames transmitted"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_discard", CTLFLAG_RD, + &sc->sc_stats.ast_tx_discard, 0, "frames discarded prior to assoc"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_qstop", CTLFLAG_RD, + &sc->sc_stats.ast_tx_qstop, 0, "output stopped 'cuz no buffer"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_encap", CTLFLAG_RD, + &sc->sc_stats.ast_tx_encap, 0, "tx encapsulation failed"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nonode", CTLFLAG_RD, + &sc->sc_stats.ast_tx_nonode, 0, "tx failed 'cuz no node"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nombuf", CTLFLAG_RD, + &sc->sc_stats.ast_tx_nombuf, 0, "tx failed 'cuz no mbuf"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nomcl", CTLFLAG_RD, + &sc->sc_stats.ast_tx_nomcl, 0, "tx failed 'cuz no cluster"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_linear", CTLFLAG_RD, + &sc->sc_stats.ast_tx_linear, 0, "tx linearized to cluster"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nodata", CTLFLAG_RD, + &sc->sc_stats.ast_tx_nodata, 0, "tx discarded empty frame"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_busdma", CTLFLAG_RD, + &sc->sc_stats.ast_tx_busdma, 0, "tx failed for dma resrcs"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_xretries", CTLFLAG_RD, + &sc->sc_stats.ast_tx_xretries, 0, "tx failed 'cuz too many retries"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_fifoerr", CTLFLAG_RD, + &sc->sc_stats.ast_tx_fifoerr, 0, "tx failed 'cuz FIFO underrun"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_filtered", CTLFLAG_RD, + &sc->sc_stats.ast_tx_filtered, 0, "tx failed 'cuz xmit filtered"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_shortretry", CTLFLAG_RD, + &sc->sc_stats.ast_tx_shortretry, 0, "tx on-chip retries (short)"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_longretry", CTLFLAG_RD, + &sc->sc_stats.ast_tx_longretry, 0, "tx on-chip retries (long)"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_badrate", CTLFLAG_RD, + &sc->sc_stats.ast_tx_badrate, 0, "tx failed 'cuz bogus xmit rate"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_noack", CTLFLAG_RD, + &sc->sc_stats.ast_tx_noack, 0, "tx frames with no ack marked"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_rts", CTLFLAG_RD, + &sc->sc_stats.ast_tx_rts, 0, "tx frames with rts enabled"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_cts", CTLFLAG_RD, + &sc->sc_stats.ast_tx_cts, 0, "tx frames with cts enabled"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_shortpre", CTLFLAG_RD, + &sc->sc_stats.ast_tx_shortpre, 0, "tx frames with short preamble"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_altrate", CTLFLAG_RD, + &sc->sc_stats.ast_tx_altrate, 0, "tx frames with alternate rate"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_protect", CTLFLAG_RD, + &sc->sc_stats.ast_tx_protect, 0, "tx frames with protection"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_ctsburst", CTLFLAG_RD, + &sc->sc_stats.ast_tx_ctsburst, 0, "tx frames with cts and bursting"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_ctsext", CTLFLAG_RD, + &sc->sc_stats.ast_tx_ctsext, 0, "tx frames with cts extension"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_nombuf", CTLFLAG_RD, + &sc->sc_stats.ast_rx_nombuf, 0, "rx setup failed 'cuz no mbuf"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_busdma", CTLFLAG_RD, + &sc->sc_stats.ast_rx_busdma, 0, "rx setup failed for dma resrcs"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_orn", CTLFLAG_RD, + &sc->sc_stats.ast_rx_orn, 0, "rx failed 'cuz of desc overrun"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_crcerr", CTLFLAG_RD, + &sc->sc_stats.ast_rx_crcerr, 0, "rx failed 'cuz of bad CRC"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_fifoerr", CTLFLAG_RD, + &sc->sc_stats.ast_rx_fifoerr, 0, "rx failed 'cuz of FIFO overrun"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_badcrypt", CTLFLAG_RD, + &sc->sc_stats.ast_rx_badcrypt, 0, "rx failed 'cuz decryption"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_badmic", CTLFLAG_RD, + &sc->sc_stats.ast_rx_badmic, 0, "rx failed 'cuz MIC failure"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_phyerr", CTLFLAG_RD, + &sc->sc_stats.ast_rx_phyerr, 0, "rx failed 'cuz of PHY err"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_tooshort", CTLFLAG_RD, + &sc->sc_stats.ast_rx_tooshort, 0, "rx discarded 'cuz frame too short"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_toobig", CTLFLAG_RD, + &sc->sc_stats.ast_rx_toobig, 0, "rx discarded 'cuz frame too large"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_packets", CTLFLAG_RD, + &sc->sc_stats.ast_rx_packets, 0, "packet recv on the interface"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_mgt", CTLFLAG_RD, + &sc->sc_stats.ast_rx_mgt, 0, "management frames received"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_ctl", CTLFLAG_RD, + &sc->sc_stats.ast_rx_ctl, 0, "rx discarded 'cuz ctl frame"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_be_xmit", CTLFLAG_RD, + &sc->sc_stats.ast_be_xmit, 0, "beacons transmitted"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_be_nombuf", CTLFLAG_RD, + &sc->sc_stats.ast_be_nombuf, 0, "beacon setup failed 'cuz no mbuf"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_per_cal", CTLFLAG_RD, + &sc->sc_stats.ast_per_cal, 0, "periodic calibration calls"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_per_calfail", CTLFLAG_RD, + &sc->sc_stats.ast_per_calfail, 0, "periodic calibration failed"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_per_rfgain", CTLFLAG_RD, + &sc->sc_stats.ast_per_rfgain, 0, "periodic calibration rfgain reset"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rate_calls", CTLFLAG_RD, + &sc->sc_stats.ast_rate_calls, 0, "rate control checks"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rate_raise", CTLFLAG_RD, + &sc->sc_stats.ast_rate_raise, 0, "rate control raised xmit rate"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rate_drop", CTLFLAG_RD, + &sc->sc_stats.ast_rate_drop, 0, "rate control dropped xmit rate"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ant_defswitch", CTLFLAG_RD, + &sc->sc_stats.ast_ant_defswitch, 0, "rx/default antenna switches"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ant_txswitch", CTLFLAG_RD, + &sc->sc_stats.ast_ant_txswitch, 0, "tx antenna switches"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_cabq_xmit", CTLFLAG_RD, + &sc->sc_stats.ast_cabq_xmit, 0, "cabq frames transmitted"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_cabq_busy", CTLFLAG_RD, + &sc->sc_stats.ast_cabq_busy, 0, "cabq found busy"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_raw", CTLFLAG_RD, + &sc->sc_stats.ast_tx_raw, 0, "tx frames through raw api"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ff_txok", CTLFLAG_RD, + &sc->sc_stats.ast_ff_txok, 0, "fast frames tx'd successfully"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ff_txerr", CTLFLAG_RD, + &sc->sc_stats.ast_ff_txerr, 0, "fast frames tx'd w/ error"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ff_rx", CTLFLAG_RD, + &sc->sc_stats.ast_ff_rx, 0, "fast frames rx'd"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ff_flush", CTLFLAG_RD, + &sc->sc_stats.ast_ff_flush, 0, "fast frames flushed from staging q"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_qfull", CTLFLAG_RD, + &sc->sc_stats.ast_tx_qfull, 0, "tx dropped 'cuz of queue limit"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nobuf", CTLFLAG_RD, + &sc->sc_stats.ast_tx_nobuf, 0, "tx dropped 'cuz no ath buffer"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tdma_update", CTLFLAG_RD, + &sc->sc_stats.ast_tdma_update, 0, "TDMA slot timing updates"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tdma_timers", CTLFLAG_RD, + &sc->sc_stats.ast_tdma_timers, 0, "TDMA slot update set beacon timers"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tdma_tsf", CTLFLAG_RD, + &sc->sc_stats.ast_tdma_tsf, 0, "TDMA slot update set TSF"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tdma_ack", CTLFLAG_RD, + &sc->sc_stats.ast_tdma_ack, 0, "TDMA tx failed 'cuz ACK required"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_raw_fail", CTLFLAG_RD, + &sc->sc_stats.ast_tx_raw_fail, 0, "raw tx failed 'cuz h/w down"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nofrag", CTLFLAG_RD, + &sc->sc_stats.ast_tx_nofrag, 0, "tx dropped 'cuz no ath frag buffer"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_be_missed", CTLFLAG_RD, + &sc->sc_stats.ast_be_missed, 0, "number of -missed- beacons"); +} ==== //depot/projects/soc2009/anchie_send/src/sys/dev/ath/if_athioctl.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.24 2009/02/13 05:38:03 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.25 2010/08/14 14:01:12 adrian Exp $ */ /* @@ -118,7 +118,8 @@ u_int32_t ast_tdma_ack; /* TDMA tx failed 'cuz ACK required */ u_int32_t ast_tx_raw_fail;/* raw tx failed 'cuz h/w down */ u_int32_t ast_tx_nofrag; /* tx dropped 'cuz no ath frag buffer */ - u_int32_t ast_pad[14]; + u_int32_t ast_be_missed; /* missed beacons */ + u_int32_t ast_pad[13]; }; #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) ==== //depot/projects/soc2009/anchie_send/src/sys/dev/bwi/if_bwi.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.14 2010/06/29 21:56:42 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.15 2010/08/14 20:12:10 bschmidt Exp $"); #include "opt_inet.h" #include "opt_bwi.h" @@ -511,7 +511,8 @@ IEEE80211_C_SHPREAMBLE | IEEE80211_C_WPA | IEEE80211_C_BGSCAN | - IEEE80211_C_MONITOR; + IEEE80211_C_MONITOR | + IEEE80211_C_RATECTL; ic->ic_opmode = IEEE80211_M_STA; ieee80211_ifattach(ic, macaddr); ==== //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwn.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.20 2010/07/22 20:08:02 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.21 2010/08/14 20:12:10 bschmidt Exp $"); /* * The Broadcom Wireless LAN controller driver. @@ -1070,6 +1070,7 @@ | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ | IEEE80211_C_BGSCAN /* capable of bg scanning */ | IEEE80211_C_TXPMGT /* capable of txpow mgt */ + | IEEE80211_C_RATECTL /* use ratectl */ ; ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS; /* s/w bmiss */ ==== //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_common.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 17 18:54:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2467810656A4; Tue, 17 Aug 2010 18:54:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D93931065695 for ; Tue, 17 Aug 2010 18:54:30 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C604C8FC16 for ; Tue, 17 Aug 2010 18:54:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HIsUHJ064690 for ; Tue, 17 Aug 2010 18:54:30 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HIsUOe064687 for perforce@freebsd.org; Tue, 17 Aug 2010 18:54:30 GMT (envelope-from afiveg@FreeBSD.org) Date: Tue, 17 Aug 2010 18:54:30 GMT Message-Id: <201008171854.o7HIsUOe064687@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 18:54:31 -0000 http://p4web.freebsd.org/@@182531?ac=10 Change 182531 by afiveg@cottonmouth on 2010/08/17 18:53:38 Cosmetic fixes: eliminating unneeded functions, improving the comments. Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#17 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#17 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#20 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#32 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#33 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#32 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#30 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#22 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#15 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#16 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#46 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#46 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#16 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#28 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#29 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#23 edit .. //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#14 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#17 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#17 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#20 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#32 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#33 (text+ko) ==== @@ -3498,11 +3498,7 @@ } #ifdef RINGMAP - /* Call our ringmap-isr only in case any process captures (open_cnt > 0) */ - RINGMAP_LOCK(adapter->rm); - if (adapter->rm->open_cnt > 0) adapter->rm->funcs->delayed_isr(adapter); - RINGMAP_UNLOCK(adapter->rm); #endif while ((current_desc->status & E1000_RXD_STAT_DD) && ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#32 (text+ko) ==== @@ -18,8 +18,6 @@ #include "if_lem.h" #include "ringmap_8254.h" -struct ringmap * rm_8254_get_ringmap_p(device_t); -device_t rm_8254_get_device_p(struct cdev *); int rm_8254_set_slot(struct capt_object *, unsigned int); void rm_8254_interrupt(void *); void rm_8254_delayed_interrupt(void *); @@ -97,24 +95,28 @@ RINGMAP_INTR(start); - getmicrotime(&last_ts); + RINGMAP_LOCK(adapter->rm); + /* Do the next steps only if there is capturing process */ + if (adapter->rm->open_cnt > 0) { + getmicrotime(&last_ts); + rm_8254_sync_tail(rm_8254_find_next(adapter)); - rm_8254_sync_tail(rm_8254_find_next(adapter)); - - SLIST_FOREACH(co, &adapter->rm->object_list, objects) { - if (co->ring != NULL) { + SLIST_FOREACH(co, &adapter->rm->object_list, objects) { + if (co->ring != NULL) { #if (RINGMAP_INTR_DEB) - PRINT_RING_PTRS(co->ring); + PRINT_RING_PTRS(co->ring); #endif - co->ring->last_ts = last_ts; - ++co->ring->intr_num; + co->ring->last_ts = last_ts; + ++co->ring->intr_num; + } } } + RINGMAP_UNLOCK(adapter->rm); RINGMAP_INTR(end); } -/* The ring which TAIL pointer is mostly near to to the HEAD(RDH) */ +/* Returns the ring which TAIL pointer is mostly near to to the HEAD(RDH) */ struct capt_object * rm_8254_find_next(struct adapter *adapter) { @@ -229,40 +231,6 @@ } -/* - * Get pointer to device structure of adapter using our ringmap char device. - * This is a trick. Our cdev must have the same unit number as dev of adapter. - * Look in ringmap.c: ringmap_attach() where we create our cdev. - */ -device_t -rm_8254_get_device_p(struct cdev *cdev) -{ - struct adapter *adapter; - - adapter = (struct adapter *)devclass_get_softc(em_devclass, dev2unit(cdev)); -#if (__RINGMAP_DEB) - if (adapter == NULL){ - RINGMAP_WARN(Can not get pointer to adapter structure); - } -#endif - - return (adapter->dev); -} - - -/* - * Returns pointer to ringmap structure - */ -struct ringmap * -rm_8254_get_ringmap_p(device_t dev) -{ - struct adapter *adapter; - - adapter = (struct adapter *)device_get_softc(dev); - return (adapter->rm); -} - - /* Print the values from RDT and RDH */ int rm_8254_print_ring_pointers(struct adapter *adapter) ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#30 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#22 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#15 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#16 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#46 (text+ko) ==== @@ -55,16 +55,14 @@ .d_open = ringmap_open, .d_close = ringmap_close, .d_ioctl = ringmap_ioctl, - .d_read = ringmap_read, - .d_mmap_single = ringmap_mmap_single, + .d_read = ringmap_read, /* Tell to user ring physical addr */ + .d_mmap_single = ringmap_mmap_single, /* Doesn't work yet */ .d_name = "ringmap_cdev" }; - static struct ringmap_global_list ringmap_list_head = SLIST_HEAD_INITIALIZER(ringmap_list_head); - /* * Will called from if_em.c before returning from * em_attach() function. @@ -169,8 +167,9 @@ /****************************************************************** * This func will called as result of open(2). Here we allocate - * the memory for the new packets ring that will associated with - * current thread. + * the memory for the new ring and capt_object structure (so called + * capturing object). Capturing object represents the thread with + * its ring. ******************************************************************/ int ringmap_open(struct cdev *cdev, int flag, int otyp, struct thread *td) @@ -303,18 +302,19 @@ int ringmap_close(struct cdev *cdev, int flag, int otyp, struct thread *td) { - RINGMAP_FUNC_DEBUG(start); - + RINGMAP_FUNC_DEBUG(The last capturing object is gone); #if (__RINGMAP_DEB) printf(RINGMAP_PREFIX"[%s] pid = %d\n", __func__, td->td_proc->p_pid); #endif - - RINGMAP_FUNC_DEBUG(end); - return (0); } +/* + * Callback of ringmap_close() + * Free memory allocated for capturing object and remove the + * capturing object from the list. + */ void clear_capt_object(void * data) { @@ -398,10 +398,8 @@ object = &obj; - RINGMAP_FUNC_DEBUG(start); - return (0); } @@ -458,7 +456,7 @@ #endif if ( devfs_get_cdevpriv((void **)&co) ) { - RINGMAP_IOCTL(Error! Can not get private date!); + RINGMAP_IOCTL(Error! Can not get private data!); return (ENODEV); } @@ -469,7 +467,7 @@ /* Sleep and wait for new packets */ case IOCTL_SLEEP_WAIT: - /* Count how many times we should wait for new packets */ + /* Count how many times we wait for new packets */ co->ring->user_wait_kern++; /* Set adapter TAIL register */ @@ -494,7 +492,9 @@ /* Synchronize sowftware ring-tail with hardware-ring-tail (RDT) */ case IOCTL_SYNC_TAIL: - rm->funcs->sync_tail(co->que); + RINGMAP_LOCK(rm); + rm->funcs->sync_tail(co); + RINGMAP_UNLOCK(rm); break; default: @@ -518,8 +518,12 @@ printf("=== Ring Kernel Addr:0x%X\n", (unsigned int)co->ring); - printf("=== Queue Kernel Addr:0x%X\n\n", - (unsigned int)co->que); + /* Print addr of que only if multiqueue supported */ + if (co->que != NULL) + printf("=== Queue Kernel Addr:0x%X\n\n", + (unsigned int)co->que); + } else { + RINGMAP_WARN(NULL pointer: capturing object); } } ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#46 (text+ko) ==== @@ -248,13 +248,13 @@ * DEBUG OUTPUT */ #ifndef RINGMAP_IOCTL_DEB -#define RINGMAP_IOCTL_DEB 1 +#define RINGMAP_IOCTL_DEB 0 #else #define RINGMAP_IOCTL_DEB 1 #endif #ifndef RINGMAP_INTR_DEB -#define RINGMAP_INTR_DEB 1 +#define RINGMAP_INTR_DEB 0 #else #define RINGMAP_INTR_DEB 1 #endif ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#16 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#28 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#29 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#23 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#14 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Aug 17 19:36:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95CDE1065693; Tue, 17 Aug 2010 19:36:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 572A010656A5 for ; Tue, 17 Aug 2010 19:36:11 +0000 (UTC) (envelope-from phcoder@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 445728FC29 for ; Tue, 17 Aug 2010 19:36:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HJaBAf073619 for ; Tue, 17 Aug 2010 19:36:11 GMT (envelope-from phcoder@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HJaBOD073616 for perforce@freebsd.org; Tue, 17 Aug 2010 19:36:11 GMT (envelope-from phcoder@FreeBSD.org) Date: Tue, 17 Aug 2010 19:36:11 GMT Message-Id: <201008171936.o7HJaBOD073616@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to phcoder@FreeBSD.org using -f From: Volodymyr Serbinenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 19:36:12 -0000 http://p4web.freebsd.org/@@182533?ac=10 Change 182533 by phcoder@phcoder_ on 2010/08/17 19:35:58 REintegrate from BZR. Now yeeloong port is functional with few remaining issues. Affected files ... .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/elf.h#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/include/elf.h#3 integrate Differences ... ==== //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/elf.h#3 (text+ko) ==== ==== //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/include/elf.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Aug 17 19:51:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A9BF10656A6; Tue, 17 Aug 2010 19:51:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D07D1065675 for ; Tue, 17 Aug 2010 19:51:34 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 404738FC14 for ; Tue, 17 Aug 2010 19:51:34 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HJpYBX077411 for ; Tue, 17 Aug 2010 19:51:34 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HJpYRh077408 for perforce@freebsd.org; Tue, 17 Aug 2010 19:51:34 GMT (envelope-from jhb@freebsd.org) Date: Tue, 17 Aug 2010 19:51:34 GMT Message-Id: <201008171951.o7HJpYRh077408@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 19:51:34 -0000 http://p4web.freebsd.org/@@182534?ac=10 Change 182534 by jhb@jhb_fiver on 2010/08/17 19:50:28 Remove unused KTRACE includes. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#76 edit .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#28 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#125 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#99 edit .. //depot/projects/smpng/sys/kern/sched_ule.c#106 edit .. //depot/projects/smpng/sys/powerpc/aim/trap.c#10 edit .. //depot/projects/smpng/sys/powerpc/booke/trap.c#6 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#88 edit .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#14 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#76 (text+ko) ==== @@ -50,7 +50,6 @@ #include "opt_isa.h" #include "opt_kdb.h" #include "opt_kdtrace.h" -#include "opt_ktrace.h" #include #include @@ -70,9 +69,6 @@ #include #include #include -#ifdef KTRACE -#include -#endif #ifdef HWPMC_HOOKS #include #endif ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#28 (text+ko) ==== @@ -45,7 +45,6 @@ #include "opt_clock.h" #include "opt_cpu.h" #include "opt_isa.h" -#include "opt_ktrace.h" #include #include @@ -65,9 +64,6 @@ #include #include #include -#ifdef KTRACE -#include -#endif #include #include ==== //depot/projects/smpng/sys/i386/i386/trap.c#125 (text+ko) ==== @@ -50,7 +50,6 @@ #include "opt_isa.h" #include "opt_kdb.h" #include "opt_kdtrace.h" -#include "opt_ktrace.h" #include "opt_npx.h" #include "opt_trap.h" @@ -72,9 +71,6 @@ #include #include #include -#ifdef KTRACE -#include -#endif #ifdef HWPMC_HOOKS #include #endif ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#99 (text+ko) ==== @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.138 2010/05/24 17:24:14 kib Exp $"); #include "opt_ddb.h" -#include "opt_ktrace.h" #include #include @@ -67,11 +66,6 @@ #include #endif -#ifdef KTRACE -#include -#include -#endif - #include #include ==== //depot/projects/smpng/sys/kern/sched_ule.c#106 (text+ko) ==== @@ -62,10 +62,6 @@ #include #include #include -#ifdef KTRACE -#include -#include -#endif #ifdef HWPMC_HOOKS #include ==== //depot/projects/smpng/sys/powerpc/aim/trap.c#10 (text+ko) ==== @@ -34,8 +34,6 @@ #include __FBSDID("$FreeBSD: src/sys/powerpc/aim/trap.c,v 1.82 2010/07/13 05:32:19 nwhitehorn Exp $"); -#include "opt_ktrace.h" - #include #include #include @@ -50,9 +48,6 @@ #include #include #include -#ifdef KTRACE -#include -#endif #include #include ==== //depot/projects/smpng/sys/powerpc/booke/trap.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD: src/sys/powerpc/booke/trap.c,v 1.7 2010/05/23 18:32:02 kib Exp $"); #include "opt_fpu_emu.h" -#include "opt_ktrace.h" #include #include @@ -51,9 +50,6 @@ #include #include #include -#ifdef KTRACE -#include -#endif #include #include ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#88 (text+ko) ==== @@ -44,7 +44,6 @@ #include "opt_ddb.h" #include "opt_ktr.h" -#include "opt_ktrace.h" #include #include @@ -65,10 +64,6 @@ #include #include #include -#ifdef KTRACE -#include -#include -#endif #include #include ==== //depot/projects/smpng/sys/sun4v/sun4v/trap.c#14 (text+ko) ==== @@ -42,7 +42,6 @@ #include "opt_ddb.h" #include "opt_ktr.h" -#include "opt_ktrace.h" #include #include @@ -62,10 +61,6 @@ #include #include #include -#ifdef KTRACE -#include -#include -#endif #include From owner-p4-projects@FreeBSD.ORG Tue Aug 17 19:51:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFF461065773; Tue, 17 Aug 2010 19:51:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74D751065693 for ; Tue, 17 Aug 2010 19:51:34 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 628D98FC1E for ; Tue, 17 Aug 2010 19:51:34 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HJpYKO077417 for ; Tue, 17 Aug 2010 19:51:34 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HJpYpl077414 for perforce@freebsd.org; Tue, 17 Aug 2010 19:51:34 GMT (envelope-from jhb@freebsd.org) Date: Tue, 17 Aug 2010 19:51:34 GMT Message-Id: <201008171951.o7HJpYpl077414@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 19:51:35 -0000 http://p4web.freebsd.org/@@182535?ac=10 Change 182535 by jhb@jhb_fiver on 2010/08/17 19:50:55 Don't really need the lock here. Affected files ... .. //depot/projects/smpng/sys/kern/kern_proc.c#113 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_proc.c#113 (text+ko) ==== @@ -717,9 +717,7 @@ kp->ki_textvp = p->p_textvp; #ifdef KTRACE kp->ki_tracep = p->p_tracevp; - mtx_lock(&ktrace_mtx); kp->ki_traceflag = p->p_traceflag; - mtx_unlock(&ktrace_mtx); #endif kp->ki_fd = p->p_fd; kp->ki_vmspace = p->p_vmspace; From owner-p4-projects@FreeBSD.ORG Tue Aug 17 19:52:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C3851065698; Tue, 17 Aug 2010 19:52:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA613106566C for ; Tue, 17 Aug 2010 19:52:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8DF9C8FC1F for ; Tue, 17 Aug 2010 19:52:40 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HJqeik077436 for ; Tue, 17 Aug 2010 19:52:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HJqeGQ077433 for perforce@freebsd.org; Tue, 17 Aug 2010 19:52:40 GMT (envelope-from jhb@freebsd.org) Date: Tue, 17 Aug 2010 19:52:40 GMT Message-Id: <201008171952.o7HJqeGQ077433@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 19:52:41 -0000 http://p4web.freebsd.org/@@182536?ac=10 Change 182536 by jhb@jhb_fiver on 2010/08/17 19:51:45 Move ktrace logic for fork() and exec() into kern_ktrace.c. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exec.c#131 edit .. //depot/projects/smpng/sys/kern/kern_fork.c#126 edit .. //depot/projects/smpng/sys/kern/kern_ktrace.c#74 edit .. //depot/projects/smpng/sys/sys/ktrace.h#18 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exec.c#131 (text+ko) ==== @@ -661,16 +661,8 @@ setsugid(p); #ifdef KTRACE - if (p->p_tracevp != NULL && - priv_check_cred(oldcred, PRIV_DEBUG_DIFFCRED, 0)) { - mtx_lock(&ktrace_mtx); - p->p_traceflag = 0; - tracevp = p->p_tracevp; - p->p_tracevp = NULL; - tracecred = p->p_tracecred; - p->p_tracecred = NULL; - mtx_unlock(&ktrace_mtx); - } + if (priv_check_cred(oldcred, PRIV_DEBUG_DIFFCRED, 0)) + ktrprocexec(p, &tracecred, &tracevp); #endif /* * Close any file descriptors 0..2 that reference procfs, ==== //depot/projects/smpng/sys/kern/kern_fork.c#126 (text+ko) ==== @@ -645,21 +645,7 @@ callout_init(&p2->p_itcallout, CALLOUT_MPSAFE); #ifdef KTRACE - /* - * Copy traceflag and tracefile if enabled. - */ - mtx_lock(&ktrace_mtx); - KASSERT(p2->p_tracevp == NULL, ("new process has a ktrace vnode")); - if (p1->p_traceflag & KTRFAC_INHERIT) { - p2->p_traceflag = p1->p_traceflag; - if ((p2->p_tracevp = p1->p_tracevp) != NULL) { - VREF(p2->p_tracevp); - KASSERT(p1->p_tracecred != NULL, - ("ktrace vnode with no cred")); - p2->p_tracecred = crhold(p1->p_tracecred); - } - } - mtx_unlock(&ktrace_mtx); + ktrprocfork(p1, p2); #endif /* ==== //depot/projects/smpng/sys/kern/kern_ktrace.c#74 (text+ko) ==== @@ -126,7 +126,7 @@ 0, "Maximum size of genio event payload"); static int print_message = 1; -struct mtx ktrace_mtx; +static struct mtx ktrace_mtx; static struct sx ktrace_sx; static void ktrace_init(void *dummy); @@ -467,7 +467,22 @@ } /* - * When a process exits drain per-process asynchronous trace records + * When a setuid process execs, disable tracing. + * + * XXX: We toss any pending asynchronous records. + */ +void +ktrprocexec(struct proc *p, struct ucred **uc, struct vnode **vp) +{ + + PROC_LOCK_ASSERT(p, MA_OWNED); + mtx_lock(&ktrace_mtx); + ktr_freeproc(p, uc, vp); + mtx_unlock(&ktrace_mtx); +} + +/* + * When a process exits, drain per-process asynchronous trace records * and disable tracing. */ void @@ -502,6 +517,29 @@ } /* + * When a process forks, enable tracing in the new process if needed. + */ +void +ktrprocfork(struct proc *p1, struct proc *p2) +{ + + PROC_LOCK_ASSERT(p1, MA_OWNED); + PROC_LOCK_ASSERT(p2, MA_OWNED); + mtx_lock(&ktrace_mtx); + KASSERT(p2->p_tracevp == NULL, ("new process has a ktrace vnode")); + if (p1->p_traceflag & KTRFAC_INHERIT) { + p2->p_traceflag = p1->p_traceflag; + if ((p2->p_tracevp = p1->p_tracevp) != NULL) { + VREF(p2->p_tracevp); + KASSERT(p1->p_tracecred != NULL, + ("ktrace vnode with no cred")); + p2->p_tracecred = crhold(p1->p_tracecred); + } + } + mtx_unlock(&ktrace_mtx); +} + +/* * When a thread returns, drain any asynchronous records generated by the * system call. */ ==== //depot/projects/smpng/sys/sys/ktrace.h#18 (text+ko) ==== @@ -73,10 +73,6 @@ if (KTRCHECKDRAIN(td)) \ ktruserret(td); \ } while (0) -#define KTRPROCEXIT(td) do { \ - if (KTRCHECKDRAIN(td)) \ - ktrprocexit(td); \ -} while (0) /* * ktrace record types @@ -195,8 +191,6 @@ #define KTRFAC_DROP 0x20000000 /* last event was dropped */ #ifdef _KERNEL -extern struct mtx ktrace_mtx; - void ktrnamei(char *); void ktrcsw(int, int); void ktrpsig(int, sig_t, sigset_t *, int); @@ -204,7 +198,9 @@ void ktrsyscall(int, int narg, register_t args[]); void ktrsysctl(int *name, u_int namelen); void ktrsysret(int, int, register_t); +void ktrprocexec(struct proc *, struct ucred **, struct vnode **); void ktrprocexit(struct thread *); +void ktrprocfork(struct proc *, struct proc *); void ktruserret(struct thread *); void ktrstruct(const char *, void *, size_t); #define ktrsockaddr(s) \ From owner-p4-projects@FreeBSD.ORG Tue Aug 17 20:00:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8512F1065698; Tue, 17 Aug 2010 20:00:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4635F1065693 for ; Tue, 17 Aug 2010 20:00:24 +0000 (UTC) (envelope-from phcoder@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 310A78FC1F for ; Tue, 17 Aug 2010 20:00:24 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HK0Op0077836 for ; Tue, 17 Aug 2010 20:00:24 GMT (envelope-from phcoder@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HK0LdI077764 for perforce@freebsd.org; Tue, 17 Aug 2010 20:00:21 GMT (envelope-from phcoder@FreeBSD.org) Date: Tue, 17 Aug 2010 20:00:21 GMT Message-Id: <201008172000.o7HK0LdI077764@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to phcoder@FreeBSD.org using -f From: Volodymyr Serbinenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 20:00:24 -0000 http://p4web.freebsd.org/@@182537?ac=10 Change 182537 by phcoder@phcoder_ on 2010/08/17 19:59:50 Resync with bzr repo. Now it's a functional port with only few issues remaining. Affected files ... .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/acpica/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/acpica/acpi_switch.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/acpica/acpi_wakecode.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/acpica/acpi_wakeup.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/acpica/genwakecode.sh#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/acpica/genwakedata.sh#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/acpica/madt.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/apic_vector.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/cpu_switch.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/exception.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/fpu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/genassym.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/identcpu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/initcpu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/intr_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/legacy.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/mp_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/mptable_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/pmap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/support.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/trap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/tsc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/amd64/vm_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/conf/GENERIC#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/conf/GENERIC.hints#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/conf/NOTES#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/ia32/ia32_exception.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/ia32/ia32_reg.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/ia32/ia32_signal.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/apicvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/asmacros.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/clock.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/cpu.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/fpu.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/mca.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/param.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/pcb.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/pcpu.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/pmap.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/segments.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/smp.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/specialreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/include/vmparam.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/linux32/linux32_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/linux32/linux32_proto.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/linux32/linux32_syscall.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/linux32/linux32_sysent.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/linux32/linux32_sysvec.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/amd64/linux32/syscalls.master#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/arm/machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/arm/nexus.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/arm/pmap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/at91/at91_pmc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/at91/at91_pmcreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/conf/DB-78XXX#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/conf/DB-88F5XXX#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/conf/DB-88F6XXX#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/conf/SHEEVAPLUG#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/include/bootinfo.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/include/fdt.h#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/include/metadata.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/include/ofw_machdep.h#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/include/pmap.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/include/vmparam.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/bus_space.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/common.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/discovery/discovery.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/discovery/files.db78xxx#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/discovery/std.db78xxx#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/files.mv#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/gpio.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/ic.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/kirkwood/kirkwood.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/kirkwood/sheevaplug.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/kirkwood/std.db88f6xxx#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/kirkwood/std.sheevaplug#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/mv_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/mv_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/mv_sata.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/mvreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/mvvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/mvwin.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/orion/db88f5xxx.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/orion/orion.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/orion/std.db88f5xxx#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/rtc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/timer.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/mv/twsi.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/s3c2xx0/files.s3c2xx0#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/s3c2xx0/s3c24x0.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/s3c2xx0/s3c24x0reg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/s3c2xx0/s3c2xx0_space.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/arm/s3c2xx0/s3c2xx0var.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/arm/uboot/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/arm/uboot/version#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/common/Makefile.inc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/common/load_elf_obj.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/common/loader.8#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/ficl/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/ficl/ficl.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/forth/loader.conf#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/i386/boot0/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/i386/btx/btx/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/i386/btx/btxldr/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/i386/cdboot/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/i386/loader/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/i386/mbr/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/i386/pmbr/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/i386/pxeldr/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/ia64/common/exec.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/ia64/efi/version#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/ofw/Makefile.inc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/ofw/libofw/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/ofw/libofw/libofw.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/pc98/boot0.5/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/pc98/boot0/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/pc98/btx/btx/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/pc98/btx/btxldr/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/pc98/cdboot/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/pc98/loader/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/Makefile.inc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/boot1.chrp/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/ofw/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/ofw/conf.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/ofw/ldscript.powerpc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/ofw/metadata.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/uboot/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/uboot/ldscript.powerpc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/powerpc/uboot/version#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/sparc64/boot1/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/uboot/Makefile.inc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/uboot/common/metadata.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/zfs/zfs.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/boot/zfs/zfsimpl.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/ata/ata_da.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/ata/ata_pmp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/ata/ata_xpt.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/cam.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/cam_ccb.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/cam_debug.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/cam_periph.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/cam_xpt.c#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/cam_xpt_internal.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/scsi/scsi_all.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/scsi/scsi_all.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/scsi/scsi_cd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/scsi/scsi_ch.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/scsi/scsi_da.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/scsi/scsi_target.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cam/scsi/scsi_xpt.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/boot/zfs/zfsimpl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/compat/opensolaris/sys/atomic.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/compat/opensolaris/sys/misc.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/compat/opensolaris/sys/policy.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/compat/opensolaris/sys/sid.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/compat/opensolaris/sys/uio.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/dev/cyclic/cyclic.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/dev/dtrace/dtrace_debug.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/dev/dtrace/dtrace_load.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/freebsd32.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/freebsd32_misc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/freebsd32_proto.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/freebsd32_signal.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/freebsd32_syscall.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/freebsd32_sysent.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/freebsd32_util.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/freebsd32/syscalls.master#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/linprocfs/linprocfs.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/linux/linux_signal.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/ndis/subr_usbd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/svr4/svr4_filio.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/svr4/svr4_proto.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/svr4/svr4_syscall.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/svr4/svr4_syscallnames.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/svr4/svr4_sysent.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/x86bios/x86bios.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/compat/x86bios/x86bios.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/Makefile.arm#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/Makefile.mips#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/Makefile.powerpc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/NOTES#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files.amd64#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files.arm#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files.i386#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files.mips#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files.pc98#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files.powerpc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files.sparc64#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/files.sun4v#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/kern.mk#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/kern.post.mk#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/kern.pre.mk#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/kmod.mk#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/ldscript.mips#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/ldscript.mips.n32#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/ldscript.mips.octeon1.32#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/ldscript.mips.octeon1.64#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/ldscript.mips.octeon1.n32#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/options#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/options.amd64#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/options.arm#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/options.mips#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/conf/options.powerpc#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/acpica_prep.sh#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/changes.txt#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/common/adisasm.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/common/adwalk.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/common/dmextern.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/common/dmrestag.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/common/dmtable.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/common/dmtbdump.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/common/dmtbinfo.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslpredef.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslstartup.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/asltree.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/debugger/dbfileio.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/debugger/dbhistry.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/debugger/dbinput.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/debugger/dbutils.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/disassembler/dmobject.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/events/evgpe.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/events/evgpeinit.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/events/evgpeutil.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/events/evrgnini.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/events/evxface.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/events/evxfevnt.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/executer/exdump.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/executer/exfldio.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/executer/exprep.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/executer/exregion.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/executer/exsystem.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/hardware/hwvalid.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acconfig.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acdebug.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acdisasm.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acevents.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acexcep.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acglobal.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/achware.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/aclocal.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acnamesp.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acobject.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acoutput.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acpiosxf.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acpixf.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acpredef.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acstruct.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/actbl.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/actbl2.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/actypes.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/include/acutils.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsaccess.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsdump.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsnames.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsparse.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsrepair.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nssearch.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsutils.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nswalk.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/osunixxf.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/utilities/uteval.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/utilities/utinit.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/utilities/utmutex.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/utilities/uttrack.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/acpica/utilities/utxface.c#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/contrib/libfdt/libfdt_env.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/crypto/via/padlock.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/crypto/via/padlock.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/crypto/via/padlock_cipher.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/crypto/via/padlock_hash.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_break.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_capture.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_command.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_command.h#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_examine.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_main.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_print.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_ps.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_run.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_script.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_sym.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_textdump.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_thread.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_variables.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_watch.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/db_write_cmd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ddb/ddb.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpi_support/acpi_aiboost.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpi_support/acpi_asus.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpi_support/acpi_fujitsu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpi_support/acpi_hp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpi_support/acpi_ibm.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpi_support/atk0110.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/Osd/OsdHardware.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/Osd/OsdMemory.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_button.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_cpu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_dock.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_ec.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_hpet.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_hpet.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_lid.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_pcib.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_pcib_acpi.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_pcib_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_pcibvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_thermal.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/acpica/acpi_video.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/agp/agp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/agp/agp_nvidia.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ahci/ahci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/aic7xxx/aic79xx.reg#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/aic7xxx/aic7xxx.reg#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/alc/if_alc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/alc/if_alcreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/alc/if_alcvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/amdsbwd/amdsbwd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/amr/amrvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/arcmsr/arcmsr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/arcmsr/arcmsr.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/ata-all.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/ata-all.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/ata-card.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/ata-disk.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/ata-lowlevel.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/ata-pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/atapi-cam.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-amd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-highpoint.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-intel.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-ite.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-jmicron.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-marvell.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-nvidia.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-promise.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-serverworks.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-sis.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ata/chipsets/ata-via.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ah.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ath/if_ath.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/atkbdc/atkbdc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/bce/if_bce.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/bce/if_bcereg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/bge/if_bge.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/bge/if_bgereg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/bktr/bktr_core.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/bwi/if_bwi.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/bwi/if_bwi_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/bwn/if_bwn.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cas/if_cas.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cfe/cfe_env.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cfi/cfi_bus_lbc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/coretemp/coretemp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cxgb/common/cxgb_common.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cxgb/cxgb_adapter.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cxgb/cxgb_main.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cxgb/cxgb_sge.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/drm/drm_pciids.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_82575.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_api.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_api.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_hw.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_mbx.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_mbx.h#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_osdep.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_regs.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_vf.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/e1000_vf.h#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/if_em.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/if_igb.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/if_igb.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/e1000/if_lem.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/et/if_et.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/et/if_etreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/et/if_etvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fb/fb.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fb/fbreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fb/vesa.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fdc/fdc_acpi.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fdt/fdt_arm.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fdt/fdt_common.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fdt/fdt_common.h#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fdt/fdt_pci.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fdt/fdt_static_dtb.S#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fdt/fdtbus.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/fdt/simplebus.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/flash/mx25l.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/flash/mx25lreg.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/gem/if_gem.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/hme/if_hme.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/hptiop/hptiop.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/hptmv/entry.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/hwpmc/hwpmc_core.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/hwpmc/hwpmc_core.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/hwpmc/hwpmc_mod.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ichwd/ichwd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iicbus/iic.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iicbus/iicbus.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ipmi/ipmi_smbios.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iscsi/initiator/isc_cam.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iscsi/initiator/isc_sm.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iscsi/initiator/isc_soc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iscsi/initiator/isc_subr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iscsi/initiator/iscsi.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iscsi/initiator/iscsi.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iscsi/initiator/iscsi_subr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iscsi/initiator/iscsivar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/isp/isp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/isp/isp_freebsd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/isp/isp_library.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/isp/isp_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iwn/if_iwn.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iwn/if_iwnreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/iwn/if_iwnvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ixgbe/ixgbe.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ixgbe/ixgbe.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/md/md.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mge/if_mge.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mge/if_mgevar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mii/atphy.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mii/e1000phy.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mii/miidevs#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mpt/mpt.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mpt/mpt.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mpt/mpt_cam.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mpt/mpt_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mpt/mpt_raid.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/mvs/mvs.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/null/null.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ofw/ofw_bus_subr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ofw/ofw_bus_subr.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ofw/ofw_if.m#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ofw/ofw_standard.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ofw/openfirm.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ofw/openfirm.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/pci/pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/pci/pci_user.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/pci/pcib_private.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/pci/pcireg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/pci/pcivar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/puc/pucdata.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/quicc/quicc_bfe_ocp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/random/nehemiah.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sec/sec.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sge/if_sge.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sge/if_sgereg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/siis/siis.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sk/if_sk.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sound/pci/hda/hdac.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sound/pcm/feeder_eq.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sound/pcm/feeder_rate.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sound/pcm/sound.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sound/usb/uaudio.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/sound/usb/uaudioreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/ste/if_ste.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/syscons/schistory.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/syscons/scterm-teken.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/syscons/scvgarndr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/syscons/syscons.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/tsec/if_tsec.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/tsec/if_tsec.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/tsec/if_tsec_ocp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_cl.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_cl_fwif.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_cl_init.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_cl_intr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_cl_io.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_cl_misc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_cl_share.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_osl.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_osl_cam.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_osl_externs.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_osl_freebsd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_osl_inline.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/twa/tw_osl_share.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/uart/uart_bus_fdt.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/uart/uart_bus_ocp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/uart/uart_cpu_powerpc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/controller/ehci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/controller/ehci_mv.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/controller/ohci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/controller/uhci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/controller/usb_controller.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/net/if_rue.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/net/uhso.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/quirk/usb_quirk.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/serial/u3g.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/serial/uftdi.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/serial/uipaq.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/serial/uplcom.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/serial/uslcom.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/usb_busdma.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/usb_debug.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/usb_dev.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/usb_device.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/usb_process.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/usb_transfer.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/usbdevs#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/wlan/if_rum.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/wlan/if_run.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/wlan/if_runvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/wlan/if_upgt.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/usb/wlan/if_ural.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/dev/xen/netfront/netfront.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/coda/coda.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/coda/coda_venus.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/coda/coda_vnops.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/devfs/devfs.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/devfs/devfs_devs.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/devfs/devfs_rule.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/devfs/devfs_vfsops.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/devfs/devfs_vnops.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfs/nfs_commonport.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_clbio.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_clcomsubs.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_cllock.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_clnfsiod.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_clport.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_clrpcops.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_clsubs.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_clvnops.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfs_lock.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsclient/nfsnode.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsserver/nfs_nfsdport.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsserver/nfs_nfsdsocket.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nfsserver/nfs_nfsdstate.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/nwfs/nwfs_io.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/procfs/procfs_type.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/smbfs/smbfs_io.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/tmpfs/tmpfs_vnops.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/udf/udf_vnops.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/fs/unionfs/union_subr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/cache/g_cache.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/gate/g_gate.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/geom_dev.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/geom_disk.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/geom_disk.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/geom_event.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/geom_io.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/label/g_label.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/mountver/g_mountver.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/part/g_part.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/part/g_part.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/part/g_part_bsd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/part/g_part_gpt.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/part/g_part_mbr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/geom/sched/g_sched.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/acpica/acpi_wakeup.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/acpica/madt.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/conf/GENERIC#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/conf/GENERIC.hints#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/conf/NOTES#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/apic_vector.s#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/atpic_vector.s#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/exception.s#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/genassym.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/identcpu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/initcpu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/intr_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/legacy.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/mp_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/mptable_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/pmap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/ptrace_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/support.s#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/swtch.s#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/trap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/tsc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/i386/vm_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/ibcs2/ibcs2_proto.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/ibcs2/ibcs2_syscall.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/ibcs2/ibcs2_sysent.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/apicreg.h#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/apicvar.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/clock.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/cpu.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/mca.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/md_var.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/npx.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/pcb.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/pcpu.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/pmap.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/segments.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/smp.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/specialreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/vm86.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/include/vmparam.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/isa/npx.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/linux/linux_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/linux/linux_ptrace.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/linux/linux_sysent.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/linux/linux_sysvec.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/pci/pci_bus.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/xen/mp_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/i386/xen/pmap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/acpica/acpi_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/conf/GENERIC#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia32/ia32_signal.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/autoconf.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/busdma_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/exception.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/mca.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/mp_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/pmap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/ia64/vm_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/asm.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/mca.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/md_var.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/param.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/pcpu.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/proc.h#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/profile.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/smp.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/ia64/include/vmparam.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/isa/rtc.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/isa/syscons_isa.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/bus_if.m#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/imgact_shell.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/init_main.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/init_sysent.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_acct.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_clock.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_conf.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_cons.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_context.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_cpu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_et.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_exec.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_exit.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_intr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_jail.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_ktr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_ktrace.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_malloc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_mbuf.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_mib.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_module.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_resource.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_sdt.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_sig.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_switch.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_sx.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_syscalls.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_tc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_thr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_thread.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_timeout.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/kern_umtx.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/link_elf_obj.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/makesyscalls.sh#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/posix4_mib.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/sched_4bsd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/sched_ule.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_acl_nfs4.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_acl_posix1e.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_autoconf.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_bus.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_devstat.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_fattime.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_kdb.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_lock.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_mchain.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_module.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_param.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_pcpu.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_prf.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_rtc.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_sleepqueue.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_smp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_taskqueue.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_trap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_unit.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/subr_witness.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/sys_generic.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/sys_process.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/sys_socket.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/syscalls.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/syscalls.master#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/systrace_args.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/sysv_sem.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/sysv_shm.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/tty.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/uipc_mbuf.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/uipc_mbuf2.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/uipc_mqueue.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/uipc_sem.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/uipc_shm.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/uipc_socket.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/uipc_syscalls.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/uipc_usrreq.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/vfs_acl.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/vfs_bio.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/vfs_cache.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/vfs_cluster.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/vfs_subr.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/vfs_syscalls.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/kern/vfs_vnops.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/libkern/memchr.c#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/atheros/ar71xx_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/atheros/ar71xx_wdog.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/atheros/ar71xxreg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/atheros/if_arge.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/atheros/if_argevar.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/cavium/files.octeon1#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/cavium/octeon_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/cavium/octeon_mp.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/cavium/std.octeon1#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/conf/AR71XX#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/conf/OCTEON1#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/conf/OCTEON1-32#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/conf/OCTEON1.hints#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/conf/XLR#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/conf/XLRN32#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/conf/YEELOONG#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/_bus.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/_stdint.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/asm.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/asmacros.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/bus.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/cache.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/cache_mipsNN.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/clock.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/cpu.h#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/cpufunc.h#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/cpuinfo.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/cpuregs.h#5 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/db_machdep.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/elf.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/endian.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/intr_machdep.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/md_var.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/param.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/pmap.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/profile.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/pte.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/reg.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/runq.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/setjmp.h#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/sf_buf.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/smp.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/vm.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/include/vmparam.h#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/bus_space_generic.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/busdma_machdep.c#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/cache.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/cache_mipsNN.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/cpu.c#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/db_interface.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/db_trace.c#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/elf64_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/elf_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/exception.S#5 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/fp.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/genassym.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/locore.S#5 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/mainbus.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/mp_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/mpboot.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/multiboot2.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/nexus.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/pm_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/pmap.c#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/psraccess.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/stack_machdep.c#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/support.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/swtch.S#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/tick.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/trap.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/uio_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/mips/vm_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/board.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/board.h#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/dev/xlr/rge.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/files.xlr#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/intr_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/iodi.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/on_chip.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/std.xlr#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/tick.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/xlr_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/rmi/xlr_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/sibyte/sb_machdep.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/sibyte/sb_scd.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/sibyte/sb_zbpci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/yeeloong/bonito_pci.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/yeeloong/files.yeeloong#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/yeeloong/std.yeeloong#2 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/yeeloong/uart_bus_yeeloongusart.c#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/mips/yeeloong/yeeloong_machdep.c#4 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/acpi/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/acpi/acpi/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/acpi/acpi_aiboost/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/acpi/aibs/Makefile#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/ata/atacore/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/cas/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/em/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/hwpmc/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/igb/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/iwnfw/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/iwnfw/Makefile.inc#3 integrate .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/iwnfw/iwn6000/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/mqueue/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/netgraph/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/netgraph/patch/Makefile#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/nfscl/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/nfsclient/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/opensolaris/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/siftr/Makefile#1 add .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/sound/driver/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/x86bios/Makefile#3 edit .. //depot/projects/soc2010/phcoder_yeeloong/src/sys/modules/zfs/Makefile#3 edit >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 17 20:36:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C48BD10656A7; Tue, 17 Aug 2010 20:36:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86A0B1065675 for ; Tue, 17 Aug 2010 20:36:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5A1F18FC23 for ; Tue, 17 Aug 2010 20:36:37 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HKabGG087363 for ; Tue, 17 Aug 2010 20:36:37 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HKabN8087360 for perforce@freebsd.org; Tue, 17 Aug 2010 20:36:37 GMT (envelope-from jhb@freebsd.org) Date: Tue, 17 Aug 2010 20:36:37 GMT Message-Id: <201008172036.o7HKabN8087360@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 20:36:38 -0000 http://p4web.freebsd.org/@@182540?ac=10 Change 182540 by jhb@jhb_jhbbsd on 2010/08/17 20:36:24 These are no longer needed. Affected files ... .. //depot/projects/smpng/sys/kern/kern_proc.c#114 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_proc.c#114 (text+ko) ==== @@ -64,10 +64,6 @@ #include #include #include -#ifdef KTRACE -#include -#include -#endif #ifdef DDB #include From owner-p4-projects@FreeBSD.ORG Tue Aug 17 21:30:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A7151065696; Tue, 17 Aug 2010 21:30:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F03BB1065679 for ; Tue, 17 Aug 2010 21:30:22 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8BD188FC13 for ; Tue, 17 Aug 2010 21:30:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HLUMji097994 for ; Tue, 17 Aug 2010 21:30:22 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HLUM6P097988 for perforce@freebsd.org; Tue, 17 Aug 2010 21:30:22 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 17 Aug 2010 21:30:22 GMT Message-Id: <201008172130.o7HLUM6P097988@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 21:30:23 -0000 http://p4web.freebsd.org/@@182542?ac=10 Change 182542 by rene@rene_acer on 2010/08/17 21:29:32 MFen the Dutch handbook: - bibliography 1.88 -> 1.89 - config 1.239 -> 1.241 (plus spelling fixes) - disks 1.294 -> 1.295 - firewalls 1.93 -> 1.94 - geom 1.48 -> 1.49 - install 1.394 -> 1.403 (plus style fixes) - introduction 1.137 -> 1.138 - mirrors 1.488 -> 1.489 - network-servers 1.123 -> 1.124 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml#11 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#17 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#17 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#21 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#13 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#14 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#25 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#54 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#33 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml#11 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.8 2010/06/19 19:50:00 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml - %SRCID% 1.88 + %SRCID% 1.89 Vertaald door: Siebrand Mazeland --> @@ -649,8 +649,8 @@ The UNIX-HATERS Handbook. IDG Books Worldwide, Inc., 1994. ISBN 1-56884-203-1. Het is niet meer te leveren, maar wel - online beschikbaar. + url="http://www.simson.net/ref/ugh.pdf">online + beschikbaar. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#17 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.20 2009/10/28 19:26:48 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/config/chapter.sgml - %SRCID% 1.239 + %SRCID% 1.241 --> @@ -933,7 +933,7 @@ Gebruik maken van &windows; - NDIS-stuurpgrogramma's + NDIS-stuurprogramma's NDIS @@ -2976,9 +2976,34 @@ nodige stuurprogramma's/hardware liggen om getest en bewerkt te worden. + Een veelvoorkomend probleem met suspend/resume is dat veel + apparaatstuurprogramma's hun firmware, registers of apparaatgeheugen + niet fatsoenlijk opslaan, herstellen, of herinitialiseren. Een + eerste poging om het probleem te vinden omvat: + + &prompt.root; sysctl debug.bootverbose=1 +&prompt.root; sysctl debug.acpi.suspend_bounce=1 +&prompt.root; acpiconf -s 3 + + Deze test emuleert de suspend/resume-cyclus van alle + apparaten zonder daadwerkelijk naar de toestand S3 + te gaan. In sommige gevallen kunt u zo eenvoudig problemen + vaststellen (bijvoorbeeld het verliezen van de firmware-toestand, + timeout van de apparaatwaakhond, en steeds opnieuw iets proberen). + Merk op dat het systeem niet werkelijk naar de toestand + S3 gaat, wat inhoudt dat apparaten geen spanning + verliezen waardoor velen prima zullen werken zelfs als de + suspend/resume-methoden geheel ontbreken, dit in tegenstelling tot de + echte toestand S3. + + Moeilijkere gevallen vereisen aanvullende hardware, dat is een + serieële poort/kabel voor de serieële console of een + Firewire poort/kabel voor &man.dcons.4;, en vaardigheden in het + debuggen van de kernel. + Om een probleem te kunnen isoleren helpt het om zoveel mogelijk stuurprogramma's uit de kernel te halen. Als dit - werkt, kan er teruggewerkt worden naar het stuurpgrogramma dat + werkt, kan er teruggewerkt worden naar het stuurprogramma dat schuldig is aan het falen. Meestal vertonen binaire stuurprogramma's als nvidia.ko, X11 beeldschermstuurprogramma's en USB de @@ -3002,7 +3027,7 @@ suspend/resume ondersteuning op dezelfde hardware uit te proberen. Als het werkt met &linux;, dan is het waarschijnlijk een &os; stuurprogrammaprobleem en als het - mogelijk is uit te vinden over welk stuurpgroramma het gaat, + mogelijk is uit te vinden over welk stuurprogramma het gaat, kan dat bijdragen aan het oplossen van het probleem. ACPI houdt zich in het algemeen niet bezig met andere stuurprogramma's zoals geluid, ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#17 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.16 2010/05/30 08:01:40 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml - %SRCID% 1.294 + %SRCID% 1.295 --> @@ -1370,6 +1370,15 @@ ATAPI-drives + + Met behulp van de ATAPI/CAM module kan + cdda2wav ook gebruikt worden voor ATAPI-drives. + Dit gereedschap is vaak een betere keuze voor de meeste gebruikers + (jitter-correctie, endianness-zaken, etc.) dan de methode die + hieronder wordt voorgesteld. + + Het ATAPI CD-stuurprogramma maakt elke track beschikbaar als ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#21 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.14 2010/07/20 18:13:41 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml - %SRCID% 1.93 + %SRCID% 1.94 --> @@ -994,7 +994,7 @@ Als het pakket een TCP pakket is, dan is er nog een veld dat begint met een verbindingsstreepje met daarachter letters die overeenkomen met vlaggen die - ingeschakeld waren. In &man.ipmon.8; is een lijst met + ingeschakeld waren. In &man.ipf.5; is een lijst met letters en bijbehorende vlaggen te vinden. Als het pakket een ICMP pakket is, dan worden aan het ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#13 (text+ko) ==== @@ -2,10 +2,9 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.11 2009/05/06 20:50:59 rene Exp $ - $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.13 2006/01/05 21:13:21 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/geom/chapter.sgml - %SRCID% 1.48 + %SRCID% 1.49 --> @@ -790,8 +789,8 @@ stappen, ervan uitgaande dat da4 de nieuwe beschikbare SCSI schijf is: - &prompt.root; gjournal label /dev/da4 -&prompt.root; gjournal load + &prompt.root; gjournal load +&prompt.root; gjournal label /dev/da4 Op dit moment zou er een ad4 apparaatknooppunt en een ad4.journal ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#14 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.15 2010/07/20 18:13:41 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml - %SRCID% 1.394 + %SRCID% 1.403 --> @@ -230,7 +230,7 @@ Probeer een computer te inventariseren voordat &os; wordt geïnstalleerd. De &os; installatieroutines geven een overzicht van alle componenten (harde schijven, netwerkkaarten, - cd-rom-spelers, enzovoort) met hun typenummer en fabrikant. + CD-ROM-spelers, enzovoort) met hun typenummer en fabrikant. &os; probeert ook de juiste instellingen te achterhalen, zoals IRQ en IO-poort gebruik. Vanwege de verscheidenheid aan PC-hardware verloopt dit niet altijd helemaal succesvol en @@ -287,7 +287,7 @@ - cd-rom + CD-ROM N/A @@ -439,16 +439,7 @@ &partitionmagic;, of gratis software zoals GPartEd, kunnen partities van grootte gewijzigd worden om ruimte te maken voor - &os;. De map tools op de CDROM bevat - twee freeware programma's die dit ook kunnen, - FIPS en - PResizer. Handleidingen hiervoor - staan in dezelfde map. FIPS, - PResizer en - &partitionmagic; kunnen - FAT16 en FAT32-partities - wijzigen als ze gebruikt worden in &ms-dos; tot &windows; ME. - Van zowel &partitionmagic; als + &os;. Van zowel &partitionmagic; als GPartEd is bekend dat ze met NTFS kunnen werken. GPartEd is beschikbaar op een @@ -551,7 +542,7 @@ Dit is een voorbeeld van een Digital Personal Workstation 433au en geeft aan dat er drie schijven verbonden zijn met de - computer. De eerste is een cd-rom station genaamd + computer. De eerste is een CD-ROM station genaamd DKA0 en de andere twee zijn harde schijven die achtereenvolgens DKC0 en DKC100 heten. @@ -564,7 +555,7 @@ schijf is met SCSI ID 3 op de derde SCSI bus (C). Apparaatnaam PKx is de SCSI host bus adapter. Zoals te zien in de uitvoer van SHOW - DEVICE worden SCSI cd-rom stations op dezelfde + DEVICE worden SCSI CD-ROM stations op dezelfde manier behandeld als SCSI harde schijven. IDE schijven hebben namen in het formaat @@ -680,6 +671,10 @@ + Een USB-geheugenstick + + + DOS-partitie op dezelfde computer @@ -731,19 +726,84 @@ besturingssysteem dat is geïnstalleerd op een harde schijf, maar hij kan ook ingesteld worden om op te starten van een bootable diskette. De meeste hedendaagse - computers kunnen ook opstarten van een cd-rom in het cd-rom - station. + computers kunnen ook opstarten van een CD-ROM in het CD-ROM + station of van een USB-schijf. - Als &os; op cd-rom of DVD beschikbaar is (gekocht of zelf - gebrand) en een computer kan opstarten van een cd-rom of DVD + Als &os; op CD-ROM of DVD beschikbaar is (gekocht of zelf + gebrand) en een computer kan opstarten van een CD-ROM of DVD (meestal een BIOS optie genaamd Boot Order of iets dergelijks), dan is het doorwerken van deze sectie niet - nodig. De &os; cd-rom en DVD images zijn bootable en kunnen + nodig. De &os; CD-ROM en DVD images zijn bootable en kunnen zonder verdere voorbereidingen gebruikt worden om &os; te installeren. + Om een opstartbare geheugenstick te maken kunnen deze stappen + gevolgd worden: + + + + Bemachtig een image voor de geheugenstick + + Het image voor de geheugenstick kan worden gedownload vanuit de + map ISO-IMAGES van + ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/arch/ISO-IMAGES/versie/&os;-&rel.current;-RELEASE-arch-memstick.img. + Vervang arch en + versie door de architectuur en de versie + die u wilt installeren. De geheugenstick-images voor + &os;/&arch.i386; &rel.current;-RELEASE zijn beschikbaar op + . + + Het image van de geheugenstick heeft een extensie + .img. De map + ISO-IMAGES bevat een aantal + verschillende images, en degene die u nodig heeft zal afhangen van + de &os;-versie die u installeert, en in sommige gevallen van de + hardware waarop u het installeert. + + + Maak voordat u verder gaat een backup + van de gegevens die nu op uw USB-stick staan, aangezien deze + procedure ze zal wissen. + + + + + Maak de geheugenstick klaar voor gebruik + + + Het onderstaande voorbeeld vermeldt + /dev/da0 als het + doelapparaat van waar af u zal opstarten. Zorg er voor dat u het + juiste apparaat als het uitvoerapparaat opgeeft om te voorkomen + dat u uw bestaande gegevens vernietigd. + + + Stel de sysctl kern.geom.debugflags in om + een master boot record naar het doelapparaat te kunnen + schrijven. + + &prompt.root; sysctl kern.geom.debugflags=16 + + + + + Schrijf het imagebestand naar de geheugenstick + + Het .img-bestand is + geen gewoon bestand dat u naar de geheugenstick + kopieert. Het is een afbeelding van de complete inhoud van de + stick. Dit betekent dat u de bestanden niet + op de gewone manier van de ene schijf naar de andere kopieëren. + U dient in plaats hiervan &man.dd.1; gebruiken om de afbeelding + direct naar de schijf te schrijven: + + &prompt.root; dd if=&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/da0 bs=64k + + + Om opstartdiskettes te maken kunnen de volgende stappen gevolgd worden: @@ -751,18 +811,25 @@ Bemachtig de images voor opstartdiskettes + + Merk op dat met ingang van &os; 8.0 floppy-images niet + langer beschikbaar zijn. Zie de bovenstaande instructies voor + hoe &os; met behulp van een USB-geheugenstick te installeren, of + gebruik een CD-ROM of DVD. + + De opstartschijven zijn beschikbaar op de installatiemedia in de map floppies/ en kunnen ook gedownload worden uit de map floppies, - ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<arch>/<versie>-RELEASE/floppies/. - Vervang <arch> en - <versie> + ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/arch/versie-RELEASE/floppies/. + Vervang arch en + versie door de architectuur en het versienummer dat geïnstalleerd moet worden. De images voor bootdiskettes voor bijvoorbeeld - &os;/&arch.i386; &rel.current;-RELEASE zijn + &os;/&arch.i386; &rel2.current;-RELEASE zijn beschikbaar op . + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/floppies/">. De diskette-images hebben de extensie .flp. De map @@ -829,8 +896,8 @@ &ms-dos;/&windows;, dan levert het &os; project de software fdimage. - Als de floppies van de cd-rom worden gebruikt en het - cd-rom station is E:, dan kan dit + Als de floppies van de CD-ROM worden gebruikt en het + CD-ROM station is E:, dan kan dit als volgt: E:\> tools\fdimage floppies\boot.flp A: @@ -841,7 +908,7 @@ naam van het bestand dat erop wordt gekopieerd. Pas de opdrachtregel steeds aan, afhankelijk van waar de .flp-bestanden staan. Als er geen - cd-rom beschikbaar is dan kan fdimage + CD-ROM beschikbaar is dan kan fdimage gedownload worden vanuit de map tools op @@ -924,7 +991,7 @@ eerste harde schijf, enzovoorts. Als het nodig was om diskettes aan te maken, stel dan - floppy disk in. Als wordt opstart van een cd-rom stel dat + floppy disk in. Als wordt opstart van een CD-ROM stel dat dan in. Raadpleeg in geval van twijfel de documentatie van de computer en/of het moederbord. @@ -941,7 +1008,7 @@ het diskettestation. Bij opstarten vanaf CD moet na het aanzetten van de - computer zo snel mogelijk de cd-rom ingestoken worden. + computer zo snel mogelijk de CD-ROM ingestoken worden. Als de computer opstart zoals altijd en met het @@ -970,7 +1037,7 @@ - &os; start nu op. Bij opstarten vanaf cd-rom is iets + &os; start nu op. Bij opstarten vanaf CD-ROM is iets als het volgende op het scherm te zien (versie-informatie weggelaten): @@ -1024,7 +1091,7 @@ - Of nu wordt opstart van diskette of cd-rom, de + Of nu wordt opstart van diskette of CD-ROM, de opstartprocedure komt op een gegeven moment bij het bootloader-menu van &os;: @@ -1071,10 +1138,10 @@ >>>BOOT DVA0 -FLAGS '' -FILE '' - Bij opstarten vanaf cd-rom: stop dan de cd-rom in het - cd-rom station en geef het volgende commando om de + Bij opstarten vanaf CD-ROM: stop dan de CD-ROM in het + CD-ROM station en geef het volgende commando om de installatie te starten (vervang daarbij de naam van het - cd-rom station als nodig): + CD-ROM station als nodig): >>>BOOT DKA0 -FLAGS '' -FILE '' @@ -1093,7 +1160,7 @@ - Of nu wordt opstart van diskette of cd-rom, de + Of nu wordt opstart van diskette of CD-ROM, de opstartprocedure komt op een gegeven moment op het volgende punt: @@ -1290,12 +1357,12 @@ User Confirmation Requested Are you sure you wish to exit? The system will reboot - (be sure to remove any floppies/CDs/DVDs from the drives). [ Yes ] No - Het installatieprogramma start opnieuw als de cd-rom nog in - het station zit en &gui.yes; gekozen wordt. + Het installatieprogramma start opnieuw als &gui.yes; gekozen wordt + en de CD-ROM in het station is gelaten tijdens het opnieuw + opstarten. Bij opstarten van diskettes is het nodig om de diskette met boot.flp uit de drive te halen voordat @@ -2096,7 +2163,7 @@ Message Now, you need to create BSD partitions inside of the fdisk partition(s) just created. If you have a reasonable amount of disk - space (200MB or more) and don't have any special requirements, simply + space (1GB or more) and don't have any special requirements, simply use the (A)uto command to allocate space automatically. If you have more specific needs or just don't care for the layout chosen by (A)uto, press F1 for more information on manual layout. @@ -2392,7 +2459,7 @@ Installatiemedia kiezen - Als wordt geïnstalleerd vanaf een cd-rom of DVD kies dan + Als wordt geïnstalleerd vanaf een CD-ROM of DVD kies dan met de pijltjestoetsen de optie Install from a &os; CD/DVD. Zorg ervoor dat &gui.ok; actief is en druk op Enter om verder te gaan. @@ -2751,7 +2818,7 @@ Enter. User Confirmation Requested - Would you like to Bring Up the ed0 interface right now? + Would you like to Bring the ed0 interface up right now? [ Yes ] No @@ -3735,8 +3802,8 @@ [ Yes ] No Selecteer &gui.yes; en verwijder de diskette als er van een - diskette is opgestart. Het cd-rom station is op slot tot de - machine begint met herstarten. Het cd-rom station wordt dan + diskette is opgestart. Het CD-ROM station is op slot tot de + machine begint met herstarten. Het CD-ROM station wordt dan vrijgegeven en de CD kan dan (snel) verwijderd worden. Het systeem start op, dus let op eventuele foutberichten @@ -4707,7 +4774,7 @@ Om herhaling te voorkomen: &os;-schijf - betekent in deze context een &os; cd-rom of DVD die gekocht is + betekent in deze context een &os; CD-ROM of DVD die gekocht is of zelf is gemaakt. @@ -4752,7 +4819,7 @@ - Installatie cd-rom maken + Installatie CD-ROM maken Als onderdeel van elke versie stelt het &os; project tenminste twee CDROM images beschikbaar (ISO @@ -4778,8 +4845,8 @@ images: - FreeBSD 6.<replaceable>X</replaceable> en - 7.<replaceable>X</replaceable> ISO imagenamen en + <title>&os; 7.<replaceable>X</replaceable> en + 8.<replaceable>X</replaceable> ISO image-namen en verklaring @@ -4787,59 +4854,107 @@ Bestandsnaam - Bevat + Inhoud - versie-RELEASE-arch-bootonly.iso + &os;-versie-RELEASE-arch-bootonly.iso + + Met dit CD-image kunt u het installatieproces starten + door vanaf een CD-ROM-drive op te starten maar het bevat + geen ondersteuning om &os; van de CD zelf te installeren. + U dient hiervoor een installatie vanaf het netwerk ( + bijvoorbeeld een FTP-server) uit te voeren nadat u van deze + CD heeft opgestart. + + + + &os;-versie-RELEASE-arch-disc1.iso.gz + + Dit DVD-image bevat alles wat u nodig heeft om het + basisgedeelte van &os; te installeren, een verzameling van + vooraf gebouwde pakketten, en de documentatie. Het + ondersteunt ook het opstarten in een livefs + gebaseerde reddingsmodus. + + + + &os;-versie-RELEASE-arch-memstick.img + + Dit image kan naar een USB-geheugenstick worden + geschreven en gebruikt worden om een installatie uit te + voeren op machines die vanaf USB-drives kunnen opstarten. + Het ondersteunt ook het opstarten in een + livefs gebaseerde reddingsmodus. De + documentatiepakketten worden geleverd, echter geen andere + pakketten. Dit image is niet beschikbaar voor &os; 7.3 + en eerder. + + + + &os;-versie-RELEASE-arch-disc1.iso - Alles wat nodig is om in een &os; kernel te - starten en in het installatieprogramma te komen. De - installatiebestanden dienen van FTP of een andere - ondersteunde bron te komen. + Dit CD-image bevat het basisgedeelte van &os; en de + documentatiepakketten maar geen andere pakketten. - versie-RELEASE-arch-disc1.iso + &os;-versie-RELEASE-arch-disc2.iso - Alles wat nodig is om &os; te installeren en - een live bestandssyteem dat gebruikt - wordt in samenwerking met de optie - Repair in - sysinstall. + Een CD-image met zoveel mogelijk pakketten van derde + partijen als er op de schijf passen. Dit image is niet + beschikbaar voor &os; 8.0 en hoger. - versie-RELEASE-arch-disc2.iso + &os;-versie-RELEASE-arch-disc3.iso - Zoveel programma's van derde partijen als op de - schijf passen. + Nog een CD-image met zoveel mogelijk pakketten van + derde partijen als op de schijf passen. Dit image is niet + beschikbaar voor &os; 8.0 en hoger. versie-RELEASE-arch-docs.iso - &os; documentatie. + De &os; documentatie. + + + + &os;-versie-RELEASE-arch-livefs.iso + + Dit CD-image bevat ondersteuning om in een + livefs gebaseerde reddingsmodus op te starten + maar het ondersteunt niet het installeren van de CD + zelf.
- Of het bootonly ISO image of het disc one image - moet gedownload worden. Download niet - beiden, want disc one bevat alles wat ook op het bootonly - ISO image staat. + + Uitgaven van &os; 7.X voor &os; 7.3 en uitgaven van + &os; 8.X voor &os; 8.1 gebruikten een andere + naamconventie. Voor de namen van hun ISO-images staat geen + &os;-. + + + U moet òof het + bootonly image downloaden (indien beschikbaar), + òf het image van disc1. Download ze niet + allebei, aangezien het image disc1 alles bevat + wat het bootonly image bevat. - Gebruik de bootonly ISO als toegang tot Internet - goedkoop is. Hiermee kan &os; geïnstalleerd worden, + Gebruik de bootonly ISO als toegang tot + Internet goedkoop is. Hiermee kan &os; geïnstalleerd worden, waarna pakketten van derde partijen gedownload en geïnstalleerd kunnen worden via het ports/packages systeem (zie ). - Gebruik het disc one image om een uitgave van &os; te - installeren en een redelijke hoeveelheid pakketten op de + Gebruik het disc1 image om een uitgave van + &os; te installeren en een redelijke hoeveelheid pakketten op de schijf te installeren. De additionele disc images zijn nuttig, maar niet @@ -4891,7 +5006,7 @@ Op de &os; computer die de FTP site bevat moet de - cd-rom in het cd-rom station zitten en aangekoppeld zijn op + CD-ROM in het CD-ROM station zitten en aangekoppeld zijn op /cdrom. &prompt.root; mount /cdrom @@ -5025,9 +5140,9 @@ in een map genaamd freebsd in de hoofdmap van de partitie gezet worden, bijvoorbeeld c:\freebsd. De mappenstructuur van de - cd-rom of FTP site moet gedeeltelijk worden gereproduceerd in + CD-ROM of FTP site moet gedeeltelijk worden gereproduceerd in deze map, dus we raden aan het DOS commando - xcopy te gebruiken als de bron een cd-rom + xcopy te gebruiken als de bron een CD-ROM is. Om bijvoorbeeld een minimale installatie van &os; voor te bereiden: @@ -5037,9 +5152,9 @@ Hierbij wordt aangenomen dat C: de schijf is met voldoende vrije ruimte en dat - E: het cd-rom station is. + E: het CD-ROM station is. - Als er geen cd-rom station is, dan kan de distributie + Als er geen CD-ROM station is, dan kan de distributie gedownload worden van ftp.FreeBSD.org. Elke distributie heeft zijn eigen map. De @@ -5065,7 +5180,7 @@ Het installeren vanaf een tape is waarschijnlijk de gemakkelijkste manier, sneller dan een online FTP installatie - of een cd-rom installatie. Het installatieprogramma verwacht + of een CD-ROM installatie. Het installatieprogramma verwacht dat de bestanden eenvoudigweg getarred zijn op een tape. Na het ophalen van alle benodigde distributiebestanden moeten ze op een tape getarred worden: ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#25 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.19 2009/12/05 20:33:10 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.137 + %SRCID% 1.138 --> @@ -797,7 +797,9 @@ De RELENG_8 tak is gemaakt in augustus 2009. De eerste uitgave van de 8.X tak is 8.0-RELEASE, vrijgegeven in - &rel.current.date;. + november 2009. De meest recente uitgave &rel.current;-RELEASE kwam uit + in &rel.current.date;. Er zullen nog andere uitgaven van de + RELENG_8 tak uitkomen. Op dit moment vinden lange-termijn ontwikkelprojecten plaats in de 9.X-CURRENT tak, en snapshot uitgaven van 9.X op ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#54 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.488 + %SRCID% 1.489 --> @@ -2884,6 +2884,14 @@ + RELENG_8_1_0_RELEASE + + + &os; 8.1 + + + + RELENG_8_0_0_RELEASE ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#33 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.26 2010/07/04 18:35:22 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml - %SRCID% 1.123 + %SRCID% 1.124 --> @@ -1849,15 +1849,15 @@ 20 * * * * root /usr/libexec/ypxfr passwd.byname 21 * * * * root /usr/libexec/ypxfr passwd.byuid - Met de bovenstaande twee regels wordt de slave - gedwongen zijn afbeeldingen met de afbeeldingen op de - masterserver te synchroniseren. Hoewel dit niet verplicht - is, omdat de masterserver probeert veranderingen aan de - NIS-afbeeldingen door te geven aan zijn slaves, is het wel - verstandig om een slave tot bijwerken te dwingen, omdat - wachtwoordinformatie van vitaal belang is voor systemen die - van de server afhankelijk zijn. Dit is des te belangrijker - op drukke netwerken, omdat daar het bijwerken van + Met de bovenstaande twee regels wordt de slave gedwongen zijn + afbeeldingen met de afbeeldingen op de masterserver te + synchroniseren. Dit is niet verplicht omdat de masterserver + automatisch probeert veranderingen aan de NIS-afbeeldingen door te + geven aan zijn slaves. Echter, vanwege het belang van correcte + wachtwoordinformatie op andere cliënten die van de slaveserver + afhankelijk zijn, is het aanbevolen om specifiek de + wachtwoordafbeeldingen vaak tot bijwerken te dwingen. Dit is des + te belangrijker op drukke netwerken, omdat daar het bijwerken van afbeeldingen niet altijd compleet afgehandeld hoeft te worden. From owner-p4-projects@FreeBSD.ORG Tue Aug 17 22:12:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F8441065695; Tue, 17 Aug 2010 22:12:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1175A10656A9 for ; Tue, 17 Aug 2010 22:12:08 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F2F508FC13 for ; Tue, 17 Aug 2010 22:12:07 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7HMC7jF007422 for ; Tue, 17 Aug 2010 22:12:07 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7HMC7QZ007419 for perforce@freebsd.org; Tue, 17 Aug 2010 22:12:07 GMT (envelope-from kibab@FreeBSD.org) Date: Tue, 17 Aug 2010 22:12:07 GMT Message-Id: <201008172212.o7HMC7QZ007419@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2010 22:12:08 -0000 http://p4web.freebsd.org/@@182548?ac=10 Change 182548 by kibab@kibab_kibab-nb on 2010/08/17 22:11:26 Fix compilation, stage 1. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cam/cam.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_lockstat.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ntptime.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/ksched.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_cow.c#4 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/libalias/alias.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netncp/ncp_ncp.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/security/mac/mac_syscalls.c#3 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/cam/cam.c#2 (text+ko) ==== @@ -49,6 +49,8 @@ #include #include #include + +FEATURE(scbus, "SCSI devices support"); #endif static int camstatusentrycomp(const void *key, const void *member); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_lockstat.c#3 (text+ko) ==== @@ -39,8 +39,9 @@ #include #include #include +#include #include - +#include FEATURE(kdtrace_hooks, "Kernel DTRACE hooks"); /* * The following must match the type definition of dtrace_probe. It is ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ntptime.c#2 (text+ko) ==== @@ -51,6 +51,10 @@ #include #include +#ifdef PPS_SYNC +FEATURE(pps_sync, "Support usage of external PPS signal by kernel PLL"); +#endif + /* * Single-precision macros for 64-bit machines */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/ksched.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include -FEATURE(_kposix_priority_scheduling, "POSIX P1003.1B realtime extensions"); +//FEATURE(kposix_priority_scheduling, "POSIX P1003.1B realtime extensions"); /* ksched: Real-time extension to support POSIX priority scheduling. */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_cow.c#4 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include +#include #include #include #include ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/libalias/alias.c#3 (text+ko) ==== @@ -116,6 +116,7 @@ #include #include #include +#include FEATURE(libalias, "libalias library"); #else #include ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netncp/ncp_ncp.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/security/mac/mac_syscalls.c#3 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Aug 18 07:26:53 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A741210656C8; Wed, 18 Aug 2010 07:26:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 605C010656C3 for ; Wed, 18 Aug 2010 07:26:53 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3BC758FC1E for ; Wed, 18 Aug 2010 07:26:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7I7QqSP021826 for ; Wed, 18 Aug 2010 07:26:52 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7I7QqiO021823 for perforce@freebsd.org; Wed, 18 Aug 2010 07:26:52 GMT (envelope-from kibab@FreeBSD.org) Date: Wed, 18 Aug 2010 07:26:52 GMT Message-Id: <201008180726.o7I7QqiO021823@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2010 07:26:53 -0000 http://p4web.freebsd.org/@@182552?ac=10 Change 182552 by kibab@kibab_kibab-nb on 2010/08/18 07:26:39 - PAE feature. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_malloc.c#4 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/ksched.c#4 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_malloc.c#4 (text+ko) ==== @@ -93,6 +93,10 @@ dtrace_malloc_probe_func_t dtrace_malloc_probe; #endif +#ifdef PAE +FEATURE(pae, "Physical Address Extensions support"); +#endif + /* * When realloc() is called, if the new size is sufficiently smaller than * the old size, realloc() will allocate a new, smaller block to avoid ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/ksched.c#4 (text+ko) ==== @@ -42,13 +42,14 @@ #include #include #include +#include #include #include #include #include #include -//FEATURE(kposix_priority_scheduling, "POSIX P1003.1B realtime extensions"); +FEATURE(kposix_priority_scheduling, "POSIX P1003.1B realtime extensions"); /* ksched: Real-time extension to support POSIX priority scheduling. */ From owner-p4-projects@FreeBSD.ORG Wed Aug 18 10:48:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BCC91065693; Wed, 18 Aug 2010 10:48:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E29DE106567A for ; Wed, 18 Aug 2010 10:48:49 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D07DD8FC13 for ; Wed, 18 Aug 2010 10:48:49 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7IAmnNG065709 for ; Wed, 18 Aug 2010 10:48:49 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7IAmndY065706 for perforce@freebsd.org; Wed, 18 Aug 2010 10:48:49 GMT (envelope-from lz@FreeBSD.org) Date: Wed, 18 Aug 2010 10:48:49 GMT Message-Id: <201008181048.o7IAmndY065706@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2010 10:48:50 -0000 http://p4web.freebsd.org/@@182558?ac=10 Change 182558 by lz@gnehzuil-freebsd on 2010/08/18 10:48:17 clean code to generate a patch for submitting it. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#26 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#6 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#12 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#7 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2fs.h#4 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/inode.h#5 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#26 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include -/* Just for clear */ #define phy_blk(cg, fs) (((cg) * (fs->e2fs->e2fs_fpg)) + fs->e2fs->e2fs_first_dblock) static daddr_t ext2_alloccg(struct inode *, int, daddr_t, int); @@ -122,7 +121,7 @@ if (bpref < 0) bpref = 0; - /* Check whther it use reservation window */ + /* Check whether it use reservation window */ if (rp != NULL) { /* * If window's start is not in this cylinder group, @@ -247,7 +246,7 @@ static void ext2_remove_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp) { - RB_REMOVE(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp); + RB_REMOVE(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; rp->rsv_alloc_hit = 0; @@ -314,7 +313,7 @@ rp->rsv_end = start + size - 1; rp->rsv_alloc_hit = 0; - RB_INSERT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp); + RB_INSERT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); return (0); } @@ -336,7 +335,7 @@ return (-1); prev = rsv; - rsv = RB_NEXT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rsv); + rsv = RB_NEXT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rsv); if (rsv == NULL) break; @@ -353,7 +352,7 @@ rp->rsv_alloc_hit = 0; if (prev != rp) - RB_INSERT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp); + RB_INSERT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); return (0); } @@ -419,7 +418,7 @@ EXT2_TREE_LOCK(fs); - search = ext2_search_rsv(&fs->e2fs_rsv_tree, start); + search = ext2_search_rsv(fs->e2fs_rsv_tree, start); repeat: ret = ext2_find_rsv(search, rp, fs, start, cg); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#6 (text+ko) ==== @@ -79,6 +79,9 @@ fs = ip->i_e2fs; ump = ip->i_ump; + if (ip->i_rsv == NULL) + ext2_init_rsv(ip); + /* * check if this is a sequential block allocation. * If so, increment next_alloc fields to allow ext2_blkpref @@ -137,11 +140,6 @@ else nsize = fs->e2fs_bsize; EXT2_LOCK(ump); -/* - error = ext2_alloc(ip, lbn, - ext2_blkpref(ip, lbn, (int)lbn, &ip->i_db[0], 0), - nsize, cred, &newb); -*/ error = ext2_alloc_rsv(ip, lbn, ext2_blkpref(ip, lbn, (int)lbn, &ip->i_db[0], 0), nsize, cred, &newb); @@ -176,11 +174,6 @@ EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[0].in_off + EXT2_NDIR_BLOCKS, &ip->i_db[0], 0); -/* - if ((error = ext2_alloc(ip, lbn, pref, - (int)fs->e2fs_bsize, cred, &newb))) - return (error); -*/ if ((error = ext2_alloc_rsv(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb))) return (error); @@ -222,9 +215,6 @@ if (pref == 0) pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap, bp->b_lblkno); -/* - error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); -*/ error = ext2_alloc_rsv(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); if (error) { brelse(bp); @@ -264,13 +254,6 @@ EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[i].in_off, &bap[0], bp->b_lblkno); -/* - if ((error = ext2_alloc(ip, - lbn, pref, (int)fs->e2fs_bsize, cred, &newb)) != 0) { - brelse(bp); - return (error); - } -*/ if ((error = ext2_alloc_rsv(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb)) != 0) { brelse(bp); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#12 (text+ko) ==== @@ -31,8 +31,8 @@ #include #define EXT2_RSV_DEFAULT_RESERVE_BLKS 8 -#define EXT2_RSV_MAX_RESERVE_BLKS 1024 -#define EXT2_RSV_NOT_ALLOCATED 0 +#define EXT2_RSV_MAX_RESERVE_BLKS 1024 +#define EXT2_RSV_NOT_ALLOCATED 0 #define EXT2_RSV_LOCK(ip) mtx_lock(&ip->i_rsv_lock) #define EXT2_RSV_UNLOCK(ip) mtx_unlock(&ip->i_rsv_lock) @@ -60,19 +60,19 @@ const struct ext2_rsv_win *b) { if (a->rsv_start < b->rsv_start) - return -1; + return (-1); if (a->rsv_start == b->rsv_start) - return 0; + return (0); - return 1; + return (1); } RB_PROTOTYPE(ext2_rsv_win_tree, ext2_rsv_win, rsv_link, ext2_rsv_win_cmp); +/* predefine */ struct inode; /* ext2_alloc.c */ void ext2_init_rsv(struct inode *ip); void ext2_discard_rsv(struct inode *ip); -int ext2_alloc_rsv(struct inode *, int32_t, int32_t, - int, struct ucred *, int32_t *); +int ext2_alloc_rsv(struct inode *, int32_t, int32_t, int, struct ucred *, int32_t *); #endif /* !_FS_EXT2FS_EXT2_RSV_WIN_H_ */ ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/*- +/* * modified for EXT2FS support in Lites 1.1 * * Aug 1995, Godmar Back (gback@cs.utah.edu) @@ -61,6 +61,7 @@ #include #include #include +#include static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td); static int ext2_mountfs(struct vnode *, struct mount *); @@ -585,7 +586,9 @@ bzero(&ump->um_e2fs->e2fs_rsv_lock, sizeof(struct mtx)); mtx_init(&ump->um_e2fs->e2fs_rsv_lock, "rsv tree lock", NULL, MTX_DEF); - RB_INIT(&ump->um_e2fs->e2fs_rsv_tree); + ump->um_e2fs->e2fs_rsv_tree = malloc(sizeof(struct ext2_rsv_win_tree), + M_EXT2MNT, M_WAITOK | M_ZERO); + RB_INIT(ump->um_e2fs->e2fs_rsv_tree); brelse(bp); bp = NULL; @@ -686,6 +689,7 @@ g_topology_unlock(); PICKUP_GIANT(); vrele(ump->um_devvp); + free(fs->e2fs_rsv_tree, M_EXT2MNT); mtx_destroy(&fs->e2fs_rsv_lock); free(fs->e2fs_gd, M_EXT2MNT); free(fs->e2fs_contigdirs, M_EXT2MNT); @@ -928,11 +932,7 @@ bzero(&ip->i_rsv_lock, sizeof(struct mtx)); mtx_init(&ip->i_rsv_lock, "inode rsv lock", NULL, MTX_DEF); - EXT2_RSV_LOCK(ip); ip->i_rsv = NULL; - if (ip->i_rsv == NULL) - ext2_init_rsv(ip); - EXT2_RSV_UNLOCK(ip); /* * Now we want to make sure that block pointers for unused ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2fs.h#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include /* * Special inode numbers @@ -177,8 +176,8 @@ off_t e2fs_maxfilesize; struct ext2_gd *e2fs_gd; /* Group Descriptors */ - struct mtx e2fs_rsv_lock; /* Protect reservation window RB tree */ - struct ext2_rsv_win_tree e2fs_rsv_tree; /* Reservation window index */ + struct mtx e2fs_rsv_lock; /* Protect reservation window RB tree */ + struct ext2_rsv_win_tree *e2fs_rsv_tree; /* Reservation window index */ }; /* ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/inode.h#5 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include -#include #define ROOTINO ((ino_t)2) @@ -102,6 +101,7 @@ u_int32_t i_uid; /* File owner. */ u_int32_t i_gid; /* File group. */ + /* Fields for reservation window */ struct mtx i_rsv_lock; /* Protects i_rsv */ struct ext2_rsv_win *i_rsv; /* Reservation window */ }; From owner-p4-projects@FreeBSD.ORG Wed Aug 18 14:04:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F00D7106567A; Wed, 18 Aug 2010 14:04:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0AB71065675 for ; Wed, 18 Aug 2010 14:04:06 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9D6CF8FC26 for ; Wed, 18 Aug 2010 14:04:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7IE46M2006942 for ; Wed, 18 Aug 2010 14:04:06 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7IE45oF006939 for perforce@freebsd.org; Wed, 18 Aug 2010 14:04:05 GMT (envelope-from jhb@freebsd.org) Date: Wed, 18 Aug 2010 14:04:05 GMT Message-Id: <201008181404.o7IE45oF006939@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2010 14:04:07 -0000 http://p4web.freebsd.org/@@182561?ac=10 Change 182561 by jhb@jhb_jhbbsd on 2010/08/18 14:03:49 IFC @182560 Affected files ... .. //depot/projects/smpng/share/man/man9/DEVICE_PROBE.9#4 integrate .. //depot/projects/smpng/share/man/man9/Makefile#17 integrate .. //depot/projects/smpng/share/man/man9/VOP_LISTEXTATTR.9#3 integrate .. //depot/projects/smpng/share/man/man9/VOP_VPTOCNP.9#4 integrate .. //depot/projects/smpng/share/man/man9/crypto.9#2 integrate .. //depot/projects/smpng/share/man/man9/g_geom.9#2 integrate .. //depot/projects/smpng/share/man/man9/g_wither_geom.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211.9#6 integrate .. //depot/projects/smpng/share/man/man9/kproc.9#4 integrate .. //depot/projects/smpng/share/man/man9/netisr.9#6 integrate .. //depot/projects/smpng/share/man/man9/runqueue.9#2 integrate .. //depot/projects/smpng/share/man/man9/vm_page_bits.9#3 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#70 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#111 integrate .. //depot/projects/smpng/sys/amd64/include/elf.h#10 integrate .. //depot/projects/smpng/sys/arm/include/elf.h#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#93 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#71 integrate .. //depot/projects/smpng/sys/conf/kern.mk#28 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#69 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#79 integrate .. //depot/projects/smpng/sys/conf/options.mips#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#124 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#38 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcibvar.h#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#76 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#17 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212.h#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#12 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9160.ini#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#90 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#20 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#9 integrate .. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#16 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#17 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#35 integrate .. //depot/projects/smpng/sys/dev/flash/mx25l.c#3 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#17 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#120 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#42 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#26 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_if.m#9 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#20 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#17 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#16 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#24 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#36 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#88 integrate .. //depot/projects/smpng/sys/i386/acpica/Makefile#9 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#131 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#150 integrate .. //depot/projects/smpng/sys/i386/include/elf.h#12 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#17 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#132 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#75 integrate .. //depot/projects/smpng/sys/kern/subr_autoconf.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#92 integrate .. //depot/projects/smpng/sys/kern/subr_rtc.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#133 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#181 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_cpudef.h#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar71xxreg.h#4 integrate .. //depot/projects/smpng/sys/mips/atheros/ar724xreg.h#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar91xxreg.h#1 branch .. //depot/projects/smpng/sys/mips/conf/XLR#3 integrate .. //depot/projects/smpng/sys/mips/conf/XLR64#2 integrate .. //depot/projects/smpng/sys/mips/conf/XLRN32#3 integrate .. //depot/projects/smpng/sys/mips/include/bus.h#5 integrate .. //depot/projects/smpng/sys/mips/include/cpuregs.h#7 integrate .. //depot/projects/smpng/sys/mips/include/elf.h#6 integrate .. //depot/projects/smpng/sys/mips/include/intr_machdep.h#3 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#15 integrate .. //depot/projects/smpng/sys/mips/include/vmparam.h#7 integrate .. //depot/projects/smpng/sys/mips/mips/exception.S#8 integrate .. //depot/projects/smpng/sys/mips/mips/locore.S#7 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#14 integrate .. //depot/projects/smpng/sys/mips/mips/mpboot.S#5 integrate .. //depot/projects/smpng/sys/mips/mips/pm_machdep.c#9 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#24 integrate .. //depot/projects/smpng/sys/mips/mips/trap.c#10 integrate .. //depot/projects/smpng/sys/mips/mips/vm_machdep.c#10 integrate .. //depot/projects/smpng/sys/mips/rmi/std.xlr#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#176 integrate .. //depot/projects/smpng/sys/modules/em/Makefile#15 integrate .. //depot/projects/smpng/sys/modules/igb/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/ixgbe/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/sem/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/tpm/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if.c#136 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#108 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#52 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#55 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#47 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#75 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#57 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#93 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#67 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#123 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#79 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#100 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#67 integrate .. //depot/projects/smpng/sys/powerpc/include/elf.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/elf.h#16 integrate .. //depot/projects/smpng/sys/sun4v/include/elf.h#6 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#43 integrate .. //depot/projects/smpng/sys/sys/imgact.h#21 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#81 integrate .. //depot/projects/smpng/sys/vm/memguard.c#7 integrate .. //depot/projects/smpng/sys/vm/memguard.h#6 integrate .. //depot/projects/smpng/sys/vm/uma.h#26 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#81 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/DEVICE_PROBE.9#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.24 2010/07/31 10:01:15 joel Exp $ +.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.25 2010/08/16 15:18:30 joel Exp $ .\" .Dd March 3, 2008 .Dt DEVICE_PROBE 9 @@ -91,7 +91,7 @@ .Bl -tag -width BUS_PROBE_NOWILDCARD .It BUS_PROBE_SPECIFIC The device that cannot be reprobed, and that no -possible other driver may exist (typically legacy drivers who don't fallow +possible other driver may exist (typically legacy drivers who don't follow all the rules, or special needs drivers). .It BUS_PROBE_VENDOR The device is supported by a vendor driver. ==== //depot/projects/smpng/share/man/man9/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.370 2010/08/06 16:50:48 stefanf Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.371 2010/08/15 21:25:52 brueffer Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -994,7 +994,7 @@ rtalloc.9 rtalloc_ign.9 \ rtalloc.9 RTFREE.9 \ rtalloc.9 rtfree.9 -MLINKS+=runqueue.9 chooseproc.9 \ +MLINKS+=runqueue.9 choosethread.9 \ runqueue.9 procrunnable.9 \ runqueue.9 remrunqueue.9 \ runqueue.9 setrunqueue.9 ==== //depot/projects/smpng/share/man/man9/VOP_LISTEXTATTR.9#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_LISTEXTATTR.9,v 1.8 2010/04/14 19:08:06 uqs Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LISTEXTATTR.9,v 1.9 2010/08/16 15:18:30 joel Exp $ .\" .Dd August 19, 2005 .Dt VOP_LISTEXTATTR 9 @@ -78,7 +78,7 @@ .Dv NULL when .Fa size -is not, and vise versa. +is not, and vice versa. .It Fa cred The user credentials to use in authorizing the request. .It Fa td ==== //depot/projects/smpng/share/man/man9/VOP_VPTOCNP.9#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.5 2010/07/31 12:14:28 joel Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.6 2010/08/16 15:18:30 joel Exp $ .\" .Dd December 7, 2008 .Dt VOP_VPTOCNP 9 @@ -42,7 +42,7 @@ .Sh DESCRIPTION This translates a vnode into its component name, and writes that name to the head of the buffer specified by -.Fa buf +.Fa buf . .Bl -tag -width buflen .It Fa vp The vnode to translate. ==== //depot/projects/smpng/share/man/man9/crypto.9#2 (text+ko) ==== @@ -15,7 +15,7 @@ .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR .\" PURPOSE. .\" -.\" $FreeBSD: src/share/man/man9/crypto.9,v 1.14 2007/09/19 16:28:46 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/crypto.9,v 1.15 2010/08/15 21:37:30 brueffer Exp $ .\" .Dd September 19, 2007 .Dt CRYPTO 9 @@ -143,7 +143,7 @@ The same holds for the framework. Thus, a callback mechanism is used to notify a consumer that a request has been completed (the -callback is specified by the consumer on an per-request basis). +callback is specified by the consumer on a per-request basis). The callback is invoked by the framework whether the request was successfully completed or not. An error indication is provided in the latter case. ==== //depot/projects/smpng/share/man/man9/g_geom.9#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/g_geom.9,v 1.7 2004/07/06 08:21:12 ru Exp $ +.\" $FreeBSD: src/share/man/man9/g_geom.9,v 1.8 2010/08/16 15:18:30 joel Exp $ .\" .Dd January 16, 2004 .Dt G_GEOM 9 @@ -109,9 +109,9 @@ .Fn g_destroy_geom : .Bl -item -offset indent .It -The geom cannot posses any providers. +The geom cannot possess any providers. .It -The geom cannot posses any consumers. +The geom cannot possess any consumers. .It The topology lock has to be held. .El ==== //depot/projects/smpng/share/man/man9/g_wither_geom.9#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/g_wither_geom.9,v 1.5 2004/07/06 08:21:12 ru Exp $ +.\" $FreeBSD: src/share/man/man9/g_wither_geom.9,v 1.6 2010/08/16 15:18:30 joel Exp $ .\" .Dd January 16, 2004 .Dt G_WITHER_GEOM 9 @@ -54,7 +54,7 @@ to avoid duplicated code in all classes. Before it is called, field .Va softc -should be disposed off and set to +should be disposed of and set to .Dv NULL . Note that the .Fn g_wither_geom ==== //depot/projects/smpng/share/man/man9/ieee80211.9#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.8 2010/04/28 13:29:48 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.9 2010/08/16 15:18:30 joel Exp $ .\" .Dd April 28, 2010 .Dt IEEE80211 9 @@ -205,11 +205,11 @@ Transmit a raw 802.11 frame. The default method drops the frame and generates a message on the console. .It Dv ic_updateslot -Update hardware state after an 802.11 IFS slot time change, +Update hardware state after an 802.11 IFS slot time change. There is no default method; the pointer may be NULL in which case it will not be used. .It Dv ic_update_mcast -Update hardware for a change in the multicast packet filter, +Update hardware for a change in the multicast packet filter. The default method prints a console message. .It Dv ic_update_promisc Update hardware for a change in the promiscuous mode setting. @@ -261,13 +261,13 @@ and pending frames in the receive reorder queues (for stations using A-MPDU). .It Dv ic_node_drain Reclaim all optional resources associated with a node. -This call is used to free up resources when they are in short supply, +This call is used to free up resources when they are in short supply. .It Dv ic_node_getrssi Return the Receive Signal Strength Indication (RSSI) in .5 dBm units for the specified node. This interface returns a subset of the information returned by -.Dv ic_node_getsignal , +.Dv ic_node_getsignal . The default method calculates a filtered average over the last ten samples passed in to .Xr ieee80211_input 9 @@ -341,7 +341,7 @@ for handling transmit A-MPDU. .It Dv ic_addb_response Process a received ADDBA Response Action frame and setup resources as -needed for doing transmit A-MPDU, +needed for doing transmit A-MPDU. .It Dv ic_addb_stop Shutdown an A-MPDU transmit stream for the specified station and AC. The default method reclaims local state after sending a DelBA Action frame. @@ -490,7 +490,7 @@ The follow general 802.11n capabilities are defined. The first capabilities are defined exactly as they appear in the 802.11n specification. -Capabilities beginning with IEEE80211_HTC_AMPDU are used soley by the +Capabilities beginning with IEEE80211_HTC_AMPDU are used solely by the .Nm layer. .Bl -tag -width IEEE80211_C_8023ENCAP ==== //depot/projects/smpng/share/man/man9/kproc.9#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/kproc.9,v 1.5 2010/07/31 10:01:15 joel Exp $ +.\" $FreeBSD: src/share/man/man9/kproc.9,v 1.6 2010/08/16 15:18:30 joel Exp $ .\" .Dd October 19, 2007 .Dt KPROC 9 @@ -244,7 +244,7 @@ The .Fa procptr pointer points to a -.Vt "struct proc " +.Vt "struct proc" pointer that is the location to be updated with the new proc pointer if a new process is created, or if not .Dv NULL , @@ -255,7 +255,7 @@ If not NULL, the .Fa tdptr pointer points to a -.Vt "struct thread " +.Vt "struct thread" pointer that is the location to be updated with the new thread pointer. The .Fa flags ==== //depot/projects/smpng/share/man/man9/netisr.9#6 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/netisr.9,v 1.6 2010/07/31 12:14:28 joel Exp $ +.\" $FreeBSD: src/share/man/man9/netisr.9,v 1.7 2010/08/16 15:18:30 joel Exp $ .\" .Dd February 22, 2010 .Dt NETISR 9 @@ -103,7 +103,7 @@ .Va nh_m2flow , then .Nm -will query the protocol in the evet that the +will query the protocol in the event that the .Vt mbuf doesn't have a flow ID, falling back on source ordering. .It NETISR_POLICY_CPU @@ -120,7 +120,7 @@ .Bl -tag -width "netisr_handler_t nh_handler" .It Vt "const char *" Va nh_name Unique character string name of the protocol, which may be included in -.Xr 2 sysctl +.Xr sysctl 2 MIB names, so should not contain whitespace. .It Vt netisr_handler_t Va nh_handler Protocol handler function that will be invoked on each packet received for ==== //depot/projects/smpng/share/man/man9/runqueue.9#2 (text+ko) ==== @@ -21,13 +21,13 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/runqueue.9,v 1.6 2004/07/07 07:56:36 ru Exp $ +.\" $FreeBSD: src/share/man/man9/runqueue.9,v 1.7 2010/08/15 21:25:52 brueffer Exp $ .\" -.Dd November 3, 2000 +.Dd August 15, 2010 .Dt RUNQUEUE 9 .Os .Sh NAME -.Nm chooseproc , +.Nm choosethread , .Nm procrunnable , .Nm remrunqueue , .Nm setrunqueue ==== //depot/projects/smpng/share/man/man9/vm_page_bits.9#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vm_page_bits.9,v 1.4 2010/01/04 14:58:41 kib Exp $ +.\" $FreeBSD: src/share/man/man9/vm_page_bits.9,v 1.5 2010/08/16 15:18:30 joel Exp $ .\" .Dd December 1, 2001 .Dt VM_PAGE_BITS 9 @@ -84,7 +84,7 @@ .Dv DEV_BSIZE aligned and no larger than .Dv PAGE_SIZE . -If it is not properly aligned, any unaligned chucks of the +If it is not properly aligned, any unaligned chunks of the .Dv DEV_BSIZE blocks at the beginning and end of the range will be zeroed. .Pp ==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.36 2010/08/12 00:20:46 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.37 2010/08/13 22:08:42 jkim Exp $"); #include #include @@ -278,13 +278,13 @@ for (;;) ia32_pause(); } else { - acpi_resync_clock(sc); - PCPU_SET(switchtime, cpu_ticks()); + PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); #ifdef SMP if (wakeup_cpus != 0) acpi_wakeup_cpus(sc, wakeup_cpus); #endif + acpi_resync_clock(sc); ret = 0; } ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#70 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.328 2010/08/12 00:20:46 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.330 2010/08/13 22:08:42 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1324,10 +1324,8 @@ cpumask_t cpumask; u_int cpu; - sched_pin(); cpu = PCPU_GET(cpuid); cpumask = PCPU_GET(cpumask); - sched_unpin(); savectx(&stoppcbs[cpu]); @@ -1358,10 +1356,8 @@ register_t cr3, rf; u_int cpu; - sched_pin(); cpu = PCPU_GET(cpuid); cpumask = PCPU_GET(cpumask); - sched_unpin(); rf = intr_disable(); cr3 = rcr3(); @@ -1370,7 +1366,7 @@ wbinvd(); atomic_set_int(&stopped_cpus, cpumask); } else { - PCPU_SET(switchtime, cpu_ticks()); + PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); } @@ -1542,14 +1538,10 @@ #endif int retval; + mask = PCPU_GET(cpumask); #ifdef MP_WATCHDOG - sched_pin(); - mask = PCPU_GET(cpumask); cpuid = PCPU_GET(cpuid); - sched_unpin(); ap_watchdog(cpuid); -#else - mask = PCPU_GET(cpumask); #endif retval = 0; ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#111 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.710 2010/08/10 16:14:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.711 2010/08/17 12:17:24 gahr Exp $"); /* * Manages physical address maps. @@ -620,7 +620,8 @@ if (sysenv != NULL) { if (strncmp(sysenv, "MacBook5,1", 10) == 0 || strncmp(sysenv, "MacBookPro5,5", 13) == 0 || - strncmp(sysenv, "Macmini3,1", 10) == 0) + strncmp(sysenv, "Macmini3,1", 10) == 0 || + strncmp(sysenv, "iMac9,1", 7) == 0) pat_works = 0; freeenv(sysenv); } ==== //depot/projects/smpng/sys/amd64/include/elf.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/elf.h,v 1.23 2010/03/11 14:49:06 nwhitehorn Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.24 2010/08/17 08:55:45 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -88,8 +88,14 @@ #define AT_GID 13 /* Real gid. */ #define AT_EGID 14 /* Effective gid. */ #define AT_EXECPATH 15 /* Path to the executable. */ +#define AT_CANARY 16 /* Canary for SSP */ +#define AT_CANARYLEN 17 /* Length of the canary. */ +#define AT_OSRELDATE 18 /* OSRELDATE. */ +#define AT_NCPUS 19 /* Number of CPUs. */ +#define AT_PAGESIZES 20 /* Pagesizes. */ +#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */ -#define AT_COUNT 16 /* Count of defined aux entry types. */ +#define AT_COUNT 22 /* Count of defined aux entry types. */ /* * Relocation types. ==== //depot/projects/smpng/sys/arm/include/elf.h#10 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.12 2010/08/17 08:55:45 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -76,8 +76,14 @@ #define AT_GID 13 /* Real gid. */ #define AT_EGID 14 /* Effective gid. */ #define AT_EXECPATH 15 /* Path to the executable. */ +#define AT_CANARY 16 /* Canary for SSP */ +#define AT_CANARYLEN 17 /* Length of the canary. */ +#define AT_OSRELDATE 18 /* OSRELDATE. */ +#define AT_NCPUS 19 /* Number of CPUs. */ +#define AT_PAGESIZES 20 /* Pagesizes. */ +#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */ -#define AT_COUNT 16 /* Count of defined aux entry types. */ +#define AT_COUNT 22 /* Count of defined aux entry types. */ #define R_ARM_COUNT 33 /* Count of defined relocation types. */ ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#93 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.249 2010/07/25 15:43:52 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.250 2010/08/17 17:11:15 mjacob Exp $"); #include @@ -958,6 +958,8 @@ static void daoninvalidate(struct cam_periph *periph) { + struct ccb_abort cab; + struct ccb_hdr *ccb_h, *ccb_h_t; struct da_softc *softc; softc = (struct da_softc *)periph->softc; @@ -967,15 +969,29 @@ */ xpt_register_async(0, daasync, periph, periph->path); + /* + * Invalidate the pack label + */ softc->flags |= DA_FLAG_PACK_INVALID; /* * Return all queued I/O with ENXIO. - * XXX Handle any transactions queued to the card - * with XPT_ABORT_CCB. */ bioq_flush(&softc->bio_queue, NULL, ENXIO); + /* + * Issue aborts for any pending commands. + */ + xpt_setup_ccb(&cab.ccb_h, periph->path, CAM_PRIORITY_NORMAL+1); + cab.ccb_h.func_code = XPT_ABORT; + LIST_FOREACH_SAFE(ccb_h, &softc->pending_ccbs, periph_links.le, ccb_h_t) { + cab.abort_ccb = (union ccb *)ccb_h; + xpt_action((union ccb *)&cab); + } + + /* + * This disk is *history*.... + */ disk_gone(softc->disk); xpt_print(periph->path, "lost device\n"); } ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#71 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.114 2010/08/07 11:57:13 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.115 2010/08/17 08:55:45 kib Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -2525,11 +2525,13 @@ register_t * freebsd32_copyout_strings(struct image_params *imgp) { - int argc, envc; + int argc, envc, i; u_int32_t *vectp; char *stringp, *destp; u_int32_t *stack_base; struct freebsd32_ps_strings *arginfo; + char canary[sizeof(long) * 8]; + int32_t pagesizes32[MAXPAGESIZES]; size_t execpath_len; int szsigcode; @@ -2545,8 +2547,10 @@ sv_psstrings; szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); destp = (caddr_t)arginfo - szsigcode - SPARE_USRSPACE - - roundup(execpath_len, sizeof(char *)) - - roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); + roundup(execpath_len, sizeof(char *)) - + roundup(sizeof(canary), sizeof(char *)) - + roundup(sizeof(pagesizes32), sizeof(char *)) - + roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); /* * install sigcode @@ -2565,6 +2569,25 @@ } /* + * Prepare the canary for SSP. + */ + arc4rand(canary, sizeof(canary), 0); + imgp->canary = (uintptr_t)arginfo - szsigcode - execpath_len - + sizeof(canary); + copyout(canary, (void *)imgp->canary, sizeof(canary)); + imgp->canarylen = sizeof(canary); + + /* + * Prepare the pagesizes array. + */ + for (i = 0; i < MAXPAGESIZES; i++) + pagesizes32[i] = (uint32_t)pagesizes[i]; + imgp->pagesizes = (uintptr_t)arginfo - szsigcode - execpath_len - + roundup(sizeof(canary), sizeof(char *)) - sizeof(pagesizes32); + copyout(pagesizes32, (void *)imgp->pagesizes, sizeof(pagesizes32)); + imgp->pagesizeslen = sizeof(pagesizes32); + + /* * If we have a valid auxargs ptr, prepare some room * on the stack. */ ==== //depot/projects/smpng/sys/conf/kern.mk#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.65 2010/07/22 18:47:41 rpaulo Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.66 2010/08/17 20:39:28 rpaulo Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -6,7 +6,7 @@ # Note that the newly added -Wcast-qual is responsible for generating # most of the remaining warnings. Warnings introduced with -Wall will # also pop up, but are easier to fix. -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" #CWARNFLAGS= -w2 # use this if you are terribly bored CWARNFLAGS= .else @@ -29,8 +29,8 @@ # operations inside the kernel itself. These operations are exclusively # reserved for user applications. # -.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" -.if ${CC} != "clang" +.if ${MACHINE_ARCH} == "i386" && ${CC:T:Micc} != "icc" +.if ${CC:T:Mclang} != "clang" CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 .endif CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 @@ -93,20 +93,20 @@ # GCC 3.0 and above like to do certain optimizations based on the # assumption that the program is linked against libc. Stop this. # -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" CFLAGS+= -nolib_inline .else CFLAGS+= -ffreestanding .endif -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" CFLAGS+= -restrict .endif # # GCC SSP support. # -.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" && \ +.if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && ${MACHINE_ARCH} != "ia64" && \ ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" CFLAGS+= -fstack-protector .endif ==== //depot/projects/smpng/sys/conf/kern.pre.mk#69 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.115 2010/07/22 21:31:35 rpaulo Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.116 2010/08/17 20:39:28 rpaulo Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -23,7 +23,7 @@ OBJCOPY?= objcopy SIZE?= size -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" COPTFLAGS?= -O .else . if defined(DEBUG) @@ -48,7 +48,7 @@ COPTFLAGS+= ${_CPUCFLAGS} . endif .endif -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" C_DIALECT= NOSTDINC= -X .else @@ -92,8 +92,8 @@ CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS} CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -.if ${CC} != "icc" -.if ${CC} != "clang" +.if ${CC:T:Micc} != "icc" +.if ${CC:T:Mclang} != "clang" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} .if ${MACHINE_CPUARCH} != "mips" CFLAGS+= --param inline-unit-growth=100 @@ -111,7 +111,7 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -.if ${CC} == "icc" || ${CC} == "clang" +.if ${CC:T:Micc} == "icc" || ${CC:T:Mclang} == "clang" .error "Profiling doesn't work with icc or clang yet" .endif CFLAGS+= -DGPROF -falign-functions=16 ==== //depot/projects/smpng/sys/conf/kmod.mk#79 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.236 2010/07/22 18:47:41 rpaulo Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.237 2010/08/17 20:39:28 rpaulo Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -81,7 +81,7 @@ .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} .else . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) @@ -94,7 +94,7 @@ CFLAGS+= -DKLD_MODULE # Don't use any standard or source-relative include directories. -.if ${CC} == "icc" +.if ${CC:T:Micc} == "icc" NOSTDINC= -X .else CSTD= c99 @@ -114,7 +114,7 @@ # for example. CFLAGS+= -I@/contrib/altq -.if ${CC} != "icc" && ${CC} != "clang" +.if ${CC:T:Micc} != "icc" && ${CC:T:Mclang} != "clang" CFLAGS+= -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 @@ -122,7 +122,7 @@ # Disallow common variables, and if we end up with commons from # somewhere unexpected, allocate storage for them in the module itself. -.if ${CC} != "icc" +.if ${CC:T:Micc} != "icc" CFLAGS+= -fno-common .endif LDFLAGS+= -d -warn-common ==== //depot/projects/smpng/sys/conf/options.mips#6 (text+ko) ==== @@ -26,7 +26,7 @@ # SUCH DAMAGE. # # JNPR: options.mips,v 1.2 2006/09/15 12:52:34 -# $FreeBSD: src/sys/conf/options.mips,v 1.8 2010/07/20 19:25:11 jmallett Exp $ +# $FreeBSD: src/sys/conf/options.mips,v 1.10 2010/08/15 19:07:44 imp Exp $ CPU_MIPS4KC opt_global.h CPU_MIPS32 opt_global.h @@ -35,6 +35,7 @@ CPU_HAVEFPU opt_global.h CPU_SB1 opt_global.h CPU_CNMIPS opt_global.h +CPU_RMI opt_global.h ISA_MIPS1 opt_cputype.h ISA_MIPS3 opt_cputype.h @@ -50,8 +51,6 @@ CFE_ENV_SIZE opt_global.h NOFPU opt_global.h -TARGET_EMULATOR opt_ddb.h -TARGET_XLR_XLS opt_global.h TICK_USE_YAMON_FREQ opt_global.h TICK_USE_MALTA_RTC opt_global.h ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#124 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.283 2010/07/15 23:24:06 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.284 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include @@ -129,8 +129,6 @@ static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev, ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters, ACPI_BUFFER *ret); -static int acpi_device_pwr_for_sleep(device_t bus, device_t dev, - int *dstate); static ACPI_STATUS acpi_device_scan_cb(ACPI_HANDLE h, UINT32 level, void *context, void **retval); static ACPI_STATUS acpi_device_scan_children(device_t bus, device_t dev, @@ -1415,7 +1413,7 @@ return (AcpiEvaluateObject(h, pathname, parameters, ret)); } -static int +int acpi_device_pwr_for_sleep(device_t bus, device_t dev, int *dstate) { struct acpi_softc *sc; ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#38 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.63 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.64 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include @@ -275,3 +275,14 @@ return_VALUE (interrupt); } + +int +acpi_pcib_power_for_sleep(device_t pcib, device_t dev, int *pstate) +{ + device_t acpi_dev; + + acpi_dev = devclass_get_device(devclass_find("acpi"), 0); + acpi_device_pwr_for_sleep(acpi_dev, dev, pstate); + return (0); +} + ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#32 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.61 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.62 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" #include @@ -116,6 +116,7 @@ DEVMETHOD(pcib_alloc_msix, acpi_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, acpi_pcib_map_msi), + DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep), {0, 0} }; ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#17 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.19 2010/08/05 16:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.20 2010/08/17 15:44:52 jhb Exp $"); #include "opt_acpi.h" @@ -80,6 +80,7 @@ /* pcib interface */ DEVMETHOD(pcib_route_interrupt, acpi_pcib_pci_route_interrupt), + DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep), {0, 0} }; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 18 20:25:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1FE01065696; Wed, 18 Aug 2010 20:25:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7009510656AC for ; Wed, 18 Aug 2010 20:25:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5E1288FC2B for ; Wed, 18 Aug 2010 20:25:58 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7IKPwTV085992 for ; Wed, 18 Aug 2010 20:25:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7IKPwpc085989 for perforce@freebsd.org; Wed, 18 Aug 2010 20:25:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Aug 2010 20:25:58 GMT Message-Id: <201008182025.o7IKPwpc085989@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2010 20:25:59 -0000 http://p4web.freebsd.org/@@182575?ac=10 Change 182575 by hselasky@hselasky_laptop001 on 2010/08/18 20:25:21 USB serial: - add new device ID to USB 3G driver PR: usb/149764 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#134 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#35 (text+ko) ==== @@ -284,6 +284,7 @@ U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI), + U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI), U3G_DEV(KYOCERA2, CDMA_MSM_K, 0), U3G_DEV(KYOCERA2, KPC680, 0), U3G_DEV(LONGCHEER, WM66, U3GINIT_HUAWEI), ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#134 (text+ko) ==== @@ -1836,6 +1836,7 @@ product HUAWEI E143E 0x143e 3G modem product HUAWEI E143F 0x143f 3G modem product HUAWEI E1752 0x1446 3G modem +product HUAWEI K3765 0x1465 3G modem product HUAWEI E14AC 0x14ac 3G modem /* HUAWEI 3com products */ From owner-p4-projects@FreeBSD.ORG Wed Aug 18 21:27:25 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9679F10656A6; Wed, 18 Aug 2010 21:27:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59127106567A for ; Wed, 18 Aug 2010 21:27:25 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 474118FC14 for ; Wed, 18 Aug 2010 21:27:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7ILRPoO098371 for ; Wed, 18 Aug 2010 21:27:25 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7ILRPpo098368 for perforce@freebsd.org; Wed, 18 Aug 2010 21:27:25 GMT (envelope-from anchie@FreeBSD.org) Date: Wed, 18 Aug 2010 21:27:25 GMT Message-Id: <201008182127.o7ILRPpo098368@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2010 21:27:25 -0000 http://p4web.freebsd.org/@@182583?ac=10 Change 182583 by anchie@anchie_malimis on 2010/08/18 21:26:25 Fixing the p4 integration issue. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#24 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#24 (text+ko) ==== @@ -71,11 +71,10 @@ #include #include #include +#include #include #include -#ifdef DEV_CARP - #define SDL(s) ((struct sockaddr_dl *)s) struct dadq; From owner-p4-projects@FreeBSD.ORG Wed Aug 18 21:42:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D70C01065675; Wed, 18 Aug 2010 21:42:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 998231065670 for ; Wed, 18 Aug 2010 21:42:48 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8775D8FC16 for ; Wed, 18 Aug 2010 21:42:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7ILgmDL002274 for ; Wed, 18 Aug 2010 21:42:48 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7ILgmOT002271 for perforce@freebsd.org; Wed, 18 Aug 2010 21:42:48 GMT (envelope-from anchie@FreeBSD.org) Date: Wed, 18 Aug 2010 21:42:48 GMT Message-Id: <201008182142.o7ILgmOT002271@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2010 21:42:49 -0000 http://p4web.freebsd.org/@@182586?ac=10 Change 182586 by anchie@anchie_malimis on 2010/08/18 21:42:12 Fixing integration bugs. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#25 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#25 (text+ko) ==== @@ -71,8 +71,8 @@ #include #include #include +#include #include -#include #include #define SDL(s) ((struct sockaddr_dl *)s) From owner-p4-projects@FreeBSD.ORG Thu Aug 19 13:35:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A86EC1065698; Thu, 19 Aug 2010 13:35:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A43F1065693; Thu, 19 Aug 2010 13:35:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 39C7E8FC1A; Thu, 19 Aug 2010 13:35:24 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id C095C46B35; Thu, 19 Aug 2010 09:35:23 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id DCC668A03C; Thu, 19 Aug 2010 09:35:22 -0400 (EDT) From: John Baldwin To: Ilya Bakulin Date: Wed, 18 Aug 2010 16:15:06 -0400 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20100217; KDE/4.4.5; amd64; ; ) References: <201008180726.o7I7QqiO021823@skunkworks.freebsd.org> In-Reply-To: <201008180726.o7I7QqiO021823@skunkworks.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201008181615.06129.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Thu, 19 Aug 2010 09:35:22 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.1 required=4.2 tests=AWL,BAYES_00, DATE_IN_PAST_12_24 autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 182552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2010 13:35:24 -0000 On Wednesday, August 18, 2010 3:26:52 am Ilya Bakulin wrote: > http://p4web.freebsd.org/@@182552?ac=10 > > Change 182552 by kibab@kibab_kibab-nb on 2010/08/18 07:26:39 > > - PAE feature. > > Affected files ... > > .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_malloc.c#4 edit > .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/ksched.c#4 edit > > Differences ... > > ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_malloc.c#4 (text+ko) ==== > > @@ -93,6 +93,10 @@ > dtrace_malloc_probe_func_t dtrace_malloc_probe; > #endif > > +#ifdef PAE > +FEATURE(pae, "Physical Address Extensions support"); > +#endif > + There should already be a PAE feature present in sys/i386/i386/machdep.c. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Thu Aug 19 17:43:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B704C1065673; Thu, 19 Aug 2010 17:43:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 758FC106567A for ; Thu, 19 Aug 2010 17:43:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6190E8FC08 for ; Thu, 19 Aug 2010 17:43:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7JHhWgR057419 for ; Thu, 19 Aug 2010 17:43:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7JHhVXI057416 for perforce@freebsd.org; Thu, 19 Aug 2010 17:43:31 GMT (envelope-from jhb@freebsd.org) Date: Thu, 19 Aug 2010 17:43:31 GMT Message-Id: <201008191743.o7JHhVXI057416@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2010 17:43:33 -0000 http://p4web.freebsd.org/@@182625?ac=10 Change 182625 by jhb@jhb_jhbbsd on 2010/08/19 17:43:24 IFC @182624 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#77 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#29 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#6 integrate .. //depot/projects/smpng/sys/conf/makeLINT.mk#3 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#25 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#89 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#42 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#126 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#100 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#76 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#115 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#107 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_chip.c#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar71xx_chip.h#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar71xx_cpudef.h#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_pci.c#3 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_setup.c#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar71xx_setup.h#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar71xx_wdog.c#3 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xxreg.h#5 integrate .. //depot/projects/smpng/sys/mips/atheros/ar724x_chip.c#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar724x_chip.h#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar724xreg.h#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar91xx_chip.c#1 branch .. //depot/projects/smpng/sys/mips/atheros/ar91xx_chip.h#1 branch .. //depot/projects/smpng/sys/mips/atheros/files.ar71xx#2 integrate .. //depot/projects/smpng/sys/mips/atheros/if_arge.c#5 integrate .. //depot/projects/smpng/sys/mips/atheros/if_argevar.h#3 integrate .. //depot/projects/smpng/sys/mips/atheros/uart_bus_ar71xx.c#2 integrate .. //depot/projects/smpng/sys/mips/atheros/uart_cpu_ar71xx.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#177 integrate .. //depot/projects/smpng/sys/modules/send/Makefile#1 branch .. //depot/projects/smpng/sys/netinet/in.h#52 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#136 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#68 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#124 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#77 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#65 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#68 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#42 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#68 integrate .. //depot/projects/smpng/sys/netinet6/send.c#1 branch .. //depot/projects/smpng/sys/netinet6/send.h#1 branch .. //depot/projects/smpng/sys/powerpc/aim/trap.c#11 integrate .. //depot/projects/smpng/sys/powerpc/booke/trap.c#7 integrate .. //depot/projects/smpng/sys/powerpc/conf/Makefile#3 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#19 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#89 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#15 integrate .. //depot/projects/smpng/sys/sys/ktrace.h#19 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#87 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#77 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.346 2010/07/12 20:45:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.347 2010/08/19 16:41:27 jhb Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#29 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.22 2010/05/23 18:32:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.23 2010/08/19 16:41:27 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#6 (text+ko) ==== @@ -403,6 +403,25 @@ #define _INT_ALIGNMENT 4 #define _FLOAT_ALIGNMENT 4 #define _FLOAT_COMPLEX_ALIGNMENT 4 +#if defined(__mips_n64) +#define _LONG_ALIGNMENT 8 +#define _LONG_LONG_ALIGNMENT 8 +#define _DOUBLE_ALIGNMENT 8 +#define _DOUBLE_COMPLEX_ALIGNMENT 8 +#define _LONG_DOUBLE_ALIGNMENT 8 +#define _LONG_DOUBLE_COMPLEX_ALIGNMENT 8 +#define _POINTER_ALIGNMENT 8 +#define _MAX_ALIGNMENT 8 +#define _ALIGNMENT_REQUIRED 0 + +#define _LONG_LONG_ALIGNMENT_32 _INT_ALIGNMENT +/* + * Define the appropriate "implementation choices". + */ +#if !defined(_LP64) +#define _LP64 +#endif +#else #define _LONG_ALIGNMENT 4 #define _LONG_LONG_ALIGNMENT 4 #define _DOUBLE_ALIGNMENT 4 @@ -422,6 +441,7 @@ #if !defined(_I32LPx) && defined(_KERNEL) #define _I32LPx #endif +#endif #define _SUNOS_VTOC_16 #define _DMA_USES_PHYSADDR #define _FIRMWARE_NEEDS_FDISK ==== //depot/projects/smpng/sys/conf/makeLINT.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/makeLINT.mk,v 1.2 2010/01/08 19:00:20 bz Exp $ +# $FreeBSD: src/sys/conf/makeLINT.mk,v 1.3 2010/08/19 03:19:26 nwhitehorn Exp $ all: @echo "make LINT only" @@ -17,3 +17,6 @@ echo "ident ${.TARGET}-VIMAGE" >> ${.TARGET}-VIMAGE echo "options VIMAGE" >> ${.TARGET}-VIMAGE .endif +.if ${TARGET} == "powerpc" + echo "machine ${TARGET} ${TARGET_ARCH}" >> ${.TARGET} +.endif ==== //depot/projects/smpng/sys/dev/e1000/if_igb.c#25 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.54 2010/08/06 20:55:49 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.55 2010/08/19 17:00:33 jfv Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -2473,8 +2473,8 @@ if ((adapter->hw.mac.type == e1000_82575) && (queues > 4)) queues = 4; - /* Limit the VF adapter to one queues */ - if ((adapter->hw.mac.type == e1000_vfadapt) && (queues > 2)) + /* Limit the VF adapter to one queue */ + if (adapter->hw.mac.type == e1000_vfadapt) queues = 1; /* ==== //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#89 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.188 2010/08/12 15:29:07 jh Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.189 2010/08/19 16:39:00 jh Exp $ */ /* @@ -848,6 +848,8 @@ *dm_unlock = 0; sx_xunlock(&dmp->dm_lock); devfs_unmount_final(dmp); + if (cdev != NULL) + dev_rel(cdev); return (ENOENT); } if (cdev == NULL) @@ -859,6 +861,7 @@ *dm_unlock = 0; sx_xunlock(&dmp->dm_lock); devfs_unmount_final(dmp); + dev_rel(cdev); return (ENOENT); } ==== //depot/projects/smpng/sys/geom/mirror/g_mirror.c#42 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.99 2010/01/05 10:30:56 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.100 2010/08/18 15:38:10 mav Exp $"); #include #include @@ -844,21 +844,6 @@ } } -static __inline int -bintime_cmp(struct bintime *bt1, struct bintime *bt2) -{ - - if (bt1->sec < bt2->sec) - return (-1); - else if (bt1->sec > bt2->sec) - return (1); - if (bt1->frac < bt2->frac) - return (-1); - else if (bt1->frac > bt2->frac) - return (1); - return (0); -} - static void g_mirror_done(struct bio *bp) { ==== //depot/projects/smpng/sys/i386/i386/trap.c#126 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.330 2010/06/05 15:59:59 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.331 2010/08/19 16:41:27 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#100 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.138 2010/05/24 17:24:14 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.139 2010/08/19 16:41:27 jhb Exp $"); #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_ktrace.c#76 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.134 2010/08/17 21:34:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.135 2010/08/19 16:38:58 jhb Exp $"); #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/kern/kern_proc.c#115 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.300 2010/05/27 08:10:12 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.301 2010/08/19 16:40:30 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/sched_ule.c#107 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.272 2010/08/06 15:36:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.273 2010/08/19 16:41:27 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" ==== //depot/projects/smpng/sys/mips/atheros/ar71xx_cpudef.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/mips/atheros/ar71xx_cpudef.h,v 1.1 2010/08/18 08:22:09 adrian Exp $ */ +/* $FreeBSD: src/sys/mips/atheros/ar71xx_cpudef.h,v 1.2 2010/08/19 16:15:30 adrian Exp $ */ #ifndef __AR71XX_CPUDEF_H__ #define __AR71XX_CPUDEF_H__ @@ -81,6 +81,16 @@ return ar71xx_cpu_ops->ar71xx_chip_device_stopped(mask); } +static inline void ar71xx_device_set_pll_ge0(int speed) +{ + ar71xx_cpu_ops->ar71xx_chip_set_pll_ge0(speed); +} + +static inline void ar71xx_device_set_pll_ge1(int speed) +{ + ar71xx_cpu_ops->ar71xx_chip_set_pll_ge1(speed); +} + static inline void ar71xx_device_flush_ddr_ge0(void) { ar71xx_cpu_ops->ar71xx_chip_ddr_flush_ge0(); ==== //depot/projects/smpng/sys/mips/atheros/ar71xx_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/atheros/ar71xx_machdep.c,v 1.3 2010/01/25 00:44:05 gonzo Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/atheros/ar71xx_machdep.c,v 1.7 2010/08/19 02:15:39 adrian Exp $"); #include #include @@ -57,6 +57,9 @@ #include +#include +#include + extern char edata[], end[]; uint32_t ar711_base_mac[ETHER_ADDR_LEN]; @@ -118,9 +121,7 @@ void platform_reset(void) { - uint32_t reg = ATH_READ_REG(AR71XX_RST_RESET); - - ATH_WRITE_REG(AR71XX_RST_RESET, reg | RST_RESET_FULL_CHIP); + ar71xx_device_stop(RST_RESET_FULL_CHIP); /* Wait for reset */ while(1) ; @@ -143,7 +144,6 @@ __register_t a2 __unused, __register_t a3 __unused) { uint64_t platform_counter_freq; - uint32_t reg; int argc, i, count = 0; char **argv, **envp; vm_offset_t kernend; @@ -202,11 +202,21 @@ * should be called first. */ init_param1(); + + /* Detect the system type - this is needed for subsequent chipset-specific calls */ + ar71xx_detect_sys_type(); + ar71xx_detect_sys_frequency(); + platform_counter_freq = ar71xx_cpu_freq(); mips_timer_init_params(platform_counter_freq, 1); cninit(); init_static_kenv(boot1_env, sizeof(boot1_env)); + printf("CPU platform: %s\n", ar71xx_get_system_type()); + printf("CPU Frequency=%d MHz\n", u_ar71xx_cpu_freq / 1000000); + printf("CPU DDR Frequency=%d MHz\n", u_ar71xx_ddr_freq / 1000000); + printf("CPU AHB Frequency=%d MHz\n", u_ar71xx_ahb_freq / 1000000); + printf("platform frequency: %lld\n", platform_counter_freq); printf("arguments: \n"); printf(" a0 = %08x\n", a0); @@ -244,22 +254,7 @@ /* * Reset USB devices */ - reg = ATH_READ_REG(AR71XX_RST_RESET); - reg |= - RST_RESET_USB_OHCI_DLL | RST_RESET_USB_HOST | RST_RESET_USB_PHY; - ATH_WRITE_REG(AR71XX_RST_RESET, reg); - DELAY(1000); - reg &= - ~(RST_RESET_USB_OHCI_DLL | RST_RESET_USB_HOST | RST_RESET_USB_PHY); - ATH_WRITE_REG(AR71XX_RST_RESET, reg); - - ATH_WRITE_REG(AR71XX_USB_CTRL_CONFIG, - USB_CTRL_CONFIG_OHCI_DES_SWAP | USB_CTRL_CONFIG_OHCI_BUF_SWAP | - USB_CTRL_CONFIG_EHCI_DES_SWAP | USB_CTRL_CONFIG_EHCI_BUF_SWAP); - - ATH_WRITE_REG(AR71XX_USB_CTRL_FLADJ, - (32 << USB_CTRL_FLADJ_HOST_SHIFT) | (3 << USB_CTRL_FLADJ_A5_SHIFT)); - DELAY(1000); + ar71xx_init_usb_peripheral(); kdb_init(); #ifdef KDB ==== //depot/projects/smpng/sys/mips/atheros/ar71xx_pci.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/atheros/ar71xx_pci.c,v 1.3 2010/08/05 21:31:29 gonzo Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/atheros/ar71xx_pci.c,v 1.4 2010/08/19 02:05:16 adrian Exp $"); #include #include @@ -56,6 +56,8 @@ #include #include +#include + #undef AR71XX_PCI_DEBUG #ifdef AR71XX_PCI_DEBUG #define dprintf printf @@ -258,7 +260,6 @@ { int busno = 0; int rid = 0; - uint32_t reset; struct ar71xx_pci_softc *sc = device_get_softc(dev); sc->sc_mem_rman.rm_type = RMAN_ARRAY; @@ -295,15 +296,10 @@ } /* reset PCI core and PCI bus */ - reset = ATH_READ_REG(AR71XX_RST_RESET); - reset |= (RST_RESET_PCI_CORE | RST_RESET_PCI_BUS); - ATH_WRITE_REG(AR71XX_RST_RESET, reset); - ATH_READ_REG(AR71XX_RST_RESET); + ar71xx_device_stop(RST_RESET_PCI_CORE | RST_RESET_PCI_BUS); DELAY(100000); - reset &= ~(RST_RESET_PCI_CORE | RST_RESET_PCI_BUS); - ATH_WRITE_REG(AR71XX_RST_RESET, reset); - ATH_READ_REG(AR71XX_RST_RESET); + ar71xx_device_start(RST_RESET_PCI_CORE | RST_RESET_PCI_BUS); DELAY(100000); /* Init PCI windows */ ==== //depot/projects/smpng/sys/mips/atheros/ar71xx_wdog.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/atheros/ar71xx_wdog.c,v 1.2 2010/06/19 12:12:39 adrian Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/atheros/ar71xx_wdog.c,v 1.3 2010/08/19 02:03:12 adrian Exp $"); #include #include @@ -41,6 +41,7 @@ #include #include +#include struct ar71xx_wdog_softc { device_t dev; ==== //depot/projects/smpng/sys/mips/atheros/ar71xxreg.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/mips/atheros/ar71xxreg.h,v 1.7 2010/08/18 09:11:45 adrian Exp $ */ +/* $FreeBSD: src/sys/mips/atheros/ar71xxreg.h,v 1.11 2010/08/19 16:25:15 adrian Exp $ */ #ifndef _AR71XX_REG_H_ #define _AR71XX_REG_H_ @@ -161,6 +161,7 @@ #define GPIO_FUNC_USB_CLK_EN (0) #define AR71XX_BASE_FREQ 40000000 +#define AR71XX_PLL_CPU_BASE 0x18050000 #define AR71XX_PLL_CPU_CONFIG 0x18050000 #define PLL_SW_UPDATE (1 << 31) #define PLL_LOCKED (1 << 30) @@ -181,6 +182,8 @@ #define PLL_BYPASS (1 << 1) #define PLL_POWER_DOWN (1 << 0) #define AR71XX_PLL_SEC_CONFIG 0x18050004 +#define AR71XX_PLL_ETH0_SHIFT 17 +#define AR71XX_PLL_ETH1_SHIFT 19 #define AR71XX_PLL_CPU_CLK_CTRL 0x18050008 #define AR71XX_PLL_ETH_INT0_CLK 0x18050010 #define AR71XX_PLL_ETH_INT1_CLK 0x18050014 @@ -194,6 +197,9 @@ #define AR71XX_PLL_ETH_EXT_CLK 0x18050018 #define AR71XX_PLL_PCI_CLK 0x1805001C +/* Reset block */ +#define AR71XX_RST_BLOCK_BASE 0x18060000 + #define AR71XX_RST_WDOG_CONTROL 0x18060008 #define RST_WDOG_LAST (1 << 31) #define RST_WDOG_ACTION_MASK 3 @@ -235,6 +241,33 @@ #define RST_RESET_PCI_BUS (1 << 1) #define RST_RESET_PCI_CORE (1 << 0) +/* Chipset revision details */ +#define AR71XX_RST_RESET_REG_REV_ID 0x18060090 +#define REV_ID_MAJOR_MASK 0xfff0 +#define REV_ID_MAJOR_AR71XX 0x00a0 +#define REV_ID_MAJOR_AR913X 0x00b0 +#define REV_ID_MAJOR_AR7240 0x00c0 +#define REV_ID_MAJOR_AR7241 0x0100 +#define REV_ID_MAJOR_AR7242 0x1100 + +/* AR71XX chipset revision details */ +#define AR71XX_REV_ID_MINOR_MASK 0x3 +#define AR71XX_REV_ID_MINOR_AR7130 0x0 +#define AR71XX_REV_ID_MINOR_AR7141 0x1 +#define AR71XX_REV_ID_MINOR_AR7161 0x2 +#define AR71XX_REV_ID_REVISION_MASK 0x3 +#define AR71XX_REV_ID_REVISION_SHIFT 2 + +/* AR724X chipset revision details */ +#define AR724X_REV_ID_REVISION_MASK 0x3 + +/* AR91XX chipset revision details */ +#define AR91XX_REV_ID_MINOR_MASK 0x3 +#define AR91XX_REV_ID_MINOR_AR9130 0x0 +#define AR91XX_REV_ID_MINOR_AR9132 0x1 +#define AR91XX_REV_ID_REVISION_MASK 0x3 +#define AR91XX_REV_ID_REVISION_SHIFT 2 + /* * GigE adapters region */ @@ -459,38 +492,6 @@ #define ATH_WRITE_REG(reg, val) \ *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1((reg))) = (val) -static inline uint64_t -ar71xx_cpu_freq(void) -{ - uint32_t pll_config, div; - uint64_t freq; - - /* PLL freq */ - pll_config = ATH_READ_REG(AR71XX_PLL_CPU_CONFIG); - div = ((pll_config >> PLL_FB_SHIFT) & PLL_FB_MASK) + 1; - freq = div * AR71XX_BASE_FREQ; - /* CPU freq */ - div = ((pll_config >> PLL_CPU_DIV_SEL_SHIFT) & PLL_CPU_DIV_SEL_MASK) - + 1; - freq = freq / div; - - return (freq); -} - -static inline uint64_t -ar71xx_ahb_freq(void) -{ - uint32_t pll_config, div; - uint64_t freq; - - /* PLL freq */ - pll_config = ATH_READ_REG(AR71XX_PLL_CPU_CONFIG); - /* AHB freq */ - div = (((pll_config >> PLL_AHB_DIV_SHIFT) & PLL_AHB_DIV_MASK) + 1) * 2; - freq = ar71xx_cpu_freq() / div; - return (freq); -} - static inline void ar71xx_ddr_flush(uint32_t reg) { @@ -502,4 +503,27 @@ ; } +static inline void +ar71xx_write_pll(uint32_t cfg_reg, uint32_t pll_reg, uint32_t pll, uint32_t pll_reg_shift) +{ + uint32_t sec_cfg; + + /* set PLL registers */ + sec_cfg = ATH_READ_REG(cfg_reg); + sec_cfg &= ~(3 << pll_reg_shift); + sec_cfg |= (2 << pll_reg_shift); + + ATH_WRITE_REG(cfg_reg, sec_cfg); + DELAY(100); + + ATH_WRITE_REG(pll_reg, pll); + sec_cfg |= (3 << pll_reg_shift); + ATH_WRITE_REG(cfg_reg, sec_cfg); + DELAY(100); + + sec_cfg &= ~(3 << pll_reg_shift); + ATH_WRITE_REG(cfg_reg, sec_cfg); + DELAY(100); +} + #endif /* _AR71XX_REG_H_ */ ==== //depot/projects/smpng/sys/mips/atheros/ar724xreg.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/mips/atheros/ar724xreg.h,v 1.1 2010/08/18 00:26:14 adrian Exp $ */ +/* $FreeBSD: src/sys/mips/atheros/ar724xreg.h,v 1.2 2010/08/19 11:53:55 adrian Exp $ */ #ifndef __AR72XX_REG_H__ #define __AR72XX_REG_H__ @@ -47,6 +47,9 @@ #define AR724X_BASE_FREQ 5000000 +#define AR724X_RESET_REG_RESET_MODULE AR71XX_RST_BLOCK_BASE + 0x1c +#define AR724X_RESET_MODULE_USB_OHCI_DLL (1 << 3) + /* XXX so USB requires different init code? -adrian */ #define AR7240_OHCI_BASE 0x1b000000 #define AR7240_OHCI_SIZE 0x01000000 ==== //depot/projects/smpng/sys/mips/atheros/files.ar71xx#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/mips/atheros/files.ar71xx,v 1.2 2010/01/22 22:14:12 gonzo Exp $ +# $FreeBSD: src/sys/mips/atheros/files.ar71xx,v 1.5 2010/08/19 11:53:55 adrian Exp $ mips/atheros/apb.c standard mips/atheros/ar71xx_machdep.c standard @@ -15,3 +15,7 @@ mips/atheros/ar71xx_bus_space_reversed.c standard mips/mips/intr_machdep.c standard mips/mips/tick.c standard +mips/atheros/ar71xx_setup.c standard +mips/atheros/ar71xx_chip.c standard +mips/atheros/ar724x_chip.c standard +mips/atheros/ar91xx_chip.c standard ==== //depot/projects/smpng/sys/mips/atheros/if_arge.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/atheros/if_arge.c,v 1.6 2010/07/08 15:20:57 adrian Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/atheros/if_arge.c,v 1.9 2010/08/19 16:29:08 adrian Exp $"); /* * AR71XX gigabit ethernet driver @@ -79,6 +79,7 @@ #include #include +#include #undef ARGE_DEBUG #ifdef ARGE_DEBUG @@ -181,14 +182,10 @@ static void arge_flush_ddr(struct arge_softc *sc) { - - ATH_WRITE_REG(sc->arge_ddr_flush_reg, 1); - while (ATH_READ_REG(sc->arge_ddr_flush_reg) & 1) - ; - - ATH_WRITE_REG(sc->arge_ddr_flush_reg, 1); - while (ATH_READ_REG(sc->arge_ddr_flush_reg) & 1) - ; + if (sc->arge_mac_unit == 0) + ar71xx_device_flush_ddr_ge0(); + else + ar71xx_device_flush_ddr_ge1(); } static int @@ -236,15 +233,6 @@ KASSERT(((sc->arge_mac_unit == 0) || (sc->arge_mac_unit == 1)), ("if_arge: Only MAC0 and MAC1 supported")); - if (sc->arge_mac_unit == 0) { - sc->arge_ddr_flush_reg = AR71XX_WB_FLUSH_GE0; - sc->arge_pll_reg = AR71XX_PLL_ETH_INT0_CLK; - sc->arge_pll_reg_shift = 17; - } else { - sc->arge_ddr_flush_reg = AR71XX_WB_FLUSH_GE1; - sc->arge_pll_reg = AR71XX_PLL_ETH_INT1_CLK; - sc->arge_pll_reg_shift = 19; - } /* * Get which PHY of 5 available we should use for this unit @@ -381,19 +369,9 @@ DELAY(20); /* Step 2. Punt the MAC core from the central reset register */ - reg = ATH_READ_REG(AR71XX_RST_RESET); - if (sc->arge_mac_unit == 0) - reg |= RST_RESET_GE0_MAC; - else if (sc->arge_mac_unit == 1) - reg |= RST_RESET_GE1_MAC; - ATH_WRITE_REG(AR71XX_RST_RESET, reg); + ar71xx_device_stop(sc->arge_mac_unit == 0 ? RST_RESET_GE0_MAC : RST_RESET_GE1_MAC); DELAY(100); - reg = ATH_READ_REG(AR71XX_RST_RESET); - if (sc->arge_mac_unit == 0) - reg &= ~RST_RESET_GE0_MAC; - else if (sc->arge_mac_unit == 1) - reg &= ~RST_RESET_GE1_MAC; - ATH_WRITE_REG(AR71XX_RST_RESET, reg); + ar71xx_device_start(sc->arge_mac_unit == 0 ? RST_RESET_GE0_MAC : RST_RESET_GE1_MAC); /* Step 3. Reconfigure MAC block */ ARGE_WRITE(sc, AR71XX_MAC_CFG1, @@ -683,7 +661,8 @@ static void arge_set_pll(struct arge_softc *sc, int media, int duplex) { - uint32_t cfg, ifcontrol, rx_filtmask, pll, sec_cfg; + uint32_t cfg, ifcontrol, rx_filtmask; + int if_speed; cfg = ARGE_READ(sc, AR71XX_MAC_CFG2); cfg &= ~(MAC_CFG2_IFACE_MODE_1000 @@ -702,21 +681,21 @@ switch(media) { case IFM_10_T: cfg |= MAC_CFG2_IFACE_MODE_10_100; - pll = PLL_ETH_INT_CLK_10; + if_speed = 10; break; case IFM_100_TX: cfg |= MAC_CFG2_IFACE_MODE_10_100; ifcontrol |= MAC_IFCONTROL_SPEED; - pll = PLL_ETH_INT_CLK_100; + if_speed = 100; break; case IFM_1000_T: case IFM_1000_SX: cfg |= MAC_CFG2_IFACE_MODE_1000; rx_filtmask |= FIFO_RX_MASK_BYTE_MODE; - pll = PLL_ETH_INT_CLK_1000; + if_speed = 1000; break; default: - pll = PLL_ETH_INT_CLK_100; + if_speed = 100; device_printf(sc->arge_dev, "Unknown media %d\n", media); } @@ -730,22 +709,10 @@ rx_filtmask); /* set PLL registers */ - sec_cfg = ATH_READ_REG(AR71XX_PLL_SEC_CONFIG); - sec_cfg &= ~(3 << sc->arge_pll_reg_shift); - sec_cfg |= (2 << sc->arge_pll_reg_shift); - - ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg); - DELAY(100); - - ATH_WRITE_REG(sc->arge_pll_reg, pll); - - sec_cfg |= (3 << sc->arge_pll_reg_shift); - ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg); - DELAY(100); - - sec_cfg &= ~(3 << sc->arge_pll_reg_shift); - ATH_WRITE_REG(AR71XX_PLL_SEC_CONFIG, sec_cfg); - DELAY(100); + if (sc->arge_mac_unit == 0) + ar71xx_device_set_pll_ge0(if_speed); + else + ar71xx_device_set_pll_ge1(if_speed); } ==== //depot/projects/smpng/sys/mips/atheros/if_argevar.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/mips/atheros/if_argevar.h,v 1.3 2010/07/08 15:20:57 adrian Exp $ + * $FreeBSD: src/sys/mips/atheros/if_argevar.h,v 1.5 2010/08/19 16:29:08 adrian Exp $ */ #ifndef __IF_ARGEVAR_H__ @@ -150,9 +150,6 @@ uint32_t arge_intr_status; int arge_mac_unit; int arge_phymask; - uint32_t arge_ddr_flush_reg; - uint32_t arge_pll_reg; - uint32_t arge_pll_reg_shift; int arge_if_flags; uint32_t arge_debug; struct { ==== //depot/projects/smpng/sys/mips/atheros/uart_bus_ar71xx.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/mips/atheros/uart_bus_ar71xx.c,v 1.1 2010/01/09 18:02:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/atheros/uart_bus_ar71xx.c,v 1.2 2010/08/19 02:03:12 adrian Exp $"); #include #include @@ -41,6 +41,7 @@ #include #include +#include #include "uart_if.h" ==== //depot/projects/smpng/sys/mips/atheros/uart_cpu_ar71xx.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/mips/atheros/uart_cpu_ar71xx.c,v 1.1 2010/01/09 18:02:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/atheros/uart_cpu_ar71xx.c,v 1.2 2010/08/19 02:03:12 adrian Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include +#include #include bus_space_tag_t uart_bus_space_io; ==== //depot/projects/smpng/sys/modules/Makefile#177 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.661 2010/08/12 22:46:31 imp Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.662 2010/08/19 11:31:03 anchie Exp $ .include @@ -257,6 +257,7 @@ ${_scsi_low} \ sdhci \ sem \ + send \ sf \ sge \ siba_bwn \ ==== //depot/projects/smpng/sys/netinet/in.h#52 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.115 2010/03/31 23:02:25 delphij Exp $ + * $FreeBSD: src/sys/netinet/in.h,v 1.116 2010/08/19 11:31:03 anchie Exp $ */ #ifndef _NETINET_IN_H_ @@ -252,6 +252,7 @@ /* Only used internally, so can be outside the range of valid IP protocols. */ #define IPPROTO_DIVERT 258 /* divert pseudo-protocol */ +#define IPPROTO_SEND 259 /* SeND pseudo-protocol */ /* * Defined to avoid confusion. The master value is defined by ==== //depot/projects/smpng/sys/netinet/tcp_input.c#136 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.416 2010/04/29 11:52:42 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.417 2010/08/18 17:39:47 andre Exp $"); #include "opt_ipfw.h" /* for ipfw_fwd */ #include "opt_inet.h" @@ -571,7 +571,7 @@ */ if ((tcp_log_in_vain == 1 && (thflags & TH_SYN)) || tcp_log_in_vain == 2) { - if ((s = tcp_log_addrs(NULL, th, (void *)ip, ip6))) + if ((s = tcp_log_vain(NULL, th, (void *)ip, ip6))) log(LOG_INFO, "%s; %s: Connection attempt " "to closed port\n", s, __func__); } ==== //depot/projects/smpng/sys/netinet/tcp_output.c#68 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_output.c,v 1.169 2010/08/15 13:25:18 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_output.c,v 1.170 2010/08/18 18:05:54 andre Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -140,7 +140,7 @@ { struct socket *so = tp->t_inpcb->inp_socket; long len, recwin, sendwin; - int off, flags, error; + int off, flags, error, rw; struct mbuf *m; struct ip *ip = NULL; struct ipovly *ipov = NULL; @@ -176,23 +176,34 @@ idle = (tp->t_flags & TF_LASTIDLE) || (tp->snd_max == tp->snd_una); if (idle && ticks - tp->t_rcvtime >= tp->t_rxtcur) { /* - * We have been idle for "a while" and no acks are - * expected to clock out any data we send -- - * slow start to get ack "clock" running again. + * If we've been idle for more than one retransmit + * timeout the old congestion window is no longer + * current and we have to reduce it to the restart + * window before we can transmit again. + * + * The restart window is the initial window or the last + * CWND, whichever is smaller. + * + * This is done to prevent us from flooding the path with + * a full CWND at wirespeed, overloading router and switch + * buffers along the way. * - * Set the slow-start flight size depending on whether - * this is a local network or not. + * See RFC5681 Section 4.1. "Restarting Idle Connections". */ - int ss = V_ss_fltsz; + if (V_tcp_do_rfc3390) + rw = min(4 * tp->t_maxseg, + max(2 * tp->t_maxseg, 4380)); #ifdef INET6 - if (isipv6) { - if (in6_localaddr(&tp->t_inpcb->in6p_faddr)) - ss = V_ss_fltsz_local; - } else -#endif /* INET6 */ - if (in_localaddr(tp->t_inpcb->inp_faddr)) - ss = V_ss_fltsz_local; - tp->snd_cwnd = tp->t_maxseg * ss; + else if ((isipv6 ? in6_localaddr(&tp->t_inpcb->in6p_faddr) : + in_localaddr(tp->t_inpcb->inp_faddr))) +#else + else if (in_localaddr(tp->t_inpcb->inp_faddr)) +#endif + rw = V_ss_fltsz_local * tp->t_maxseg; + else + rw = V_ss_fltsz * tp->t_maxseg; + + tp->snd_cwnd = min(rw, tp->snd_cwnd); } tp->t_flags &= ~TF_LASTIDLE; if (idle) { ==== //depot/projects/smpng/sys/netinet/tcp_subr.c#124 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.361 2010/08/18 09:28:12 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.362 2010/08/18 17:39:47 andre Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -268,6 +268,8 @@ static struct inpcb *tcp_notify(struct inpcb *, int); static void tcp_isn_tick(void *); +static char * tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th, + void *ip4hdr, const void *ip6hdr); /* * Target size of TCP PCB hash tables. Must be a power of two. @@ -2234,9 +2236,33 @@ * and ip6_hdr pointers have to be passed as void pointers. */ char * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 19 21:31:53 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A84A1065693; Thu, 19 Aug 2010 21:31:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E161610656A3 for ; Thu, 19 Aug 2010 21:31:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CE90B8FC16 for ; Thu, 19 Aug 2010 21:31:52 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7JLVqcq005799 for ; Thu, 19 Aug 2010 21:31:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7JLVqT5005796 for perforce@freebsd.org; Thu, 19 Aug 2010 21:31:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Aug 2010 21:31:52 GMT Message-Id: <201008192131.o7JLVqT5005796@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2010 21:31:53 -0000 http://p4web.freebsd.org/@@182630?ac=10 Change 182630 by hselasky@hselasky_laptop001 on 2010/08/19 21:31:49 USB network: - add new driver for iPhone Ethernet device Affected files ... .. //depot/projects/usb/src/sys/conf/files#99 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#1 add .. //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#1 add .. //depot/projects/usb/src/sys/modules/usb/Makefile#28 edit .. //depot/projects/usb/src/sys/modules/usb/ipheth/Makefile#1 add Differences ... ==== //depot/projects/usb/src/sys/conf/files#99 (text+ko) ==== @@ -1775,6 +1775,7 @@ dev/usb/net/if_axe.c optional axe dev/usb/net/if_cdce.c optional cdce dev/usb/net/if_cue.c optional cue +dev/usb/net/if_ipheth.c optional ipheth dev/usb/net/if_kue.c optional kue dev/usb/net/if_rue.c optional rue dev/usb/net/if_udav.c optional udav ==== //depot/projects/usb/src/sys/modules/usb/Makefile#28 (text+ko) ==== @@ -31,7 +31,7 @@ SUBDIR += atp uhid ukbd ums udbp ufm SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umodem umoscom uplcom uslcom uvisor uvscom -SUBDIR += uether aue axe cdce cue kue rue udav uhso +SUBDIR += uether aue axe cdce cue kue rue udav uhso ipheth SUBDIR += usfs umass urio SUBDIR += quirk template From owner-p4-projects@FreeBSD.ORG Thu Aug 19 22:32:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F3BF10656A3; Thu, 19 Aug 2010 22:32:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51F6D1065696 for ; Thu, 19 Aug 2010 22:32:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3EFE28FC12 for ; Thu, 19 Aug 2010 22:32:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7JMWE6N019012 for ; Thu, 19 Aug 2010 22:32:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7JMWERv019009 for perforce@freebsd.org; Thu, 19 Aug 2010 22:32:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Aug 2010 22:32:14 GMT Message-Id: <201008192232.o7JMWERv019009@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2010 22:32:14 -0000 http://p4web.freebsd.org/@@182632?ac=10 Change 182632 by hselasky@hselasky_laptop001 on 2010/08/19 22:31:15 USB network (iPhone Ethernet) - add missing init code - add 4G product ID Affected files ... .. //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#2 (text+ko) ==== @@ -164,6 +164,9 @@ {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS, IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, IPHETH_USBINTF_PROTO)}, + {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4G, + IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, + IPHETH_USBINTF_PROTO)}, }; static int @@ -340,7 +343,18 @@ static void ipheth_init(struct usb_ether *ue) { + struct ipheth_softc *sc = uether_getsc(ue); + struct ifnet *ifp = uether_getifp(ue); + + IPHETH_LOCK_ASSERT(sc, MA_OWNED); + ifp->if_drv_flags |= IFF_DRV_RUNNING; + + /* stall data write direction, which depends on USB mode */ + usbd_xfer_set_stall(sc->sc_xfer[IPHETH_BULK_TX]); + + /* start data transfers */ + ipheth_start(ue); } static void ==== //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#2 (text+ko) ==== @@ -37,6 +37,7 @@ #define USB_PRODUCT_IPHONE 0x1290 #define USB_PRODUCT_IPHONE_3G 0x1292 #define USB_PRODUCT_IPHONE_3GS 0x1294 +#define USB_PRODUCT_IPHONE_4G 0x1297 #define IPHETH_USBINTF_CLASS 255 #define IPHETH_USBINTF_SUBCLASS 253 From owner-p4-projects@FreeBSD.ORG Thu Aug 19 23:07:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0620A1065679; Thu, 19 Aug 2010 23:07:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC8E8106566C for ; Thu, 19 Aug 2010 23:07:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A97B18FC14 for ; Thu, 19 Aug 2010 23:07:21 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7JN7Lbw024846 for ; Thu, 19 Aug 2010 23:07:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7JN7LdD024843 for perforce@freebsd.org; Thu, 19 Aug 2010 23:07:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Aug 2010 23:07:21 GMT Message-Id: <201008192307.o7JN7LdD024843@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2010 23:07:22 -0000 http://p4web.freebsd.org/@@182635?ac=10 Change 182635 by hselasky@hselasky_laptop001 on 2010/08/19 23:06:17 USB network (iPhone 3G/3GS/4G ethernet protocol): - fix some protocol issues. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#3 (text+ko) ==== @@ -108,7 +108,7 @@ .direction = UE_DIR_TX, .frames = IPHETH_TX_FRAMES_MAX, .bufsize = (IPHETH_TX_FRAMES_MAX * IPHETH_BUF_SIZE), - .flags = {.force_short_xfer = 1,.ext_buffer = 1,}, + .flags = {.force_short_xfer = 1,}, .callback = ipheth_bulk_write_callback, .timeout = IPHETH_TX_TIMEOUT, }, @@ -387,8 +387,8 @@ { struct ipheth_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); + struct usb_page_cache *pc; struct mbuf *m; - struct mbuf *mt; uint8_t x; int actlen; int aframes; @@ -417,21 +417,24 @@ if (m == NULL) break; - if (m->m_len != m->m_pkthdr.len) { - mt = m_defrag(m, M_DONTWAIT); - if (mt == NULL) { - m_freem(m); - ifp->if_oerrors++; - continue; - } - m = mt; - } - if (m->m_pkthdr.len > MCLBYTES) { - m->m_pkthdr.len = MCLBYTES; - } + usbd_xfer_set_frame_offset(xfer, + x * IPHETH_BUF_SIZE, x); + + pc = usbd_xfer_get_frame(xfer, x); + sc->sc_tx_buf[x] = m; - usbd_xfer_set_frame_data(xfer, x, m->m_data, m->m_len); + if (m->m_pkthdr.len > IPHETH_BUF_SIZE) + m->m_pkthdr.len = IPHETH_BUF_SIZE; + + usbd_m_copy_in(pc, 0, m, 0, m->m_pkthdr.len); + + usbd_xfer_set_frame_len(xfer, x, IPHETH_BUF_SIZE); + + if (IPHETH_BUF_SIZE != m->m_pkthdr.len) { + usbd_frame_zero(pc, m->m_pkthdr.len, + IPHETH_BUF_SIZE - m->m_pkthdr.len); + } /* * If there's a BPF listener, bounce a copy of @@ -488,12 +491,16 @@ sc->sc_rx_buf[x] = NULL; len = usbd_xfer_frame_len(xfer, x); - if (len < sizeof(struct ether_header)) { + if (len < (sizeof(struct ether_header) + + IPHETH_RX_ADJ)) { m_freem(m); continue; } + + m_adj(m, IPHETH_RX_ADJ); + /* queue up mbuf */ - uether_rxmbuf(&sc->sc_ue, m, len); + uether_rxmbuf(&sc->sc_ue, m, len - IPHETH_RX_ADJ); } /* FALLTHROUGH */ ==== //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#3 (text+ko) ==== @@ -49,6 +49,8 @@ #define IPHETH_RX_FRAMES_MAX 1 #define IPHETH_TX_FRAMES_MAX 8 +#define IPHETH_RX_ADJ 2 + #define IPHETH_CFG_INDEX 0 #define IPHETH_IF_INDEX 2 #define IPHETH_ALT_INTFNUM 1 From owner-p4-projects@FreeBSD.ORG Thu Aug 19 23:13:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 212DC1065698; Thu, 19 Aug 2010 23:13:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D71231065673 for ; Thu, 19 Aug 2010 23:13:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C427C8FC1C for ; Thu, 19 Aug 2010 23:13:57 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7JNDvdb027495 for ; Thu, 19 Aug 2010 23:13:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7JNDv8C027492 for perforce@freebsd.org; Thu, 19 Aug 2010 23:13:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Aug 2010 23:13:57 GMT Message-Id: <201008192313.o7JNDv8C027492@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2010 23:13:58 -0000 http://p4web.freebsd.org/@@182636?ac=10 Change 182636 by hselasky@hselasky_laptop001 on 2010/08/19 23:13:23 USB network: - correct maximum RX buffer size. - correct for execution on ARM (IP-header alignment) Affected files ... .. //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#4 (text+ko) ==== @@ -96,7 +96,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_RX, .frames = IPHETH_RX_FRAMES_MAX, - .bufsize = (IPHETH_RX_FRAMES_MAX * IPHETH_BUF_SIZE), + .bufsize = (IPHETH_RX_FRAMES_MAX * MCLBYTES), .flags = {.short_frames_ok = 1,.short_xfer_ok = 1,.ext_buffer = 1,}, .callback = ipheth_bulk_read_callback, .timeout = 0, /* no timeout */ @@ -511,6 +511,10 @@ m = uether_newbuf(); if (m == NULL) goto tr_stall; + + /* cancel alignment for ethernet */ + m_adj(m, ETHER_ALIGN); + sc->sc_rx_buf[x] = m; } else { m = sc->sc_rx_buf[x]; From owner-p4-projects@FreeBSD.ORG Fri Aug 20 07:35:09 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBE3C10656A6; Fri, 20 Aug 2010 07:35:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C97A10656A4 for ; Fri, 20 Aug 2010 07:35:09 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5F5D18FC20 for ; Fri, 20 Aug 2010 07:35:08 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7K7Z8Tc031000 for ; Fri, 20 Aug 2010 07:35:08 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7K7Z80x030997 for perforce@freebsd.org; Fri, 20 Aug 2010 07:35:08 GMT (envelope-from dforsyth@FreeBSD.org) Date: Fri, 20 Aug 2010 07:35:08 GMT Message-Id: <201008200735.o7K7Z80x030997@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 07:35:10 -0000 http://p4web.freebsd.org/@@182645?ac=10 Change 182645 by dforsyth@skunk on 2010/08/20 07:34:42 A few of the changes Tim suggested. This is the main libpkg repository now. Affected files ... .. //depot/projects/soc2010/dforsyth_libpkg/doc/man/pkg_database.3#1 add .. //depot/projects/soc2010/dforsyth_libpkg/doc/man/pkg_freebsd.3#1 add .. //depot/projects/soc2010/dforsyth_libpkg/doc/man/pkg_repository.3#1 add .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/Makefile#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/base.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database_internal.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/exec.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/exec.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/exec_internal.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_repository_ftp.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_repository_ftp.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_repository_path.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_repository_path.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/internal.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/logger.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/logger.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.c#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_freebsd.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_freebsd.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_internal.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_pkg.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/property.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/property.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/repository.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/repository.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/repository_internal.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/util.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/util.h#2 edit Differences ... ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/Makefile#3 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/base.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.c#2 (text+ko) ==== @@ -49,17 +49,20 @@ } /* Release a package database from memory. */ -void +int pkg_database_release(struct pkg_database *db) { _pkg_database_check_magic(db, __func__); if (db->status != CLOSED) { - warnx("closing pkg_database before free()"); - db->vtable->close(db); + if (db->vtable->close(db) != PKG_OK) { + warnx("db->vtable->close() failed."); + return (PKG_NOT_OK); + } } + free(db); - free(db); + return (PKG_OK); } void @@ -169,8 +172,7 @@ _pkg_check_magic(p, __func__); if (db->status != OPEN) { - /* Just leave. */ - return (PKG_NOT_OK); + PKG_CLIENT_CRASH(__func__, "db->status != OPEN"); } /* Log this action. */ /* ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.h#2 (text+ko) ==== @@ -15,7 +15,9 @@ struct pkg_database *pkg_database_create(void); -void pkg_database_release(struct pkg_database *); +int pkg_database_release(struct pkg_database *); + +uid_t pkg_database_owner(struct pkg_database *); /* Get the next package in a database. */ int pkg_database_get_next_pkg(struct pkg_database *, struct pkg *, u_int); ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database_internal.h#2 (text+ko) ==== @@ -16,6 +16,7 @@ int (*get_pkg) (struct pkg_database *, struct pkg *, u_int); int (*rewind) (struct pkg_database *); int (*open) (struct pkg_database *, const char *, u_int); + uid_t (*owner) (struct pkg_database *); }; /* Define the package database type. */ ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/exec.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/exec.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/exec_internal.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.c#2 (text+ko) ==== @@ -26,6 +26,7 @@ static int _write_pkg(struct pkg_database *, struct pkg *, u_int); static int _pkg_database_directorydb_open(struct pkg_database *, const char *, u_int); +static uid_t _pkg_database_directorydb_owner(struct pkg_database *); static int _pkg_database_directorydb_rewind(struct pkg_database *); static int _pkg_database_directorydb_close(struct pkg_database *); static int _pkg_database_directorydb_add_pkg(struct pkg_database *, @@ -41,7 +42,8 @@ .add_pkg = _pkg_database_directorydb_add_pkg, .remove_pkg = _pkg_database_directorydb_remove_pkg, .rewind = _pkg_database_directorydb_rewind, - .get_next_pkg = _pkg_database_directorydb_get_next_pkg + .get_next_pkg = _pkg_database_directorydb_get_next_pkg, + .owner = _pkg_database_directorydb_owner }; @@ -74,6 +76,20 @@ return ("directorydb"); } +static uid_t +_pkg_database_directorydb_owner(struct pkg_database *db) +{ + struct _directorydb *d; + struct stat sb; + + d = db->internal; + if (d == NULL || lstat(d->location[0], &sb) < 0) { + return (-1); + } + + return (sb.st_uid); +} + static int _pkg_database_directorydb_open(struct pkg_database *db, const char *path, u_int flags) ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_repository_ftp.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_repository_ftp.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_repository_path.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_repository_path.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/internal.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/logger.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/logger.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.c#3 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.h#3 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_freebsd.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_freebsd.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_internal.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_pkg.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/property.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/property.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/repository.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/repository.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/repository_internal.h#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/util.c#2 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/util.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Aug 20 10:19:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22CEB1065694; Fri, 20 Aug 2010 10:19:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D980B1065670; Fri, 20 Aug 2010 10:19:44 +0000 (UTC) (envelope-from webmaster@kibab.com) Received: from mx0.deglitch.com (backbone.deglitch.com [78.110.53.255]) by mx1.freebsd.org (Postfix) with ESMTP id 898CA8FC1A; Fri, 20 Aug 2010 10:19:44 +0000 (UTC) Received: from kibab-work.smstraffic.ru (unknown [195.94.237.82]) by mx0.deglitch.com (Postfix) with ESMTPA id 813908FC4E; Fri, 20 Aug 2010 14:19:10 +0400 (MSD) Date: Fri, 20 Aug 2010 14:19:00 +0400 From: Ilya Bakulin To: John Baldwin Message-ID: <20100820141900.6a4483dc@kibab-work.smstraffic.ru> In-Reply-To: <201008181615.06129.jhb@freebsd.org> References: <201008180726.o7I7QqiO021823@skunkworks.freebsd.org> <201008181615.06129.jhb@freebsd.org> Organization: ON Labs X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i386-portbld-freebsd8.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/O3gUF.v97ot1eesKNyj5P_v"; protocol="application/pgp-signature" Cc: Perforce Change Reviews , Ilya Bakulin Subject: Re: PERFORCE change 182552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 10:19:45 -0000 --Sig_/O3gUF.v97ot1eesKNyj5P_v Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: quoted-printable =F7 Wed, 18 Aug 2010 16:15:06 -0400 John Baldwin =D0=C9=DB=C5=D4: > > =3D=3D=3D=3D //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern= _malloc.c#4 (text+ko) =3D=3D=3D=3D > > =20 > > +#ifdef PAE > > +FEATURE(pae, "Physical Address Extensions support"); > > +#endif > > + >=20 > There should already be a PAE feature present in sys/i386/i386/machdep.c. >=20 Oops, yes. It is there. And it is far more suitable place for this feature = declaration, because PAE is architecture-dependent feature. I'll remove my declaration. --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD, =E9=CC=D8=D1 =E2=C1=CB=D5=CC=C9=CE (ON Labs) --Sig_/O3gUF.v97ot1eesKNyj5P_v Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (FreeBSD) iEYEARECAAYFAkxuVpwACgkQo9vlj1oadwiCeACgv5jern/p5HZWGQ4vwf+6W3Sr gkIAn0PWzWsJObSYsdyfGCWfki9z6QHY =bkTY -----END PGP SIGNATURE----- --Sig_/O3gUF.v97ot1eesKNyj5P_v-- From owner-p4-projects@FreeBSD.ORG Fri Aug 20 11:19:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F29710656AE; Fri, 20 Aug 2010 11:19:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E51FE1065693 for ; Fri, 20 Aug 2010 11:19:03 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D1ACF8FC1B for ; Fri, 20 Aug 2010 11:19:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7KBJ37l085754 for ; Fri, 20 Aug 2010 11:19:03 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7KBJ3eG085751 for perforce@freebsd.org; Fri, 20 Aug 2010 11:19:03 GMT (envelope-from lz@FreeBSD.org) Date: Fri, 20 Aug 2010 11:19:03 GMT Message-Id: <201008201119.o7KBJ3eG085751@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 11:19:04 -0000 http://p4web.freebsd.org/@@182649?ac=10 Change 182649 by lz@gnehzuil-freebsd on 2010/08/20 11:18:29 Remove reservation window codes to prepare for generating a patch. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_alloc.c#3 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_balloc.c#3 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode.c#4 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#10 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#7 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/inode.h#6 edit Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_alloc.c#3 (text+ko) ==== @@ -50,11 +50,7 @@ #include #include #include -#include -/* Just for clear */ -#define phy_blk(cg, fs) (((cg) * (fs->e2fs->e2fs_fpg)) + fs->e2fs->e2fs_first_dblock) - static daddr_t ext2_alloccg(struct inode *, int, daddr_t, int); static u_long ext2_dirpref(struct inode *); static void ext2_fserr(struct m_ext2fs *, uid_t, char *); @@ -63,521 +59,39 @@ int)); static daddr_t ext2_nodealloccg(struct inode *, int, daddr_t, int); static daddr_t ext2_mapsearch(struct m_ext2fs *, char *, daddr_t); - -/* For reservation window */ -static u_long ext2_alloc_blk(struct inode *, int, struct buf *, int32_t, struct ext2_rsv_win *); -static int ext2_alloc_new_rsv(struct inode *, int, struct buf *, int32_t); -static int ext2_bpref_in_rsv(struct ext2_rsv_win *, int32_t); -static int ext2_find_rsv(struct ext2_rsv_win *, struct ext2_rsv_win *, - struct m_ext2fs *, int32_t, int); -static void ext2_remove_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *); -static u_long ext2_rsvalloc(struct m_ext2fs *, struct inode *, - int, struct buf *, int32_t, int); -static daddr_t ext2_search_next_block(struct m_ext2fs *, char *, int, int); -static struct ext2_rsv_win *ext2_search_rsv(struct ext2_rsv_win_tree *, int32_t); - -RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rsv_link, ext2_rsv_win_cmp); - /* * Allocate a block in the file system. * - * By given preference: - * It checks whether inode has a reservation window and preference - * is within it. If so, it will try to allocate a free block from - * this reservation window. - * Otherwise, it traverses RB tree to find a place, which is not - * in any window. then it inserts it to RB tree and tries to allocate - * a free block again. - * If fails, it will try to allocate a free block in other cylinder - * groups without perference. - */ - -/* - * Allocate a free block. + * A preference may be optionally specified. If a preference is given + * the following hierarchy is used to allocate a block: + * 1) allocate the requested block. + * 2) allocate a rotationally optimal block in the same cylinder. + * 3) allocate a block in the same cylinder group. + * 4) quadradically rehash into other cylinder groups, until an + * available block is located. + * If no block preference is given the following hierarchy is used + * to allocate a block: + * 1) allocate a block in the cylinder group that contains the + * inode for the file. + * 2) quadradically rehash into other cylinder groups, until an + * available block is located. * - * Firstly it checks whether reservation window is used. - * If it use reservation window, it will try to allocate a free - * block from the reservation window. If failed, it will traverse - * the bitmap to find a free block. - * If it not use reservation window, it will try to allocate - * a free block by bpref. If failed, it will traverse the bitmap - * to find a free block. - */ -static u_long -ext2_alloc_blk(struct inode *ip, int cg, struct buf *bp, - int32_t bpref, struct ext2_rsv_win *rp) -{ - struct m_ext2fs *fs; - struct ext2mount *ump; - int bno, start, end; - char *bbp; - - fs = ip->i_e2fs; - ump = ip->i_ump; - bbp = (char *)bp->b_data; - - if (fs->e2fs_gd[cg].ext2bgd_nbfree_lo == 0) - return (0); - - if (bpref < 0) - bpref = 0; - - /* Check whther it use reservation window */ - if (rp != NULL) { - /* - * If window's start is not in this cylinder group, - * try to allocate from the beginning of this group. - * Otherwise, try to allocate from the beginning of - * the window. - */ - if (dtog(fs, rp->rsv_start) != cg) - start = phy_blk(cg, fs); - else - start = rp->rsv_start; - - /* - * If window's end cross the end of this group, - * set end variable to the end of this group. - * Otherwise, set it to window's end. - */ - if (dtog(fs, rp->rsv_end) != cg) - end = fs->e2fs->e2fs_fpg; - else - end = rp->rsv_end; - - /* If preference block is within the window, try to allocate it. */ - if (start <= bpref && bpref <= end) { - bpref = dtogd(fs, bpref); - if (isclr(bbp, bpref)) { - rp->rsv_alloc_hit++; - bno = bpref; - goto gotit; - } - } else - bpref = dtogd(fs, rp->rsv_start); - } else { - if (dtog(fs, bpref) != cg) - bpref = 0; - if (bpref != 0) { - bpref = dtogd(fs, bpref); - if (isclr(bbp, bpref)) { - bno = bpref; - goto gotit; - } - } - } - - bno = ext2_mapsearch(fs, bbp, bpref); - if (bno < 0) - return (0); - -gotit: - setbit(bbp, (daddr_t)bno); - EXT2_LOCK(ump); - fs->e2fs->e2fs_fbcount_lo--; - fs->e2fs_gd[cg].ext2bgd_nbfree_lo--; - fs->e2fs_fmod = 1; - EXT2_UNLOCK(ump); - bdwrite(bp); - bno = phy_blk(cg, fs) + bno; - ip->i_next_alloc_goal = bno; - return (bno); -} - -/* - * Initialize reservation window per inode. - */ -void -ext2_init_rsv(struct inode *ip) -{ - struct ext2_rsv_win *rp; - - rp = malloc(sizeof(struct ext2_rsv_win), - M_EXT2NODE, M_WAITOK | M_ZERO); - - /* - * If malloc failed, we just do not use - * reservation window mechanism. - */ - if (rp == NULL) - return; - - rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; - rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; - - rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; - rp->rsv_alloc_hit = 0; - - ip->i_rsv = rp; -} - -/* - * Discard reservation window. - * - * It is called at following locations: - * 1. free an inode - * 2. sync inode - * 3. truncate a file - */ -void -ext2_discard_rsv(struct inode *ip) -{ - struct ext2_rsv_win *rp; - - if (ip->i_rsv == NULL) - return; - - rp = ip->i_rsv; - - /* If reservation window is empty, nothing to do */ - if (rp->rsv_end == EXT2_RSV_NOT_ALLOCATED) - return; - - EXT2_TREE_LOCK(ip->i_e2fs); - ext2_remove_rsv_win(ip->i_e2fs, rp); - EXT2_TREE_UNLOCK(ip->i_e2fs); - rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; -} - -/* - * Remove a ext2_rsv_win structure from RB tree. - */ -static void -ext2_remove_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp) -{ - RB_REMOVE(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp); - rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; - rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; - rp->rsv_alloc_hit = 0; -} - -/* - * Check bpref is in the reservation window. - */ -static int -ext2_bpref_in_rsv(struct ext2_rsv_win *rp, int32_t bpref) -{ - if (bpref >= 0 && (bpref < rp->rsv_start || bpref > rp->rsv_end)) - return (0); - - return (1); -} - -/* - * Search a tree node from RB tree. It includes the bpref or - * the previous one if bpref is not in any window. - */ -static struct ext2_rsv_win * -ext2_search_rsv(struct ext2_rsv_win_tree *root, int32_t start) -{ - struct ext2_rsv_win *prev, *next; - - if (RB_EMPTY(root)) - return (NULL); - - next = RB_ROOT(root); - do { - prev = next; - if (start < next->rsv_start) - next = RB_LEFT(next, rsv_link); - else if (start > next->rsv_end) - next = RB_RIGHT(next, rsv_link); - else - return (next); - } while (next != NULL); - - if (prev->rsv_start > start) { - next = RB_PREV(ext2_rsv_win_tree, root, prev); - if (next != NULL) - prev = next; - } - - return (prev); -} - -/* - * Find a reservation window by given range from start to - * the end of this cylinder group. - */ -static int -ext2_find_rsv(struct ext2_rsv_win *search, struct ext2_rsv_win *rp, - struct m_ext2fs *fs, int32_t start, int cg) -{ - struct ext2_rsv_win *rsv, *prev; - int32_t cur; - int size = rp->rsv_goal_size; - - if (search == NULL) { - rp->rsv_start = start & ~7; - rp->rsv_end = start + size - 1; - rp->rsv_alloc_hit = 0; - - RB_INSERT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp); - - return (0); - } - - /* - * Make the start of reservation window byte-aligned - * in order to can find a free block with bit operations - * in ext2_search_next_block() function. - */ - cur = start & ~7; - rsv = search; - prev = NULL; - - while (1) { - if (cur <= rsv->rsv_end) - cur = rsv->rsv_end + 1; - - if (dtog(fs, cur) != cg) - return (-1); - - prev = rsv; - rsv = RB_NEXT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rsv); - - if (rsv == NULL) - break; - - if (cur + size <= rsv->rsv_start) - break; - } - - if (prev != rp && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) - ext2_remove_rsv_win(fs, rp); - - rp->rsv_start = cur; - rp->rsv_end = cur + size - 1; - rp->rsv_alloc_hit = 0; - - if (prev != rp) - RB_INSERT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp); - - return (0); -} - -/* - * Find a free block by given range from bpref to - * the end of this cylinder group. - */ -static daddr_t -ext2_search_next_block(struct m_ext2fs *fs, char *bbp, int bpref, int cg) -{ - daddr_t bno; - int start, loc, len, map, i; - - start = bpref / NBBY; - len = howmany(fs->e2fs->e2fs_fpg, NBBY) - start; - loc = skpc(0xff, len, &bbp[start]); - if (loc == 0) - return (-1); - - i = start + len - loc; - map = bbp[i]; - bno = i * NBBY; - for (i = 1; i < (1 << NBBY); i <<= 1, bno++) { - if ((map & i) == 0) - return (bno); - } - - return (-1); -} - -/* - * Allocate a new reservation window. - */ -static int -ext2_alloc_new_rsv(struct inode *ip, int cg, struct buf *bp, int32_t bpref) -{ - struct m_ext2fs *fs; - struct ext2_rsv_win *rp, *search; - char *bbp; - int start, size, ret; - - fs = ip->i_e2fs; - rp = ip->i_rsv; - bbp = bp->b_data; - size = rp->rsv_goal_size; - - if (bpref <= 0) - start = phy_blk(cg, fs); - else - start = bpref; - - /* Dynamically increase the size of window */ - if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) { - if (rp->rsv_alloc_hit > - ((rp->rsv_end - rp->rsv_start + 1) / 2)) { - size = size * 2; - if (size > EXT2_RSV_MAX_RESERVE_BLKS) - size = EXT2_RSV_MAX_RESERVE_BLKS; - rp->rsv_goal_size = size; - } - } - - EXT2_TREE_LOCK(fs); - - search = ext2_search_rsv(&fs->e2fs_rsv_tree, start); - -repeat: - ret = ext2_find_rsv(search, rp, fs, start, cg); - if (ret < 0) { - if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) - ext2_remove_rsv_win(fs, rp); - EXT2_TREE_UNLOCK(fs); - return (-1); - } - EXT2_TREE_UNLOCK(fs); - - start = dtogd(fs, rp->rsv_start); - start = ext2_search_next_block(fs, bbp, start, cg); - if (start < 0) { - EXT2_TREE_LOCK(fs); - if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) - ext2_remove_rsv_win(fs, rp); - EXT2_TREE_UNLOCK(fs); - return (-1); - } - - start = phy_blk(cg, fs) + start; - if (start >= rp->rsv_start && start <= rp->rsv_end) - return (0); - - search = rp; - EXT2_TREE_LOCK(fs); - goto repeat; -} - -/* - * Allocate a free block from reservation window. + * A preference may be optionally specified. If a preference is given + * the following hierarchy is used to allocate a block: + * 1) allocate the requested block. + * 2) allocate a rotationally optimal block in the same cylinder. + * 3) allocate a block in the same cylinder group. + * 4) quadradically rehash into other cylinder groups, until an + * available block is located. + * If no block preference is given the following hierarchy is used + * to allocate a block: + * 1) allocate a block in the cylinder group that contains the + * inode for the file. + * 2) quadradically rehash into other cylinder groups, until an + * available block is located. */ -static u_long -ext2_rsvalloc(struct m_ext2fs *fs, struct inode *ip, int cg, - struct buf *bp, int32_t bpref, int size) -{ - struct ext2_rsv_win *rp; - int ret; - - rp = ip->i_rsv; - if (rp == NULL) - return (ext2_alloc_blk(ip, cg, bp, bpref, NULL)); - if (rp->rsv_end == EXT2_RSV_NOT_ALLOCATED || - !ext2_bpref_in_rsv(rp, bpref)) { - ret = ext2_alloc_new_rsv(ip, cg, bp, bpref); - if (ret < 0) - return (0); - } - - return (ext2_alloc_blk(ip, cg, bp, bpref, rp)); -} - -/* - * Allocate a block using reservation window in ext2 file system. - * - * NOTE: This function will replace the ext2_alloc() function. - */ int -ext2_alloc_rsv(struct inode *ip, int32_t lbn, int32_t bpref, - int size, struct ucred *cred, int32_t *bnp) -{ - struct m_ext2fs *fs; - struct ext2mount *ump; - struct buf *bp; - int32_t bno = 0; - int i, cg, error; - - *bnp = 0; - fs = ip->i_e2fs; - ump = ip->i_ump; - mtx_assert(EXT2_MTX(ump), MA_OWNED); - - if (size == fs->e2fs_bsize && fs->e2fs->e2fs_fbcount_lo == 0) - goto nospace; - if (cred->cr_uid != 0 && - fs->e2fs->e2fs_fbcount_lo < fs->e2fs->e2fs_rbcount_lo) - goto nospace; - - if (bpref >= fs->e2fs->e2fs_bcount_lo) - bpref = 0; - if (bpref == 0) - cg = ino_to_cg(fs, ip->i_number); - else - cg = dtog(fs, bpref); - - /* If cg has some free blocks, then try to allocate a free block from this cg */ - if (fs->e2fs_gd[cg].ext2bgd_nbfree_lo > 0) { - /* Read block bitmap from buffer */ - EXT2_UNLOCK(ump); - error = bread(ip->i_devvp, - fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap_lo), - (int)fs->e2fs_bsize, NOCRED, &bp); - if (error) { - brelse(bp); - goto ioerror; - } - - EXT2_RSV_LOCK(ip); - /* Try to allocate from reservation window */ - bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size); - EXT2_RSV_UNLOCK(ip); - if (bno > 0) - goto allocated; - - brelse(bp); - EXT2_LOCK(ump); - } - - /* Just need to try to allocate a free block from rest groups. */ - cg = (cg + 1) % fs->e2fs_gcount; - for (i = 1; i < fs->e2fs_gcount; i++) { - if (fs->e2fs_gd[cg].ext2bgd_nbfree_lo > 0) { - /* Read block bitmap from buffer */ - EXT2_UNLOCK(ump); - error = bread(ip->i_devvp, - fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap_lo), - (int)fs->e2fs_bsize, NOCRED, &bp); - if (error) { - brelse(bp); - goto ioerror; - } - - EXT2_RSV_LOCK(ip); - bno = ext2_rsvalloc(fs, ip, cg, bp, -1, size); - EXT2_RSV_UNLOCK(ip); - if (bno > 0) - goto allocated; - - brelse(bp); - EXT2_LOCK(ump); - } - - cg++; - if (cg == fs->e2fs_gcount) - cg = 0; - } - -allocated: - if (bno > 0) { - ip->i_blocks += btodb(fs->e2fs_bsize); - ip->i_flag |= IN_CHANGE | IN_UPDATE; - *bnp = bno; - return (0); - } - -nospace: - EXT2_UNLOCK(ump); - ext2_fserr(fs, cred->cr_uid, "file system full"); - uprintf("\n%s: write failed, file system is full\n", fs->e2fs_fsmnt); - return (ENOSPC); - -ioerror: - ext2_fserr(fs, cred->cr_uid, "file system IO error"); - uprintf("\n%s: write failed, file system IO error\n", fs->e2fs_fsmnt); - return EIO; -} - -int ext2_alloc(ip, lbn, bpref, size, cred, bnp) struct inode *ip; int32_t lbn, bpref; @@ -632,7 +146,7 @@ * Reallocate a sequence of blocks into a contiguous sequence of blocks. * * The vnode and an array of buffer pointers for a range of sequential - * logicar blocks to be made contiguous is given. The allocator attempts + * logical blocks to be made contiguous is given. The allocator attempts * to find a range of sequential blocks starting as close as possible to * an fs_rotdelay offset from the end of the allocation for the logical * block immediately preceding the current range. If successful, the @@ -1409,11 +923,9 @@ start = 0; loc = skpc(0xff, len, &bbp[start]); if (loc == 0) { - /* XXX: just for reservation window */ - return -1; - /*printf("start = %d, len = %d, fs = %s\n",*/ - /*start, len, fs->e2fs_fsmnt);*/ - /*panic("ext2fs_alloccg: map corrupted");*/ + printf("start = %d, len = %d, fs = %s\n", + start, len, fs->e2fs_fsmnt); + panic("ext2fs_alloccg: map corrupted"); /* NOTREACHED */ } } ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_balloc.c#3 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include /* * Balloc defines the structure of file system storage * by allocating the physical blocks on a device given @@ -137,14 +136,9 @@ else nsize = fs->e2fs_bsize; EXT2_LOCK(ump); -/* error = ext2_alloc(ip, lbn, ext2_blkpref(ip, lbn, (int)lbn, &ip->i_db[0], 0), nsize, cred, &newb); -*/ - error = ext2_alloc_rsv(ip, lbn, - ext2_blkpref(ip, lbn, (int)lbn, &ip->i_db[0], 0), - nsize, cred, &newb); if (error) return (error); bp = getblk(vp, lbn, nsize, 0, 0, 0); @@ -176,14 +170,9 @@ EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[0].in_off + EXT2_NDIR_BLOCKS, &ip->i_db[0], 0); -/* if ((error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb))) return (error); -*/ - if ((error = ext2_alloc_rsv(ip, lbn, pref, - (int)fs->e2fs_bsize, cred, &newb))) - return (error); nb = newb; bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, 0, 0); bp->b_blkno = fsbtodb(fs, newb); @@ -222,10 +211,7 @@ if (pref == 0) pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap, bp->b_lblkno); -/* error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); -*/ - error = ext2_alloc_rsv(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); if (error) { brelse(bp); return (error); @@ -264,18 +250,11 @@ EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[i].in_off, &bap[0], bp->b_lblkno); -/* if ((error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb)) != 0) { brelse(bp); return (error); } -*/ - if ((error = ext2_alloc_rsv(ip, lbn, pref, - (int)fs->e2fs_bsize, cred, &newb)) != 0) { - brelse(bp); - return (error); - } nb = newb; nbp = getblk(vp, lbn, fs->e2fs_bsize, 0, 0, 0); nbp->b_blkno = fsbtodb(fs, nb); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode.c#4 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int, long *); @@ -155,10 +154,6 @@ fs = oip->i_e2fs; osize = oip->i_size; - EXT2_RSV_LOCK(oip); - ext2_discard_rsv(oip); - EXT2_RSV_UNLOCK(oip); - /* * Lengthen the size of the file. We must ensure that the * last byte of the file is allocated. Since the smallest @@ -490,10 +485,6 @@ if (prtactive && vrefcnt(vp) != 0) vprint("ext2_inactive: pushing active", vp); - EXT2_RSV_LOCK(ip); - ext2_discard_rsv(ip); - EXT2_RSV_UNLOCK(ip); - /* * Ignore inodes related to stale file handles. */ @@ -542,14 +533,6 @@ } vfs_hash_remove(vp); - EXT2_RSV_LOCK(ip); - if (ip->i_rsv != NULL) { - free(ip->i_rsv, M_EXT2NODE); - ip->i_rsv = NULL; - } - EXT2_RSV_UNLOCK(ip); - mtx_destroy(&ip->i_rsv_lock); - mtx_destroy(&ip->i_ext_lock); free(vp->v_data, M_EXT2NODE); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#10 (text+ko) ==== @@ -679,12 +679,6 @@ if ((error = compute_sb_data(devvp, ump->um_e2fs->e2fs, ump->um_e2fs))) goto out; - /* Initial reservation window index and lock */ - bzero(&ump->um_e2fs->e2fs_rsv_lock, sizeof(struct mtx)); - mtx_init(&ump->um_e2fs->e2fs_rsv_lock, - "rsv tree lock", NULL, MTX_DEF); - RB_INIT(&ump->um_e2fs->e2fs_rsv_tree); - brelse(bp); bp = NULL; fs = ump->um_e2fs; @@ -784,7 +778,6 @@ g_topology_unlock(); PICKUP_GIANT(); vrele(ump->um_devvp); - mtx_destroy(&fs->e2fs_rsv_lock); free(fs->e2fs_fg, M_EXT2MNT); free(fs->e2fs_gd, M_EXT2MNT); free(fs->e2fs_contigdirs, M_EXT2MNT); @@ -1029,15 +1022,6 @@ ip->i_prealloc_count = 0; ip->i_prealloc_block = 0; - /* initialize rsv lock and rsv data structure */ - bzero(&ip->i_rsv_lock, sizeof(struct mtx)); - mtx_init(&ip->i_rsv_lock, "inode rsv lock", NULL, MTX_DEF); - EXT2_RSV_LOCK(ip); - ip->i_rsv = NULL; - if (ip->i_rsv == NULL) - ext2_init_rsv(ip); - EXT2_RSV_UNLOCK(ip); - /* initialize ext lock */ bzero(&ip->i_ext_lock, sizeof(struct mtx)); mtx_init(&ip->i_ext_lock, "inode ext lock", NULL, MTX_DEF); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#7 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include /* @@ -215,9 +214,6 @@ off_t e2fs_maxfilesize; struct ext2_gd *e2fs_gd; /* Group Descriptors */ - struct mtx e2fs_rsv_lock; /* Protect reservation window RB tree */ - struct ext2_rsv_win_tree e2fs_rsv_tree; /* Reservation window index */ - u_int8_t e2fs_log_gpf; /* FLEX_BG group size */ int e2fs_descpbbits; struct ext4_flex_groups *e2fs_fg; ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/inode.h#6 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include -#include #include #define ROOTINO ((ino_t)2) @@ -106,10 +105,6 @@ u_int32_t i_uid; /* File owner. */ u_int32_t i_gid; /* File group. */ - /* reservation window */ - struct mtx i_rsv_lock; /* Protects i_rsv */ - struct ext2_rsv_win *i_rsv; /* Reservation window */ - /* ext4 extents support */ struct mtx i_ext_lock; /* this lock only is required in read/write mode but we still use it in read-only mode. */ From owner-p4-projects@FreeBSD.ORG Fri Aug 20 11:20:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD19A1065695; Fri, 20 Aug 2010 11:20:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A351D1065670 for ; Fri, 20 Aug 2010 11:20:09 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 774D98FC1A for ; Fri, 20 Aug 2010 11:20:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7KBK9ac085906 for ; Fri, 20 Aug 2010 11:20:09 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7KBK95b085902 for perforce@freebsd.org; Fri, 20 Aug 2010 11:20:09 GMT (envelope-from lz@FreeBSD.org) Date: Fri, 20 Aug 2010 11:20:09 GMT Message-Id: <201008201120.o7KBK95b085902@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 11:20:10 -0000 http://p4web.freebsd.org/@@182650?ac=10 Change 182650 by lz@gnehzuil-freebsd on 2010/08/20 11:19:12 Remove ext2_rsv_win.h file. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_rsv_win.h#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Aug 20 12:56:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAA0810656A9; Fri, 20 Aug 2010 12:56:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D2B81065698 for ; Fri, 20 Aug 2010 12:56:46 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 60E7B8FC1C for ; Fri, 20 Aug 2010 12:56:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7KCukeQ005920 for ; Fri, 20 Aug 2010 12:56:46 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7KCukK5005917 for perforce@freebsd.org; Fri, 20 Aug 2010 12:56:46 GMT (envelope-from lz@FreeBSD.org) Date: Fri, 20 Aug 2010 12:56:46 GMT Message-Id: <201008201256.o7KCukK5005917@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 12:56:47 -0000 http://p4web.freebsd.org/@@182652?ac=10 Change 182652 by lz@gnehzuil-freebsd on 2010/08/20 12:55:46 Fix a bug in mount ext2 file system. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#11 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#8 edit Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#11 (text+ko) ==== @@ -420,11 +420,8 @@ } if (E2FS_REV0_INODE_SIZE + fs->e2fs_want_extra_isize > - fs->e2fs_isize) { + fs->e2fs_isize) printf("EXT2-fs: no space for extra inode.\n"); - return (EIO); - } - return (0); } @@ -956,7 +953,7 @@ struct cdev *dev; struct thread *td; int error; - /*int i, used_blocks;*/ + int i, used_blocks; td = curthread; error = vfs_hash_get(mp, ino, flags, td, vpp, NULL, NULL); @@ -1036,16 +1033,15 @@ * NOTE: When ext4 file system use extents, we don't zero * block pointers. */ -#if 0 - if(S_ISDIR(ip->i_mode) || S_ISREG(ip->i_mode)) { - used_blocks = (ip->i_size+fs->e2fs_bsize-1) / fs->e2fs_bsize; - for(i = used_blocks; i < EXT2_NDIR_BLOCKS; i++) - ip->i_db[i] = 0; - } -#endif + if (!(fs->e2fs->e2fs_features_incompat & EXT4F_INCOMPAT_EXTENTS)) { + if (S_ISDIR(ip->i_mode) || S_ISREG(ip->i_mode)) { + used_blocks = (ip->i_size+fs->e2fs_bsize-1) / fs->e2fs_bsize; + for(i = used_blocks; i < EXT2_NDIR_BLOCKS; i++) + ip->i_db[i] = 0; + } + } - - ext2_print_inode(ip); + /*ext2_print_inode(ip);*/ bqrelse(bp); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#8 (text+ko) ==== @@ -265,7 +265,8 @@ #define EXT4F_INCOMPAT_EXTENTS 0x0040 #define EXT4F_INCOMPAT_64BIT 0x0080 #define EXT4F_INCOMPAT_MMP 0x0100 -#define EXT4F_INCOMPAT_FLEX_BG 0X0200 +#define EXT4F_INCOMPAT_FLEX_BG 0x0200 +#define EXT4F_INCOMPAT_EAINODE 0x0400 /* * Features supported in this implementation From owner-p4-projects@FreeBSD.ORG Fri Aug 20 13:27:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D7C410656AB; Fri, 20 Aug 2010 13:27:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F9C710656A6; Fri, 20 Aug 2010 13:27:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 2273D8FC1C; Fri, 20 Aug 2010 13:27:50 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id B4D4D46B8B; Fri, 20 Aug 2010 09:27:49 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 97D708A03C; Fri, 20 Aug 2010 09:27:47 -0400 (EDT) From: John Baldwin To: Zheng Liu Date: Fri, 20 Aug 2010 08:08:48 -0400 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20100217; KDE/4.4.5; amd64; ; ) References: <201008201119.o7KBJ3eG085751@skunkworks.freebsd.org> In-Reply-To: <201008201119.o7KBJ3eG085751@skunkworks.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201008200808.48089.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Fri, 20 Aug 2010 09:27:48 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 182649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 13:27:50 -0000 On Friday, August 20, 2010 7:19:03 am Zheng Liu wrote: > http://p4web.freebsd.org/@@182649?ac=10 > > Change 182649 by lz@gnehzuil-freebsd on 2010/08/20 11:18:29 > > Remove reservation window codes to prepare for generating a patch. > > Affected files ... > > .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_alloc.c#3 edit > .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_balloc.c#3 edit > .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode.c#4 edit > .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#10 edit > .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#7 edit > .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/inode.h#6 edit I think you should leave these in as we would want the reservation code in the tree with the ext4 changes. If you want to generate a full diff of both the reservation code and ext4 changes for people to test, I can help you to generate that sort of patch. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Aug 20 18:23:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8046B10656AB; Fri, 20 Aug 2010 18:23:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42F6510656A9 for ; Fri, 20 Aug 2010 18:23:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 30E098FC14 for ; Fri, 20 Aug 2010 18:23:43 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7KINhM8075001 for ; Fri, 20 Aug 2010 18:23:43 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7KINhYt074998 for perforce@freebsd.org; Fri, 20 Aug 2010 18:23:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Aug 2010 18:23:43 GMT Message-Id: <201008201823.o7KINhYt074998@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 18:23:43 -0000 http://p4web.freebsd.org/@@182661?ac=10 Change 182661 by hselasky@hselasky_laptop001 on 2010/08/20 18:22:47 USB serial: - add new device ID. PR: usb/149826 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#135 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#20 (text+ko) ==== @@ -258,6 +258,7 @@ UPLCOM_DEV(IODATA, USBRSAQ), /* I/O DATA USB-RSAQ */ UPLCOM_DEV(IODATA, USBRSAQ5), /* I/O DATA USB-RSAQ5 */ UPLCOM_DEV(MOBILEACTION, MA620), /* Mobile Action MA-620 Infrared Adapter */ + UPLCOM_DEV(PROLIFIC, GPRS), /* Wireless Data Card */ UPLCOM_DEV(PROLIFIC, PHAROS), /* Prolific Pharos */ UPLCOM_DEV(PROLIFIC, PL2303), /* Generic */ UPLCOM_DEV(PROLIFIC, RSAQ2), /* I/O DATA USB-RSAQ2 */ ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#135 (text+ko) ==== @@ -2536,6 +2536,7 @@ product PROLIFIC PL2301 0x0000 PL2301 Host-Host interface product PROLIFIC PL2302 0x0001 PL2302 Host-Host interface product PROLIFIC RSAQ2 0x04bb PL2303 Serial (IODATA USB-RSAQ2) +product PROLIFIC GPRS 0x0609 Wireless Data Card product PROLIFIC PL2303 0x2303 PL2303 Serial (ATEN/IOGEAR UC232A) product PROLIFIC PL2305 0x2305 Parallel printer product PROLIFIC ATAPI4 0x2307 ATAPI-4 Controller From owner-p4-projects@FreeBSD.ORG Fri Aug 20 18:27:01 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8759F10656A7; Fri, 20 Aug 2010 18:27:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A15010656A4 for ; Fri, 20 Aug 2010 18:27:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 382518FC0A for ; Fri, 20 Aug 2010 18:27:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7KIR1Ti075040 for ; Fri, 20 Aug 2010 18:27:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7KIR1lZ075037 for perforce@freebsd.org; Fri, 20 Aug 2010 18:27:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Aug 2010 18:27:01 GMT Message-Id: <201008201827.o7KIR1lZ075037@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 18:27:01 -0000 http://p4web.freebsd.org/@@182662?ac=10 Change 182662 by hselasky@hselasky_laptop001 on 2010/08/20 18:26:52 Style fix. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#136 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#136 (text+ko) ==== @@ -2536,7 +2536,7 @@ product PROLIFIC PL2301 0x0000 PL2301 Host-Host interface product PROLIFIC PL2302 0x0001 PL2302 Host-Host interface product PROLIFIC RSAQ2 0x04bb PL2303 Serial (IODATA USB-RSAQ2) -product PROLIFIC GPRS 0x0609 Wireless Data Card +product PROLIFIC GPRS 0x0609 Wireless Data Card product PROLIFIC PL2303 0x2303 PL2303 Serial (ATEN/IOGEAR UC232A) product PROLIFIC PL2305 0x2305 Parallel printer product PROLIFIC ATAPI4 0x2307 ATAPI-4 Controller From owner-p4-projects@FreeBSD.ORG Sat Aug 21 16:19:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 072C610656A6; Sat, 21 Aug 2010 16:19:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE24A10656A5 for ; Sat, 21 Aug 2010 16:19:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id ACAFA8FC15 for ; Sat, 21 Aug 2010 16:19:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7LGJESR045596 for ; Sat, 21 Aug 2010 16:19:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7LGJENv045593 for perforce@freebsd.org; Sat, 21 Aug 2010 16:19:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 21 Aug 2010 16:19:14 GMT Message-Id: <201008211619.o7LGJENv045593@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Aug 2010 16:19:15 -0000 http://p4web.freebsd.org/@@182688?ac=10 Change 182688 by hselasky@hselasky_laptop001 on 2010/08/21 16:18:45 USB mouse: - add support for more mouse buttons - patch by: Lee, Chung-Yeol Reviewed by: hselasky @ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#31 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#31 (text+ko) ==== @@ -399,6 +399,7 @@ struct ums_info *info = &sc->sc_info[index]; uint32_t flags; uint8_t i; + uint8_t j; if (hid_locate(buf, len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), hid_input, index, &info->sc_loc_x, &flags, &info->sc_iid_x)) { @@ -476,6 +477,17 @@ break; } } + + /* detect other buttons */ + + for (j = 0; (i < UMS_BUTTONS_MAX) && (j < 2); i++, j++) { + if (!hid_locate(buf, len, HID_USAGE2(HUP_MICROSOFT, (j + 1)), + hid_input, index, &info->sc_loc_btn[i], NULL, + &info->sc_iid_btn[i])) { + break; + } + } + info->sc_buttons = i; if (i > sc->sc_buttons)