From owner-svn-src-projects@FreeBSD.ORG Sun Sep 27 17:33:26 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8D77106566C; Sun, 27 Sep 2009 17:33:26 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 970898FC0C; Sun, 27 Sep 2009 17:33:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RHXQd2030544; Sun, 27 Sep 2009 17:33:26 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8RHXQlI030542; Sun, 27 Sep 2009 17:33:26 GMT (envelope-from des@svn.freebsd.org) Message-Id: <200909271733.n8RHXQlI030542@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sun, 27 Sep 2009 17:33:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197538 - projects/quota64/usr.sbin/edquota X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 17:33:26 -0000 Author: des Date: Sun Sep 27 17:33:26 2009 New Revision: 197538 URL: http://svn.freebsd.org/changeset/base/197538 Log: type / format fixup Modified: projects/quota64/usr.sbin/edquota/edquota.c Modified: projects/quota64/usr.sbin/edquota/edquota.c ============================================================================== --- projects/quota64/usr.sbin/edquota/edquota.c Sun Sep 27 14:49:51 2009 (r197537) +++ projects/quota64/usr.sbin/edquota/edquota.c Sun Sep 27 17:33:26 2009 (r197538) @@ -97,10 +97,10 @@ struct quotause { #define FOUND 0x01 int alldigits(const char *s); -int cvtatos(u_int64_t, char *, u_int64_t *); -char *cvtstoa(u_int64_t); -u_int64_t cvtblkval(u_int64_t, char, const char *); -u_int64_t cvtinoval(u_int64_t, char, const char *); +int cvtatos(uint64_t, char *, uint64_t *); +char *cvtstoa(uint64_t); +uint64_t cvtblkval(uint64_t, char, const char *); +uint64_t cvtinoval(uint64_t, char, const char *); int editit(char *); char *fmthumanvalblks(int64_t); char *fmthumanvalinos(int64_t); @@ -121,7 +121,7 @@ main(int argc, char *argv[]) long id, protoid; int i, quotatype, range, tmpfd; uid_t startuid, enduid; - u_int64_t lim; + uint64_t lim; char *protoname, *cp, *endpt, *oldoptarg; int eflag = 0, tflag = 0, pflag = 0, ch; char *fspath = NULL; @@ -509,7 +509,7 @@ fmthumanvalblks(int64_t blocks) dbtob(blocks), "", HN_AUTOSCALE, HN_NOSPACE); return (numbuf); } - snprintf(numbuf, sizeof(numbuf), "%lluk", dbtokb(blocks)); + snprintf(numbuf, sizeof(numbuf), "%juk", (uintmax_t)dbtokb(blocks)); return(numbuf); } @@ -523,7 +523,7 @@ fmthumanvalinos(int64_t inos) inos, "", HN_AUTOSCALE, HN_NOSPACE | HN_DIVISOR_1000); return (numbuf); } - snprintf(numbuf, sizeof(numbuf), "%llu", inos); + snprintf(numbuf, sizeof(numbuf), "%ju", (uintmax_t)inos); return(numbuf); } @@ -535,7 +535,7 @@ readprivs(struct quotause *quplist, char { struct quotause *qup; FILE *fd; - u_int64_t hardlimit, softlimit, curitems; + uintmax_t hardlimit, softlimit, curitems; char hardunits, softunits, curitemunits; int cnt; char *cp; @@ -562,7 +562,7 @@ readprivs(struct quotause *quplist, char return (0); } cnt = sscanf(cp, - " in use: %llu%c, limits (soft = %llu%c, hard = %llu%c)", + " in use: %ju%c, limits (soft = %ju%c, hard = %ju%c)", &curitems, &curitemunits, &softlimit, &softunits, &hardlimit, &hardunits); /* @@ -570,17 +570,17 @@ readprivs(struct quotause *quplist, char */ if (cnt != 6) cnt = sscanf(cp, - " in use: %llu%c, limits (soft = %llu%c hard = %llu%c", + " in use: %ju%c, limits (soft = %ju%c hard = %ju%c", &curitems, &curitemunits, &softlimit, &softunits, &hardlimit, &hardunits); if (cnt != 6) cnt = sscanf(cp, - " in use: %llu%c, limits (soft = %llu%c hard = %llu%c)", + " in use: %ju%c, limits (soft = %ju%c hard = %ju%c)", &curitems, &curitemunits, &softlimit, &softunits, &hardlimit, &hardunits); if (cnt != 6) cnt = sscanf(cp, - " in use: %llu%c, limits (soft = %llu%c, hard = %llu%c", + " in use: %ju%c, limits (soft = %ju%c, hard = %ju%c", &curitems, &curitemunits, &softlimit, &softunits, &hardlimit, &hardunits); if (cnt != 6) { @@ -598,7 +598,7 @@ readprivs(struct quotause *quplist, char return (0); } cnt = sscanf(&cp[7], - " in use: %llu%c limits (soft = %llu%c, hard = %llu%c)", + " in use: %ju%c limits (soft = %ju%c, hard = %ju%c)", &curitems, &curitemunits, &softlimit, &softunits, &hardlimit, &hardunits); /* @@ -606,17 +606,17 @@ readprivs(struct quotause *quplist, char */ if (cnt != 6) cnt = sscanf(&cp[7], - " in use: %llu%c limits (soft = %llu%c hard = %llu%c", + " in use: %ju%c limits (soft = %ju%c hard = %ju%c", &curitems, &curitemunits, &softlimit, &softunits, &hardlimit, &hardunits); if (cnt != 6) cnt = sscanf(&cp[7], - " in use: %llu%c limits (soft = %llu%c hard = %llu%c)", + " in use: %ju%c limits (soft = %ju%c hard = %ju%c)", &curitems, &curitemunits, &softlimit, &softunits, &hardlimit, &hardunits); if (cnt != 6) cnt = sscanf(&cp[7], - " in use: %llu%c limits (soft = %llu%c, hard = %llu%c", + " in use: %ju%c limits (soft = %ju%c, hard = %ju%c", &curitems, &curitemunits, &softlimit, &softunits, &hardlimit, &hardunits); if (cnt != 6) { @@ -717,7 +717,7 @@ readtimes(struct quotause *quplist, char FILE *fd; int cnt; char *cp; - u_int64_t itime, btime, iseconds, bseconds; + uintmax_t itime, btime, iseconds, bseconds; char *fsp, bunits[10], iunits[10], line1[BUFSIZ]; fd = fopen(inname, "r"); @@ -740,7 +740,7 @@ readtimes(struct quotause *quplist, char return (0); } cnt = sscanf(cp, - " block grace period: %llu %s file grace period: %llu %s", + " block grace period: %ju %s file grace period: %ju %s", &btime, bunits, &itime, iunits); if (cnt != 4) { warnx("%s:%s: bad format", fsp, cp); @@ -779,21 +779,25 @@ readtimes(struct quotause *quplist, char * Convert seconds to ASCII times. */ char * -cvtstoa(u_int64_t secs) +cvtstoa(uint64_t secs) { static char buf[20]; if (secs % (24 * 60 * 60) == 0) { secs /= 24 * 60 * 60; - sprintf(buf, "%llu day%s", secs, secs == 1 ? "" : "s"); + sprintf(buf, "%ju day%s", (uintmax_t)secs, + secs == 1 ? "" : "s"); } else if (secs % (60 * 60) == 0) { secs /= 60 * 60; - sprintf(buf, "%llu hour%s", secs, secs == 1 ? "" : "s"); + sprintf(buf, "%ju hour%s", (uintmax_t)secs, + secs == 1 ? "" : "s"); } else if (secs % 60 == 0) { secs /= 60; - sprintf(buf, "%llu minute%s", secs, secs == 1 ? "" : "s"); + sprintf(buf, "%ju minute%s", (uintmax_t)secs, + secs == 1 ? "" : "s"); } else - sprintf(buf, "%llu second%s", secs, secs == 1 ? "" : "s"); + sprintf(buf, "%ju second%s", (uintmax_t)secs, + secs == 1 ? "" : "s"); return (buf); } @@ -801,7 +805,7 @@ cvtstoa(u_int64_t secs) * Convert ASCII input times to seconds. */ int -cvtatos(u_int64_t period, char *units, u_int64_t *seconds) +cvtatos(uint64_t period, char *units, uint64_t *seconds) { if (bcmp(units, "second", 6) == 0) @@ -823,8 +827,8 @@ cvtatos(u_int64_t period, char *units, u /* * Convert a limit to number of disk blocks. */ -u_int64_t -cvtblkval(u_int64_t limit, char units, const char *itemname) +uint64_t +cvtblkval(uint64_t limit, char units, const char *itemname) { switch(units) { @@ -864,8 +868,9 @@ cvtblkval(u_int64_t limit, char units, c itemname); break; default: - errx(2, "%llu%c: unknown units for %s, specify none, K, M, G, T, P, or E\n", - limit, units, itemname); + errx(2, "%ju%c: unknown units for %s, specify " + "none, K, M, G, T, P, or E\n", + (uintmax_t)limit, units, itemname); break; } return (limit); @@ -874,8 +879,8 @@ cvtblkval(u_int64_t limit, char units, c /* * Convert a limit to number of inodes. */ -u_int64_t -cvtinoval(u_int64_t limit, char units, const char *itemname) +uint64_t +cvtinoval(uint64_t limit, char units, const char *itemname) { switch(units) { @@ -914,8 +919,9 @@ cvtinoval(u_int64_t limit, char units, c itemname); break; default: - errx(2, "%llu%c: unknown units for %s, specify none, K, M, G, T, P, or E\n", - limit, units, itemname); + errx(2, "%ju%c: unknown units for %s, specify " + "none, K, M, G, T, P, or E\n", + (uintmax_t)limit, units, itemname); break; } return (limit); From owner-svn-src-projects@FreeBSD.ORG Tue Sep 29 19:50:51 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0128C1065670; Tue, 29 Sep 2009 19:50:51 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CC8508FC1F; Tue, 29 Sep 2009 19:50:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TJooPL094271; Tue, 29 Sep 2009 19:50:50 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8TJoowo094270; Tue, 29 Sep 2009 19:50:50 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200909291950.n8TJoowo094270@svn.freebsd.org> From: Sean Bruno Date: Tue, 29 Sep 2009 19:50:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197622 - projects/sbruno_firewire X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2009 19:50:51 -0000 Author: sbruno Date: Tue Sep 29 19:50:50 2009 New Revision: 197622 URL: http://svn.freebsd.org/changeset/base/197622 Log: SVN workspace for firewire testing and enhancements. Added: projects/sbruno_firewire/ (props changed) - copied from r197621, head/ From owner-svn-src-projects@FreeBSD.ORG Tue Sep 29 23:00:28 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8F3C1065670; Tue, 29 Sep 2009 23:00:28 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C9D4D8FC22; Tue, 29 Sep 2009 23:00:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TN0S6e098331; Tue, 29 Sep 2009 23:00:28 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8TN0Sjt098329; Tue, 29 Sep 2009 23:00:28 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909292300.n8TN0Sjt098329@svn.freebsd.org> From: Lawrence Stewart Date: Tue, 29 Sep 2009 23:00:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197626 - projects/tcp_ffcaia2008_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2009 23:00:28 -0000 Author: lstewart Date: Tue Sep 29 23:00:28 2009 New Revision: 197626 URL: http://svn.freebsd.org/changeset/base/197626 Log: Remove all uses of the register keyword. The compiler is likely to do a better job at managing this stuff than me. Sponsored by: FreeBSD Foundation Suggested by: rpaulo@ Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Tue Sep 29 21:28:32 2009 (r197625) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Tue Sep 29 23:00:28 2009 (r197626) @@ -611,7 +611,7 @@ siftr_pkt_manager_thread(void *arg) static uint32_t hash_pkt(struct mbuf *m, uint32_t offset) { - register uint32_t hash = 0; + uint32_t hash = 0; while ((m != NULL) && (offset > m->m_len)) { /* @@ -655,12 +655,12 @@ siftr_chkpkt( void *arg, struct inpcb *inp ) { - register struct pkt_node *pkt_node = NULL; - register struct ip *ip = NULL; - register struct tcphdr *th = NULL; - register struct tcpcb *tp = NULL; - register unsigned int ip_hl = 0; - register uint8_t inp_locally_locked = 0; + struct pkt_node *pkt_node = NULL; + struct ip *ip = NULL; + struct tcphdr *th = NULL; + struct tcpcb *tp = NULL; + unsigned int ip_hl = 0; + uint8_t inp_locally_locked = 0; /* * I don't think we need m_pullup here because both @@ -950,12 +950,12 @@ siftr_chkpkt6( void *arg, struct inpcb *inp ) { - register struct pkt_node *pkt_node = NULL; - register struct ip6_hdr *ip6 = NULL; - register struct tcphdr *th = NULL; - register struct tcpcb *tp = NULL; - register unsigned int ip6_hl = 0; - register uint8_t inp_locally_locked = 0; + struct pkt_node *pkt_node = NULL; + struct ip6_hdr *ip6 = NULL; + struct tcphdr *th = NULL; + struct tcpcb *tp = NULL; + unsigned int ip6_hl = 0; + uint8_t inp_locally_locked = 0; /* * I don't think we need m_pullup here because both From owner-svn-src-projects@FreeBSD.ORG Tue Sep 29 23:59:12 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A639106566B; Tue, 29 Sep 2009 23:59:12 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8A33C8FC19; Tue, 29 Sep 2009 23:59:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TNxCp8099546; Tue, 29 Sep 2009 23:59:12 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8TNxCAf099544; Tue, 29 Sep 2009 23:59:12 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909292359.n8TNxCAf099544@svn.freebsd.org> From: Lawrence Stewart Date: Tue, 29 Sep 2009 23:59:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197628 - projects/tcp_ffcaia2008_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2009 23:59:12 -0000 Author: lstewart Date: Tue Sep 29 23:59:12 2009 New Revision: 197628 URL: http://svn.freebsd.org/changeset/base/197628 Log: Numerous style tweaks. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Tue Sep 29 23:03:16 2009 (r197627) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Tue Sep 29 23:59:12 2009 (r197628) @@ -317,41 +317,37 @@ siftr_process_pkt(struct pkt_node * pkt_ * Our key consists of ipversion,localip,localport,foreignip,foreignport */ key[0] = pkt_node->ipver; - memcpy( key + key_offset, - (void *)(&(pkt_node->ip_laddr)), - sizeof(pkt_node->ip_laddr) - ); + memcpy(key + key_offset, + (void *)(&(pkt_node->ip_laddr)), + sizeof(pkt_node->ip_laddr)); key_offset += sizeof(pkt_node->ip_laddr); - memcpy( key + key_offset, - (void *)(&(pkt_node->tcp_localport)), - sizeof(pkt_node->tcp_localport) - ); + memcpy(key + key_offset, + (void *)(&(pkt_node->tcp_localport)), + sizeof(pkt_node->tcp_localport)); key_offset += sizeof(pkt_node->tcp_localport); - memcpy( key + key_offset, - (void *)(&(pkt_node->ip_faddr)), - sizeof(pkt_node->ip_faddr) - ); + memcpy(key + key_offset, + (void *)(&(pkt_node->ip_faddr)), + sizeof(pkt_node->ip_faddr)); key_offset += sizeof(pkt_node->ip_faddr); - memcpy( key + key_offset, - (void *)(&(pkt_node->tcp_foreignport)), - sizeof(pkt_node->tcp_foreignport) - ); + memcpy(key + key_offset, + (void *)(&(pkt_node->tcp_foreignport)), + sizeof(pkt_node->tcp_foreignport)); - counter_list = (counter_hash + - (hash32_buf(key, sizeof(key), 0) & siftr_hashmask)); + counter_list = (counter_hash + + (hash32_buf(key, sizeof(key), 0) & siftr_hashmask)); /* * If the list is not empty i.e. the hash index has * been used by another flow previously. */ - if(LIST_FIRST(counter_list) != NULL) { + if (LIST_FIRST(counter_list) != NULL) { /* * Loop through the hash nodes in the list. * There should normally only be 1 hash node in the list, * except if there have been collisions at the hash index * computed by hash32_buf() */ - LIST_FOREACH(hash_node, counter_list, nodes) { + LIST_FOREACH (hash_node, counter_list, nodes) { /* * Check if the key for the pkt we are currently * processing is the same as the key stored in the @@ -370,18 +366,16 @@ siftr_process_pkt(struct pkt_node * pkt_ /* If this flow hash hasn't been seen before or we have a collision */ if (hash_node == NULL || !found_match) { /* Create a new hash node to store the flow's counter */ - hash_node = malloc( sizeof(struct flow_hash_node), - M_SIFTR_HASHNODE, - M_WAITOK - ); + hash_node = malloc(sizeof(struct flow_hash_node), + M_SIFTR_HASHNODE, + M_WAITOK); if (hash_node != NULL) { /* Initialise our new hash node list entry */ hash_node->counter = 0; memcpy(hash_node->key, key, sizeof(key)); LIST_INSERT_HEAD(counter_list, hash_node, nodes); - } - else { + } else { /* malloc failed */ if (pkt_node->direction == PFIL_IN) siftr_num_inbound_skipped_pkts_malloc++; @@ -390,8 +384,7 @@ siftr_process_pkt(struct pkt_node * pkt_ return; } - } - else if (siftr_pkts_per_log > 1) { + } else if (siftr_pkts_per_log > 1) { /* * Taking the remainder of the counter divided * by the current value of siftr_pkts_per_log @@ -400,7 +393,7 @@ siftr_process_pkt(struct pkt_node * pkt_ * messages being written to the log file */ hash_node->counter = (hash_node->counter + 1) % - siftr_pkts_per_log; + siftr_pkts_per_log; /* * If we have not seen enough packets since the last time @@ -424,48 +417,49 @@ siftr_process_pkt(struct pkt_node * pkt_ /* Construct an IPv6 log message. */ sprintf(siftr_log_msg, - "%c,0x%08x,%zd.%06ld,%x:%x:%x:%x:%x:%x:%x:%x,%u,%x:%x:%x:%x:%x:%x:%x:%x,%u,%ld,%ld,%ld,%ld,%ld,%u,%u,%u,%u,%u,%u,%u,%d,%u,%u,%u,%u,%u\n", - direction[pkt_node->direction], - pkt_node->hash, - pkt_node->tval.tv_sec, - pkt_node->tval.tv_usec, - UPPER_SHORT(pkt_node->ip_laddr[0]), - LOWER_SHORT(pkt_node->ip_laddr[0]), - UPPER_SHORT(pkt_node->ip_laddr[1]), - LOWER_SHORT(pkt_node->ip_laddr[1]), - UPPER_SHORT(pkt_node->ip_laddr[2]), - LOWER_SHORT(pkt_node->ip_laddr[2]), - UPPER_SHORT(pkt_node->ip_laddr[3]), - LOWER_SHORT(pkt_node->ip_laddr[3]), - ntohs(pkt_node->tcp_localport), - UPPER_SHORT(pkt_node->ip_faddr[0]), - LOWER_SHORT(pkt_node->ip_faddr[0]), - UPPER_SHORT(pkt_node->ip_faddr[1]), - LOWER_SHORT(pkt_node->ip_faddr[1]), - UPPER_SHORT(pkt_node->ip_faddr[2]), - LOWER_SHORT(pkt_node->ip_faddr[2]), - UPPER_SHORT(pkt_node->ip_faddr[3]), - LOWER_SHORT(pkt_node->ip_faddr[3]), - ntohs(pkt_node->tcp_foreignport), - pkt_node->snd_ssthresh, - pkt_node->snd_cwnd, - pkt_node->snd_bwnd, - pkt_node->snd_wnd, - pkt_node->rcv_wnd, - pkt_node->snd_scale, - pkt_node->rcv_scale, - pkt_node->conn_state, - pkt_node->max_seg_size, - pkt_node->smoothed_rtt, - pkt_node->sack_enabled, - pkt_node->flags, - pkt_node->rxt_length, - pkt_node->snd_buf_hiwater, - pkt_node->snd_buf_cc, - pkt_node->rcv_buf_hiwater, - pkt_node->rcv_buf_cc, - pkt_node->sent_inflight_bytes - ); + "%c,0x%08x,%zd.%06ld,%x:%x:%x:%x:%x:%x:%x:%x,%u,%x:%x:%x:" + "%x:%x:%x:%x:%x,%u,%ld,%ld,%ld,%ld,%ld,%u,%u,%u,%u,%u,%u," + "%u,%d,%u,%u,%u,%u,%u\n", + direction[pkt_node->direction], + pkt_node->hash, + pkt_node->tval.tv_sec, + pkt_node->tval.tv_usec, + UPPER_SHORT(pkt_node->ip_laddr[0]), + LOWER_SHORT(pkt_node->ip_laddr[0]), + UPPER_SHORT(pkt_node->ip_laddr[1]), + LOWER_SHORT(pkt_node->ip_laddr[1]), + UPPER_SHORT(pkt_node->ip_laddr[2]), + LOWER_SHORT(pkt_node->ip_laddr[2]), + UPPER_SHORT(pkt_node->ip_laddr[3]), + LOWER_SHORT(pkt_node->ip_laddr[3]), + ntohs(pkt_node->tcp_localport), + UPPER_SHORT(pkt_node->ip_faddr[0]), + LOWER_SHORT(pkt_node->ip_faddr[0]), + UPPER_SHORT(pkt_node->ip_faddr[1]), + LOWER_SHORT(pkt_node->ip_faddr[1]), + UPPER_SHORT(pkt_node->ip_faddr[2]), + LOWER_SHORT(pkt_node->ip_faddr[2]), + UPPER_SHORT(pkt_node->ip_faddr[3]), + LOWER_SHORT(pkt_node->ip_faddr[3]), + ntohs(pkt_node->tcp_foreignport), + pkt_node->snd_ssthresh, + pkt_node->snd_cwnd, + pkt_node->snd_bwnd, + pkt_node->snd_wnd, + pkt_node->rcv_wnd, + pkt_node->snd_scale, + pkt_node->rcv_scale, + pkt_node->conn_state, + pkt_node->max_seg_size, + pkt_node->smoothed_rtt, + pkt_node->sack_enabled, + pkt_node->flags, + pkt_node->rxt_length, + pkt_node->snd_buf_hiwater, + pkt_node->snd_buf_cc, + pkt_node->rcv_buf_hiwater, + pkt_node->rcv_buf_cc, + pkt_node->sent_inflight_bytes); } else { /* IPv4 packet */ pkt_node->ip_laddr[0] = FIRST_OCTET(pkt_node->ip_laddr[3]); pkt_node->ip_laddr[1] = SECOND_OCTET(pkt_node->ip_laddr[3]); @@ -479,40 +473,40 @@ siftr_process_pkt(struct pkt_node * pkt_ /* Construct an IPv4 log message. */ sprintf(siftr_log_msg, - "%c,0x%08x,%zd.%06ld,%u.%u.%u.%u,%u,%u.%u.%u.%u,%u,%ld,%ld,%ld,%ld,%ld,%u,%u,%u,%u,%u,%u,%u,%d,%u,%u,%u,%u,%u\n", - direction[pkt_node->direction], - pkt_node->hash, - pkt_node->tval.tv_sec, - pkt_node->tval.tv_usec, - pkt_node->ip_laddr[0], - pkt_node->ip_laddr[1], - pkt_node->ip_laddr[2], - pkt_node->ip_laddr[3], - ntohs(pkt_node->tcp_localport), - pkt_node->ip_faddr[0], - pkt_node->ip_faddr[1], - pkt_node->ip_faddr[2], - pkt_node->ip_faddr[3], - ntohs(pkt_node->tcp_foreignport), - pkt_node->snd_ssthresh, - pkt_node->snd_cwnd, - pkt_node->snd_bwnd, - pkt_node->snd_wnd, - pkt_node->rcv_wnd, - pkt_node->snd_scale, - pkt_node->rcv_scale, - pkt_node->conn_state, - pkt_node->max_seg_size, - pkt_node->smoothed_rtt, - pkt_node->sack_enabled, - pkt_node->flags, - pkt_node->rxt_length, - pkt_node->snd_buf_hiwater, - pkt_node->snd_buf_cc, - pkt_node->rcv_buf_hiwater, - pkt_node->rcv_buf_cc, - pkt_node->sent_inflight_bytes - ); + "%c,0x%08x,%zd.%06ld,%u.%u.%u.%u,%u,%u.%u.%u.%u,%u,%ld,%ld," + "%ld,%ld,%ld,%u,%u,%u,%u,%u,%u,%u,%d,%u,%u,%u,%u,%u\n", + direction[pkt_node->direction], + pkt_node->hash, + pkt_node->tval.tv_sec, + pkt_node->tval.tv_usec, + pkt_node->ip_laddr[0], + pkt_node->ip_laddr[1], + pkt_node->ip_laddr[2], + pkt_node->ip_laddr[3], + ntohs(pkt_node->tcp_localport), + pkt_node->ip_faddr[0], + pkt_node->ip_faddr[1], + pkt_node->ip_faddr[2], + pkt_node->ip_faddr[3], + ntohs(pkt_node->tcp_foreignport), + pkt_node->snd_ssthresh, + pkt_node->snd_cwnd, + pkt_node->snd_bwnd, + pkt_node->snd_wnd, + pkt_node->rcv_wnd, + pkt_node->snd_scale, + pkt_node->rcv_scale, + pkt_node->conn_state, + pkt_node->max_seg_size, + pkt_node->smoothed_rtt, + pkt_node->sack_enabled, + pkt_node->flags, + pkt_node->rxt_length, + pkt_node->snd_buf_hiwater, + pkt_node->snd_buf_cc, + pkt_node->rcv_buf_hiwater, + pkt_node->rcv_buf_cc, + pkt_node->sent_inflight_bytes); #ifdef SIFTR_IPV6 } #endif @@ -527,11 +521,6 @@ siftr_process_pkt(struct pkt_node * pkt_ } - - - - - static void siftr_pkt_manager_thread(void *arg) { @@ -541,26 +530,26 @@ siftr_pkt_manager_thread(void *arg) mtx_lock(&siftr_pkt_mgr_mtx); - /* draining == 0 when queue has been flushed and it's safe to exit */ + /* draining == 0 when queue has been flushed and it's safe to exit. */ while (draining) { /* * Sleep until we are signalled to wake because thread has - * been told to exit or until 1 tick has passed + * been told to exit or until 1 tick has passed. */ msleep(&wait_for_pkt, &siftr_pkt_mgr_mtx, PWAIT, "pktwait", 1); - /* Gain exclusive access to the pkt_node queue */ + /* Gain exclusive access to the pkt_node queue. */ mtx_lock(&siftr_pkt_queue_mtx); /* * Move pkt_queue to tmp_pkt_queue, which leaves - * pkt_queue empty and ready to receive more pkt_nodes + * pkt_queue empty and ready to receive more pkt_nodes. */ STAILQ_CONCAT(&tmp_pkt_queue, &pkt_queue); /* * We've finished making changes to the list. Unlock it - * so the pfil hooks can continue queuing pkt_nodes + * so the pfil hooks can continue queuing pkt_nodes. */ mtx_unlock(&siftr_pkt_queue_mtx); @@ -570,19 +559,18 @@ siftr_pkt_manager_thread(void *arg) */ mtx_unlock(&siftr_pkt_mgr_mtx); - /* Flush all pkt_nodes to the log file */ + /* Flush all pkt_nodes to the log file. */ STAILQ_FOREACH_SAFE(pkt_node, - &tmp_pkt_queue, - nodes, - pkt_node_temp) { + &tmp_pkt_queue, + nodes, + pkt_node_temp) { siftr_process_pkt(pkt_node); STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes); free(pkt_node, M_SIFTR_PKTNODE); } KASSERT(STAILQ_EMPTY(&tmp_pkt_queue), - ("SIFTR tmp_pkt_queue not empty after flush") - ); + ("SIFTR tmp_pkt_queue not empty after flush")); mtx_lock(&siftr_pkt_mgr_mtx); @@ -604,10 +592,11 @@ siftr_pkt_manager_thread(void *arg) mtx_unlock(&siftr_pkt_mgr_mtx); - /* calls wakeup on this thread's struct thread ptr */ + /* Calls wakeup on this thread's struct thread ptr. */ kthread_exit(); } + static uint32_t hash_pkt(struct mbuf *m, uint32_t offset) { @@ -626,34 +615,29 @@ hash_pkt(struct mbuf *m, uint32_t offset while (m != NULL) { /* Ensure there is data in the mbuf */ if ((m->m_len - offset) > 0) { - hash = hash32_buf( m->m_data + offset, - m->m_len - offset, - hash - ); + hash = hash32_buf(m->m_data + offset, + m->m_len - offset, + hash); } - m = m->m_next; offset = 0; } - return hash; + return (hash); } + /* * pfil hook that is called for each IPv4 packet making its way through the * stack in either direction. * The pfil subsystem holds a non-sleepable mutex somewhere when * calling our hook function, so we can't sleep at all. * It's very important to use the M_NOWAIT flag with all function calls - * that support it so that they won't sleep, otherwise you get a panic + * that support it so that they won't sleep, otherwise you get a panic. */ static int -siftr_chkpkt( void *arg, - struct mbuf **m, - struct ifnet *ifp, - int dir, - struct inpcb *inp -) +siftr_chkpkt(void *arg, struct mbuf **m, struct ifnet *ifp, int dir, + struct inpcb *inp) { struct pkt_node *pkt_node = NULL; struct ip *ip = NULL; @@ -663,18 +647,17 @@ siftr_chkpkt( void *arg, uint8_t inp_locally_locked = 0; /* - * I don't think we need m_pullup here because both - * ip_input and ip_output seem to do the heavy lifting + * XXX: I don't think we need m_pullup here because both + * ip_input and ip_output seem to do the heavy lifting. */ /* *m = m_pullup(*m, sizeof(struct ip)); if (*m == NULL) goto ret; */ - /* Cram the mbuf into an ip packet struct */ ip = mtod(*m, struct ip *); - /* Only continue processing if the packet is TCP */ - if(ip->ip_p != IPPROTO_TCP) + /* Only continue processing if the packet is TCP. */ + if (ip->ip_p != IPPROTO_TCP) goto ret; /* @@ -685,21 +668,19 @@ siftr_chkpkt( void *arg, if (m_tag_locate(*m, PACKET_COOKIE_SIFTR, PACKET_TAG_SIFTR, NULL) != NULL) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_dejavu++; else siftr_num_outbound_skipped_pkts_dejavu++; goto ret; - } - else { - struct m_tag *tag = m_tag_alloc( PACKET_COOKIE_SIFTR, - PACKET_TAG_SIFTR, - 0, - M_NOWAIT - ); + } else { + struct m_tag *tag = m_tag_alloc(PACKET_COOKIE_SIFTR, + PACKET_TAG_SIFTR, + 0, + M_NOWAIT); if (tag == NULL) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_malloc++; else siftr_num_outbound_skipped_pkts_malloc++; @@ -710,7 +691,7 @@ siftr_chkpkt( void *arg, m_tag_prepend(*m, tag); } - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_tcp_pkts++; else siftr_num_outbound_tcp_pkts++; @@ -718,44 +699,42 @@ siftr_chkpkt( void *arg, /* * Create a tcphdr struct starting at the correct offset * in the IP packet. ip->ip_hl gives the ip header length - * in 4-byte words, so multiply it to get the size in bytes + * in 4-byte words, so multiply it to get the size in bytes. */ ip_hl = (ip->ip_hl << 2); th = (struct tcphdr *)((caddr_t)ip + ip_hl); /* * If the pfil hooks don't provide a pointer to the - * IP control block, we need to find it ourselves and lock it + * IP control block, we need to find it ourselves and lock it. */ if (!inp) { - /* Find the corresponding inpcb for this pkt */ + /* Find the corresponding inpcb for this pkt. */ - /* We need the tcbinfo lock */ + /* We need the tcbinfo lock. */ INP_INFO_UNLOCK_ASSERT(_siftrtcbinfo); INP_INFO_RLOCK(_siftrtcbinfo); if (dir == PFIL_IN) inp = in_pcblookup_hash(_siftrtcbinfo, - ip->ip_src, - th->th_sport, - ip->ip_dst, - th->th_dport, - 0, - (*m)->m_pkthdr.rcvif - ); + ip->ip_src, + th->th_sport, + ip->ip_dst, + th->th_dport, + 0, + (*m)->m_pkthdr.rcvif); else inp = in_pcblookup_hash(_siftrtcbinfo, - ip->ip_dst, - th->th_dport, - ip->ip_src, - th->th_sport, - 0, - (*m)->m_pkthdr.rcvif - ); + ip->ip_dst, + th->th_dport, + ip->ip_src, + th->th_sport, + 0, + (*m)->m_pkthdr.rcvif); - /* If we can't find the IP control block, bail */ + /* If we can't find the IP control block, bail. */ if (!inp) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_icb++; else siftr_num_outbound_skipped_pkts_icb++; @@ -765,7 +744,7 @@ siftr_chkpkt( void *arg, goto ret; } - /* Acquire the inpcb lock */ + /* Acquire the inpcb lock. */ INP_UNLOCK_ASSERT(inp); INP_RLOCK(inp); INP_INFO_RUNLOCK(_siftrtcbinfo); @@ -775,11 +754,13 @@ siftr_chkpkt( void *arg, INP_LOCK_ASSERT(inp); - pkt_node = malloc(sizeof(struct pkt_node), M_SIFTR_PKTNODE, M_NOWAIT | M_ZERO); - + pkt_node = malloc(sizeof(struct pkt_node), + M_SIFTR_PKTNODE, + M_NOWAIT | M_ZERO); + if (pkt_node == NULL) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_malloc++; else siftr_num_outbound_skipped_pkts_malloc++; @@ -796,7 +777,7 @@ siftr_chkpkt( void *arg, * or we're in the timewait state, bail */ if (!tp || (inp->inp_flags & INP_TIMEWAIT)) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_tcb++; else siftr_num_outbound_skipped_pkts_tcb++; @@ -835,7 +816,7 @@ siftr_chkpkt( void *arg, pkt_node->rcv_buf_cc = inp->inp_socket->so_rcv.sb_cc; pkt_node->sent_inflight_bytes = tp->snd_max - tp->snd_una; - /* We've finished accessing the tcb so release the lock */ + /* We've finished accessing the tcb so release the lock. */ if (inp_locally_locked) INP_RUNLOCK(inp); @@ -934,21 +915,14 @@ inp_unlock: ret: /* Returning 0 ensures pfil will not discard the pkt */ - return 0; + return (0); } - - - #ifdef SIFTR_IPV6 static int -siftr_chkpkt6( void *arg, - struct mbuf **m, - struct ifnet *ifp, - int dir, - struct inpcb *inp -) +siftr_chkpkt6(void *arg, struct mbuf **m, struct ifnet *ifp, int dir, + struct inpcb *inp) { struct pkt_node *pkt_node = NULL; struct ip6_hdr *ip6 = NULL; @@ -956,23 +930,22 @@ siftr_chkpkt6( void *arg, struct tcpcb *tp = NULL; unsigned int ip6_hl = 0; uint8_t inp_locally_locked = 0; - + /* * I don't think we need m_pullup here because both - * ip_input and ip_output seem to do the heavy lifting + * ip_input and ip_output seem to do the heavy lifting. */ /* *m = m_pullup(*m, sizeof(struct ip)); if (*m == NULL) goto ret; */ - /* Cram the mbuf into an ip6 packet struct */ ip6 = mtod(*m, struct ip6_hdr *); /* * Only continue processing if the packet is TCP * XXX: We should follow the next header fields * as shown on Pg 6 RFC 2460, but right now we'll - * only check pkts that have no extension headers + * only check pkts that have no extension headers. */ if (ip6->ip6_nxt != IPPROTO_TCP) goto ret6; @@ -985,7 +958,7 @@ siftr_chkpkt6( void *arg, if (m_tag_locate(*m, PACKET_COOKIE_SIFTR, PACKET_TAG_SIFTR, NULL) != NULL) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_dejavu++; else siftr_num_outbound_skipped_pkts_dejavu++; @@ -993,13 +966,12 @@ siftr_chkpkt6( void *arg, goto ret6; } else { - struct m_tag *tag = m_tag_alloc( PACKET_COOKIE_SIFTR, - PACKET_TAG_SIFTR, - 0, - M_NOWAIT - ); + struct m_tag *tag = m_tag_alloc(PACKET_COOKIE_SIFTR, + PACKET_TAG_SIFTR, + 0, + M_NOWAIT); if (tag == NULL) { - if(dir == PFIL_IN) + if( dir == PFIL_IN) siftr_num_inbound_skipped_pkts_malloc++; else siftr_num_outbound_skipped_pkts_malloc++; @@ -1020,43 +992,41 @@ siftr_chkpkt6( void *arg, /* * Create a tcphdr struct starting at the correct offset * in the ipv6 packet. ip->ip_hl gives the ip header length - * in 4-byte words, so multiply it to get the size in bytes + * in 4-byte words, so multiply it to get the size in bytes. */ th = (struct tcphdr *)((caddr_t)ip6 + ip6_hl); /* * For inbound packets, the pfil hooks don't provide a pointer to the - * IP control block, so we need to find it ourselves and lock it + * IP control block, so we need to find it ourselves and lock it. */ if (!inp) { - /* Find the the corresponding inpcb for this pkt */ + /* Find the the corresponding inpcb for this pkt. */ - /* We need the tcbinfo lock */ + /* We need the tcbinfo lock. */ INP_INFO_UNLOCK_ASSERT(_siftrtcbinfo); INP_INFO_RLOCK(_siftrtcbinfo); if (dir == PFIL_IN) inp = in6_pcblookup_hash(_siftrtcbinfo, - &ip6->ip6_src, - th->th_sport, - &ip6->ip6_dst, - th->th_dport, - 0, - (*m)->m_pkthdr.rcvif - ); + &ip6->ip6_src, + th->th_sport, + &ip6->ip6_dst, + th->th_dport, + 0, + (*m)->m_pkthdr.rcvif); else inp = in6_pcblookup_hash(_siftrtcbinfo, - &ip6->ip6_dst, - th->th_dport, - &ip6->ip6_src, - th->th_sport, - 0, - (*m)->m_pkthdr.rcvif - ); + &ip6->ip6_dst, + th->th_dport, + &ip6->ip6_src, + th->th_sport, + 0, + (*m)->m_pkthdr.rcvif); - /* If we can't find the IP control block, bail */ + /* If we can't find the IP control block, bail. */ if (!inp) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_icb++; else siftr_num_outbound_skipped_pkts_icb++; @@ -1065,17 +1035,19 @@ siftr_chkpkt6( void *arg, goto ret6; } - /* Acquire the inpcb lock */ + /* Acquire the inpcb lock. */ INP_RLOCK(inp); INP_INFO_RUNLOCK(_siftrtcbinfo); inp_locally_locked = 1; } - pkt_node = malloc(sizeof(struct pkt_node), M_SIFTR_PKTNODE, M_NOWAIT | M_ZERO); + pkt_node = malloc(sizeof(struct pkt_node), + M_SIFTR_PKTNODE, + M_NOWAIT | M_ZERO); if (pkt_node == NULL) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_malloc++; else siftr_num_outbound_skipped_pkts_malloc++; @@ -1083,16 +1055,16 @@ siftr_chkpkt6( void *arg, goto inp_unlock6; } - /* Find the TCP control block that corresponds with this packet */ + /* Find the TCP control block that corresponds with this packet. */ tp = intotcpcb(inp); /* * If we can't find the TCP control block (happens occasionaly for a * packet sent during the shutdown phase of a TCP connection), - * or we're in the timewait state, bail + * or we're in the timewait state, bail. */ if (!tp || (inp->inp_flags & INP_TIMEWAIT)) { - if(dir == PFIL_IN) + if (dir == PFIL_IN) siftr_num_inbound_skipped_pkts_tcb++; else siftr_num_outbound_skipped_pkts_tcb++; @@ -1101,7 +1073,7 @@ siftr_chkpkt6( void *arg, goto inp_unlock6; } - /* Fill in pkt_node data */ + /* Fill in pkt_node data. */ pkt_node->ip_laddr[0] = inp->in6p_laddr.s6_addr32[0]; pkt_node->ip_laddr[1] = inp->in6p_laddr.s6_addr32[1]; pkt_node->ip_laddr[2] = inp->in6p_laddr.s6_addr32[2]; @@ -1132,7 +1104,7 @@ siftr_chkpkt6( void *arg, pkt_node->rcv_buf_cc = inp->inp_socket->so_rcv.sb_cc; pkt_node->sent_inflight_bytes = tp->snd_max - tp->snd_una; - /* We've finished accessing the tcb so release the lock */ + /* We've finished accessing the tcb so release the lock. */ if (inp_locally_locked) INP_RUNLOCK(inp); @@ -1157,8 +1129,8 @@ inp_unlock6: INP_RUNLOCK(inp); ret6: - /* Returning 0 ensures pfil will not discard the pkt */ - return 0; + /* Returning 0 ensures pfil will not discard the pkt. */ + return (0); } #endif /* #ifdef SIFTR_IPV6 */ @@ -1171,32 +1143,31 @@ siftr_pfil(int action) struct pfil_head *pfh_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6); #endif - if(action == HOOK) { - pfil_add_hook( siftr_chkpkt, - NULL, PFIL_IN | PFIL_OUT | PFIL_WAITOK, - pfh_inet - ); + if (action == HOOK) { + pfil_add_hook(siftr_chkpkt, + NULL, + PFIL_IN | PFIL_OUT | PFIL_WAITOK, + pfh_inet); #ifdef SIFTR_IPV6 - pfil_add_hook( siftr_chkpkt6, - NULL, PFIL_IN | PFIL_OUT | PFIL_WAITOK, - pfh_inet6 - ); + pfil_add_hook(siftr_chkpkt6, + NULL, + PFIL_IN | PFIL_OUT | PFIL_WAITOK, + pfh_inet6); #endif - } - else if(action == UNHOOK) { + } else if (action == UNHOOK) { pfil_remove_hook(siftr_chkpkt, - NULL, PFIL_IN | PFIL_OUT | PFIL_WAITOK, - pfh_inet - ); + NULL, + PFIL_IN | PFIL_OUT | PFIL_WAITOK, + pfh_inet); #ifdef SIFTR_IPV6 pfil_remove_hook(siftr_chkpkt6, - NULL, PFIL_IN | PFIL_OUT | PFIL_WAITOK, - pfh_inet6 - ); + NULL, + PFIL_IN | PFIL_OUT | PFIL_WAITOK, + pfh_inet6); #endif } - return 0; + return (0); } @@ -1208,26 +1179,25 @@ siftr_sysctl_logfile_name_handler(SYSCTL if (!req->newptr) goto skip; - /* If old filename and new filename are different */ + /* If old filename and new filename are different. */ if (strncmp(siftr_logfile, (char *)req->newptr, PATH_MAX)) { - int error = alq_open( &new_alq, - req->newptr, - curthread->td_ucred, - SIFTR_LOG_FILE_MODE, - SIFTR_ALQ_BUFLEN, - 0 - ); + int error = alq_open(&new_alq, + req->newptr, + curthread->td_ucred, + SIFTR_LOG_FILE_MODE, + SIFTR_ALQ_BUFLEN, + 0); - /* Bail if unable to create new alq */ + /* Bail if unable to create new alq. */ if (error) - return 1; + return (1); /* * If disabled, siftr_alq == NULL so we simply close * the alq as we've proved it can be opened. * If enabled, close the existing alq and switch the old - * for the new + * for the new. */ if (siftr_alq == NULL) alq_close(new_alq); @@ -1241,6 +1211,7 @@ skip: return sysctl_handle_string(oidp, arg1, arg2, req); } + static int siftr_manage_ops(uint8_t action) { @@ -1260,9 +1231,9 @@ siftr_manage_ops(uint8_t action) uint8_t faddr[4]; #endif - /* Init an autosizing sbuf that initially holds 200 chars */ + /* Init an autosizing sbuf that initially holds 200 chars. */ if ((s = sbuf_new(NULL, NULL, 200, SBUF_AUTOEXTEND)) == NULL) - return -1; + return (-1); if (action == SIFTR_ENABLE) { @@ -1270,47 +1241,46 @@ siftr_manage_ops(uint8_t action) * Create our alq * XXX: We should abort if alq_open fails! */ - alq_open( &siftr_alq, - siftr_logfile, - curthread->td_ucred, - SIFTR_LOG_FILE_MODE, - SIFTR_ALQ_BUFLEN, - 0 - ); + alq_open(&siftr_alq, + siftr_logfile, + curthread->td_ucred, + SIFTR_LOG_FILE_MODE, + SIFTR_ALQ_BUFLEN, + 0); STAILQ_INIT(&pkt_queue); siftr_exit_pkt_manager_thread = 0; - ret = kthread_add( &siftr_pkt_manager_thread, - NULL, - NULL, - &siftr_pkt_manager_thr, - RFNOWAIT, - 0, - "siftr_pkt_manager_thr" - ); + ret = kthread_add(&siftr_pkt_manager_thread, + NULL, + NULL, + &siftr_pkt_manager_thr, + RFNOWAIT, + 0, + "siftr_pkt_manager_thr"); siftr_pfil(HOOK); microtime(&tval); sbuf_printf(s, - "enable_time_secs=%zd\tenable_time_usecs=%06ld\tsiftrver=%s\thz=%u\ttcp_rtt_scale=%u\tsysname=%s\tsysver=%u\tipmode=%u\n", - tval.tv_sec, - tval.tv_usec, - MODVERSION, - hz, - TCP_RTT_SCALE, - SYS_NAME, - __FreeBSD_version, - SIFTR_IPMODE - ); + "enable_time_secs=%zd\tenable_time_usecs=%06ld\t" + "siftrver=%s\thz=%u\ttcp_rtt_scale=%u\tsysname=%s\t" + "sysver=%u\tipmode=%u\n", + tval.tv_sec, + tval.tv_usec, + MODVERSION, + hz, + TCP_RTT_SCALE, + SYS_NAME, + __FreeBSD_version, + SIFTR_IPMODE); sbuf_finish(s); alq_writen(siftr_alq, sbuf_data(s), sbuf_len(s), ALQ_WAITOK); - } - else if (action == SIFTR_DISABLE && siftr_pkt_manager_thr != NULL) { + + } else if (action == SIFTR_DISABLE && siftr_pkt_manager_thr != NULL) { /* * Remove the pfil hook functions. All threads currently in @@ -1319,27 +1289,26 @@ siftr_manage_ops(uint8_t action) */ siftr_pfil(UNHOOK); - /* This will block until the pkt manager thread unlocks it */ + /* This will block until the pkt manager thread unlocks it. */ mtx_lock(&siftr_pkt_mgr_mtx); - /* Tell the pkt manager thread that it should exit now */ + /* Tell the pkt manager thread that it should exit now. */ siftr_exit_pkt_manager_thread = 1; /* * Wake the pkt_manager thread so it realises that - * siftr_exit_pkt_manager_thread == 1 and exits gracefully + * siftr_exit_pkt_manager_thread == 1 and exits gracefully. * The wakeup won't be delivered until we unlock - * siftr_pkt_mgr_mtx so this isn't racy + * siftr_pkt_mgr_mtx so this isn't racy. */ wakeup(&wait_for_pkt); - /* Wait for the pkt_manager thread to exit */ - msleep( siftr_pkt_manager_thr, - &siftr_pkt_mgr_mtx, - PWAIT, - "thrwait", - 0 - ); + /* Wait for the pkt_manager thread to exit. */ + msleep(siftr_pkt_manager_thr, + &siftr_pkt_mgr_mtx, + PWAIT, + "thrwait", + 0); siftr_pkt_manager_thr = NULL; mtx_unlock(&siftr_pkt_mgr_mtx); @@ -1347,33 +1316,42 @@ siftr_manage_ops(uint8_t action) microtime(&tval); sbuf_printf(s, - "disable_time_secs=%zd\tdisable_time_usecs=%06ld\tnum_inbound_tcp_pkts=%u\tnum_outbound_tcp_pkts=%u\ttotal_tcp_pkts=%u\tnum_inbound_skipped_pkts_malloc=%u\tnum_outbound_skipped_pkts_malloc=%u\tnum_inbound_skipped_pkts_mtx=%u\tnum_outbound_skipped_pkts_mtx=%u\tnum_inbound_skipped_pkts_tcb=%u\tnum_outbound_skipped_pkts_tcb=%u\tnum_inbound_skipped_pkts_icb=%u\tnum_outbound_skipped_pkts_icb=%u\ttotal_skipped_tcp_pkts=%u\tflow_list=", *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 00:26:43 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7674F1065679; Wed, 30 Sep 2009 00:26:43 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 66D658FC18; Wed, 30 Sep 2009 00:26:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U0Qhax000196; Wed, 30 Sep 2009 00:26:43 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U0Qhiw000194; Wed, 30 Sep 2009 00:26:43 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909300026.n8U0Qhiw000194@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 30 Sep 2009 00:26:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197629 - projects/tcp_ffcaia2008_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 00:26:43 -0000 Author: lstewart Date: Wed Sep 30 00:26:43 2009 New Revision: 197629 URL: http://svn.freebsd.org/changeset/base/197629 Log: msleep() is deprecated in favour of mtx_sleep(). Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Tue Sep 29 23:59:12 2009 (r197628) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Wed Sep 30 00:26:43 2009 (r197629) @@ -536,7 +536,11 @@ siftr_pkt_manager_thread(void *arg) * Sleep until we are signalled to wake because thread has * been told to exit or until 1 tick has passed. */ - msleep(&wait_for_pkt, &siftr_pkt_mgr_mtx, PWAIT, "pktwait", 1); + mtx_sleep(&wait_for_pkt, + &siftr_pkt_mgr_mtx, + PWAIT, + "pktwait", + 1); /* Gain exclusive access to the pkt_node queue. */ mtx_lock(&siftr_pkt_queue_mtx); @@ -1304,7 +1308,7 @@ siftr_manage_ops(uint8_t action) wakeup(&wait_for_pkt); /* Wait for the pkt_manager thread to exit. */ - msleep(siftr_pkt_manager_thr, + mtx_sleep(siftr_pkt_manager_thr, &siftr_pkt_mgr_mtx, PWAIT, "thrwait", From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 01:05:15 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A3741065679; Wed, 30 Sep 2009 01:05:15 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 69D928FC18; Wed, 30 Sep 2009 01:05:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U15Fhm000993; Wed, 30 Sep 2009 01:05:15 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U15FBT000991; Wed, 30 Sep 2009 01:05:15 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909300105.n8U15FBT000991@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 30 Sep 2009 01:05:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197630 - projects/tcp_ffcaia2008_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 01:05:15 -0000 Author: lstewart Date: Wed Sep 30 01:05:15 2009 New Revision: 197630 URL: http://svn.freebsd.org/changeset/base/197630 Log: Move text related to SIFTR's history out of licence header. Acknowledge the FreeBSD Foundation as the copyright owner for the work done on SIFTR in 2009 as part of the "Enhancing the FreeBSD TCP Implementation" project. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Wed Sep 30 00:26:43 2009 (r197629) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Wed Sep 30 01:05:15 2009 (r197630) @@ -2,24 +2,12 @@ * Copyright (c) 2007-2009, Centre for Advanced Internet Architectures * Swinburne University of Technology, Melbourne, Australia * (CRICOS number 00111D). - * + * Copyright (c) 2009, The FreeBSD Foundation * All rights reserved. * - * SIFTR was first released in 2007 by James Healy and Lawrence Stewart whilst - * working on the NewTCP research project at Swinburne University's Centre for - * Advanced Internet Architectures, Melbourne, Australia, which was made - * possible in part by a grant from the Cisco University Research Program Fund - * at Community Foundation Silicon Valley. More details are available at: - * http://caia.swin.edu.au/urp/newtcp/ - * - * Work on SIFTR v1.2.x was sponsored by the FreeBSD Foundation as part of - * the "Enhancing the FreeBSD TCP Implementation" project 2008-2009. - * More details are available at: - * http://www.freebsdfoundation.org/ - * http://caia.swin.edu.au/freebsd/etcp09/ - * - * Lawrence Stewart is currently the sole maintainer, and all contact regarding - * SIFTR should be directed to him via email: lastewart@swin.edu.au + * Portions of this software were developed at the Centre for Advanced + * Internet Architectures, Swinburne University of Technology, Melbourne, + * Australia by Lawrence Stewart under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,6 +35,7 @@ * SUCH DAMAGE. */ + /****************************************************** * Statistical Information For TCP Research (SIFTR) * @@ -54,8 +43,24 @@ * TCP stack, allowing internal stats to be recorded to a log file * during experimentation. * + * SIFTR was first released in 2007 by James Healy and Lawrence Stewart whilst + * working on the NewTCP research project at Swinburne University's Centre for + * Advanced Internet Architectures, Melbourne, Australia, which was made + * possible in part by a grant from the Cisco University Research Program Fund + * at Community Foundation Silicon Valley. More details are available at: + * http://caia.swin.edu.au/urp/newtcp/ + * + * Work on SIFTR v1.2.x was sponsored by the FreeBSD Foundation as part of + * the "Enhancing the FreeBSD TCP Implementation" project 2008-2009. + * More details are available at: + * http://www.freebsdfoundation.org/ + * http://caia.swin.edu.au/freebsd/etcp09/ + * + * Lawrence Stewart is currently the sole maintainer, and all contact regarding + * SIFTR should be directed to him via email: lastewart@swin.edu.au + * * Initial release date: June 2007 - * Most recent update: July 2009 + * Most recent update: September 2009 ******************************************************/ From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 01:13:41 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76DC71065692; Wed, 30 Sep 2009 01:13:41 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6701C8FC1A; Wed, 30 Sep 2009 01:13:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U1DfJU001200; Wed, 30 Sep 2009 01:13:41 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U1DfXb001198; Wed, 30 Sep 2009 01:13:41 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909300113.n8U1DfXb001198@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 30 Sep 2009 01:13:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197631 - projects/tcp_ffcaia2008_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 01:13:41 -0000 Author: lstewart Date: Wed Sep 30 01:13:40 2009 New Revision: 197631 URL: http://svn.freebsd.org/changeset/base/197631 Log: Add the FreeBSD svn keyword goo and cdefs include. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Wed Sep 30 01:05:15 2009 (r197630) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Wed Sep 30 01:13:40 2009 (r197631) @@ -64,6 +64,9 @@ ******************************************************/ +#include +__FBSDID("$FreeBSD$"); + #include #include #include From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 01:22:43 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDF361065670; Wed, 30 Sep 2009 01:22:43 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BDC5A8FC12; Wed, 30 Sep 2009 01:22:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U1Mhjc001400; Wed, 30 Sep 2009 01:22:43 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U1MhPD001398; Wed, 30 Sep 2009 01:22:43 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909300122.n8U1MhPD001398@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 30 Sep 2009 01:22:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197632 - projects/tcp_ffcaia2008_8.x/sys/netinet X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 01:22:43 -0000 Author: lstewart Date: Wed Sep 30 01:22:43 2009 New Revision: 197632 URL: http://svn.freebsd.org/changeset/base/197632 Log: Alphabetically order includes. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Modified: projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Wed Sep 30 01:13:40 2009 (r197631) +++ projects/tcp_ffcaia2008_8.x/sys/netinet/siftr.c Wed Sep 30 01:22:43 2009 (r197632) @@ -68,32 +68,32 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include #include #include #include #include +#include #include +#include #include #include -#include -#include #ifdef SIFTR_IPV6 #include From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 01:34:03 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9156106566B; Wed, 30 Sep 2009 01:34:03 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D8C748FC08; Wed, 30 Sep 2009 01:34:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U1Y34g001641; Wed, 30 Sep 2009 01:34:03 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U1Y3cx001639; Wed, 30 Sep 2009 01:34:03 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909300134.n8U1Y3cx001639@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 30 Sep 2009 01:34:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197633 - projects/tcp_ffcaia2008_8.x/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 01:34:04 -0000 Author: lstewart Date: Wed Sep 30 01:34:03 2009 New Revision: 197633 URL: http://svn.freebsd.org/changeset/base/197633 Log: Acknowledge the FreeBSD Foundation as the copyright owner for the work done on ALQ in 2009 as part of the "Enhancing the FreeBSD TCP Implementation" project. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 01:22:43 2009 (r197632) +++ projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 01:34:03 2009 (r197633) @@ -1,8 +1,13 @@ /*- * Copyright (c) 2002, Jeffrey Roberson * Copyright (c) 2008-2009, Lawrence Stewart + * Copyright (c) 2009, The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed at the Centre for Advanced + * Internet Architectures, Swinburne University of Technology, Melbourne, + * Australia by Lawrence Stewart under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 02:50:10 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D3CC1065670; Wed, 30 Sep 2009 02:50:10 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 79E388FC12; Wed, 30 Sep 2009 02:50:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U2oAkW003099; Wed, 30 Sep 2009 02:50:10 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U2oAf6003090; Wed, 30 Sep 2009 02:50:10 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200909300250.n8U2oAf6003090@svn.freebsd.org> From: Sean Bruno Date: Wed, 30 Sep 2009 02:50:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197634 - projects/sbruno_firewire/sys/dev/firewire X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 02:50:10 -0000 Author: sbruno Date: Wed Sep 30 02:50:09 2009 New Revision: 197634 URL: http://svn.freebsd.org/changeset/base/197634 Log: Radical reworking of guts inside of sbp_targ. A lot of stuff going on here. sbp_targ.c -- add two new fwbind functions for the mandatory busy_timeout and reset_start CSRs(SBP-2) implement handler funcitons to handle these fwbinds -- extend the morb4 struct to be aligned with spec(SBP-2) -- define the unrestricted page table format per spec (SBP-2) -- define the agent state struct to better provide status to initiators -- enhance and implement locking and remove GIANT -- reach down into the fwohci stack and initiate a bus reset (ibr) whenever we enable/disable the lun -- align ourselves with CAM a bit better and assign status when needed -- handle transactions that require multiple CTIOs via sbp_targ_xfer_pt() and sbp_targ_fetch_pt() -- handle exclusive login capability from initiator and do the right thing. -- add sbp_targ_send_agent_state(), it doesn't do anything though. fwohci_pci.c -- remove meaningless #if 1 firewire.c -- implement config_intrhook() to allow CAM and others to initialize us more gracefully (thanks scottl, gibbs and others) -- manage node detection in an equally effective and simpler looping structure. fwohci.c -- move the bus_reset and SID interrupt handlers out of taskqueues and handle them immediately sbp.c -- implement a wrapper around xpt_done() to assist in debugging sbp hangs at boot. TBD add to debug level. fwcsr.c/h -- introduce common functions to handle CSR registration and deletion. Added: projects/sbruno_firewire/sys/dev/firewire/fwcsr.c projects/sbruno_firewire/sys/dev/firewire/fwcsr.h Modified: projects/sbruno_firewire/sys/dev/firewire/firewire.c projects/sbruno_firewire/sys/dev/firewire/firewirereg.h projects/sbruno_firewire/sys/dev/firewire/fwohci.c projects/sbruno_firewire/sys/dev/firewire/fwohci_pci.c projects/sbruno_firewire/sys/dev/firewire/sbp.c projects/sbruno_firewire/sys/dev/firewire/sbp_targ.c Modified: projects/sbruno_firewire/sys/dev/firewire/firewire.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/firewire.c Wed Sep 30 01:34:03 2009 (r197633) +++ projects/sbruno_firewire/sys/dev/firewire/firewire.c Wed Sep 30 02:50:09 2009 (r197634) @@ -77,7 +77,7 @@ struct crom_src_buf { struct crom_chunk hw; }; -int firewire_debug=0, try_bmr=1, hold_count=0; +int firewire_debug=1, try_bmr=1, hold_count=0; SYSCTL_INT(_debug, OID_AUTO, firewire_debug, CTLFLAG_RW, &firewire_debug, 0, "FireWire driver debug flag"); SYSCTL_NODE(_hw, OID_AUTO, firewire, CTLFLAG_RD, 0, "FireWire Subsystem"); @@ -103,13 +103,14 @@ static void firewire_xfer_timeout(void * static int firewire_shutdown (device_t); #endif static device_t firewire_add_child (device_t, int, const char *, int); -static void fw_try_bmr (void *); +static void fw_try_bmr (struct firewire_comm *); static void fw_try_bmr_callback (struct fw_xfer *); static void fw_asystart (struct fw_xfer *); static int fw_get_tlabel (struct firewire_comm *, struct fw_xfer *); static void fw_bus_probe (struct firewire_comm *); static void fw_attach_dev (struct firewire_comm *); static void fw_bus_probe_thread(void *); +static void fw_probe_init(void *); #ifdef FW_VMACCESS static void fw_vmaccess (struct fw_xfer *); #endif @@ -458,16 +459,27 @@ firewire_attach(device_t dev) mtx_init(&fc->wait_lock, "fwwait", NULL, MTX_DEF); mtx_init(&fc->tlabel_lock, "fwtlabel", NULL, MTX_DEF); CALLOUT_INIT(&fc->timeout_callout); +#if 0 CALLOUT_INIT(&fc->bmr_callout); CALLOUT_INIT(&fc->busprobe_callout); +#endif TASK_INIT(&fc->task_timeout, 0, firewire_xfer_timeout, (void *)fc); callout_reset(&sc->fc->timeout_callout, hz, (void *)firewire_watchdog, (void *)sc->fc); /* create thread */ - kproc_create(fw_bus_probe_thread, (void *)fc, &fc->probe_thread, - 0, 0, "fw%d_probe", unit); + if (kproc_create(fw_bus_probe_thread, (void *)sc, + &fc->probe_thread, 0, 0, "fw%d_probe", unit)) + panic("Could not create fw%d_probe thread\n", unit); + + sc->ich.ich_func = (void *)fw_probe_init; + sc->ich.ich_arg = (void *)sc; + if (config_intrhook_establish(&sc->ich) != 0) { + device_printf(sc->fc->dev, + "can't establish config hook\n"); + return(ENXIO); + } /* Locate our children */ bus_generic_probe(dev); @@ -475,11 +487,6 @@ firewire_attach(device_t dev) /* launch attachement of the added children */ bus_generic_attach(dev); - /* bus_reset */ - FW_GLOCK(fc); - fw_busreset(fc, FWBUSNOTREADY); - FW_GUNLOCK(fc); - fc->ibr(fc); return 0; } @@ -536,8 +543,11 @@ firewire_detach(device_t dev) printf("firewire probe thread didn't die\n"); mtx_unlock(&fc->wait_lock); - if (fc->arq !=0 && fc->arq->maxq > 0) + if (fc->arq !=0 && fc->arq->maxq > 0) { + FW_GLOCK(fc); fw_drain_txq(fc); + FW_GUNLOCK(fc); + } if ((err = fwdev_destroydev(sc)) != 0) return err; @@ -546,8 +556,10 @@ firewire_detach(device_t dev) return err; callout_stop(&fc->timeout_callout); +#if 0 callout_stop(&fc->bmr_callout); callout_stop(&fc->busprobe_callout); +#endif /* XXX xfer_free and untimeout on all xfers */ for (fwdev = STAILQ_FIRST(&fc->devices); fwdev != NULL; @@ -597,7 +609,7 @@ fw_drain_txq(struct firewire_comm *fc) STAILQ_INIT(&xfer_drain); - FW_GLOCK(fc); + FW_GLOCK_ASSERT(fc); fw_xferq_drain(fc->atq); fw_xferq_drain(fc->ats); for(i = 0; i < fc->nisodma; i++) @@ -617,6 +629,7 @@ fw_drain_txq(struct firewire_comm *fc) STAILQ_FOREACH_SAFE(xfer, &xfer_drain, tlabel, txfer) xfer->hand(xfer); + FW_GLOCK(fc); } static void @@ -741,8 +754,10 @@ fw_busreset(struct firewire_comm *fc, ui int i, devcnt; FW_GLOCK_ASSERT(fc); +#if 0 if (fc->status == FWBUSMGRELECT) callout_stop(&fc->bmr_callout); +#endif fc->status = new_status; fw_reset_csr(fc); @@ -756,8 +771,11 @@ fw_busreset(struct firewire_comm *fc, ui for( i = 0 ; i < devcnt ; i++) if (device_get_state(devlistp[i]) >= DS_ATTACHED) { fdc = device_get_softc(devlistp[i]); - if (fdc->post_busreset != NULL) + if (fdc->post_busreset != NULL) { + FW_GUNLOCK(fc); fdc->post_busreset(fdc); + FW_GLOCK(fc); + } } free(devlistp, M_TEMP); } @@ -1321,6 +1339,7 @@ void fw_sidrcv(struct firewire_comm* fc, union fw_self_id *self_id; u_int i, j, node, c_port = 0, i_branch = 0; + FW_GLOCK_ASSERT(fc); fc->sid_cnt = len /(sizeof(uint32_t) * 2); fc->max_node = fc->nodeid & 0x3f; CSRARC(fc, NODE_IDS) = ((uint32_t)fc->nodeid) << 16; @@ -1408,17 +1427,25 @@ void fw_sidrcv(struct firewire_comm* fc, if (fc->irm == fc->nodeid) { fc->status = FWBUSMGRDONE; CSRARC(fc, BUS_MGR_ID) = fc->set_bmr(fc, fc->irm); + FW_GUNLOCK(fc); fw_bmr(fc); + FW_GLOCK(fc); } else { fc->status = FWBUSMGRELECT; + fw_try_bmr(fc); +#if 0 callout_reset(&fc->bmr_callout, hz/8, (void *)fw_try_bmr, (void *)fc); +#endif } } else fc->status = FWBUSMGRDONE; +#if 0 callout_reset(&fc->busprobe_callout, hz/4, (void *)fw_bus_probe, (void *)fc); +#endif + fw_bus_probe(fc); } /* @@ -1716,79 +1743,109 @@ fw_find_self_id(struct firewire_comm *fc static void fw_explore(struct firewire_comm *fc) { - int node, err, s, i, todo, todo2, trys; - char nodes[63]; - struct fw_device dfwdev; - union fw_self_id *fwsid; - - todo = 0; - /* setup dummy fwdev */ - dfwdev.fc = fc; - dfwdev.speed = 0; - dfwdev.maxrec = 8; /* 512 */ - dfwdev.status = FWDEVINIT; - - for (node = 0; node <= fc->max_node; node ++) { - /* We don't probe myself and linkdown nodes */ - if (node == fc->nodeid) { - if (firewire_debug) - device_printf(fc->bdev, "%s:" - "found myself node(%d) fc->nodeid(%d) fc->max_node(%d)\n", - __func__, node, fc->nodeid, fc->max_node); - continue; - } else if (firewire_debug) { - device_printf(fc->bdev, "%s:" - "node(%d) fc->max_node(%d) found\n", - __func__, node, fc->max_node); - } - fwsid = fw_find_self_id(fc, node); - if (!fwsid || !fwsid->p0.link_active) { - if (firewire_debug) - device_printf(fc->bdev, "%s: node%d: link down\n", - __func__, node); - continue; - } - nodes[todo++] = node; - } - - s = splfw(); - for (trys = 0; todo > 0 && trys < 3; trys ++) { - todo2 = 0; - for (i = 0; i < todo; i ++) { - dfwdev.dst = nodes[i]; - err = fw_explore_node(&dfwdev); - if (err) - nodes[todo2++] = nodes[i]; - if (firewire_debug) - device_printf(fc->bdev, "%s: node %d, err = %d\n", - __func__, node, err); - } - todo = todo2; - } - splx(s); + int node, err, s, i; + struct fw_device dfwdev; + union fw_self_id *fwsid; + + /* setup dummy fwdev */ + dfwdev.fc = fc; + dfwdev.speed = 0; + dfwdev.maxrec = 8; /* 512 */ + dfwdev.status = FWDEVINIT; + + for (node = 0; node <= fc->max_node; node ++) { + /* We don't probe myself and linkdown nodes */ + if (node == fc->nodeid) { + if (firewire_debug) + device_printf(fc->bdev, "%s:" + "found myself node(%d) fc->nodeid(%d) fc->max_node(%d)\n", + __func__, node, fc->nodeid, fc->max_node); + continue; + } else if (firewire_debug) { + device_printf(fc->bdev, "%s:" + "node(%d) fc->max_node(%d) found\n", + __func__, node, fc->max_node); + } + + fwsid = fw_find_self_id(fc, node); + if (!fwsid || !fwsid->p0.link_active) { + if (firewire_debug) + device_printf(fc->bdev, "%s: node%d: link down\n", + __func__, node); + continue; + } + + s = splfw(); + dfwdev.dst = node; + for (i = 0; i < 3; i ++) { + err = fw_explore_node(&dfwdev); + if (firewire_debug) + device_printf(fc->bdev, "%s: node %d, err = %d\n", + __func__, node, err); + if (!err) /* If explore fails, retry else break inner loop */ + break; + } + if (firewire_debug && (i > 3) ) /* Failure to explore node */ + device_printf(fc->bdev, "%s: failure to explore node(%d) err(%d)\n", + __func__, node, err); + splx(s); + } } - +/* + * Used at system boot time to allow the bus_probe_thread + * to execute via config_intrhook + */ static void -fw_bus_probe_thread(void *arg) +fw_probe_init(void *arg) { + struct firewire_softc *sc; struct firewire_comm *fc; - fc = (struct firewire_comm *)arg; + sc = (struct firewire_softc *)arg; + fc = sc->fc; + printf("%s: started\n", __func__); mtx_lock(&fc->wait_lock); - while (fc->status != FWBUSDETACH) { - if (fc->status == FWBUSEXPLORE) { - mtx_unlock(&fc->wait_lock); - fw_explore(fc); - fc->status = FWBUSEXPDONE; - if (firewire_debug) - printf("bus_explore done\n"); - fw_attach_dev(fc); - mtx_lock(&fc->wait_lock); - } + fc->probe_init_state = 1; + /*wakeup(fc);*/ + /*msleep((void *)fw_probe_init, &fc->wait_lock, PWAIT|PCATCH, "-", 0);*/ + /* bus_reset */ + FW_GLOCK(fc); + fw_busreset(fc, FWBUSNOTREADY); + FW_GUNLOCK(fc); + mtx_unlock(&fc->wait_lock); + fc->ibr(fc); + printf("%s: finished\n", __func__); +} + +static void +fw_bus_probe_thread(void *arg) +{ + struct firewire_softc *sc = (struct firewire_softc *)arg; + struct firewire_comm *fc = sc->fc; + + mtx_lock(&fc->wait_lock); + do { + printf("%s: going to sleep\n", __func__); msleep((void *)fc, &fc->wait_lock, PWAIT|PCATCH, "-", 0); - } + printf("%s: awoke!\n", __func__); + if (fc->status != FWBUSDETACH) { + if (fc->status == FWBUSEXPLORE) { + mtx_unlock(&fc->wait_lock); + fw_explore(fc); + fc->status = FWBUSEXPDONE; + if (firewire_debug) + printf("bus_explore done\n"); + fw_attach_dev(fc); + mtx_lock(&fc->wait_lock); + } + } + if (fc->probe_init_state) { + fc->probe_init_state = 0; + config_intrhook_disestablish(&sc->ich); + } + } while (fc->status != FWBUSDETACH); mtx_unlock(&fc->wait_lock); kproc_exit(0); } @@ -2180,10 +2237,9 @@ error: * To candidate Bus Manager election process. */ static void -fw_try_bmr(void *arg) +fw_try_bmr(struct firewire_comm *fc) { struct fw_xfer *xfer; - struct firewire_comm *fc = (struct firewire_comm *)arg; struct fw_pkt *fp; int err = 0; Modified: projects/sbruno_firewire/sys/dev/firewire/firewirereg.h ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/firewirereg.h Wed Sep 30 01:34:03 2009 (r197633) +++ projects/sbruno_firewire/sys/dev/firewire/firewirereg.h Wed Sep 30 02:50:09 2009 (r197634) @@ -49,6 +49,7 @@ typedef struct proc fw_proc; #include #include #include +#include #define splfw splimp @@ -79,6 +80,11 @@ struct firewire_softc { struct cdev *dev; #endif struct firewire_comm *fc; + struct intr_config_hook ich; + /* + * Used during initialization to wakeup + * sleeping parent thread + */ }; #define FW_MAX_DMACH 0x20 @@ -128,6 +134,7 @@ struct firewire_comm{ #define FWBUSPHYCONF 6 #define FWBUSEXPDONE 7 #define FWBUSCOMPLETION 10 + int probe_init_state; int nisodma; struct fw_eui64 eui; struct fw_xferq Added: projects/sbruno_firewire/sys/dev/firewire/fwcsr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sbruno_firewire/sys/dev/firewire/fwcsr.c Wed Sep 30 02:50:09 2009 (r197634) @@ -0,0 +1,89 @@ +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +/* + * Initialize callback for busy timeout + */ +void +fwcsr_busy_timeout_init(struct fw_bind *busy_timeout, + struct firewire_dev_comm *fd, + void *dev_softc, + void *callback, + struct malloc_type *dev_type, + uint32_t send_len, + uint32_t recv_len, + uint32_t max_lun) +{ + busy_timeout->start = 0xfffff0000000 | BUSY_TIMEOUT; + busy_timeout->end = 0xfffff0000000 | BUSY_TIMEOUT; + + STAILQ_INIT(&busy_timeout->xferlist); + fw_xferlist_add(&busy_timeout->xferlist, dev_type, + /*send*/ send_len, /*recv*/ recv_len, + max_lun, + fd->fc, dev_softc, callback); + fw_bindadd(fd->fc, busy_timeout); +} + +/* + * Terminate busy timeout callback + */ +void +fwcsr_busy_timeout_stop(struct fw_bind *busy_timeout, + struct firewire_dev_comm *fd) +{ + mtx_assert(&Giant, MA_OWNED); + fw_xferlist_remove(&busy_timeout->xferlist); + fw_bindremove(fd->fc, busy_timeout); +} + +/* + * Initialize the RESET START register + * handler and process the call back handler + */ +void +fwcsr_reset_start_init(struct fw_bind *reset_start, + struct firewire_dev_comm *fd, + void *dev_softc, + void *callback, + struct malloc_type *dev_type, + uint32_t send_len, + uint32_t recv_len, + uint32_t max_lun) +{ + reset_start->start = 0xfffff0000000 | RESET_START; + reset_start->end = 0xfffff0000000 | RESET_START; + + STAILQ_INIT(&reset_start->xferlist); + fw_xferlist_add(&reset_start->xferlist, dev_type, + /*send*/ send_len, /*recv*/ recv_len, + max_lun, + fd->fc, dev_softc, callback); + fw_bindadd(fd->fc, reset_start); +} + +/* + * Terminate processing of RESET_START register + */ +void +fwcsr_reset_start_stop(struct fw_bind *reset_start, + struct firewire_dev_comm *fd) +{ + fw_xferlist_remove(&reset_start->xferlist); + fw_bindremove(fd->fc, reset_start); +} Added: projects/sbruno_firewire/sys/dev/firewire/fwcsr.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sbruno_firewire/sys/dev/firewire/fwcsr.h Wed Sep 30 02:50:09 2009 (r197634) @@ -0,0 +1,9 @@ +void fwcsr_busy_timeout_init(struct fw_bind *, struct firewire_dev_comm *, + void *, void *, struct malloc_type *, uint32_t, + uint32_t, uint32_t); +void fwcsr_busy_timeout_stop(struct fw_bind *, struct firewire_dev_comm *); + +void fwcsr_reset_start_init(struct fw_bind *, struct firewire_dev_comm *, + void *, void *, struct malloc_type *, uint32_t, + uint32_t, uint32_t); +void fwcsr_reset_start_stop(struct fw_bind *, struct firewire_dev_comm *); Modified: projects/sbruno_firewire/sys/dev/firewire/fwohci.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/fwohci.c Wed Sep 30 01:34:03 2009 (r197633) +++ projects/sbruno_firewire/sys/dev/firewire/fwohci.c Wed Sep 30 02:50:09 2009 (r197634) @@ -164,8 +164,7 @@ static uint32_t fwohci_cyctimer (struct static void fwohci_rbuf_update (struct fwohci_softc *, int); static void fwohci_tbuf_update (struct fwohci_softc *, int); void fwohci_txbufdb (struct fwohci_softc *, int , struct fw_bulkxfer *); -static void fwohci_task_busreset(void *, int); -static void fwohci_task_sid(void *, int); +static void fwohci_sid(struct fwohci_softc *); static void fwohci_task_dma(void *, int); /* @@ -771,8 +770,6 @@ fwohci_init(struct fwohci_softc *sc, dev taskqueue_thread_enqueue, &sc->fc.taskqueue); taskqueue_start_threads(&sc->fc.taskqueue, 1, PI_NET, "fw%d_taskq", device_get_unit(dev)); - TASK_INIT(&sc->fwohci_task_busreset, 2, fwohci_task_busreset, sc); - TASK_INIT(&sc->fwohci_task_sid, 1, fwohci_task_sid, sc); TASK_INIT(&sc->fwohci_task_dma, 0, fwohci_task_dma, sc); fw_init(&sc->fc); @@ -817,8 +814,6 @@ fwohci_detach(struct fwohci_softc *sc, d fwohci_db_free(&sc->ir[i]); } if (sc->fc.taskqueue != NULL) { - taskqueue_drain(sc->fc.taskqueue, &sc->fwohci_task_busreset); - taskqueue_drain(sc->fc.taskqueue, &sc->fwohci_task_sid); taskqueue_drain(sc->fc.taskqueue, &sc->fwohci_task_dma); taskqueue_drain(sc->fc.taskqueue, &sc->fc.task_timeout); taskqueue_free(sc->fc.taskqueue); @@ -1843,7 +1838,7 @@ fwohci_intr_core(struct fwohci_softc *sc struct firewire_comm *fc = (struct firewire_comm *)sc; uint32_t node_id, plen; - FW_GLOCK_ASSERT(fc); + FW_GLOCK(fc); if ((stat & OHCI_INT_PHY_BUS_R) && (fc->status != FWBUSRESET)) { fc->status = FWBUSRESET; /* Disable bus reset interrupt until sid recv. */ @@ -1858,8 +1853,10 @@ fwohci_intr_core(struct fwohci_softc *sc OWRITE(sc, OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN); sc->atrs.xferq.flag &= ~FWXFERQ_RUNNING; - if (!kdb_active) - taskqueue_enqueue(sc->fc.taskqueue, &sc->fwohci_task_busreset); + fw_busreset(&sc->fc, FWBUSRESET); + + OWRITE(sc, OHCI_CROMHDR, ntohl(sc->fc.config_rom[0])); + OWRITE(sc, OHCI_BUS_OPT, ntohl(sc->fc.config_rom[2])); } if (stat & OHCI_INT_PHY_SID) { /* Enable bus reset interrupt */ @@ -1909,12 +1906,16 @@ fwohci_intr_core(struct fwohci_softc *sc fc->status = FWBUSINIT; + fwohci_sid(sc); +#if 0 if (!kdb_active) taskqueue_enqueue(sc->fc.taskqueue, &sc->fwohci_task_sid); +#endif } sidout: if ((stat & ~(OHCI_INT_PHY_BUS_R | OHCI_INT_PHY_SID)) && (!kdb_active)) taskqueue_enqueue(sc->fc.taskqueue, &sc->fwohci_task_dma); + FW_GUNLOCK(fc); } static void @@ -1995,26 +1996,14 @@ fwohci_intr_dma(struct fwohci_softc *sc, } static void -fwohci_task_busreset(void *arg, int pending) -{ - struct fwohci_softc *sc = (struct fwohci_softc *)arg; - - FW_GLOCK(&sc->fc); - fw_busreset(&sc->fc, FWBUSRESET); - OWRITE(sc, OHCI_CROMHDR, ntohl(sc->fc.config_rom[0])); - OWRITE(sc, OHCI_BUS_OPT, ntohl(sc->fc.config_rom[2])); - FW_GUNLOCK(&sc->fc); -} - -static void -fwohci_task_sid(void *arg, int pending) +fwohci_sid(struct fwohci_softc *sc) { - struct fwohci_softc *sc = (struct fwohci_softc *)arg; struct firewire_comm *fc = &sc->fc; uint32_t *buf; int i, plen; + FW_GLOCK_ASSERT(fc); /* * We really should have locking * here. Not sure why it's not @@ -2069,7 +2058,6 @@ fwohci_check_stat(struct fwohci_softc *s { uint32_t stat, irstat, itstat; - FW_GLOCK_ASSERT(&sc->fc); stat = OREAD(sc, FWOHCI_INTSTAT); if (stat == 0xffffffff) { device_printf(sc->fc.dev, @@ -2104,9 +2092,7 @@ fwohci_intr(void *arg) { struct fwohci_softc *sc = (struct fwohci_softc *)arg; - FW_GLOCK(&sc->fc); fwohci_check_stat(sc); - FW_GUNLOCK(&sc->fc); } void @@ -2114,9 +2100,7 @@ fwohci_poll(struct firewire_comm *fc, in { struct fwohci_softc *sc = (struct fwohci_softc *)fc; - FW_GLOCK(fc); fwohci_check_stat(sc); - FW_GUNLOCK(fc); } static void Modified: projects/sbruno_firewire/sys/dev/firewire/fwohci_pci.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/fwohci_pci.c Wed Sep 30 01:34:03 2009 (r197633) +++ projects/sbruno_firewire/sys/dev/firewire/fwohci_pci.c Wed Sep 30 02:50:09 2009 (r197634) @@ -91,7 +91,6 @@ static int fwohci_pci_detach(device_t se static int fwohci_pci_probe( device_t dev ) { -#if 1 uint32_t id; id = pci_get_devid(dev); @@ -212,7 +211,6 @@ fwohci_pci_probe( device_t dev ) device_set_desc(dev, "Sun PCIO-2"); return BUS_PROBE_DEFAULT; } -#endif if (pci_get_class(dev) == PCIC_SERIALBUS && pci_get_subclass(dev) == PCIS_SERIALBUS_FW && pci_get_progif(dev) == PCI_INTERFACE_OHCI) { Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/sbp.c Wed Sep 30 01:34:03 2009 (r197633) +++ projects/sbruno_firewire/sys/dev/firewire/sbp.c Wed Sep 30 02:50:09 2009 (r197634) @@ -97,6 +97,11 @@ #define SBP_QUEUE_LEN ((SBP_DMA_SIZE - SBP_LOGIN_SIZE) / sizeof(struct sbp_ocb)) #define SBP_NUM_OCB (SBP_QUEUE_LEN * SBP_NUM_TARGETS) +#define SBP_XPT_DONE(ccb)\ + do { \ + xpt_print(ccb->ccb_h.path, "%s: func = %x, status = %x\n",\ + __func__, ccb->ccb_h.func_code, ccb->ccb_h.status); \ + } while (0) /* * STATUS FIFO addressing * bit @@ -806,12 +811,12 @@ sbp_post_busreset(void *arg) SBP_DEBUG(0) printf("sbp_post_busreset\n"); END_DEBUG + SBP_LOCK(sbp); if ((sbp->sim->flags & SIMQ_FREEZED) == 0) { - SBP_LOCK(sbp); - xpt_freeze_simq(sbp->sim, /*count*/1); sbp->sim->flags |= SIMQ_FREEZED; - SBP_UNLOCK(sbp); + xpt_freeze_simq(sbp->sim, /*count*/1); } + SBP_UNLOCK(sbp); microtime(&sbp->last_busreset); } @@ -1257,7 +1262,7 @@ END_DEBUG if(fw_asyreq(xfer->fc, -1, xfer) != 0){ sbp_xfer_free(xfer); ocb->ccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(ocb->ccb); + SBP_XPT_DONE(ocb->ccb); } SBP_LOCK(sdev->target->sbp); } @@ -1900,7 +1905,7 @@ END_DEBUG if (ccb->csio.cdb_io.cdb_bytes[0] == INQUIRY) sbp_fix_inq_data(ocb); SBP_LOCK(sbp); - xpt_done(ccb); + SBP_XPT_DONE(ccb); SBP_UNLOCK(sbp); } break; @@ -2370,7 +2375,7 @@ SBP_DEBUG(1) END_DEBUG ccb->ccb_h.status = CAM_DEV_NOT_THERE; - xpt_done(ccb); + SBP_XPT_DONE(ccb); return; } break; @@ -2390,7 +2395,7 @@ SBP_DEBUG(0) ccb->ccb_h.func_code); END_DEBUG ccb->ccb_h.status = CAM_DEV_NOT_THERE; - xpt_done(ccb); + SBP_XPT_DONE(ccb); return; } break; @@ -2433,7 +2438,7 @@ SBP_DEBUG(2) END_DEBUG if(sdev == NULL){ ccb->ccb_h.status = CAM_DEV_NOT_THERE; - xpt_done(ccb); + SBP_XPT_DONE(ccb); return; } #if 0 @@ -2444,7 +2449,7 @@ END_DEBUG printf("probe stage, periph name: %s\n", name); if (strcmp(name, "probe") != 0) { ccb->ccb_h.status = CAM_REQUEUE_REQ; - xpt_done(ccb); + SBP_XPT_DONE(ccb); return; } } @@ -2457,7 +2462,7 @@ END_DEBUG sdev->freeze ++; SBP_UNLOCK(sdev->target->sbp); } - xpt_done(ccb); + SBP_XPT_DONE(ccb); return; } @@ -2521,7 +2526,7 @@ printf("ORB %08x %08x %08x %08x\n", ntoh if (ccg->block_size == 0) { printf("sbp_action1: block_size is 0.\n"); ccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(ccb); + SBP_XPT_DONE(ccb); break; } SBP_DEBUG(1) @@ -2557,7 +2562,7 @@ END_DEBUG #else cam_calc_geometry(ccg, /*extended*/1); #endif - xpt_done(ccb); + SBP_XPT_DONE(ccb); break; } case XPT_RESET_BUS: /* Reset the specified SCSI bus */ @@ -2569,7 +2574,7 @@ SBP_DEBUG(1) END_DEBUG ccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(ccb); + SBP_XPT_DONE(ccb); break; } case XPT_PATH_INQ: /* Path routing inquiry */ @@ -2601,7 +2606,7 @@ END_DEBUG cpi->protocol_version = SCSI_REV_2; cpi->ccb_h.status = CAM_REQ_CMP; - xpt_done(ccb); + SBP_XPT_DONE(ccb); break; } case XPT_GET_TRAN_SETTINGS: @@ -2626,18 +2631,18 @@ SBP_DEBUG(1) ccb->ccb_h.target_id, ccb->ccb_h.target_lun); END_DEBUG cts->ccb_h.status = CAM_REQ_CMP; - xpt_done(ccb); + SBP_XPT_DONE(ccb); break; } case XPT_ABORT: ccb->ccb_h.status = CAM_UA_ABORT; - xpt_done(ccb); + SBP_XPT_DONE(ccb); break; case XPT_SET_TRAN_SETTINGS: /* XXX */ default: ccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(ccb); + SBP_XPT_DONE(ccb); break; } return; @@ -2939,7 +2944,7 @@ END_DEBUG ocb->ccb->ccb_h.timeout_ch); ocb->ccb->ccb_h.status = status; SBP_LOCK(sdev->target->sbp); - xpt_done(ocb->ccb); + SBP_XPT_DONE(ocb->ccb); SBP_UNLOCK(sdev->target->sbp); } sbp_free_ocb(sdev, ocb); Modified: projects/sbruno_firewire/sys/dev/firewire/sbp_targ.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/sbp_targ.c Wed Sep 30 01:34:03 2009 (r197633) +++ projects/sbruno_firewire/sys/dev/firewire/sbp_targ.c Wed Sep 30 02:50:09 2009 (r197634) @@ -41,6 +41,7 @@ #include #include #include +#include #if __FreeBSD_version < 500000 #include #endif @@ -53,6 +54,7 @@ #include #include #include +#include #include #include @@ -61,6 +63,7 @@ #include #include #include +#include #define SBP_TARG_RECV_LEN 8 #define MAX_INITIATORS 8 @@ -73,9 +76,10 @@ * BASE 0xffff f001 0000 management port * BASE 0xffff f001 0020 command port for login id 0 * BASE 0xffff f001 0040 command port for login id 1 + * BASE 0xffff f001 (0x20 * [login_id + 1]) for login_id * */ -#define SBP_TARG_MGM 0x10000 /* offset from 0xffff f000 000 */ +#define SBP_TARG_MGM 0x10000 /* offset from 0xffff f000 0000 */ #define SBP_TARG_BIND_HI 0xffff #define SBP_TARG_BIND_LO(l) (0xf0000000 + SBP_TARG_MGM + 0x20 * ((l) + 1)) #define SBP_TARG_BIND_START (((u_int64_t)SBP_TARG_BIND_HI << 32) | \ @@ -88,15 +92,20 @@ #define FETCH_CMD 1 #define FETCH_POINTER 2 -#define F_LINK_ACTIVE (1 << 0) -#define F_ATIO_STARVED (1 << 1) -#define F_LOGIN (1 << 2) -#define F_HOLD (1 << 3) -#define F_FREEZED (1 << 4) +#define F_LINK_ACTIVE (1 << 0) /* The F/W link is active */ +#define F_ATIO_STARVED (1 << 1) /* We are out of ATIO's */ +#define F_LOGIN (1 << 2) /* This initiator has logged in */ +#define F_HOLD (1 << 3) /* Hold on to this login */ +#define F_FREEZED (1 << 4) /* Frozen login, usually a bus reset occured */ +#define F_RECYCLE_LOGIN (1 << 5) /* This login is to be reused due */ + /* to login before SBP_TARG_HOLD_TIMEOUT */ +#define F_EXCLUSIVE (1 << 6) /* Reject all other logins. */ + +#define SBP_TARG_HOLD_TIMEOUT 1 MALLOC_DEFINE(M_SBP_TARG, "sbp_targ", "SBP-II/FireWire target mode"); -static int debug = 0; +static int debug = 1; SYSCTL_INT(_debug, OID_AUTO, sbp_targ_debug, CTLFLAG_RW, &debug, 0, "SBP target mode debug flag"); @@ -134,6 +143,8 @@ struct sbp_targ_softc { struct cam_sim *sim; struct cam_path *path; struct fw_bind fwb; + struct fw_bind busy_timeout; + struct fw_bind reset_start; int ndevs; int flags; struct crom_chunk unit; @@ -171,6 +182,10 @@ struct corb4 { struct morb4 { #if BYTE_ORDER == BIG_ENDIAN + uint16_t reserved; + uint16_t off_hi; + uint32_t off_lo; + uint64_t reserved2; uint32_t n:1, rq_fmt:2, :9, @@ -182,9 +197,26 @@ struct morb4 { :9, rq_fmt:2, n:1; + uint64_t reserved2; + uint32_t off_lo; + uint16_t off_hi; + uint16_t reserved; #endif }; +/* + * Urestricted page table format + * states that the segment length + * and high base addr are in the first + * 32 bits and the base low is in + * the second + */ +struct unrestricted_page_table_fmt { + uint16_t segment_len; + uint16_t segment_base_high; + uint32_t segment_base_low; +}; + struct orb_info { struct sbp_targ_softc *sc; struct fw_device *fwdev; @@ -207,10 +239,24 @@ struct orb_info { struct corb4 orb4; STAILQ_ENTRY(orb_info) link; uint32_t orb[8]; - uint32_t *page_table; + struct unrestricted_page_table_fmt *page_table; + struct unrestricted_page_table_fmt *cur_pte; + struct unrestricted_page_table_fmt *last_pte; + uint32_t last_block_read; struct sbp_status status; }; +struct agent_state { + uint32_t fetch_agent_state; +#define AGENT_STATE_RESET 0 +#define AGENT_STATE_ACTIVE 1 +#define AGENT_STATE_SUSPENDED 2 +#define AGENT_STATE_DEAD 3 + uint32_t bus_reset_command_reset_init_vals; + uint32_t read_vals; + uint32_t write_effects; +}; + static char *orb_fun_name[] = { ORB_FUN_NAMES }; @@ -219,6 +265,8 @@ static void sbp_targ_recv(struct fw_xfer static void sbp_targ_fetch_orb(struct sbp_targ_softc *, struct fw_device *, uint16_t, uint32_t, struct sbp_targ_login *, int); static void sbp_targ_abort(struct sbp_targ_softc *, struct orb_info *); +static void sbp_targ_xfer_pt(struct orb_info *); +static void sbp_targ_send_agent_state(struct fw_xfer *, int state); static void sbp_targ_identify(driver_t *driver, device_t parent) @@ -251,13 +299,19 @@ sbp_targ_dealloc_login(struct sbp_targ_l } for (orbi = STAILQ_FIRST(&login->orbs); orbi != NULL; orbi = next) { next = STAILQ_NEXT(orbi, link); + if (debug) + printf("%s: free orbi %p\n", __func__, orbi); free(orbi, M_SBP_TARG); + orbi = NULL; } callout_stop(&login->hold_callout); STAILQ_REMOVE(&login->lstate->logins, login, sbp_targ_login, link); login->lstate->sc->logins[login->id] = NULL; + if (debug) + printf("%s: free login %p\n", __func__, login); free((void *)login, M_SBP_TARG); + login = NULL; } static void @@ -267,12 +321,25 @@ sbp_targ_hold_expire(void *arg) login = (struct sbp_targ_login *)arg; - if (login->flags & F_HOLD) { - printf("%s: login_id=%d expired\n", __func__, login->id); - sbp_targ_dealloc_login(login); - } else { - printf("%s: login_id=%d not hold\n", __func__, login->id); - } + /* if the login has been deallocated + * prior to the login timeout, login + * should be NULL, and we should do + * nothing + */ + if (login != NULL ) { + if (login->flags & F_HOLD) { + if (debug) + printf("%s: login(%p), " + "login_id=%d expired\n", + __func__, login, login->id); + sbp_targ_dealloc_login(login); + } else if (debug) { + printf("%s: login(%p), " + "login_id=%d not hold\n", + __func__, login, login->id); + } + } else if (debug) + printf("%s: woke up and this login was NULL\n", __func__); } static void @@ -292,14 +359,15 @@ sbp_targ_post_busreset(void *arg) unit = &sc->unit; + SBP_LOCK(sc); if ((sc->flags & F_FREEZED) == 0) { - SBP_LOCK(sc); sc->flags |= F_FREEZED; + printf("%s: freezing simq\n", __func__); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 04:56:48 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B22F3106568B; Wed, 30 Sep 2009 04:56:48 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9FDD08FC16; Wed, 30 Sep 2009 04:56:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U4um0B005598; Wed, 30 Sep 2009 04:56:48 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U4umq9005596; Wed, 30 Sep 2009 04:56:48 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200909300456.n8U4umq9005596@svn.freebsd.org> From: Sean Bruno Date: Wed, 30 Sep 2009 04:56:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197635 - projects/sbruno_firewire/sys/modules/firewire/sbp_targ X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 04:56:48 -0000 Author: sbruno Date: Wed Sep 30 04:56:48 2009 New Revision: 197635 URL: http://svn.freebsd.org/changeset/base/197635 Log: Update the module-foo to include the fwcsr.h/c objects as dependencies Modified: projects/sbruno_firewire/sys/modules/firewire/sbp_targ/Makefile Modified: projects/sbruno_firewire/sys/modules/firewire/sbp_targ/Makefile ============================================================================== --- projects/sbruno_firewire/sys/modules/firewire/sbp_targ/Makefile Wed Sep 30 02:50:09 2009 (r197634) +++ projects/sbruno_firewire/sys/modules/firewire/sbp_targ/Makefile Wed Sep 30 04:56:48 2009 (r197635) @@ -9,6 +9,7 @@ SRCS = bus_if.h device_if.h \ opt_cam.h opt_scsi.h \ sbp_targ.c sbp.h \ firewire.h firewirereg.h \ - iec13213.h + iec13213.h \ + fwcsr.c fwcsr.h .include From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 09:53:04 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 604A71065692; Wed, 30 Sep 2009 09:53:04 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 510378FC3C; Wed, 30 Sep 2009 09:53:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8U9r48n011114; Wed, 30 Sep 2009 09:53:04 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8U9r3Oo011112; Wed, 30 Sep 2009 09:53:03 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909300953.n8U9r3Oo011112@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 30 Sep 2009 09:53:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197638 - projects/tcp_ffcaia2008_8.x/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 09:53:04 -0000 Author: lstewart Date: Wed Sep 30 09:53:03 2009 New Revision: 197638 URL: http://svn.freebsd.org/changeset/base/197638 Log: Alphabetically order includes. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 08:48:59 2009 (r197637) +++ projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 09:53:03 2009 (r197638) @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include "opt_mac.h" #include -#include +#include +#include +#include #include #include #include @@ -44,12 +46,9 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include -#include +#include #include -#include -#include +#include #include From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 10:01:47 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6CF81065672; Wed, 30 Sep 2009 10:01:47 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 96D808FC13; Wed, 30 Sep 2009 10:01:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8UA1lgW011357; Wed, 30 Sep 2009 10:01:47 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8UA1lP9011355; Wed, 30 Sep 2009 10:01:47 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909301001.n8UA1lP9011355@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 30 Sep 2009 10:01:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197639 - projects/tcp_ffcaia2008_8.x/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 10:01:47 -0000 Author: lstewart Date: Wed Sep 30 10:01:47 2009 New Revision: 197639 URL: http://svn.freebsd.org/changeset/base/197639 Log: Numerous style tweaks. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 09:53:03 2009 (r197638) +++ projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 10:01:47 2009 (r197639) @@ -295,9 +295,7 @@ alq_doio(struct alq *alq) int vfslocked; int wrapearly; - KASSERT((ALQ_HAS_PENDING_DATA(alq)), - ("%s: queue emtpy!", __func__) - ); + KASSERT((ALQ_HAS_PENDING_DATA(alq)), ("%s: queue emtpy!", __func__)); vp = alq->aq_vp; td = curthread; @@ -384,8 +382,7 @@ alq_doio(struct alq *alq) alq->aq_writehead = alq->aq_writetail = 0; KASSERT((alq->aq_writetail >= 0 && alq->aq_writetail < alq->aq_buflen), - ("%s: aq_writetail < 0 || aq_writetail >= aq_buflen", __func__) - ); + ("%s: aq_writetail < 0 || aq_writetail >= aq_buflen", __func__)); if (alq->aq_flags & AQ_WANTED) { alq->aq_flags &= ~AQ_WANTED; @@ -396,9 +393,9 @@ alq_doio(struct alq *alq) } static struct kproc_desc ald_kp = { - "ALQ Daemon", - ald_daemon, - &ald_proc + "ALQ Daemon", + ald_daemon, + &ald_proc }; SYSINIT(aldthread, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &ald_kp); @@ -479,8 +476,7 @@ alq_write(struct alq *alq, void *data, i { /* Should only be called in fixed length message (legacy) mode. */ KASSERT((alq->aq_entmax > 0 && alq->aq_entlen > 0), - ("%s: fixed length write on variable length queue", __func__) - ); + ("%s: fixed length write on variable length queue", __func__)); return (alq_writen(alq, data, alq->aq_entlen, flags)); } @@ -491,8 +487,7 @@ alq_writen(struct alq *alq, void *data, int copy = len; KASSERT((len > 0 && len <= alq->aq_buflen), - ("%s: len <= 0 || len > aq_buflen", __func__) - ); + ("%s: len <= 0 || len > aq_buflen", __func__)); ALQ_LOCK(alq); @@ -546,8 +541,7 @@ alq_writen(struct alq *alq, void *data, KASSERT((alq->aq_writehead == alq->aq_buflen), ("alq->aq_writehead (%d) > alq->aq_buflen (%d)", alq->aq_writehead, - alq->aq_buflen) - ); + alq->aq_buflen)); alq->aq_writehead = 0; } @@ -561,8 +555,7 @@ alq_writen(struct alq *alq, void *data, } KASSERT((alq->aq_writehead >= 0 && alq->aq_writehead < alq->aq_buflen), - ("%s: aq_writehead < 0 || aq_writehead >= aq_buflen", __func__) - ); + ("%s: aq_writehead < 0 || aq_writehead >= aq_buflen", __func__)); alq->aq_freebytes -= len; @@ -588,8 +581,7 @@ alq_get(struct alq *alq, int flags) { /* Should only be called in fixed length message (legacy) mode. */ KASSERT((alq->aq_entmax > 0 && alq->aq_entlen > 0), - ("%s: fixed length get on variable length queue", __func__) - ); + ("%s: fixed length get on variable length queue", __func__)); return (alq_getn(alq, alq->aq_entlen, flags)); } @@ -599,8 +591,7 @@ alq_getn(struct alq *alq, int len, int f int contigbytes; KASSERT((len > 0 && len <= alq->aq_buflen), - ("%s: len <= 0 || len > alq->aq_buflen", __func__) - ); + ("%s: len <= 0 || len > alq->aq_buflen", __func__)); ALQ_LOCK(alq); @@ -642,7 +633,7 @@ alq_getn(struct alq *alq, int len, int f * to accept the message and the user can't wait, return. */ if ((len > alq->aq_buflen) || - ((flags & ALQ_NOWAIT) && (contigbytes < len))) { + ((flags & ALQ_NOWAIT) && (contigbytes < len))) { ALQ_UNLOCK(alq); return (NULL); } @@ -689,8 +680,7 @@ alq_getn(struct alq *alq, int len, int f alq->aq_writehead = 0; KASSERT((alq->aq_writehead >= 0 && alq->aq_writehead < alq->aq_buflen), - ("%s: aq_writehead < 0 || aq_writehead >= aq_buflen", __func__) - ); + ("%s: aq_writehead < 0 || aq_writehead >= aq_buflen", __func__)); return (&alq->aq_getpost); } @@ -701,7 +691,7 @@ alq_post(struct alq *alq, struct ale *al int activate; if (((alq->aq_flags & AQ_ACTIVE) == 0) && - ((flags & ALQ_NOACTIVATE) == 0)) { + ((flags & ALQ_NOACTIVATE) == 0)) { alq->aq_flags |= AQ_ACTIVE; activate = 1; } else From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 10:59:09 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3511B1065693; Wed, 30 Sep 2009 10:59:09 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail04.syd.optusnet.com.au (mail04.syd.optusnet.com.au [211.29.132.185]) by mx1.freebsd.org (Postfix) with ESMTP id C6CAE8FC2D; Wed, 30 Sep 2009 10:59:08 +0000 (UTC) Received: from besplex.bde.org (c122-107-125-150.carlnfd1.nsw.optusnet.com.au [122.107.125.150]) by mail04.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id n8UAx5TE011749 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Sep 2009 20:59:06 +1000 Date: Wed, 30 Sep 2009 20:59:05 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Lawrence Stewart In-Reply-To: <200909300953.n8U9r3Oo011112@svn.freebsd.org> Message-ID: <20090930203736.D1368@besplex.bde.org> References: <200909300953.n8U9r3Oo011112@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r197638 - projects/tcp_ffcaia2008_8.x/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 10:59:09 -0000 On Wed, 30 Sep 2009, Lawrence Stewart wrote: > Log: > Alphabetically order includes. > ... > Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c > ============================================================================== > --- projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 08:48:59 2009 (r197637) > +++ projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 09:53:03 2009 (r197638) > @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); > #include "opt_mac.h" > > #include > -#include > +#include > +#include > +#include > #include > #include > #include > @@ -44,12 +46,9 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > -#include > -#include > -#include > +#include > ... should not be sorted alphabeticaly, since it declares things like KASSERT() and (by nested includes) hundreds of inline functions (especially ones in , and ) which are used in many other headers. It should be sorted immediately after where it was. Mis-sorting it is sometimes masked by namespace pollution in other headers. has the grossest namespace pollution despite me once completely cleaning it up :-(. It now includes and . ( is even more disgusting. It starts by including and says that this is "/* for NULL */", despite there being a whole header for the purpose of defining NULL and thus avoiding namespace which would be caused by defining NULL in a more central header, and despite it using _much_ more of than the definition of NULL.) But most headers aren't as bad. Thus sorting alphabetically (near the end) rarely works, and even when it works it is fragile and will break when a header sorted before it starts using KASSERT(). Bruce From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 19:08:07 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B75841065672 for ; Wed, 30 Sep 2009 19:08:07 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id 44E848FC15 for ; Wed, 30 Sep 2009 19:08:06 +0000 (UTC) Received: from lstewart-laptop.caia.swin.edu.au ([64.9.241.180]) (authenticated bits=0) by lauren.room52.net (8.14.3/8.14.3) with ESMTP id n8UIloL8011390 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Oct 2009 04:47:56 +1000 (EST) (envelope-from lstewart@freebsd.org) Message-ID: <4AC3A7CE.4000207@freebsd.org> Date: Wed, 30 Sep 2009 11:47:42 -0700 From: Lawrence Stewart User-Agent: Thunderbird 2.0.0.23 (X11/20090909) MIME-Version: 1.0 To: Bruce Evans References: <200909300953.n8U9r3Oo011112@svn.freebsd.org> <20090930203736.D1368@besplex.bde.org> In-Reply-To: <20090930203736.D1368@besplex.bde.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,RDNS_NONE, SPF_SOFTFAIL autolearn=disabled version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on lauren.room52.net Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r197638 - projects/tcp_ffcaia2008_8.x/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 19:08:07 -0000 Bruce Evans wrote: > On Wed, 30 Sep 2009, Lawrence Stewart wrote: > >> Log: >> Alphabetically order includes. >> ... >> Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c >> ============================================================================== >> >> --- projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 >> 08:48:59 2009 (r197637) >> +++ projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 >> 09:53:03 2009 (r197638) >> @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); >> #include "opt_mac.h" >> >> #include >> -#include >> +#include >> +#include >> +#include >> #include >> #include >> #include >> @@ -44,12 +46,9 @@ __FBSDID("$FreeBSD$"); >> #include >> #include >> #include >> -#include >> -#include >> -#include >> +#include >> ... > > should not be sorted alphabeticaly, since it declares > things like KASSERT() and (by nested includes) hundreds of inline > functions (especially ones in , > and ) which are used in many other headers. It should > be sorted immediately after where it was. Ok got it, thanks for the pointer. Everything compiled fine which is why I made the change but as you say there must be some "pollution" somewhere. Does this requirement to keep the systm.h include up top warrant a mention in style(9) or is it just something to remember? > > Mis-sorting it is sometimes masked by namespace pollution in other > headers. has the grossest namespace pollution despite > me once completely cleaning it up :-(. It now includes > and . ( is even more disgusting. It starts by > including and says that this is "/* for NULL */", despite > there being a whole header for the purpose of defining > NULL and thus avoiding namespace which would be caused by defining > NULL in a more central header, and despite it using _much_ more of > than the definition of NULL.) But most headers aren't > as bad. Thus sorting alphabetically (near the end) > rarely works, and even when it works it is fragile and will break when > a header sorted before it starts using KASSERT(). Random, likely naive thought: is there some way to detect if a header has been included before or after another header? Could be done fairly easily with an external script I guess, but something explicit in the files (some sort of preprocessor and macro magic?) would be more useful I suspect. Perhaps there could be a warning emitted if ordering is violated or an include is detected that shouldn't be there. If done right, it would likely do the job of educating people about correct ordering/inclusion and go a long way to reducing "pollution creep". Cheers, Lawrence From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 19:19:53 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86833106566B; Wed, 30 Sep 2009 19:19:53 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7737B8FC1E; Wed, 30 Sep 2009 19:19:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8UJJriA023750; Wed, 30 Sep 2009 19:19:53 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8UJJrvk023748; Wed, 30 Sep 2009 19:19:53 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909301919.n8UJJrvk023748@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 30 Sep 2009 19:19:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197651 - projects/tcp_ffcaia2008_8.x/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 19:19:53 -0000 Author: lstewart Date: Wed Sep 30 19:19:53 2009 New Revision: 197651 URL: http://svn.freebsd.org/changeset/base/197651 Log: Unsort the systm.h include back to the top of the list under param.h where it belongs. It only worked in alphabetical order by luck and defines things other header files may use in the future. Sponsored by: FreeBSD Foundation Submitted by: bde@ Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 18:50:50 2009 (r197650) +++ projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Wed Sep 30 19:19:53 2009 (r197651) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include "opt_mac.h" #include +#include #include #include #include @@ -46,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include From owner-svn-src-projects@FreeBSD.ORG Wed Sep 30 22:38:02 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4230D106566B; Wed, 30 Sep 2009 22:38:02 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail07.syd.optusnet.com.au (mail07.syd.optusnet.com.au [211.29.132.188]) by mx1.freebsd.org (Postfix) with ESMTP id D14E48FC1D; Wed, 30 Sep 2009 22:38:01 +0000 (UTC) Received: from besplex.bde.org (c122-107-125-150.carlnfd1.nsw.optusnet.com.au [122.107.125.150]) by mail07.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id n8UMbw0f021329 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Oct 2009 08:37:59 +1000 Date: Thu, 1 Oct 2009 08:37:58 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Lawrence Stewart In-Reply-To: <4AC3A7CE.4000207@freebsd.org> Message-ID: <20091001070833.R49077@besplex.bde.org> References: <200909300953.n8U9r3Oo011112@svn.freebsd.org> <20090930203736.D1368@besplex.bde.org> <4AC3A7CE.4000207@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Bruce Evans Subject: Re: svn commit: r197638 - projects/tcp_ffcaia2008_8.x/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2009 22:38:02 -0000 On Wed, 30 Sep 2009, Lawrence Stewart wrote: > Bruce Evans wrote: >> should not be sorted alphabeticaly, since it declares >> things like KASSERT() and (by nested includes) hundreds of inline >> functions (especially ones in , >> and ) which are used in many other headers. It should >> be sorted immediately after where it was. > > Ok got it, thanks for the pointer. Everything compiled fine which is why I > made the change but as you say there must be some "pollution" somewhere. Does > this requirement to keep the systm.h include up top warrant a mention in > style(9) or is it just something to remember? It's not really style, but how the kernel headers are (dis)organized. mumble(9) would be a better place. Probably intro(9), except that doesn't exist. > Random, likely naive thought: is there some way to detect if a header has > been included before or after another header? Could be done fairly easily > with an external script I guess, cpp -M order (used in .depend files) gives the order of include processing. This could be used in the script. I sometimes look at .depend files to find header pollution, but haven't automated this. > but something explicit in the files (some > sort of preprocessor and macro magic?) would be more useful I suspect. > Perhaps there could be a warning emitted if ordering is violated or an > include is detected that shouldn't be there. If done right, it would likely > do the job of educating people about correct ordering/inclusion and go a long > way to reducing "pollution creep". Generally we're trying to reduce prerequisites by including headers in other headers, but this is hard to do without increasing the include mess, and almost everything still has and probably and possibly as prerequisites. I don't know how to detect pollution using only standard C cpp directives. It would be easy using counters as found in primitive macro assemblers, but cpp still doesn't seem to have anything like that. I just looked at cpp.info and found the nonstandard __INCLUDE_LEVEL__ directive which could be used to set a boolean macro when a header is included non-nested. Unfortunately, cpp is also missing the feature of directives within directives (also found in primitive macro assembler) which would be useful here for avoiding having to change every header of interest to set the new macro. Bruce From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 13:01:14 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0900106568B; Thu, 1 Oct 2009 13:01:14 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A16A18FC0C; Thu, 1 Oct 2009 13:01:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91D1EHS051866; Thu, 1 Oct 2009 13:01:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91D1Eoa051864; Thu, 1 Oct 2009 13:01:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200910011301.n91D1Eoa051864@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 1 Oct 2009 13:01:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197664 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 13:01:14 -0000 Author: nwhitehorn Date: Thu Oct 1 13:01:14 2009 New Revision: 197664 URL: http://svn.freebsd.org/changeset/base/197664 Log: Change where we save and restore the TOC pointer. Modified: projects/ppc64/sys/powerpc/aim64/swtch.S Modified: projects/ppc64/sys/powerpc/aim64/swtch.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/swtch.S Thu Oct 1 12:52:48 2009 (r197663) +++ projects/ppc64/sys/powerpc/aim64/swtch.S Thu Oct 1 13:01:14 2009 (r197664) @@ -111,6 +111,8 @@ ENTRY(cpu_switch) std %r16,PCB_CR(%r5) mflr %r16 /* Save the link register */ std %r16,PCB_LR(%r5) + std %r1,PCB_SP(%r5) /* Save the stack pointer */ + std %r2,PCB_TOC(%r5) /* Save the TOC pointer */ li %r14,0 /* Save USER_SR for copyin/out */ li %r15,0 @@ -120,8 +122,6 @@ ENTRY(cpu_switch) isync std %r14,PCB_AIM_USR_ESID(%r5) std %r15,PCB_AIM_USR_VSID(%r5) - std %r1,PCB_SP(%r5) /* Save the stack pointer */ - std %r2,PCB_TOC(%r5) /* Save the TOC pointer */ mr %r14,%r3 /* Copy the old thread ptr... */ mr %r15,%r4 /* and the new thread ptr in scratch */ @@ -200,6 +200,8 @@ cpu_switchin: mtcr %r5 ld %r5,PCB_LR(%r3) /* Load the link register */ mtlr %r5 + ld %r1,PCB_SP(%r3) /* Load the stack pointer */ + ld %r2,PCB_TOC(%r3) /* Load the TOC pointer */ li %r5,USER_SR /* Load the USER_SR segment reg */ sldi %r5,%r5,28 @@ -210,8 +212,6 @@ cpu_switchin: slbmte %r5,%r6 isync - ld %r1,PCB_SP(%r3) /* Load the stack pointer */ - ld %r2,PCB_TOC(%r3) /* Load the TOC pointer */ /* * Perform a dummy stwcx. to clear any reservations we may have * inherited from the previous thread. It doesn't matter if the @@ -248,6 +248,7 @@ ENTRY(savectx) mfcr %r4 /* Save the condition register */ std %r4,PCB_CR(%r3) + std %r2,PCB_TOC(%r3) /* Save the TOC pointer */ blr /* From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 13:02:34 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87BEA1065694; Thu, 1 Oct 2009 13:02:34 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 78B2E8FC26; Thu, 1 Oct 2009 13:02:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91D2Y5N051936; Thu, 1 Oct 2009 13:02:34 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91D2Yud051934; Thu, 1 Oct 2009 13:02:34 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200910011302.n91D2Yud051934@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 1 Oct 2009 13:02:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197665 - projects/ppc64/sys/powerpc/include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 13:02:34 -0000 Author: nwhitehorn Date: Thu Oct 1 13:02:34 2009 New Revision: 197665 URL: http://svn.freebsd.org/changeset/base/197665 Log: Chase earlier changes: MI code does not like us to have some registers different sizes than others, so make them all a register_t. Modified: projects/ppc64/sys/powerpc/include/reg.h Modified: projects/ppc64/sys/powerpc/include/reg.h ============================================================================== --- projects/ppc64/sys/powerpc/include/reg.h Thu Oct 1 13:01:14 2009 (r197664) +++ projects/ppc64/sys/powerpc/include/reg.h Thu Oct 1 13:02:34 2009 (r197665) @@ -8,8 +8,8 @@ struct reg { register_t fixreg[32]; register_t lr; - int cr; - int xer; + register_t cr; + register_t xer; register_t ctr; register_t pc; }; From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 13:03:17 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83DD41065676; Thu, 1 Oct 2009 13:03:17 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 74D3D8FC0A; Thu, 1 Oct 2009 13:03:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91D3Hoh051996; Thu, 1 Oct 2009 13:03:17 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91D3HcO051994; Thu, 1 Oct 2009 13:03:17 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200910011303.n91D3HcO051994@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 1 Oct 2009 13:03:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197666 - projects/ppc64/sys/powerpc/aim X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 13:03:17 -0000 Author: nwhitehorn Date: Thu Oct 1 13:03:17 2009 New Revision: 197666 URL: http://svn.freebsd.org/changeset/base/197666 Log: Remove unused static function set_user_sr(). Modified: projects/ppc64/sys/powerpc/aim/trap.c Modified: projects/ppc64/sys/powerpc/aim/trap.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/trap.c Thu Oct 1 13:02:34 2009 (r197665) +++ projects/ppc64/sys/powerpc/aim/trap.c Thu Oct 1 13:03:17 2009 (r197666) @@ -86,8 +86,6 @@ static int fix_unaligned(struct thread * static int handle_onfault(struct trapframe *frame); static void syscall(struct trapframe *frame); -static __inline void setusr(u_int); - int setfault(faultbuf); /* defined in locore.S */ /* Why are these not defined in a header? */ @@ -618,13 +616,6 @@ trap_pfault(struct trapframe *frame, int return (SIGSEGV); } -static __inline void -setusr(u_int content) -{ - __asm __volatile ("isync; mtsr %0,%1; isync" - :: "n"(USER_SR), "r"(content)); -} - int badaddr(void *addr, size_t size) { From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 13:16:25 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 073DC106566B; Thu, 1 Oct 2009 13:16:25 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC1668FC47; Thu, 1 Oct 2009 13:16:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91DGOL4052408; Thu, 1 Oct 2009 13:16:24 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91DGOS4052403; Thu, 1 Oct 2009 13:16:24 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200910011316.n91DGOS4052403@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 1 Oct 2009 13:16:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197668 - in projects/ppc64/sys/powerpc64: . conf powerpc64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 13:16:25 -0000 Author: nwhitehorn Date: Thu Oct 1 13:16:24 2009 New Revision: 197668 URL: http://svn.freebsd.org/changeset/base/197668 Log: Temporarily add a stub sys/powerpc64 while the build system is wrangled into supporting multi-architecture platforms. This takes advantage of being able to commit symlinks in svn in order to share sys/powerpc64/include and sys/powerpc64/powerpc64/genassym.c, which config really, really wants to be in those places. Added: projects/ppc64/sys/powerpc64/ projects/ppc64/sys/powerpc64/conf/ - copied from r196960, projects/ppc64/sys/powerpc/conf/ projects/ppc64/sys/powerpc64/include (contents, props changed) projects/ppc64/sys/powerpc64/powerpc64/ projects/ppc64/sys/powerpc64/powerpc64/genassym.c (contents, props changed) Deleted: projects/ppc64/sys/powerpc64/conf/MPC85XX Modified: projects/ppc64/sys/powerpc64/conf/DEFAULTS projects/ppc64/sys/powerpc64/conf/GENERIC Modified: projects/ppc64/sys/powerpc64/conf/DEFAULTS ============================================================================== --- projects/ppc64/sys/powerpc/conf/DEFAULTS Tue Sep 8 04:08:14 2009 (r196960) +++ projects/ppc64/sys/powerpc64/conf/DEFAULTS Thu Oct 1 13:16:24 2009 (r197668) @@ -3,7 +3,7 @@ # # $FreeBSD$ -machine powerpc +machine powerpc64 # Pseudo devices. device mem # Memory and kernel memory devices Modified: projects/ppc64/sys/powerpc64/conf/GENERIC ============================================================================== --- projects/ppc64/sys/powerpc/conf/GENERIC Tue Sep 8 04:08:14 2009 (r196960) +++ projects/ppc64/sys/powerpc64/conf/GENERIC Thu Oct 1 13:16:24 2009 (r197668) @@ -19,6 +19,7 @@ # $FreeBSD$ cpu AIM +cpu CELL ident GENERIC #To statically compile in device wiring instead of /boot/device.hints @@ -28,7 +29,7 @@ makeoptions DEBUG=-g #Build kernel with # Platform support options POWERMAC #NewWorld Apple PowerMacs -options PSIM #GDB PSIM ppc simulator +options MAMBO #IBM Systemsim ppc simulator options SCHED_ULE #ULE scheduler options INET #InterNETworking @@ -51,7 +52,6 @@ options PSEUDOFS #Pseudo-filesystem fr options GEOM_PART_GPT #GUID Partition Tables. options GEOM_LABEL #Provides labelization options COMPAT_43TTY #BSD 4.3 TTY compat (sgtty) -options COMPAT_FREEBSD4 #Keep this for a while options COMPAT_FREEBSD5 #Compatible with FreeBSD5 options COMPAT_FREEBSD6 #Compatible with FreeBSD6 options COMPAT_FREEBSD7 #Compatible with FreeBSD7 @@ -79,7 +79,7 @@ options WITNESS_SKIPSPIN #Don't run wit #options SMP # Symmetric MultiProcessor Kernel # CPU frequency control -device cpufreq +#device cpufreq # Standard busses device pci @@ -112,7 +112,6 @@ device uart # PCI Ethernet NICs that use the common MII bus controller code. device miibus # MII bus support device bge # Broadcom BCM570xx Gigabit Ethernet -device bm # Apple BMAC Ethernet device gem # Sun GEM/Sun ERI/Apple GMAC device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) @@ -163,7 +162,6 @@ device smu # Apple System Management U # ADB support device adb -device cuda device pmu # Powermac I2C support Added: projects/ppc64/sys/powerpc64/include ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/sys/powerpc64/include Thu Oct 1 13:16:24 2009 (r197668) @@ -0,0 +1 @@ +link ../powerpc/include \ No newline at end of file Added: projects/ppc64/sys/powerpc64/powerpc64/genassym.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/sys/powerpc64/powerpc64/genassym.c Thu Oct 1 13:16:24 2009 (r197668) @@ -0,0 +1 @@ +link ../../powerpc/powerpc/genassym.c \ No newline at end of file From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 15:28:09 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BADE106566B; Thu, 1 Oct 2009 15:28:09 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3B6638FC17; Thu, 1 Oct 2009 15:28:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91FS9w3055695; Thu, 1 Oct 2009 15:28:09 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91FS9hT055693; Thu, 1 Oct 2009 15:28:09 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200910011528.n91FS9hT055693@svn.freebsd.org> From: Sean Bruno Date: Thu, 1 Oct 2009 15:28:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197672 - projects/sbruno_firewire/sys/modules/firewire/sbp_targ X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 15:28:09 -0000 Author: sbruno Date: Thu Oct 1 15:28:08 2009 New Revision: 197672 URL: http://svn.freebsd.org/changeset/base/197672 Log: Remove undeeded depends in Makefile Modified: projects/sbruno_firewire/sys/modules/firewire/sbp_targ/Makefile Modified: projects/sbruno_firewire/sys/modules/firewire/sbp_targ/Makefile ============================================================================== --- projects/sbruno_firewire/sys/modules/firewire/sbp_targ/Makefile Thu Oct 1 15:22:34 2009 (r197671) +++ projects/sbruno_firewire/sys/modules/firewire/sbp_targ/Makefile Thu Oct 1 15:28:08 2009 (r197672) @@ -8,8 +8,6 @@ KMOD = sbp_targ SRCS = bus_if.h device_if.h \ opt_cam.h opt_scsi.h \ sbp_targ.c sbp.h \ - firewire.h firewirereg.h \ - iec13213.h \ - fwcsr.c fwcsr.h + fwcsr.c .include From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 15:28:41 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B5D21065679; Thu, 1 Oct 2009 15:28:41 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B4468FC14; Thu, 1 Oct 2009 15:28:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91FSe3S055742; Thu, 1 Oct 2009 15:28:40 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91FSe4n055740; Thu, 1 Oct 2009 15:28:40 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200910011528.n91FSe4n055740@svn.freebsd.org> From: Sean Bruno Date: Thu, 1 Oct 2009 15:28:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197673 - projects/sbruno_firewire/sys/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 15:28:41 -0000 Author: sbruno Date: Thu Oct 1 15:28:40 2009 New Revision: 197673 URL: http://svn.freebsd.org/changeset/base/197673 Log: Add fwcsr.c to files for firewire Modified: projects/sbruno_firewire/sys/conf/files Modified: projects/sbruno_firewire/sys/conf/files ============================================================================== --- projects/sbruno_firewire/sys/conf/files Thu Oct 1 15:28:08 2009 (r197672) +++ projects/sbruno_firewire/sys/conf/files Thu Oct 1 15:28:40 2009 (r197673) @@ -920,6 +920,7 @@ dev/fe/if_fe.c optional fe dev/fe/if_fe_pccard.c optional fe pccard dev/firewire/firewire.c optional firewire dev/firewire/fwcrom.c optional firewire +dev/firewire/fwcsr.c optional firewire dev/firewire/fwdev.c optional firewire dev/firewire/fwdma.c optional firewire dev/firewire/fwmem.c optional firewire From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 16:17:45 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B06B10656C4; Thu, 1 Oct 2009 16:17:45 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 109ED8FC1D; Thu, 1 Oct 2009 16:17:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91GHiM0057100; Thu, 1 Oct 2009 16:17:44 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91GHiB6057098; Thu, 1 Oct 2009 16:17:44 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200910011617.n91GHiB6057098@svn.freebsd.org> From: Sean Bruno Date: Thu, 1 Oct 2009 16:17:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197677 - projects/sbruno_firewire/sys/dev/firewire X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 16:17:45 -0000 Author: sbruno Date: Thu Oct 1 16:17:44 2009 New Revision: 197677 URL: http://svn.freebsd.org/changeset/base/197677 Log: Quick and dirty callout implementation for debugging purposes to allow non-booting systems to bypass an initialization failure at startup. Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/sbp.c Thu Oct 1 15:51:29 2009 (r197676) +++ projects/sbruno_firewire/sys/dev/firewire/sbp.c Thu Oct 1 16:17:44 2009 (r197677) @@ -252,10 +252,12 @@ struct sbp_softc { #define SIMQ_FREEZED 1 int flags; struct mtx mtx; + struct callout busreset_timeout; }; #define SBP_LOCK(sbp) mtx_lock(&(sbp)->mtx) #define SBP_UNLOCK(sbp) mtx_unlock(&(sbp)->mtx) +static void sbp_busreset_timeout(void *); static void sbp_post_explore (void *); static void sbp_recv (struct fw_xfer *); static void sbp_mgm_callback (struct fw_xfer *); @@ -815,10 +817,29 @@ END_DEBUG if ((sbp->sim->flags & SIMQ_FREEZED) == 0) { sbp->sim->flags |= SIMQ_FREEZED; xpt_freeze_simq(sbp->sim, /*count*/1); + callout_reset(&sbp->busreset_timeout, + scan_delay * hz / 1000, + sbp_busreset_timeout, + (void *)sbp); } SBP_UNLOCK(sbp); microtime(&sbp->last_busreset); } +static void +sbp_busreset_timeout(void *arg) +{ + struct sbp_softc *sbp; + + sbp = (struct sbp_softc *)arg; + + callout_stop(&sbp->busreset_timeout); + printf("%s: Failed to recieved SID from fwohci\n", __func__); + SBP_LOCK(sbp); + xpt_release_simq(sbp->sim, /*run queue*/TRUE); + sbp->sim->flags &= ~SIMQ_FREEZED; + SBP_UNLOCK(sbp); +} + static void sbp_post_explore(void *arg) @@ -828,6 +849,7 @@ sbp_post_explore(void *arg) struct fw_device *fwdev; int i, alive; + callout_stop(&sbp->busreset_timeout); SBP_DEBUG(0) printf("sbp_post_explore (sbp_cold=%d)\n", sbp_cold); END_DEBUG @@ -2063,6 +2085,7 @@ END_DEBUG sbp->fd.post_busreset = sbp_post_busreset; sbp->fd.post_explore = sbp_post_explore; + CALLOUT_INIT(&sbp->busreset_timeout); if (fc->status != -1) { s = splfw(); sbp_post_busreset((void *)sbp); @@ -2359,6 +2382,8 @@ SBP_DEBUG(1) ccb->ccb_h.target_id, ccb->ccb_h.target_lun); END_DEBUG + printf("%s: ccb func_code = %x\n", __func__, ccb->ccb_h.func_code); + switch (ccb->ccb_h.func_code) { case XPT_SCSI_IO: case XPT_RESET_DEV: From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 16:25:36 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BF2D1065692; Thu, 1 Oct 2009 16:25:36 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1753F8FC26; Thu, 1 Oct 2009 16:25:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91GPZQp057352; Thu, 1 Oct 2009 16:25:35 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91GPZ9Z057310; Thu, 1 Oct 2009 16:25:35 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200910011625.n91GPZ9Z057310@svn.freebsd.org> From: Sean Bruno Date: Thu, 1 Oct 2009 16:25:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197678 - in projects/sbruno_firewire: . etc/rc.d sys/amd64/amd64 sys/amd64/conf sys/amd64/include sys/bsm sys/cam sys/compat/freebsd32 sys/dev/acpica sys/dev/ae sys/dev/age sys/dev/alc... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 16:25:36 -0000 Author: sbruno Date: Thu Oct 1 16:25:35 2009 New Revision: 197678 URL: http://svn.freebsd.org/changeset/base/197678 Log: Merge to HEAD Modified: projects/sbruno_firewire/ (props changed) projects/sbruno_firewire/etc/rc.d/netoptions projects/sbruno_firewire/etc/rc.d/routing projects/sbruno_firewire/sys/amd64/amd64/initcpu.c projects/sbruno_firewire/sys/amd64/conf/GENERIC projects/sbruno_firewire/sys/amd64/include/cpufunc.h projects/sbruno_firewire/sys/bsm/audit_kevents.h projects/sbruno_firewire/sys/cam/cam_sim.c projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_proto.h projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_syscall.h projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_syscalls.c projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_sysent.c projects/sbruno_firewire/sys/compat/freebsd32/syscalls.master projects/sbruno_firewire/sys/dev/acpica/acpi_acad.c projects/sbruno_firewire/sys/dev/acpica/acpi_video.c projects/sbruno_firewire/sys/dev/ae/if_ae.c projects/sbruno_firewire/sys/dev/age/if_age.c projects/sbruno_firewire/sys/dev/alc/if_alc.c projects/sbruno_firewire/sys/dev/ale/if_ale.c projects/sbruno_firewire/sys/dev/if_ndis/if_ndis.c projects/sbruno_firewire/sys/dev/mxge/if_mxge.c projects/sbruno_firewire/sys/dev/mxge/if_mxge_var.h projects/sbruno_firewire/sys/dev/sound/pci/hda/hdac.c projects/sbruno_firewire/sys/fs/nfs/nfs_commonacl.c projects/sbruno_firewire/sys/i386/conf/GENERIC projects/sbruno_firewire/sys/i386/i386/initcpu.c projects/sbruno_firewire/sys/i386/include/cpufunc.h projects/sbruno_firewire/sys/kern/init_main.c projects/sbruno_firewire/sys/kern/init_sysent.c projects/sbruno_firewire/sys/kern/kern_rwlock.c projects/sbruno_firewire/sys/kern/kern_sig.c projects/sbruno_firewire/sys/kern/kern_sx.c projects/sbruno_firewire/sys/kern/syscalls.c projects/sbruno_firewire/sys/kern/syscalls.master projects/sbruno_firewire/sys/kern/uipc_syscalls.c projects/sbruno_firewire/sys/pc98/conf/GENERIC projects/sbruno_firewire/sys/sys/rwlock.h projects/sbruno_firewire/sys/sys/sx.h projects/sbruno_firewire/sys/sys/syscall.h projects/sbruno_firewire/sys/sys/syscall.mk projects/sbruno_firewire/sys/sys/sysproto.h projects/sbruno_firewire/sys/vm/vm_map.c projects/sbruno_firewire/usr.sbin/lpr/lp/lp.sh projects/sbruno_firewire/usr.sbin/mfiutil/mfiutil.8 (props changed) Modified: projects/sbruno_firewire/etc/rc.d/netoptions ============================================================================== --- projects/sbruno_firewire/etc/rc.d/netoptions Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/etc/rc.d/netoptions Thu Oct 1 16:25:35 2009 (r197678) @@ -9,6 +9,7 @@ # KEYWORD: nojail . /etc/rc.subr +. /etc/network.subr name="netoptions" start_cmd="netoptions_start" @@ -66,11 +67,13 @@ netoptions_start() ;; esac - if checkyesno ipv6_ipv4mapping; then - ${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null - else - echo -n " no-ipv4-mapped-ipv6" - ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null + if afexists inet6; then + if checkyesno ipv6_ipv4mapping; then + ${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null + else + echo -n " no-ipv4-mapped-ipv6" + ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null + fi fi [ -n "${_netoptions_initdone}" ] && echo '.' Modified: projects/sbruno_firewire/etc/rc.d/routing ============================================================================== --- projects/sbruno_firewire/etc/rc.d/routing Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/etc/rc.d/routing Thu Oct 1 16:25:35 2009 (r197678) @@ -51,7 +51,9 @@ static_start() ;; *) do_static inet add - do_static inet6 add + if afexists inet6; then + do_static inet6 add + fi do_static atm add ;; esac @@ -74,7 +76,9 @@ static_stop() ;; *) do_static inet delete - do_static inet6 delete + if afexists inet6; then + do_static inet6 delete + fi do_static atm delete ;; esac Modified: projects/sbruno_firewire/sys/amd64/amd64/initcpu.c ============================================================================== --- projects/sbruno_firewire/sys/amd64/amd64/initcpu.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/amd64/amd64/initcpu.c Thu Oct 1 16:25:35 2009 (r197678) @@ -165,4 +165,10 @@ initializecpu(void) */ if ((cpu_feature & CPUID_CLFSH) != 0) cpu_clflush_line_size = ((cpu_procinfo >> 8) & 0xff) * 8; + /* + * XXXKIB: (temporary) hack to work around traps generated when + * CLFLUSHing APIC registers window. + */ + if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS)) + cpu_feature &= ~CPUID_CLFSH; } Modified: projects/sbruno_firewire/sys/amd64/conf/GENERIC ============================================================================== --- projects/sbruno_firewire/sys/amd64/conf/GENERIC Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/amd64/conf/GENERIC Thu Oct 1 16:25:35 2009 (r197678) @@ -257,7 +257,7 @@ device xe # Xircom pccard Ethernet device wlan # 802.11 support options IEEE80211_DEBUG # enable debug msgs options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's -options IEEE80211_SUPPORT_MESH # enable 802.11s D3.0 support +options IEEE80211_SUPPORT_MESH # enable 802.11s draft support device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support Modified: projects/sbruno_firewire/sys/amd64/include/cpufunc.h ============================================================================== --- projects/sbruno_firewire/sys/amd64/include/cpufunc.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/amd64/include/cpufunc.h Thu Oct 1 16:25:35 2009 (r197678) @@ -277,7 +277,7 @@ static __inline void mfence(void) { - __asm__ __volatile("mfence" : : : "memory"); + __asm __volatile("mfence" : : : "memory"); } static __inline void @@ -457,14 +457,14 @@ load_es(u_int sel) __asm __volatile("mov %0,%%es" : : "rm" (sel)); } -static inline void +static __inline void cpu_monitor(const void *addr, int extensions, int hints) { __asm __volatile("monitor;" : :"a" (addr), "c" (extensions), "d"(hints)); } -static inline void +static __inline void cpu_mwait(int extensions, int hints) { __asm __volatile("mwait;" : :"a" (hints), "c" (extensions)); Modified: projects/sbruno_firewire/sys/bsm/audit_kevents.h ============================================================================== --- projects/sbruno_firewire/sys/bsm/audit_kevents.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/bsm/audit_kevents.h Thu Oct 1 16:25:35 2009 (r197678) @@ -598,6 +598,10 @@ #define AUE_FSCTL 43194 /* Darwin. */ #define AUE_FFSCTL 43195 /* Darwin. */ #define AUE_LPATHCONF 43196 /* FreeBSD. */ +#define AUE_PDFORK 43197 /* FreeBSD. */ +#define AUE_PDKILL 43198 /* FreeBSD. */ +#define AUE_PDGETPID 43199 /* FreeBSD. */ +#define AUE_PDWAIT 43200 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the Modified: projects/sbruno_firewire/sys/cam/cam_sim.c ============================================================================== --- projects/sbruno_firewire/sys/cam/cam_sim.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/cam/cam_sim.c Thu Oct 1 16:25:35 2009 (r197678) @@ -106,8 +106,10 @@ cam_sim_free(struct cam_sim *sim, int fr { int error; + mtx_assert(sim->mtx, MA_OWNED); sim->refcount--; if (sim->refcount > 0) { + printf("%s: sim->refcount(%d)\n", __func__, sim->refcount); error = msleep(sim, sim->mtx, PRIBIO, "simfree", 0); KASSERT(error == 0, ("invalid error value for msleep(9)")); } @@ -125,6 +127,7 @@ cam_sim_release(struct cam_sim *sim) KASSERT(sim->refcount >= 1, ("sim->refcount >= 1")); mtx_assert(sim->mtx, MA_OWNED); + printf("%s: sim->refcount(%d)\n", __func__, sim->refcount); sim->refcount--; if (sim->refcount == 0) wakeup(sim); @@ -137,6 +140,7 @@ cam_sim_hold(struct cam_sim *sim) mtx_assert(sim->mtx, MA_OWNED); sim->refcount++; + printf("%s: sim->refcount(%d)\n", __func__, sim->refcount); } void Modified: projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_proto.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_proto.h Thu Oct 1 16:25:35 2009 (r197678) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468 2009-07-08 16:26:43Z trasz + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -626,8 +626,7 @@ int freebsd4_freebsd32_sigreturn(struct #endif /* COMPAT_FREEBSD4 */ -#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ - defined(COMPAT_FREEBSD6) +#ifdef COMPAT_FREEBSD6 struct freebsd6_freebsd32_pread_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; @@ -681,11 +680,10 @@ int freebsd6_freebsd32_lseek(struct thre int freebsd6_freebsd32_truncate(struct thread *, struct freebsd6_freebsd32_truncate_args *); int freebsd6_freebsd32_ftruncate(struct thread *, struct freebsd6_freebsd32_ftruncate_args *); -#endif /* COMPAT_FREEBSD[456] */ +#endif /* COMPAT_FREEBSD6 */ -#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ - defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) +#ifdef COMPAT_FREEBSD7 struct freebsd7_freebsd32_semctl_args { char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)]; @@ -707,7 +705,7 @@ int freebsd7_freebsd32_semctl(struct thr int freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *); int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *); -#endif /* COMPAT_FREEBSD[4567] */ +#endif /* COMPAT_FREEBSD7 */ #define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4 #define FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat AUE_GETFSSTAT Modified: projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_syscall.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_syscall.h Thu Oct 1 16:25:35 2009 (r197678) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468 2009-07-08 16:26:43Z trasz + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson */ #define FREEBSD32_SYS_syscall 0 @@ -382,4 +382,4 @@ #define FREEBSD32_SYS_freebsd32_msgctl 511 #define FREEBSD32_SYS_freebsd32_shmctl 512 #define FREEBSD32_SYS_lpathconf 513 -#define FREEBSD32_SYS_MAXSYSCALL 514 +#define FREEBSD32_SYS_MAXSYSCALL 522 Modified: projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_syscalls.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_syscalls.c Thu Oct 1 16:25:35 2009 (r197678) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468 2009-07-08 16:26:43Z trasz + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson */ const char *freebsd32_syscallnames[] = { @@ -521,4 +521,12 @@ const char *freebsd32_syscallnames[] = { "freebsd32_msgctl", /* 511 = freebsd32_msgctl */ "freebsd32_shmctl", /* 512 = freebsd32_shmctl */ "lpathconf", /* 513 = lpathconf */ + "#514", /* 514 = cap_new */ + "#515", /* 515 = cap_getrights */ + "#516", /* 516 = cap_enter */ + "#517", /* 517 = cap_getmode */ + "#518", /* 518 = pdfork */ + "#519", /* 519 = pdkill */ + "#520", /* 520 = pdgetpid */ + "#521", /* 521 = pdwait */ }; Modified: projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_sysent.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/compat/freebsd32/freebsd32_sysent.c Thu Oct 1 16:25:35 2009 (r197678) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468 2009-07-08 16:26:43Z trasz + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson */ #include "opt_compat.h" @@ -558,4 +558,12 @@ struct sysent freebsd32_sysent[] = { { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0, 0 }, /* 511 = freebsd32_msgctl */ { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0, 0 }, /* 512 = freebsd32_shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 514 = cap_new */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = cap_enter */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ }; Modified: projects/sbruno_firewire/sys/compat/freebsd32/syscalls.master ============================================================================== --- projects/sbruno_firewire/sys/compat/freebsd32/syscalls.master Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/compat/freebsd32/syscalls.master Thu Oct 1 16:25:35 2009 (r197678) @@ -901,3 +901,11 @@ 512 AUE_SHMCTL STD { int freebsd32_shmctl(int shmid, int cmd, \ struct shmid_ds32 *buf); } 513 AUE_LPATHCONF NOPROTO { int lpathconf(char *path, int name); } +514 AUE_CAP_NEW UNIMPL cap_new +515 AUE_CAP_GETRIGHTS UNIMPL cap_getrights +516 AUE_CAP_ENTER UNIMPL cap_enter +517 AUE_CAP_GETMODE UNIMPL cap_getmode +518 AUE_PDFORK UNIMPL pdfork +519 AUE_PDKILL UNIMPL pdkill +520 AUE_PDGETPID UNIMPL pdgetpid +521 AUE_PDWAIT UNIMPL pdwait Modified: projects/sbruno_firewire/sys/dev/acpica/acpi_acad.c ============================================================================== --- projects/sbruno_firewire/sys/dev/acpica/acpi_acad.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/acpica/acpi_acad.c Thu Oct 1 16:25:35 2009 (r197678) @@ -109,13 +109,14 @@ acpi_acad_get_status(void *context) ACPI_SERIAL_BEGIN(acad); if (newstatus != -1 && sc->status != newstatus) { sc->status = newstatus; + ACPI_SERIAL_END(acad); power_profile_set_state(newstatus ? POWER_PROFILE_PERFORMANCE : POWER_PROFILE_ECONOMY); ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), "%s Line\n", newstatus ? "On" : "Off"); acpi_UserNotify("ACAD", h, newstatus); - } - ACPI_SERIAL_END(acad); + } else + ACPI_SERIAL_END(acad); } static void Modified: projects/sbruno_firewire/sys/dev/acpica/acpi_video.c ============================================================================== --- projects/sbruno_firewire/sys/dev/acpica/acpi_video.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/acpica/acpi_video.c Thu Oct 1 16:25:35 2009 (r197678) @@ -170,7 +170,13 @@ static struct sysctl_oid *acpi_video_sys static struct acpi_video_output_queue crt_units, tv_units, ext_units, lcd_units, other_units; +/* + * The 'video' lock protects the hierarchy of video output devices + * (the video "bus"). The 'video_output' lock protects per-output + * data is equivalent to a softc lock for each video output. + */ ACPI_SERIAL_DECL(video, "ACPI video"); +ACPI_SERIAL_DECL(video_output, "ACPI video output"); MALLOC_DEFINE(M_ACPIVIDEO, "acpivideo", "ACPI video extension"); static int @@ -236,12 +242,14 @@ acpi_video_attach(device_t dev) acpi_sc = devclass_get_softc(devclass_find("acpi"), 0); if (acpi_sc == NULL) return (ENXIO); + ACPI_SERIAL_BEGIN(video); if (acpi_video_sysctl_tree == NULL) { acpi_video_sysctl_tree = SYSCTL_ADD_NODE(&acpi_video_sysctl_ctx, SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "video", CTLFLAG_RD, 0, "video extension control"); } + ACPI_SERIAL_END(video); sc->device = dev; sc->handle = acpi_get_handle(dev); @@ -316,6 +324,7 @@ acpi_video_notify_handler(ACPI_HANDLE ha dss_p = 0; lasthand = NULL; ACPI_SERIAL_BEGIN(video); + ACPI_SERIAL_BEGIN(video_output); STAILQ_FOREACH(vo, &sc->vid_outputs, vo_next) { dss = vo_get_graphics_state(vo->handle); dcs = vo_get_device_status(vo->handle); @@ -331,6 +340,7 @@ acpi_video_notify_handler(ACPI_HANDLE ha } if (lasthand != NULL) vo_set_device_state(lasthand, dss_p|DSS_COMMIT); + ACPI_SERIAL_END(video_output); ACPI_SERIAL_END(video); break; case VID_NOTIFY_REPROBE: @@ -367,12 +377,14 @@ acpi_video_power_profile(void *context) return; ACPI_SERIAL_BEGIN(video); + ACPI_SERIAL_BEGIN(video_output); STAILQ_FOREACH(vo, &sc->vid_outputs, vo_next) { if (vo->vo_levels != NULL && vo->vo_brightness == -1) vo_set_brightness(vo->handle, state == POWER_PROFILE_ECONOMY ? vo->vo_economy : vo->vo_fullpower); } + ACPI_SERIAL_END(video_output); ACPI_SERIAL_END(video); } @@ -550,7 +562,7 @@ static void acpi_video_vo_bind(struct acpi_video_output *vo, ACPI_HANDLE handle) { - ACPI_SERIAL_ASSERT(video); + ACPI_SERIAL_BEGIN(video_output); if (vo->vo_levels != NULL) AcpiOsFree(vo->vo_levels); vo->handle = handle; @@ -565,6 +577,7 @@ acpi_video_vo_bind(struct acpi_video_out /* XXX - see above. */ vo->vo_economy = vo->vo_levels[BCL_ECONOMY]; } + ACPI_SERIAL_END(video_output); } static void @@ -605,7 +618,7 @@ acpi_video_vo_check_level(struct acpi_vi { int i; - ACPI_SERIAL_ASSERT(video); + ACPI_SERIAL_ASSERT(video_output); if (vo->vo_levels == NULL) return (ENODEV); for (i = 0; i < vo->vo_numlevels; i++) @@ -624,7 +637,7 @@ acpi_video_vo_active_sysctl(SYSCTL_HANDL vo = (struct acpi_video_output *)arg1; if (vo->handle == NULL) return (ENXIO); - ACPI_SERIAL_BEGIN(video); + ACPI_SERIAL_BEGIN(video_output); state = (vo_get_device_status(vo->handle) & DCS_ACTIVE) ? 1 : 0; err = sysctl_handle_int(oidp, &state, 0, req); if (err != 0 || req->newptr == NULL) @@ -632,7 +645,7 @@ acpi_video_vo_active_sysctl(SYSCTL_HANDL vo_set_device_state(vo->handle, DSS_COMMIT | (state ? DSS_ACTIVE : DSS_INACTIVE)); out: - ACPI_SERIAL_END(video); + ACPI_SERIAL_END(video_output); return (err); } @@ -644,7 +657,7 @@ acpi_video_vo_bright_sysctl(SYSCTL_HANDL int level, preset, err; vo = (struct acpi_video_output *)arg1; - ACPI_SERIAL_BEGIN(video); + ACPI_SERIAL_BEGIN(video_output); if (vo->handle == NULL) { err = ENXIO; goto out; @@ -674,7 +687,7 @@ acpi_video_vo_bright_sysctl(SYSCTL_HANDL vo_set_brightness(vo->handle, (level == -1) ? preset : level); out: - ACPI_SERIAL_END(video); + ACPI_SERIAL_END(video_output); return (err); } @@ -686,7 +699,7 @@ acpi_video_vo_presets_sysctl(SYSCTL_HAND err = 0; vo = (struct acpi_video_output *)arg1; - ACPI_SERIAL_BEGIN(video); + ACPI_SERIAL_BEGIN(video_output); if (vo->handle == NULL) { err = ENXIO; goto out; @@ -717,7 +730,7 @@ acpi_video_vo_presets_sysctl(SYSCTL_HAND *preset = level; out: - ACPI_SERIAL_END(video); + ACPI_SERIAL_END(video_output); return (err); } @@ -729,7 +742,7 @@ acpi_video_vo_levels_sysctl(SYSCTL_HANDL int err; vo = (struct acpi_video_output *)arg1; - ACPI_SERIAL_BEGIN(video); + ACPI_SERIAL_BEGIN(video_output); if (vo->vo_levels == NULL) { err = ENODEV; goto out; @@ -742,7 +755,7 @@ acpi_video_vo_levels_sysctl(SYSCTL_HANDL vo->vo_numlevels * sizeof(*vo->vo_levels), req); out: - ACPI_SERIAL_END(video); + ACPI_SERIAL_END(video_output); return (err); } @@ -892,6 +905,7 @@ vo_set_brightness(ACPI_HANDLE handle, in { ACPI_STATUS status; + ACPI_SERIAL_ASSERT(video_output); status = acpi_SetInteger(handle, "_BCM", level); if (ACPI_FAILURE(status)) printf("can't evaluate %s._BCM - %s\n", @@ -904,6 +918,7 @@ vo_get_device_status(ACPI_HANDLE handle) UINT32 dcs; ACPI_STATUS status; + ACPI_SERIAL_ASSERT(video_output); dcs = 0; status = acpi_GetInteger(handle, "_DCS", &dcs); if (ACPI_FAILURE(status)) @@ -933,6 +948,7 @@ vo_set_device_state(ACPI_HANDLE handle, { ACPI_STATUS status; + ACPI_SERIAL_ASSERT(video_output); status = acpi_SetInteger(handle, "_DSS", state); if (ACPI_FAILURE(status)) printf("can't evaluate %s._DSS - %s\n", Modified: projects/sbruno_firewire/sys/dev/ae/if_ae.c ============================================================================== --- projects/sbruno_firewire/sys/dev/ae/if_ae.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/ae/if_ae.c Thu Oct 1 16:25:35 2009 (r197678) @@ -2077,7 +2077,7 @@ ae_rxfilter(ae_softc_t *sc) TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - crc = ether_crc32_le(LLADDR((struct sockaddr_dl *) + crc = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN); mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f); } Modified: projects/sbruno_firewire/sys/dev/age/if_age.c ============================================================================== --- projects/sbruno_firewire/sys/dev/age/if_age.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/age/if_age.c Thu Oct 1 16:25:35 2009 (r197678) @@ -3135,7 +3135,7 @@ age_rxfilter(struct age_softc *sc) TAILQ_FOREACH(ifma, &sc->age_ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - crc = ether_crc32_le(LLADDR((struct sockaddr_dl *) + crc = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN); mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f); } Modified: projects/sbruno_firewire/sys/dev/alc/if_alc.c ============================================================================== --- projects/sbruno_firewire/sys/dev/alc/if_alc.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/alc/if_alc.c Thu Oct 1 16:25:35 2009 (r197678) @@ -3476,7 +3476,7 @@ alc_rxfilter(struct alc_softc *sc) TAILQ_FOREACH(ifma, &sc->alc_ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - crc = ether_crc32_le(LLADDR((struct sockaddr_dl *) + crc = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN); mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f); } Modified: projects/sbruno_firewire/sys/dev/ale/if_ale.c ============================================================================== --- projects/sbruno_firewire/sys/dev/ale/if_ale.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/ale/if_ale.c Thu Oct 1 16:25:35 2009 (r197678) @@ -3060,7 +3060,7 @@ ale_rxfilter(struct ale_softc *sc) TAILQ_FOREACH(ifma, &sc->ale_ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - crc = ether_crc32_le(LLADDR((struct sockaddr_dl *) + crc = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN); mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f); } Modified: projects/sbruno_firewire/sys/dev/if_ndis/if_ndis.c ============================================================================== --- projects/sbruno_firewire/sys/dev/if_ndis/if_ndis.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/if_ndis/if_ndis.c Thu Oct 1 16:25:35 2009 (r197678) @@ -1534,7 +1534,7 @@ ndis_inputtask(dobj, arg) if (m == NULL) break; KeReleaseSpinLock(&sc->ndis_rxlock, irql); - if (sc->ndis_80211) + if ((sc->ndis_80211 != 0) && (vap != NULL)) vap->iv_deliver_data(vap, vap->iv_bss, m); else (*ifp->if_input)(ifp, m); @@ -1746,7 +1746,7 @@ ndis_ticktask(d, xsc) sc->ndis_sts == NDIS_STATUS_MEDIA_CONNECT) { sc->ndis_link = 1; NDIS_UNLOCK(sc); - if (sc->ndis_80211) { + if ((sc->ndis_80211 != 0) && (vap != NULL)) { ndis_getstate_80211(sc); ieee80211_new_state(vap, IEEE80211_S_RUN, -1); } @@ -1758,7 +1758,7 @@ ndis_ticktask(d, xsc) sc->ndis_sts == NDIS_STATUS_MEDIA_DISCONNECT) { sc->ndis_link = 0; NDIS_UNLOCK(sc); - if (sc->ndis_80211) + if ((sc->ndis_80211 != 0) && (vap != NULL)) ieee80211_new_state(vap, IEEE80211_S_SCAN, 0); NDIS_LOCK(sc); if_link_state_change(sc->ifp, LINK_STATE_DOWN); @@ -2047,9 +2047,6 @@ ndis_init(xsc) /* Setup task offload. */ ndis_set_offload(sc); - if (sc->ndis_80211) - ndis_setstate_80211(sc); - NDIS_LOCK(sc); sc->ndis_txidx = 0; @@ -2297,8 +2294,6 @@ ndis_setstate_80211(sc) ifp = sc->ifp; ic = ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); - if (vap == NULL) - return; if (!NDIS_INITIALIZED(sc)) { DPRINTF(("%s: NDIS not initialized\n", __func__)); @@ -2730,8 +2725,6 @@ ndis_getstate_80211(sc) ifp = sc->ifp; ic = ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); - if (vap == NULL) - return; ni = vap->iv_bss; if (!NDIS_INITIALIZED(sc)) Modified: projects/sbruno_firewire/sys/dev/mxge/if_mxge.c ============================================================================== --- projects/sbruno_firewire/sys/dev/mxge/if_mxge.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/mxge/if_mxge.c Thu Oct 1 16:25:35 2009 (r197678) @@ -3701,10 +3701,16 @@ mxge_setup_cfg_space(mxge_softc_t *sc) if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { lnk = pci_read_config(dev, reg + 0x12, 2); sc->link_width = (lnk >> 4) & 0x3f; - - pectl = pci_read_config(dev, reg + 0x8, 2); - pectl = (pectl & ~0x7000) | (5 << 12); - pci_write_config(dev, reg + 0x8, pectl, 2); + + if (sc->pectl == 0) { + pectl = pci_read_config(dev, reg + 0x8, 2); + pectl = (pectl & ~0x7000) | (5 << 12); + pci_write_config(dev, reg + 0x8, pectl, 2); + sc->pectl = pectl; + } else { + /* restore saved pectl after watchdog reset */ + pci_write_config(dev, reg + 0x8, sc->pectl, 2); + } } /* Enable DMA and Memory space access */ @@ -3816,6 +3822,9 @@ mxge_watchdog_reset(mxge_softc_t *sc, in /* release all TX locks */ for (s = 0; s < num_tx_slices; s++) { ss = &sc->ss[s]; +#ifdef IFNET_BUF_RING + mxge_start_locked(ss); +#endif mtx_unlock(&ss->tx.mtx); } } Modified: projects/sbruno_firewire/sys/dev/mxge/if_mxge_var.h ============================================================================== --- projects/sbruno_firewire/sys/dev/mxge/if_mxge_var.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/mxge/if_mxge_var.h Thu Oct 1 16:25:35 2009 (r197678) @@ -274,6 +274,7 @@ struct mxge_softc { struct sysctl_ctx_list slice_sysctl_ctx; char *mac_addr_string; uint8_t mac_addr[6]; /* eeprom mac address */ + uint16_t pectl; /* save PCIe CTL state */ char product_code_string[64]; char serial_number_string[64]; char cmd_mtx_name[16]; Modified: projects/sbruno_firewire/sys/dev/sound/pci/hda/hdac.c ============================================================================== --- projects/sbruno_firewire/sys/dev/sound/pci/hda/hdac.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/dev/sound/pci/hda/hdac.c Thu Oct 1 16:25:35 2009 (r197678) @@ -622,6 +622,7 @@ static const struct { #define HDA_CODEC_ALC882 HDA_CODEC_CONSTRUCT(REALTEK, 0x0882) #define HDA_CODEC_ALC883 HDA_CODEC_CONSTRUCT(REALTEK, 0x0883) #define HDA_CODEC_ALC885 HDA_CODEC_CONSTRUCT(REALTEK, 0x0885) +#define HDA_CODEC_ALC887 HDA_CODEC_CONSTRUCT(REALTEK, 0x0887) #define HDA_CODEC_ALC888 HDA_CODEC_CONSTRUCT(REALTEK, 0x0888) #define HDA_CODEC_ALC889 HDA_CODEC_CONSTRUCT(REALTEK, 0x0889) #define HDA_CODEC_ALCXXXX HDA_CODEC_CONSTRUCT(REALTEK, 0xffff) @@ -807,6 +808,7 @@ static const struct { { HDA_CODEC_ALC882, "Realtek ALC882" }, { HDA_CODEC_ALC883, "Realtek ALC883" }, { HDA_CODEC_ALC885, "Realtek ALC885" }, + { HDA_CODEC_ALC887, "Realtek ALC887" }, { HDA_CODEC_ALC888, "Realtek ALC888" }, { HDA_CODEC_ALC889, "Realtek ALC889" }, { HDA_CODEC_AD1882, "Analog Devices AD1882" }, @@ -6568,7 +6570,7 @@ hdac_create_pcms(struct hdac_devinfo *de continue; for (j = 0; j < devinfo->function.audio.num_devs; j++) { if (devinfo->function.audio.devs[j].digital != 255 && - (!devinfo->function.audio.devs[j].digital) == + (!devinfo->function.audio.devs[j].digital) != (!as[i].digital)) continue; if (as[i].dir == HDA_CTL_IN) { Modified: projects/sbruno_firewire/sys/fs/nfs/nfs_commonacl.c ============================================================================== --- projects/sbruno_firewire/sys/fs/nfs/nfs_commonacl.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/fs/nfs/nfs_commonacl.c Thu Oct 1 16:25:35 2009 (r197678) @@ -695,7 +695,7 @@ nfsrv_setacl(vnode_t vp, NFSACL_T *aclp, if (nfsrv_useacl == 0 || !NFSHASNFS4ACL(vnode_mount(vp))) return (NFSERR_ATTRNOTSUPP); /* - * With NFS4 ACLs, chmod(2) may need to add additional entries. + * With NFSv4 ACLs, chmod(2) may need to add additional entries. * Make sure it has enough room for that - splitting every entry * into two and appending "canonical six" entries at the end. * Cribbed out of kern/vfs_acl.c - Rick M. Modified: projects/sbruno_firewire/sys/i386/conf/GENERIC ============================================================================== --- projects/sbruno_firewire/sys/i386/conf/GENERIC Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/i386/conf/GENERIC Thu Oct 1 16:25:35 2009 (r197678) @@ -269,7 +269,7 @@ device xe # Xircom pccard Ethernet device wlan # 802.11 support options IEEE80211_DEBUG # enable debug msgs options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's -options IEEE80211_SUPPORT_MESH # enable 802.11s D3.0 support +options IEEE80211_SUPPORT_MESH # enable 802.11s draft support device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support Modified: projects/sbruno_firewire/sys/i386/i386/initcpu.c ============================================================================== --- projects/sbruno_firewire/sys/i386/i386/initcpu.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/i386/i386/initcpu.c Thu Oct 1 16:25:35 2009 (r197678) @@ -717,6 +717,12 @@ initializecpu(void) */ if ((cpu_feature & CPUID_CLFSH) != 0) cpu_clflush_line_size = ((cpu_procinfo >> 8) & 0xff) * 8; + /* + * XXXKIB: (temporary) hack to work around traps generated when + * CLFLUSHing APIC registers window. + */ + if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS)) + cpu_feature &= ~CPUID_CLFSH; #if defined(PC98) && !defined(CPU_UPGRADE_HW_CACHE) /* Modified: projects/sbruno_firewire/sys/i386/include/cpufunc.h ============================================================================== --- projects/sbruno_firewire/sys/i386/include/cpufunc.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/i386/include/cpufunc.h Thu Oct 1 16:25:35 2009 (r197678) @@ -132,14 +132,14 @@ enable_intr(void) #endif } -static inline void +static __inline void cpu_monitor(const void *addr, int extensions, int hints) { __asm __volatile("monitor;" : :"a" (addr), "c" (extensions), "d"(hints)); } -static inline void +static __inline void cpu_mwait(int extensions, int hints) { __asm __volatile("mwait;" : :"a" (hints), "c" (extensions)); Modified: projects/sbruno_firewire/sys/kern/init_main.c ============================================================================== --- projects/sbruno_firewire/sys/kern/init_main.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/kern/init_main.c Thu Oct 1 16:25:35 2009 (r197678) @@ -284,15 +284,28 @@ restart: *************************************************************************** */ static void -print_caddr_t(void *data __unused) +print_caddr_t(void *data) { printf("%s", (char *)data); } + +static void +print_version(void *data __unused) +{ + int len; + + /* Strip a trailing newline from version. */ + len = strlen(version); + while (len > 0 && version[len - 1] == '\n') + len--; + printf("%.*s %s\n", len, version, machine); +} + SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, copyright); SYSINIT(trademark, SI_SUB_COPYRIGHT, SI_ORDER_SECOND, print_caddr_t, trademark); -SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_THIRD, print_caddr_t, version); +SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_THIRD, print_version, NULL); #ifdef WITNESS static char wit_warn[] = Modified: projects/sbruno_firewire/sys/kern/init_sysent.c ============================================================================== --- projects/sbruno_firewire/sys/kern/init_sysent.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/kern/init_sysent.c Thu Oct 1 16:25:35 2009 (r197678) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz + * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson */ #include "opt_compat.h" @@ -548,4 +548,12 @@ struct sysent sysent[] = { { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 511 = msgctl */ { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 512 = shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 514 = cap_new */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = cap_enter */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ }; Modified: projects/sbruno_firewire/sys/kern/kern_rwlock.c ============================================================================== --- projects/sbruno_firewire/sys/kern/kern_rwlock.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/kern/kern_rwlock.c Thu Oct 1 16:25:35 2009 (r197678) @@ -541,7 +541,7 @@ _rw_runlock(struct rwlock *rw, const cha */ x = rw->rw_lock; if (RW_READERS(x) > 1) { - if (atomic_cmpset_ptr(&rw->rw_lock, x, + if (atomic_cmpset_rel_ptr(&rw->rw_lock, x, x - RW_ONE_READER)) { if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR4(KTR_LOCK, @@ -559,7 +559,8 @@ _rw_runlock(struct rwlock *rw, const cha if (!(x & RW_LOCK_WAITERS)) { MPASS((x & ~RW_LOCK_WRITE_SPINNER) == RW_READERS_LOCK(1)); - if (atomic_cmpset_ptr(&rw->rw_lock, x, RW_UNLOCKED)) { + if (atomic_cmpset_rel_ptr(&rw->rw_lock, x, + RW_UNLOCKED)) { if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR2(KTR_LOCK, "%s: %p last succeeded", __func__, rw); @@ -597,7 +598,7 @@ _rw_runlock(struct rwlock *rw, const cha x |= (v & RW_LOCK_READ_WAITERS); } else queue = TS_SHARED_QUEUE; - if (!atomic_cmpset_ptr(&rw->rw_lock, RW_READERS_LOCK(1) | v, + if (!atomic_cmpset_rel_ptr(&rw->rw_lock, RW_READERS_LOCK(1) | v, x)) { turnstile_chain_unlock(&rw->lock_object); continue; Modified: projects/sbruno_firewire/sys/kern/kern_sig.c ============================================================================== --- projects/sbruno_firewire/sys/kern/kern_sig.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/kern/kern_sig.c Thu Oct 1 16:25:35 2009 (r197678) @@ -1892,7 +1892,7 @@ sigtd(struct proc *p, int sig, int prop) /* * Check if current thread can handle the signal without - * switching conetxt to another thread. + * switching context to another thread. */ if (curproc == p && !SIGISMEMBER(curthread->td_sigmask, sig)) return (curthread); Modified: projects/sbruno_firewire/sys/kern/kern_sx.c ============================================================================== --- projects/sbruno_firewire/sys/kern/kern_sx.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/kern/kern_sx.c Thu Oct 1 16:25:35 2009 (r197678) @@ -931,7 +931,7 @@ _sx_sunlock_hard(struct sx *sx, const ch * so, just drop one and return. */ if (SX_SHARERS(x) > 1) { - if (atomic_cmpset_ptr(&sx->sx_lock, x, + if (atomic_cmpset_rel_ptr(&sx->sx_lock, x, x - SX_ONE_SHARER)) { if (LOCK_LOG_TEST(&sx->lock_object, 0)) CTR4(KTR_LOCK, @@ -949,8 +949,8 @@ _sx_sunlock_hard(struct sx *sx, const ch */ if (!(x & SX_LOCK_EXCLUSIVE_WAITERS)) { MPASS(x == SX_SHARERS_LOCK(1)); - if (atomic_cmpset_ptr(&sx->sx_lock, SX_SHARERS_LOCK(1), - SX_LOCK_UNLOCKED)) { + if (atomic_cmpset_rel_ptr(&sx->sx_lock, + SX_SHARERS_LOCK(1), SX_LOCK_UNLOCKED)) { if (LOCK_LOG_TEST(&sx->lock_object, 0)) CTR2(KTR_LOCK, "%s: %p last succeeded", __func__, sx); @@ -973,7 +973,7 @@ _sx_sunlock_hard(struct sx *sx, const ch * Note that the state of the lock could have changed, * so if it fails loop back and retry. */ - if (!atomic_cmpset_ptr(&sx->sx_lock, + if (!atomic_cmpset_rel_ptr(&sx->sx_lock, SX_SHARERS_LOCK(1) | SX_LOCK_EXCLUSIVE_WAITERS, SX_LOCK_UNLOCKED)) { sleepq_release(&sx->lock_object); Modified: projects/sbruno_firewire/sys/kern/syscalls.c ============================================================================== --- projects/sbruno_firewire/sys/kern/syscalls.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/kern/syscalls.c Thu Oct 1 16:25:35 2009 (r197678) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz + * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson */ const char *syscallnames[] = { @@ -521,4 +521,12 @@ const char *syscallnames[] = { "msgctl", /* 511 = msgctl */ "shmctl", /* 512 = shmctl */ "lpathconf", /* 513 = lpathconf */ + "#514", /* 514 = cap_new */ + "#515", /* 515 = cap_getrights */ + "#516", /* 516 = cap_enter */ + "#517", /* 517 = cap_getmode */ + "#518", /* 518 = pdfork */ + "#519", /* 519 = pdkill */ + "#520", /* 520 = pdgetpid */ + "#521", /* 521 = pdwait */ }; Modified: projects/sbruno_firewire/sys/kern/syscalls.master ============================================================================== --- projects/sbruno_firewire/sys/kern/syscalls.master Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/kern/syscalls.master Thu Oct 1 16:25:35 2009 (r197678) @@ -911,5 +911,13 @@ 512 AUE_SHMCTL NOSTD { int shmctl(int shmid, int cmd, \ struct shmid_ds *buf); } 513 AUE_LPATHCONF STD { int lpathconf(char *path, int name); } +514 AUE_CAP_NEW UNIMPL cap_new +515 AUE_CAP_GETRIGHTS UNIMPL cap_getrights +516 AUE_CAP_ENTER UNIMPL cap_enter +517 AUE_CAP_GETMODE UNIMPL cap_getmode +518 AUE_PDFORK UNIMPL pdfork +519 AUE_PDKILL UNIMPL pdkill +520 AUE_PDGETPID UNIMPL pdgetpid +521 AUE_PDWAIT UNIMPL pdwait ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master Modified: projects/sbruno_firewire/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sbruno_firewire/sys/kern/uipc_syscalls.c Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/kern/uipc_syscalls.c Thu Oct 1 16:25:35 2009 (r197678) @@ -2086,9 +2086,11 @@ retry_space: /* * Get the page from backing store. */ - bsize = vp->v_mount->mnt_stat.f_iosize; vfslocked = VFS_LOCK_GIANT(vp->v_mount); - vn_lock(vp, LK_SHARED | LK_RETRY); + error = vn_lock(vp, LK_SHARED); + if (error != 0) + goto after_read; + bsize = vp->v_mount->mnt_stat.f_iosize; /* * XXXMAC: Because we don't have fp->f_cred @@ -2101,6 +2103,7 @@ retry_space: IO_VMIO | ((MAXBSIZE / bsize) << IO_SEQSHIFT), td->td_ucred, NOCRED, &resid, td); VOP_UNLOCK(vp, 0); + after_read: VFS_UNLOCK_GIANT(vfslocked); VM_OBJECT_LOCK(obj); vm_page_io_finish(pg); Modified: projects/sbruno_firewire/sys/pc98/conf/GENERIC ============================================================================== --- projects/sbruno_firewire/sys/pc98/conf/GENERIC Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/pc98/conf/GENERIC Thu Oct 1 16:25:35 2009 (r197678) @@ -223,7 +223,7 @@ device xe # Xircom pccard Ethernet #device wlan # 802.11 support #options IEEE80211_DEBUG # enable debug msgs #options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's -#options IEEE80211_SUPPORT_MESH # enable 802.11s D3.0 support +#options IEEE80211_SUPPORT_MESH # enable 802.11s draft support #device wlan_wep # 802.11 WEP support #device wlan_ccmp # 802.11 CCMP support #device wlan_tkip # 802.11 TKIP support Modified: projects/sbruno_firewire/sys/sys/rwlock.h ============================================================================== --- projects/sbruno_firewire/sys/sys/rwlock.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/sys/rwlock.h Thu Oct 1 16:25:35 2009 (r197678) @@ -55,13 +55,6 @@ * * When the lock is not locked by any thread, it is encoded as a read lock * with zero waiters. - * - * A note about memory barriers. Write locks need to use the same memory - * barriers as mutexes: _acq when acquiring a write lock and _rel when - * releasing a write lock. Read locks also need to use an _acq barrier when - * acquiring a read lock. However, since read locks do not update any - * locked data (modulo bugs of course), no memory barrier is needed when - * releasing a read lock. */ #define RW_LOCK_READ 0x01 Modified: projects/sbruno_firewire/sys/sys/sx.h ============================================================================== --- projects/sbruno_firewire/sys/sys/sx.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/sys/sx.h Thu Oct 1 16:25:35 2009 (r197678) @@ -63,13 +63,6 @@ * * When the lock is not locked by any thread, it is encoded as a * shared lock with zero waiters. - * - * A note about memory barriers. Exclusive locks need to use the same - * memory barriers as mutexes: _acq when acquiring an exclusive lock - * and _rel when releasing an exclusive lock. On the other side, - * shared lock needs to use an _acq barrier when acquiring the lock - * but, since they don't update any locked data, no memory barrier is - * needed when releasing a shared lock. */ #define SX_LOCK_SHARED 0x01 @@ -200,7 +193,7 @@ __sx_sunlock(struct sx *sx, const char * uintptr_t x = sx->sx_lock; if (x == (SX_SHARERS_LOCK(1) | SX_LOCK_EXCLUSIVE_WAITERS) || - !atomic_cmpset_ptr(&sx->sx_lock, x, x - SX_ONE_SHARER)) + !atomic_cmpset_rel_ptr(&sx->sx_lock, x, x - SX_ONE_SHARER)) _sx_sunlock_hard(sx, file, line); } Modified: projects/sbruno_firewire/sys/sys/syscall.h ============================================================================== --- projects/sbruno_firewire/sys/sys/syscall.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/sys/syscall.h Thu Oct 1 16:25:35 2009 (r197678) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz + * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson */ #define SYS_syscall 0 @@ -428,4 +428,4 @@ #define SYS_msgctl 511 #define SYS_shmctl 512 #define SYS_lpathconf 513 -#define SYS_MAXSYSCALL 514 +#define SYS_MAXSYSCALL 522 Modified: projects/sbruno_firewire/sys/sys/syscall.mk ============================================================================== --- projects/sbruno_firewire/sys/sys/syscall.mk Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/sys/syscall.mk Thu Oct 1 16:25:35 2009 (r197678) @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz +# created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson MIASM = \ syscall.o \ exit.o \ Modified: projects/sbruno_firewire/sys/sys/sysproto.h ============================================================================== --- projects/sbruno_firewire/sys/sys/sysproto.h Thu Oct 1 16:17:44 2009 (r197677) +++ projects/sbruno_firewire/sys/sys/sysproto.h Thu Oct 1 16:25:35 2009 (r197678) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz + * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson */ #ifndef _SYS_SYSPROTO_H_ @@ -2233,21 +2233,13 @@ int freebsd4_sigreturn(struct thread *, #endif /* COMPAT_FREEBSD4 */ -#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) +#ifdef COMPAT_FREEBSD6 -#endif /* COMPAT_FREEBSD[45] */ +#endif /* COMPAT_FREEBSD6 */ -#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ - defined(COMPAT_FREEBSD6) - - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 20:05:38 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 301261065672; Thu, 1 Oct 2009 20:05:38 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1EBD68FC2D; Thu, 1 Oct 2009 20:05:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91K5abq063333; Thu, 1 Oct 2009 20:05:36 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91K5aVI063329; Thu, 1 Oct 2009 20:05:36 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200910012005.n91K5aVI063329@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Thu, 1 Oct 2009 20:05:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197685 - in projects/mips/sys/mips: include mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 20:05:38 -0000 Author: gonzo Date: Thu Oct 1 20:05:36 2009 New Revision: 197685 URL: http://svn.freebsd.org/changeset/base/197685 Log: - Sync caches properly when dealing with sf_buf Modified: projects/mips/sys/mips/include/pmap.h projects/mips/sys/mips/mips/pmap.c projects/mips/sys/mips/mips/vm_machdep.c Modified: projects/mips/sys/mips/include/pmap.h ============================================================================== --- projects/mips/sys/mips/include/pmap.h Thu Oct 1 19:12:14 2009 (r197684) +++ projects/mips/sys/mips/include/pmap.h Thu Oct 1 20:05:36 2009 (r197685) @@ -172,6 +172,7 @@ void *pmap_kenter_temporary(vm_paddr_t p void pmap_kenter_temporary_free(vm_paddr_t pa); int pmap_compute_pages_to_dump(void); void pmap_update_page(pmap_t pmap, vm_offset_t va, pt_entry_t pte); +void pmap_flush_pvcache(vm_page_t m); /* * floating virtual pages (FPAGES) Modified: projects/mips/sys/mips/mips/pmap.c ============================================================================== --- projects/mips/sys/mips/mips/pmap.c Thu Oct 1 19:12:14 2009 (r197684) +++ projects/mips/sys/mips/mips/pmap.c Thu Oct 1 20:05:36 2009 (r197685) @@ -187,7 +187,6 @@ static int init_pte_prot(vm_offset_t va, static void pmap_TLB_invalidate_kernel(vm_offset_t); static void pmap_TLB_update_kernel(vm_offset_t, pt_entry_t); static void pmap_init_fpage(void); -static void pmap_flush_pvcache(vm_page_t m); #ifdef SMP static void pmap_invalidate_page_action(void *arg); @@ -744,11 +743,12 @@ pmap_qenter(vm_offset_t va, vm_page_t *m vm_offset_t origva = va; for (i = 0; i < count; i++) { + pmap_flush_pvcache(m[i]); pmap_kenter(va, VM_PAGE_TO_PHYS(m[i])); va += PAGE_SIZE; } - mips_dcache_wbinv_range_index(origva, PAGE_SIZE*count); + mips_dcache_inv_range(origva, PAGE_SIZE*count); } /* @@ -3313,7 +3313,7 @@ pmap_kextract(vm_offset_t va) return pa; } -static void +void pmap_flush_pvcache(vm_page_t m) { pv_entry_t pv; Modified: projects/mips/sys/mips/mips/vm_machdep.c ============================================================================== --- projects/mips/sys/mips/mips/vm_machdep.c Thu Oct 1 19:12:14 2009 (r197684) +++ projects/mips/sys/mips/mips/vm_machdep.c Thu Oct 1 20:05:36 2009 (r197685) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -474,6 +475,12 @@ sf_buf_alloc(struct vm_page *m, int flag nsfbufsused++; nsfbufspeak = imax(nsfbufspeak, nsfbufsused); } + /* + * Flush all mappings in order to have up to date + * physycal memory + */ + pmap_flush_pvcache(sf->m); + mips_dcache_inv_range(sf->kva, PAGE_SIZE); goto done; } } @@ -515,6 +522,10 @@ sf_buf_free(struct sf_buf *sf) { mtx_lock(&sf_buf_lock); sf->ref_count--; + /* + * Make sure all changes in KVA end up in physical memory + */ + mips_dcache_wbinv_range(sf->kva, PAGE_SIZE); if (sf->ref_count == 0) { TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry); nsfbufsused--; From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 20:11:43 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C7681065670; Thu, 1 Oct 2009 20:11:43 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA2EF8FC14; Thu, 1 Oct 2009 20:11:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91KBg8K063572; Thu, 1 Oct 2009 20:11:42 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91KBgoD063568; Thu, 1 Oct 2009 20:11:42 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200910012011.n91KBgoD063568@svn.freebsd.org> From: Sean Bruno Date: Thu, 1 Oct 2009 20:11:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197686 - in projects/sbruno_firewire/sys: cam dev/firewire sys X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 20:11:43 -0000 Author: sbruno Date: Thu Oct 1 20:11:42 2009 New Revision: 197686 URL: http://svn.freebsd.org/changeset/base/197686 Log: Capture CAM enhancements from perforce via scottl instrument the callout function to indicate completion Avoid a racy condition in sbp where multiple targets could conflict with each other by giving each target it's own malloc and stop executing secondary targets via the callback handler. Modified: projects/sbruno_firewire/sys/cam/cam_xpt.c projects/sbruno_firewire/sys/dev/firewire/sbp.c projects/sbruno_firewire/sys/sys/kernel.h Modified: projects/sbruno_firewire/sys/cam/cam_xpt.c ============================================================================== --- projects/sbruno_firewire/sys/cam/cam_xpt.c Thu Oct 1 20:05:36 2009 (r197685) +++ projects/sbruno_firewire/sys/cam/cam_xpt.c Thu Oct 1 20:11:42 2009 (r197686) @@ -107,8 +107,6 @@ struct xpt_softc { TAILQ_HEAD(,cam_eb) xpt_busses; u_int bus_generation; - struct intr_config_hook *xpt_config_hook; - struct mtx xpt_topo_lock; struct mtx xpt_lock; }; @@ -910,35 +908,19 @@ xpt_init(void *dummy) xpt_free_path(path); mtx_unlock(&xsoftc.xpt_lock); - /* - * Register a callback for when interrupts are enabled. - */ - xsoftc.xpt_config_hook = - (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook), - M_CAMXPT, M_NOWAIT | M_ZERO); - if (xsoftc.xpt_config_hook == NULL) { - printf("xpt_init: Cannot malloc config hook " - "- failing attach\n"); - return (ENOMEM); - } - - xsoftc.xpt_config_hook->ich_func = xpt_config; - if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) { - free (xsoftc.xpt_config_hook, M_CAMXPT); - printf("xpt_init: config_intrhook_establish failed " - "- failing attach\n"); - } - /* fire up rescan thread */ if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) { printf("xpt_init: failed to create rescan thread\n"); } /* Install our software interrupt handlers */ - swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); + swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, + &cambio_ih); return (0); } +SYSINIT(cam_config, SI_SUB_CONFIG_CAM, SI_ORDER_FIRST, xpt_config, NULL); + static cam_status xptregister(struct cam_periph *periph, void *arg) { @@ -4697,6 +4679,13 @@ xpt_config(void *arg) } xpt_for_all_busses(xptconfigfunc, NULL); } + + mtx_lock(&xsoftc.xpt_lock); + while (msleep(xpt_config, &xsoftc.xpt_lock, PCONFIG, "camhk", + 30 * hz) == EWOULDBLOCK) { + printf("Warning\n"); + } + mtx_unlock(&xsoftc.xpt_lock); } /* @@ -4743,9 +4732,9 @@ xpt_finishconfig_task(void *context, int xpt_for_all_devices(xptpassannouncefunc, NULL); /* Release our hook so that the boot can continue. */ - config_intrhook_disestablish(xsoftc.xpt_config_hook); - free(xsoftc.xpt_config_hook, M_CAMXPT); - xsoftc.xpt_config_hook = NULL; + mtx_lock(&xsoftc.xpt_lock); + wakeup(xpt_config); + mtx_unlock(&xsoftc.xpt_lock); } free(context, M_CAMXPT); Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/sbp.c Thu Oct 1 20:05:36 2009 (r197685) +++ projects/sbruno_firewire/sys/dev/firewire/sbp.c Thu Oct 1 20:11:42 2009 (r197686) @@ -811,7 +811,7 @@ sbp_post_busreset(void *arg) sbp = (struct sbp_softc *)arg; SBP_DEBUG(0) - printf("sbp_post_busreset\n"); + printf("%s\n", __func__); END_DEBUG SBP_LOCK(sbp); if ((sbp->sim->flags & SIMQ_FREEZED) == 0) { @@ -838,6 +838,7 @@ sbp_busreset_timeout(void *arg) xpt_release_simq(sbp->sim, /*run queue*/TRUE); sbp->sim->flags &= ~SIMQ_FREEZED; SBP_UNLOCK(sbp); + printf("%s: Done\n", __func__); } @@ -860,14 +861,6 @@ END_DEBUG if (sbp_cold > 0) sbp_cold --; -#if 0 - /* - * XXX don't let CAM the bus rest. - * CAM tries to do something with freezed (DEV_RETRY) devices. - */ - xpt_async(AC_BUS_RESET, sbp->path, /*arg*/ NULL); -#endif - /* Garbage Collection */ for(i = 0 ; i < SBP_NUM_TARGETS ; i ++){ target = &sbp->targets[i]; @@ -1036,6 +1029,8 @@ END_DEBUG device_printf(sdev->target->sbp->fd.dev, "%s:%s failed\n", __func__, sdev->bustgtlun); } + free(ccb, M_SBP); +#if 0 sdev = sbp_next_dev(target, sdev->lun_id + 1); if (sdev == NULL) { free(ccb, M_SBP); @@ -1047,6 +1042,7 @@ END_DEBUG xpt_action(ccb); xpt_release_devq(sdev->path, sdev->freeze, TRUE); sdev->freeze = 1; +#endif } static void @@ -1055,35 +1051,41 @@ sbp_cam_scan_target(void *arg) struct sbp_target *target = (struct sbp_target *)arg; struct sbp_dev *sdev; union ccb *ccb; + int targ_ctr = 0; + while ((sdev = sbp_next_dev(target, targ_ctr)) != NULL) { +#if 0 sdev = sbp_next_dev(target, 0); if (sdev == NULL) { printf("sbp_cam_scan_target: nothing to do for target%d\n", target->target_id); return; } +#endif SBP_DEBUG(0) - device_printf(sdev->target->sbp->fd.dev, - "%s:%s\n", __func__, sdev->bustgtlun); + device_printf(sdev->target->sbp->fd.dev, + "%s:%s\n", __func__, sdev->bustgtlun); END_DEBUG - ccb = malloc(sizeof(union ccb), M_SBP, M_NOWAIT | M_ZERO); - if (ccb == NULL) { - printf("sbp_cam_scan_target: malloc failed\n"); - return; - } - xpt_setup_ccb(&ccb->ccb_h, sdev->path, SCAN_PRI); - ccb->ccb_h.func_code = XPT_SCAN_LUN; - ccb->ccb_h.cbfcnp = sbp_cam_scan_lun; - ccb->ccb_h.flags |= CAM_DEV_QFREEZE; - ccb->crcn.flags = CAM_FLAG_NONE; - ccb->ccb_h.ccb_sdev_ptr = sdev; + ccb = malloc(sizeof(union ccb), M_SBP, M_NOWAIT | M_ZERO); + if (ccb == NULL) { + printf("sbp_cam_scan_target: malloc failed\n"); + break; + } + xpt_setup_ccb(&ccb->ccb_h, sdev->path, SCAN_PRI); + ccb->ccb_h.func_code = XPT_SCAN_LUN; + ccb->ccb_h.cbfcnp = sbp_cam_scan_lun; + ccb->ccb_h.flags |= CAM_DEV_QFREEZE; + ccb->crcn.flags = CAM_FLAG_NONE; + ccb->ccb_h.ccb_sdev_ptr = sdev; - /* The scan is in progress now. */ - SBP_LOCK(target->sbp); - xpt_action(ccb); - xpt_release_devq(sdev->path, sdev->freeze, TRUE); - sdev->freeze = 1; - SBP_UNLOCK(target->sbp); + /* The scan is in progress now. */ + SBP_LOCK(target->sbp); + xpt_action(ccb); + xpt_release_devq(sdev->path, sdev->freeze, TRUE); + sdev->freeze = 1; + SBP_UNLOCK(target->sbp); + targ_ctr++; + } } static __inline void Modified: projects/sbruno_firewire/sys/sys/kernel.h ============================================================================== --- projects/sbruno_firewire/sys/sys/kernel.h Thu Oct 1 20:05:36 2009 (r197685) +++ projects/sbruno_firewire/sys/sys/kernel.h Thu Oct 1 20:11:42 2009 (r197686) @@ -154,6 +154,7 @@ enum sysinit_sub_id { SI_SUB_KPROF = 0x9000000, /* kernel profiling*/ SI_SUB_KICK_SCHEDULER = 0xa000000, /* start the timeout events*/ SI_SUB_INT_CONFIG_HOOKS = 0xa800000, /* Interrupts enabled config */ + SI_SUB_CONFIG_CAM = 0xa900000, /* Interrupts enabled config */ SI_SUB_ROOT_CONF = 0xb000000, /* Find root devices */ SI_SUB_DUMP_CONF = 0xb200000, /* Find dump devices */ SI_SUB_RAID = 0xb380000, /* Configure GEOM classes */ From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 21:01:11 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D48651065679; Thu, 1 Oct 2009 21:01:11 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C43B28FC20; Thu, 1 Oct 2009 21:01:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91L1BUu065451; Thu, 1 Oct 2009 21:01:11 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91L1B4E065449; Thu, 1 Oct 2009 21:01:11 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200910012101.n91L1B4E065449@svn.freebsd.org> From: Sean Bruno Date: Thu, 1 Oct 2009 21:01:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197689 - projects/sbruno_firewire/sys/dev/firewire X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 21:01:11 -0000 Author: sbruno Date: Thu Oct 1 21:01:11 2009 New Revision: 197689 URL: http://svn.freebsd.org/changeset/base/197689 Log: Assign the SIMQ_FREEZED flag to the sbp_softc->flags field instead of stomping on the cam_sim->flags field. Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/sbp.c Thu Oct 1 20:56:15 2009 (r197688) +++ projects/sbruno_firewire/sys/dev/firewire/sbp.c Thu Oct 1 21:01:11 2009 (r197689) @@ -814,8 +814,8 @@ SBP_DEBUG(0) printf("%s\n", __func__); END_DEBUG SBP_LOCK(sbp); - if ((sbp->sim->flags & SIMQ_FREEZED) == 0) { - sbp->sim->flags |= SIMQ_FREEZED; + if ((sbp->flags & SIMQ_FREEZED) == 0) { + sbp->flags |= SIMQ_FREEZED; xpt_freeze_simq(sbp->sim, /*count*/1); callout_reset(&sbp->busreset_timeout, scan_delay * hz / 1000, @@ -835,8 +835,8 @@ sbp_busreset_timeout(void *arg) callout_stop(&sbp->busreset_timeout); printf("%s: Failed to recieved SID from fwohci\n", __func__); SBP_LOCK(sbp); + sbp->flags &= ~SIMQ_FREEZED; xpt_release_simq(sbp->sim, /*run queue*/TRUE); - sbp->sim->flags &= ~SIMQ_FREEZED; SBP_UNLOCK(sbp); printf("%s: Done\n", __func__); } @@ -904,8 +904,8 @@ END_DEBUG sbp_free_target(target); } SBP_LOCK(sbp); + sbp->flags &= ~SIMQ_FREEZED; xpt_release_simq(sbp->sim, /*run queue*/TRUE); - sbp->sim->flags &= ~SIMQ_FREEZED; SBP_UNLOCK(sbp); } From owner-svn-src-projects@FreeBSD.ORG Thu Oct 1 21:14:41 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B926E10656BF; Thu, 1 Oct 2009 21:14:41 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A4BC18FC20; Thu, 1 Oct 2009 21:14:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91LEf42067170; Thu, 1 Oct 2009 21:14:41 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91LEf79067145; Thu, 1 Oct 2009 21:14:41 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <200910012114.n91LEf79067145@svn.freebsd.org> From: Sean Bruno Date: Thu, 1 Oct 2009 21:14:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197690 - in projects/sbruno_firewire: . crypto/openssh crypto/openssh/openbsd-compat lib/libc/gen secure/libexec/sftp-server secure/libexec/ssh-keysign secure/usr.bin/scp secure/usr.bi... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2009 21:14:41 -0000 Author: sbruno Date: Thu Oct 1 21:14:40 2009 New Revision: 197690 URL: http://svn.freebsd.org/changeset/base/197690 Log: Merge from HEAD one last time today. Added: projects/sbruno_firewire/crypto/openssh/roaming.h - copied unchanged from r197689, head/crypto/openssh/roaming.h projects/sbruno_firewire/crypto/openssh/roaming_common.c - copied unchanged from r197689, head/crypto/openssh/roaming_common.c projects/sbruno_firewire/crypto/openssh/roaming_dummy.c - copied unchanged from r197689, head/crypto/openssh/roaming_dummy.c projects/sbruno_firewire/crypto/openssh/schnorr.h - copied unchanged from r197689, head/crypto/openssh/schnorr.h Modified: projects/sbruno_firewire/ (props changed) projects/sbruno_firewire/crypto/openssh/ (props changed) projects/sbruno_firewire/crypto/openssh/ChangeLog projects/sbruno_firewire/crypto/openssh/README projects/sbruno_firewire/crypto/openssh/README.platform projects/sbruno_firewire/crypto/openssh/auth-pam.c projects/sbruno_firewire/crypto/openssh/auth-passwd.c projects/sbruno_firewire/crypto/openssh/auth-sia.c projects/sbruno_firewire/crypto/openssh/auth1.c projects/sbruno_firewire/crypto/openssh/auth2-jpake.c projects/sbruno_firewire/crypto/openssh/auth2-kbdint.c projects/sbruno_firewire/crypto/openssh/auth2-none.c projects/sbruno_firewire/crypto/openssh/auth2-passwd.c projects/sbruno_firewire/crypto/openssh/auth2-pubkey.c projects/sbruno_firewire/crypto/openssh/auth2.c projects/sbruno_firewire/crypto/openssh/canohost.c projects/sbruno_firewire/crypto/openssh/canohost.h projects/sbruno_firewire/crypto/openssh/channels.c projects/sbruno_firewire/crypto/openssh/clientloop.c projects/sbruno_firewire/crypto/openssh/config.h projects/sbruno_firewire/crypto/openssh/config.h.in projects/sbruno_firewire/crypto/openssh/defines.h projects/sbruno_firewire/crypto/openssh/gss-genr.c projects/sbruno_firewire/crypto/openssh/includes.h projects/sbruno_firewire/crypto/openssh/jpake.c projects/sbruno_firewire/crypto/openssh/jpake.h projects/sbruno_firewire/crypto/openssh/kex.c projects/sbruno_firewire/crypto/openssh/kex.h projects/sbruno_firewire/crypto/openssh/kexdhs.c projects/sbruno_firewire/crypto/openssh/kexgexs.c projects/sbruno_firewire/crypto/openssh/monitor.c projects/sbruno_firewire/crypto/openssh/monitor_mm.c projects/sbruno_firewire/crypto/openssh/monitor_wrap.c projects/sbruno_firewire/crypto/openssh/monitor_wrap.h projects/sbruno_firewire/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/sbruno_firewire/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/sbruno_firewire/crypto/openssh/openbsd-compat/daemon.c projects/sbruno_firewire/crypto/openssh/openbsd-compat/getrrsetbyname.c projects/sbruno_firewire/crypto/openssh/openbsd-compat/openssl-compat.c projects/sbruno_firewire/crypto/openssh/openbsd-compat/openssl-compat.h projects/sbruno_firewire/crypto/openssh/openbsd-compat/port-aix.c projects/sbruno_firewire/crypto/openssh/openbsd-compat/port-aix.h projects/sbruno_firewire/crypto/openssh/packet.c projects/sbruno_firewire/crypto/openssh/packet.h projects/sbruno_firewire/crypto/openssh/readconf.c projects/sbruno_firewire/crypto/openssh/readconf.h projects/sbruno_firewire/crypto/openssh/schnorr.c projects/sbruno_firewire/crypto/openssh/servconf.c projects/sbruno_firewire/crypto/openssh/serverloop.c projects/sbruno_firewire/crypto/openssh/session.c projects/sbruno_firewire/crypto/openssh/sftp-client.c projects/sbruno_firewire/crypto/openssh/sftp-server.8 projects/sbruno_firewire/crypto/openssh/sftp-server.c projects/sbruno_firewire/crypto/openssh/ssh-agent.1 projects/sbruno_firewire/crypto/openssh/ssh-agent.c projects/sbruno_firewire/crypto/openssh/ssh-keygen.c projects/sbruno_firewire/crypto/openssh/ssh.1 projects/sbruno_firewire/crypto/openssh/ssh.c projects/sbruno_firewire/crypto/openssh/ssh_config projects/sbruno_firewire/crypto/openssh/ssh_config.5 projects/sbruno_firewire/crypto/openssh/ssh_namespace.h projects/sbruno_firewire/crypto/openssh/sshconnect.c projects/sbruno_firewire/crypto/openssh/sshconnect.h projects/sbruno_firewire/crypto/openssh/sshconnect2.c projects/sbruno_firewire/crypto/openssh/sshd.8 projects/sbruno_firewire/crypto/openssh/sshd.c projects/sbruno_firewire/crypto/openssh/sshd_config projects/sbruno_firewire/crypto/openssh/sshd_config.5 projects/sbruno_firewire/crypto/openssh/sshlogin.c projects/sbruno_firewire/crypto/openssh/uuencode.c projects/sbruno_firewire/crypto/openssh/version.h projects/sbruno_firewire/lib/libc/gen/_pthread_stubs.c projects/sbruno_firewire/secure/libexec/sftp-server/Makefile projects/sbruno_firewire/secure/libexec/ssh-keysign/Makefile projects/sbruno_firewire/secure/usr.bin/scp/Makefile projects/sbruno_firewire/secure/usr.bin/sftp/Makefile projects/sbruno_firewire/secure/usr.bin/ssh-add/Makefile projects/sbruno_firewire/secure/usr.bin/ssh-agent/Makefile projects/sbruno_firewire/secure/usr.bin/ssh-keygen/Makefile projects/sbruno_firewire/secure/usr.bin/ssh-keyscan/Makefile projects/sbruno_firewire/secure/usr.bin/ssh/Makefile projects/sbruno_firewire/secure/usr.sbin/sshd/Makefile projects/sbruno_firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/sbruno_firewire/sys/ddb/db_ps.c projects/sbruno_firewire/sys/dev/usb/controller/ehci.c projects/sbruno_firewire/sys/fs/fifofs/fifo_vnops.c projects/sbruno_firewire/sys/kern/subr_acl_posix1e.c projects/sbruno_firewire/sys/kern/vfs_default.c projects/sbruno_firewire/sys/kern/vfs_subr.c projects/sbruno_firewire/sys/modules/acpi/acpi/Makefile projects/sbruno_firewire/sys/net/flowtable.c projects/sbruno_firewire/sys/net/flowtable.h projects/sbruno_firewire/sys/net/route.c projects/sbruno_firewire/sys/netipsec/xform_esp.c projects/sbruno_firewire/sys/sys/vnode.h projects/sbruno_firewire/usr.sbin/mfiutil/mfiutil.8 (props changed) Modified: projects/sbruno_firewire/crypto/openssh/ChangeLog ============================================================================== --- projects/sbruno_firewire/crypto/openssh/ChangeLog Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/ChangeLog Thu Oct 1 21:14:40 2009 (r197690) @@ -1,3 +1,282 @@ +20090926 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update for release + - (djm) [README] update relnotes URL + - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere + - (djm) Release 5.3p1 + +20090911 + - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X + 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch + from jbasney at ncsa uiuc edu. + +20090908 + - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port + (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@ + +20090901 + - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for + krb5-config if it's not in the location specified by --with-kerberos5. + Patch from jchadima at redhat. + +20090829 + - (dtucker) [README.platform] Add text about development packages, based on + text from Chris Pepper in bug #1631. + +20090828 + - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently + causes problems in some Tru64 configurations. + - (djm) [sshd_config.5] downgrade mention of login.conf to be an example + and mention PAM as another provider for ChallengeResponseAuthentication; + bz#1408; ok dtucker@ + - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when + attempting atomic rename(); ok dtucker@ + - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables + in argv, so pass them in the environment; ok dtucker@ + - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on + the pty master on Solaris, since it never succeeds and can hang if large + amounts of data is sent to the slave (eg a copy-paste). Based on a patch + originally from Doke Scott, ok djm@ + - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer + size a compile-time option and set it to 64k on Cygwin, since Corinna + reports that it makes a significant difference to performance. ok djm@ + - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry. + +20090820 + - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not + using it since the type conflicts can cause problems on FreeBSD. Patch + from Jonathan Chen. + - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move + the setpcred call on AIX to immediately before the permanently_set_uid(). + Ensures that we still have privileges when we call chroot and + pam_open_sesson. Based on a patch from David Leonard. + +20090817 + - (dtucker) [configure.ac] Check for headers before libraries for openssl an + zlib, which should make the errors slightly more meaningful on platforms + where there's separate "-devel" packages for those. + - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make + PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders. + +20090729 + - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error + function. Patch from Corinna Vinschen. + +20090713 + - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it + fits into 16 bits to work around a bug in glibc's resolver where it masks + off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob. + +20090712 + - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, + prevents configure complaining on older BSDs. + - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch + from Corinna Vinschen. + - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on + logout to after the session close. Patch from Anicka Bernathova, + originally from Andreas Schwab via Novelll ok djm. + +20090707 + - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated + scripts and fix usage of eval. Patch from Corinna Vinschen. + +20090705 + - (dtucker) OpenBSD CVS Sync + - andreas@cvs.openbsd.org 2009/06/27 09:29:06 + [packet.h packet.c] + packet_bacup_state() and packet_restore_state() will be used to + temporarily save the current state ren resuming a suspended connection. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:32:43 + [roaming_common.c roaming.h] + It may be necessary to retransmit some data when resuming, so add it + to a buffer when roaming is enabled. + Most of this code was written by Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:35:06 + [readconf.h readconf.c] + Add client option UseRoaming. It doesn't do anything yet but will + control whether the client tries to use roaming if enabled on the + server. From Martin Forssen. + ok markus@ + - markus@cvs.openbsd.org 2009/06/30 14:54:40 + [version.h] + crank version; ok deraadt + - dtucker@cvs.openbsd.org 2009/07/02 02:11:47 + [ssh.c] + allow for long home dir paths (bz #1615). ok deraadt + (based in part on a patch from jchadima at redhat) + - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 + [clientloop.c] + only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ + ok deraadt@ markus@ + +20090622 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2009/06/22 05:39:28 + [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c] + alphabetize includes; reduces diff vs portable and style(9). + ok stevesk djm + (Id sync only; these were already in order in -portable) + +20090621 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2009/03/17 21:37:00 + [ssh.c] + pass correct argv[0] to openlog(); ok djm@ + - jmc@cvs.openbsd.org 2009/03/19 15:15:09 + [ssh.1] + for "Ciphers", just point the reader to the keyword in ssh_config(5), just + as we do for "MACs": this stops us getting out of sync when the lists + change; + fixes documentation/6102, submitted by Peter J. Philipp + alternative fix proposed by djm + ok markus + - tobias@cvs.openbsd.org 2009/03/23 08:31:19 + [ssh-agent.c] + Fixed a possible out-of-bounds memory access if the environment variable + SHELL is shorter than 3 characters. + with input by and ok dtucker + - tobias@cvs.openbsd.org 2009/03/23 19:38:04 + [ssh-agent.c] + My previous commit didn't fix the problem at all, so stick at my first + version of the fix presented to dtucker. + Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de). + ok dtucker + - sobrado@cvs.openbsd.org 2009/03/26 08:38:39 + [sftp-server.8 sshd.8 ssh-agent.1] + fix a few typographical errors found by spell(1). + ok dtucker@, jmc@ + - stevesk@cvs.openbsd.org 2009/04/13 19:07:44 + [sshd_config.5] + fix possessive; ok djm@ + - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 + [sftp-server.c] + remove unused option character from getopt() optstring; ok markus@ + - jj@cvs.openbsd.org 2009/04/14 21:10:54 + [servconf.c] + Fixed a few the-the misspellings in comments. Skipped a bunch in + binutils,gcc and so on. ok jmc@ + - stevesk@cvs.openbsd.org 2009/04/17 19:23:06 + [session.c] + use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server; + ok djm@ markus@ + - stevesk@cvs.openbsd.org 2009/04/17 19:40:17 + [sshd_config.5] + clarify that even internal-sftp needs /dev/log for logging to work; ok + markus@ + - jmc@cvs.openbsd.org 2009/04/18 18:39:10 + [sshd_config.5] + tweak previous; ok stevesk + - stevesk@cvs.openbsd.org 2009/04/21 15:13:17 + [sshd_config.5] + clarify we cd to user's home after chroot; ok markus@ on + earlier version; tweaks and ok jmc@ + - andreas@cvs.openbsd.org 2009/05/25 06:48:01 + [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c + monitor.c] + Put the globals in packet.c into a struct and don't access it directly + from other files. No functional changes. + ok markus@ djm@ + - andreas@cvs.openbsd.org 2009/05/27 06:31:25 + [canohost.h canohost.c] + Add clear_cached_addr(), needed for upcoming changes allowing the peer + address to change. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:33:39 + [clientloop.c] + Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger + change from Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:34:36 + [kex.c kex.h] + Move the KEX_COOKIE_LEN define to kex.h + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:36:07 + [packet.h packet.c] + Add packet_put_int64() and packet_get_int64(), part of a larger change + from Martin Forssen. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:38:16 + [sshconnect.h sshconnect.c] + Un-static ssh_exchange_identification(), part of a larger change from + Martin Forssen and needed for upcoming changes. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/28 16:50:16 + [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c + monitor.c Added roaming.h roaming_common.c roaming_dummy.c] + Keep track of number of bytes read and written. Needed for upcoming + changes. Most code from Martin Forssen, maf at appgate dot com. + ok markus@ + Also, applied appropriate changes to Makefile.in + - andreas@cvs.openbsd.org 2009/06/12 20:43:22 + [monitor.c packet.c] + Fix warnings found by chl@ and djm@ and change roaming_atomicio's + return type to match atomicio's + Diff from djm@, ok markus@ + - andreas@cvs.openbsd.org 2009/06/12 20:58:32 + [packet.c] + Move some more statics into session_state + ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 07:37:15 + [kexdhs.c kexgexs.c] + abort if key_sign fails, preventing possible null deref. Based on report + from Paolo Ganci, ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 09:04:03 + [roaming.h roaming_common.c roaming_dummy.c] + Add tags for the benefit of the sync scripts + Also: pull in the changes for 1.1->1.2 missed in the previous sync. + - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and + header-order changes to reduce diff vs OpenBSD. + - (dtucker) [servconf.c sshd.c] More whitespace sync. + - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include in + ifdef. + +20090616 + - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t + is a struct with a __val member. Fixes build on, eg, Redhat 6.2. + +20090504 + - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include + variable declarations. Should prevent unused warnings anywhere it's set + (only Crays as far as I can tell) and be a no-op everywhere else. + +20090318 + - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem + that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005. + Based on patch from vinschen at redhat com. + +20090308 + - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c + auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h} + openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old + version of Cygwin. Patch from vinschen at redhat com. + +20090307 + - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it + exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS + has a /dev/random). + - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add + EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c + to use them. Allows building with older OpenSSL versions. + - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed. + - (dtucker) [configure.ac] Missing comma in type list. + - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] + EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg + in openssl 0.9.6) so add an explicit test for it. + +20090306 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2009/03/05 07:18:19 + [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c] + [sshconnect2.c] + refactor the (disabled) Schnorr proof code to make it a little more + generally useful + - djm@cvs.openbsd.org 2009/03/05 11:30:50 + [uuencode.c] + document what these functions do so I don't ever have to recuse into + b64_pton/ntop to remember their return values + 20090223 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2009/02/22 23:50:57 Modified: projects/sbruno_firewire/crypto/openssh/README ============================================================================== --- projects/sbruno_firewire/crypto/openssh/README Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/README Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.2 for the release notes. +See http://www.openssh.com/txt/release-5.3 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ References - [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $ +$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $ Modified: projects/sbruno_firewire/crypto/openssh/README.platform ============================================================================== --- projects/sbruno_firewire/crypto/openssh/README.platform Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/README.platform Thu Oct 1 21:14:40 2009 (r197690) @@ -56,6 +56,18 @@ using a third party driver. More informa http://www-user.rhrk.uni-kl.de/~nissler/tuntap/ +Linux +----- + +Some Linux distributions (including Red Hat/Fedora/CentOS) include +headers and library links in the -devel RPMs rather than the main +binary RPMs. If you get an error about headers, or complaining about a +missing prerequisite then you may need to install the equivalent +development packages. On Redhat based distros these may be openssl-devel, +zlib-devel and pam-devel, on Debian based distros these may be +libssl-dev, libz-dev and libpam-dev. + + Solaris ------- If you enable BSM auditing on Solaris, you need to update audit_event(4) @@ -81,4 +93,4 @@ account stacks which will prevent authen return the output from pam_nologin to the client. -$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $ +$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $ Modified: projects/sbruno_firewire/crypto/openssh/auth-pam.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth-pam.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth-pam.c Thu Oct 1 21:14:40 2009 (r197690) @@ -602,16 +602,16 @@ sshpam_cleanup(void) return; debug("PAM: cleanup"); pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); - if (sshpam_cred_established) { - debug("PAM: deleting credentials"); - pam_setcred(sshpam_handle, PAM_DELETE_CRED); - sshpam_cred_established = 0; - } if (sshpam_session_open) { debug("PAM: closing session"); pam_close_session(sshpam_handle, PAM_SILENT); sshpam_session_open = 0; } + if (sshpam_cred_established) { + debug("PAM: deleting credentials"); + pam_setcred(sshpam_handle, PAM_DELETE_CRED); + sshpam_cred_established = 0; + } sshpam_authenticated = 0; pam_end(sshpam_handle, sshpam_err); sshpam_handle = NULL; Modified: projects/sbruno_firewire/crypto/openssh/auth-passwd.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth-passwd.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth-passwd.c Thu Oct 1 21:14:40 2009 (r197690) @@ -102,7 +102,7 @@ auth_password(Authctxt *authctxt, const } #endif #ifdef HAVE_CYGWIN - if (is_winnt) { + { HANDLE hToken = cygwin_logon_user(pw, password); if (hToken == INVALID_HANDLE_VALUE) Modified: projects/sbruno_firewire/crypto/openssh/auth-sia.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth-sia.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth-sia.c Thu Oct 1 21:14:40 2009 (r197690) @@ -34,10 +34,6 @@ #include #include #include -#include -#include -#include -#include #include "ssh.h" #include "key.h" @@ -53,52 +49,6 @@ extern ServerOptions options; extern int saved_argc; extern char **saved_argv; -static int -sia_password_change_required(const char *user) -{ - struct es_passwd *acct; - time_t pw_life; - time_t pw_date; - - set_auth_parameters(saved_argc, saved_argv); - - if ((acct = getespwnam(user)) == NULL) { - error("Couldn't access protected database entry for %s", user); - endprpwent(); - return (0); - } - - /* If forced password change flag is set, honor it */ - if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) { - endprpwent(); - return (1); - } - - /* Obtain password lifetime; if none, it can't have expired */ - if (acct->uflg->fg_expire) - pw_life = acct->ufld->fd_expire; - else if (acct->sflg->fg_expire) - pw_life = acct->sfld->fd_expire; - else { - endprpwent(); - return (0); - } - - /* Offset from last change; if none, it must be expired */ - if (acct->uflg->fg_schange) - pw_date = acct->ufld->fd_schange + pw_life; - else { - endprpwent(); - return (1); - } - - endprpwent(); - - /* If expiration date is prior to now, change password */ - - return (pw_date <= time((time_t *) NULL)); -} - int sys_auth_passwd(Authctxt *authctxt, const char *pass) { @@ -126,9 +76,6 @@ sys_auth_passwd(Authctxt *authctxt, cons sia_ses_release(&ent); - authctxt->force_pwchange = sia_password_change_required( - authctxt->user); - return (1); } Modified: projects/sbruno_firewire/crypto/openssh/auth1.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth1.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth1.c Thu Oct 1 21:14:40 2009 (r197690) @@ -318,15 +318,7 @@ do_authloop(Authctxt *authctxt) } #endif /* _UNICOS */ -#ifdef HAVE_CYGWIN - if (authenticated && - !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, - authctxt->pw)) { - packet_disconnect("Authentication rejected for uid %d.", - authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); - authenticated = 0; - } -#else +#ifndef HAVE_CYGWIN /* Special handling for root */ if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(meth->name)) { Modified: projects/sbruno_firewire/crypto/openssh/auth2-jpake.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth2-jpake.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth2-jpake.c Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ +/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -42,8 +42,8 @@ #include "ssh2.h" #include "key.h" #include "hostfile.h" -#include "buffer.h" #include "auth.h" +#include "buffer.h" #include "packet.h" #include "dispatch.h" #include "log.h" @@ -55,6 +55,7 @@ #endif #include "monitor_wrap.h" +#include "schnorr.h" #include "jpake.h" /* @@ -359,7 +360,7 @@ auth2_jpake_get_pwdata(Authctxt *authctx } /* - * Being authentication attempt. + * Begin authentication attempt. * Note, sets authctxt->postponed while in subprotocol */ static int Modified: projects/sbruno_firewire/crypto/openssh/auth2-kbdint.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth2-kbdint.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth2-kbdint.c Thu Oct 1 21:14:40 2009 (r197690) @@ -58,10 +58,6 @@ userauth_kbdint(Authctxt *authctxt) xfree(devs); xfree(lang); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } Modified: projects/sbruno_firewire/crypto/openssh/auth2-none.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth2-none.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth2-none.c Thu Oct 1 21:14:40 2009 (r197690) @@ -61,10 +61,6 @@ userauth_none(Authctxt *authctxt) { none_enabled = 0; packet_check_eom(); -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - return (0); -#endif if (options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); Modified: projects/sbruno_firewire/crypto/openssh/auth2-passwd.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth2-passwd.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth2-passwd.c Thu Oct 1 21:14:40 2009 (r197690) @@ -68,10 +68,6 @@ userauth_passwd(Authctxt *authctxt) logit("password change not supported"); else if (PRIVSEP(auth_password(authctxt, password)) == 1) authenticated = 1; -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - authenticated = 0; -#endif memset(password, 0, len); xfree(password); return authenticated; Modified: projects/sbruno_firewire/crypto/openssh/auth2-pubkey.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth2-pubkey.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth2-pubkey.c Thu Oct 1 21:14:40 2009 (r197690) @@ -170,10 +170,6 @@ done: key_free(key); xfree(pkalg); xfree(pkblob); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } Modified: projects/sbruno_firewire/crypto/openssh/auth2.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/auth2.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/auth2.c Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -36,8 +36,8 @@ __RCSID("$FreeBSD$"); #include #include -#include "xmalloc.h" #include "atomicio.h" +#include "xmalloc.h" #include "ssh2.h" #include "packet.h" #include "log.h" Modified: projects/sbruno_firewire/crypto/openssh/canohost.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/canohost.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/canohost.c Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,6 +35,8 @@ #include "misc.h" static void check_ip_options(int, char *); +static char *canonical_host_ip = NULL; +static int cached_port = -1; /* * Return the canonical name of the host at the other end of the socket. The @@ -304,6 +306,16 @@ get_local_name(int sock) return get_socket_address(sock, 0, NI_NAMEREQD); } +void +clear_cached_addr(void) +{ + if (canonical_host_ip != NULL) { + xfree(canonical_host_ip); + canonical_host_ip = NULL; + } + cached_port = -1; +} + /* * Returns the IP-address of the remote host as a string. The returned * string must not be freed. @@ -312,8 +324,6 @@ get_local_name(int sock) const char * get_remote_ipaddr(void) { - static char *canonical_host_ip = NULL; - /* Check whether we have cached the ipaddr. */ if (canonical_host_ip == NULL) { if (packet_connection_is_on_socket()) { @@ -402,13 +412,11 @@ get_peer_port(int sock) int get_remote_port(void) { - static int port = -1; - /* Cache to avoid getpeername() on a dead connection */ - if (port == -1) - port = get_port(0); + if (cached_port == -1) + cached_port = get_port(0); - return port; + return cached_port; } int Modified: projects/sbruno_firewire/crypto/openssh/canohost.h ============================================================================== --- projects/sbruno_firewire/crypto/openssh/canohost.h Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/canohost.h Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.h,v 1.10 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: canohost.h,v 1.11 2009/05/27 06:31:25 andreas Exp $ */ /* * Author: Tatu Ylonen @@ -24,6 +24,6 @@ char *get_local_name(int); int get_remote_port(void); int get_local_port(void); int get_sock_port(int, int); - +void clear_cached_addr(void); void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); Modified: projects/sbruno_firewire/crypto/openssh/channels.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/channels.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/channels.c Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.295 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.296 2009/05/25 06:48:00 andreas Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1653,6 +1653,7 @@ channel_handle_wfd(Channel *c, fd_set *r } return -1; } +#ifndef BROKEN_TCGETATTR_ICANON if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') { if (tcgetattr(c->wfd, &tio) == 0 && !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) { @@ -1666,6 +1667,7 @@ channel_handle_wfd(Channel *c, fd_set *r packet_send(); } } +#endif buffer_consume(&c->output, len); if (compat20 && len > 0) { c->local_consumed += len; @@ -2431,7 +2433,7 @@ channel_input_status_confirm(int type, u int id; /* Reset keepalive timeout */ - keep_alive_timeouts = 0; + packet_set_alive_timeouts(0); id = packet_get_int(); packet_check_eom(); Modified: projects/sbruno_firewire/crypto/openssh/clientloop.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/clientloop.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/clientloop.c Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.209 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -109,6 +109,7 @@ #include "misc.h" #include "match.h" #include "msg.h" +#include "roaming.h" /* import options */ extern Options options; @@ -491,13 +492,13 @@ client_global_request_reply(int type, u_ xfree(gc); } - keep_alive_timeouts = 0; + packet_set_alive_timeouts(0); } static void server_alive_check(void) { - if (++keep_alive_timeouts > options.server_alive_count_max) { + if (packet_inc_alive_timeouts() > options.server_alive_count_max) { logit("Timeout, server not responding."); cleanup_exit(255); } @@ -634,8 +635,8 @@ client_suspend_self(Buffer *bin, Buffer static void client_process_net_input(fd_set *readset) { - int len; - char buf[8192]; + int len, cont = 0; + char buf[SSH_IOBUFSZ]; /* * Read input from the server, and add any such data to the buffer of @@ -643,8 +644,8 @@ client_process_net_input(fd_set *readset */ if (FD_ISSET(connection_in, readset)) { /* Read as much as possible. */ - len = read(connection_in, buf, sizeof(buf)); - if (len == 0) { + len = roaming_read(connection_in, buf, sizeof(buf), &cont); + if (len == 0 && cont == 0) { /* * Received EOF. The remote host has closed the * connection. @@ -1128,7 +1129,7 @@ static void client_process_input(fd_set *readset) { int len; - char buf[8192]; + char buf[SSH_IOBUFSZ]; /* Read input from stdin. */ if (FD_ISSET(fileno(stdin), readset)) { @@ -1476,6 +1477,14 @@ client_loop(int have_pty, int escape_cha /* Stop watching for window change. */ signal(SIGWINCH, SIG_DFL); + if (compat20) { + packet_start(SSH2_MSG_DISCONNECT); + packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); + packet_put_cstring("disconnected by user"); + packet_send(); + packet_write_wait(); + } + channel_free_all(); if (have_pty) Modified: projects/sbruno_firewire/crypto/openssh/config.h ============================================================================== --- projects/sbruno_firewire/crypto/openssh/config.h Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/config.h Thu Oct 1 21:14:40 2009 (r197690) @@ -69,6 +69,9 @@ /* Define if your snprintf is busted */ /* #undef BROKEN_SNPRINTF */ +/* tcgetattr with ICANON may hang */ +/* #undef BROKEN_TCGETATTR_ICANON */ + /* updwtmpx is broken (if present) */ /* #undef BROKEN_UPDWTMPX */ @@ -123,9 +126,12 @@ /* Builtin PRNG command timeout */ #define ENTROPY_TIMEOUT_MSEC 200 -/* f_fsid has members */ +/* fsid_t has member val */ /* #undef FSID_HAS_VAL */ +/* fsid_t has member __val */ +/* #undef FSID_HAS___VAL */ + /* Define to 1 if the `getpgrp' function requires zero arguments. */ #define GETPGRP_VOID 1 @@ -519,6 +525,9 @@ /* Define to 1 if the system has the type `in_addr_t'. */ #define HAVE_IN_ADDR_T 1 +/* Define to 1 if the system has the type `in_port_t'. */ +#define HAVE_IN_PORT_T 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_LASTLOG_H */ @@ -1227,6 +1236,9 @@ /* Define if X11 doesn't support AF_UNIX sockets on that system */ /* #undef NO_X11_UNIX_SOCKETS */ +/* Define if EVP_DigestUpdate returns void */ +/* #undef OPENSSL_EVP_DIGESTUPDATE_VOID */ + /* libcrypto is missing AES 192 and 256 bit functions */ /* #undef OPENSSL_LOBOTOMISED_AES */ @@ -1310,6 +1322,9 @@ /* Use audit debugging module */ /* #undef SSH_AUDIT_EVENTS */ +/* Windows is sensitive to read buffer size */ +/* #undef SSH_IOBUFSZ */ + /* non-privileged user for privilege separation */ #define SSH_PRIVSEP_USER "sshd" @@ -1398,9 +1413,13 @@ /* Define if you want SELinux support. */ /* #undef WITH_SELINUX */ -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ +#if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +#elif ! defined __LITTLE_ENDIAN__ +/* # undef WORDS_BIGENDIAN */ +#endif /* Define if xauth is found in your path */ /* #undef XAUTH_PATH */ Modified: projects/sbruno_firewire/crypto/openssh/config.h.in ============================================================================== --- projects/sbruno_firewire/crypto/openssh/config.h.in Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/config.h.in Thu Oct 1 21:14:40 2009 (r197690) @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + /* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address */ #undef AIX_GETNAMEINFO_HACK @@ -68,6 +71,9 @@ /* Define if your snprintf is busted */ #undef BROKEN_SNPRINTF +/* tcgetattr with ICANON may hang */ +#undef BROKEN_TCGETATTR_ICANON + /* updwtmpx is broken (if present) */ #undef BROKEN_UPDWTMPX @@ -122,9 +128,12 @@ /* Builtin PRNG command timeout */ #undef ENTROPY_TIMEOUT_MSEC -/* f_fsid has members */ +/* fsid_t has member val */ #undef FSID_HAS_VAL +/* fsid_t has member __val */ +#undef FSID_HAS___VAL + /* Define to 1 if the `getpgrp' function requires zero arguments. */ #undef GETPGRP_VOID @@ -518,6 +527,9 @@ /* Define to 1 if the system has the type `in_addr_t'. */ #undef HAVE_IN_ADDR_T +/* Define to 1 if the system has the type `in_port_t'. */ +#undef HAVE_IN_PORT_T + /* Define to 1 if you have the header file. */ #undef HAVE_LASTLOG_H @@ -1226,6 +1238,9 @@ /* Define if X11 doesn't support AF_UNIX sockets on that system */ #undef NO_X11_UNIX_SOCKETS +/* Define if EVP_DigestUpdate returns void */ +#undef OPENSSL_EVP_DIGESTUPDATE_VOID + /* libcrypto is missing AES 192 and 256 bit functions */ #undef OPENSSL_LOBOTOMISED_AES @@ -1309,6 +1324,9 @@ /* Use audit debugging module */ #undef SSH_AUDIT_EVENTS +/* Windows is sensitive to read buffer size */ +#undef SSH_IOBUFSZ + /* non-privileged user for privilege separation */ #undef SSH_PRIVSEP_USER @@ -1397,9 +1415,17 @@ /* Define if you want SELinux support. */ #undef WITH_SELINUX -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif /* Define if xauth is found in your path */ #undef XAUTH_PATH Modified: projects/sbruno_firewire/crypto/openssh/defines.h ============================================================================== --- projects/sbruno_firewire/crypto/openssh/defines.h Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/defines.h Thu Oct 1 21:14:40 2009 (r197690) @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.153 2009/02/01 11:19:54 dtucker Exp $ */ +/* $Id: defines.h,v 1.156 2009/08/28 01:21:07 dtucker Exp $ */ /* Constants */ @@ -300,6 +300,9 @@ struct sockaddr_un { #ifndef HAVE_IN_ADDR_T typedef u_int32_t in_addr_t; #endif +#ifndef HAVE_IN_PORT_T +typedef u_int16_t in_port_t; +#endif #if defined(BROKEN_SYS_TERMIO_H) && !defined(_STRUCT_WINSIZE) #define _STRUCT_WINSIZE @@ -591,6 +594,10 @@ struct winsize { #define FSID_TO_ULONG(f) \ ((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \ ((f).val[1] & 0xffffffffUL)) +#elif defined(FSID_HAS___VAL) +#define FSID_TO_ULONG(f) \ + ((((u_int64_t)(f).__val[0] & 0xffffffffUL) << 32) | \ + ((f).__val[1] & 0xffffffffUL)) #else # define FSID_TO_ULONG(f) ((f)) #endif @@ -742,4 +749,8 @@ struct winsize { #define INET6_ADDRSTRLEN 46 #endif +#ifndef SSH_IOBUFSZ +# define SSH_IOBUFSZ 8192 +#endif + #endif /* _DEFINES_H */ Modified: projects/sbruno_firewire/crypto/openssh/gss-genr.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/gss-genr.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/gss-genr.c Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -/* $OpenBSD: gss-genr.c,v 1.19 2007/06/12 11:56:15 dtucker Exp $ */ +/* $OpenBSD: gss-genr.c,v 1.20 2009/06/22 05:39:28 dtucker Exp $ */ /* * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. Modified: projects/sbruno_firewire/crypto/openssh/includes.h ============================================================================== --- projects/sbruno_firewire/crypto/openssh/includes.h Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/includes.h Thu Oct 1 21:14:40 2009 (r197690) @@ -31,7 +31,8 @@ #endif #if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ defined(GLOB_HAS_GL_MATCHC) && \ - defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0 + defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0 && \ + !defined(BROKEN_GLOB) # include #endif #ifdef HAVE_ENDIAN_H Modified: projects/sbruno_firewire/crypto/openssh/jpake.c ============================================================================== --- projects/sbruno_firewire/crypto/openssh/jpake.c Thu Oct 1 21:01:11 2009 (r197689) +++ projects/sbruno_firewire/crypto/openssh/jpake.c Thu Oct 1 21:14:40 2009 (r197690) @@ -1,4 +1,4 @@ -/* $OpenBSD: jpake.c,v 1.1 2008/11/04 08:22:12 djm Exp $ */ +/* $OpenBSD: jpake.c,v 1.2 2009/03/05 07:18:19 djm Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -47,6 +47,7 @@ #include "log.h" #include "jpake.h" +#include "schnorr.h" #ifdef JPAKE @@ -60,165 +61,10 @@ "98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB" \ "9ED529077096966D670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF" -struct jpake_group * +struct modp_group * jpake_default_group(void) { - struct jpake_group *ret; - - ret = xmalloc(sizeof(*ret)); - ret->p = ret->q = ret->g = NULL; - if (BN_hex2bn(&ret->p, JPAKE_GROUP_P) == 0 || - BN_hex2bn(&ret->g, JPAKE_GROUP_G) == 0) - fatal("%s: BN_hex2bn", __func__); - /* Subgroup order is p/2 (p is a safe prime) */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Oct 2 01:07:29 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 092DB1065679; Fri, 2 Oct 2009 01:07:29 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC5C78FC18; Fri, 2 Oct 2009 01:07:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9217S12084366; Fri, 2 Oct 2009 01:07:28 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9217SlH084363; Fri, 2 Oct 2009 01:07:28 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200910020107.n9217SlH084363@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 2 Oct 2009 01:07:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197694 - in projects/tcp_ffcaia2008_8.x/sys: kern sys X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2009 01:07:29 -0000 Author: lstewart Date: Fri Oct 2 01:07:28 2009 New Revision: 197694 URL: http://svn.freebsd.org/changeset/base/197694 Log: Style tweaks. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c projects/tcp_ffcaia2008_8.x/sys/sys/alq.h Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Thu Oct 1 22:05:38 2009 (r197693) +++ projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Fri Oct 2 01:07:28 2009 (r197694) @@ -64,16 +64,16 @@ struct alq { int aq_wrapearly; /* # bytes left blank at end of buf */ int aq_flags; /* Queue flags */ struct ale aq_getpost; /* ALE for use by get/post */ - struct mtx aq_mtx; /* Queue lock */ - struct vnode *aq_vp; /* Open vnode handle */ - struct ucred *aq_cred; /* Credentials of the opening thread */ + struct mtx aq_mtx; /* Queue lock */ + struct vnode *aq_vp; /* Open vnode handle */ + struct ucred *aq_cred; /* Credentials of the opening thread */ LIST_ENTRY(alq) aq_act; /* List of active queues */ LIST_ENTRY(alq) aq_link; /* List of all queues */ }; #define AQ_WANTED 0x0001 /* Wakeup sleeper when io is done */ -#define AQ_ACTIVE 0x0002 /* on the active list */ -#define AQ_FLUSHING 0x0004 /* doing IO */ +#define AQ_ACTIVE 0x0002 /* On the active list */ +#define AQ_FLUSHING 0x0004 /* Doing IO */ #define AQ_SHUTDOWN 0x0008 /* Queue no longer valid */ #define ALQ_LOCK(alq) mtx_lock_spin(&(alq)->aq_mtx) @@ -95,7 +95,7 @@ static struct proc *ald_proc; #define ALD_LOCK() mtx_lock(&ald_mtx) #define ALD_UNLOCK() mtx_unlock(&ald_mtx) -/* Daemon functions */ +/* Daemon functions. */ static int ald_add(struct alq *); static int ald_rem(struct alq *); static void ald_startup(void *); @@ -104,7 +104,7 @@ static void ald_shutdown(void *, int); static void ald_activate(struct alq *); static void ald_deactivate(struct alq *); -/* Internal queue functions */ +/* Internal queue functions. */ static void alq_shutdown(struct alq *); static int alq_doio(struct alq *); @@ -132,7 +132,7 @@ done: /* * Remove a queue from the global list unless we're shutting down. If so, - * the ald will take care of cleaning up it's resources. + * the ALD will take care of cleaning up it's resources. */ static int ald_rem(struct alq *alq) @@ -193,7 +193,7 @@ ald_daemon(void) && !ald_shutingdown) mtx_sleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0); - /* Don't shutdown until all active alq's are flushed */ + /* Don't shutdown until all active ALQs are flushed. */ if (ald_shutingdown && alq == NULL) { ALD_UNLOCK(); break; @@ -219,10 +219,10 @@ ald_shutdown(void *arg, int howto) ALD_LOCK(); - /* Ensure no new queues can be created */ + /* Ensure no new queues can be created. */ ald_shutingdown = 1; - /* Shutdown all alqs prior to terminating the ald_daemon */ + /* Shutdown all ALQs prior to terminating the ald_daemon. */ while ((alq = LIST_FIRST(&ald_queues)) != NULL) { LIST_REMOVE(alq, aq_link); ALD_UNLOCK(); @@ -230,15 +230,15 @@ ald_shutdown(void *arg, int howto) ALD_LOCK(); } - /* At this point, all alqs are flushed and shutdown */ + /* At this point, all ALQs are flushed and shutdown. */ /* * Wake ald_daemon so that it exits. It won't be able to do - * anything until we mtx_sleep because we hold the ald_mtx + * anything until we mtx_sleep because we hold the ald_mtx. */ wakeup(&ald_active); - /* Wait for ald_daemon to exit */ + /* Wait for ald_daemon to exit. */ mtx_sleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0); ALD_UNLOCK(); @@ -253,9 +253,9 @@ alq_shutdown(struct alq *alq) alq->aq_flags |= AQ_SHUTDOWN; /* - * If the alq isn't active but has unwritten data (possible if + * If the ALQ isn't active but has unwritten data (possible if * the ALQ_NOACTIVATE flag has been used), explicitly activate the - * alq here so that the pending data gets flushed by the ald_daemon. + * ALQ here so that the pending data gets flushed by the ald_daemon. */ if (!(alq->aq_flags & AQ_ACTIVE) && ALQ_HAS_PENDING_DATA(alq)) { @@ -267,7 +267,7 @@ alq_shutdown(struct alq *alq) ALQ_LOCK(alq); } - /* Drain IO */ + /* Drain IO. */ while (alq->aq_flags & AQ_ACTIVE) { alq->aq_flags |= AQ_WANTED; msleep_spin(alq, &alq->aq_mtx, "aldclose", 0); @@ -309,10 +309,10 @@ alq_doio(struct alq *alq) aiov[0].iov_base = alq->aq_entbuf + alq->aq_writetail; if (alq->aq_writetail < alq->aq_writehead) { - /* Buffer not wrapped */ + /* Buffer not wrapped. */ totlen = aiov[0].iov_len = alq->aq_writehead - alq->aq_writetail; } else if (alq->aq_writehead == 0) { - /* Buffer not wrapped (special case to avoid an empty iov) */ + /* Buffer not wrapped (special case to avoid an empty iov). */ totlen = aiov[0].iov_len = alq->aq_buflen - alq->aq_writetail;; } else { /* @@ -340,16 +340,12 @@ alq_doio(struct alq *alq) auio.uio_resid = totlen; auio.uio_td = td; - /* - * Do all of the junk required to write now. - */ + /* Do all of the junk required to write now. */ vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - /* - * XXX: VOP_WRITE error checks are ignored. - */ + /* XXX: VOP_WRITE error checks are ignored. */ #ifdef MAC if (mac_vnode_check_write(alq->aq_cred, NOCRED, vp) == 0) #endif @@ -402,7 +398,7 @@ SYSINIT(aldthread, SI_SUB_KTHREAD_IDLE, SYSINIT(ald, SI_SUB_LOCK, SI_ORDER_ANY, ald_startup, NULL); -/* User visible queue functions */ +/* User visible queue functions. */ /* * Create the queue data structure, allocate the buffer, and open the file. @@ -514,9 +510,9 @@ alq_writen(struct alq *alq, void *data, /* * We need to serialise wakups to ensure records remain in order... * Therefore, wakeup the next thread in the queue waiting for - * alq resources to be available. - * (technically this is only required if we actually entered the above - * while loop) + * ALQ resources to be available. + * (Technically this is only required if we actually entered the above + * while loop.) */ wakeup_one(alq); @@ -655,9 +651,9 @@ alq_getn(struct alq *alq, int len, int f /* * We need to serialise wakups to ensure records remain in order. * Therefore, wakeup the next thread in the queue waiting for - * alq resources to be available. - * (technically this is only required if we actually entered the above - * while loop) + * ALQ resources to be available. + * (Technically this is only required if we actually entered the above + * while loop.) */ wakeup_one(alq); @@ -767,7 +763,7 @@ static int alq_load_handler(module_t mod case MOD_QUIESCE: ALD_LOCK(); - /* only allow unload if there are no open queues */ + /* Only allow unload if there are no open queues. */ if (LIST_FIRST(&ald_queues) == NULL) { ald_shutingdown = 1; ALD_UNLOCK(); @@ -787,11 +783,10 @@ static int alq_load_handler(module_t mod return (ret); } -/* basic module data */ static moduledata_t alq_mod = { "alq", - alq_load_handler, /* execution entry point for the module */ + alq_load_handler, NULL }; Modified: projects/tcp_ffcaia2008_8.x/sys/sys/alq.h ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/sys/alq.h Thu Oct 1 22:05:38 2009 (r197693) +++ projects/tcp_ffcaia2008_8.x/sys/sys/alq.h Fri Oct 2 01:07:28 2009 (r197694) @@ -47,7 +47,7 @@ struct ale { int ae_flags; /* Unused, compat. */ }; -/* flags options */ +/* Flag options. */ #define ALQ_NOWAIT 0x0001 #define ALQ_WAITOK 0x0002 #define ALQ_NOACTIVATE 0x0004 From owner-svn-src-projects@FreeBSD.ORG Fri Oct 2 11:10:52 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A0201065695; Fri, 2 Oct 2009 11:10:52 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D542D8FC17; Fri, 2 Oct 2009 11:10:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n92BAp3s099231; Fri, 2 Oct 2009 11:10:51 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n92BApLC099230; Fri, 2 Oct 2009 11:10:51 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200910021110.n92BApLC099230@svn.freebsd.org> From: Robert Watson Date: Fri, 2 Oct 2009 11:10:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197705 - projects/capabilities8 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2009 11:10:52 -0000 Author: rwatson Date: Fri Oct 2 11:10:51 2009 New Revision: 197705 URL: http://svn.freebsd.org/changeset/base/197705 Log: Migrate a portion of TrustedBSD Capabilities development from Perforce to Subversion -- specifically, we will be maintaining a backport of the work to stable/8 in Subversion. This is the initial branch integration from stable/8 to the capabilities8 tree. Obtained from: TrustedBSD Project Sponsored by: Google Added: projects/capabilities8/ (props changed) - copied from r197703, stable/8/ From owner-svn-src-projects@FreeBSD.ORG Fri Oct 2 19:51:05 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BEB01065676; Fri, 2 Oct 2009 19:51:05 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 157688FC0A; Fri, 2 Oct 2009 19:51:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n92Jp5fG011484; Fri, 2 Oct 2009 19:51:05 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n92Jp4fC011457; Fri, 2 Oct 2009 19:51:04 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200910021951.n92Jp4fC011457@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Fri, 2 Oct 2009 19:51:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197717 - in projects/mips: . bin/sh cddl/compat/opensolaris/include cddl/contrib/opensolaris cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/head contrib/bind9 contrib/cpio c... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2009 19:51:05 -0000 Author: gonzo Date: Fri Oct 2 19:51:03 2009 New Revision: 197717 URL: http://svn.freebsd.org/changeset/base/197717 Log: - MFC Added: projects/mips/cddl/compat/opensolaris/include/assert.h - copied unchanged from r197687, head/cddl/compat/opensolaris/include/assert.h projects/mips/crypto/openssh/roaming.h - copied unchanged from r197687, head/crypto/openssh/roaming.h projects/mips/crypto/openssh/roaming_common.c - copied unchanged from r197687, head/crypto/openssh/roaming_common.c projects/mips/crypto/openssh/roaming_dummy.c - copied unchanged from r197687, head/crypto/openssh/roaming_dummy.c projects/mips/crypto/openssh/schnorr.h - copied unchanged from r197687, head/crypto/openssh/schnorr.h projects/mips/etc/rc.d/faith - copied unchanged from r197687, head/etc/rc.d/faith projects/mips/etc/rc.d/stf - copied unchanged from r197687, head/etc/rc.d/stf projects/mips/lib/libc/gen/getpagesizes.3 - copied unchanged from r197687, head/lib/libc/gen/getpagesizes.3 projects/mips/lib/libc/gen/getpagesizes.c - copied unchanged from r197687, head/lib/libc/gen/getpagesizes.c projects/mips/lib/libc/nls/gl_ES.ISO8859-1.msg - copied unchanged from r197687, head/lib/libc/nls/gl_ES.ISO8859-1.msg projects/mips/sbin/ifconfig/af_nd6.c - copied unchanged from r197687, head/sbin/ifconfig/af_nd6.c projects/mips/share/man/man4/dpms.4 - copied unchanged from r197687, head/share/man/man4/dpms.4 projects/mips/share/man/man4/lindev.4 - copied unchanged from r197687, head/share/man/man4/lindev.4 projects/mips/share/man/man9/vaccess_acl_nfs4.9 - copied unchanged from r197687, head/share/man/man9/vaccess_acl_nfs4.9 projects/mips/sys/amd64/include/_align.h - copied unchanged from r197687, head/sys/amd64/include/_align.h projects/mips/sys/amd64/include/apm_bios.h - copied unchanged from r197687, head/sys/amd64/include/apm_bios.h projects/mips/sys/arm/include/_align.h - copied unchanged from r197687, head/sys/arm/include/_align.h projects/mips/sys/compat/x86bios/ - copied from r197687, head/sys/compat/x86bios/ projects/mips/sys/contrib/dev/acpica/include/actbl2.h - copied unchanged from r197687, head/sys/contrib/dev/acpica/include/actbl2.h projects/mips/sys/contrib/dev/acpica/namespace/nsrepair.c - copied unchanged from r197687, head/sys/contrib/dev/acpica/namespace/nsrepair.c projects/mips/sys/contrib/dev/acpica/utilities/utids.c - copied unchanged from r197687, head/sys/contrib/dev/acpica/utilities/utids.c projects/mips/sys/contrib/x86emu/ - copied from r197687, head/sys/contrib/x86emu/ projects/mips/sys/dev/dpms/ - copied from r197687, head/sys/dev/dpms/ projects/mips/sys/dev/fb/vesa.c - copied unchanged from r197687, head/sys/dev/fb/vesa.c projects/mips/sys/dev/fb/vesa.h - copied unchanged from r197687, head/sys/dev/fb/vesa.h projects/mips/sys/dev/lindev/ - copied from r197687, head/sys/dev/lindev/ projects/mips/sys/dev/usb/serial/uch341.c - copied unchanged from r197687, head/sys/dev/usb/serial/uch341.c projects/mips/sys/fs/procfs/procfs_osrel.c - copied unchanged from r197687, head/sys/fs/procfs/procfs_osrel.c projects/mips/sys/i386/include/_align.h - copied unchanged from r197687, head/sys/i386/include/_align.h projects/mips/sys/ia64/include/_align.h - copied unchanged from r197687, head/sys/ia64/include/_align.h projects/mips/sys/mips/include/_align.h - copied unchanged from r197687, head/sys/mips/include/_align.h projects/mips/sys/modules/lindev/ - copied from r197687, head/sys/modules/lindev/ projects/mips/sys/modules/usb/uch341/ - copied from r197687, head/sys/modules/usb/uch341/ projects/mips/sys/modules/x86bios/ - copied from r197687, head/sys/modules/x86bios/ projects/mips/sys/pc98/include/_align.h - copied unchanged from r197687, head/sys/pc98/include/_align.h projects/mips/sys/powerpc/include/_align.h - copied unchanged from r197687, head/sys/powerpc/include/_align.h projects/mips/sys/sparc64/include/_align.h - copied unchanged from r197687, head/sys/sparc64/include/_align.h projects/mips/sys/sun4v/include/_align.h - copied unchanged from r197687, head/sys/sun4v/include/_align.h projects/mips/tools/regression/acltools/03.t - copied unchanged from r197687, head/tools/regression/acltools/03.t projects/mips/tools/regression/acltools/aclfuzzer.sh - copied unchanged from r197687, head/tools/regression/acltools/aclfuzzer.sh projects/mips/tools/regression/acltools/tools-crossfs.test - copied unchanged from r197687, head/tools/regression/acltools/tools-crossfs.test projects/mips/tools/regression/mmap/ - copied from r197687, head/tools/regression/mmap/ projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.10 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.10 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.11 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.11 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.12 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.12 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.13 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.13 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.14 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.14 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.15 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.15 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.16 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.16 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.17 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.17 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.18 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.18 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.5 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.6 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.7 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.8 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1.9 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/1.9 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.10 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.10 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.11 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.11 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.12 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.12 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.13 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.13 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.14 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.14 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.15 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.15 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.16 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.16 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.17 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.17 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.18 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.18 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.19 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.19 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.20 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.20 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.21 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.21 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.22 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.22 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.5 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.6 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.7 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.8 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2.9 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/2.9 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/3.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/3.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/3.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/3.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/3.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/3.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/3.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/3.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/4.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/4.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/4.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/4.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4.5 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/4.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4.6 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/4.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4.7 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/4.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4.8 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/4.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/5.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/5.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/5.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/5.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5.5 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/5.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5.6 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/5.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5.7 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/5.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5.8 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/5.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/6.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/6.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/6.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/6.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/6.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/6.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/6.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/6.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/6.5 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/6.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/6.6 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/6.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/7.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/7.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/7.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/7.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7.5 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/7.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7.6 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/7.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7.7 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/7.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7.8 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/7.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.10 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.10 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.11 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.11 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.12 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.12 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.13 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.13 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.14 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.14 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.15 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.15 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.16 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.16 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.17 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.17 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.18 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.18 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.19 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.19 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.20 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.20 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.21 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.21 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.22 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.22 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.23 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.23 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.5 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.6 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.7 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.8 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8.9 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/8.9 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.1 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.10 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.10 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.11 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.11 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.12 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.12 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.13 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.13 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.14 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.14 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.15 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.15 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.16 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.16 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.17 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.17 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.18 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.18 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.19 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.19 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.2 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.20 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.20 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.21 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.21 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.22 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.22 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.23 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.23 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.24 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.24 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.25 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.25 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.26 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.26 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.27 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.27 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.28 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.28 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.29 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.29 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.3 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.30 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.30 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.31 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.31 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.4 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.5 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.6 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.7 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.8 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9.9 - copied unchanged from r197687, head/tools/regression/usr.bin/sed/regress.multitest.out/9.9 Deleted: projects/mips/cddl/contrib/opensolaris/head/assert.h projects/mips/etc/rc.d/auto_linklocal projects/mips/etc/rc.d/network_ipv6 projects/mips/share/man/man4/man4.i386/dpms.4 projects/mips/sys/dev/isp/isp_tpublic.h projects/mips/sys/i386/include/pc/vesa.h projects/mips/sys/i386/isa/dpms.c projects/mips/sys/i386/isa/vesa.c projects/mips/sys/pc98/include/pc/vesa.h projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9 projects/mips/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8 Modified: projects/mips/ (props changed) projects/mips/Makefile.inc1 projects/mips/ObsoleteFiles.inc projects/mips/UPDATING projects/mips/bin/sh/sh.1 projects/mips/cddl/contrib/opensolaris/ (props changed) projects/mips/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/mips/contrib/bind9/ (props changed) projects/mips/contrib/cpio/ (props changed) projects/mips/contrib/csup/ (props changed) projects/mips/contrib/ee/ (props changed) projects/mips/contrib/file/ (props changed) projects/mips/contrib/gdb/ (props changed) projects/mips/contrib/gdtoa/ (props changed) projects/mips/contrib/less/ (props changed) projects/mips/contrib/libpcap/ (props changed) projects/mips/contrib/ncurses/ (props changed) projects/mips/contrib/netcat/ (props changed) projects/mips/contrib/ntp/ (props changed) projects/mips/contrib/openbsm/ (props changed) projects/mips/contrib/openpam/ (props changed) projects/mips/contrib/pf/ (props changed) projects/mips/contrib/sendmail/ (props changed) projects/mips/contrib/tcpdump/ (props changed) projects/mips/contrib/tcsh/ (props changed) projects/mips/contrib/top/ (props changed) projects/mips/contrib/top/install-sh (props changed) projects/mips/crypto/openssh/ (props changed) projects/mips/crypto/openssh/ChangeLog projects/mips/crypto/openssh/README projects/mips/crypto/openssh/README.platform projects/mips/crypto/openssh/auth-pam.c projects/mips/crypto/openssh/auth-passwd.c projects/mips/crypto/openssh/auth-sia.c projects/mips/crypto/openssh/auth1.c projects/mips/crypto/openssh/auth2-jpake.c projects/mips/crypto/openssh/auth2-kbdint.c projects/mips/crypto/openssh/auth2-none.c projects/mips/crypto/openssh/auth2-passwd.c projects/mips/crypto/openssh/auth2-pubkey.c projects/mips/crypto/openssh/auth2.c projects/mips/crypto/openssh/canohost.c projects/mips/crypto/openssh/canohost.h projects/mips/crypto/openssh/channels.c projects/mips/crypto/openssh/clientloop.c projects/mips/crypto/openssh/config.h projects/mips/crypto/openssh/config.h.in projects/mips/crypto/openssh/defines.h projects/mips/crypto/openssh/gss-genr.c projects/mips/crypto/openssh/includes.h projects/mips/crypto/openssh/jpake.c projects/mips/crypto/openssh/jpake.h projects/mips/crypto/openssh/kex.c projects/mips/crypto/openssh/kex.h projects/mips/crypto/openssh/kexdhs.c projects/mips/crypto/openssh/kexgexs.c projects/mips/crypto/openssh/monitor.c projects/mips/crypto/openssh/monitor_mm.c projects/mips/crypto/openssh/monitor_wrap.c projects/mips/crypto/openssh/monitor_wrap.h projects/mips/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/mips/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/mips/crypto/openssh/openbsd-compat/daemon.c projects/mips/crypto/openssh/openbsd-compat/getrrsetbyname.c projects/mips/crypto/openssh/openbsd-compat/openssl-compat.c projects/mips/crypto/openssh/openbsd-compat/openssl-compat.h projects/mips/crypto/openssh/openbsd-compat/port-aix.c projects/mips/crypto/openssh/openbsd-compat/port-aix.h projects/mips/crypto/openssh/packet.c projects/mips/crypto/openssh/packet.h projects/mips/crypto/openssh/readconf.c projects/mips/crypto/openssh/readconf.h projects/mips/crypto/openssh/schnorr.c projects/mips/crypto/openssh/servconf.c projects/mips/crypto/openssh/serverloop.c projects/mips/crypto/openssh/session.c projects/mips/crypto/openssh/sftp-client.c projects/mips/crypto/openssh/sftp-server.8 projects/mips/crypto/openssh/sftp-server.c projects/mips/crypto/openssh/ssh-agent.1 projects/mips/crypto/openssh/ssh-agent.c projects/mips/crypto/openssh/ssh-keygen.c projects/mips/crypto/openssh/ssh.1 projects/mips/crypto/openssh/ssh.c projects/mips/crypto/openssh/ssh_config projects/mips/crypto/openssh/ssh_config.5 projects/mips/crypto/openssh/ssh_namespace.h projects/mips/crypto/openssh/sshconnect.c projects/mips/crypto/openssh/sshconnect.h projects/mips/crypto/openssh/sshconnect2.c projects/mips/crypto/openssh/sshd.8 projects/mips/crypto/openssh/sshd.c projects/mips/crypto/openssh/sshd_config projects/mips/crypto/openssh/sshd_config.5 projects/mips/crypto/openssh/sshlogin.c projects/mips/crypto/openssh/uuencode.c projects/mips/crypto/openssh/version.h projects/mips/crypto/openssl/ (props changed) projects/mips/etc/defaults/rc.conf projects/mips/etc/mtree/BSD.usr.dist projects/mips/etc/network.subr projects/mips/etc/periodic/daily/400.status-disks projects/mips/etc/periodic/security/200.chkmounts projects/mips/etc/rc.d/Makefile projects/mips/etc/rc.d/NETWORKING projects/mips/etc/rc.d/addswap projects/mips/etc/rc.d/defaultroute projects/mips/etc/rc.d/devd projects/mips/etc/rc.d/ip6addrctl projects/mips/etc/rc.d/mroute6d projects/mips/etc/rc.d/netif projects/mips/etc/rc.d/netoptions projects/mips/etc/rc.d/ppp projects/mips/etc/rc.d/route6d projects/mips/etc/rc.d/routed projects/mips/etc/rc.d/routing projects/mips/etc/rc.d/rtadvd projects/mips/etc/rc.d/sysctl projects/mips/etc/rc.subr projects/mips/gnu/usr.bin/groff/tmac/mdoc.local projects/mips/gnu/usr.bin/patch/common.h projects/mips/gnu/usr.bin/patch/pch.c projects/mips/lib/Makefile projects/mips/lib/libc/ (props changed) projects/mips/lib/libc/Versions.def projects/mips/lib/libc/gen/Makefile.inc projects/mips/lib/libc/gen/Symbol.map projects/mips/lib/libc/gen/_pthread_stubs.c projects/mips/lib/libc/net/getifaddrs.c projects/mips/lib/libc/nls/Makefile.inc projects/mips/lib/libc/regex/engine.c projects/mips/lib/libc/regex/grot/tests projects/mips/lib/libc/stdio/asprintf.c (props changed) projects/mips/lib/libc/stdio/fopen.3 projects/mips/lib/libc/stdlib/malloc.3 projects/mips/lib/libc/stdlib/malloc.c projects/mips/lib/libc/stdtime/ (props changed) projects/mips/lib/libc/stdtime/localtime.c projects/mips/lib/libc/string/ffsll.c (props changed) projects/mips/lib/libc/string/flsll.c (props changed) projects/mips/lib/libc/string/wcpcpy.c (props changed) projects/mips/lib/libc/sys/fcntl.2 projects/mips/lib/libc/sys/kqueue.2 projects/mips/lib/libc/sys/setfib.2 projects/mips/lib/libc/sys/stack_protector.c projects/mips/lib/libdevinfo/devinfo.h projects/mips/lib/libdisk/change.c projects/mips/lib/libjail/jail.3 projects/mips/lib/libkvm/kvm_proc.c projects/mips/lib/libradius/libradius.3 projects/mips/lib/libradius/radlib.c projects/mips/lib/libradius/radlib.h projects/mips/lib/libradius/radlib_private.h projects/mips/lib/libstand/net.c projects/mips/lib/libstand/nfs.c projects/mips/lib/libstand/rpc.c projects/mips/lib/libthr/thread/thr_spec.c projects/mips/lib/libthr/thread/thr_umtx.h projects/mips/lib/libutil/ (props changed) projects/mips/libexec/rpc.rquotad/rquotad.c projects/mips/release/Makefile projects/mips/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/mips/release/doc/en_US.ISO8859-1/relnotes/article.sgml projects/mips/release/picobsd/bridge/crunch.conf projects/mips/sbin/ (props changed) projects/mips/sbin/camcontrol/camcontrol.c projects/mips/sbin/geom/class/mirror/gmirror.8 projects/mips/sbin/geom/class/nop/gnop.8 projects/mips/sbin/ifconfig/Makefile projects/mips/sbin/ifconfig/af_inet6.c projects/mips/sbin/ifconfig/ifconfig.8 projects/mips/sbin/ipfw/ (props changed) projects/mips/sbin/ipfw/ipfw.8 projects/mips/sbin/mksnap_ffs/mksnap_ffs.8 projects/mips/sbin/mount/mount.8 projects/mips/sbin/mount/mount.c projects/mips/sbin/mount_nfs/mount_nfs.c projects/mips/sbin/savecore/savecore.8 projects/mips/sbin/shutdown/shutdown.c projects/mips/secure/libexec/sftp-server/Makefile projects/mips/secure/libexec/ssh-keysign/Makefile projects/mips/secure/usr.bin/scp/Makefile projects/mips/secure/usr.bin/sftp/Makefile projects/mips/secure/usr.bin/ssh-add/Makefile projects/mips/secure/usr.bin/ssh-agent/Makefile projects/mips/secure/usr.bin/ssh-keygen/Makefile projects/mips/secure/usr.bin/ssh-keyscan/Makefile projects/mips/secure/usr.bin/ssh/Makefile projects/mips/secure/usr.sbin/sshd/Makefile projects/mips/share/examples/scsi_target/scsi_target.c projects/mips/share/man/man4/Makefile projects/mips/share/man/man4/acpi_panasonic.4 projects/mips/share/man/man4/ed.4 projects/mips/share/man/man4/inet6.4 projects/mips/share/man/man4/man4.i386/Makefile projects/mips/share/man/man4/msk.4 projects/mips/share/man/man4/syscons.4 projects/mips/share/man/man4/textdump.4 projects/mips/share/man/man5/device.hints.5 projects/mips/share/man/man5/procfs.5 projects/mips/share/man/man5/rc.conf.5 projects/mips/share/man/man7/tuning.7 projects/mips/share/man/man9/Makefile projects/mips/share/man/man9/VOP_ACCESS.9 projects/mips/share/man/man9/acl.9 projects/mips/share/man/man9/fail.9 projects/mips/share/man/man9/ieee80211.9 projects/mips/share/man/man9/ieee80211_crypto.9 projects/mips/share/man/man9/ieee80211_input.9 projects/mips/share/man/man9/ieee80211_node.9 projects/mips/share/man/man9/ieee80211_output.9 projects/mips/share/man/man9/ieee80211_proto.9 projects/mips/share/man/man9/ieee80211_radiotap.9 projects/mips/share/man/man9/vaccess.9 projects/mips/share/misc/bsd-family-tree projects/mips/share/misc/iso3166 projects/mips/share/monetdef/zh_CN.GB18030.src projects/mips/share/monetdef/zh_CN.GB2312.src projects/mips/share/timedef/hi_IN.ISCII-DEV.src (contents, props changed) projects/mips/share/zoneinfo/ (props changed) projects/mips/share/zoneinfo/asia projects/mips/share/zoneinfo/australasia projects/mips/share/zoneinfo/southamerica projects/mips/sys/ (props changed) projects/mips/sys/amd64/acpica/acpi_machdep.c projects/mips/sys/amd64/acpica/madt.c projects/mips/sys/amd64/amd64/identcpu.c projects/mips/sys/amd64/amd64/initcpu.c projects/mips/sys/amd64/amd64/machdep.c projects/mips/sys/amd64/amd64/msi.c projects/mips/sys/amd64/amd64/pmap.c projects/mips/sys/amd64/amd64/trap.c projects/mips/sys/amd64/conf/GENERIC projects/mips/sys/amd64/conf/NOTES projects/mips/sys/amd64/include/acpica_machdep.h projects/mips/sys/amd64/include/cpufunc.h projects/mips/sys/amd64/include/param.h projects/mips/sys/amd64/include/specialreg.h projects/mips/sys/amd64/include/xen/ (props changed) projects/mips/sys/amd64/linux32/linux32_proto.h projects/mips/sys/amd64/pci/pci_cfgreg.c projects/mips/sys/arm/arm/identcpu.c projects/mips/sys/arm/include/md_var.h projects/mips/sys/arm/include/param.h projects/mips/sys/boot/forth/loader.conf projects/mips/sys/boot/i386/libi386/pxe.c projects/mips/sys/boot/pc98/Makefile.inc projects/mips/sys/bsm/audit_kevents.h projects/mips/sys/cam/ata/ata_all.c projects/mips/sys/cam/cam_periph.c projects/mips/sys/cam/cam_xpt.c projects/mips/sys/cam/scsi/scsi_target.c projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c projects/mips/sys/cddl/compat/opensolaris/sys/vfs.h projects/mips/sys/cddl/contrib/opensolaris/ (props changed) projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/mips/sys/compat/freebsd32/freebsd32_misc.c projects/mips/sys/compat/freebsd32/freebsd32_proto.h projects/mips/sys/compat/freebsd32/freebsd32_syscall.h projects/mips/sys/compat/freebsd32/freebsd32_syscalls.c projects/mips/sys/compat/freebsd32/freebsd32_sysent.c projects/mips/sys/compat/freebsd32/syscalls.master projects/mips/sys/compat/linux/linux_ioctl.c projects/mips/sys/compat/linux/linux_misc.c projects/mips/sys/compat/svr4/svr4_proto.h projects/mips/sys/conf/NOTES projects/mips/sys/conf/files projects/mips/sys/conf/files.amd64 projects/mips/sys/conf/files.i386 projects/mips/sys/conf/files.pc98 projects/mips/sys/conf/newvers.sh projects/mips/sys/conf/options projects/mips/sys/conf/options.amd64 projects/mips/sys/contrib/dev/acpica/ (props changed) projects/mips/sys/contrib/dev/acpica/acpica_prep.sh projects/mips/sys/contrib/dev/acpica/changes.txt projects/mips/sys/contrib/dev/acpica/common/dmrestag.c projects/mips/sys/contrib/dev/acpica/common/dmtable.c projects/mips/sys/contrib/dev/acpica/common/dmtbdump.c projects/mips/sys/contrib/dev/acpica/common/dmtbinfo.c projects/mips/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/mips/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/mips/sys/contrib/dev/acpica/compiler/aslcompiler.y projects/mips/sys/contrib/dev/acpica/compiler/asldefine.h projects/mips/sys/contrib/dev/acpica/compiler/aslfiles.c projects/mips/sys/contrib/dev/acpica/compiler/aslglobal.h projects/mips/sys/contrib/dev/acpica/compiler/aslload.c projects/mips/sys/contrib/dev/acpica/compiler/asllookup.c projects/mips/sys/contrib/dev/acpica/compiler/aslmain.c projects/mips/sys/contrib/dev/acpica/compiler/aslmap.c projects/mips/sys/contrib/dev/acpica/compiler/aslstubs.c projects/mips/sys/contrib/dev/acpica/compiler/asltypes.h projects/mips/sys/contrib/dev/acpica/debugger/dbcmds.c projects/mips/sys/contrib/dev/acpica/debugger/dbdisply.c projects/mips/sys/contrib/dev/acpica/debugger/dbexec.c projects/mips/sys/contrib/dev/acpica/dispatcher/dsfield.c projects/mips/sys/contrib/dev/acpica/dispatcher/dsmethod.c projects/mips/sys/contrib/dev/acpica/dispatcher/dsmthdat.c projects/mips/sys/contrib/dev/acpica/dispatcher/dsobject.c projects/mips/sys/contrib/dev/acpica/dispatcher/dswload.c projects/mips/sys/contrib/dev/acpica/events/evgpe.c projects/mips/sys/contrib/dev/acpica/events/evgpeblk.c projects/mips/sys/contrib/dev/acpica/events/evrgnini.c projects/mips/sys/contrib/dev/acpica/executer/exconfig.c projects/mips/sys/contrib/dev/acpica/executer/exfield.c projects/mips/sys/contrib/dev/acpica/executer/exfldio.c projects/mips/sys/contrib/dev/acpica/executer/exstorob.c projects/mips/sys/contrib/dev/acpica/executer/exutils.c projects/mips/sys/contrib/dev/acpica/hardware/hwgpe.c projects/mips/sys/contrib/dev/acpica/hardware/hwregs.c projects/mips/sys/contrib/dev/acpica/hardware/hwsleep.c projects/mips/sys/contrib/dev/acpica/hardware/hwtimer.c projects/mips/sys/contrib/dev/acpica/hardware/hwxface.c projects/mips/sys/contrib/dev/acpica/include/acconfig.h projects/mips/sys/contrib/dev/acpica/include/acdebug.h projects/mips/sys/contrib/dev/acpica/include/acdisasm.h projects/mips/sys/contrib/dev/acpica/include/acglobal.h projects/mips/sys/contrib/dev/acpica/include/achware.h projects/mips/sys/contrib/dev/acpica/include/acinterp.h projects/mips/sys/contrib/dev/acpica/include/aclocal.h projects/mips/sys/contrib/dev/acpica/include/acmacros.h projects/mips/sys/contrib/dev/acpica/include/acnamesp.h projects/mips/sys/contrib/dev/acpica/include/acobject.h projects/mips/sys/contrib/dev/acpica/include/acparser.h projects/mips/sys/contrib/dev/acpica/include/acpixf.h projects/mips/sys/contrib/dev/acpica/include/acpredef.h projects/mips/sys/contrib/dev/acpica/include/actbl.h projects/mips/sys/contrib/dev/acpica/include/actbl1.h projects/mips/sys/contrib/dev/acpica/include/actypes.h projects/mips/sys/contrib/dev/acpica/include/acutils.h projects/mips/sys/contrib/dev/acpica/include/amlcode.h projects/mips/sys/contrib/dev/acpica/namespace/nsalloc.c projects/mips/sys/contrib/dev/acpica/namespace/nseval.c projects/mips/sys/contrib/dev/acpica/namespace/nsinit.c projects/mips/sys/contrib/dev/acpica/namespace/nsload.c projects/mips/sys/contrib/dev/acpica/namespace/nspredef.c projects/mips/sys/contrib/dev/acpica/namespace/nsxfeval.c projects/mips/sys/contrib/dev/acpica/namespace/nsxfname.c projects/mips/sys/contrib/dev/acpica/parser/psloop.c projects/mips/sys/contrib/dev/acpica/parser/psxface.c projects/mips/sys/contrib/dev/acpica/tables/tbutils.c projects/mips/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h projects/mips/sys/contrib/dev/acpica/utilities/uteval.c projects/mips/sys/contrib/dev/acpica/utilities/utglobal.c projects/mips/sys/contrib/dev/acpica/utilities/utinit.c projects/mips/sys/contrib/dev/acpica/utilities/utmisc.c projects/mips/sys/contrib/dev/acpica/utilities/utxface.c projects/mips/sys/contrib/pf/ (props changed) projects/mips/sys/ddb/db_ps.c projects/mips/sys/dev/aac/aac.c projects/mips/sys/dev/aac/aacvar.h projects/mips/sys/dev/acpi_support/acpi_aiboost.c projects/mips/sys/dev/acpi_support/acpi_ibm.c projects/mips/sys/dev/acpica/acpi.c projects/mips/sys/dev/acpica/acpi_acad.c projects/mips/sys/dev/acpica/acpi_cpu.c projects/mips/sys/dev/acpica/acpi_pcib_acpi.c projects/mips/sys/dev/acpica/acpi_video.c projects/mips/sys/dev/acpica/acpivar.h projects/mips/sys/dev/ae/if_ae.c projects/mips/sys/dev/age/if_age.c projects/mips/sys/dev/agp/agp_i810.c projects/mips/sys/dev/alc/if_alc.c projects/mips/sys/dev/ale/if_ale.c projects/mips/sys/dev/amdtemp/amdtemp.c projects/mips/sys/dev/asmc/asmc.c projects/mips/sys/dev/asmc/asmcvar.h projects/mips/sys/dev/ata/chipsets/ata-marvell.c projects/mips/sys/dev/atkbdc/atkbd.c projects/mips/sys/dev/ciss/ciss.c projects/mips/sys/dev/ciss/cissreg.h projects/mips/sys/dev/ciss/cissvar.h projects/mips/sys/dev/cxgb/cxgb_sge.c projects/mips/sys/dev/de/if_de.c projects/mips/sys/dev/de/if_devar.h projects/mips/sys/dev/drm/drm_pciids.h projects/mips/sys/dev/drm/radeon_drv.h projects/mips/sys/dev/drm/radeon_irq.c projects/mips/sys/dev/drm/radeon_state.c projects/mips/sys/dev/e1000/if_em.c projects/mips/sys/dev/e1000/if_igb.c projects/mips/sys/dev/fb/s3_pci.c projects/mips/sys/dev/fb/vga.c projects/mips/sys/dev/fxp/if_fxp.c projects/mips/sys/dev/hwpmc/pmc_events.h projects/mips/sys/dev/ichwd/ichwd.c projects/mips/sys/dev/if_ndis/if_ndis.c projects/mips/sys/dev/isp/isp.c projects/mips/sys/dev/isp/isp_freebsd.c projects/mips/sys/dev/isp/isp_stds.h projects/mips/sys/dev/isp/ispmbox.h projects/mips/sys/dev/ixgbe/ixgbe.c projects/mips/sys/dev/jme/if_jme.c projects/mips/sys/dev/kbd/kbd.c projects/mips/sys/dev/mii/e1000phy.c projects/mips/sys/dev/mii/e1000phyreg.h projects/mips/sys/dev/msk/if_msk.c projects/mips/sys/dev/msk/if_mskreg.h projects/mips/sys/dev/mwl/if_mwl.c projects/mips/sys/dev/mxge/if_mxge.c projects/mips/sys/dev/mxge/if_mxge_var.h projects/mips/sys/dev/pci/pci.c projects/mips/sys/dev/pci/pci_user.c projects/mips/sys/dev/pci/pcireg.h projects/mips/sys/dev/pci/pcivar.h projects/mips/sys/dev/ppbus/vpo.c projects/mips/sys/dev/sound/pci/es137x.c projects/mips/sys/dev/sound/pci/es137x.h projects/mips/sys/dev/sound/pci/hda/hda_reg.h projects/mips/sys/dev/sound/pci/hda/hdac.c projects/mips/sys/dev/sound/pci/t4dwave.c projects/mips/sys/dev/syscons/daemon/daemon_saver.c projects/mips/sys/dev/syscons/scmouse.c projects/mips/sys/dev/syscons/scterm-teken.c projects/mips/sys/dev/syscons/scvesactl.c projects/mips/sys/dev/syscons/syscons.c projects/mips/sys/dev/syscons/syscons.h projects/mips/sys/dev/twa/tw_cl_io.c projects/mips/sys/dev/twa/tw_cl_share.h projects/mips/sys/dev/twe/twe.c projects/mips/sys/dev/twe/twevar.h projects/mips/sys/dev/usb/controller/atmegadci.c projects/mips/sys/dev/usb/controller/ehci.c projects/mips/sys/dev/usb/controller/ehci_pci.c projects/mips/sys/dev/usb/controller/usb_controller.c projects/mips/sys/dev/usb/net/if_axe.c projects/mips/sys/dev/usb/net/if_cdce.c projects/mips/sys/dev/usb/net/if_cdcereg.h projects/mips/sys/dev/usb/quirk/usb_quirk.c projects/mips/sys/dev/usb/serial/u3g.c projects/mips/sys/dev/usb/serial/uark.c projects/mips/sys/dev/usb/serial/ubsa.c projects/mips/sys/dev/usb/serial/ubser.c projects/mips/sys/dev/usb/serial/uchcom.c projects/mips/sys/dev/usb/serial/ucycom.c projects/mips/sys/dev/usb/serial/ufoma.c projects/mips/sys/dev/usb/serial/uftdi.c projects/mips/sys/dev/usb/serial/ugensa.c projects/mips/sys/dev/usb/serial/uipaq.c projects/mips/sys/dev/usb/serial/umct.c projects/mips/sys/dev/usb/serial/umodem.c projects/mips/sys/dev/usb/serial/umoscom.c projects/mips/sys/dev/usb/serial/uplcom.c projects/mips/sys/dev/usb/serial/usb_serial.c projects/mips/sys/dev/usb/serial/usb_serial.h projects/mips/sys/dev/usb/serial/uslcom.c projects/mips/sys/dev/usb/serial/uvscom.c projects/mips/sys/dev/usb/storage/umass.c projects/mips/sys/dev/usb/usb.h projects/mips/sys/dev/usb/usb_bus.h projects/mips/sys/dev/usb/usb_cdc.h projects/mips/sys/dev/usb/usb_device.c projects/mips/sys/dev/usb/usb_device.h projects/mips/sys/dev/usb/usb_hub.c projects/mips/sys/dev/usb/usb_transfer.c projects/mips/sys/dev/usb/usbdevs projects/mips/sys/dev/xen/xenpci/ (props changed) projects/mips/sys/fs/fifofs/fifo_vnops.c projects/mips/sys/fs/nfs/nfs_commonacl.c projects/mips/sys/fs/nfsclient/nfs_clnode.c projects/mips/sys/fs/nfsclient/nfs_clport.c projects/mips/sys/fs/procfs/procfs.c projects/mips/sys/fs/procfs/procfs.h projects/mips/sys/geom/part/g_part.c projects/mips/sys/geom/part/g_part_ebr.c projects/mips/sys/i386/acpica/acpi_machdep.c projects/mips/sys/i386/acpica/madt.c projects/mips/sys/i386/conf/GENERIC projects/mips/sys/i386/conf/NOTES projects/mips/sys/i386/cpufreq/hwpstate.c projects/mips/sys/i386/i386/identcpu.c projects/mips/sys/i386/i386/initcpu.c projects/mips/sys/i386/i386/machdep.c projects/mips/sys/i386/i386/msi.c projects/mips/sys/i386/i386/pmap.c projects/mips/sys/i386/i386/trap.c projects/mips/sys/i386/ibcs2/ibcs2_proto.h projects/mips/sys/i386/include/acpica_machdep.h projects/mips/sys/i386/include/apm_bios.h projects/mips/sys/i386/include/cpufunc.h projects/mips/sys/i386/include/param.h projects/mips/sys/i386/include/specialreg.h projects/mips/sys/i386/include/xen/xen-os.h projects/mips/sys/i386/linux/linux_proto.h projects/mips/sys/i386/pci/pci_cfgreg.c projects/mips/sys/i386/xen/locore.s projects/mips/sys/i386/xen/pmap.c projects/mips/sys/ia64/include/param.h projects/mips/sys/kern/init_main.c projects/mips/sys/kern/init_sysent.c projects/mips/sys/kern/kern_descrip.c projects/mips/sys/kern/kern_event.c projects/mips/sys/kern/kern_exec.c projects/mips/sys/kern/kern_mib.c projects/mips/sys/kern/kern_rwlock.c projects/mips/sys/kern/kern_shutdown.c projects/mips/sys/kern/kern_sig.c projects/mips/sys/kern/kern_sx.c projects/mips/sys/kern/kern_timeout.c projects/mips/sys/kern/kern_umtx.c projects/mips/sys/kern/sched_ule.c projects/mips/sys/kern/subr_acl_nfs4.c projects/mips/sys/kern/subr_acl_posix1e.c projects/mips/sys/kern/subr_bus.c projects/mips/sys/kern/subr_devstat.c projects/mips/sys/kern/subr_smp.c projects/mips/sys/kern/sys_generic.c projects/mips/sys/kern/sys_pipe.c projects/mips/sys/kern/syscalls.c projects/mips/sys/kern/syscalls.master projects/mips/sys/kern/tty.c projects/mips/sys/kern/tty_pts.c projects/mips/sys/kern/uipc_mqueue.c projects/mips/sys/kern/uipc_socket.c projects/mips/sys/kern/uipc_syscalls.c projects/mips/sys/kern/vfs_aio.c projects/mips/sys/kern/vfs_default.c projects/mips/sys/kern/vfs_export.c projects/mips/sys/kern/vfs_subr.c projects/mips/sys/kern/vfs_vnops.c projects/mips/sys/mips/conf/OCTEON1 (props changed) projects/mips/sys/mips/include/param.h projects/mips/sys/mips/octeon1/ (props changed) projects/mips/sys/modules/Makefile projects/mips/sys/modules/acpi/acpi/Makefile projects/mips/sys/modules/dpms/Makefile projects/mips/sys/modules/dtrace/lockstat/Makefile projects/mips/sys/modules/nfslockd/Makefile projects/mips/sys/modules/procfs/Makefile projects/mips/sys/modules/usb/Makefile projects/mips/sys/modules/vesa/Makefile projects/mips/sys/net/bpf.c projects/mips/sys/net/flowtable.c projects/mips/sys/net/flowtable.h projects/mips/sys/net/if.c projects/mips/sys/net/if_llatbl.c projects/mips/sys/net/if_var.h projects/mips/sys/net/if_vlan.c projects/mips/sys/net/route.c projects/mips/sys/net/route.h projects/mips/sys/net80211/ieee80211.h projects/mips/sys/net80211/ieee80211_hwmp.c projects/mips/sys/net80211/ieee80211_mesh.c projects/mips/sys/net80211/ieee80211_mesh.h projects/mips/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h projects/mips/sys/netinet/if_ether.c projects/mips/sys/netinet/if_ether.h projects/mips/sys/netinet/in.c projects/mips/sys/netinet/in_mcast.c projects/mips/sys/netinet/in_pcb.c projects/mips/sys/netinet/in_proto.c projects/mips/sys/netinet/ip_mroute.c projects/mips/sys/netinet/raw_ip.c projects/mips/sys/netinet/sctp_asconf.c projects/mips/sys/netinet/sctp_bsd_addr.c projects/mips/sys/netinet/sctp_input.c projects/mips/sys/netinet/sctp_os_bsd.h projects/mips/sys/netinet/sctp_output.c projects/mips/sys/netinet/sctp_pcb.c projects/mips/sys/netinet/sctp_pcb.h projects/mips/sys/netinet/sctp_structs.h projects/mips/sys/netinet/sctp_sysctl.c projects/mips/sys/netinet/sctp_timer.c projects/mips/sys/netinet/sctp_usrreq.c projects/mips/sys/netinet/sctputil.c projects/mips/sys/netinet/tcp_subr.c projects/mips/sys/netinet/tcp_timer.c projects/mips/sys/netinet/tcp_timer.h projects/mips/sys/netinet/tcp_usrreq.c projects/mips/sys/netinet/tcp_var.h projects/mips/sys/netinet6/in6.c projects/mips/sys/netinet6/in6_ifattach.c projects/mips/sys/netinet6/in6_proto.c projects/mips/sys/netinet6/ip6_input.c projects/mips/sys/netinet6/nd6.c projects/mips/sys/netinet6/nd6.h projects/mips/sys/netinet6/nd6_nbr.c projects/mips/sys/netinet6/nd6_rtr.c projects/mips/sys/netinet6/sctp6_usrreq.c projects/mips/sys/netipsec/key.c projects/mips/sys/netipsec/xform_esp.c projects/mips/sys/netsmb/smb_dev.c projects/mips/sys/nfsclient/nfs_node.c projects/mips/sys/nfsclient/nfs_vfsops.c projects/mips/sys/nfsserver/nfs_serv.c projects/mips/sys/pc98/conf/GENERIC projects/mips/sys/pc98/conf/NOTES projects/mips/sys/pci/intpm.c projects/mips/sys/pci/intpmreg.h projects/mips/sys/powerpc/conf/GENERIC projects/mips/sys/powerpc/include/param.h projects/mips/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c projects/mips/sys/sparc64/conf/GENERIC projects/mips/sys/sparc64/include/param.h projects/mips/sys/sparc64/pci/ofw_pci.h projects/mips/sys/sparc64/pci/psycho.c projects/mips/sys/sparc64/pci/schizo.c projects/mips/sys/sparc64/sparc64/jbusppm.c projects/mips/sys/sun4v/include/param.h projects/mips/sys/sys/ata.h projects/mips/sys/sys/bus.h projects/mips/sys/sys/event.h projects/mips/sys/sys/fcntl.h projects/mips/sys/sys/imgact_aout.h projects/mips/sys/sys/kbio.h projects/mips/sys/sys/mman.h projects/mips/sys/sys/param.h projects/mips/sys/sys/rwlock.h projects/mips/sys/sys/smp.h projects/mips/sys/sys/socket.h projects/mips/sys/sys/sx.h projects/mips/sys/sys/syscall.h projects/mips/sys/sys/syscall.mk projects/mips/sys/sys/syscallsubr.h projects/mips/sys/sys/sysproto.h projects/mips/sys/sys/systm.h projects/mips/sys/sys/vnode.h projects/mips/sys/ufs/ufs/ufs_gjournal.c projects/mips/sys/ufs/ufs/ufs_vnops.c projects/mips/sys/vm/vm_map.c projects/mips/sys/vm/vm_mmap.c projects/mips/tools/regression/acltools/00.t projects/mips/tools/regression/sockets/accf_data_attach/accf_data_attach.c projects/mips/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) projects/mips/tools/regression/usr.bin/sed/multitest.t projects/mips/tools/tools/mwl/mwlstats/mwlstats.c projects/mips/tools/tools/nanobsd/nanobsd.sh projects/mips/usr.bin/csup/ (props changed) projects/mips/usr.bin/find/find.1 projects/mips/usr.bin/gcore/elfcore.c projects/mips/usr.bin/netstat/inet.c projects/mips/usr.bin/netstat/netstat.1 projects/mips/usr.bin/procstat/ (props changed) projects/mips/usr.bin/sed/compile.c projects/mips/usr.sbin/Makefile projects/mips/usr.sbin/acpi/acpidb/Makefile projects/mips/usr.sbin/apm/Makefile projects/mips/usr.sbin/btxld/btxld.c projects/mips/usr.sbin/crashinfo/crashinfo.8 projects/mips/usr.sbin/dumpcis/cardinfo.h (props changed) projects/mips/usr.sbin/dumpcis/cis.h (props changed) projects/mips/usr.sbin/freebsd-update/freebsd-update.sh projects/mips/usr.sbin/kbdcontrol/kbdcontrol.c projects/mips/usr.sbin/kbdcontrol/kbdmap.5 projects/mips/usr.sbin/lpr/lp/lp.sh projects/mips/usr.sbin/ndp/ndp.8 projects/mips/usr.sbin/ndp/ndp.c projects/mips/usr.sbin/rtsold/if.c projects/mips/usr.sbin/rtsold/rtsold.8 projects/mips/usr.sbin/rtsold/rtsold.c projects/mips/usr.sbin/rtsold/rtsold.h projects/mips/usr.sbin/sysinstall/menus.c projects/mips/usr.sbin/zic/ (props changed) Modified: projects/mips/Makefile.inc1 ============================================================================== --- projects/mips/Makefile.inc1 Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/Makefile.inc1 Fri Oct 2 19:51:03 2009 (r197717) @@ -5,7 +5,7 @@ # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir -# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel Modified: projects/mips/ObsoleteFiles.inc ============================================================================== --- projects/mips/ObsoleteFiles.inc Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/ObsoleteFiles.inc Fri Oct 2 19:51:03 2009 (r197717) @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090909: vesa and dpms promoted to be i386/amd64 common +OLD_FILES+=usr/include/machine/pc/vesa.h +OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz # 20090904: remove lukemftpd OLD_FILES+=usr/libexec/lukemftpd OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz Modified: projects/mips/UPDATING ============================================================================== --- projects/mips/UPDATING Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/UPDATING Fri Oct 2 19:51:03 2009 (r197717) @@ -22,6 +22,65 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090926: + The rc.d/network_ipv6, IPv6 configuration script has been integrated + into rc.d/netif. The changes are the following: + + 1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF + for IPv4. For aliases, $ifconfig_IF_aliasN should be used. + Note that both variables need the "inet6" keyword at the head. + + Do not set $ipv6_network_interfaces manually if you do not + understand what you are doing. It is not needed in most cases. + + $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but + they are obsolete. + + 2. $ipv6_enable is obsolete. Use $ipv6_prefer and + "inet6 accept_rtadv" keyword in ifconfig(8) instead. + + If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and + all configured interfaces have "inet6 accept_rtadv" in the + $ifconfig_IF_ipv6. These are for backward compatibility. + + 3. A new variable $ipv6_prefer has been added. If NO, IPv6 + functionality of interfaces with no corresponding + $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag, + and the default address selection policy of ip6addrctl(8) + is the IPv4-preferred one (see rc.d/ip6addrctl for more details). + Note that if you want to configure IPv6 functionality on the + disabled interfaces after boot, first you need to clear the flag by + using ifconfig(8) like: + + ifconfig em0 inet6 -ifdisabled + + If YES, the default address selection policy is set as + IPv6-preferred. + + The default value of $ipv6_prefer is NO. + + 4. If your system need to receive Router Advertisement messages, + define "inet6 accept_rtadv" in $ifconfig_IF_ipv6. The rc(8) + scripts automatically invoke rtsol(8) when the interface becomes + UP. The Router Advertisement messages are used for SLAAC + (State-Less Address AutoConfiguration). + +20090922: + 802.11s D3.03 support was committed. This is incompatible with the + previous code, which was based on D3.0. + +20090912: + A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value + of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to + control whether accepting Router Advertisement messages or not. + Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and + a sysctl variable net.inet6.ip6.auto_linklocal is its default value. + The ifconfig(8) utility now supports these flags. + +20090910: + ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for + mount(8) and -a option for df(1) to see them. + 20090825: The old tunable hw.bus.devctl_disable has been superseded by hw.bus.devctl_queue. hw.bus.devctl_disable=1 in loader.conf should be Modified: projects/mips/bin/sh/sh.1 ============================================================================== --- projects/mips/bin/sh/sh.1 Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/bin/sh/sh.1 Fri Oct 2 19:51:03 2009 (r197717) @@ -375,6 +375,10 @@ introduces a comment if used at the begi The word starting with .Ql # and the rest of the line are ignored. +.Pp +.Tn ASCII +.Dv NUL +characters (character code 0) are not allowed in shell input. .Ss Quoting Quoting is used to remove the special meaning of certain characters or words to the shell, such as operators, whitespace, keywords, Copied: projects/mips/cddl/compat/opensolaris/include/assert.h (from r197687, head/cddl/compat/opensolaris/include/assert.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/cddl/compat/opensolaris/include/assert.h Fri Oct 2 19:51:03 2009 (r197717, copy of r197687, head/cddl/compat/opensolaris/include/assert.h) @@ -0,0 +1,55 @@ +/*- + * Copyright (c) 2009 Pawel Jakub Dawidek + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#undef assert +#undef _assert + +#ifdef NDEBUG +#define assert(e) ((void)0) +#define _assert(e) ((void)0) +#else +#define _assert(e) assert(e) + +#define assert(e) ((e) ? (void)0 : __assert(#e, __FILE__, __LINE__)) +#endif /* NDEBUG */ + +#ifndef _ASSERT_H_ +#define _ASSERT_H_ +#include +#include + +static __inline void +__assert(const char *expr, const char *file, int line) +{ + + (void)fprintf(stderr, "Assertion failed: (%s), file %s, line %d.\n", + expr, file, line); + abort(); + /* NOTREACHED */ +} +#endif /* !_ASSERT_H_ */ Modified: projects/mips/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/mips/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Oct 2 19:51:03 2009 (r197717) @@ -535,7 +535,7 @@ This property is not inherited. .ad .sp .6 .RS 4n -Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity +Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity checking on user data. Disabling checksums is NOT a recommended practice. .RE Modified: projects/mips/crypto/openssh/ChangeLog ============================================================================== --- projects/mips/crypto/openssh/ChangeLog Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/ChangeLog Fri Oct 2 19:51:03 2009 (r197717) @@ -1,3 +1,282 @@ +20090926 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update for release + - (djm) [README] update relnotes URL + - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere + - (djm) Release 5.3p1 + +20090911 + - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X + 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch + from jbasney at ncsa uiuc edu. + +20090908 + - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port + (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@ + +20090901 + - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for + krb5-config if it's not in the location specified by --with-kerberos5. + Patch from jchadima at redhat. + +20090829 + - (dtucker) [README.platform] Add text about development packages, based on + text from Chris Pepper in bug #1631. + +20090828 + - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently + causes problems in some Tru64 configurations. + - (djm) [sshd_config.5] downgrade mention of login.conf to be an example + and mention PAM as another provider for ChallengeResponseAuthentication; + bz#1408; ok dtucker@ + - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when + attempting atomic rename(); ok dtucker@ + - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables + in argv, so pass them in the environment; ok dtucker@ + - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on + the pty master on Solaris, since it never succeeds and can hang if large + amounts of data is sent to the slave (eg a copy-paste). Based on a patch + originally from Doke Scott, ok djm@ + - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer + size a compile-time option and set it to 64k on Cygwin, since Corinna + reports that it makes a significant difference to performance. ok djm@ + - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry. + +20090820 + - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not + using it since the type conflicts can cause problems on FreeBSD. Patch + from Jonathan Chen. + - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move + the setpcred call on AIX to immediately before the permanently_set_uid(). + Ensures that we still have privileges when we call chroot and + pam_open_sesson. Based on a patch from David Leonard. + +20090817 + - (dtucker) [configure.ac] Check for headers before libraries for openssl an + zlib, which should make the errors slightly more meaningful on platforms + where there's separate "-devel" packages for those. + - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make + PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders. + +20090729 + - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error + function. Patch from Corinna Vinschen. + +20090713 + - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it + fits into 16 bits to work around a bug in glibc's resolver where it masks + off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob. + +20090712 + - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, + prevents configure complaining on older BSDs. + - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch + from Corinna Vinschen. + - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on + logout to after the session close. Patch from Anicka Bernathova, + originally from Andreas Schwab via Novelll ok djm. + +20090707 + - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated + scripts and fix usage of eval. Patch from Corinna Vinschen. + +20090705 + - (dtucker) OpenBSD CVS Sync + - andreas@cvs.openbsd.org 2009/06/27 09:29:06 + [packet.h packet.c] + packet_bacup_state() and packet_restore_state() will be used to + temporarily save the current state ren resuming a suspended connection. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:32:43 + [roaming_common.c roaming.h] + It may be necessary to retransmit some data when resuming, so add it + to a buffer when roaming is enabled. + Most of this code was written by Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:35:06 + [readconf.h readconf.c] + Add client option UseRoaming. It doesn't do anything yet but will + control whether the client tries to use roaming if enabled on the + server. From Martin Forssen. + ok markus@ + - markus@cvs.openbsd.org 2009/06/30 14:54:40 + [version.h] + crank version; ok deraadt + - dtucker@cvs.openbsd.org 2009/07/02 02:11:47 + [ssh.c] + allow for long home dir paths (bz #1615). ok deraadt + (based in part on a patch from jchadima at redhat) + - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 + [clientloop.c] + only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ + ok deraadt@ markus@ + +20090622 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2009/06/22 05:39:28 + [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c] + alphabetize includes; reduces diff vs portable and style(9). + ok stevesk djm + (Id sync only; these were already in order in -portable) + +20090621 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2009/03/17 21:37:00 + [ssh.c] + pass correct argv[0] to openlog(); ok djm@ + - jmc@cvs.openbsd.org 2009/03/19 15:15:09 + [ssh.1] + for "Ciphers", just point the reader to the keyword in ssh_config(5), just + as we do for "MACs": this stops us getting out of sync when the lists + change; + fixes documentation/6102, submitted by Peter J. Philipp + alternative fix proposed by djm + ok markus + - tobias@cvs.openbsd.org 2009/03/23 08:31:19 + [ssh-agent.c] + Fixed a possible out-of-bounds memory access if the environment variable + SHELL is shorter than 3 characters. + with input by and ok dtucker + - tobias@cvs.openbsd.org 2009/03/23 19:38:04 + [ssh-agent.c] + My previous commit didn't fix the problem at all, so stick at my first + version of the fix presented to dtucker. + Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de). + ok dtucker + - sobrado@cvs.openbsd.org 2009/03/26 08:38:39 + [sftp-server.8 sshd.8 ssh-agent.1] + fix a few typographical errors found by spell(1). + ok dtucker@, jmc@ + - stevesk@cvs.openbsd.org 2009/04/13 19:07:44 + [sshd_config.5] + fix possessive; ok djm@ + - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 + [sftp-server.c] + remove unused option character from getopt() optstring; ok markus@ + - jj@cvs.openbsd.org 2009/04/14 21:10:54 + [servconf.c] + Fixed a few the-the misspellings in comments. Skipped a bunch in + binutils,gcc and so on. ok jmc@ + - stevesk@cvs.openbsd.org 2009/04/17 19:23:06 + [session.c] + use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server; + ok djm@ markus@ + - stevesk@cvs.openbsd.org 2009/04/17 19:40:17 + [sshd_config.5] + clarify that even internal-sftp needs /dev/log for logging to work; ok + markus@ + - jmc@cvs.openbsd.org 2009/04/18 18:39:10 + [sshd_config.5] + tweak previous; ok stevesk + - stevesk@cvs.openbsd.org 2009/04/21 15:13:17 + [sshd_config.5] + clarify we cd to user's home after chroot; ok markus@ on + earlier version; tweaks and ok jmc@ + - andreas@cvs.openbsd.org 2009/05/25 06:48:01 + [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c + monitor.c] + Put the globals in packet.c into a struct and don't access it directly + from other files. No functional changes. + ok markus@ djm@ + - andreas@cvs.openbsd.org 2009/05/27 06:31:25 + [canohost.h canohost.c] + Add clear_cached_addr(), needed for upcoming changes allowing the peer + address to change. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:33:39 + [clientloop.c] + Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger + change from Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:34:36 + [kex.c kex.h] + Move the KEX_COOKIE_LEN define to kex.h + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:36:07 + [packet.h packet.c] + Add packet_put_int64() and packet_get_int64(), part of a larger change + from Martin Forssen. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:38:16 + [sshconnect.h sshconnect.c] + Un-static ssh_exchange_identification(), part of a larger change from + Martin Forssen and needed for upcoming changes. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/28 16:50:16 + [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c + monitor.c Added roaming.h roaming_common.c roaming_dummy.c] + Keep track of number of bytes read and written. Needed for upcoming + changes. Most code from Martin Forssen, maf at appgate dot com. + ok markus@ + Also, applied appropriate changes to Makefile.in + - andreas@cvs.openbsd.org 2009/06/12 20:43:22 + [monitor.c packet.c] + Fix warnings found by chl@ and djm@ and change roaming_atomicio's + return type to match atomicio's + Diff from djm@, ok markus@ + - andreas@cvs.openbsd.org 2009/06/12 20:58:32 + [packet.c] + Move some more statics into session_state + ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 07:37:15 + [kexdhs.c kexgexs.c] + abort if key_sign fails, preventing possible null deref. Based on report + from Paolo Ganci, ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 09:04:03 + [roaming.h roaming_common.c roaming_dummy.c] + Add tags for the benefit of the sync scripts + Also: pull in the changes for 1.1->1.2 missed in the previous sync. + - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and + header-order changes to reduce diff vs OpenBSD. + - (dtucker) [servconf.c sshd.c] More whitespace sync. + - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include in + ifdef. + +20090616 + - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t + is a struct with a __val member. Fixes build on, eg, Redhat 6.2. + +20090504 + - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include + variable declarations. Should prevent unused warnings anywhere it's set + (only Crays as far as I can tell) and be a no-op everywhere else. + +20090318 + - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem + that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005. + Based on patch from vinschen at redhat com. + +20090308 + - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c + auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h} + openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old + version of Cygwin. Patch from vinschen at redhat com. + +20090307 + - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it + exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS + has a /dev/random). + - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add + EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c + to use them. Allows building with older OpenSSL versions. + - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed. + - (dtucker) [configure.ac] Missing comma in type list. + - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] + EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg + in openssl 0.9.6) so add an explicit test for it. + +20090306 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2009/03/05 07:18:19 + [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c] + [sshconnect2.c] + refactor the (disabled) Schnorr proof code to make it a little more + generally useful + - djm@cvs.openbsd.org 2009/03/05 11:30:50 + [uuencode.c] + document what these functions do so I don't ever have to recuse into + b64_pton/ntop to remember their return values + 20090223 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2009/02/22 23:50:57 Modified: projects/mips/crypto/openssh/README ============================================================================== --- projects/mips/crypto/openssh/README Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/README Fri Oct 2 19:51:03 2009 (r197717) @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.2 for the release notes. +See http://www.openssh.com/txt/release-5.3 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ References - [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $ +$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $ Modified: projects/mips/crypto/openssh/README.platform ============================================================================== --- projects/mips/crypto/openssh/README.platform Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/README.platform Fri Oct 2 19:51:03 2009 (r197717) @@ -56,6 +56,18 @@ using a third party driver. More informa http://www-user.rhrk.uni-kl.de/~nissler/tuntap/ +Linux +----- + +Some Linux distributions (including Red Hat/Fedora/CentOS) include +headers and library links in the -devel RPMs rather than the main +binary RPMs. If you get an error about headers, or complaining about a +missing prerequisite then you may need to install the equivalent +development packages. On Redhat based distros these may be openssl-devel, +zlib-devel and pam-devel, on Debian based distros these may be +libssl-dev, libz-dev and libpam-dev. + + Solaris ------- If you enable BSM auditing on Solaris, you need to update audit_event(4) @@ -81,4 +93,4 @@ account stacks which will prevent authen return the output from pam_nologin to the client. -$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $ +$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $ Modified: projects/mips/crypto/openssh/auth-pam.c ============================================================================== --- projects/mips/crypto/openssh/auth-pam.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth-pam.c Fri Oct 2 19:51:03 2009 (r197717) @@ -602,16 +602,16 @@ sshpam_cleanup(void) return; debug("PAM: cleanup"); pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); - if (sshpam_cred_established) { - debug("PAM: deleting credentials"); - pam_setcred(sshpam_handle, PAM_DELETE_CRED); - sshpam_cred_established = 0; - } if (sshpam_session_open) { debug("PAM: closing session"); pam_close_session(sshpam_handle, PAM_SILENT); sshpam_session_open = 0; } + if (sshpam_cred_established) { + debug("PAM: deleting credentials"); + pam_setcred(sshpam_handle, PAM_DELETE_CRED); + sshpam_cred_established = 0; + } sshpam_authenticated = 0; pam_end(sshpam_handle, sshpam_err); sshpam_handle = NULL; Modified: projects/mips/crypto/openssh/auth-passwd.c ============================================================================== --- projects/mips/crypto/openssh/auth-passwd.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth-passwd.c Fri Oct 2 19:51:03 2009 (r197717) @@ -102,7 +102,7 @@ auth_password(Authctxt *authctxt, const } #endif #ifdef HAVE_CYGWIN - if (is_winnt) { + { HANDLE hToken = cygwin_logon_user(pw, password); if (hToken == INVALID_HANDLE_VALUE) Modified: projects/mips/crypto/openssh/auth-sia.c ============================================================================== --- projects/mips/crypto/openssh/auth-sia.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth-sia.c Fri Oct 2 19:51:03 2009 (r197717) @@ -34,10 +34,6 @@ #include #include #include -#include -#include -#include -#include #include "ssh.h" #include "key.h" @@ -53,52 +49,6 @@ extern ServerOptions options; extern int saved_argc; extern char **saved_argv; -static int -sia_password_change_required(const char *user) -{ - struct es_passwd *acct; - time_t pw_life; - time_t pw_date; - - set_auth_parameters(saved_argc, saved_argv); - - if ((acct = getespwnam(user)) == NULL) { - error("Couldn't access protected database entry for %s", user); - endprpwent(); - return (0); - } - - /* If forced password change flag is set, honor it */ - if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) { - endprpwent(); - return (1); - } - - /* Obtain password lifetime; if none, it can't have expired */ - if (acct->uflg->fg_expire) - pw_life = acct->ufld->fd_expire; - else if (acct->sflg->fg_expire) - pw_life = acct->sfld->fd_expire; - else { - endprpwent(); - return (0); - } - - /* Offset from last change; if none, it must be expired */ - if (acct->uflg->fg_schange) - pw_date = acct->ufld->fd_schange + pw_life; - else { - endprpwent(); - return (1); - } - - endprpwent(); - - /* If expiration date is prior to now, change password */ - - return (pw_date <= time((time_t *) NULL)); -} - int sys_auth_passwd(Authctxt *authctxt, const char *pass) { @@ -126,9 +76,6 @@ sys_auth_passwd(Authctxt *authctxt, cons sia_ses_release(&ent); - authctxt->force_pwchange = sia_password_change_required( - authctxt->user); - return (1); } Modified: projects/mips/crypto/openssh/auth1.c ============================================================================== --- projects/mips/crypto/openssh/auth1.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth1.c Fri Oct 2 19:51:03 2009 (r197717) @@ -318,15 +318,7 @@ do_authloop(Authctxt *authctxt) } #endif /* _UNICOS */ -#ifdef HAVE_CYGWIN - if (authenticated && - !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, - authctxt->pw)) { - packet_disconnect("Authentication rejected for uid %d.", - authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); - authenticated = 0; - } -#else +#ifndef HAVE_CYGWIN /* Special handling for root */ if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(meth->name)) { Modified: projects/mips/crypto/openssh/auth2-jpake.c ============================================================================== --- projects/mips/crypto/openssh/auth2-jpake.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth2-jpake.c Fri Oct 2 19:51:03 2009 (r197717) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ +/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -42,8 +42,8 @@ #include "ssh2.h" #include "key.h" #include "hostfile.h" -#include "buffer.h" #include "auth.h" +#include "buffer.h" #include "packet.h" #include "dispatch.h" #include "log.h" @@ -55,6 +55,7 @@ #endif #include "monitor_wrap.h" +#include "schnorr.h" #include "jpake.h" /* @@ -359,7 +360,7 @@ auth2_jpake_get_pwdata(Authctxt *authctx } /* - * Being authentication attempt. + * Begin authentication attempt. * Note, sets authctxt->postponed while in subprotocol */ static int Modified: projects/mips/crypto/openssh/auth2-kbdint.c ============================================================================== --- projects/mips/crypto/openssh/auth2-kbdint.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth2-kbdint.c Fri Oct 2 19:51:03 2009 (r197717) @@ -58,10 +58,6 @@ userauth_kbdint(Authctxt *authctxt) xfree(devs); xfree(lang); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } Modified: projects/mips/crypto/openssh/auth2-none.c ============================================================================== --- projects/mips/crypto/openssh/auth2-none.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth2-none.c Fri Oct 2 19:51:03 2009 (r197717) @@ -61,10 +61,6 @@ userauth_none(Authctxt *authctxt) { none_enabled = 0; packet_check_eom(); -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - return (0); -#endif if (options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); Modified: projects/mips/crypto/openssh/auth2-passwd.c ============================================================================== --- projects/mips/crypto/openssh/auth2-passwd.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth2-passwd.c Fri Oct 2 19:51:03 2009 (r197717) @@ -68,10 +68,6 @@ userauth_passwd(Authctxt *authctxt) logit("password change not supported"); else if (PRIVSEP(auth_password(authctxt, password)) == 1) authenticated = 1; -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - authenticated = 0; -#endif memset(password, 0, len); xfree(password); return authenticated; Modified: projects/mips/crypto/openssh/auth2-pubkey.c ============================================================================== --- projects/mips/crypto/openssh/auth2-pubkey.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth2-pubkey.c Fri Oct 2 19:51:03 2009 (r197717) @@ -170,10 +170,6 @@ done: key_free(key); xfree(pkalg); xfree(pkblob); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } Modified: projects/mips/crypto/openssh/auth2.c ============================================================================== --- projects/mips/crypto/openssh/auth2.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/auth2.c Fri Oct 2 19:51:03 2009 (r197717) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -36,8 +36,8 @@ __RCSID("$FreeBSD$"); #include #include -#include "xmalloc.h" #include "atomicio.h" +#include "xmalloc.h" #include "ssh2.h" #include "packet.h" #include "log.h" Modified: projects/mips/crypto/openssh/canohost.c ============================================================================== --- projects/mips/crypto/openssh/canohost.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/canohost.c Fri Oct 2 19:51:03 2009 (r197717) @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,6 +35,8 @@ #include "misc.h" static void check_ip_options(int, char *); +static char *canonical_host_ip = NULL; +static int cached_port = -1; /* * Return the canonical name of the host at the other end of the socket. The @@ -304,6 +306,16 @@ get_local_name(int sock) return get_socket_address(sock, 0, NI_NAMEREQD); } +void +clear_cached_addr(void) +{ + if (canonical_host_ip != NULL) { + xfree(canonical_host_ip); + canonical_host_ip = NULL; + } + cached_port = -1; +} + /* * Returns the IP-address of the remote host as a string. The returned * string must not be freed. @@ -312,8 +324,6 @@ get_local_name(int sock) const char * get_remote_ipaddr(void) { - static char *canonical_host_ip = NULL; - /* Check whether we have cached the ipaddr. */ if (canonical_host_ip == NULL) { if (packet_connection_is_on_socket()) { @@ -402,13 +412,11 @@ get_peer_port(int sock) int get_remote_port(void) { - static int port = -1; - /* Cache to avoid getpeername() on a dead connection */ - if (port == -1) - port = get_port(0); + if (cached_port == -1) + cached_port = get_port(0); - return port; + return cached_port; } int Modified: projects/mips/crypto/openssh/canohost.h ============================================================================== --- projects/mips/crypto/openssh/canohost.h Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/canohost.h Fri Oct 2 19:51:03 2009 (r197717) @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.h,v 1.10 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: canohost.h,v 1.11 2009/05/27 06:31:25 andreas Exp $ */ /* * Author: Tatu Ylonen @@ -24,6 +24,6 @@ char *get_local_name(int); int get_remote_port(void); int get_local_port(void); int get_sock_port(int, int); - +void clear_cached_addr(void); void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); Modified: projects/mips/crypto/openssh/channels.c ============================================================================== --- projects/mips/crypto/openssh/channels.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/channels.c Fri Oct 2 19:51:03 2009 (r197717) @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.295 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.296 2009/05/25 06:48:00 andreas Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1653,6 +1653,7 @@ channel_handle_wfd(Channel *c, fd_set *r } return -1; } +#ifndef BROKEN_TCGETATTR_ICANON if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') { if (tcgetattr(c->wfd, &tio) == 0 && !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) { @@ -1666,6 +1667,7 @@ channel_handle_wfd(Channel *c, fd_set *r packet_send(); } } +#endif buffer_consume(&c->output, len); if (compat20 && len > 0) { c->local_consumed += len; @@ -2431,7 +2433,7 @@ channel_input_status_confirm(int type, u int id; /* Reset keepalive timeout */ - keep_alive_timeouts = 0; + packet_set_alive_timeouts(0); id = packet_get_int(); packet_check_eom(); Modified: projects/mips/crypto/openssh/clientloop.c ============================================================================== --- projects/mips/crypto/openssh/clientloop.c Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/clientloop.c Fri Oct 2 19:51:03 2009 (r197717) @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.209 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -109,6 +109,7 @@ #include "misc.h" #include "match.h" #include "msg.h" +#include "roaming.h" /* import options */ extern Options options; @@ -491,13 +492,13 @@ client_global_request_reply(int type, u_ xfree(gc); } - keep_alive_timeouts = 0; + packet_set_alive_timeouts(0); } static void server_alive_check(void) { - if (++keep_alive_timeouts > options.server_alive_count_max) { + if (packet_inc_alive_timeouts() > options.server_alive_count_max) { logit("Timeout, server not responding."); cleanup_exit(255); } @@ -634,8 +635,8 @@ client_suspend_self(Buffer *bin, Buffer static void client_process_net_input(fd_set *readset) { - int len; - char buf[8192]; + int len, cont = 0; + char buf[SSH_IOBUFSZ]; /* * Read input from the server, and add any such data to the buffer of @@ -643,8 +644,8 @@ client_process_net_input(fd_set *readset */ if (FD_ISSET(connection_in, readset)) { /* Read as much as possible. */ - len = read(connection_in, buf, sizeof(buf)); - if (len == 0) { + len = roaming_read(connection_in, buf, sizeof(buf), &cont); + if (len == 0 && cont == 0) { /* * Received EOF. The remote host has closed the * connection. @@ -1128,7 +1129,7 @@ static void client_process_input(fd_set *readset) { int len; - char buf[8192]; + char buf[SSH_IOBUFSZ]; /* Read input from stdin. */ if (FD_ISSET(fileno(stdin), readset)) { @@ -1476,6 +1477,14 @@ client_loop(int have_pty, int escape_cha /* Stop watching for window change. */ signal(SIGWINCH, SIG_DFL); + if (compat20) { + packet_start(SSH2_MSG_DISCONNECT); + packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); + packet_put_cstring("disconnected by user"); + packet_send(); + packet_write_wait(); + } + channel_free_all(); if (have_pty) Modified: projects/mips/crypto/openssh/config.h ============================================================================== --- projects/mips/crypto/openssh/config.h Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/config.h Fri Oct 2 19:51:03 2009 (r197717) @@ -69,6 +69,9 @@ /* Define if your snprintf is busted */ /* #undef BROKEN_SNPRINTF */ +/* tcgetattr with ICANON may hang */ +/* #undef BROKEN_TCGETATTR_ICANON */ + /* updwtmpx is broken (if present) */ /* #undef BROKEN_UPDWTMPX */ @@ -123,9 +126,12 @@ /* Builtin PRNG command timeout */ #define ENTROPY_TIMEOUT_MSEC 200 -/* f_fsid has members */ +/* fsid_t has member val */ /* #undef FSID_HAS_VAL */ +/* fsid_t has member __val */ +/* #undef FSID_HAS___VAL */ + /* Define to 1 if the `getpgrp' function requires zero arguments. */ #define GETPGRP_VOID 1 @@ -519,6 +525,9 @@ /* Define to 1 if the system has the type `in_addr_t'. */ #define HAVE_IN_ADDR_T 1 +/* Define to 1 if the system has the type `in_port_t'. */ +#define HAVE_IN_PORT_T 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_LASTLOG_H */ @@ -1227,6 +1236,9 @@ /* Define if X11 doesn't support AF_UNIX sockets on that system */ /* #undef NO_X11_UNIX_SOCKETS */ +/* Define if EVP_DigestUpdate returns void */ +/* #undef OPENSSL_EVP_DIGESTUPDATE_VOID */ + /* libcrypto is missing AES 192 and 256 bit functions */ /* #undef OPENSSL_LOBOTOMISED_AES */ @@ -1310,6 +1322,9 @@ /* Use audit debugging module */ /* #undef SSH_AUDIT_EVENTS */ +/* Windows is sensitive to read buffer size */ +/* #undef SSH_IOBUFSZ */ + /* non-privileged user for privilege separation */ #define SSH_PRIVSEP_USER "sshd" @@ -1398,9 +1413,13 @@ /* Define if you want SELinux support. */ /* #undef WITH_SELINUX */ -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ +#if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +#elif ! defined __LITTLE_ENDIAN__ +/* # undef WORDS_BIGENDIAN */ +#endif /* Define if xauth is found in your path */ /* #undef XAUTH_PATH */ Modified: projects/mips/crypto/openssh/config.h.in ============================================================================== --- projects/mips/crypto/openssh/config.h.in Fri Oct 2 18:33:40 2009 (r197716) +++ projects/mips/crypto/openssh/config.h.in Fri Oct 2 19:51:03 2009 (r197717) @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Oct 2 23:48:42 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2EEB106566B; Fri, 2 Oct 2009 23:48:42 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B019D8FC1E; Fri, 2 Oct 2009 23:48:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n92NmgY4017502; Fri, 2 Oct 2009 23:48:42 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n92Nmgou017491; Fri, 2 Oct 2009 23:48:42 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200910022348.n92Nmgou017491@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Fri, 2 Oct 2009 23:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197723 - in projects/mips: etc/rc.d share/colldef share/mklocale share/monetdef share/msgdef share/timedef sys/dev/drm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2009 23:48:42 -0000 Author: gonzo Date: Fri Oct 2 23:48:42 2009 New Revision: 197723 URL: http://svn.freebsd.org/changeset/base/197723 Log: - Fix the problem presented by r196988. svn merge was erroneously interrupted and after re-run new files were not added to repo though respective revisions were marked as merged. This commit presents latest versions of these files. Added: projects/mips/etc/rc.d/static_arp projects/mips/share/colldef/la_LN.ISO8859-13.src projects/mips/share/mklocale/la_LN.ISO8859-13.src projects/mips/share/monetdef/lv_LV.ISO8859-13.src projects/mips/share/msgdef/lv_LV.ISO8859-13.src projects/mips/share/msgdef/lv_LV.UTF-8.src projects/mips/share/timedef/lv_LV.ISO8859-13.src projects/mips/share/timedef/lv_LV.UTF-8.src projects/mips/sys/dev/drm/r600_blit.c projects/mips/sys/dev/drm/radeon_cs.c Added: projects/mips/etc/rc.d/static_arp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/etc/rc.d/static_arp Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,74 @@ +#!/bin/sh +# +# Copyright (c) 2009 Xin LI +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# Configure static ARP table +# +# $FreeBSD$ +# + +# PROVIDE: static_arp +# REQUIRE: netif +# KEYWORD: nojail + +. /etc/rc.subr +. /etc/network.subr + +name="static_arp" +start_cmd="static_arp_start" +stop_cmd="static_arp_stop" + +static_arp_start() +{ + local e arp_args + + if [ -n "${static_arp_pairs}" ]; then + echo -n 'Binding static ARP pair(s):' + for e in ${static_arp_pairs}; do + echo -n " ${e}" + eval arp_args=\$static_arp_${e} + arp -S ${arp_args} >/dev/null 2>&1 + done + echo '.' + fi +} + +static_arp_stop() +{ + local e arp_args + + if [ -n "${static_arp_pairs}" ]; then + echo -n 'Unbinding static ARP pair(s):' + for e in ${static_arp_pairs}; do + echo -n " ${e}" + eval arp_args=\$static_arp_${e} + arp -d ${arp_args%%[ ]*} > /dev/null 2>&1 + done + echo '.' + fi +} + +load_rc_config $name +run_rc_command "$1" Added: projects/mips/share/colldef/la_LN.ISO8859-13.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/share/colldef/la_LN.ISO8859-13.src Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,37 @@ +# Latin-7 / Baltic Rim (backward compatible with ASCII) +# +# $FreeBSD$ +# +charmap map.ISO8859-13 +order \ +# controls + ;...;;;...;;\ +# + ;;!;\";<"">;;\ + ;;;;\ + %;&;';\(;\);*;+;<-:>;<*X>;<.M>;\,;<,,>;<``>;<-->;<+->;-;.;<'.>;/;\ +# digits + 0;...;9;\ +# + :;\;;\<;=;>;<<<>;/>>;?;;;;\ +# capital + (A,,,,,);\ + B;(C,,);D;(E,,,,);\ + F;(G,);H;(I,,);Y;\ + J;(K,);(L,,);M;(N,,);(O,,,,,);\ + P;Q;(R,);(S,,);T;\ + (U,,,);\ + V;W;X;(Z,,,);\ +# + [;\\;];^;_;`;\ +# small + (a,,,,,);\ + b;(c,,);d;(e,,,,);\ + f;(g,);h;(i,,);y;\ + j;(k,);(l,,);m;(n,,);(o,,,,,);\ + p;q;(r,);(s,,,);t;\ + (u,,,);\ + v;w;x;(z,,,);\ +# + \{;|;;\};~;;
;;;;;<1S>;<2S>;<3S>;\ + <14>;<12>;<34> Added: projects/mips/share/mklocale/la_LN.ISO8859-13.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/share/mklocale/la_LN.ISO8859-13.src Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,49 @@ +/* + * LOCALE_CTYPE for the iso_8859_13 Locale + * + * $FreeBSD$ + */ + +ENCODING "NONE" +VARIABLE ISO 8859-13 Latin-7 character set + +# +# This is a comment +# +ALPHA 'A' - 'Z' 'a' - 'z' +ALPHA 0xaa 0xba 0xc0 - 0xd6 0xd8 - 0xde 0xe0 - 0xf6 0xf8 - 0xfe +CONTROL 0x00 - 0x1f 0x7f - 0x9f +DIGIT '0' - '9' +GRAPH 0x21 - 0x7e 0xa1 - 0xff +LOWER 'a' - 'z' +LOWER 0xba 0xdf - 0xf6 0xf8 - 0xfe +PUNCT 0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e +PUNCT 0xa1 - 0xa9 0xab - 0xb9 0xbb -0xbf 0xd7 0xdf 0xf7 0xff +SPACE 0x09 - 0x0d 0x20 0xa0 +UPPER 'A' - 'Z' +UPPER 0xaa 0xc0 - 0xd6 0xd8 - 0xde +XDIGIT '0' - '9' 'a' - 'f' 'A' - 'F' +BLANK ' ' '\t' 0xa0 +PRINT 0x20 - 0x7e 0xa0 - 0xff + +MAPLOWER <'A' - 'Z' : 'a'> +MAPLOWER <'a' - 'z' : 'a'> +MAPLOWER <0xaa 0xba> +MAPLOWER <0xba 0xba> +MAPLOWER <0xc0 - 0xd6 : 0xe0> +MAPLOWER <0xd8 - 0xde : 0xf8> +MAPLOWER <0xe0 - 0xf6 : 0xe0> +MAPLOWER <0xf8 - 0xfe : 0xf8> + +MAPUPPER <'A' - 'Z' : 'A'> +MAPUPPER <'a' - 'z' : 'A'> +MAPUPPER <0xaa 0xaa> +MAPUPPER <0xba 0xaa> +MAPUPPER <0xc0 - 0xd6 : 0xc0> +MAPUPPER <0xd8 - 0xdf : 0xd8> +MAPUPPER <0xe0 - 0xf6 : 0xc0> +MAPUPPER <0xf8 - 0xfe : 0xd8> + +TODIGIT <'0' - '9' : 0> +TODIGIT <'A' - 'F' : 10> +TODIGIT <'a' - 'f' : 10> Added: projects/mips/share/monetdef/lv_LV.ISO8859-13.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/share/monetdef/lv_LV.ISO8859-13.src Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,36 @@ +# $FreeBSD$ +# +# WARNING: spaces may be essential at the end of lines +# WARNING: empty lines are essential too +# +# int_curr_symbol (last character always SPACE) +LVL +# currency_symbol +Ls +# mon_decimal_point +, +# mon_thousands_sep + +# mon_grouping, separated by ; +3;3 +# positive_sign + +# negative_sign +- +# int_frac_digits +2 +# frac_digits +2 +# p_cs_precedes +0 +# p_sep_by_space +1 +# n_cs_precedes +0 +# n_sep_by_space +1 +# p_sign_posn +1 +# n_sign_posn +1 +# EOF Added: projects/mips/share/msgdef/lv_LV.ISO8859-13.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/share/msgdef/lv_LV.ISO8859-13.src Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,14 @@ +# $FreeBSD$ +# +# WARNING: spaces may be essential at the end of lines +# WARNING: empty lines are essential too +# +# yesexpr +^[jJyY].* +# noexpr +^[nN].* +# yesstr +jā +# nostr +nē +# EOF Added: projects/mips/share/msgdef/lv_LV.UTF-8.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/share/msgdef/lv_LV.UTF-8.src Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,14 @@ +# $FreeBSD$ +# +# WARNING: spaces may be essential at the end of lines +# WARNING: empty lines are essential too +# +# yesexpr +^[jJyY].* +# noexpr +^[nN].* +# yesstr +jā +# nostr +nē +# EOF Added: projects/mips/share/timedef/lv_LV.ISO8859-13.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/share/timedef/lv_LV.ISO8859-13.src Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,101 @@ +# $FreeBSD$ +# WARNING: spaces may be essential at the end of lines +# WARNING: empty lines are essential too +# +# Short month names +# +Jan +Feb +Mar +Apr +Mai +Jūn +Jūl +Aug +Sep +Okt +Nov +Dec +# +# Long month names +# +janvāris +februāris +marts +aprīlis +maijs +jūnijs +jūlijs +augusts +septembris +oktobris +novembris +decembris +# +# Short weekday names +# +Sv +Pr +Ot +Tr +Ct +Pk +Ss +# +# Long weekday names +# +Svētdiena +Pirmdiena +Otrdiena +Trešdiena +Ceturtdiena +Piektdiena +Sestdiena +# +# X_fmt +# +%H:%M:%S +# +# x_fmt +# +%d/%m/%Y +# +# c_fmt +# %A, %Y m. %B %e d. %T +%e. %b, %Y. gads %X +# +# am +# + +# +# pm +# + +# +# date_fmt +# +%A, %Y. gada %e. %B %T %Z +# +# Long month names in alternative form +# +janvāris +februāris +marts +aprīlis +maijs +jūnijs +jūlijs +augusts +septembris +oktobris +novembris +decembris +# +# md_order +# +md +# +# ampm_fmt +# + +# EOF Added: projects/mips/share/timedef/lv_LV.UTF-8.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/share/timedef/lv_LV.UTF-8.src Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,101 @@ +# $FreeBSD$ +# WARNING: spaces may be essential at the end of lines +# WARNING: empty lines are essential too +# +# Short month names +# +Jan +Feb +Mar +Apr +Mai +JÅ«n +JÅ«l +Aug +Sep +Okt +Nov +Dec +# +# Long month names +# +janvāris +februāris +marts +aprÄ«lis +maijs +jÅ«nijs +jÅ«lijs +augusts +septembris +oktobris +novembris +decembris +# +# Short weekday names +# +Sv +Pr +Ot +Tr +Ct +Pk +Ss +# +# Long weekday names +# +Svētdiena +Pirmdiena +Otrdiena +TreÅ”diena +Ceturtdiena +Piektdiena +Sestdiena +# +# X_fmt +# +%H:%M:%S +# +# x_fmt +# +%d/%m/%Y +# +# c_fmt +# %A, %Y m. %B %e d. %T +%e. %b, %Y. gads %X +# +# am +# + +# +# pm +# + +# +# date_fmt +# +%A, %Y. gada %e. %B %T %Z +# +# Long month names in alternative form +# +janvāris +februāris +marts +aprÄ«lis +maijs +jÅ«nijs +jÅ«lijs +augusts +septembris +oktobris +novembris +decembris +# +# md_order +# +md +# +# ampm_fmt +# + +# EOF Added: projects/mips/sys/dev/drm/r600_blit.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/dev/drm/r600_blit.c Fri Oct 2 23:48:42 2009 (r197723) @@ -0,0 +1,1990 @@ +/*- + * Copyright 2009 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Alex Deucher + */ + +#include +__FBSDID("$FreeBSD$"); + +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" +#include "dev/drm/radeon_drm.h" +#include "dev/drm/radeon_drv.h" + +static u32 r6xx_default_state[] = +{ + 0xc0002400, + 0x00000000, + 0xc0012800, + 0x80000000, + 0x80000000, + 0xc0004600, + 0x00000016, + 0xc0016800, + 0x00000010, + 0x00028000, + 0xc0016800, + 0x00000010, + 0x00008000, + 0xc0016800, + 0x00000542, + 0x07000003, + 0xc0016800, + 0x000005c5, + 0x00000000, + 0xc0016800, + 0x00000363, + 0x00000000, + 0xc0016800, + 0x0000060c, + 0x82000000, + 0xc0016800, + 0x0000060e, + 0x01020204, + 0xc0016f00, + 0x00000000, + 0x00000000, + 0xc0016f00, + 0x00000001, + 0x00000000, + 0xc0096900, + 0x0000022a, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0xc0016900, + 0x00000004, + 0x00000000, + 0xc0016900, + 0x0000000a, + 0x00000000, + 0xc0016900, + 0x0000000b, + 0x00000000, + 0xc0016900, + 0x0000010c, + 0x00000000, + 0xc0016900, + 0x0000010d, + 0x00000000, + 0xc0016900, + 0x00000200, + 0x00000000, + 0xc0016900, + 0x00000343, + 0x00000060, + 0xc0016900, + 0x00000344, + 0x00000040, + 0xc0016900, + 0x00000351, + 0x0000aa00, + 0xc0016900, + 0x00000104, + 0x00000000, + 0xc0016900, + 0x0000010e, + 0x00000000, + 0xc0046900, + 0x00000105, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0xc0036900, + 0x00000109, + 0x00000000, + 0x00000000, + 0x00000000, + 0xc0046900, + 0x0000030c, + 0x01000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0xc0046900, + 0x00000048, + 0x3f800000, + 0x00000000, + 0x3f800000, + 0x3f800000, + 0xc0016900, + 0x0000008e, + 0x0000000f, + 0xc0016900, + 0x00000080, + 0x00000000, + 0xc0016900, + 0x00000083, + 0x0000ffff, + 0xc0016900, + 0x00000084, + 0x00000000, + 0xc0016900, + 0x00000085, + 0x20002000, + 0xc0016900, + 0x00000086, + 0x00000000, + 0xc0016900, + 0x00000087, + 0x20002000, + 0xc0016900, + 0x00000088, + 0x00000000, + 0xc0016900, + 0x00000089, + 0x20002000, + 0xc0016900, + 0x0000008a, + 0x00000000, + 0xc0016900, + 0x0000008b, + 0x20002000, + 0xc0016900, + 0x0000008c, + 0x00000000, + 0xc0016900, + 0x00000094, + 0x80000000, + 0xc0016900, + 0x00000095, + 0x20002000, + 0xc0026900, + 0x000000b4, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x00000096, + 0x80000000, + 0xc0016900, + 0x00000097, + 0x20002000, + 0xc0026900, + 0x000000b6, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x00000098, + 0x80000000, + 0xc0016900, + 0x00000099, + 0x20002000, + 0xc0026900, + 0x000000b8, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x0000009a, + 0x80000000, + 0xc0016900, + 0x0000009b, + 0x20002000, + 0xc0026900, + 0x000000ba, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x0000009c, + 0x80000000, + 0xc0016900, + 0x0000009d, + 0x20002000, + 0xc0026900, + 0x000000bc, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x0000009e, + 0x80000000, + 0xc0016900, + 0x0000009f, + 0x20002000, + 0xc0026900, + 0x000000be, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000a0, + 0x80000000, + 0xc0016900, + 0x000000a1, + 0x20002000, + 0xc0026900, + 0x000000c0, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000a2, + 0x80000000, + 0xc0016900, + 0x000000a3, + 0x20002000, + 0xc0026900, + 0x000000c2, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000a4, + 0x80000000, + 0xc0016900, + 0x000000a5, + 0x20002000, + 0xc0026900, + 0x000000c4, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000a6, + 0x80000000, + 0xc0016900, + 0x000000a7, + 0x20002000, + 0xc0026900, + 0x000000c6, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000a8, + 0x80000000, + 0xc0016900, + 0x000000a9, + 0x20002000, + 0xc0026900, + 0x000000c8, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000aa, + 0x80000000, + 0xc0016900, + 0x000000ab, + 0x20002000, + 0xc0026900, + 0x000000ca, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000ac, + 0x80000000, + 0xc0016900, + 0x000000ad, + 0x20002000, + 0xc0026900, + 0x000000cc, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000ae, + 0x80000000, + 0xc0016900, + 0x000000af, + 0x20002000, + 0xc0026900, + 0x000000ce, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000b0, + 0x80000000, + 0xc0016900, + 0x000000b1, + 0x20002000, + 0xc0026900, + 0x000000d0, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x000000b2, + 0x80000000, + 0xc0016900, + 0x000000b3, + 0x20002000, + 0xc0026900, + 0x000000d2, + 0x00000000, + 0x3f800000, + 0xc0016900, + 0x00000293, + 0x00004010, + 0xc0016900, + 0x00000300, + 0x00000000, + 0xc0016900, + 0x00000301, + 0x00000000, + 0xc0016900, + 0x00000312, + 0xffffffff, + 0xc0016900, + 0x00000307, + 0x00000000, + 0xc0016900, + 0x00000308, + 0x00000000, + 0xc0016900, + 0x00000283, + 0x00000000, + 0xc0016900, + 0x00000292, + 0x00000000, + 0xc0066900, + 0x0000010f, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0xc0016900, + 0x00000206, + 0x00000000, + 0xc0016900, + 0x00000207, + 0x00000000, + 0xc0016900, + 0x00000208, + 0x00000000, + 0xc0046900, + 0x00000303, + 0x3f800000, + 0x3f800000, + 0x3f800000, + 0x3f800000, + 0xc0016900, + 0x00000205, + 0x00000004, + 0xc0016900, + 0x00000280, + 0x00000000, + 0xc0016900, + 0x00000281, + 0x00000000, + 0xc0016900, + 0x0000037e, + 0x00000000, + 0xc0016900, + 0x00000382, + 0x00000000, + 0xc0016900, + 0x00000380, + 0x00000000, + 0xc0016900, + 0x00000383, + 0x00000000, + 0xc0016900, + 0x00000381, + 0x00000000, + 0xc0016900, + 0x00000282, + 0x00000008, + 0xc0016900, + 0x00000302, + 0x0000002d, + 0xc0016900, + 0x0000037f, + 0x00000000, + 0xc0016900, + 0x000001b2, + 0x00000000, + 0xc0016900, + 0x000001b6, + 0x00000000, + 0xc0016900, + 0x000001b7, + 0x00000000, + 0xc0016900, + 0x000001b8, + 0x00000000, + 0xc0016900, + 0x000001b9, + 0x00000000, + 0xc0016900, + 0x00000225, + 0x00000000, + 0xc0016900, + 0x00000229, + 0x00000000, + 0xc0016900, + 0x00000237, + 0x00000000, + 0xc0016900, + 0x00000100, + 0x00000800, + 0xc0016900, + 0x00000101, + 0x00000000, + 0xc0016900, + 0x00000102, + 0x00000000, + 0xc0016900, + 0x000002a8, + 0x00000000, + 0xc0016900, + 0x000002a9, + 0x00000000, + 0xc0016900, + 0x00000103, + 0x00000000, + 0xc0016900, + 0x00000284, + 0x00000000, + 0xc0016900, + 0x00000290, + 0x00000000, + 0xc0016900, + 0x00000285, + 0x00000000, + 0xc0016900, + 0x00000286, + 0x00000000, + 0xc0016900, + 0x00000287, + 0x00000000, + 0xc0016900, + 0x00000288, + 0x00000000, + 0xc0016900, + 0x00000289, + 0x00000000, + 0xc0016900, + 0x0000028a, + 0x00000000, + 0xc0016900, + 0x0000028b, + 0x00000000, + 0xc0016900, + 0x0000028c, + 0x00000000, + 0xc0016900, + 0x0000028d, + 0x00000000, + 0xc0016900, + 0x0000028e, + 0x00000000, + 0xc0016900, + 0x0000028f, + 0x00000000, + 0xc0016900, + 0x000002a1, + 0x00000000, + 0xc0016900, + 0x000002a5, + 0x00000000, + 0xc0016900, + 0x000002ac, + 0x00000000, + 0xc0016900, + 0x000002ad, + 0x00000000, + 0xc0016900, + 0x000002ae, + 0x00000000, + 0xc0016900, + 0x000002c8, + 0x00000000, + 0xc0016900, + 0x00000206, + 0x00000100, + 0xc0016900, + 0x00000204, + 0x00010000, + 0xc0036e00, + 0x00000000, + 0x00000012, + 0x00000000, + 0x00000000, + 0xc0016900, + 0x0000008f, + 0x0000000f, + 0xc0016900, + 0x000001e8, + 0x00000001, + 0xc0016900, + 0x00000202, + 0x00cc0000, + 0xc0016900, + 0x00000205, + 0x00000244, + 0xc0016900, + 0x00000203, + 0x00000210, + 0xc0016900, + 0x000001b1, + 0x00000000, + 0xc0016900, + 0x00000185, + 0x00000000, + 0xc0016900, + 0x000001b3, + 0x00000001, *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***