From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 05:42:15 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6B29A1C; Mon, 27 Apr 2015 05:42:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9482F1161; Mon, 27 Apr 2015 05:42:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R5gF4E022762; Mon, 27 Apr 2015 05:42:15 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R5gFdN022761; Mon, 27 Apr 2015 05:42:15 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504270542.t3R5gFdN022761@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 27 Apr 2015 05:42:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282050 - stable/10/sys/contrib/x86emu X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 05:42:15 -0000 Author: delphij Date: Mon Apr 27 05:42:14 2015 New Revision: 282050 URL: https://svnweb.freebsd.org/changeset/base/282050 Log: MFC r281502: Sync with OpenBSD: Use volatile instead of __volatile__. Modified: stable/10/sys/contrib/x86emu/x86emu.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/contrib/x86emu/x86emu.c ============================================================================== --- stable/10/sys/contrib/x86emu/x86emu.c Mon Apr 27 01:36:16 2015 (r282049) +++ stable/10/sys/contrib/x86emu/x86emu.c Mon Apr 27 05:42:14 2015 (r282050) @@ -1,4 +1,4 @@ -/* $OpenBSD: x86emu.c,v 1.5 2010/02/17 15:09:47 pirofti Exp $ */ +/* $OpenBSD: x86emu.c,v 1.9 2014/06/15 11:04:49 pirofti Exp $ */ /* $NetBSD: x86emu.c,v 1.7 2009/02/03 19:26:29 joerg Exp $ */ /* @@ -5250,7 +5250,7 @@ x86emuOp2_pop_FS(struct x86emu *emu) static void hw_cpuid(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) { - __asm__ __volatile__("cpuid" + __asm__ volatile("cpuid" : "=a" (*a), "=b" (*b), "=c" (*c), "=d" (*d) : "a" (*a), "c" (*c) From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 05:49:19 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 344B8E0C; Mon, 27 Apr 2015 05:49:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 221FF11B0; Mon, 27 Apr 2015 05:49:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R5nJuL024031; Mon, 27 Apr 2015 05:49:19 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R5nItW024027; Mon, 27 Apr 2015 05:49:18 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504270549.t3R5nItW024027@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 27 Apr 2015 05:49:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282052 - stable/10/usr.bin/gzip X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 05:49:19 -0000 Author: delphij Date: Mon Apr 27 05:49:18 2015 New Revision: 282052 URL: https://svnweb.freebsd.org/changeset/base/282052 Log: MFC r281500,281540,281626: Sync with NetBSD: - Mention xz(1) in gzip(1). - Strip away path from header name when decompressing. Modified: stable/10/usr.bin/gzip/gzip.1 stable/10/usr.bin/gzip/gzip.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/gzip/gzip.1 ============================================================================== --- stable/10/usr.bin/gzip/gzip.1 Mon Apr 27 05:44:09 2015 (r282051) +++ stable/10/usr.bin/gzip/gzip.1 Mon Apr 27 05:49:18 2015 (r282052) @@ -1,4 +1,4 @@ -.\" $NetBSD: gzip.1,v 1.23 2014/03/18 18:20:45 riastradh Exp $ +.\" $NetBSD: gzip.1,v 1.25 2015/04/06 21:41:17 wiz Exp $ .\" .\" Copyright (c) 1997, 2003, 2004 Matthew R. Green .\" All rights reserved. @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd October 9, 2011 +.Dd April 6, 2015 .Dt GZIP 1 .Os .Sh NAME @@ -105,9 +105,10 @@ options are enabled. This version of .Nm is also capable of decompressing files compressed using -.Xr compress 1 +.Xr compress 1 , +.Xr bzip2 1 , or -.Xr bzip2 1 . +.Xr xz 1 . .Sh OPTIONS The following options are available: .Bl -tag -width XXrXXXrecursiveX Modified: stable/10/usr.bin/gzip/gzip.c ============================================================================== --- stable/10/usr.bin/gzip/gzip.c Mon Apr 27 05:44:09 2015 (r282051) +++ stable/10/usr.bin/gzip/gzip.c Mon Apr 27 05:49:18 2015 (r282052) @@ -1,4 +1,4 @@ -/* $NetBSD: gzip.c,v 1.106 2014/10/18 08:33:30 snj Exp $ */ +/* $NetBSD: gzip.c,v 1.108 2015/04/15 02:29:12 christos Exp $ */ /*- * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green @@ -158,7 +158,7 @@ static suffixes_t suffixes[] = { #define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0]) #define SUFFIX_MAXLEN 30 -static const char gzip_version[] = "FreeBSD gzip 20141022"; +static const char gzip_version[] = "FreeBSD gzip 20150413"; #ifndef SMALL static const char gzip_copyright[] = \ @@ -1354,7 +1354,7 @@ file_uncompress(char *file, char *outfil #ifndef SMALL ssize_t rv; time_t timestamp = 0; - unsigned char name[PATH_MAX + 1]; + char name[PATH_MAX + 1]; #endif /* gather the old name info */ @@ -1409,21 +1409,33 @@ file_uncompress(char *file, char *outfil timestamp = ts[3] << 24 | ts[2] << 16 | ts[1] << 8 | ts[0]; if (header1[3] & ORIG_NAME) { - rbytes = pread(fd, name, sizeof name, GZIP_ORIGNAME); + rbytes = pread(fd, name, sizeof(name) - 1, GZIP_ORIGNAME); if (rbytes < 0) { maybe_warn("can't read %s", file); goto lose; } - if (name[0] != 0) { + if (name[0] != '\0') { + char *dp, *nf; + + /* Make sure that name is NUL-terminated */ + name[rbytes] = '\0'; + + /* strip saved directory name */ + nf = strrchr(name, '/'); + if (nf == NULL) + nf = name; + else + nf++; + /* preserve original directory name */ - char *dp = strrchr(file, '/'); + dp = strrchr(file, '/'); if (dp == NULL) dp = file; else dp++; snprintf(outfile, outsize, "%.*s%.*s", (int) (dp - file), - file, (int) rbytes, name); + file, (int) rbytes, nf); } } } @@ -2110,7 +2122,7 @@ static void display_license(void) { - fprintf(stderr, "%s (based on NetBSD gzip 20141018)\n", gzip_version); + fprintf(stderr, "%s (based on NetBSD gzip 20150113)\n", gzip_version); fprintf(stderr, "%s\n", gzip_copyright); exit(0); } From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 06:02:49 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C66DD105; Mon, 27 Apr 2015 06:02:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2F671359; Mon, 27 Apr 2015 06:02:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R62nmx033092; Mon, 27 Apr 2015 06:02:49 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R62lAg033082; Mon, 27 Apr 2015 06:02:47 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504270602.t3R62lAg033082@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 27 Apr 2015 06:02:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282053 - stable/9/usr.bin/gzip X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 06:02:49 -0000 Author: delphij Date: Mon Apr 27 06:02:47 2015 New Revision: 282053 URL: https://svnweb.freebsd.org/changeset/base/282053 Log: MFC r222211,r222287,r225845,r226184,r226418,r236596,r267773,r267887,r273507, r281500,r281540,r281626: Sync with HEAD: xz support, bug fixes, etc. Added: stable/9/usr.bin/gzip/unxz.c - copied, changed from r226184, head/usr.bin/gzip/unxz.c Modified: stable/9/usr.bin/gzip/Makefile stable/9/usr.bin/gzip/gzip.1 stable/9/usr.bin/gzip/gzip.c stable/9/usr.bin/gzip/zmore stable/9/usr.bin/gzip/zmore.1 stable/9/usr.bin/gzip/zuncompress.c Directory Properties: stable/9/usr.bin/gzip/ (props changed) Modified: stable/9/usr.bin/gzip/Makefile ============================================================================== --- stable/9/usr.bin/gzip/Makefile Mon Apr 27 05:49:18 2015 (r282052) +++ stable/9/usr.bin/gzip/Makefile Mon Apr 27 06:02:47 2015 (r282053) @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/04/14 22:15:20 lukem Exp $ +# $NetBSD: Makefile,v 1.18 2013/11/13 11:12:24 pettai Exp $ # $FreeBSD$ .include @@ -6,8 +6,8 @@ PROG= gzip MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1 -DPADD= ${LIBZ} -LDADD= -lz +DPADD= ${LIBZ} ${LIBLZMA} +LDADD= -lz -llzma .if ${MK_BZIP2_SUPPORT} != "no" DPADD+= ${LIBBZ2} @@ -21,7 +21,8 @@ SCRIPTS= gzexe zdiff zforce zmore znew MLINKS+= gzip.1 gunzip.1 \ gzip.1 gzcat.1 \ gzip.1 zcat.1 \ - zdiff.1 zcmp.1 + zdiff.1 zcmp.1 \ + zmore.1 zless.1 LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip \ ${BINDIR}/gzip ${BINDIR}/gzcat \ Modified: stable/9/usr.bin/gzip/gzip.1 ============================================================================== --- stable/9/usr.bin/gzip/gzip.1 Mon Apr 27 05:49:18 2015 (r282052) +++ stable/9/usr.bin/gzip/gzip.1 Mon Apr 27 06:02:47 2015 (r282053) @@ -1,4 +1,4 @@ -.\" $NetBSD: gzip.1,v 1.20 2009/04/01 08:15:37 mrg Exp $ +.\" $NetBSD: gzip.1,v 1.25 2015/04/06 21:41:17 wiz Exp $ .\" .\" Copyright (c) 1997, 2003, 2004 Matthew R. Green .\" All rights reserved. @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd May 23, 2011 +.Dd April 6, 2015 .Dt GZIP 1 .Os .Sh NAME @@ -105,9 +105,10 @@ options are enabled. This version of .Nm is also capable of decompressing files compressed using -.Xr compress 1 +.Xr compress 1 , +.Xr bzip2 1 , or -.Xr bzip2 1 . +.Xr xz 1 . .Sh OPTIONS The following options are available: .Bl -tag -width XXrXXXrecursiveX @@ -185,6 +186,7 @@ Options on the command line will overrid .Sh SEE ALSO .Xr bzip2 1 , .Xr compress 1 , +.Xr xz 1 , .Xr fts 3 , .Xr zlib 3 .Sh HISTORY @@ -213,9 +215,9 @@ and first appeared in This implementation of .Nm was written by -.An Matthew R. Green Aq mrg@eterna.com.au +.An Matthew R. Green Aq Mt mrg@eterna.com.au with unpack support written by -.An Xin LI Aq delphij@FreeBSD.org . +.An Xin LI Aq Mt delphij@FreeBSD.org . .Sh BUGS According to RFC 1952, the recorded file size is stored in a 32-bit integer, therefore, it can not represent files larger than 4GB. Modified: stable/9/usr.bin/gzip/gzip.c ============================================================================== --- stable/9/usr.bin/gzip/gzip.c Mon Apr 27 05:49:18 2015 (r282052) +++ stable/9/usr.bin/gzip/gzip.c Mon Apr 27 06:02:47 2015 (r282053) @@ -1,4 +1,4 @@ -/* $NetBSD: gzip.c,v 1.99 2011/03/23 12:59:44 tsutsui Exp $ */ +/* $NetBSD: gzip.c,v 1.108 2015/04/15 02:29:12 christos Exp $ */ /*- * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green @@ -77,6 +77,9 @@ enum filetype { #ifndef NO_PACK_SUPPORT FT_PACK, #endif +#ifndef NO_XZ_SUPPORT + FT_XZ, +#endif FT_LAST, FT_UNKNOWN }; @@ -97,6 +100,12 @@ enum filetype { #define PACK_MAGIC "\037\036" #endif +#ifndef NO_XZ_SUPPORT +#include +#define XZ_SUFFIX ".xz" +#define XZ_MAGIC "\3757zXZ" +#endif + #define GZ_SUFFIX ".gz" #define BUFLEN (64 * 1024) @@ -139,6 +148,9 @@ static suffixes_t suffixes[] = { #ifndef NO_COMPRESS_SUPPORT SUFFIX(Z_SUFFIX, ""), #endif +#ifndef NO_XZ_SUPPORT + SUFFIX(XZ_SUFFIX, ""), +#endif SUFFIX(GZ_SUFFIX, ""), /* Overwritten by -S "" */ #endif /* SMALL */ #undef SUFFIX @@ -146,7 +158,7 @@ static suffixes_t suffixes[] = { #define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0]) #define SUFFIX_MAXLEN 30 -static const char gzip_version[] = "FreeBSD gzip 20110523"; +static const char gzip_version[] = "FreeBSD gzip 20150413"; #ifndef SMALL static const char gzip_copyright[] = \ @@ -199,16 +211,13 @@ static int exit_value = 0; /* exit valu static char *infile; /* name of file coming in */ -static void maybe_err(const char *fmt, ...) __dead2 - __attribute__((__format__(__printf__, 1, 2))); -#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT) -static void maybe_errx(const char *fmt, ...) __dead2 - __attribute__((__format__(__printf__, 1, 2))); -#endif -static void maybe_warn(const char *fmt, ...) - __attribute__((__format__(__printf__, 1, 2))); -static void maybe_warnx(const char *fmt, ...) - __attribute__((__format__(__printf__, 1, 2))); +static void maybe_err(const char *fmt, ...) __printflike(1, 2) __dead2; +#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT) || \ + !defined(NO_XZ_SUPPORT) +static void maybe_errx(const char *fmt, ...) __printflike(1, 2) __dead2; +#endif +static void maybe_warn(const char *fmt, ...) __printflike(1, 2); +static void maybe_warnx(const char *fmt, ...) __printflike(1, 2); static enum filetype file_gettype(u_char *); #ifdef SMALL #define gz_compress(if, of, sz, fn, tm) gz_compress(if, of, sz) @@ -223,8 +232,8 @@ static void handle_stdin(void); static void handle_stdout(void); static void print_ratio(off_t, off_t, FILE *); static void print_list(int fd, off_t, const char *, time_t); -static void usage(void); -static void display_version(void); +static void usage(void) __dead2; +static void display_version(void) __dead2; #ifndef SMALL static void display_license(void); static void sigint_handler(int); @@ -257,7 +266,9 @@ static off_t zuncompress(FILE *, FILE *, static off_t unpack(int, int, char *, size_t, off_t *); #endif -int main(int, char **p); +#ifndef NO_XZ_SUPPORT +static off_t unxz(int, int, char *, size_t, off_t *); +#endif #ifdef SMALL #define getopt_long(a,b,c,d,e) getopt(a,b,c) @@ -456,7 +467,8 @@ maybe_err(const char *fmt, ...) exit(2); } -#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT) +#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT) || \ + !defined(NO_XZ_SUPPORT) /* ... without an errno. */ void maybe_errx(const char *fmt, ...) @@ -1122,6 +1134,11 @@ file_gettype(u_char *buf) return FT_PACK; else #endif +#ifndef NO_XZ_SUPPORT + if (memcmp(buf, XZ_MAGIC, 4) == 0) /* XXX: We only have 4 bytes */ + return FT_XZ; + else +#endif return FT_UNKNOWN; } @@ -1337,7 +1354,7 @@ file_uncompress(char *file, char *outfil #ifndef SMALL ssize_t rv; time_t timestamp = 0; - unsigned char name[PATH_MAX + 1]; + char name[PATH_MAX + 1]; #endif /* gather the old name info */ @@ -1369,7 +1386,6 @@ file_uncompress(char *file, char *outfil } method = file_gettype(header1); - #ifndef SMALL if (fflag == 0 && method == FT_UNKNOWN) { maybe_warnx("%s: not in gzip format", file); @@ -1393,21 +1409,33 @@ file_uncompress(char *file, char *outfil timestamp = ts[3] << 24 | ts[2] << 16 | ts[1] << 8 | ts[0]; if (header1[3] & ORIG_NAME) { - rbytes = pread(fd, name, sizeof name, GZIP_ORIGNAME); + rbytes = pread(fd, name, sizeof(name) - 1, GZIP_ORIGNAME); if (rbytes < 0) { maybe_warn("can't read %s", file); goto lose; } - if (name[0] != 0) { + if (name[0] != '\0') { + char *dp, *nf; + + /* Make sure that name is NUL-terminated */ + name[rbytes] = '\0'; + + /* strip saved directory name */ + nf = strrchr(name, '/'); + if (nf == NULL) + nf = name; + else + nf++; + /* preserve original directory name */ - char *dp = strrchr(file, '/'); + dp = strrchr(file, '/'); if (dp == NULL) dp = file; else dp++; snprintf(outfile, outsize, "%.*s%.*s", (int) (dp - file), - file, (int) rbytes, name); + file, (int) rbytes, nf); } } } @@ -1447,9 +1475,9 @@ file_uncompress(char *file, char *outfil } else zfd = STDOUT_FILENO; + switch (method) { #ifndef NO_BZIP2_SUPPORT - if (method == FT_BZIP2) { - + case FT_BZIP2: /* XXX */ if (lflag) { maybe_warnx("no -l with bzip2 files"); @@ -1457,11 +1485,11 @@ file_uncompress(char *file, char *outfil } size = unbzip2(fd, zfd, NULL, 0, NULL); - } else + break; #endif #ifndef NO_COMPRESS_SUPPORT - if (method == FT_Z) { + case FT_Z: { FILE *in, *out; /* XXX */ @@ -1494,30 +1522,42 @@ file_uncompress(char *file, char *outfil unlink(outfile); goto lose; } - } else + break; + } #endif #ifndef NO_PACK_SUPPORT - if (method == FT_PACK) { + case FT_PACK: if (lflag) { maybe_warnx("no -l with packed files"); goto lose; } size = unpack(fd, zfd, NULL, 0, NULL); - } else + break; +#endif + +#ifndef NO_XZ_SUPPORT + case FT_XZ: + if (lflag) { + maybe_warnx("no -l with xz files"); + goto lose; + } + + size = unxz(fd, zfd, NULL, 0, NULL); + break; #endif #ifndef SMALL - if (method == FT_UNKNOWN) { + case FT_UNKNOWN: if (lflag) { maybe_warnx("no -l for unknown filetypes"); goto lose; } size = cat_fd(NULL, 0, NULL, fd); - } else + break; #endif - { + default: if (lflag) { print_list(fd, isb.st_size, outfile, isb.st_mtime); close(fd); @@ -1525,6 +1565,7 @@ file_uncompress(char *file, char *outfil } size = gz_uncompress(fd, zfd, NULL, 0, NULL, file); + break; } if (close(fd) != 0) @@ -1697,7 +1738,8 @@ handle_stdin(void) return; } - usize = zuncompress(in, stdout, (char *)header1, sizeof header1, &gsize); + usize = zuncompress(in, stdout, (char *)header1, + sizeof header1, &gsize); fclose(in); break; #endif @@ -1707,6 +1749,12 @@ handle_stdin(void) (char *)header1, sizeof header1, &gsize); break; #endif +#ifndef NO_XZ_SUPPORT + case FT_XZ: + usize = unxz(STDIN_FILENO, STDOUT_FILENO, + (char *)header1, sizeof header1, &gsize); + break; +#endif } #ifndef SMALL @@ -1733,7 +1781,7 @@ handle_stdout(void) return; } #endif - /* If stdin is a file use it's mtime, otherwise use current time */ + /* If stdin is a file use its mtime, otherwise use current time */ ret = fstat(STDIN_FILENO, &sb); #ifndef SMALL @@ -2074,7 +2122,7 @@ static void display_license(void) { - fprintf(stderr, "%s (based on NetBSD gzip 20091011)\n", gzip_version); + fprintf(stderr, "%s (based on NetBSD gzip 20150113)\n", gzip_version); fprintf(stderr, "%s\n", gzip_copyright); exit(0); } @@ -2098,6 +2146,9 @@ display_version(void) #ifndef NO_PACK_SUPPORT #include "unpack.c" #endif +#ifndef NO_XZ_SUPPORT +#include "unxz.c" +#endif static ssize_t read_retry(int fd, void *buf, size_t sz) Copied and modified: stable/9/usr.bin/gzip/unxz.c (from r226184, head/usr.bin/gzip/unxz.c) ============================================================================== --- head/usr.bin/gzip/unxz.c Mon Oct 10 06:37:32 2011 (r226184, copy source) +++ stable/9/usr.bin/gzip/unxz.c Mon Apr 27 06:02:47 2015 (r282053) @@ -15,13 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/9/usr.bin/gzip/zmore ============================================================================== --- stable/9/usr.bin/gzip/zmore Mon Apr 27 05:49:18 2015 (r282052) +++ stable/9/usr.bin/gzip/zmore Mon Apr 27 06:02:47 2015 (r282053) @@ -1,7 +1,8 @@ #!/bin/sh - # -# $NetBSD: zmore,v 1.3 2004/03/29 09:59:42 wiz Exp $ -# $OpenBSD: zmore,v 1.4 2003/07/29 07:42:45 otto Exp $ +# $NetBSD: zmore,v 1.5 2013/12/06 13:33:15 pettai Exp $ +# +# $OpenBSD: zmore,v 1.6 2008/08/20 09:22:02 mpf Exp $ # #- # Copyright (c) 2003 Todd C. Miller @@ -42,15 +43,21 @@ while test $# -ne 0; do esac done +if [ `basename $0` = "zless" ] ; then + pager=${PAGER-less} +else + pager=${PAGER-more} +fi + # No files means read from stdin if [ $# -eq 0 ]; then - gzip -cdfq 2>&1 | ${PAGER-more} $flags + gzip -cdfq 2>&1 | $pager $flags exit 0 fi oterm=`stty -g 2>/dev/null` while test $# -ne 0; do - gzip -cdfq "$1" 2>&1 | ${PAGER-more} $flags + gzip -cdfq "$1" 2>&1 | $pager $flags prev="$1" shift if tty -s && test -n "$oterm" -a $# -gt 0; then Modified: stable/9/usr.bin/gzip/zmore.1 ============================================================================== --- stable/9/usr.bin/gzip/zmore.1 Mon Apr 27 05:49:18 2015 (r282052) +++ stable/9/usr.bin/gzip/zmore.1 Mon Apr 27 06:02:47 2015 (r282053) @@ -1,5 +1,5 @@ -.\" $NetBSD: zmore.1,v 1.3 2003/12/28 12:47:52 wiz Exp $ -.\" $OpenBSD: zmore.1,v 1.3 2003/06/23 21:00:48 deraadt Exp $ +.\" $NetBSD: zmore.1,v 1.4 2013/11/12 21:58:37 pettai Exp $ +.\" $OpenBSD: zmore.1,v 1.10 2009/08/16 09:41:08 sobrado Exp $ .\" .\" Copyright (c) 2003 Todd C. Miller .\" @@ -20,16 +20,20 @@ .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" .\" $FreeBSD$ -.Dd February 6, 2011 +.Dd October 22, 2014 .Dt ZMORE 1 .Os .Sh NAME -.Nm zmore +.Nm zmore , +.Nm zless .Nd view compressed files .Sh SYNOPSIS .Nm zmore .Op Ar flags -.Op Ar file ... +.Op Ar +.Nm zless +.Op Ar flags +.Op Ar .Sh DESCRIPTION .Nm is a filter that allows the viewing of files compressed with Lempel-Ziv @@ -51,6 +55,14 @@ that are specified are passed to the use .Pa /usr/bin/more by default). .Pp +.Nm zless +is equivalent to +.Nm zmore +but uses +.Xr less 1 +as a pager instead of +.Xr more 1 . +.Pp When multiple files are specified, .Nm will pause at the end of each file and present the following prompt to the user: @@ -86,7 +98,11 @@ style compression since there is no suff Program used to display files. If unset, .Pa /usr/bin/more -is used. +is used +.Pq Nm zmore +or +.Pa /usr/bin/less +.Pq Nm zless . .El .Sh SEE ALSO .Xr compress 1 , Modified: stable/9/usr.bin/gzip/zuncompress.c ============================================================================== --- stable/9/usr.bin/gzip/zuncompress.c Mon Apr 27 05:49:18 2015 (r282052) +++ stable/9/usr.bin/gzip/zuncompress.c Mon Apr 27 06:02:47 2015 (r282053) @@ -1,4 +1,4 @@ -/* $NetBSD: zuncompress.c,v 1.8 2010/11/06 21:42:32 mrg Exp $ */ +/* $NetBSD: zuncompress.c,v 1.11 2011/08/16 13:55:02 joerg Exp $ */ /*- * Copyright (c) 1985, 1986, 1992, 1993 @@ -146,7 +146,7 @@ zuncompress(FILE *in, FILE *out, char *p else compressed_pre = NULL; - while ((bin = fread(buf, 1, sizeof(buf), in)) != 0) { + while ((bin = fread(buf, 1, BUFSIZE, in)) != 0) { if (tflag == 0 && (off_t)fwrite(buf, 1, bin, out) != bin) { free(buf); return -1; From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 08:02:17 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94D65CB9; Mon, 27 Apr 2015 08:02:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 81F5C1F6D; Mon, 27 Apr 2015 08:02:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R82HbM093587; Mon, 27 Apr 2015 08:02:17 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R82DL9093560; Mon, 27 Apr 2015 08:02:13 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201504270802.t3R82DL9093560@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 27 Apr 2015 08:02:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282065 - in stable/10/sys: conf i386/i386 i386/include x86/acpica X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 08:02:17 -0000 Author: kib Date: Mon Apr 27 08:02:12 2015 New Revision: 282065 URL: https://svnweb.freebsd.org/changeset/base/282065 Log: MFC r281495: Add config option PAE_TABLES for the i386 kernel. It switches pmap to use PAE format for the page tables, but does not incur other consequences of the full PAE config. In particular, vm_paddr_t and bus_addr_t are left 32bit, and max supported memory is still limited by 4GB. The option allows to have nx permissions for memory mappings on i386 kernel, while keeping the usual i386 KBI and avoiding the kernel data sizing problems typical for the PAE config. Modified: stable/10/sys/conf/options.i386 stable/10/sys/i386/i386/bios.c stable/10/sys/i386/i386/initcpu.c stable/10/sys/i386/i386/locore.s stable/10/sys/i386/i386/machdep.c stable/10/sys/i386/i386/minidump_machdep.c stable/10/sys/i386/i386/mpboot.s stable/10/sys/i386/i386/pmap.c stable/10/sys/i386/i386/swtch.s stable/10/sys/i386/i386/trap.c stable/10/sys/i386/i386/vm86bios.s stable/10/sys/i386/i386/vm_machdep.c stable/10/sys/i386/include/param.h stable/10/sys/i386/include/pmap.h stable/10/sys/i386/include/vmparam.h stable/10/sys/x86/acpica/acpi_wakeup.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/options.i386 ============================================================================== --- stable/10/sys/conf/options.i386 Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/conf/options.i386 Mon Apr 27 08:02:12 2015 (r282065) @@ -37,6 +37,11 @@ KVA_PAGES opt_global.h # Physical address extensions and support for >4G ram. As above. PAE opt_global.h +# Use PAE page tables, but limit memory support to 4GB. +# This keeps the i386 non-PAE KBI, in particular, drivers see +# 32bit vm_paddr_t. +PAE_TABLES opt_global.h + TIMER_FREQ opt_clock.h CPU_ATHLON_SSE_HACK opt_cpu.h Modified: stable/10/sys/i386/i386/bios.c ============================================================================== --- stable/10/sys/i386/i386/bios.c Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/bios.c Mon Apr 27 08:02:12 2015 (r282065) @@ -389,7 +389,7 @@ bios16(struct bios_args *args, char *fmt args->seg.code32.limit = 0xffff; ptd = (pd_entry_t *)rcr3(); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if (ptd == IdlePDPT) #else if (ptd == IdlePTD) Modified: stable/10/sys/i386/i386/initcpu.c ============================================================================== --- stable/10/sys/i386/i386/initcpu.c Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/initcpu.c Mon Apr 27 08:02:12 2015 (r282065) @@ -784,7 +784,7 @@ initializecpu(void) init_transmeta(); break; } -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if ((amd_feature & AMDID_NX) != 0) { uint64_t msr; Modified: stable/10/sys/i386/i386/locore.s ============================================================================== --- stable/10/sys/i386/i386/locore.s Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/locore.s Mon Apr 27 08:02:12 2015 (r282065) @@ -99,7 +99,7 @@ physfree: .long 0 /* phys addr of next .globl IdlePTD IdlePTD: .long 0 /* phys addr of kernel PTD */ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) .globl IdlePDPT IdlePDPT: .long 0 /* phys addr of kernel PDPT */ #endif @@ -281,7 +281,7 @@ NON_GPROF_ENTRY(btext) 1: /* Now enable paging */ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) movl R(IdlePDPT), %eax movl %eax, %cr3 movl %cr4, %eax @@ -722,7 +722,7 @@ no_kernend: movl %esi,R(KPTmap) /* Allocate Page Table Directory */ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) /* XXX only need 32 bytes (easier for now) */ ALLOCPAGES(1) movl %esi,R(IdlePDPT) @@ -788,7 +788,7 @@ no_kernend: fillkptphys($PG_RW) /* Map page directory. */ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) movl R(IdlePDPT), %eax movl $1, %ecx fillkptphys($PG_RW) @@ -890,7 +890,7 @@ done_pde: movl $NPGPTD,%ecx fillkpt(R(IdlePTD), $PG_RW) -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) movl R(IdlePTD), %eax xorl %ebx, %ebx movl $NPGPTD, %ecx Modified: stable/10/sys/i386/i386/machdep.c ============================================================================== --- stable/10/sys/i386/i386/machdep.c Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/machdep.c Mon Apr 27 08:02:12 2015 (r282065) @@ -3080,7 +3080,7 @@ init386(first) dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)]; dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 = dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) dblfault_tss.tss_cr3 = (int)IdlePDPT; #else dblfault_tss.tss_cr3 = (int)IdlePTD; @@ -3133,7 +3133,7 @@ init386(first) /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; #else thread0.td_pcb->pcb_cr3 = (int)IdlePTD; @@ -3385,7 +3385,7 @@ init386(first) dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)]; dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 = dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) dblfault_tss.tss_cr3 = (int)IdlePDPT; #else dblfault_tss.tss_cr3 = (int)IdlePTD; @@ -3457,7 +3457,7 @@ init386(first) /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; #else thread0.td_pcb->pcb_cr3 = (int)IdlePTD; Modified: stable/10/sys/i386/i386/minidump_machdep.c ============================================================================== --- stable/10/sys/i386/i386/minidump_machdep.c Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/minidump_machdep.c Mon Apr 27 08:02:12 2015 (r282065) @@ -265,7 +265,7 @@ minidumpsys(struct dumperinfo *di) mdhdr.bitmapsize = vm_page_dump_size; mdhdr.ptesize = ptesize; mdhdr.kernbase = KERNBASE; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) mdhdr.paemode = 1; #endif Modified: stable/10/sys/i386/i386/mpboot.s ============================================================================== --- stable/10/sys/i386/i386/mpboot.s Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/mpboot.s Mon Apr 27 08:02:12 2015 (r282065) @@ -99,7 +99,7 @@ NON_GPROF_ENTRY(MPentry) movl %eax,%cr4 /* Now enable paging mode */ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) movl R(IdlePDPT), %eax movl %eax, %cr3 movl %cr4, %eax Modified: stable/10/sys/i386/i386/pmap.c ============================================================================== --- stable/10/sys/i386/i386/pmap.c Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/pmap.c Mon Apr 27 08:02:12 2015 (r282065) @@ -214,7 +214,7 @@ vm_offset_t kernel_vm_end = KERNBASE + N extern u_int32_t KERNend; extern u_int32_t KPTphys; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) pt_entry_t pg_nx; static uma_zone_t pdptzone; #endif @@ -339,7 +339,7 @@ static void _pmap_unwire_ptp(pmap_t pmap static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va); static void pmap_pte_release(pt_entry_t *pte); static int pmap_unuse_pt(pmap_t, vm_offset_t, struct spglist *); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) static void *pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #endif static void pmap_set_pg(void); @@ -399,7 +399,7 @@ pmap_bootstrap(vm_paddr_t firstaddr) */ PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_pdir = (pd_entry_t *) (KERNBASE + (u_int)IdlePTD); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) kernel_pmap->pm_pdpt = (pdpt_entry_t *) (KERNBASE + (u_int)IdlePDPT); #endif CPU_FILL(&kernel_pmap->pm_active); /* don't allow deactivation */ @@ -656,7 +656,7 @@ pmap_page_init(vm_page_t m) m->md.pat_mode = PAT_WRITE_BACK; } -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) static void * pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { @@ -669,7 +669,7 @@ pmap_pdpt_allocf(uma_zone_t zone, int by #endif /* - * ABuse the pte nodes for unmapped kva to thread a kva freelist through. + * Abuse the pte nodes for unmapped kva to thread a kva freelist through. * Requirements: * - Must deal with pages in order to ensure that none of the PG_* bits * are ever set, PG_V in particular. @@ -808,7 +808,7 @@ pmap_init(void) if (pv_chunkbase == NULL) panic("pmap_init: not enough kvm for pv chunks"); pmap_ptelist_init(&pv_vafree, pv_chunkbase, pv_maxchunks); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) pdptzone = uma_zcreate("PDPT", NPGPTD * sizeof(pdpt_entry_t), NULL, NULL, NULL, NULL, (NPGPTD * sizeof(pdpt_entry_t)) - 1, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -1743,7 +1743,7 @@ pmap_pinit0(pmap_t pmap) * not need to be inserted into that list. */ pmap->pm_pdir = (pd_entry_t *)(KERNBASE + (vm_offset_t)IdlePTD); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) pmap->pm_pdpt = (pdpt_entry_t *)(KERNBASE + (vm_offset_t)IdlePDPT); #endif pmap->pm_root.rt_root = 0; @@ -1772,7 +1772,7 @@ pmap_pinit(pmap_t pmap) pmap->pm_pdir = (pd_entry_t *)kva_alloc(NBPTD); if (pmap->pm_pdir == NULL) return (0); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) pmap->pm_pdpt = uma_zalloc(pdptzone, M_WAITOK | M_ZERO); KASSERT(((vm_offset_t)pmap->pm_pdpt & ((NPGPTD * sizeof(pdpt_entry_t)) - 1)) == 0, @@ -1814,7 +1814,7 @@ pmap_pinit(pmap_t pmap) for (i = 0; i < NPGPTD; i++) { pa = VM_PAGE_TO_PHYS(ptdpg[i]); pmap->pm_pdir[PTDPTDI + i] = pa | PG_V | PG_RW | PG_A | PG_M; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) pmap->pm_pdpt[i] = pa | PG_V; #endif } @@ -1973,7 +1973,7 @@ pmap_lazyfix(pmap_t pmap) lsb--; CPU_SETOF(lsb, &mask); mtx_lock_spin(&smp_ipi_mtx); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) lazyptd = vtophys(pmap->pm_pdpt); #else lazyptd = vtophys(pmap->pm_pdir); @@ -2057,7 +2057,7 @@ pmap_release(pmap_t pmap) for (i = 0; i < NPGPTD; i++) { m = ptdpg[i]; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) KASSERT(VM_PAGE_TO_PHYS(m) == (pmap->pm_pdpt[i] & PG_FRAME), ("pmap_release: got wrong ptd page")); #endif @@ -3149,7 +3149,7 @@ retry: } if ((prot & VM_PROT_WRITE) == 0) newpde &= ~(PG_RW | PG_M); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if ((prot & VM_PROT_EXECUTE) == 0) newpde |= pg_nx; #endif @@ -3182,7 +3182,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv return; } -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if ((prot & (VM_PROT_WRITE|VM_PROT_EXECUTE)) == (VM_PROT_WRITE|VM_PROT_EXECUTE)) return; @@ -3285,13 +3285,13 @@ retry: } pbits &= ~(PG_RW | PG_M); } -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if ((prot & VM_PROT_EXECUTE) == 0) pbits |= pg_nx; #endif if (pbits != obits) { -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if (!atomic_cmpset_64(pte, obits, pbits)) goto retry; #else @@ -3605,7 +3605,7 @@ validate: if ((newpte & PG_MANAGED) != 0) vm_page_aflag_set(m, PGA_WRITEABLE); } -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if ((prot & VM_PROT_EXECUTE) == 0) newpte |= pg_nx; #endif @@ -3632,7 +3632,7 @@ validate: vm_page_aflag_set(om, PGA_REFERENCED); if (opa != VM_PAGE_TO_PHYS(m)) invlva = TRUE; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if ((origpte & PG_NX) == 0 && (newpte & PG_NX) != 0) invlva = TRUE; @@ -3703,7 +3703,7 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t return (FALSE); } } -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if ((prot & VM_PROT_EXECUTE) == 0) newpde |= pg_nx; #endif @@ -3880,7 +3880,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ pmap->pm_stats.resident_count++; pa = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 0); -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) if ((prot & VM_PROT_EXECUTE) == 0) pa |= pg_nx; #endif @@ -5460,7 +5460,7 @@ pmap_activate(struct thread *td) CPU_CLR(cpuid, &oldpmap->pm_active); CPU_SET(cpuid, &pmap->pm_active); #endif -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) cr3 = vtophys(pmap->pm_pdpt); #else cr3 = vtophys(pmap->pm_pdir); Modified: stable/10/sys/i386/i386/swtch.s ============================================================================== --- stable/10/sys/i386/i386/swtch.s Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/swtch.s Mon Apr 27 08:02:12 2015 (r282065) @@ -174,7 +174,7 @@ ENTRY(cpu_switch) /* switch address space */ movl PCB_CR3(%edx),%eax -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) cmpl %eax,IdlePDPT /* Kernel address space? */ #else cmpl %eax,IdlePTD /* Kernel address space? */ Modified: stable/10/sys/i386/i386/trap.c ============================================================================== --- stable/10/sys/i386/i386/trap.c Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/trap.c Mon Apr 27 08:02:12 2015 (r282065) @@ -884,7 +884,7 @@ trap_pfault(frame, usermode, eva) */ if (frame->tf_err & PGEX_W) ftype = VM_PROT_WRITE; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) else if ((frame->tf_err & PGEX_I) && pg_nx != 0) ftype = VM_PROT_EXECUTE; #endif Modified: stable/10/sys/i386/i386/vm86bios.s ============================================================================== --- stable/10/sys/i386/i386/vm86bios.s Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/vm86bios.s Mon Apr 27 08:02:12 2015 (r282065) @@ -122,7 +122,7 @@ ENTRY(vm86_bioscall) movl SCR_NEWPTD(%edx),%eax /* mapping for vm86 page table */ movl %eax,0(%ebx) /* ... install as PTD entry 0 */ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) movl IdlePDPT,%ecx #endif movl %ecx,%cr3 /* new page tables */ Modified: stable/10/sys/i386/i386/vm_machdep.c ============================================================================== --- stable/10/sys/i386/i386/vm_machdep.c Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/i386/vm_machdep.c Mon Apr 27 08:02:12 2015 (r282065) @@ -294,7 +294,7 @@ cpu_fork(td1, p2, td2, flags) * Set registers for trampoline to user mode. Leave space for the * return address on stack. These are the kernel mode register values. */ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) pcb2->pcb_cr3 = vtophys(vmspace_pmap(p2->p_vmspace)->pm_pdpt); #else pcb2->pcb_cr3 = vtophys(vmspace_pmap(p2->p_vmspace)->pm_pdir); Modified: stable/10/sys/i386/include/param.h ============================================================================== --- stable/10/sys/i386/include/param.h Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/include/param.h Mon Apr 27 08:02:12 2015 (r282065) @@ -90,7 +90,7 @@ #define PAGE_MASK (PAGE_SIZE-1) #define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t))) -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) #define NPGPTD 4 #define PDRSHIFT 21 /* LOG2(NBPDR) */ #define NPGPTD_SHIFT 9 Modified: stable/10/sys/i386/include/pmap.h ============================================================================== --- stable/10/sys/i386/include/pmap.h Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/include/pmap.h Mon Apr 27 08:02:12 2015 (r282065) @@ -63,7 +63,7 @@ #define PG_AVAIL2 0x400 /* < programmers use */ #define PG_AVAIL3 0x800 /* \ */ #define PG_PDE_PAT 0x1000 /* PAT PAT index */ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) #define PG_NX (1ull<<63) /* No-execute */ #endif @@ -71,7 +71,7 @@ /* Our various interpretations of the above */ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) #define PG_FRAME (0x000ffffffffff000ull) #define PG_PS_FRAME (0x000fffffffe00000ull) #else @@ -110,7 +110,7 @@ * is 1 Gigabyte. Double everything. It must be a multiple of 8 for PAE. */ #ifndef KVA_PAGES -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) #define KVA_PAGES 512 #else #define KVA_PAGES 256 @@ -128,11 +128,14 @@ * be calculated as follows: * max_phys / PAGE_SIZE * sizeof(struct vm_page) / NBPDR * PAE: max_phys 16G, sizeof(vm_page) 76, NBPDR 2M, 152 page table pages. + * PAE_TABLES: max_phys 4G, sizeof(vm_page) 68, NBPDR 2M, 36 page table pages. * Non-PAE: max_phys 4G, sizeof(vm_page) 68, NBPDR 4M, 18 page table pages. */ #ifndef NKPT -#ifdef PAE +#if defined(PAE) #define NKPT 240 +#elif defined(PAE_TABLES) +#define NKPT 60 #else #define NKPT 30 #endif @@ -166,7 +169,7 @@ #include -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) typedef uint64_t pdpt_entry_t; typedef uint64_t pd_entry_t; @@ -193,7 +196,7 @@ extern pt_entry_t PTmap[]; extern pd_entry_t PTD[]; extern pd_entry_t PTDpde[]; -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) extern pdpt_entry_t *IdlePDPT; #endif extern pd_entry_t *IdlePTD; /* physical address of "Idle" state directory */ @@ -331,7 +334,7 @@ pmap_kextract(vm_offset_t va) #define PT_UPDATES_FLUSH() #endif -#if defined(PAE) && !defined(XEN) +#if (defined(PAE) || defined(PAE_TABLES)) && !defined(XEN) #define pde_cmpset(pdep, old, new) atomic_cmpset_64_i586(pdep, old, new) #define pte_load_store(ptep, pte) atomic_swap_64_i586(ptep, pte) @@ -340,7 +343,7 @@ pmap_kextract(vm_offset_t va) extern pt_entry_t pg_nx; -#elif !defined(PAE) && !defined(XEN) +#elif !defined(PAE) && !defined(PAE_TABLES) && !defined(XEN) #define pde_cmpset(pdep, old, new) atomic_cmpset_int(pdep, old, new) #define pte_load_store(ptep, pte) atomic_swap_int(ptep, pte) @@ -375,8 +378,8 @@ struct pmap { cpuset_t pm_active; /* active on cpus */ struct pmap_statistics pm_stats; /* pmap statistics */ LIST_ENTRY(pmap) pm_list; /* List of all pmaps */ -#ifdef PAE - pdpt_entry_t *pm_pdpt; /* KVA of page director pointer +#if defined(PAE) || defined(PAE_TABLES) + pdpt_entry_t *pm_pdpt; /* KVA of page directory pointer table */ #endif struct vm_radix pm_root; /* spare page table pages */ Modified: stable/10/sys/i386/include/vmparam.h ============================================================================== --- stable/10/sys/i386/include/vmparam.h Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/i386/include/vmparam.h Mon Apr 27 08:02:12 2015 (r282065) @@ -120,11 +120,11 @@ #endif /* - * Level 0 reservations consist of 512 pages under PAE and 1024 pages - * otherwise. + * Level 0 reservations consist of 512 pages when PAE pagetables are + * used, and 1024 pages otherwise. */ #ifndef VM_LEVEL_0_ORDER -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) #define VM_LEVEL_0_ORDER 9 #else #define VM_LEVEL_0_ORDER 10 Modified: stable/10/sys/x86/acpica/acpi_wakeup.c ============================================================================== --- stable/10/sys/x86/acpica/acpi_wakeup.c Mon Apr 27 07:38:46 2015 (r282064) +++ stable/10/sys/x86/acpica/acpi_wakeup.c Mon Apr 27 08:02:12 2015 (r282065) @@ -368,7 +368,7 @@ acpi_install_wakeup_handler(struct acpi_ /* Save pointers to some global data. */ WAKECODE_FIXUP(wakeup_ret, void *, resumectx); #ifndef __amd64__ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) WAKECODE_FIXUP(wakeup_cr3, register_t, vtophys(kernel_pmap->pm_pdpt)); #else WAKECODE_FIXUP(wakeup_cr3, register_t, vtophys(kernel_pmap->pm_pdir)); From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 08:06:34 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5AF03E2A; Mon, 27 Apr 2015 08:06:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49A751F95; Mon, 27 Apr 2015 08:06:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R86YMT094227; Mon, 27 Apr 2015 08:06:34 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R86X5d094225; Mon, 27 Apr 2015 08:06:33 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201504270806.t3R86X5d094225@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 27 Apr 2015 08:06:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282066 - in stable/10/sys: amd64/amd64 i386/i386 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 08:06:34 -0000 Author: kib Date: Mon Apr 27 08:06:33 2015 New Revision: 282066 URL: https://svnweb.freebsd.org/changeset/base/282066 Log: MFC r281762: Remove duplicate definitions of MWAIT_CX hints. Identical defines in specialreg.h are enough. Modified: stable/10/sys/amd64/amd64/machdep.c stable/10/sys/i386/i386/machdep.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/amd64/machdep.c ============================================================================== --- stable/10/sys/amd64/amd64/machdep.c Mon Apr 27 08:02:12 2015 (r282065) +++ stable/10/sys/amd64/amd64/machdep.c Mon Apr 27 08:06:33 2015 (r282066) @@ -717,15 +717,6 @@ cpu_idle_hlt(sbintime_t sbt) *state = STATE_RUNNING; } -/* - * MWAIT cpu power states. Lower 4 bits are sub-states. - */ -#define MWAIT_C0 0xf0 -#define MWAIT_C1 0x00 -#define MWAIT_C2 0x10 -#define MWAIT_C3 0x20 -#define MWAIT_C4 0x30 - static void cpu_idle_mwait(sbintime_t sbt) { Modified: stable/10/sys/i386/i386/machdep.c ============================================================================== --- stable/10/sys/i386/i386/machdep.c Mon Apr 27 08:02:12 2015 (r282065) +++ stable/10/sys/i386/i386/machdep.c Mon Apr 27 08:06:33 2015 (r282066) @@ -1359,15 +1359,6 @@ cpu_idle_hlt(sbintime_t sbt) } #endif -/* - * MWAIT cpu power states. Lower 4 bits are sub-states. - */ -#define MWAIT_C0 0xf0 -#define MWAIT_C1 0x00 -#define MWAIT_C2 0x10 -#define MWAIT_C3 0x20 -#define MWAIT_C4 0x30 - static void cpu_idle_mwait(sbintime_t sbt) { From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 12:54:05 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8CD087E7; Mon, 27 Apr 2015 12:54:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A2BD1039; Mon, 27 Apr 2015 12:54:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RCs5bF043191; Mon, 27 Apr 2015 12:54:05 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RCs511043190; Mon, 27 Apr 2015 12:54:05 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201504271254.t3RCs511043190@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 27 Apr 2015 12:54:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282090 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 12:54:05 -0000 Author: kib Date: Mon Apr 27 12:54:04 2015 New Revision: 282090 URL: https://svnweb.freebsd.org/changeset/base/282090 Log: MFC r272290 (by mjg): Use bzero instead of explicitly zeroing stuff in do_execve. Modified: stable/10/sys/kern/kern_exec.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_exec.c ============================================================================== --- stable/10/sys/kern/kern_exec.c Mon Apr 27 12:06:13 2015 (r282089) +++ stable/10/sys/kern/kern_exec.c Mon Apr 27 12:54:04 2015 (r282090) @@ -382,29 +382,10 @@ do_execve(td, args, mac_p) /* * Initialize part of the common data */ + bzero(imgp, sizeof(*imgp)); imgp->proc = p; - imgp->execlabel = NULL; imgp->attr = &attr; - imgp->entry_addr = 0; - imgp->reloc_base = 0; - imgp->vmspace_destroyed = 0; - imgp->interpreted = 0; - imgp->opened = 0; - imgp->interpreter_name = NULL; - imgp->auxargs = NULL; - imgp->vp = NULL; - imgp->object = NULL; - imgp->firstpage = NULL; - imgp->ps_strings = 0; - imgp->auxarg_size = 0; imgp->args = args; - imgp->execpath = imgp->freepath = NULL; - imgp->execpathp = 0; - imgp->canary = 0; - imgp->canarylen = 0; - imgp->pagesizes = 0; - imgp->pagesizeslen = 0; - imgp->stack_prot = 0; #ifdef MAC error = mac_execve_enter(imgp, mac_p); @@ -412,8 +393,6 @@ do_execve(td, args, mac_p) goto exec_fail; #endif - imgp->image_header = NULL; - /* * Translate the file name. namei() returns a vnode pointer * in ni_vp amoung other things. From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 14:59:32 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37A11CB6; Mon, 27 Apr 2015 14:59:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 259281F86; Mon, 27 Apr 2015 14:59:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RExWXa006273; Mon, 27 Apr 2015 14:59:32 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RExWT0006272; Mon, 27 Apr 2015 14:59:32 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201504271459.t3RExWT0006272@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 27 Apr 2015 14:59:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282094 - stable/10/sys/geom/uncompress X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 14:59:32 -0000 Author: pfg Date: Mon Apr 27 14:59:31 2015 New Revision: 282094 URL: https://svnweb.freebsd.org/changeset/base/282094 Log: MFC r281769: g_uncompress_taste: prevent a double free. Found by: Clang Static Analyzer Modified: stable/10/sys/geom/uncompress/g_uncompress.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/geom/uncompress/g_uncompress.c ============================================================================== --- stable/10/sys/geom/uncompress/g_uncompress.c Mon Apr 27 14:18:07 2015 (r282093) +++ stable/10/sys/geom/uncompress/g_uncompress.c Mon Apr 27 14:59:31 2015 (r282094) @@ -571,6 +571,7 @@ g_uncompress_taste(struct g_class *mp, s (buf+sizeof(struct cloop_header)))[i]); } free(buf, M_GEOM); + buf = NULL; DPRINTF(("%s: done reading offsets\n", gp->name)); mtx_init(&sc->last_mtx, "geom_uncompress cache", NULL, MTX_DEF); sc->last_blk = -1; From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 15:00:17 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A51DE03; Mon, 27 Apr 2015 15:00:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4880D1F96; Mon, 27 Apr 2015 15:00:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RF0H6F008972; Mon, 27 Apr 2015 15:00:17 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RF0HBg008971; Mon, 27 Apr 2015 15:00:17 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201504271500.t3RF0HBg008971@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 27 Apr 2015 15:00:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282095 - stable/9/sys/geom/uncompress X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 15:00:17 -0000 Author: pfg Date: Mon Apr 27 15:00:16 2015 New Revision: 282095 URL: https://svnweb.freebsd.org/changeset/base/282095 Log: MFC r281769: g_uncompress_taste: prevent a double free. Found by: Clang Static Analyzer Modified: stable/9/sys/geom/uncompress/g_uncompress.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/geom/uncompress/g_uncompress.c ============================================================================== --- stable/9/sys/geom/uncompress/g_uncompress.c Mon Apr 27 14:59:31 2015 (r282094) +++ stable/9/sys/geom/uncompress/g_uncompress.c Mon Apr 27 15:00:16 2015 (r282095) @@ -565,6 +565,7 @@ g_uncompress_taste(struct g_class *mp, s sc->offsets[i] = be64toh(((uint64_t *) (buf+sizeof(struct cloop_header)))[i]); } + buf = NULL; DPRINTF(("%s: done reading offsets\n", gp->name)); mtx_init(&sc->last_mtx, "geom_uncompress cache", NULL, MTX_DEF); sc->last_blk = -1; From owner-svn-src-stable@FreeBSD.ORG Mon Apr 27 19:41:42 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C71139C; Mon, 27 Apr 2015 19:41:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 88E2012B8; Mon, 27 Apr 2015 19:41:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RJfgRH052839; Mon, 27 Apr 2015 19:41:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RJfeEa052833; Mon, 27 Apr 2015 19:41:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504271941.t3RJfeEa052833@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 27 Apr 2015 19:41:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282111 - in stable/10/release: . scripts tools X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 19:41:42 -0000 Author: gjb Date: Mon Apr 27 19:41:40 2015 New Revision: 282111 URL: https://svnweb.freebsd.org/changeset/base/282111 Log: MFC r280299, r280840, r280846, r280879, r280881, r280884, r280928, r281783, r281809, r281832: r280299 (cperciva): When creating VM images, copy the contents of the created filesystem into a new filesystem before packaging it into a disk image. This prevents "remnants" of deleted files from showing up in the VM images, and reduces their compressed size (by about 10% for the cloudware images) as a result. r280840 (cperciva): Clean up filesystem unmounting in vmimage builds: - Remove vm_umount_base function which is currently unused. - Add umount_loop function which loops attempting to unmount one filesystem. - Replace calls to umount with calls to umount_loop. - Don't attempt to unmount ${DESTDIR}/dev if it isn't mounted. The looping is necessary because sometimes umount fails due to filesystems being busy. The most common cause of such busyness is periodic(8) jobs running `find / ...`. r280846 (cperciva): Improve check for whether ${DESTDIR}/dev is mounted. r280879 (cperciva): Add bits for building EC2 disk images. r280881 (cperciva): Partially revert r278118 now that the required logic for deciding whether freebsd-update can be useful has moved into the firstboot_freebsd_update script. r280884 (cperciva): Fix pkg(8) command line in vm_extra_pre_umount(). r280928 (cperciva): Add code for creating an EC2 AMI. r281783: When building VM disk images, vm_copy_base() uses tar(1) to copy the userland from one md(4)-mounted filesystem to a clean filesystem to prevent remnants of files that were added and removed from resulting in an unclean filesystem. When newfs(8) creates the first filesystem with journaled soft-updates enabled, the /.sujournal file in the new filesystem cannot be overwritten by the /.sujournal in the original filesystem. To avoid this particular error case, do not enable journaled soft-updates when creating the md(4)-backed filesystems, and instead use tunefs(8) to enable journaled soft-updates after the new filesystem is populated in vm_copy_base(). While here, fix a long standing bug where the build environment /boot files were used by mkimg(1) when creating the VM disk images by using the files in .OBJDIR. r281809: Simplify variable expansion in attempt to fix the vm-image build. r281832: Fix locating the /boot files. Sponsored by: The FreeBSD Foundation Added: stable/10/release/Makefile.ec2 - copied unchanged from r280928, head/release/Makefile.ec2 stable/10/release/tools/ec2.conf - copied, changed from r280879, head/release/tools/ec2.conf Modified: stable/10/release/Makefile.vm stable/10/release/scripts/mk-vmimage.sh stable/10/release/tools/gce.conf stable/10/release/tools/vmimage.subr Directory Properties: stable/10/ (props changed) Copied: stable/10/release/Makefile.ec2 (from r280928, head/release/Makefile.ec2) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/Makefile.ec2 Mon Apr 27 19:41:40 2015 (r282111, copy of r280928, head/release/Makefile.ec2) @@ -0,0 +1,44 @@ +# +# $FreeBSD$ +# +# +# Makefile for creating an EC2 AMI from a disk image. +# + +.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" +AMINAMESUFFIX!= date +-%Y-%m-%d +.endif +.if defined(EC2PUBLIC) +PUBLISH= --public +.endif + +ec2ami: cw-ec2 +.if !exists(/usr/local/bin/bsdec2-image-upload) + @echo "--------------------------------------------------------------" + @echo ">>> Creating EC2 AMIs requires bsdec2-image-upload" + @echo "--------------------------------------------------------------" + @false +.endif +.if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) + @echo "--------------------------------------------------------------" + @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" + @echo "--------------------------------------------------------------" + @false +.endif +.if !defined(AWSREGION) + @echo "--------------------------------------------------------------" + @echo ">>> AWSREGION must be specified EC2 AMI creation" + @echo "--------------------------------------------------------------" + @false +.endif +.if !defined(AWSBUCKET) + @echo "--------------------------------------------------------------" + @echo ">>> AWSBUCKET must be specified for EC2 AMI creation" + @echo "--------------------------------------------------------------" + @false +.endif + /usr/local/bin/bsdec2-image-upload ${PUBLISH} \ + ${.OBJDIR}/ec2.raw \ + "${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}" \ + "${TYPE} ${REVISION}-${BRANCH}" \ + ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} Modified: stable/10/release/Makefile.vm ============================================================================== --- stable/10/release/Makefile.vm Mon Apr 27 19:18:51 2015 (r282110) +++ stable/10/release/Makefile.vm Mon Apr 27 19:41:40 2015 (r282111) @@ -16,11 +16,15 @@ QCOW2_DESC= Qemu, KVM disk image RAW_DESC= Unformatted raw disk image CLOUDWARE?= AZURE \ + EC2 \ GCE \ OPENSTACK AZURE_FORMAT= vhdf AZURE_DESC= Microsoft Azure platform image AZURE_DISK= ${OSRELEASE}.${AZURE_FORMAT} +EC2_FORMAT= raw +EC2_DESC= Amazon EC2 image +EC2_DISK= ${OSRELEASE}.${EC2_FORMAT} GCE_FORMAT= raw GCE_DESC= Google Compute Engine image GCE_DISK= disk.${GCE_FORMAT} @@ -148,3 +152,5 @@ cloudware-install: .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDINSTALL} .endif + +.include "${.CURDIR}/Makefile.ec2" Modified: stable/10/release/scripts/mk-vmimage.sh ============================================================================== --- stable/10/release/scripts/mk-vmimage.sh Mon Apr 27 19:18:51 2015 (r282110) +++ stable/10/release/scripts/mk-vmimage.sh Mon Apr 27 19:41:40 2015 (r282111) @@ -102,6 +102,7 @@ main() { vm_extra_pre_umount vm_extra_pkg_rmcache cleanup + vm_copy_base vm_create_disk || return 0 vm_extra_create_disk Copied and modified: stable/10/release/tools/ec2.conf (from r280879, head/release/tools/ec2.conf) ============================================================================== --- head/release/tools/ec2.conf Tue Mar 31 01:28:33 2015 (r280879, copy source) +++ stable/10/release/tools/ec2.conf Mon Apr 27 19:41:40 2015 (r282111) @@ -32,7 +32,7 @@ vm_extra_pre_umount() { # catalogue and install or update pkg when the instance first # launches, so these files would just be replaced anyway; removing # them from the image allows it to boot faster. - pkg -c ${DESTDIR} delete -f pkg + pkg -c ${DESTDIR} delete -f -y pkg rm ${DESTDIR}/var/db/pkg/repo-*.sqlite # The size of the EC2 root disk can be configured at instance launch Modified: stable/10/release/tools/gce.conf ============================================================================== --- stable/10/release/tools/gce.conf Mon Apr 27 19:18:51 2015 (r282110) +++ stable/10/release/tools/gce.conf Mon Apr 27 19:41:40 2015 (r282111) @@ -10,7 +10,7 @@ export VM_EXTRA_PACKAGES="firstboot-free # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="google_accounts_manager ntpd sshd firstboot_growfs \ - firstboot_pkgs google_startup" + firstboot_pkgs firstboot_freebsd_update google_startup" vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf @@ -23,13 +23,6 @@ vm_extra_pre_umount() { dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" -case \$(uname -r) in - *-BETA*|*-RC*|*-RELEASE*) - firstboot_freebsd_update_enable="YES" - ;; - *) - ;; -esac # need to fill in something here #firstboot_pkgs_list="" panicmail_autosubmit="YES" Modified: stable/10/release/tools/vmimage.subr ============================================================================== --- stable/10/release/tools/vmimage.subr Mon Apr 27 19:18:51 2015 (r282110) +++ stable/10/release/tools/vmimage.subr Mon Apr 27 19:41:40 2015 (r282111) @@ -14,17 +14,24 @@ write_partition_layout() { SWAPOPT="-p freebsd-swap/swapfs::1G" fi + _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)" + if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then + BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot" + else + BOOTFILES="/${_OBJDIR}/sys/boot" + fi + case "${TARGET}:${TARGET_ARCH}" in amd64:amd64 | i386:i386) - mkimg -s gpt -b /boot/pmbr \ - -p freebsd-boot/bootfs:=/boot/gptboot \ + mkimg -s gpt -b ${BOOTFILES}/i386/pmbr/pmbr \ + -p freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot \ ${SWAPOPT} \ -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; powerpc:powerpc*) mkimg -s apm \ - -p apple-boot/bootfs:=/boot/boot1.hfs \ + -p apple-boot/bootfs:=${BOOTFILES}/powerpc/boot1.chrp/boot1.hfs \ ${SWAPOPT} \ -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} @@ -45,8 +52,10 @@ err() { } cleanup() { - umount ${DESTDIR}/dev 2>/dev/null - umount ${DESTDIR} + if [ -c "${DESTDIR}/dev/null" ]; then + umount_loop ${DESTDIR}/dev 2>/dev/null + fi + umount_loop ${DESTDIR} if [ ! -z "${mddev}" ]; then mdconfig -d -u ${mddev} fi @@ -61,12 +70,42 @@ vm_create_base() { mkdir -p ${DESTDIR} truncate -s ${VMSIZE} ${VMBASE} mddev=$(mdconfig -f ${VMBASE}) - newfs -j /dev/${mddev} + newfs /dev/${mddev} mount /dev/${mddev} ${DESTDIR} return 0 } +vm_copy_base() { + # Creates a new UFS root filesystem and copies the contents of the + # current root filesystem into it. This produces a "clean" disk + # image without any remnants of files which were created temporarily + # during image-creation and have since been deleted (e.g., downloaded + # package archives). + + mkdir -p ${DESTDIR}/old + mdold=$(mdconfig -f ${VMBASE}) + mount /dev/${mdold} ${DESTDIR}/old + + truncate -s ${VMSIZE} ${VMBASE}.tmp + mkdir -p ${DESTDIR}/new + mdnew=$(mdconfig -f ${VMBASE}.tmp) + newfs /dev/${mdnew} + mount /dev/${mdnew} ${DESTDIR}/new + + tar -cf- -C ${DESTDIR}/old . | tar -xUf- -C ${DESTDIR}/new + + umount_loop /dev/${mdold} + rmdir ${DESTDIR}/old + mdconfig -d -u ${mdold} + + umount_loop /dev/${mdnew} + rmdir ${DESTDIR}/new + tunefs -j enable /dev/${mdnew} + mdconfig -d -u ${mdnew} + mv ${VMBASE}.tmp ${VMBASE} +} + vm_install_base() { # Installs the FreeBSD userland/kernel to the virtual machine disk. @@ -88,7 +127,7 @@ vm_install_base() { mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} /usr/bin/newaliases chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart - umount ${DESTDIR}/dev + umount_loop ${DESTDIR}/dev cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf @@ -123,7 +162,7 @@ vm_extra_install_packages() { /usr/sbin/pkg bootstrap -y chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} - umount ${DESTDIR}/dev + umount_loop ${DESTDIR}/dev return 0 } @@ -152,16 +191,17 @@ vm_extra_pkg_rmcache() { return 0 } -vm_umount_base() { +umount_loop() { + DIR=$1 i=0 sync - while ! umount ${DESTDIR}/dev ${DESTDIR}; do + while ! umount ${DIR}; do i=$(( $i + 1 )) if [ $i -ge 10 ]; then # This should never happen. But, it has happened. - msg="Cannot umount(8) ${DESTDIR}\n" - msg="${msg}Something has gone horribly wrong." - err "${msg}" + echo "Cannot umount(8) ${DIR}" + echo "Something has gone horribly wrong." + return 1 fi sleep 1 done From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 01:15:18 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E8C5A1C; Tue, 28 Apr 2015 01:15:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 210AB1938; Tue, 28 Apr 2015 01:15:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3S1FHH5018452; Tue, 28 Apr 2015 01:15:17 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3S1FHi0018450; Tue, 28 Apr 2015 01:15:17 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201504280115.t3S1FHi0018450@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 28 Apr 2015 01:15:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282118 - stable/10/libexec/rtld-elf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 01:15:18 -0000 Author: emaste Date: Tue Apr 28 01:15:17 2015 New Revision: 282118 URL: https://svnweb.freebsd.org/changeset/base/282118 Log: MFC r281005: Make die available as rtld_die for use by MD relocation code Sponsored by: The FreeBSD Foundation Modified: stable/10/libexec/rtld-elf/rtld.c stable/10/libexec/rtld-elf/rtld.h Directory Properties: stable/10/ (props changed) Modified: stable/10/libexec/rtld-elf/rtld.c ============================================================================== --- stable/10/libexec/rtld-elf/rtld.c Mon Apr 27 21:58:41 2015 (r282117) +++ stable/10/libexec/rtld-elf/rtld.c Tue Apr 28 01:15:17 2015 (r282118) @@ -78,7 +78,6 @@ typedef void * (*path_enum_proc) (const * Function declarations. */ static const char *basename(const char *); -static void die(void) __dead2; static void digest_dynamic1(Obj_Entry *, int, const Elf_Dyn **, const Elf_Dyn **, const Elf_Dyn **); static void digest_dynamic2(Obj_Entry *, const Elf_Dyn *, const Elf_Dyn *, @@ -422,7 +421,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ unsetenv(LD_ "DEBUG") || unsetenv(LD_ "ELF_HINTS_PATH") || unsetenv(LD_ "LOADFLTR") || unsetenv(LD_ "LIBRARY_PATH_RPATH")) { _rtld_error("environment corrupt; aborting"); - die(); + rtld_die(); } } ld_debug = getenv(LD_ "DEBUG"); @@ -470,7 +469,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ obj_main = map_object(fd, argv0, NULL); close(fd); if (obj_main == NULL) - die(); + rtld_die(); max_stack_flags = obj->stack_flags; } else { /* Main program already loaded. */ const Elf_Phdr *phdr; @@ -487,7 +486,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ assert(aux_info[AT_ENTRY] != NULL); entry = (caddr_t) aux_info[AT_ENTRY]->a_un.a_ptr; if ((obj_main = digest_phdr(phdr, phnum, entry, argv0)) == NULL) - die(); + rtld_die(); } if (aux_info[AT_EXECPATH] != 0) { @@ -554,12 +553,12 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ dbg("loading LD_PRELOAD libraries"); if (load_preload_objects() == -1) - die(); + rtld_die(); preload_tail = obj_tail; dbg("loading needed objects"); if (load_needed_objects(obj_main, 0) == -1) - die(); + rtld_die(); /* Make a list of all objects loaded at startup. */ last_interposer = obj_main; @@ -575,7 +574,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ dbg("checking for required versions"); if (rtld_verify_versions(&list_main) == -1 && !ld_tracing) - die(); + rtld_die(); if (ld_tracing) { /* We're done */ trace_loaded_objects(obj_main); @@ -604,11 +603,11 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ if (relocate_objects(obj_main, ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, SYMLOOK_EARLY, NULL) == -1) - die(); + rtld_die(); dbg("doing copy relocations"); if (do_copy_relocations(obj_main) == -1) - die(); + rtld_die(); if (getenv(LD_ "DUMP_REL_POST") != NULL) { dump_relocations(obj_main); @@ -640,7 +639,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ if (resolve_objects_ifunc(obj_main, ld_bind_now != NULL && *ld_bind_now != '\0', SYMLOOK_EARLY, NULL) == -1) - die(); + rtld_die(); if (!obj_main->crt_no_init) { /* @@ -707,7 +706,7 @@ _rtld_bind(Obj_Entry *obj, Elf_Size relo def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, true, NULL, &lockstate); if (def == NULL) - die(); + rtld_die(); if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) target = (Elf_Addr)rtld_resolve_ifunc(defobj, def); else @@ -856,8 +855,8 @@ origin_subst(char *real, const char *ori return (res4); } -static void -die(void) +void +rtld_die(void) { const char *msg = dlerror(); @@ -1207,7 +1206,7 @@ digest_dynamic2(Obj_Entry *obj, const El if (obj->z_origin && obj->origin_path == NULL) { obj->origin_path = xmalloc(PATH_MAX); if (rtld_dirname_abs(obj->path, obj->origin_path) == -1) - die(); + rtld_die(); } if (dyn_runpath != NULL) { @@ -1911,7 +1910,7 @@ init_pagesizes(Elf_Auxinfo **aux_info) } if (sysctl(mib, len, psa, &size, NULL, 0) == -1) { _rtld_error("sysctl for hw.pagesize(s) failed"); - die(); + rtld_die(); } psa_filled: pagesizes = psa; @@ -4496,7 +4495,7 @@ allocate_module_tls(int index) } if (!obj) { _rtld_error("Can't find module with TLS index %d", index); - die(); + rtld_die(); } p = malloc_aligned(obj->tlssize, obj->tlsalign); @@ -4637,7 +4636,7 @@ locate_dependency(const Obj_Entry *obj, } _rtld_error("%s: Unexpected inconsistency: dependency %s not found", obj->path, name); - die(); + rtld_die(); } static int @@ -4944,7 +4943,7 @@ __stack_chk_fail(void) { _rtld_error("stack overflow detected; terminated"); - die(); + rtld_die(); } __weak_reference(__stack_chk_fail, __stack_chk_fail_local); @@ -4953,7 +4952,7 @@ __chk_fail(void) { _rtld_error("buffer overflow detected; terminated"); - die(); + rtld_die(); } const char * Modified: stable/10/libexec/rtld-elf/rtld.h ============================================================================== --- stable/10/libexec/rtld-elf/rtld.h Mon Apr 27 21:58:41 2015 (r282117) +++ stable/10/libexec/rtld-elf/rtld.h Tue Apr 28 01:15:17 2015 (r282118) @@ -355,6 +355,7 @@ typedef struct Struct_SymLook { } SymLook; void _rtld_error(const char *, ...) __printflike(1, 2) __exported; +void rtld_die(void) __dead2; const char *rtld_strerror(int); Obj_Entry *map_object(int, const char *, const struct stat *); void *xcalloc(size_t, size_t); From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 12:02:25 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E04EDA61; Tue, 28 Apr 2015 12:02:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD5ED12F4; Tue, 28 Apr 2015 12:02:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SC2OHx039158; Tue, 28 Apr 2015 12:02:24 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SC2OJK039157; Tue, 28 Apr 2015 12:02:24 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201504281202.t3SC2OJK039157@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Tue, 28 Apr 2015 12:02:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282140 - stable/10/sys/dev/drm2 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 12:02:25 -0000 Author: dumbbell Date: Tue Apr 28 12:02:24 2015 New Revision: 282140 URL: https://svnweb.freebsd.org/changeset/base/282140 Log: drm: Import Linux commit b7ea85a4fed37835eec78a7be3039c8dc22b8178 Author: Huacai Chen Date: Tue May 21 06:23:43 2013 +0000 drm: fix a use-after-free when GPU acceleration disabled When GPU acceleration is disabled, drm_vblank_cleanup() will free the vblank-related data, such as vblank_refcount, vblank_inmodeset, etc. But we found that drm_vblank_post_modeset() may be called after the cleanup, which use vblank_refcount and vblank_inmodeset. And this will cause a kernel panic. Fix this by return immediately if dev->num_crtcs is zero. This is the same thing that drm_vblank_pre_modeset() does. Call trace of a drm_vblank_post_modeset() after drm_vblank_cleanup(): [ 62.628906] [] drm_vblank_post_modeset+0x34/0xb4 [ 62.628906] [] atombios_crtc_dpms+0xb4/0x174 [ 62.628906] [] atombios_crtc_commit+0x18/0x38 [ 62.628906] [] drm_crtc_helper_set_mode+0x304/0x3cc [ 62.628906] [] drm_crtc_helper_set_config+0x6d8/0x988 [ 62.628906] [] drm_fb_helper_set_par+0x94/0x104 [ 62.628906] [] fbcon_init+0x424/0x57c [ 62.628906] [] visual_init+0xb8/0x118 [ 62.628906] [] take_over_console+0x238/0x384 [ 62.628906] [] fbcon_takeover+0x7c/0xdc [ 62.628906] [] notifier_call_chain+0x44/0x94 [ 62.628906] [] __blocking_notifier_call_chain+0x48/0x68 [ 62.628906] [] register_framebuffer+0x228/0x260 [ 62.628906] [] drm_fb_helper_single_fb_probe+0x260/0x314 [ 62.628906] [] drm_fb_helper_initial_config+0x200/0x234 [ 62.628906] [] radeon_fbdev_init+0xd4/0xf4 [ 62.628906] [] radeon_modeset_init+0x9bc/0xa18 [ 62.628906] [] radeon_driver_load_kms+0xdc/0x12c [ 62.628906] [] drm_get_pci_dev+0x148/0x238 [ 62.628906] [] local_pci_probe+0x5c/0xd0 [ 62.628906] [] work_for_cpu_fn+0x1c/0x30 [ 62.628906] [] process_one_work+0x274/0x3bc [ 62.628906] [] process_scheduled_works+0x24/0x44 [ 62.628906] [] worker_thread+0x31c/0x3f4 [ 62.628906] [] kthread+0x88/0x90 [ 62.628906] [] kernel_thread_helper+0x10/0x18 Signed-off-by: Huacai Chen Signed-off-by: Binbin Zhou Cc: Reviewed-by: Michel Dänzer Acked-by: Paul Menzel Signed-off-by: Dave Airlie Reported by: J.R. Oldroyd MFC of: r279599 Modified: stable/10/sys/dev/drm2/drm_irq.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/drm_irq.c ============================================================================== --- stable/10/sys/dev/drm2/drm_irq.c Tue Apr 28 11:03:47 2015 (r282139) +++ stable/10/sys/dev/drm2/drm_irq.c Tue Apr 28 12:02:24 2015 (r282140) @@ -883,7 +883,7 @@ void drm_vblank_off(struct drm_device *d */ void drm_vblank_pre_modeset(struct drm_device *dev, int crtc) { - /* vblank is not initialized (IRQ not installed ?) */ + /* vblank is not initialized (IRQ not installed ?), or has been freed */ if (!dev->num_crtcs) return; /* @@ -902,6 +902,9 @@ void drm_vblank_pre_modeset(struct drm_d void drm_vblank_post_modeset(struct drm_device *dev, int crtc) { + /* vblank is not initialized (IRQ not installed ?), or has been freed */ + if (!dev->num_crtcs) + return; if (dev->vblank_inmodeset[crtc]) { mtx_lock(&dev->vbl_lock); From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 12:37:10 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9046365; Tue, 28 Apr 2015 12:37:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A727A16FE; Tue, 28 Apr 2015 12:37:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SCbAmA054891; Tue, 28 Apr 2015 12:37:10 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SCbASJ054890; Tue, 28 Apr 2015 12:37:10 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201504281237.t3SCbASJ054890@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Tue, 28 Apr 2015 12:37:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282141 - stable/10/sys/dev/drm2 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 12:37:10 -0000 Author: dumbbell Date: Tue Apr 28 12:37:09 2015 New Revision: 282141 URL: https://svnweb.freebsd.org/changeset/base/282141 Log: DRM2: fix off-by-one overflow in ioctl processing Call to the driver-specific ioctl used to process ioctl number that will lead to the out-of-bounds access to the ioctl handler array. PR: 193367 Approved by: kib MFC of: r275209 (original commit by rea) Modified: stable/10/sys/dev/drm2/drm_drv.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/drm_drv.c ============================================================================== --- stable/10/sys/dev/drm2/drm_drv.c Tue Apr 28 12:02:24 2015 (r282140) +++ stable/10/sys/dev/drm2/drm_drv.c Tue Apr 28 12:37:09 2015 (r282141) @@ -909,7 +909,7 @@ int drm_ioctl(struct cdev *kdev, u_long if (ioctl->func == NULL && nr >= DRM_COMMAND_BASE) { /* The array entries begin at DRM_COMMAND_BASE ioctl nr */ nr -= DRM_COMMAND_BASE; - if (nr > dev->driver->max_ioctl) { + if (nr >= dev->driver->max_ioctl) { DRM_DEBUG("Bad driver ioctl number, 0x%x (of 0x%x)\n", nr, dev->driver->max_ioctl); return EINVAL; From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 12:48:31 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5F457CC; Tue, 28 Apr 2015 12:48:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B4160187A; Tue, 28 Apr 2015 12:48:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SCmV2H060110; Tue, 28 Apr 2015 12:48:31 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SCmVdM060109; Tue, 28 Apr 2015 12:48:31 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201504281248.t3SCmVdM060109@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 28 Apr 2015 12:48:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282142 - stable/10/libexec/rtld-elf/mips X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 12:48:31 -0000 Author: emaste Date: Tue Apr 28 12:48:30 2015 New Revision: 282142 URL: https://svnweb.freebsd.org/changeset/base/282142 Log: MFC r281107: MIPS rtld: report missing symbol rather than segfaulting This is only an interim fix; MIPS should be using the MI code instead, which does not have this issue. Modified: stable/10/libexec/rtld-elf/mips/reloc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/libexec/rtld-elf/mips/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/mips/reloc.c Tue Apr 28 12:37:09 2015 (r282141) +++ stable/10/libexec/rtld-elf/mips/reloc.c Tue Apr 28 12:48:30 2015 (r282142) @@ -245,7 +245,7 @@ _mips_rtld_bind(Obj_Entry *obj, Elf_Size def = find_symdef(reloff, obj, &defobj, SYMLOOK_IN_PLT, NULL, NULL); if (def == NULL) - _rtld_error("bind failed no symbol"); + rtld_die(); target = (Elf_Addr)(defobj->relocbase + def->st_value); dbg("bind now/fixup at %s sym # %jd in %s --> was=%p new=%p", From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 12:52:09 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8D399B3; Tue, 28 Apr 2015 12:52:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96A071956; Tue, 28 Apr 2015 12:52:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SCq9HJ064225; Tue, 28 Apr 2015 12:52:09 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SCq9bL064224; Tue, 28 Apr 2015 12:52:09 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201504281252.t3SCq9bL064224@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 28 Apr 2015 12:52:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282143 - stable/10/lib/libc/mips/gen X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 12:52:09 -0000 Author: emaste Date: Tue Apr 28 12:52:08 2015 New Revision: 282143 URL: https://svnweb.freebsd.org/changeset/base/282143 Log: MFC r277877: Use zero register instead of immediate 0x0 in MIPS assembly It seems GAS makes the substitution automatically, but Clang's integrated assembler does not (yet). It fails with "invalid operand for instruction." Modified: stable/10/lib/libc/mips/gen/sigsetjmp.S Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/mips/gen/sigsetjmp.S ============================================================================== --- stable/10/lib/libc/mips/gen/sigsetjmp.S Tue Apr 28 12:48:30 2015 (r282142) +++ stable/10/lib/libc/mips/gen/sigsetjmp.S Tue Apr 28 12:52:08 2015 (r282143) @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); LEAF(sigsetjmp) PIC_PROLOGUE(sigsetjmp) - bne a1, 0x0, 1f # do saving of signal mask? + bne a1, zero, 1f # do saving of signal mask? PIC_TAILCALL(_setjmp) 1: PIC_TAILCALL(setjmp) From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:11:45 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E89708A2; Tue, 28 Apr 2015 18:11:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D70E31289; Tue, 28 Apr 2015 18:11:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIBjTH029230; Tue, 28 Apr 2015 18:11:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIBjR2029229; Tue, 28 Apr 2015 18:11:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281811.t3SIBjR2029229@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:11:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282186 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:11:46 -0000 Author: gjb Date: Tue Apr 28 18:11:45 2015 New Revision: 282186 URL: https://svnweb.freebsd.org/changeset/base/282186 Log: Document r280304, OpenSSL update to version 1.0.1m. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:36 2015 (r282185) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:45 2015 (r282186) @@ -187,8 +187,8 @@ Contributed Software - OpenSSL has - been updated to version 1.0.1l. + OpenSSL has + been updated to version 1.0.1m. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:12:04 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62753218; Tue, 28 Apr 2015 18:12:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 516A212A8; Tue, 28 Apr 2015 18:12:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIC4dx029687; Tue, 28 Apr 2015 18:12:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIC4qY029686; Tue, 28 Apr 2015 18:12:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281812.t3SIC4qY029686@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:12:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282194 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:12:04 -0000 Author: gjb Date: Tue Apr 28 18:12:03 2015 New Revision: 282194 URL: https://svnweb.freebsd.org/changeset/base/282194 Log: Document r281936, disallow ar(1) directory traversal. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:01 2015 (r282193) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:03 2015 (r282194) @@ -192,6 +192,13 @@ sponsor="&limelight;">A new flag, -R, has been added to the &man.netstat.8; utility, which is used to dump RSS/flow information. + + The + &man.ar.1; utility has been updated to set + ARCHIVE_EXTRACT_SECURE_SYMLINKS and + ARCHIVE_EXTRACT_SECURE_NODOTDOT to disallow + directory traversal when extracting an archive, similar to + &man.tar.1;. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:11:57 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC603D6D; Tue, 28 Apr 2015 18:11:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9AEB2129B; Tue, 28 Apr 2015 18:11:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIBvXR029516; Tue, 28 Apr 2015 18:11:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIBvuu029510; Tue, 28 Apr 2015 18:11:57 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281811.t3SIBvuu029510@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:11:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282191 - in stable/10/release/doc: en_US.ISO8859-1/relnotes share/xml X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:11:57 -0000 Author: gjb Date: Tue Apr 28 18:11:56 2015 New Revision: 282191 URL: https://svnweb.freebsd.org/changeset/base/282191 Log: Document r281161, '-R' flag added to netstat(8). Add Limelight Networks to sponsors.ent. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml stable/10/release/doc/share/xml/sponsor.ent Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:54 2015 (r282190) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:56 2015 (r282191) @@ -187,6 +187,11 @@ library that would prevent a directory from being included in the archive when --one-file-system is used has been fixed. + + A new flag, -R, has + been added to the &man.netstat.8; utility, which is used to + dump RSS/flow information. Modified: stable/10/release/doc/share/xml/sponsor.ent ============================================================================== --- stable/10/release/doc/share/xml/sponsor.ent Tue Apr 28 18:11:54 2015 (r282190) +++ stable/10/release/doc/share/xml/sponsor.ent Tue Apr 28 18:11:56 2015 (r282191) @@ -23,6 +23,7 @@ + From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:11:50 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7348DAF1; Tue, 28 Apr 2015 18:11:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 622F31292; Tue, 28 Apr 2015 18:11:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIBoFl029338; Tue, 28 Apr 2015 18:11:50 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIBoUF029336; Tue, 28 Apr 2015 18:11:50 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281811.t3SIBoUF029336@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:11:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282188 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:11:50 -0000 Author: gjb Date: Tue Apr 28 18:11:49 2015 New Revision: 282188 URL: https://svnweb.freebsd.org/changeset/base/282188 Log: Document r280392, make sure that setmode sets errno on failure. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:47 2015 (r282187) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:49 2015 (r282188) @@ -216,6 +216,10 @@ A new file configuration library, &man.figpar.3;, has been added to the base system. + + The &man.setmode.3; function has been + updated to consistently set errno on + failure. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:12:06 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D3BC2FD; Tue, 28 Apr 2015 18:12:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C60012B0; Tue, 28 Apr 2015 18:12:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIC6gY029751; Tue, 28 Apr 2015 18:12:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIC6q1029750; Tue, 28 Apr 2015 18:12:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281812.t3SIC6q1029750@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:12:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282195 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:12:06 -0000 Author: gjb Date: Tue Apr 28 18:12:05 2015 New Revision: 282195 URL: https://svnweb.freebsd.org/changeset/base/282195 Log: Document r281957, hptnr(4) driver updated to version 1.1.1. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:03 2015 (r282194) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:05 2015 (r282195) @@ -297,7 +297,8 @@ Storage Drivers -   + The &man.hptnr.4; driver has been + updated to version 1.1.1. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:12:00 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1ACFAF5D; Tue, 28 Apr 2015 18:11:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC66E12A0; Tue, 28 Apr 2015 18:11:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIBx4R029575; Tue, 28 Apr 2015 18:11:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIBxL2029574; Tue, 28 Apr 2015 18:11:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281811.t3SIBxL2029574@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:11:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282192 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:12:00 -0000 Author: gjb Date: Tue Apr 28 18:11:59 2015 New Revision: 282192 URL: https://svnweb.freebsd.org/changeset/base/282192 Log: Document r281687, ACPI update to 20150410. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:56 2015 (r282191) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:59 2015 (r282192) @@ -200,8 +200,8 @@ OpenSSL has been updated to version 1.0.1m. - The &man.acpi.4; subsystem has been - updated to version 20150204. + The &man.acpi.4; subsystem has been + updated to version 20150410. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:11:48 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32DF09C7; Tue, 28 Apr 2015 18:11:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2159D128F; Tue, 28 Apr 2015 18:11:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIBm9h029281; Tue, 28 Apr 2015 18:11:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIBlZK029280; Tue, 28 Apr 2015 18:11:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281811.t3SIBlZK029280@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:11:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282187 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:11:48 -0000 Author: gjb Date: Tue Apr 28 18:11:47 2015 New Revision: 282187 URL: https://svnweb.freebsd.org/changeset/base/282187 Log: Document r280370, DSM TRIM support for virtual AHCI disks. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:45 2015 (r282186) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:47 2015 (r282187) @@ -300,7 +300,9 @@ Virtualization Support -   + The &man.bhyve.8; hypervisor has been + updated to support DSM TRIM commands for + virtual AHCI disks. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:11:52 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B3680B04; Tue, 28 Apr 2015 18:11:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A26321296; Tue, 28 Apr 2015 18:11:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIBqg6029397; Tue, 28 Apr 2015 18:11:52 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIBqNr029396; Tue, 28 Apr 2015 18:11:52 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281811.t3SIBqNr029396@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:11:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282189 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:11:52 -0000 Author: gjb Date: Tue Apr 28 18:11:51 2015 New Revision: 282189 URL: https://svnweb.freebsd.org/changeset/base/282189 Log: Document r281044, fix directory inclusion when '--one-file-system' is specified. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:49 2015 (r282188) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:51 2015 (r282189) @@ -182,6 +182,11 @@ The &man.fstyp.8; utility has been added, which is used to determine the filesystem on a specified device. + + A regression in the &man.libarchive.3; + library that would prevent a directory from being included in + the archive when --one-file-system is used + has been fixed. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:11:54 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB94EB65; Tue, 28 Apr 2015 18:11:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA7651299; Tue, 28 Apr 2015 18:11:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIBsAq029444; Tue, 28 Apr 2015 18:11:54 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIBsoE029443; Tue, 28 Apr 2015 18:11:54 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281811.t3SIBsoE029443@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:11:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282190 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:11:55 -0000 Author: gjb Date: Tue Apr 28 18:11:54 2015 New Revision: 282190 URL: https://svnweb.freebsd.org/changeset/base/282190 Log: Document r281075, ACPICA update to version 20150204. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:51 2015 (r282189) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:54 2015 (r282190) @@ -194,6 +194,9 @@ OpenSSL has been updated to version 1.0.1m. + + The &man.acpi.4; subsystem has been + updated to version 20150204. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:12:11 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20F12557; Tue, 28 Apr 2015 18:12:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1047312B9; Tue, 28 Apr 2015 18:12:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SICA82029881; Tue, 28 Apr 2015 18:12:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SICALW029880; Tue, 28 Apr 2015 18:12:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281812.t3SICALW029880@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:12:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282197 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:12:11 -0000 Author: gjb Date: Tue Apr 28 18:12:10 2015 New Revision: 282197 URL: https://svnweb.freebsd.org/changeset/base/282197 Log: Fix a whitespace nit. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:08 2015 (r282196) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:10 2015 (r282197) @@ -345,6 +345,7 @@ General Storage + The &man.ctl.4; LUN mapping has been rewritten, replacing iSCSI-specific mapping mechanisms From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:12:08 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D892C429; Tue, 28 Apr 2015 18:12:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C760412B3; Tue, 28 Apr 2015 18:12:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIC86o029830; Tue, 28 Apr 2015 18:12:08 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIC83c029829; Tue, 28 Apr 2015 18:12:08 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281812.t3SIC83c029829@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:12:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282196 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:12:09 -0000 Author: gjb Date: Tue Apr 28 18:12:08 2015 New Revision: 282196 URL: https://svnweb.freebsd.org/changeset/base/282196 Log: Update svn revision marker. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:05 2015 (r282195) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:08 2015 (r282196) @@ -22,7 +22,7 @@ $FreeBSD$ - + 2015 From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 18:12:02 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54CF912E; Tue, 28 Apr 2015 18:12:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2385F12A6; Tue, 28 Apr 2015 18:12:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SIC1iZ029638; Tue, 28 Apr 2015 18:12:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SIC1kQ029637; Tue, 28 Apr 2015 18:12:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504281812.t3SIC1kQ029637@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 18:12:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282193 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:12:02 -0000 Author: gjb Date: Tue Apr 28 18:12:01 2015 New Revision: 282193 URL: https://svnweb.freebsd.org/changeset/base/282193 Log: Document r281843, GELI passphrase prompt support in loader. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:11:59 2015 (r282192) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 18:12:01 2015 (r282193) @@ -395,7 +395,11 @@ Boot Loader Changes -   + The boot loader has been updated to + support entering the GELI passphrase before + loading the kernel. To enable this behavior, add + geom_eli_passphrase_prompt="YES" to + &man.loader.conf.5;. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 19:35:07 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5415FEF5; Tue, 28 Apr 2015 19:35:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E6521C89; Tue, 28 Apr 2015 19:35:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SJZ78a070533; Tue, 28 Apr 2015 19:35:07 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SJZ6U4070528; Tue, 28 Apr 2015 19:35:06 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201504281935.t3SJZ6U4070528@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Tue, 28 Apr 2015 19:35:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282199 - in stable/10/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon dev/drm2/ttm modules modules/drm2 modules/drm2/drm2 modules/drm2/radeonkms X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 19:35:07 -0000 Author: dumbbell Date: Tue Apr 28 19:35:05 2015 New Revision: 282199 URL: https://svnweb.freebsd.org/changeset/base/282199 Log: drm: Update the device-independent code to match Linux 3.8.13 This update brings few features: o Support for the setmaster/dropmaster ioctls. For instance, they are used to run multiple X servers simultaneously. o Support for minor devices. The only user-visible change is a new entry in /dev/dri but it is useless at the moment. This is a first step to support render nodes [1]. The main benefit is to greatly reduce the diff with Linux (at the expense of an unreadable commit diff). Hopefully, next upgrades will be easier. No updates were made to the drivers, beside adapting them to API changes. [1] https://en.wikipedia.org/wiki/Direct_Rendering_Manager#Render_nodes r280814 is merged at the same time to avoid a short window where RANDR might be broken: drm: Import Linux commit 9bc3cd5673d84d29272fa7181a4dfca83cbb48c1 Author: Ville Syrjälä Date: Fri May 31 12:17:08 2013 +0000 drm: Sort connector modes based on vrefresh Keeping the modes sorted by vrefresh before the pixel clock makes the mode list somehow more pleasing to the eye. Signed-off-by: Ville Syrjälä Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie PR: 198936 (r280814) Tested by: Many people MFC of: r280183, r280187 (original commit by glebius), r280814 Relnotes: yes Added: stable/10/sys/dev/drm2/drm_os_freebsd.c - copied, changed from r280183, head/sys/dev/drm2/drm_os_freebsd.c Deleted: stable/10/sys/dev/drm2/drm_drawable.c stable/10/sys/dev/drm2/drm_internal.h stable/10/sys/dev/drm2/drm_sman.c stable/10/sys/dev/drm2/drm_sman.h stable/10/sys/dev/drm2/radeon/radeon_atpx_handler.c Modified: stable/10/sys/dev/drm2/ati_pcigart.c stable/10/sys/dev/drm2/drm.h stable/10/sys/dev/drm2/drmP.h stable/10/sys/dev/drm2/drm_agpsupport.c stable/10/sys/dev/drm2/drm_atomic.h stable/10/sys/dev/drm2/drm_auth.c stable/10/sys/dev/drm2/drm_buffer.c stable/10/sys/dev/drm2/drm_bufs.c stable/10/sys/dev/drm2/drm_context.c stable/10/sys/dev/drm2/drm_crtc.c stable/10/sys/dev/drm2/drm_crtc.h stable/10/sys/dev/drm2/drm_crtc_helper.c stable/10/sys/dev/drm2/drm_crtc_helper.h stable/10/sys/dev/drm2/drm_dma.c stable/10/sys/dev/drm2/drm_dp_helper.c stable/10/sys/dev/drm2/drm_dp_iic_helper.c stable/10/sys/dev/drm2/drm_drv.c stable/10/sys/dev/drm2/drm_edid.c stable/10/sys/dev/drm2/drm_edid.h stable/10/sys/dev/drm2/drm_edid_modes.h stable/10/sys/dev/drm2/drm_fb_helper.c stable/10/sys/dev/drm2/drm_fb_helper.h stable/10/sys/dev/drm2/drm_fops.c stable/10/sys/dev/drm2/drm_fourcc.h stable/10/sys/dev/drm2/drm_gem.c stable/10/sys/dev/drm2/drm_gem_names.c stable/10/sys/dev/drm2/drm_global.c stable/10/sys/dev/drm2/drm_hashtab.c stable/10/sys/dev/drm2/drm_ioc32.c stable/10/sys/dev/drm2/drm_ioctl.c stable/10/sys/dev/drm2/drm_irq.c stable/10/sys/dev/drm2/drm_lock.c stable/10/sys/dev/drm2/drm_memory.c stable/10/sys/dev/drm2/drm_mm.c stable/10/sys/dev/drm2/drm_mm.h stable/10/sys/dev/drm2/drm_mode.h stable/10/sys/dev/drm2/drm_modes.c stable/10/sys/dev/drm2/drm_os_freebsd.h stable/10/sys/dev/drm2/drm_pci.c stable/10/sys/dev/drm2/drm_pciids.h stable/10/sys/dev/drm2/drm_sarea.h stable/10/sys/dev/drm2/drm_scatter.c stable/10/sys/dev/drm2/drm_stub.c stable/10/sys/dev/drm2/drm_sysctl.c stable/10/sys/dev/drm2/drm_vm.c stable/10/sys/dev/drm2/i915/i915_debug.c stable/10/sys/dev/drm2/i915/i915_dma.c stable/10/sys/dev/drm2/i915/i915_drm.h stable/10/sys/dev/drm2/i915/i915_drv.c stable/10/sys/dev/drm2/i915/i915_drv.h stable/10/sys/dev/drm2/i915/i915_gem.c stable/10/sys/dev/drm2/i915/i915_gem_context.c stable/10/sys/dev/drm2/i915/i915_gem_evict.c stable/10/sys/dev/drm2/i915/i915_gem_execbuffer.c stable/10/sys/dev/drm2/i915/i915_gem_gtt.c stable/10/sys/dev/drm2/i915/i915_gem_tiling.c stable/10/sys/dev/drm2/i915/i915_ioc32.c stable/10/sys/dev/drm2/i915/i915_irq.c stable/10/sys/dev/drm2/i915/i915_suspend.c stable/10/sys/dev/drm2/i915/intel_crt.c stable/10/sys/dev/drm2/i915/intel_display.c stable/10/sys/dev/drm2/i915/intel_dp.c stable/10/sys/dev/drm2/i915/intel_fb.c stable/10/sys/dev/drm2/i915/intel_hdmi.c stable/10/sys/dev/drm2/i915/intel_iic.c stable/10/sys/dev/drm2/i915/intel_lvds.c stable/10/sys/dev/drm2/i915/intel_modes.c stable/10/sys/dev/drm2/i915/intel_opregion.c stable/10/sys/dev/drm2/i915/intel_overlay.c stable/10/sys/dev/drm2/i915/intel_panel.c stable/10/sys/dev/drm2/i915/intel_ringbuffer.c stable/10/sys/dev/drm2/i915/intel_sdvo.c stable/10/sys/dev/drm2/i915/intel_tv.c stable/10/sys/dev/drm2/radeon/atom.c stable/10/sys/dev/drm2/radeon/atombios_crtc.c stable/10/sys/dev/drm2/radeon/atombios_dp.c stable/10/sys/dev/drm2/radeon/atombios_encoders.c stable/10/sys/dev/drm2/radeon/atombios_i2c.c stable/10/sys/dev/drm2/radeon/cayman_blit_shaders.c stable/10/sys/dev/drm2/radeon/evergreen.c stable/10/sys/dev/drm2/radeon/evergreen_blit_shaders.c stable/10/sys/dev/drm2/radeon/evergreen_cs.c stable/10/sys/dev/drm2/radeon/evergreen_reg.h stable/10/sys/dev/drm2/radeon/ni.c stable/10/sys/dev/drm2/radeon/nid.h stable/10/sys/dev/drm2/radeon/r100.c stable/10/sys/dev/drm2/radeon/r200.c stable/10/sys/dev/drm2/radeon/r300.c stable/10/sys/dev/drm2/radeon/r300_cmdbuf.c stable/10/sys/dev/drm2/radeon/r420.c stable/10/sys/dev/drm2/radeon/r500_reg.h stable/10/sys/dev/drm2/radeon/r600.c stable/10/sys/dev/drm2/radeon/r600_blit.c stable/10/sys/dev/drm2/radeon/r600_blit_shaders.c stable/10/sys/dev/drm2/radeon/r600_cp.c stable/10/sys/dev/drm2/radeon/r600_cs.c stable/10/sys/dev/drm2/radeon/r600_hdmi.c stable/10/sys/dev/drm2/radeon/r600d.h stable/10/sys/dev/drm2/radeon/radeon.h stable/10/sys/dev/drm2/radeon/radeon_acpi.c stable/10/sys/dev/drm2/radeon/radeon_agp.c stable/10/sys/dev/drm2/radeon/radeon_atombios.c stable/10/sys/dev/drm2/radeon/radeon_benchmark.c stable/10/sys/dev/drm2/radeon/radeon_bios.c stable/10/sys/dev/drm2/radeon/radeon_clocks.c stable/10/sys/dev/drm2/radeon/radeon_combios.c stable/10/sys/dev/drm2/radeon/radeon_connectors.c stable/10/sys/dev/drm2/radeon/radeon_cp.c stable/10/sys/dev/drm2/radeon/radeon_cs.c stable/10/sys/dev/drm2/radeon/radeon_device.c stable/10/sys/dev/drm2/radeon/radeon_display.c stable/10/sys/dev/drm2/radeon/radeon_drm.h stable/10/sys/dev/drm2/radeon/radeon_drv.c stable/10/sys/dev/drm2/radeon/radeon_drv.h stable/10/sys/dev/drm2/radeon/radeon_fb.c stable/10/sys/dev/drm2/radeon/radeon_fence.c stable/10/sys/dev/drm2/radeon/radeon_gart.c stable/10/sys/dev/drm2/radeon/radeon_gem.c stable/10/sys/dev/drm2/radeon/radeon_i2c.c stable/10/sys/dev/drm2/radeon/radeon_ioc32.c stable/10/sys/dev/drm2/radeon/radeon_irq_kms.c stable/10/sys/dev/drm2/radeon/radeon_irq_kms.h stable/10/sys/dev/drm2/radeon/radeon_kms.c stable/10/sys/dev/drm2/radeon/radeon_legacy_crtc.c stable/10/sys/dev/drm2/radeon/radeon_legacy_encoders.c stable/10/sys/dev/drm2/radeon/radeon_legacy_tv.c stable/10/sys/dev/drm2/radeon/radeon_mem.c stable/10/sys/dev/drm2/radeon/radeon_object.c stable/10/sys/dev/drm2/radeon/radeon_object.h stable/10/sys/dev/drm2/radeon/radeon_pm.c stable/10/sys/dev/drm2/radeon/radeon_ring.c stable/10/sys/dev/drm2/radeon/radeon_sa.c stable/10/sys/dev/drm2/radeon/radeon_semaphore.c stable/10/sys/dev/drm2/radeon/radeon_state.c stable/10/sys/dev/drm2/radeon/radeon_test.c stable/10/sys/dev/drm2/radeon/radeon_ttm.c stable/10/sys/dev/drm2/radeon/rs400.c stable/10/sys/dev/drm2/radeon/rs600.c stable/10/sys/dev/drm2/radeon/rs690.c stable/10/sys/dev/drm2/radeon/rv515.c stable/10/sys/dev/drm2/radeon/rv770.c stable/10/sys/dev/drm2/radeon/si.c stable/10/sys/dev/drm2/radeon/si_blit_shaders.c stable/10/sys/dev/drm2/radeon/sid.h stable/10/sys/dev/drm2/ttm/ttm_bo.c stable/10/sys/dev/drm2/ttm/ttm_bo_util.c stable/10/sys/dev/drm2/ttm/ttm_bo_vm.c stable/10/sys/dev/drm2/ttm/ttm_lock.c stable/10/sys/modules/Makefile stable/10/sys/modules/drm2/Makefile stable/10/sys/modules/drm2/drm2/Makefile stable/10/sys/modules/drm2/radeonkms/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/ati_pcigart.c ============================================================================== --- stable/10/sys/dev/drm2/ati_pcigart.c Tue Apr 28 19:15:28 2015 (r282198) +++ stable/10/sys/dev/drm2/ati_pcigart.c Tue Apr 28 19:35:05 2015 (r282199) @@ -42,7 +42,7 @@ static int drm_ati_alloc_pcigart_table(s struct drm_ati_pcigart_info *gart_info) { gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size, - PAGE_SIZE, 0xFFFFFFFFUL); + PAGE_SIZE, BUS_SPACE_MAXADDR); if (gart_info->table_handle == NULL) return -ENOMEM; @@ -97,6 +97,7 @@ int drm_ati_pcigart_cleanup(struct drm_d return 1; } +EXPORT_SYMBOL(drm_ati_pcigart_cleanup); int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info) { @@ -197,7 +198,7 @@ int drm_ati_pcigart_init(struct drm_devi } ret = 1; -#if defined(__i386) || defined(__amd64) +#if defined(__i386__) || defined(__x86_64__) wbinvd(); #else mb(); @@ -208,3 +209,4 @@ int drm_ati_pcigart_init(struct drm_devi gart_info->bus_addr = bus_address; return ret; } +EXPORT_SYMBOL(drm_ati_pcigart_init); Modified: stable/10/sys/dev/drm2/drm.h ============================================================================== --- stable/10/sys/dev/drm2/drm.h Tue Apr 28 19:15:28 2015 (r282198) +++ stable/10/sys/dev/drm2/drm.h Tue Apr 28 19:35:05 2015 (r282199) @@ -36,69 +36,31 @@ #include __FBSDID("$FreeBSD$"); -/** - * \mainpage - * - * The Direct Rendering Manager (DRM) is a device-independent kernel-level - * device driver that provides support for the XFree86 Direct Rendering - * Infrastructure (DRI). - * - * The DRM supports the Direct Rendering Infrastructure (DRI) in four major - * ways: - * -# The DRM provides synchronized access to the graphics hardware via - * the use of an optimized two-tiered lock. - * -# The DRM enforces the DRI security policy for access to the graphics - * hardware by only allowing authenticated X11 clients access to - * restricted regions of memory. - * -# The DRM provides a generic DMA engine, complete with multiple - * queues and the ability to detect the need for an OpenGL context - * switch. - * -# The DRM is extensible via the use of small device-specific modules - * that rely extensively on the API exported by the DRM module. - * - */ - #ifndef _DRM_H_ #define _DRM_H_ -#ifndef __user -#define __user -#endif -#ifndef __iomem -#define __iomem -#endif +#if defined(__linux__) -#ifdef __GNUC__ -# define DEPRECATED __attribute__ ((deprecated)) -#else -# define DEPRECATED -#endif +#include +#include +typedef unsigned int drm_handle_t; + +#else /* One of the BSDs */ -#if defined(__linux__) -#include /* For _IO* macros */ -#define DRM_IOCTL_NR(n) _IOC_NR(n) -#define DRM_IOC_VOID _IOC_NONE -#define DRM_IOC_READ _IOC_READ -#define DRM_IOC_WRITE _IOC_WRITE -#define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE -#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #include -#define DRM_IOCTL_NR(n) ((n) & 0xff) -#define DRM_IOC_VOID IOC_VOID -#define DRM_IOC_READ IOC_OUT -#define DRM_IOC_WRITE IOC_IN -#define DRM_IOC_READWRITE IOC_INOUT -#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) -#endif +#include +typedef int8_t __s8; +typedef uint8_t __u8; +typedef int16_t __s16; +typedef uint16_t __u16; +typedef int32_t __s32; +typedef uint32_t __u32; +typedef int64_t __s64; +typedef uint64_t __u64; +typedef unsigned long drm_handle_t; -#ifdef __OpenBSD__ -#define DRM_MAJOR 81 +#include #endif -#if defined(__linux__) || defined(__NetBSD__) -#define DRM_MAJOR 226 -#endif -#define DRM_MAX_MINOR 15 #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ @@ -111,20 +73,14 @@ __FBSDID("$FreeBSD$"); #define _DRM_LOCK_IS_CONT(lock) ((lock) & _DRM_LOCK_CONT) #define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT)) -#if defined(__linux__) -typedef unsigned int drm_handle_t; -#else -#include -typedef unsigned long drm_handle_t; /**< To mapped regions */ -#endif -typedef unsigned int drm_context_t; /**< GLXContext handle */ +typedef unsigned int drm_context_t; typedef unsigned int drm_drawable_t; -typedef unsigned int drm_magic_t; /**< Magic for authentication */ +typedef unsigned int drm_magic_t; /** * Cliprect. * - * \warning If you change this structure, make sure you change + * \warning: If you change this structure, make sure you change * XF86DRIClipRectRec in the server as well * * \note KW: Actually it's illegal to change either for @@ -138,6 +94,14 @@ struct drm_clip_rect { }; /** + * Drawable information. + */ +struct drm_drawable_info { + unsigned int num_rects; + struct drm_clip_rect *rects; +}; + +/** * Texture region, */ struct drm_tex_region { @@ -160,22 +124,6 @@ struct drm_hw_lock { char padding[60]; /**< Pad to cache line */ }; -/* This is beyond ugly, and only works on GCC. However, it allows me to use - * drm.h in places (i.e., in the X-server) where I can't use size_t. The real - * fix is to use uint32_t instead of size_t, but that fix will break existing - * LP64 (i.e., PowerPC64, SPARC64, IA-64, Alpha, etc.) systems. That *will* - * eventually happen, though. I chose 'unsigned long' to be the fallback type - * because that works on all the platforms I know about. Hopefully, the - * real fix will happen before that bites us. - */ - -#ifdef __SIZE_TYPE__ -# define DRM_SIZE_T __SIZE_TYPE__ -#else -# warning "__SIZE_TYPE__ not defined. Assuming sizeof(size_t) == sizeof(unsigned long)!" -# define DRM_SIZE_T unsigned long -#endif - /** * DRM_IOCTL_VERSION ioctl argument type. * @@ -185,12 +133,12 @@ struct drm_version { int version_major; /**< Major version */ int version_minor; /**< Minor version */ int version_patchlevel; /**< Patch level */ - DRM_SIZE_T name_len; /**< Length of name buffer */ - char __user *name; /**< Name of driver */ - DRM_SIZE_T date_len; /**< Length of date buffer */ - char __user *date; /**< User-space buffer to hold date */ - DRM_SIZE_T desc_len; /**< Length of desc buffer */ - char __user *desc; /**< User-space buffer to hold desc */ + size_t name_len; /**< Length of name buffer */ + char __user *name; /**< Name of driver */ + size_t date_len; /**< Length of date buffer */ + char __user *date; /**< User-space buffer to hold date */ + size_t desc_len; /**< Length of desc buffer */ + char __user *desc; /**< User-space buffer to hold desc */ }; /** @@ -199,12 +147,10 @@ struct drm_version { * \sa drmGetBusid() and drmSetBusId(). */ struct drm_unique { - DRM_SIZE_T unique_len; /**< Length of unique */ - char __user *unique; /**< Unique name for driver instantiation */ + size_t unique_len; /**< Length of unique */ + char __user *unique; /**< Unique name for driver instantiation */ }; -#undef DRM_SIZE_T - struct drm_list { int count; /**< Length of user-space structures */ struct drm_version __user *version; @@ -239,7 +185,7 @@ enum drm_map_type { _DRM_AGP = 3, /**< AGP/GART */ _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ - _DRM_GEM = 6 /**< GEM */ + _DRM_GEM = 6, /**< GEM object */ }; /** @@ -388,8 +334,8 @@ struct drm_buf_desc { enum { _DRM_PAGE_ALIGN = 0x01, /**< Align on page boundaries for DMA */ _DRM_AGP_BUFFER = 0x02, /**< Buffer is in AGP space */ - _DRM_SG_BUFFER = 0x04, /**< Scatter/gather memory buffer */ - _DRM_FB_BUFFER = 0x08, /**< Buffer is in frame buffer */ + _DRM_SG_BUFFER = 0x04, /**< Scatter/gather memory buffer */ + _DRM_FB_BUFFER = 0x08, /**< Buffer is in frame buffer */ _DRM_PCI_BUFFER_RO = 0x10 /**< Map PCI DMA buffer read-only */ } flags; unsigned long agp_start; /**< @@ -402,8 +348,8 @@ struct drm_buf_desc { * DRM_IOCTL_INFO_BUFS ioctl argument type. */ struct drm_buf_info { - int count; /**< Number of buffers described in list */ - struct drm_buf_desc __user *list; /**< List of buffer descriptions */ + int count; /**< Entries in list */ + struct drm_buf_desc __user *list; }; /** @@ -431,11 +377,7 @@ struct drm_buf_pub { */ struct drm_buf_map { int count; /**< Length of the buffer list */ -#if defined(__cplusplus) - void __user *c_virtual; -#else void __user *virtual; /**< Mmap'd area in user-virtual */ -#endif struct drm_buf_pub __user *list; /**< Buffer information */ }; @@ -454,7 +396,7 @@ struct drm_dma { enum drm_dma_flags flags; /**< Flags */ int request_count; /**< Number of buffers requested */ int request_size; /**< Desired size for buffers */ - int __user *request_indices; /**< Buffer information */ + int __user *request_indices; /**< Buffer information */ int __user *request_sizes; int granted_count; /**< Number of buffers granted */ }; @@ -525,12 +467,13 @@ struct drm_irq_busid { enum drm_vblank_seq_type { _DRM_VBLANK_ABSOLUTE = 0x0, /**< Wait for specific vblank sequence number */ _DRM_VBLANK_RELATIVE = 0x1, /**< Wait for given number of vblanks */ + /* bits 1-6 are reserved for high crtcs */ _DRM_VBLANK_HIGH_CRTC_MASK = 0x0000003e, _DRM_VBLANK_EVENT = 0x4000000, /**< Send event instead of blocking */ - _DRM_VBLANK_FLIP = 0x8000000, /**< Scheduled buffer swap should flip */ + _DRM_VBLANK_FLIP = 0x8000000, /**< Scheduled buffer swap should flip */ _DRM_VBLANK_NEXTONMISS = 0x10000000, /**< If missed, wait for next vblank */ _DRM_VBLANK_SECONDARY = 0x20000000, /**< Secondary display controller */ - _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking */ + _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking, unsupported */ }; #define _DRM_VBLANK_HIGH_CRTC_SHIFT 1 @@ -561,7 +504,6 @@ union drm_wait_vblank { struct drm_wait_vblank_reply reply; }; - #define _DRM_PRE_MODESET 1 #define _DRM_POST_MODESET 2 @@ -571,8 +513,8 @@ union drm_wait_vblank { * \sa drmModesetCtl(). */ struct drm_modeset_ctl { - uint32_t crtc; - uint32_t cmd; + __u32 crtc; + __u32 cmd; }; /** @@ -617,16 +559,14 @@ struct drm_agp_info { int agp_version_major; int agp_version_minor; unsigned long mode; - unsigned long aperture_base; /**< physical address */ - unsigned long aperture_size; /**< bytes */ - unsigned long memory_allowed; /**< bytes */ + unsigned long aperture_base; /* physical address */ + unsigned long aperture_size; /* bytes */ + unsigned long memory_allowed; /* bytes */ unsigned long memory_used; - /** \name PCI information */ - /*@{ */ + /* PCI information */ unsigned short id_vendor; unsigned short id_device; - /*@} */ }; /** @@ -647,386 +587,52 @@ struct drm_set_version { int drm_dd_minor; }; -#define DRM_FENCE_FLAG_EMIT 0x00000001 -#define DRM_FENCE_FLAG_SHAREABLE 0x00000002 -/** - * On hardware with no interrupt events for operation completion, - * indicates that the kernel should sleep while waiting for any blocking - * operation to complete rather than spinning. - * - * Has no effect otherwise. - */ -#define DRM_FENCE_FLAG_WAIT_LAZY 0x00000004 -#define DRM_FENCE_FLAG_NO_USER 0x00000010 - -/* Reserved for driver use */ -#define DRM_FENCE_MASK_DRIVER 0xFF000000 - -#define DRM_FENCE_TYPE_EXE 0x00000001 - -struct drm_fence_arg { - unsigned int handle; - unsigned int fence_class; - unsigned int type; - unsigned int flags; - unsigned int signaled; - unsigned int error; - unsigned int sequence; - unsigned int pad64; - uint64_t expand_pad[2]; /* Future expansion */ -}; - -/* Buffer permissions, referring to how the GPU uses the buffers. - * these translate to fence types used for the buffers. - * Typically a texture buffer is read, A destination buffer is write and - * a command (batch-) buffer is exe. Can be or-ed together. - */ - -#define DRM_BO_FLAG_READ (1ULL << 0) -#define DRM_BO_FLAG_WRITE (1ULL << 1) -#define DRM_BO_FLAG_EXE (1ULL << 2) - -/* - * All of the bits related to access mode - */ -#define DRM_BO_MASK_ACCESS (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_EXE) -/* - * Status flags. Can be read to determine the actual state of a buffer. - * Can also be set in the buffer mask before validation. - */ - -/* - * Mask: Never evict this buffer. Not even with force. This type of buffer is only - * available to root and must be manually removed before buffer manager shutdown - * or lock. - * Flags: Acknowledge - */ -#define DRM_BO_FLAG_NO_EVICT (1ULL << 4) - -/* - * Mask: Require that the buffer is placed in mappable memory when validated. - * If not set the buffer may or may not be in mappable memory when validated. - * Flags: If set, the buffer is in mappable memory. - */ -#define DRM_BO_FLAG_MAPPABLE (1ULL << 5) - -/* Mask: The buffer should be shareable with other processes. - * Flags: The buffer is shareable with other processes. - */ -#define DRM_BO_FLAG_SHAREABLE (1ULL << 6) - -/* Mask: If set, place the buffer in cache-coherent memory if available. - * If clear, never place the buffer in cache coherent memory if validated. - * Flags: The buffer is currently in cache-coherent memory. - */ -#define DRM_BO_FLAG_CACHED (1ULL << 7) - -/* Mask: Make sure that every time this buffer is validated, - * it ends up on the same location provided that the memory mask is the same. - * The buffer will also not be evicted when claiming space for - * other buffers. Basically a pinned buffer but it may be thrown out as - * part of buffer manager shutdown or locking. - * Flags: Acknowledge. - */ -#define DRM_BO_FLAG_NO_MOVE (1ULL << 8) - -/* Mask: Make sure the buffer is in cached memory when mapped. In conjunction - * with DRM_BO_FLAG_CACHED it also allows the buffer to be bound into the GART - * with unsnooped PTEs instead of snooped, by using chipset-specific cache - * flushing at bind time. A better name might be DRM_BO_FLAG_TT_UNSNOOPED, - * as the eviction to local memory (TTM unbind) on map is just a side effect - * to prevent aggressive cache prefetch from the GPU disturbing the cache - * management that the DRM is doing. - * - * Flags: Acknowledge. - * Buffers allocated with this flag should not be used for suballocators - * This type may have issues on CPUs with over-aggressive caching - * http://marc.info/?l=linux-kernel&m=102376926732464&w=2 - */ -#define DRM_BO_FLAG_CACHED_MAPPED (1ULL << 19) - - -/* Mask: Force DRM_BO_FLAG_CACHED flag strictly also if it is set. - * Flags: Acknowledge. - */ -#define DRM_BO_FLAG_FORCE_CACHING (1ULL << 13) - -/* - * Mask: Force DRM_BO_FLAG_MAPPABLE flag strictly also if it is clear. - * Flags: Acknowledge. - */ -#define DRM_BO_FLAG_FORCE_MAPPABLE (1ULL << 14) -#define DRM_BO_FLAG_TILE (1ULL << 15) - -/* - * Memory type flags that can be or'ed together in the mask, but only - * one appears in flags. - */ - -/* System memory */ -#define DRM_BO_FLAG_MEM_LOCAL (1ULL << 24) -/* Translation table memory */ -#define DRM_BO_FLAG_MEM_TT (1ULL << 25) -/* Vram memory */ -#define DRM_BO_FLAG_MEM_VRAM (1ULL << 26) -/* Up to the driver to define. */ -#define DRM_BO_FLAG_MEM_PRIV0 (1ULL << 27) -#define DRM_BO_FLAG_MEM_PRIV1 (1ULL << 28) -#define DRM_BO_FLAG_MEM_PRIV2 (1ULL << 29) -#define DRM_BO_FLAG_MEM_PRIV3 (1ULL << 30) -#define DRM_BO_FLAG_MEM_PRIV4 (1ULL << 31) -/* We can add more of these now with a 64-bit flag type */ - -/* - * This is a mask covering all of the memory type flags; easier to just - * use a single constant than a bunch of | values. It covers - * DRM_BO_FLAG_MEM_LOCAL through DRM_BO_FLAG_MEM_PRIV4 - */ -#define DRM_BO_MASK_MEM 0x00000000FF000000ULL -/* - * This adds all of the CPU-mapping options in with the memory - * type to label all bits which change how the page gets mapped - */ -#define DRM_BO_MASK_MEMTYPE (DRM_BO_MASK_MEM | \ - DRM_BO_FLAG_CACHED_MAPPED | \ - DRM_BO_FLAG_CACHED | \ - DRM_BO_FLAG_MAPPABLE) - -/* Driver-private flags */ -#define DRM_BO_MASK_DRIVER 0xFFFF000000000000ULL - -/* - * Don't block on validate and map. Instead, return EBUSY. - */ -#define DRM_BO_HINT_DONT_BLOCK 0x00000002 -/* - * Don't place this buffer on the unfenced list. This means - * that the buffer will not end up having a fence associated - * with it as a result of this operation - */ -#define DRM_BO_HINT_DONT_FENCE 0x00000004 -/** - * On hardware with no interrupt events for operation completion, - * indicates that the kernel should sleep while waiting for any blocking - * operation to complete rather than spinning. - * - * Has no effect otherwise. - */ -#define DRM_BO_HINT_WAIT_LAZY 0x00000008 -/* - * The client has compute relocations refering to this buffer using the - * offset in the presumed_offset field. If that offset ends up matching - * where this buffer lands, the kernel is free to skip executing those - * relocations - */ -#define DRM_BO_HINT_PRESUMED_OFFSET 0x00000010 - -#define DRM_BO_INIT_MAGIC 0xfe769812 -#define DRM_BO_INIT_MAJOR 1 -#define DRM_BO_INIT_MINOR 0 -#define DRM_BO_INIT_PATCH 0 - - -struct drm_bo_info_req { - uint64_t mask; - uint64_t flags; - unsigned int handle; - unsigned int hint; - unsigned int fence_class; - unsigned int desired_tile_stride; - unsigned int tile_info; - unsigned int pad64; - uint64_t presumed_offset; -}; - -struct drm_bo_create_req { - uint64_t flags; - uint64_t size; - uint64_t buffer_start; - unsigned int hint; - unsigned int page_alignment; -}; - - -/* - * Reply flags - */ - -#define DRM_BO_REP_BUSY 0x00000001 - -struct drm_bo_info_rep { - uint64_t flags; - uint64_t proposed_flags; - uint64_t size; - uint64_t offset; - uint64_t arg_handle; - uint64_t buffer_start; - unsigned int handle; - unsigned int fence_flags; - unsigned int rep_flags; - unsigned int page_alignment; - unsigned int desired_tile_stride; - unsigned int hw_tile_stride; - unsigned int tile_info; - unsigned int pad64; - uint64_t expand_pad[4]; /*Future expansion */ -}; - -struct drm_bo_arg_rep { - struct drm_bo_info_rep bo_info; - int ret; - unsigned int pad64; -}; - -struct drm_bo_create_arg { - union { - struct drm_bo_create_req req; - struct drm_bo_info_rep rep; - } d; -}; - -struct drm_bo_handle_arg { - unsigned int handle; -}; - -struct drm_bo_reference_info_arg { - union { - struct drm_bo_handle_arg req; - struct drm_bo_info_rep rep; - } d; -}; - -struct drm_bo_map_wait_idle_arg { - union { - struct drm_bo_info_req req; - struct drm_bo_info_rep rep; - } d; -}; - -struct drm_bo_op_req { - enum { - drm_bo_validate, - drm_bo_fence, - drm_bo_ref_fence, - } op; - unsigned int arg_handle; - struct drm_bo_info_req bo_req; -}; - - -struct drm_bo_op_arg { - uint64_t next; - union { - struct drm_bo_op_req req; - struct drm_bo_arg_rep rep; - } d; - int handled; - unsigned int pad64; -}; - - -#define DRM_BO_MEM_LOCAL 0 -#define DRM_BO_MEM_TT 1 -#define DRM_BO_MEM_VRAM 2 -#define DRM_BO_MEM_PRIV0 3 -#define DRM_BO_MEM_PRIV1 4 -#define DRM_BO_MEM_PRIV2 5 -#define DRM_BO_MEM_PRIV3 6 -#define DRM_BO_MEM_PRIV4 7 - -#define DRM_BO_MEM_TYPES 8 /* For now. */ - -#define DRM_BO_LOCK_UNLOCK_BM (1 << 0) -#define DRM_BO_LOCK_IGNORE_NO_EVICT (1 << 1) - -struct drm_bo_version_arg { - uint32_t major; - uint32_t minor; - uint32_t patchlevel; -}; - -struct drm_mm_type_arg { - unsigned int mem_type; - unsigned int lock_flags; -}; - -struct drm_mm_init_arg { - unsigned int magic; - unsigned int major; - unsigned int minor; - unsigned int mem_type; - uint64_t p_offset; - uint64_t p_size; -}; - -struct drm_mm_info_arg { - unsigned int mem_type; - uint64_t p_size; -}; - +/** DRM_IOCTL_GEM_CLOSE ioctl argument type */ struct drm_gem_close { /** Handle of the object to be closed. */ - uint32_t handle; - uint32_t pad; + __u32 handle; + __u32 pad; }; +/** DRM_IOCTL_GEM_FLINK ioctl argument type */ struct drm_gem_flink { /** Handle for the object being named */ - uint32_t handle; + __u32 handle; /** Returned global name */ - uint32_t name; + __u32 name; }; +/** DRM_IOCTL_GEM_OPEN ioctl argument type */ struct drm_gem_open { /** Name of object being opened */ - uint32_t name; + __u32 name; /** Returned handle for the object */ - uint32_t handle; - + __u32 handle; + /** Returned size of the object */ - uint64_t size; + __u64 size; }; +/** DRM_IOCTL_GET_CAP ioctl argument type */ struct drm_get_cap { - uint64_t capability; - uint64_t value; + __u64 capability; + __u64 value; }; -struct drm_event { - uint32_t type; - uint32_t length; -}; +#define DRM_CLOEXEC O_CLOEXEC +struct drm_prime_handle { + __u32 handle; -#define DRM_EVENT_VBLANK 0x01 -#define DRM_EVENT_FLIP_COMPLETE 0x02 + /** Flags.. only applicable for handle->fd */ + __u32 flags; -struct drm_event_vblank { - struct drm_event base; - uint64_t user_data; - uint32_t tv_sec; - uint32_t tv_usec; - uint32_t sequence; - uint32_t reserved; + /** Returned dmabuf file descriptor */ + __s32 fd; }; -#define DRM_CAP_DUMB_BUFFER 0x1 -#define DRM_CAP_VBLANK_HIGH_CRTC 0x2 -#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3 -#define DRM_CAP_DUMB_PREFER_SHADOW 0x4 -#define DRM_CAP_PRIME 0x5 -#define DRM_CAP_TIMESTAMP_MONOTONIC 0x6 - -#define DRM_PRIME_CAP_IMPORT 0x1 -#define DRM_PRIME_CAP_EXPORT 0x2 - -#include "drm_mode.h" - -/** - * \name Ioctls Definitions - */ -/*@{*/ +#include #define DRM_IOCTL_BASE 'd' #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) @@ -1042,12 +648,10 @@ struct drm_event_vblank { #define DRM_IOCTL_GET_CLIENT DRM_IOWR(0x05, struct drm_client) #define DRM_IOCTL_GET_STATS DRM_IOR( 0x06, struct drm_stats) #define DRM_IOCTL_SET_VERSION DRM_IOWR(0x07, struct drm_set_version) -#define DRM_IOCTL_MODESET_CTL DRM_IOW(0x08, struct drm_modeset_ctl) - +#define DRM_IOCTL_MODESET_CTL DRM_IOW(0x08, struct drm_modeset_ctl) #define DRM_IOCTL_GEM_CLOSE DRM_IOW (0x09, struct drm_gem_close) #define DRM_IOCTL_GEM_FLINK DRM_IOWR(0x0a, struct drm_gem_flink) #define DRM_IOCTL_GEM_OPEN DRM_IOWR(0x0b, struct drm_gem_open) - #define DRM_IOCTL_GET_CAP DRM_IOWR(0x0c, struct drm_get_cap) #define DRM_IOCTL_SET_UNIQUE DRM_IOW( 0x10, struct drm_unique) @@ -1065,7 +669,7 @@ struct drm_event_vblank { #define DRM_IOCTL_RM_MAP DRM_IOW( 0x1b, struct drm_map) #define DRM_IOCTL_SET_SAREA_CTX DRM_IOW( 0x1c, struct drm_ctx_priv_map) -#define DRM_IOCTL_GET_SAREA_CTX DRM_IOWR(0x1d, struct drm_ctx_priv_map) +#define DRM_IOCTL_GET_SAREA_CTX DRM_IOWR(0x1d, struct drm_ctx_priv_map) #define DRM_IOCTL_SET_MASTER DRM_IO(0x1e) #define DRM_IOCTL_DROP_MASTER DRM_IO(0x1f) @@ -1084,7 +688,8 @@ struct drm_event_vblank { #define DRM_IOCTL_UNLOCK DRM_IOW( 0x2b, struct drm_lock) #define DRM_IOCTL_FINISH DRM_IOW( 0x2c, struct drm_lock) -#define DRM_IOCTL_GEM_PRIME_OPEN DRM_IOWR(0x2e, struct drm_gem_open) +#define DRM_IOCTL_PRIME_HANDLE_TO_FD DRM_IOWR(0x2d, struct drm_prime_handle) +#define DRM_IOCTL_PRIME_FD_TO_HANDLE DRM_IOWR(0x2e, struct drm_prime_handle) #define DRM_IOCTL_AGP_ACQUIRE DRM_IO( 0x30) #define DRM_IOCTL_AGP_RELEASE DRM_IO( 0x31) @@ -1100,7 +705,7 @@ struct drm_event_vblank { #define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) -#define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, struct drm_update_draw) +#define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, struct drm_update_draw) #define DRM_IOCTL_MODE_GETRESOURCES DRM_IOWR(0xA0, struct drm_mode_card_res) #define DRM_IOCTL_MODE_GETCRTC DRM_IOWR(0xA1, struct drm_mode_crtc) @@ -1122,43 +727,16 @@ struct drm_event_vblank { #define DRM_IOCTL_MODE_PAGE_FLIP DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip) #define DRM_IOCTL_MODE_DIRTYFB DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd) -#define DRM_IOCTL_MODE_CREATE_DUMB DRM_IOWR(0xB2, struct drm_mode_create_dumb) -#define DRM_IOCTL_MODE_MAP_DUMB DRM_IOWR(0xB3, struct drm_mode_map_dumb) -#define DRM_IOCTL_MODE_DESTROY_DUMB DRM_IOWR(0xB4, struct drm_mode_destroy_dumb) +#define DRM_IOCTL_MODE_CREATE_DUMB DRM_IOWR(0xB2, struct drm_mode_create_dumb) +#define DRM_IOCTL_MODE_MAP_DUMB DRM_IOWR(0xB3, struct drm_mode_map_dumb) +#define DRM_IOCTL_MODE_DESTROY_DUMB DRM_IOWR(0xB4, struct drm_mode_destroy_dumb) #define DRM_IOCTL_MODE_GETPLANERESOURCES DRM_IOWR(0xB5, struct drm_mode_get_plane_res) -#define DRM_IOCTL_MODE_GETPLANE DRM_IOWR(0xB6, struct drm_mode_get_plane) -#define DRM_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct drm_mode_set_plane) +#define DRM_IOCTL_MODE_GETPLANE DRM_IOWR(0xB6, struct drm_mode_get_plane) +#define DRM_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct drm_mode_set_plane) #define DRM_IOCTL_MODE_ADDFB2 DRM_IOWR(0xB8, struct drm_mode_fb_cmd2) #define DRM_IOCTL_MODE_OBJ_GETPROPERTIES DRM_IOWR(0xB9, struct drm_mode_obj_get_properties) #define DRM_IOCTL_MODE_OBJ_SETPROPERTY DRM_IOWR(0xBA, struct drm_mode_obj_set_property) -#define DRM_IOCTL_MM_INIT DRM_IOWR(0xc0, struct drm_mm_init_arg) -#define DRM_IOCTL_MM_TAKEDOWN DRM_IOWR(0xc1, struct drm_mm_type_arg) -#define DRM_IOCTL_MM_LOCK DRM_IOWR(0xc2, struct drm_mm_type_arg) -#define DRM_IOCTL_MM_UNLOCK DRM_IOWR(0xc3, struct drm_mm_type_arg) - -#define DRM_IOCTL_FENCE_CREATE DRM_IOWR(0xc4, struct drm_fence_arg) -#define DRM_IOCTL_FENCE_REFERENCE DRM_IOWR(0xc6, struct drm_fence_arg) -#define DRM_IOCTL_FENCE_UNREFERENCE DRM_IOWR(0xc7, struct drm_fence_arg) -#define DRM_IOCTL_FENCE_SIGNALED DRM_IOWR(0xc8, struct drm_fence_arg) -#define DRM_IOCTL_FENCE_FLUSH DRM_IOWR(0xc9, struct drm_fence_arg) -#define DRM_IOCTL_FENCE_WAIT DRM_IOWR(0xca, struct drm_fence_arg) -#define DRM_IOCTL_FENCE_EMIT DRM_IOWR(0xcb, struct drm_fence_arg) -#define DRM_IOCTL_FENCE_BUFFERS DRM_IOWR(0xcc, struct drm_fence_arg) - -#define DRM_IOCTL_BO_CREATE DRM_IOWR(0xcd, struct drm_bo_create_arg) -#define DRM_IOCTL_BO_MAP DRM_IOWR(0xcf, struct drm_bo_map_wait_idle_arg) -#define DRM_IOCTL_BO_UNMAP DRM_IOWR(0xd0, struct drm_bo_handle_arg) -#define DRM_IOCTL_BO_REFERENCE DRM_IOWR(0xd1, struct drm_bo_reference_info_arg) -#define DRM_IOCTL_BO_UNREFERENCE DRM_IOWR(0xd2, struct drm_bo_handle_arg) -#define DRM_IOCTL_BO_SETSTATUS DRM_IOWR(0xd3, struct drm_bo_map_wait_idle_arg) -#define DRM_IOCTL_BO_INFO DRM_IOWR(0xd4, struct drm_bo_reference_info_arg) -#define DRM_IOCTL_BO_WAIT_IDLE DRM_IOWR(0xd5, struct drm_bo_map_wait_idle_arg) -#define DRM_IOCTL_BO_VERSION DRM_IOR(0xd6, struct drm_bo_version_arg) -#define DRM_IOCTL_MM_INFO DRM_IOWR(0xd7, struct drm_mm_info_arg) - -/*@}*/ - /** * Device specific ioctls should only be in their respective headers * The device specific ioctl range is from 0x40 to 0x99. @@ -1168,11 +746,51 @@ struct drm_event_vblank { * drmCommandReadWrite(). */ #define DRM_COMMAND_BASE 0x40 -#define DRM_COMMAND_END 0xA0 +#define DRM_COMMAND_END 0xA0 + +/** + * Header for events written back to userspace on the drm fd. The + * type defines the type of event, the length specifies the total + * length of the event (including the header), and user_data is + * typically a 64 bit value passed with the ioctl that triggered the + * event. A read on the drm fd will always only return complete + * events, that is, if for example the read buffer is 100 bytes, and + * there are two 64 byte events pending, only one will be returned. + * + * Event types 0 - 0x7fffffff are generic drm events, 0x80000000 and + * up are chipset specific. + */ +struct drm_event { + __u32 type; + __u32 length; +}; + +#define DRM_EVENT_VBLANK 0x01 +#define DRM_EVENT_FLIP_COMPLETE 0x02 + +struct drm_event_vblank { + struct drm_event base; + __u64 user_data; + __u32 tv_sec; + __u32 tv_usec; + __u32 sequence; + __u32 reserved; +}; + +#define DRM_CAP_DUMB_BUFFER 0x1 +#define DRM_CAP_VBLANK_HIGH_CRTC 0x2 +#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3 +#define DRM_CAP_DUMB_PREFER_SHADOW 0x4 +#define DRM_CAP_PRIME 0x5 +#define DRM_CAP_TIMESTAMP_MONOTONIC 0x6 + +#define DRM_PRIME_CAP_IMPORT 0x1 +#define DRM_PRIME_CAP_EXPORT 0x2 /* typedef area */ #ifndef __KERNEL__ typedef struct drm_clip_rect drm_clip_rect_t; +typedef struct drm_drawable_info drm_drawable_info_t; typedef struct drm_tex_region drm_tex_region_t; typedef struct drm_hw_lock drm_hw_lock_t; typedef struct drm_version drm_version_t; @@ -1206,16 +824,12 @@ typedef struct drm_update_draw drm_updat typedef struct drm_auth drm_auth_t; typedef struct drm_irq_busid drm_irq_busid_t; typedef enum drm_vblank_seq_type drm_vblank_seq_type_t; + typedef struct drm_agp_buffer drm_agp_buffer_t; typedef struct drm_agp_binding drm_agp_binding_t; typedef struct drm_agp_info drm_agp_info_t; typedef struct drm_scatter_gather drm_scatter_gather_t; typedef struct drm_set_version drm_set_version_t; - -typedef struct drm_fence_arg drm_fence_arg_t; -typedef struct drm_mm_type_arg drm_mm_type_arg_t; -typedef struct drm_mm_init_arg drm_mm_init_arg_t; -typedef enum drm_bo_type drm_bo_type_t; #endif #endif Modified: stable/10/sys/dev/drm2/drmP.h ============================================================================== --- stable/10/sys/dev/drm2/drmP.h Tue Apr 28 19:15:28 2015 (r282198) +++ stable/10/sys/dev/drm2/drmP.h Tue Apr 28 19:35:05 2015 (r282199) @@ -100,14 +100,17 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include +#include + +#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) +#define __OS_HAS_MTRR (defined(CONFIG_MTRR)) + struct drm_file; struct drm_device; -#include #include #include @@ -146,244 +149,116 @@ struct drm_device; #define DRIVER_GEM 0x1000 #define DRIVER_MODESET 0x2000 #define DRIVER_PRIME 0x4000 -#define DRIVER_LOCKLESS_IRQ 0x8000 - - -#define DRM_HASH_SIZE 16 /* Size of key hash table */ -#define DRM_KERNEL_CONTEXT 0 /* Change drm_resctx if changed */ -#define DRM_RESERVED_CONTEXTS 1 /* Change drm_resctx if changed */ - -#define DRM_GEM_MAPPING_MASK (3ULL << 62) -#define DRM_GEM_MAPPING_KEY (2ULL << 62) /* Non-canonical address form */ -#define DRM_GEM_MAX_IDX 0x3fffff -#define DRM_GEM_MAPPING_IDX(o) (((o) >> 40) & DRM_GEM_MAX_IDX) -#define DRM_GEM_MAPPING_OFF(i) (((uint64_t)(i)) << 40) -#define DRM_GEM_MAPPING_MAPOFF(o) \ - ((o) & ~(DRM_GEM_MAPPING_OFF(DRM_GEM_MAX_IDX) | DRM_GEM_MAPPING_KEY)) - -MALLOC_DECLARE(DRM_MEM_DMA); -MALLOC_DECLARE(DRM_MEM_SAREA); -MALLOC_DECLARE(DRM_MEM_DRIVER); -MALLOC_DECLARE(DRM_MEM_MAGIC); -MALLOC_DECLARE(DRM_MEM_IOCTLS); -MALLOC_DECLARE(DRM_MEM_MAPS); -MALLOC_DECLARE(DRM_MEM_BUFS); -MALLOC_DECLARE(DRM_MEM_SEGS); -MALLOC_DECLARE(DRM_MEM_PAGES); -MALLOC_DECLARE(DRM_MEM_FILES); -MALLOC_DECLARE(DRM_MEM_QUEUES); -MALLOC_DECLARE(DRM_MEM_CMDS); -MALLOC_DECLARE(DRM_MEM_MAPPINGS); -MALLOC_DECLARE(DRM_MEM_BUFLISTS); -MALLOC_DECLARE(DRM_MEM_AGPLISTS); -MALLOC_DECLARE(DRM_MEM_CTXBITMAP); -MALLOC_DECLARE(DRM_MEM_SGLISTS); -MALLOC_DECLARE(DRM_MEM_DRAWABLE); -MALLOC_DECLARE(DRM_MEM_MM); -MALLOC_DECLARE(DRM_MEM_HASHTAB); -MALLOC_DECLARE(DRM_MEM_KMS); - -SYSCTL_DECL(_hw_drm); -#define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8) +#define DRIVER_BUS_PCI 0x1 +#define DRIVER_BUS_PLATFORM 0x2 +#define DRIVER_BUS_USB 0x3 /***********************************************************************/ -/** \name Internal types and structures */ +/** \name Begin the DRM... */ /*@{*/ -#define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) -#define DRM_MIN(a,b) ((a)<(b)?(a):(b)) -#define DRM_MAX(a,b) ((a)>(b)?(a):(b)) - -#define DRM_IF_VERSION(maj, min) (maj << 16 | min) - -#define __OS_HAS_AGP 1 - -#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) -#define DRM_DEV_UID 0 -#define DRM_DEV_GID 0 - -#define wait_queue_head_t atomic_t -#define DRM_WAKEUP(w) wakeup((void *)w) -#define DRM_WAKEUP_INT(w) wakeup(w) -#define DRM_INIT_WAITQUEUE(queue) do {(void)(queue);} while (0) - -#define DRM_CURPROC curthread -#define DRM_STRUCTPROC struct thread -#define DRM_SPINTYPE struct mtx -#define DRM_SPININIT(l,name) mtx_init(l, name, NULL, MTX_DEF) -#define DRM_SPINUNINIT(l) mtx_destroy(l) -#define DRM_SPINLOCK(l) mtx_lock(l) -#define DRM_SPINUNLOCK(u) mtx_unlock(u) -#define DRM_SPINLOCK_IRQSAVE(l, irqflags) do { \ - mtx_lock(l); \ - (void)irqflags; \ -} while (0) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 21:58:12 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34188F6D; Tue, 28 Apr 2015 21:58:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21CB31C4A; Tue, 28 Apr 2015 21:58:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SLwCx6040149; Tue, 28 Apr 2015 21:58:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SLwBNY040148; Tue, 28 Apr 2015 21:58:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504282158.t3SLwBNY040148@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 28 Apr 2015 21:58:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282203 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 21:58:12 -0000 Author: gjb Date: Tue Apr 28 21:58:11 2015 New Revision: 282203 URL: https://svnweb.freebsd.org/changeset/base/282203 Log: Document r281255, devfs(5) read/write update timestamp precision. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 21:57:52 2015 (r282202) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Apr 28 21:58:11 2015 (r282203) @@ -279,6 +279,14 @@ &man.hwpmc.4; default and maximum callchain depths have been increased. The default has been increased from 16 to 32, and the maximum increased from 32 to 128. + + The &man.devfs.5; device filesystem has + been changed to update timestamps for read/write operations + using seconds precision. A new &man.sysctl.8;, + vfs.devfs.dotimes has been added, which + when set to a non-zero value, enables default precision + timestamps for these operations. From owner-svn-src-stable@FreeBSD.ORG Tue Apr 28 22:32:53 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24B237B8; Tue, 28 Apr 2015 22:32:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 128BE100B; Tue, 28 Apr 2015 22:32:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SMWqOt059703; Tue, 28 Apr 2015 22:32:52 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SMWqlS059702; Tue, 28 Apr 2015 22:32:52 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201504282232.t3SMWqlS059702@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Tue, 28 Apr 2015 22:32:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282204 - stable/10/usr.sbin/sysrc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 22:32:53 -0000 Author: dteske Date: Tue Apr 28 22:32:52 2015 New Revision: 282204 URL: https://svnweb.freebsd.org/changeset/base/282204 Log: MFC r281780: Update usage statement; align with post-r279624. Modified: stable/10/usr.sbin/sysrc/sysrc Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/sysrc/sysrc ============================================================================== --- stable/10/usr.sbin/sysrc/sysrc Tue Apr 28 21:58:11 2015 (r282203) +++ stable/10/usr.sbin/sysrc/sysrc Tue Apr 28 22:32:52 2015 (r282204) @@ -80,7 +80,7 @@ die() # usage() { - f_err "Usage: %s [OPTIONS] name[[+]=value] ...\n" "$pgm" + f_err "Usage: %s [OPTIONS] name[[+|-]=value] ...\n" "$pgm" f_err "Try \`%s --help' for more information.\n" "$pgm" die } From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 12:54:22 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BDEEDE1; Wed, 29 Apr 2015 12:54:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7922B1BCB; Wed, 29 Apr 2015 12:54:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TCsMgG088209; Wed, 29 Apr 2015 12:54:22 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TCsMdb088207; Wed, 29 Apr 2015 12:54:22 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201504291254.t3TCsMdb088207@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Wed, 29 Apr 2015 12:54:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282217 - in stable/10/sys/modules/drm2: . radeonkmsfw X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 12:54:22 -0000 Author: dumbbell Date: Wed Apr 29 12:54:21 2015 New Revision: 282217 URL: https://svnweb.freebsd.org/changeset/base/282217 Log: drm: Allow parallel builds of drivers and firmwares Submitted by: hps@ MFC of: r279600 Modified: stable/10/sys/modules/drm2/Makefile stable/10/sys/modules/drm2/radeonkmsfw/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/modules/drm2/Makefile ============================================================================== --- stable/10/sys/modules/drm2/Makefile Wed Apr 29 12:53:41 2015 (r282216) +++ stable/10/sys/modules/drm2/Makefile Wed Apr 29 12:54:21 2015 (r282217) @@ -2,6 +2,8 @@ .include +SUBDIR_PARALLEL= + .if ${MACHINE_CPUARCH} == "amd64" _i915kms= i915kms _radeonkms= radeonkms Modified: stable/10/sys/modules/drm2/radeonkmsfw/Makefile ============================================================================== --- stable/10/sys/modules/drm2/radeonkmsfw/Makefile Wed Apr 29 12:53:41 2015 (r282216) +++ stable/10/sys/modules/drm2/radeonkmsfw/Makefile Wed Apr 29 12:54:21 2015 (r282217) @@ -1,5 +1,7 @@ # $FreeBSD$ +SUBDIR_PARALLEL= + SUBDIR= \ ARUBA_me \ ARUBA_pfp \ From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 15:26:59 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 343DDF5F; Wed, 29 Apr 2015 15:26:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 225131DAE; Wed, 29 Apr 2015 15:26:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TFQxeu063280; Wed, 29 Apr 2015 15:26:59 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TFQwbp063279; Wed, 29 Apr 2015 15:26:59 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201504291526.t3TFQwbp063279@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 29 Apr 2015 15:26:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282222 - stable/10/lib/libgeom X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 15:26:59 -0000 Author: pfg Date: Wed Apr 29 15:26:58 2015 New Revision: 282222 URL: https://svnweb.freebsd.org/changeset/base/282222 Log: MFC r281875: libgeom: plug memory leak in EndElement. CID: 1016696 Found by: Clang static checker Modified: stable/10/lib/libgeom/geom_xml2tree.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libgeom/geom_xml2tree.c ============================================================================== --- stable/10/lib/libgeom/geom_xml2tree.c Wed Apr 29 15:00:43 2015 (r282221) +++ stable/10/lib/libgeom/geom_xml2tree.c Wed Apr 29 15:26:58 2015 (r282222) @@ -257,6 +257,7 @@ EndElement(void *userData, const char *n if (!strcmp(name, "config")) { mt->config = NULL; + free(p); return; } From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 15:28:05 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4007130; Wed, 29 Apr 2015 15:28:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 919B91DBE; Wed, 29 Apr 2015 15:28:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TFS5C4063492; Wed, 29 Apr 2015 15:28:05 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TFS50o063491; Wed, 29 Apr 2015 15:28:05 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201504291528.t3TFS50o063491@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 29 Apr 2015 15:28:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282223 - stable/9/lib/libgeom X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 15:28:05 -0000 Author: pfg Date: Wed Apr 29 15:28:04 2015 New Revision: 282223 URL: https://svnweb.freebsd.org/changeset/base/282223 Log: MFC r281875: libgeom: plug memory leak in EndElement. CID: 1016696 Found by: Clang static checker Modified: stable/9/lib/libgeom/geom_xml2tree.c Directory Properties: stable/9/lib/libgeom/ (props changed) Modified: stable/9/lib/libgeom/geom_xml2tree.c ============================================================================== --- stable/9/lib/libgeom/geom_xml2tree.c Wed Apr 29 15:26:58 2015 (r282222) +++ stable/9/lib/libgeom/geom_xml2tree.c Wed Apr 29 15:28:04 2015 (r282223) @@ -257,6 +257,7 @@ EndElement(void *userData, const char *n if (!strcmp(name, "config")) { mt->config = NULL; + free(p); return; } From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 15:33:09 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 199C62F4; Wed, 29 Apr 2015 15:33:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07BCF1EA1; Wed, 29 Apr 2015 15:33:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TFX8pk068146; Wed, 29 Apr 2015 15:33:08 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TFX8k3068145; Wed, 29 Apr 2015 15:33:08 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201504291533.t3TFX8k3068145@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 29 Apr 2015 15:33:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282224 - stable/10/lib/libthr/thread X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 15:33:09 -0000 Author: pfg Date: Wed Apr 29 15:33:07 2015 New Revision: 282224 URL: https://svnweb.freebsd.org/changeset/base/282224 Log: MFC r281857: _pthread_cleanup_push: fix allocator sizeof operand mismatch Same fix appears to be in DragonFly's libthread_xu. Found by: Clang Static Analyzer Modified: stable/10/lib/libthr/thread/thr_clean.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libthr/thread/thr_clean.c ============================================================================== --- stable/10/lib/libthr/thread/thr_clean.c Wed Apr 29 15:28:04 2015 (r282223) +++ stable/10/lib/libthr/thread/thr_clean.c Wed Apr 29 15:33:07 2015 (r282224) @@ -84,7 +84,7 @@ _pthread_cleanup_push(void (*routine) (v curthread->unwind_disabled = 1; #endif if ((newbuf = (struct pthread_cleanup *) - malloc(sizeof(struct _pthread_cleanup_info))) != NULL) { + malloc(sizeof(struct pthread_cleanup))) != NULL) { newbuf->routine = routine; newbuf->routine_arg = arg; newbuf->onheap = 1; From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 15:33:56 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2DDE56E; Wed, 29 Apr 2015 15:33:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E10F71EAE; Wed, 29 Apr 2015 15:33:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TFXtRC068289; Wed, 29 Apr 2015 15:33:55 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TFXt9a068288; Wed, 29 Apr 2015 15:33:55 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201504291533.t3TFXt9a068288@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 29 Apr 2015 15:33:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282225 - stable/9/lib/libthr/thread X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 15:33:56 -0000 Author: pfg Date: Wed Apr 29 15:33:55 2015 New Revision: 282225 URL: https://svnweb.freebsd.org/changeset/base/282225 Log: MFC r281857: _pthread_cleanup_push: fix allocator sizeof operand mismatch Same fix appears to be in DragonFly's libthread_xu. Found by: Clang Static Analyzer Modified: stable/9/lib/libthr/thread/thr_clean.c Directory Properties: stable/9/lib/libthr/ (props changed) Modified: stable/9/lib/libthr/thread/thr_clean.c ============================================================================== --- stable/9/lib/libthr/thread/thr_clean.c Wed Apr 29 15:33:07 2015 (r282224) +++ stable/9/lib/libthr/thread/thr_clean.c Wed Apr 29 15:33:55 2015 (r282225) @@ -84,7 +84,7 @@ _pthread_cleanup_push(void (*routine) (v curthread->unwind_disabled = 1; #endif if ((newbuf = (struct pthread_cleanup *) - malloc(sizeof(struct _pthread_cleanup_info))) != NULL) { + malloc(sizeof(struct pthread_cleanup))) != NULL) { newbuf->routine = routine; newbuf->routine_arg = arg; newbuf->onheap = 1; From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 16:15:32 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6422A11; Wed, 29 Apr 2015 16:15:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D451D13AF; Wed, 29 Apr 2015 16:15:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TGFWQR088569; Wed, 29 Apr 2015 16:15:32 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TGFW6s088568; Wed, 29 Apr 2015 16:15:32 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504291615.t3TGFW6s088568@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 29 Apr 2015 16:15:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282230 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 16:15:33 -0000 Author: gjb Date: Wed Apr 29 16:15:32 2015 New Revision: 282230 URL: https://svnweb.freebsd.org/changeset/base/282230 Log: Document r277592, file(1) update to version 5.22. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Apr 29 16:15:26 2015 (r282229) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Apr 29 16:15:32 2015 (r282230) @@ -204,6 +204,9 @@ Contributed Software + file has been + updated to version 5.22. + OpenSSL has been updated to version 1.0.1m. From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 16:15:35 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4ADD5A23; Wed, 29 Apr 2015 16:15:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38DF113B0; Wed, 29 Apr 2015 16:15:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TGFZme088616; Wed, 29 Apr 2015 16:15:35 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TGFZXY088615; Wed, 29 Apr 2015 16:15:35 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504291615.t3TGFZXY088615@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 29 Apr 2015 16:15:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282231 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 16:15:35 -0000 Author: gjb Date: Wed Apr 29 16:15:34 2015 New Revision: 282231 URL: https://svnweb.freebsd.org/changeset/base/282231 Log: Document r278608, bcm2835_cpufreq driver addition. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Apr 29 16:15:32 2015 (r282230) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Apr 29 16:15:34 2015 (r282231) @@ -344,7 +344,10 @@ ARM Support -   + The bcm2835_cpufreq + driver has been added, which supports CPU + frequency and voltage control on the Raspberry Pi + SOC. From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 16:15:37 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FC0AA68; Wed, 29 Apr 2015 16:15:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DC4813B5; Wed, 29 Apr 2015 16:15:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TGFbDu088658; Wed, 29 Apr 2015 16:15:37 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TGFbLK088657; Wed, 29 Apr 2015 16:15:37 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504291615.t3TGFbLK088657@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 29 Apr 2015 16:15:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282232 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 16:15:37 -0000 Author: gjb Date: Wed Apr 29 16:15:36 2015 New Revision: 282232 URL: https://svnweb.freebsd.org/changeset/base/282232 Log: Document r280632, kern.osreldate now configurable jail(8) parameters. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Apr 29 16:15:34 2015 (r282231) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Apr 29 16:15:36 2015 (r282232) @@ -290,6 +290,10 @@ vfs.devfs.dotimes has been added, which when set to a non-zero value, enables default precision timestamps for these operations. + + The kern.osrelease + and kern.osreldate are now configurable + &man.jail.8; parameters. From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 16:15:39 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 965F6B54; Wed, 29 Apr 2015 16:15:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 849F913BA; Wed, 29 Apr 2015 16:15:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TGFdhl088714; Wed, 29 Apr 2015 16:15:39 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TGFdBb088713; Wed, 29 Apr 2015 16:15:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504291615.t3TGFdBb088713@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 29 Apr 2015 16:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282233 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 16:15:39 -0000 Author: gjb Date: Wed Apr 29 16:15:38 2015 New Revision: 282233 URL: https://svnweb.freebsd.org/changeset/base/282233 Log: Document r282199, drm update to match Linux 3.8.13. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Apr 29 16:15:36 2015 (r282232) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Apr 29 16:15:38 2015 (r282233) @@ -306,7 +306,8 @@ Device Drivers -   + The drm code has + been updated to match &linux; version 3.8.13. From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 18:57:22 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 19DA8C5F; Wed, 29 Apr 2015 18:57:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF6D618C8; Wed, 29 Apr 2015 18:57:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TIvLfo069984; Wed, 29 Apr 2015 18:57:21 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TIvLG3069981; Wed, 29 Apr 2015 18:57:21 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201504291857.t3TIvLG3069981@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 29 Apr 2015 18:57:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282243 - in stable: 10/etc/defaults 10/etc/periodic/daily 10/share/man/man5 9/etc/defaults 9/etc/periodic/daily 9/share/man/man5 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 18:57:22 -0000 Author: jhb Date: Wed Apr 29 18:57:19 2015 New Revision: 282243 URL: https://svnweb.freebsd.org/changeset/base/282243 Log: MFC 280721: Allow additional flags to be passed to netstat -i in the daily status check. In particular, this allows an administrator to specify "-h" for human readable output if that is preferred. The default setting passes "-d", so that can be excluded by using a custom setting. Modified: stable/9/etc/defaults/periodic.conf stable/9/etc/periodic/daily/420.status-network stable/9/share/man/man5/periodic.conf.5 Directory Properties: stable/9/etc/ (props changed) stable/9/share/man/man5/ (props changed) Changes in other areas also in this revision: Modified: stable/10/etc/defaults/periodic.conf stable/10/etc/periodic/daily/420.status-network stable/10/share/man/man5/periodic.conf.5 Directory Properties: stable/10/ (props changed) Modified: stable/9/etc/defaults/periodic.conf ============================================================================== --- stable/9/etc/defaults/periodic.conf Wed Apr 29 18:07:58 2015 (r282242) +++ stable/9/etc/defaults/periodic.conf Wed Apr 29 18:57:19 2015 (r282243) @@ -119,6 +119,7 @@ daily_status_gconcat_enable="NO" # Che # 420.status-network daily_status_network_enable="YES" # Check network status daily_status_network_usedns="YES" # DNS lookups are ok +daily_status_network_netstat_flags="-d" # netstat(1) flags # 430.status-rwho daily_status_rwho_enable="YES" # Check system status Modified: stable/9/etc/periodic/daily/420.status-network ============================================================================== --- stable/9/etc/periodic/daily/420.status-network Wed Apr 29 18:07:58 2015 (r282242) +++ stable/9/etc/periodic/daily/420.status-network Wed Apr 29 18:57:19 2015 (r282243) @@ -16,12 +16,14 @@ case "$daily_status_network_enable" in echo "" echo "Network interface status:" + flags="${daily_status_network_netstat_flags}" case "$daily_status_network_usedns" in [Yy][Ee][Ss]) - netstat -id && rc=0 || rc=3;; + ;; *) - netstat -idn && rc=0 || rc=3;; - esac;; + flags="${flags} -n";; + esac + netstat -i ${flags} && rc=0 || rc=3;; *) rc=0;; esac Modified: stable/9/share/man/man5/periodic.conf.5 ============================================================================== --- stable/9/share/man/man5/periodic.conf.5 Wed Apr 29 18:07:58 2015 (r282242) +++ stable/9/share/man/man5/periodic.conf.5 Wed Apr 29 18:57:19 2015 (r282243) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 13, 2015 +.Dd March 26, 2015 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -410,6 +410,16 @@ Set to .Dq Li YES if you want to run .Nm netstat Fl i . +.It Va daily_status_network_netstat_flags +.Pq Vt str +Set to additional arguments for the +.Xr netstat 1 +utility when +.Va daily_status_network_enable +is set to +.Dq Li YES . +The default is +.Fl d . .It Va daily_status_network_usedns .Pq Vt bool Set to From owner-svn-src-stable@FreeBSD.ORG Wed Apr 29 18:57:21 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1619BC5E; Wed, 29 Apr 2015 18:57:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAF7718C7; Wed, 29 Apr 2015 18:57:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TIvKas069976; Wed, 29 Apr 2015 18:57:20 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TIvKe3069972; Wed, 29 Apr 2015 18:57:20 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201504291857.t3TIvKe3069972@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 29 Apr 2015 18:57:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282243 - in stable: 10/etc/defaults 10/etc/periodic/daily 10/share/man/man5 9/etc/defaults 9/etc/periodic/daily 9/share/man/man5 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 18:57:21 -0000 Author: jhb Date: Wed Apr 29 18:57:19 2015 New Revision: 282243 URL: https://svnweb.freebsd.org/changeset/base/282243 Log: MFC 280721: Allow additional flags to be passed to netstat -i in the daily status check. In particular, this allows an administrator to specify "-h" for human readable output if that is preferred. The default setting passes "-d", so that can be excluded by using a custom setting. Modified: stable/10/etc/defaults/periodic.conf stable/10/etc/periodic/daily/420.status-network stable/10/share/man/man5/periodic.conf.5 Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/etc/defaults/periodic.conf stable/9/etc/periodic/daily/420.status-network stable/9/share/man/man5/periodic.conf.5 Directory Properties: stable/9/etc/ (props changed) stable/9/share/man/man5/ (props changed) Modified: stable/10/etc/defaults/periodic.conf ============================================================================== --- stable/10/etc/defaults/periodic.conf Wed Apr 29 18:07:58 2015 (r282242) +++ stable/10/etc/defaults/periodic.conf Wed Apr 29 18:57:19 2015 (r282243) @@ -117,6 +117,7 @@ daily_status_gconcat_enable="NO" # Che # 420.status-network daily_status_network_enable="YES" # Check network status daily_status_network_usedns="YES" # DNS lookups are ok +daily_status_network_netstat_flags="-d" # netstat(1) flags # 430.status-rwho daily_status_rwho_enable="YES" # Check system status Modified: stable/10/etc/periodic/daily/420.status-network ============================================================================== --- stable/10/etc/periodic/daily/420.status-network Wed Apr 29 18:07:58 2015 (r282242) +++ stable/10/etc/periodic/daily/420.status-network Wed Apr 29 18:57:19 2015 (r282243) @@ -16,12 +16,14 @@ case "$daily_status_network_enable" in echo "" echo "Network interface status:" + flags="${daily_status_network_netstat_flags}" case "$daily_status_network_usedns" in [Yy][Ee][Ss]) - netstat -id && rc=0 || rc=3;; + ;; *) - netstat -idn && rc=0 || rc=3;; - esac;; + flags="${flags} -n";; + esac + netstat -i ${flags} && rc=0 || rc=3;; *) rc=0;; esac Modified: stable/10/share/man/man5/periodic.conf.5 ============================================================================== --- stable/10/share/man/man5/periodic.conf.5 Wed Apr 29 18:07:58 2015 (r282242) +++ stable/10/share/man/man5/periodic.conf.5 Wed Apr 29 18:57:19 2015 (r282243) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 13, 2015 +.Dd March 26, 2015 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -401,6 +401,16 @@ Set to .Dq Li YES if you want to run .Nm netstat Fl i . +.It Va daily_status_network_netstat_flags +.Pq Vt str +Set to additional arguments for the +.Xr netstat 1 +utility when +.Va daily_status_network_enable +is set to +.Dq Li YES . +The default is +.Fl d . .It Va daily_status_network_usedns .Pq Vt bool Set to From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 00:34:42 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BD6E602; Thu, 30 Apr 2015 00:34:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 298081E0E; Thu, 30 Apr 2015 00:34:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3U0YgtE042324; Thu, 30 Apr 2015 00:34:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3U0YgHq042323; Thu, 30 Apr 2015 00:34:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504300034.t3U0YgHq042323@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 30 Apr 2015 00:34:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282262 - stable/10/release/tools X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 00:34:42 -0000 Author: gjb Date: Thu Apr 30 00:34:41 2015 New Revision: 282262 URL: https://svnweb.freebsd.org/changeset/base/282262 Log: MFC r282112: Fix a comment. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/tools/vmimage.subr Directory Properties: stable/10/ (props changed) Modified: stable/10/release/tools/vmimage.subr ============================================================================== --- stable/10/release/tools/vmimage.subr Thu Apr 30 00:27:53 2015 (r282261) +++ stable/10/release/tools/vmimage.subr Thu Apr 30 00:34:41 2015 (r282262) @@ -175,8 +175,10 @@ vm_extra_install_ports() { } vm_extra_pre_umount() { - # Prototype. When overridden, installs additional ports within the - # virtual machine environment. + # Prototype. When overridden, performs additional tasks within the + # virtual machine environment prior to unmounting the filesystem. + # Note: When overriding this function, removing resolv.conf in the + # disk image must be included. rm -f ${DESTDIR}/etc/resolv.conf return 0 From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 00:35:46 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9CEC748; Thu, 30 Apr 2015 00:35:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 978191E1F; Thu, 30 Apr 2015 00:35:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3U0ZkRf042608; Thu, 30 Apr 2015 00:35:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3U0Zk43042607; Thu, 30 Apr 2015 00:35:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504300035.t3U0Zk43042607@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 30 Apr 2015 00:35:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282263 - stable/10/release X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 00:35:46 -0000 Author: gjb Date: Thu Apr 30 00:35:45 2015 New Revision: 282263 URL: https://svnweb.freebsd.org/changeset/base/282263 Log: MFC r282116: Add the cw-ec2-portinstall target to always install the net/bsdec2-image-upload port. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/Makefile.ec2 Directory Properties: stable/10/ (props changed) Modified: stable/10/release/Makefile.ec2 ============================================================================== --- stable/10/release/Makefile.ec2 Thu Apr 30 00:34:41 2015 (r282262) +++ stable/10/release/Makefile.ec2 Thu Apr 30 00:35:45 2015 (r282263) @@ -12,13 +12,17 @@ AMINAMESUFFIX!= date +-%Y-%m-%d PUBLISH= --public .endif -ec2ami: cw-ec2 -.if !exists(/usr/local/bin/bsdec2-image-upload) - @echo "--------------------------------------------------------------" - @echo ">>> Creating EC2 AMIs requires bsdec2-image-upload" - @echo "--------------------------------------------------------------" - @false +cw-ec2-portinstall: +.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) + make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean +.else +. if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap -y +. endif + env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload .endif + +ec2ami: cw-ec2 cw-ec2-portinstall .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) @echo "--------------------------------------------------------------" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 12:39:28 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F141751B; Thu, 30 Apr 2015 12:39:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD56C12BD; Thu, 30 Apr 2015 12:39:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UCdRBJ098609; Thu, 30 Apr 2015 12:39:27 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UCdPO4098599; Thu, 30 Apr 2015 12:39:25 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201504301239.t3UCdPO4098599@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 30 Apr 2015 12:39:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282270 - in stable/10/sys: fs/ext2fs fs/fuse fs/msdosfs fs/nandfs fs/nfsclient fs/nfsserver fs/nullfs kern sys ufs/ffs X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 12:39:28 -0000 Author: rmacklem Date: Thu Apr 30 12:39:24 2015 New Revision: 282270 URL: https://svnweb.freebsd.org/changeset/base/282270 Log: MFC: r281562 File systems that do not use the buffer cache (such as ZFS) must use VOP_FSYNC() to perform the NFS server's Commit operation. This patch adds a mnt_kern_flag called MNTK_USES_BCACHE which is set by file systems that use the buffer cache. If this flag is not set, the NFS server always does a VOP_FSYNC(). This should be ok for old file system modules that do not set MNTK_USES_BCACHE, since calling VOP_FSYNC() is correct, although it might not be optimal for file systems that use the buffer cache. Modified: stable/10/sys/fs/ext2fs/ext2_vfsops.c stable/10/sys/fs/fuse/fuse_vfsops.c stable/10/sys/fs/msdosfs/msdosfs_vfsops.c stable/10/sys/fs/nandfs/nandfs_vfsops.c stable/10/sys/fs/nfsclient/nfs_clvfsops.c stable/10/sys/fs/nfsserver/nfs_nfsdport.c stable/10/sys/fs/nullfs/null_vfsops.c stable/10/sys/kern/vfs_subr.c stable/10/sys/sys/mount.h stable/10/sys/ufs/ffs/ffs_vfsops.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/ext2fs/ext2_vfsops.c ============================================================================== --- stable/10/sys/fs/ext2fs/ext2_vfsops.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/fs/ext2fs/ext2_vfsops.c Thu Apr 30 12:39:24 2015 (r282270) @@ -661,7 +661,8 @@ ext2_mountfs(struct vnode *devvp, struct * Initialize filesystem stat information in mount struct. */ MNT_ILOCK(mp); - mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED; + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED | + MNTK_USES_BCACHE; MNT_IUNLOCK(mp); return (0); out: Modified: stable/10/sys/fs/fuse/fuse_vfsops.c ============================================================================== --- stable/10/sys/fs/fuse/fuse_vfsops.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/fs/fuse/fuse_vfsops.c Thu Apr 30 12:39:24 2015 (r282270) @@ -337,6 +337,7 @@ fuse_vfsop_mount(struct mount *mp) MNT_ILOCK(mp); mp->mnt_data = data; mp->mnt_flag |= MNT_LOCAL; + mp->mnt_kern_flag |= MNTK_USES_BCACHE; MNT_IUNLOCK(mp); /* We need this here as this slot is used by getnewvnode() */ mp->mnt_stat.f_iosize = PAGE_SIZE; Modified: stable/10/sys/fs/msdosfs/msdosfs_vfsops.c ============================================================================== --- stable/10/sys/fs/msdosfs/msdosfs_vfsops.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/fs/msdosfs/msdosfs_vfsops.c Thu Apr 30 12:39:24 2015 (r282270) @@ -759,6 +759,7 @@ mountmsdosfs(struct vnode *devvp, struct mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; + mp->mnt_kern_flag |= MNTK_USES_BCACHE; MNT_IUNLOCK(mp); if (pmp->pm_flags & MSDOSFS_LARGEFS) Modified: stable/10/sys/fs/nandfs/nandfs_vfsops.c ============================================================================== --- stable/10/sys/fs/nandfs/nandfs_vfsops.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/fs/nandfs/nandfs_vfsops.c Thu Apr 30 12:39:24 2015 (r282270) @@ -1385,6 +1385,7 @@ nandfs_mountfs(struct vnode *devvp, stru nmp->nm_ronly = ronly; MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; + mp->mnt_kern_flag |= MNTK_USES_BCACHE; MNT_IUNLOCK(mp); nmp->nm_nandfsdev = nandfsdev; /* Add our mountpoint */ Modified: stable/10/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- stable/10/sys/fs/nfsclient/nfs_clvfsops.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/fs/nfsclient/nfs_clvfsops.c Thu Apr 30 12:39:24 2015 (r282270) @@ -1193,7 +1193,8 @@ nfs_mount(struct mount *mp) out: if (!error) { MNT_ILOCK(mp); - mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_NO_IOPF; + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_NO_IOPF | + MNTK_USES_BCACHE; MNT_IUNLOCK(mp); } return (error); Modified: stable/10/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- stable/10/sys/fs/nfsserver/nfs_nfsdport.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/fs/nfsserver/nfs_nfsdport.c Thu Apr 30 12:39:24 2015 (r282270) @@ -1270,8 +1270,11 @@ nfsvno_fsync(struct vnode *vp, u_int64_t * file is done. At this time VOP_FSYNC does not accept offset and * byte count parameters so call VOP_FSYNC the whole file for now. * The same is true for NFSv4: RFC 3530 Sec. 14.2.3. + * File systems that do not use the buffer cache (as indicated + * by MNTK_USES_BCACHE not being set) must use VOP_FSYNC(). */ - if (cnt == 0 || cnt > MAX_COMMIT_COUNT) { + if (cnt == 0 || cnt > MAX_COMMIT_COUNT || + (vp->v_mount->mnt_kern_flag & MNTK_USES_BCACHE) == 0) { /* * Give up and do the whole thing */ Modified: stable/10/sys/fs/nullfs/null_vfsops.c ============================================================================== --- stable/10/sys/fs/nullfs/null_vfsops.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/fs/nullfs/null_vfsops.c Thu Apr 30 12:39:24 2015 (r282270) @@ -198,6 +198,8 @@ nullfs_mount(struct mount *mp) MNTK_EXTENDED_SHARED); } mp->mnt_kern_flag |= MNTK_LOOKUP_EXCL_DOTDOT; + mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag & + MNTK_USES_BCACHE; MNT_IUNLOCK(mp); mp->mnt_data = xmp; vfs_getnewfsid(mp); Modified: stable/10/sys/kern/vfs_subr.c ============================================================================== --- stable/10/sys/kern/vfs_subr.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/kern/vfs_subr.c Thu Apr 30 12:39:24 2015 (r282270) @@ -3138,6 +3138,7 @@ DB_SHOW_COMMAND(mount, db_show_mount) MNT_KERN_FLAG(MNTK_VGONE_WAITER); MNT_KERN_FLAG(MNTK_LOOKUP_EXCL_DOTDOT); MNT_KERN_FLAG(MNTK_MARKER); + MNT_KERN_FLAG(MNTK_USES_BCACHE); MNT_KERN_FLAG(MNTK_NOASYNC); MNT_KERN_FLAG(MNTK_UNMOUNT); MNT_KERN_FLAG(MNTK_MWAIT); Modified: stable/10/sys/sys/mount.h ============================================================================== --- stable/10/sys/sys/mount.h Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/sys/mount.h Thu Apr 30 12:39:24 2015 (r282270) @@ -355,6 +355,7 @@ void __mnt_vnode_markerfree_act #define MNTK_LOOKUP_EXCL_DOTDOT 0x00000800 #define MNTK_MARKER 0x00001000 #define MNTK_UNMAPPED_BUFS 0x00002000 +#define MNTK_USES_BCACHE 0x00004000 /* FS uses the buffer cache. */ #define MNTK_NOASYNC 0x00800000 /* disable async */ #define MNTK_UNMOUNT 0x01000000 /* unmount in progress */ #define MNTK_MWAIT 0x02000000 /* waiting for unmount to finish */ Modified: stable/10/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- stable/10/sys/ufs/ffs/ffs_vfsops.c Thu Apr 30 07:00:25 2015 (r282269) +++ stable/10/sys/ufs/ffs/ffs_vfsops.c Thu Apr 30 12:39:24 2015 (r282270) @@ -1055,7 +1055,7 @@ ffs_mountfs(devvp, mp, td) */ MNT_ILOCK(mp); mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED | - MNTK_NO_IOPF | MNTK_UNMAPPED_BUFS; + MNTK_NO_IOPF | MNTK_UNMAPPED_BUFS | MNTK_USES_BCACHE; MNT_IUNLOCK(mp); #ifdef UFS_EXTATTR #ifdef UFS_EXTATTR_AUTOSTART From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 12:44:22 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2FEF571A; Thu, 30 Apr 2015 12:44:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D3701384; Thu, 30 Apr 2015 12:44:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UCiLhw003105; Thu, 30 Apr 2015 12:44:21 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UCiLXo003101; Thu, 30 Apr 2015 12:44:21 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201504301244.t3UCiLXo003101@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 30 Apr 2015 12:44:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282271 - in stable/10/sys/fs: nfs nfsserver X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 12:44:22 -0000 Author: rmacklem Date: Thu Apr 30 12:44:20 2015 New Revision: 282271 URL: https://svnweb.freebsd.org/changeset/base/282271 Log: MFC: r281628 mav@ has found that NFS servers exporting ZFS file systems can perform better when using a 128K read/write data size. This patch changes NFS_MAXDATA from 64K to 128K so that clients can use 128K for NFS mounts to allow this. The patch also renames NFS_MAXDATA to NFS_SRVMAXIO so that it is clear that it applies to the NFS server side only. It also avoids a name conflict with the NFS_MAXDATA defined in rpcsvc/nfs_prot.h, that is used for userland RPC. Modified: stable/10/sys/fs/nfs/nfs.h stable/10/sys/fs/nfs/nfs_commonport.c stable/10/sys/fs/nfs/nfsproto.h stable/10/sys/fs/nfsserver/nfs_nfsdserv.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/nfs/nfs.h ============================================================================== --- stable/10/sys/fs/nfs/nfs.h Thu Apr 30 12:39:24 2015 (r282270) +++ stable/10/sys/fs/nfs/nfs.h Thu Apr 30 12:44:20 2015 (r282271) @@ -159,7 +159,7 @@ (t).tv_sec = time.tv_sec; (t).tv_nsec = 1000 * time.tv_usec; } while (0) #define NFS_SRVMAXDATA(n) \ (((n)->nd_flag & (ND_NFSV3 | ND_NFSV4)) ? \ - NFS_MAXDATA : NFS_V2MAXDATA) + NFS_SRVMAXIO : NFS_V2MAXDATA) #define NFS64BITSSET 0xffffffffffffffffull #define NFS64BITSMINUS1 0xfffffffffffffffeull Modified: stable/10/sys/fs/nfs/nfs_commonport.c ============================================================================== --- stable/10/sys/fs/nfs/nfs_commonport.c Thu Apr 30 12:39:24 2015 (r282270) +++ stable/10/sys/fs/nfs/nfs_commonport.c Thu Apr 30 12:44:20 2015 (r282271) @@ -281,11 +281,11 @@ nfsvno_getfs(struct nfsfsinfo *sip, int if (isdgram) pref = NFS_MAXDGRAMDATA; else - pref = NFS_MAXDATA; - sip->fs_rtmax = NFS_MAXDATA; + pref = NFS_SRVMAXIO; + sip->fs_rtmax = NFS_SRVMAXIO; sip->fs_rtpref = pref; sip->fs_rtmult = NFS_FABLKSIZE; - sip->fs_wtmax = NFS_MAXDATA; + sip->fs_wtmax = NFS_SRVMAXIO; sip->fs_wtpref = pref; sip->fs_wtmult = NFS_FABLKSIZE; sip->fs_dtpref = pref; Modified: stable/10/sys/fs/nfs/nfsproto.h ============================================================================== --- stable/10/sys/fs/nfs/nfsproto.h Thu Apr 30 12:39:24 2015 (r282270) +++ stable/10/sys/fs/nfs/nfsproto.h Thu Apr 30 12:44:20 2015 (r282271) @@ -54,11 +54,10 @@ #define NFS_VER4 4 #define NFS_V2MAXDATA 8192 #define NFS_MAXDGRAMDATA 16384 -#define NFS_MAXDATA NFS_MAXBSIZE #define NFS_MAXPATHLEN 1024 #define NFS_MAXNAMLEN 255 #define NFS_MAXPKTHDR 404 -#define NFS_MAXPACKET (NFS_MAXDATA + 2048) +#define NFS_MAXPACKET (NFS_SRVMAXIO + 2048) #define NFS_MINPACKET 20 #define NFS_FABLKSIZE 512 /* Size in bytes of a block wrt fa_blocks */ #define NFSV4_MINORVERSION 0 /* V4 Minor version */ @@ -67,6 +66,18 @@ #define NFSV41_CBVERS 4 /* V4.1 CB Version */ #define NFSV4_SMALLSTR 50 /* Strings small enough for stack */ +/* + * This value isn't a fixed value in the RFCs. + * It is the maximum data size supported by NFSv3 or NFSv4 over TCP for + * the server. It should be set to the I/O size preferred by ZFS or + * MAXBSIZE, whichever is greater. + * ZFS currently prefers 128K. + * It used to be called NFS_MAXDATA, but has been renamed to clarify that + * it refers to server side only and doesn't conflict with the NFS_MAXDATA + * defined in rpcsvc/nfs_prot.h for userland. + */ +#define NFS_SRVMAXIO (128 * 1024) + /* Stat numbers for rpc returns (version 2, 3 and 4) */ /* * These numbers are hard-wired in the RFCs, so they can't be changed. Modified: stable/10/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- stable/10/sys/fs/nfsserver/nfs_nfsdserv.c Thu Apr 30 12:39:24 2015 (r282270) +++ stable/10/sys/fs/nfsserver/nfs_nfsdserv.c Thu Apr 30 12:44:20 2015 (r282271) @@ -870,7 +870,7 @@ nfsrvd_write(struct nfsrv_descript *nd, i = mbuf_len(mp); } - if (retlen > NFS_MAXDATA || retlen < 0) + if (retlen > NFS_SRVMAXIO || retlen < 0) nd->nd_repstat = EIO; if (vnode_vtype(vp) != VREG && !nd->nd_repstat) { if (nd->nd_flag & ND_NFSV3) From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 16:09:00 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93B2987B; Thu, 30 Apr 2015 16:09:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7DD9D1CE2; Thu, 30 Apr 2015 16:09:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UG90qO004196; Thu, 30 Apr 2015 16:09:00 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UG8mNS004104; Thu, 30 Apr 2015 16:08:48 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201504301608.t3UG8mNS004104@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 30 Apr 2015 16:08:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282275 - in stable/10: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_modules... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 16:09:00 -0000 Author: tijl Date: Thu Apr 30 16:08:47 2015 New Revision: 282275 URL: https://svnweb.freebsd.org/changeset/base/282275 Log: MFC r275805: Fix incorrect type of "invalids" argument in __iconv() prototype. MFC r281550,281591: Remove the const qualifier from iconv(3) to comply with POSIX: http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html Adjust all code that calls iconv. PR: 199099 Modified: stable/10/UPDATING stable/10/bin/csh/config.h stable/10/bin/csh/iconv_stub.h stable/10/contrib/smbfs/include/netsmb/smb_lib.h stable/10/contrib/smbfs/lib/smb/nls.c stable/10/contrib/smbfs/lib/smb/print.c stable/10/contrib/smbfs/lib/smb/rq.c stable/10/include/iconv.h stable/10/lib/libarchive/Makefile stable/10/lib/libc/iconv/__iconv.c stable/10/lib/libc/iconv/bsd_iconv.c stable/10/lib/libc/iconv/citrus_iconv.h stable/10/lib/libc/iconv/citrus_iconv_local.h stable/10/lib/libc/iconv/citrus_none.c stable/10/lib/libc/iconv/citrus_stdenc.h stable/10/lib/libc/iconv/citrus_stdenc_local.h stable/10/lib/libc/iconv/citrus_stdenc_template.h stable/10/lib/libc/iconv/iconv-internal.h stable/10/lib/libc/iconv/iconv.3 stable/10/lib/libc/iconv/iconv.c stable/10/lib/libc/iconv/iconv_compat.c stable/10/lib/libc/locale/cXXrtomb_iconv.h stable/10/lib/libc/locale/mbrtocXX_iconv.h stable/10/lib/libiconv_modules/BIG5/citrus_big5.c stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/10/lib/libiconv_modules/EUC/citrus_euc.c stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/10/lib/libiconv_modules/HZ/citrus_hz.c stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/10/lib/libiconv_modules/UES/citrus_ues.c stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c stable/10/lib/libiconv_modules/ZW/citrus_zw.c stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c stable/10/lib/libkiconv/xlat16_iconv.c stable/10/sys/sys/param.h stable/10/usr.bin/iconv/iconv.c Directory Properties: stable/10/ (props changed) Modified: stable/10/UPDATING ============================================================================== --- stable/10/UPDATING Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/UPDATING Thu Apr 30 16:08:47 2015 (r282275) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20150430: + The const qualifier has been removed from iconv(3) to comply with + POSIX. The ports tree is aware of this from r384038 onwards. + 20141215: At svn r275807, The default linux compat kernel ABI has been adjusted to 2.6.18 in support of the linux-c6 compat ports infrastructure Modified: stable/10/bin/csh/config.h ============================================================================== --- stable/10/bin/csh/config.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/bin/csh/config.h Thu Apr 30 16:08:47 2015 (r282275) @@ -198,7 +198,7 @@ #define HAVE_WCWIDTH 1 /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST const +#define ICONV_CONST /* Support NLS. */ #define NLS 1 Modified: stable/10/bin/csh/iconv_stub.h ============================================================================== --- stable/10/bin/csh/iconv_stub.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/bin/csh/iconv_stub.h Thu Apr 30 16:08:47 2015 (r282275) @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); Modified: stable/10/contrib/smbfs/include/netsmb/smb_lib.h ============================================================================== --- stable/10/contrib/smbfs/include/netsmb/smb_lib.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/contrib/smbfs/include/netsmb/smb_lib.h Thu Apr 30 16:08:47 2015 (r282275) @@ -191,7 +191,7 @@ int smb_ctx_readrc(struct smb_ctx *); int smb_ctx_resolve(struct smb_ctx *); int smb_ctx_setflags(struct smb_ctx *, int, int, int); -int smb_smb_open_print_file(struct smb_ctx *, int, int, const char *, smbfh*); +int smb_smb_open_print_file(struct smb_ctx *, int, int, char *, smbfh*); int smb_smb_close_print_file(struct smb_ctx *, smbfh); int smb_read(struct smb_ctx *, smbfh, off_t, size_t, char *); @@ -204,8 +204,8 @@ int smb_rq_init(struct smb_ctx *, u_cha void smb_rq_done(struct smb_rq *); void smb_rq_wend(struct smb_rq *); int smb_rq_simple(struct smb_rq *); -int smb_rq_dmem(struct mbdata *, const char *, size_t); -int smb_rq_dstring(struct mbdata *, const char *); +int smb_rq_dmem(struct mbdata *, char *, size_t); +int smb_rq_dstring(struct mbdata *, char *); int smb_t2_request(struct smb_ctx *, int, int, const char *, int, void *, int, void *, int *, void *, int *, void *); @@ -246,10 +246,10 @@ extern u_char nls_lower[256], nls_upper[ int nls_setrecode(const char *, const char *); int nls_setlocale(const char *); -char* nls_str_toext(char *, const char *); -char* nls_str_toloc(char *, const char *); -void* nls_mem_toext(void *, const void *, int); -void* nls_mem_toloc(void *, const void *, int); +char* nls_str_toext(char *, char *); +char* nls_str_toloc(char *, char *); +void* nls_mem_toext(void *, void *, int); +void* nls_mem_toloc(void *, void *, int); char* nls_str_upper(char *, const char *); char* nls_str_lower(char *, const char *); Modified: stable/10/contrib/smbfs/lib/smb/nls.c ============================================================================== --- stable/10/contrib/smbfs/lib/smb/nls.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/contrib/smbfs/lib/smb/nls.c Thu Apr 30 16:08:47 2015 (r282275) @@ -102,7 +102,7 @@ nls_setrecode(const char *local, const c } char * -nls_str_toloc(char *dst, const char *src) +nls_str_toloc(char *dst, char *src) { #ifdef HAVE_ICONV char *p = dst; @@ -125,7 +125,7 @@ nls_str_toloc(char *dst, const char *src } char * -nls_str_toext(char *dst, const char *src) +nls_str_toext(char *dst, char *src) { #ifdef HAVE_ICONV char *p = dst; @@ -148,11 +148,11 @@ nls_str_toext(char *dst, const char *src } void * -nls_mem_toloc(void *dst, const void *src, int size) +nls_mem_toloc(void *dst, void *src, int size) { #ifdef HAVE_ICONV char *p = dst; - const char *s = src; + char *s = src; size_t inlen, outlen; if (size == 0) @@ -174,11 +174,11 @@ nls_mem_toloc(void *dst, const void *src } void * -nls_mem_toext(void *dst, const void *src, int size) +nls_mem_toext(void *dst, void *src, int size) { #ifdef HAVE_ICONV char *p = dst; - const char *s = src; + char *s = src; size_t inlen, outlen; if (size == 0) Modified: stable/10/contrib/smbfs/lib/smb/print.c ============================================================================== --- stable/10/contrib/smbfs/lib/smb/print.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/contrib/smbfs/lib/smb/print.c Thu Apr 30 16:08:47 2015 (r282275) @@ -54,7 +54,7 @@ int smb_smb_open_print_file(struct smb_ctx *ctx, int setuplen, int mode, - const char *ident, smbfh *fhp) + char *ident, smbfh *fhp) { struct smb_rq *rqp; struct mbdata *mbp; Modified: stable/10/contrib/smbfs/lib/smb/rq.c ============================================================================== --- stable/10/contrib/smbfs/lib/smb/rq.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/contrib/smbfs/lib/smb/rq.c Thu Apr 30 16:08:47 2015 (r282275) @@ -86,7 +86,7 @@ smb_rq_wend(struct smb_rq *rqp) } int -smb_rq_dmem(struct mbdata *mbp, const char *src, size_t size) +smb_rq_dmem(struct mbdata *mbp, char *src, size_t size) { struct mbuf *m; char * dst; @@ -118,7 +118,7 @@ smb_rq_dmem(struct mbdata *mbp, const ch } int -smb_rq_dstring(struct mbdata *mbp, const char *s) +smb_rq_dstring(struct mbdata *mbp, char *s) { return smb_rq_dmem(mbp, s, strlen(s) + 1); } Modified: stable/10/include/iconv.h ============================================================================== --- stable/10/include/iconv.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/include/iconv.h Thu Apr 30 16:08:47 2015 (r282275) @@ -53,7 +53,7 @@ typedef struct __tag_iconv_t *iconv_t; __BEGIN_DECLS iconv_t iconv_open(const char *, const char *); -size_t iconv(iconv_t, const char ** __restrict, +size_t iconv(iconv_t, char ** __restrict, size_t * __restrict, char ** __restrict, size_t * __restrict); int iconv_close(iconv_t); @@ -62,7 +62,7 @@ int iconv_close(iconv_t); */ int __iconv_get_list(char ***, size_t *, __iconv_bool); void __iconv_free_list(char **, size_t); -size_t __iconv(iconv_t, const char **, size_t *, char **, +size_t __iconv(iconv_t, char **, size_t *, char **, size_t *, __uint32_t, size_t *); #define __ICONV_F_HIDE_INVALID 0x0001 Modified: stable/10/lib/libarchive/Makefile ============================================================================== --- stable/10/lib/libarchive/Makefile Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libarchive/Makefile Thu Apr 30 16:08:47 2015 (r282275) @@ -37,7 +37,7 @@ LDADD+= -lmd .if ${MK_ICONV} != "no" # TODO: This can be changed back to CFLAGS once iconv works correctly # with statically linked binaries. -SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const +SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST= .endif .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ Modified: stable/10/lib/libc/iconv/__iconv.c ============================================================================== --- stable/10/lib/libc/iconv/__iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/__iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -31,7 +31,7 @@ #include "iconv-internal.h" size_t -__iconv(iconv_t a, const char **b, size_t *c, char **d, +__iconv(iconv_t a, char **b, size_t *c, char **d, size_t *e, __uint32_t f, size_t *g) { return __bsd___iconv(a, b, c, d, e, f, g); Modified: stable/10/lib/libc/iconv/bsd_iconv.c ============================================================================== --- stable/10/lib/libc/iconv/bsd_iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/bsd_iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -120,7 +120,7 @@ __bsd_iconv_close(iconv_t handle) } size_t -__bsd_iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout) +__bsd_iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout) { size_t ret; int err; @@ -141,7 +141,7 @@ __bsd_iconv(iconv_t handle, const char * } size_t -__bsd___iconv(iconv_t handle, const char **in, size_t *szin, char **out, +__bsd___iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout, uint32_t flags, size_t *invalids) { size_t ret; Modified: stable/10/lib/libc/iconv/citrus_iconv.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_iconv.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_iconv.h Thu Apr 30 16:08:47 2015 (r282275) @@ -52,7 +52,7 @@ __END_DECLS */ static __inline int _citrus_iconv_convert(struct _citrus_iconv * __restrict cv, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags, size_t * __restrict nresults) { Modified: stable/10/lib/libc/iconv/citrus_iconv_local.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_iconv_local.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_iconv_local.h Thu Apr 30 16:08:47 2015 (r282275) @@ -46,7 +46,7 @@ static void _citrus_##_m_##_iconv_unini (struct _citrus_iconv_shared *); \ static int _citrus_##_m_##_iconv_convert \ (struct _citrus_iconv * __restrict, \ - const char * __restrict * __restrict, \ + char * __restrict * __restrict, \ size_t * __restrict, \ char * __restrict * __restrict, \ size_t * __restrict outbytes, \ @@ -75,7 +75,7 @@ typedef void (*_citrus_iconv_uninit_shar (struct _citrus_iconv_shared *); typedef int (*_citrus_iconv_convert_t) (struct _citrus_iconv * __restrict, - const char *__restrict* __restrict, size_t * __restrict, + char *__restrict* __restrict, size_t * __restrict, char * __restrict * __restrict, size_t * __restrict, uint32_t, size_t * __restrict); typedef int (*_citrus_iconv_init_context_t)(struct _citrus_iconv *); Modified: stable/10/lib/libc/iconv/citrus_none.c ============================================================================== --- stable/10/lib/libc/iconv/citrus_none.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_none.c Thu Apr 30 16:08:47 2015 (r282275) @@ -83,7 +83,7 @@ _citrus_NONE_stdenc_init_state(struct _c static int _citrus_NONE_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce __unused, - _csid_t *csid, _index_t *idx, const char **s, size_t n, + _csid_t *csid, _index_t *idx, char **s, size_t n, void *ps __unused, size_t *nresult, struct iconv_hooks *hooks) { @@ -159,7 +159,7 @@ _citrus_NONE_stdenc_cstomb(struct _citru static int _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce __unused, - _wc_t * __restrict pwc, const char ** __restrict s, size_t n, + _wc_t * __restrict pwc, char ** __restrict s, size_t n, void * __restrict pspriv __unused, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: stable/10/lib/libc/iconv/citrus_stdenc.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_stdenc.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_stdenc.h Thu Apr 30 16:08:47 2015 (r282275) @@ -69,7 +69,7 @@ _citrus_stdenc_init_state(struct _citrus static __inline int _citrus_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce, _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx, - const char ** __restrict s, size_t n, void * __restrict ps, + char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: stable/10/lib/libc/iconv/citrus_stdenc_local.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_stdenc_local.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_stdenc_local.h Thu Apr 30 16:08:47 2015 (r282275) @@ -55,7 +55,7 @@ static int _citrus_##_e_##_stdenc_mbtoc (struct _citrus_stdenc * __restrict, \ _citrus_csid_t * __restrict, \ _citrus_index_t * __restrict, \ - const char ** __restrict, size_t, \ + char ** __restrict, size_t, \ void * __restrict, size_t * __restrict, \ struct iconv_hooks *); \ static int _citrus_##_e_##_stdenc_cstomb \ @@ -66,7 +66,7 @@ static int _citrus_##_e_##_stdenc_cstom static int _citrus_##_e_##_stdenc_mbtowc \ (struct _citrus_stdenc * __restrict, \ _citrus_wc_t * __restrict, \ - const char ** __restrict, size_t, \ + char ** __restrict, size_t, \ void * __restrict, size_t * __restrict, \ struct iconv_hooks *); \ static int _citrus_##_e_##_stdenc_wctomb \ @@ -106,7 +106,7 @@ typedef int (*_citrus_stdenc_init_state_ typedef int (*_citrus_stdenc_mbtocs_t) (struct _citrus_stdenc * __restrict, _citrus_csid_t * __restrict, _citrus_index_t * __restrict, - const char ** __restrict, size_t, + char ** __restrict, size_t, void * __restrict, size_t * __restrict, struct iconv_hooks *); typedef int (*_citrus_stdenc_cstomb_t) @@ -116,7 +116,7 @@ typedef int (*_citrus_stdenc_cstomb_t) typedef int (*_citrus_stdenc_mbtowc_t) (struct _citrus_stdenc * __restrict, _citrus_wc_t * __restrict, - const char ** __restrict, size_t, + char ** __restrict, size_t, void * __restrict, size_t * __restrict, struct iconv_hooks *); typedef int (*_citrus_stdenc_wctomb_t) Modified: stable/10/lib/libc/iconv/citrus_stdenc_template.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_stdenc_template.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_stdenc_template.h Thu Apr 30 16:08:47 2015 (r282275) @@ -112,7 +112,7 @@ _FUNCNAME(stdenc_init_state)(struct _cit static int _FUNCNAME(stdenc_mbtocs)(struct _citrus_stdenc * __restrict ce, _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx, - const char ** __restrict s, size_t n, void * __restrict ps, + char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { wchar_t wc; @@ -151,7 +151,7 @@ _FUNCNAME(stdenc_cstomb)(struct _citrus_ static int _FUNCNAME(stdenc_mbtowc)(struct _citrus_stdenc * __restrict ce, - _citrus_wc_t * __restrict wc, const char ** __restrict s, size_t n, + _citrus_wc_t * __restrict wc, char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: stable/10/lib/libc/iconv/iconv-internal.h ============================================================================== --- stable/10/lib/libc/iconv/iconv-internal.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/iconv-internal.h Thu Apr 30 16:08:47 2015 (r282275) @@ -29,11 +29,11 @@ /* * Interal prototypes for our back-end functions. */ -size_t __bsd___iconv(iconv_t, const char **, size_t *, char **, +size_t __bsd___iconv(iconv_t, char **, size_t *, char **, size_t *, __uint32_t, size_t *); void __bsd___iconv_free_list(char **, size_t); int __bsd___iconv_get_list(char ***, size_t *, __iconv_bool); -size_t __bsd_iconv(iconv_t, const char ** __restrict, +size_t __bsd_iconv(iconv_t, char ** __restrict, size_t * __restrict, char ** __restrict, size_t * __restrict); const char *__bsd_iconv_canonicalize(const char *); Modified: stable/10/lib/libc/iconv/iconv.3 ============================================================================== --- stable/10/lib/libc/iconv/iconv.3 Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/iconv.3 Thu Apr 30 16:08:47 2015 (r282275) @@ -48,7 +48,7 @@ .Ft size_t .Fn iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" .Ft size_t -.Fn __iconv "iconv_t cd" "const char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" "uint32_t flags" "size_t invalids" +.Fn __iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" "uint32_t flags" "size_t * invalids" .Sh DESCRIPTION The .Fn iconv_open Modified: stable/10/lib/libc/iconv/iconv.c ============================================================================== --- stable/10/lib/libc/iconv/iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -31,7 +31,7 @@ #include "iconv-internal.h" size_t -iconv(iconv_t a, const char ** __restrict b, +iconv(iconv_t a, char ** __restrict b, size_t * __restrict c, char ** __restrict d, size_t * __restrict e) { Modified: stable/10/lib/libc/iconv/iconv_compat.c ============================================================================== --- stable/10/lib/libc/iconv/iconv_compat.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/iconv_compat.c Thu Apr 30 16:08:47 2015 (r282275) @@ -37,7 +37,7 @@ #include "iconv-internal.h" size_t -__iconv_compat(iconv_t a, const char ** b, size_t * c, char ** d, +__iconv_compat(iconv_t a, char ** b, size_t * c, char ** d, size_t * e, __uint32_t f, size_t *g) { return __bsd___iconv(a, b, c, d, e, f, g); @@ -56,7 +56,7 @@ __iconv_get_list_compat(char ***a, size_ } size_t -iconv_compat(iconv_t a, const char ** __restrict b, +iconv_compat(iconv_t a, char ** __restrict b, size_t * __restrict c, char ** __restrict d, size_t * __restrict e) { Modified: stable/10/lib/libc/locale/cXXrtomb_iconv.h ============================================================================== --- stable/10/lib/libc/locale/cXXrtomb_iconv.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/locale/cXXrtomb_iconv.h Thu Apr 30 16:08:47 2015 (r282275) @@ -57,8 +57,7 @@ cXXrtomb_l(char * __restrict s, charXX_t { _ConversionState *cs; struct _citrus_iconv *handle; - const char *src; - char *dst; + char *src, *dst; size_t srcleft, dstleft, invlen; int err; Modified: stable/10/lib/libc/locale/mbrtocXX_iconv.h ============================================================================== --- stable/10/lib/libc/locale/mbrtocXX_iconv.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/locale/mbrtocXX_iconv.h Thu Apr 30 16:08:47 2015 (r282275) @@ -99,8 +99,7 @@ mbrtocXX_l(charXX_t * __restrict pc, con /* Convert as few characters to the dst buffer as possible. */ for (i = 0; ; i++) { - const char *src; - char *dst; + char *src, *dst; size_t srcleft, dstleft, invlen; int err; Modified: stable/10/lib/libiconv_modules/BIG5/citrus_big5.c ============================================================================== --- stable/10/lib/libiconv_modules/BIG5/citrus_big5.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/BIG5/citrus_big5.c Thu Apr 30 16:08:47 2015 (r282275) @@ -269,12 +269,12 @@ static int /*ARGSUSED*/ _citrus_BIG5_mbrtowc_priv(_BIG5EncodingInfo * __restrict ei, wchar_t * __restrict pwc, - const char ** __restrict s, size_t n, + char ** __restrict s, size_t n, _BIG5State * __restrict psenc, size_t * __restrict nresult) { wchar_t wchar; - const char *s0; + char *s0; int c, chlenbak; s0 = *s; Modified: stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c ============================================================================== --- stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Thu Apr 30 16:08:47 2015 (r282275) @@ -165,10 +165,10 @@ is_94charset(int c) static int /*ARGSUSED*/ _citrus_DECHanyu_mbrtowc_priv(_DECHanyuEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _DECHanyuState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wc; int ch; Modified: stable/10/lib/libiconv_modules/EUC/citrus_euc.c ============================================================================== --- stable/10/lib/libiconv_modules/EUC/citrus_euc.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/EUC/citrus_euc.c Thu Apr 30 16:08:47 2015 (r282275) @@ -190,12 +190,12 @@ _citrus_EUC_unpack_state(_EUCEncodingInf #endif static int -_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, const char **s, +_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, char **s, size_t n, _EUCState *psenc, size_t *nresult) { wchar_t wchar; int c, chlenbak, cs, len; - const char *s0, *s1 = NULL; + char *s0, *s1 = NULL; s0 = *s; Modified: stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c ============================================================================== --- stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c Thu Apr 30 16:08:47 2015 (r282275) @@ -176,10 +176,10 @@ _citrus_EUCTW_encoding_module_uninit(_EU static int _citrus_EUCTW_mbrtowc_priv(_EUCTWEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _EUCTWState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wchar; int c, chlenbak, cs; Modified: stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c ============================================================================== --- stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Thu Apr 30 16:08:47 2015 (r282275) @@ -149,10 +149,10 @@ _mb_count(wchar_t v) static int _citrus_GBK2K_mbrtowc_priv(_GBK2KEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _GBK2KState * __restrict psenc, size_t * __restrict nresult) { - const char *s0, *s1; + char *s0, *s1; wchar_t wc; int chlenbak, len; Modified: stable/10/lib/libiconv_modules/HZ/citrus_hz.c ============================================================================== --- stable/10/lib/libiconv_modules/HZ/citrus_hz.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/HZ/citrus_hz.c Thu Apr 30 16:08:47 2015 (r282275) @@ -175,13 +175,13 @@ _citrus_HZ_unpack_state(_HZEncodingInfo static int _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _HZState * __restrict psenc, size_t * __restrict nresult) { escape_t *candidate, *init; graphic_t *graphic; const range_t *range; - const char *s0; + char *s0; wchar_t wc; int bit, ch, head, len, tail; Modified: stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c ============================================================================== --- stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c Thu Apr 30 16:08:47 2015 (r282275) @@ -574,7 +574,7 @@ terminate: static wchar_t _ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei __unused, - const char * __restrict string, size_t n, const char ** __restrict result, + char * __restrict string, size_t n, char ** __restrict result, _ISO2022State * __restrict psenc) { const struct seqtable *sp; @@ -842,10 +842,10 @@ asis: static int _citrus_ISO2022_mbrtowc_priv(_ISO2022EncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _ISO2022State * __restrict psenc, size_t * __restrict nresult) { - const char *p, *result, *s0; + char *p, *result, *s0; wchar_t wchar; int c, chlenbak; Modified: stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c ============================================================================== --- stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c Thu Apr 30 16:08:47 2015 (r282275) @@ -145,10 +145,10 @@ ishanja(int l, int t) static int /*ARGSUSED*/ _citrus_JOHAB_mbrtowc_priv(_JOHABEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _JOHABState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; int l, t; if (*s == NULL) { Modified: stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c ============================================================================== --- stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c Thu Apr 30 16:08:47 2015 (r282275) @@ -153,10 +153,10 @@ _citrus_MSKanji_unpack_state(_MSKanjiEnc static int /*ARGSUSED*/ _citrus_MSKanji_mbrtowc_priv(_MSKanjiEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _MSKanjiState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wchar; int chlenbak, len; Modified: stable/10/lib/libiconv_modules/UES/citrus_ues.c ============================================================================== --- stable/10/lib/libiconv_modules/UES/citrus_ues.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/UES/citrus_ues.c Thu Apr 30 16:08:47 2015 (r282275) @@ -185,10 +185,10 @@ is_basic(wchar_t wc) static int _citrus_UES_mbrtowc_priv(_UESEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _UESState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; int ch, head, num, tail; wchar_t hi, wc; Modified: stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c ============================================================================== --- stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c Thu Apr 30 16:08:47 2015 (r282275) @@ -97,9 +97,9 @@ _citrus_UTF1632_init_state(_UTF1632Encod static int _citrus_UTF1632_mbrtowc_priv(_UTF1632EncodingInfo *ei, wchar_t *pwc, - const char **s, size_t n, _UTF1632State *psenc, size_t *nresult) + char **s, size_t n, _UTF1632State *psenc, size_t *nresult) { - const char *s0; + char *s0; size_t result; wchar_t wc = L'\0'; int chlenbak, endian, needlen; Modified: stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c ============================================================================== --- stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c Thu Apr 30 16:08:47 2015 (r282275) @@ -151,11 +151,11 @@ static const char spaces[] = " \t\r\n"; static int _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei, - uint16_t * __restrict u16, const char ** __restrict s, size_t n, + uint16_t * __restrict u16, char ** __restrict s, size_t n, _UTF7State * __restrict psenc, size_t * __restrict nresult) { _UTF7State sv; - const char *s0; + char *s0; int done, i, len; s0 = *s; @@ -244,7 +244,7 @@ ilseq: static int _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _UTF7State * __restrict psenc, size_t * __restrict nresult) { uint32_t u32; Modified: stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c ============================================================================== --- stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c Thu Apr 30 16:08:47 2015 (r282275) @@ -177,10 +177,10 @@ _citrus_UTF8_unpack_state(_UTF8EncodingI #endif static int -_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, const char **s, +_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, char **s, size_t n, _UTF8State *psenc, size_t *nresult) { - const char *s0; + char *s0; wchar_t wchar; int i; uint8_t c; Modified: stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c ============================================================================== --- stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c Thu Apr 30 16:08:47 2015 (r282275) @@ -252,11 +252,11 @@ _citrus_VIQR_unpack_state(_VIQREncodingI static int _citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _VIQRState * __restrict psenc, size_t * __restrict nresult) { mnemonic_t *m, *m0; - const char *s0; + char *s0; wchar_t wc; ssize_t i; int ch, escape; Modified: stable/10/lib/libiconv_modules/ZW/citrus_zw.c ============================================================================== --- stable/10/lib/libiconv_modules/ZW/citrus_zw.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/ZW/citrus_zw.c Thu Apr 30 16:08:47 2015 (r282275) @@ -107,10 +107,10 @@ _citrus_ZW_unpack_state(_ZWEncodingInfo static int _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char **__restrict s, size_t n, + wchar_t * __restrict pwc, char **__restrict s, size_t n, _ZWState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wc; int ch, len; Modified: stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c ============================================================================== --- stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c Thu Apr 30 16:08:47 2015 (r282275) @@ -97,7 +97,7 @@ _citrus_iconv_none_iconv_uninit_context( static int /*ARGSUSED*/ _citrus_iconv_none_iconv_convert(struct _citrus_iconv * __restrict ci __unused, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags __unused, size_t * __restrict invalids) { Modified: stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c ============================================================================== --- stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Thu Apr 30 16:08:47 2015 (r282275) @@ -104,7 +104,7 @@ init_encoding_state(struct _citrus_iconv static __inline int mbtocsx(struct _citrus_iconv_std_encoding *se, - _csid_t *csid, _index_t *idx, const char **s, size_t n, size_t *nresult, + _csid_t *csid, _index_t *idx, char **s, size_t n, size_t *nresult, struct iconv_hooks *hooks) { @@ -461,7 +461,7 @@ _citrus_iconv_std_iconv_uninit_context(s static int _citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags, size_t * __restrict invalids) { @@ -469,7 +469,7 @@ _citrus_iconv_std_iconv_convert(struct _ struct _citrus_iconv_std_context *sc = cv->cv_closure; _csid_t csid; _index_t idx; - const char *tmpin; + char *tmpin; size_t inval, szrin, szrout; int ret, state = 0; Modified: stable/10/lib/libkiconv/xlat16_iconv.c ============================================================================== --- stable/10/lib/libkiconv/xlat16_iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libkiconv/xlat16_iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -62,7 +62,7 @@ static int chklocale(int, const char *); typedef void *iconv_t; static int my_iconv_init(void); static iconv_t (*my_iconv_open)(const char *, const char *); -static size_t (*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *); +static size_t (*my_iconv)(iconv_t, char **, size_t *, char **, size_t *); static int (*my_iconv_close)(iconv_t); #else #include @@ -71,7 +71,7 @@ static int (*my_iconv_close)(iconv_t); #define my_iconv iconv #define my_iconv_close iconv_close #endif -static size_t my_iconv_char(iconv_t, const u_char **, size_t *, u_char **, size_t *); +static size_t my_iconv_char(iconv_t, u_char **, size_t *, u_char **, size_t *); int kiconv_add_xlat16_cspair(const char *tocode, const char *fromcode, int flag) @@ -221,8 +221,8 @@ kiconv_xlat16_open(const char *tocode, c src[0] = (u_char)(c >> 8); src[1] = (u_char)c; - ret = my_iconv_char(cd, (const u_char **)&srcp, - &inbytesleft, &dstp, &outbytesleft); + ret = my_iconv_char(cd, &srcp, &inbytesleft, + &dstp, &outbytesleft); if (ret == -1) { table[us] = 0; continue; @@ -338,11 +338,10 @@ my_iconv_init(void) #endif static size_t -my_iconv_char(iconv_t cd, const u_char **ibuf, size_t * ilen, u_char **obuf, +my_iconv_char(iconv_t cd, u_char **ibuf, size_t * ilen, u_char **obuf, size_t * olen) { - const u_char *sp; - u_char *dp, ilocal[3], olocal[3]; + u_char *sp, *dp, ilocal[3], olocal[3]; u_char c1, c2; int ret; size_t ir, or; @@ -352,7 +351,7 @@ my_iconv_char(iconv_t cd, const u_char * ir = *ilen; bzero(*obuf, *olen); - ret = my_iconv(cd, (const char **)&sp, ilen, (char **)&dp, olen); + ret = my_iconv(cd, (char **)&sp, ilen, (char **)&dp, olen); c1 = (*obuf)[0]; c2 = (*obuf)[1]; @@ -375,7 +374,7 @@ my_iconv_char(iconv_t cd, const u_char * sp = ilocal; dp = olocal; - if ((my_iconv(cd,(const char **)&sp, &ir, (char **)&dp, &or)) != -1) { + if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) != -1) { if (olocal[0] != c1) return (ret); @@ -429,7 +428,7 @@ my_iconv_char(iconv_t cd, const u_char * sp = ilocal + 1; dp = olocal; - if ((my_iconv(cd,(const char **)&sp, &ir, (char **)&dp, &or)) != -1) { + if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) != -1) { if (olocal[0] == c2) /* * inbuf is a single byte char Modified: stable/10/sys/sys/param.h ============================================================================== --- stable/10/sys/sys/param.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/sys/sys/param.h Thu Apr 30 16:08:47 2015 (r282275) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1001513 /* Master, propagated to newvers */ +#define __FreeBSD_version 1001514 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: stable/10/usr.bin/iconv/iconv.c ============================================================================== --- stable/10/usr.bin/iconv/iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/usr.bin/iconv/iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -71,9 +71,8 @@ do_conv(FILE *fp, const char *from, cons bool hide_invalid) { iconv_t cd; - char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out; + char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *in, *out; unsigned long long invalids; - const char *in; size_t inbytes, outbytes, ret; if ((cd = iconv_open(to, from)) == (iconv_t)-1) From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 18:07:49 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12820925; Thu, 30 Apr 2015 18:07:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00C2E1963; Thu, 30 Apr 2015 18:07:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UI7mlj063713; Thu, 30 Apr 2015 18:07:48 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UI7mMA063712; Thu, 30 Apr 2015 18:07:48 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201504301807.t3UI7mMA063712@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 30 Apr 2015 18:07:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282278 - stable/10/usr.bin/wc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 18:07:49 -0000 Author: bdrewery Date: Thu Apr 30 18:07:48 2015 New Revision: 282278 URL: https://svnweb.freebsd.org/changeset/base/282278 Log: MFC r281617: wc: Fix SIGINFO race causing final results to be lost to stderr. Relnotes: yes Modified: stable/10/usr.bin/wc/wc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/wc/wc.c ============================================================================== --- stable/10/usr.bin/wc/wc.c Thu Apr 30 17:49:35 2015 (r282277) +++ stable/10/usr.bin/wc/wc.c Thu Apr 30 18:07:48 2015 (r282278) @@ -74,6 +74,14 @@ siginfo_handler(int sig __unused) siginfo = 1; } +static void +reset_siginfo(void) +{ + + signal(SIGINFO, SIG_DFL); + siginfo = 0; +} + int main(int argc, char *argv[]) { @@ -207,6 +215,7 @@ cnt(const char *file) } else tmpll++; } + reset_siginfo(); tlinect += linect; if (dochar) tcharct += charct; @@ -229,6 +238,7 @@ cnt(const char *file) return (1); } if (S_ISREG(sb.st_mode)) { + reset_siginfo(); charct = sb.st_size; show_cnt(file, linect, wordct, charct, llct); tcharct += charct; @@ -289,6 +299,7 @@ word: gotsp = 1; } } } + reset_siginfo(); if (domulti && MB_CUR_MAX > 1) if (mbrtowc(NULL, NULL, 0, &mbs) == (size_t)-1 && !warned) warn("%s", file != NULL ? file : "stdin"); From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 18:11:44 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36732B0A; Thu, 30 Apr 2015 18:11:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 247CB1A66; Thu, 30 Apr 2015 18:11:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UIBins066006; Thu, 30 Apr 2015 18:11:44 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UIBhQE066005; Thu, 30 Apr 2015 18:11:44 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201504301811.t3UIBhQE066005@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 30 Apr 2015 18:11:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282279 - stable/9/usr.bin/wc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 18:11:44 -0000 Author: bdrewery Date: Thu Apr 30 18:11:43 2015 New Revision: 282279 URL: https://svnweb.freebsd.org/changeset/base/282279 Log: MFC r281617: wc: Fix SIGINFO race causing final results to be lost to stderr. Relnotes: yes Modified: stable/9/usr.bin/wc/wc.c Directory Properties: stable/9/usr.bin/wc/ (props changed) Modified: stable/9/usr.bin/wc/wc.c ============================================================================== --- stable/9/usr.bin/wc/wc.c Thu Apr 30 18:07:48 2015 (r282278) +++ stable/9/usr.bin/wc/wc.c Thu Apr 30 18:11:43 2015 (r282279) @@ -74,6 +74,14 @@ siginfo_handler(int sig __unused) siginfo = 1; } +static void +reset_siginfo(void) +{ + + signal(SIGINFO, SIG_DFL); + siginfo = 0; +} + int main(int argc, char *argv[]) { @@ -207,6 +215,7 @@ cnt(const char *file) } else tmpll++; } + reset_siginfo(); tlinect += linect; if (dochar) tcharct += charct; @@ -229,6 +238,7 @@ cnt(const char *file) return (1); } if (S_ISREG(sb.st_mode)) { + reset_siginfo(); charct = sb.st_size; show_cnt(file, linect, wordct, charct, llct); tcharct += charct; @@ -289,6 +299,7 @@ word: gotsp = 1; } } } + reset_siginfo(); if (domulti && MB_CUR_MAX > 1) if (mbrtowc(NULL, NULL, 0, &mbs) == (size_t)-1 && !warned) warn("%s", file != NULL ? file : "stdin"); From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 18:44:18 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 886EE4AE for ; Thu, 30 Apr 2015 18:44:18 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 697DA1DF9 for ; Thu, 30 Apr 2015 18:44:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UIiIJJ067125 for ; Thu, 30 Apr 2015 18:44:18 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id t3UIiI7i067123 for svn-src-stable@freebsd.org; Thu, 30 Apr 2015 18:44:18 GMT (envelope-from bdrewery) Received: (qmail 67044 invoked from network); 30 Apr 2015 13:44:13 -0500 Received: from unknown (HELO ?10.10.1.139?) (freebsd@shatow.net@10.10.1.139) by sweb.xzibition.com with ESMTPA; 30 Apr 2015 13:44:13 -0500 Message-ID: <55427802.80300@FreeBSD.org> Date: Thu, 30 Apr 2015 13:44:18 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Tijl Coosemans , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r282275 - in stable/10: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_modules... References: <201504301608.t3UG8mNS004104@svn.freebsd.org> In-Reply-To: <201504301608.t3UG8mNS004104@svn.freebsd.org> OpenPGP: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oMakBvV5N8R6Wa1IXfVKeqerR26SMhGHf" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 18:44:18 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --oMakBvV5N8R6Wa1IXfVKeqerR26SMhGHf Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 4/30/2015 11:08 AM, Tijl Coosemans wrote: > Author: tijl > Date: Thu Apr 30 16:08:47 2015 > New Revision: 282275 > URL: https://svnweb.freebsd.org/changeset/base/282275 >=20 > Log: > MFC r275805: > =20 > Fix incorrect type of "invalids" argument in __iconv() prototype. > =20 > MFC r281550,281591: > =20 > Remove the const qualifier from iconv(3) to comply with POSIX: > http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html > =20 > Adjust all code that calls iconv. > =20 > PR: 199099 >=20 > Modified: > stable/10/UPDATING > stable/10/bin/csh/config.h > stable/10/bin/csh/iconv_stub.h > stable/10/contrib/smbfs/include/netsmb/smb_lib.h > stable/10/contrib/smbfs/lib/smb/nls.c > stable/10/contrib/smbfs/lib/smb/print.c > stable/10/contrib/smbfs/lib/smb/rq.c > stable/10/include/iconv.h > stable/10/lib/libarchive/Makefile > stable/10/lib/libc/iconv/__iconv.c > stable/10/lib/libc/iconv/bsd_iconv.c > stable/10/lib/libc/iconv/citrus_iconv.h > stable/10/lib/libc/iconv/citrus_iconv_local.h > stable/10/lib/libc/iconv/citrus_none.c > stable/10/lib/libc/iconv/citrus_stdenc.h > stable/10/lib/libc/iconv/citrus_stdenc_local.h > stable/10/lib/libc/iconv/citrus_stdenc_template.h > stable/10/lib/libc/iconv/iconv-internal.h > stable/10/lib/libc/iconv/iconv.3 > stable/10/lib/libc/iconv/iconv.c > stable/10/lib/libc/iconv/iconv_compat.c > stable/10/lib/libc/locale/cXXrtomb_iconv.h > stable/10/lib/libc/locale/mbrtocXX_iconv.h > stable/10/lib/libiconv_modules/BIG5/citrus_big5.c > stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c > stable/10/lib/libiconv_modules/EUC/citrus_euc.c > stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c > stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c > stable/10/lib/libiconv_modules/HZ/citrus_hz.c > stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c > stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c > stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c > stable/10/lib/libiconv_modules/UES/citrus_ues.c > stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c > stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c > stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c > stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c > stable/10/lib/libiconv_modules/ZW/citrus_zw.c > stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c > stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c > stable/10/lib/libkiconv/xlat16_iconv.c > stable/10/sys/sys/param.h > stable/10/usr.bin/iconv/iconv.c > Directory Properties: > stable/10/ (props changed) >=20 > Modified: stable/10/UPDATING > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/10/UPDATING Thu Apr 30 15:48:48 2015 (r282274) > +++ stable/10/UPDATING Thu Apr 30 16:08:47 2015 (r282275) > @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH > stable/10, and then rebuild without this option. The bootstrap process= from > older version of current is a bit fragile. > =20 > +20150430: > + The const qualifier has been removed from iconv(3) to comply with > + POSIX. The ports tree is aware of this from r384038 onwards. > + Being an ABI change this seems wrong to MFC. Binaries are not only built from Ports. For a binary built on 10.1 will this change cause any issues? --=20 Regards, Bryan Drewery --oMakBvV5N8R6Wa1IXfVKeqerR26SMhGHf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJVQngCAAoJEDXXcbtuRpfPTa0IAKIN33p9AyOOJTlSym7Q7UIn FOOa5tXv+C3tVD6J95hn32EAkf9C2yMGXHYPRxx3DiR+xfjg0AnhvXYi5i5rhigf n4E5jgmKffSc45dGeZKwgUuVGCJ9Ep91dbhzqkpsf99/QzJB9NNlT9ReQpShW0Ze xCVjFMLEagAw5D19grMM/+fa4obaPyv2EfC67v5pNtAiS4JSNcOGHmhMD8lauOLD ga79xUjC9mC6xrxA3cc0NSw62orAn8uQrMKVT2qgH2zIlMkED6FbuAT7yX/6Lg15 idz79ELTtteSiuNhEeeLIGCd5ZTGT3arV87FkUBkMTUnsPdUryH75BNP6JuEXsc= =c6Bs -----END PGP SIGNATURE----- --oMakBvV5N8R6Wa1IXfVKeqerR26SMhGHf-- From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 19:40:37 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D78FEF1; Thu, 30 Apr 2015 19:40:37 +0000 (UTC) Received: from mailrelay119.isp.belgacom.be (mailrelay119.isp.belgacom.be [195.238.20.146]) by mx1.freebsd.org (Postfix) with ESMTP id B176A1324; Thu, 30 Apr 2015 19:40:35 +0000 (UTC) X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=wisUSL2q+2X910teRg2xg/30tBFW7lBMAi45pEFXNHU= c=1 sm=2 a=6I5d2MoRAAAA:8 a=uZvujYp8AAAA:8 a=l6kVda_T1Z9zCi4Qi1MA:9 a=CjuIK1q_8ugA:10 a=tKbmi1Y-NooA:10 a=tNJVa7PJUT1K0kJ5Z0MA:9 a=dmpdFviX8IwA:10 a=0ZwACUlkkugA:10 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CZBgCohEJV/wu/8VFcgwxTUAzFWYFThTZOAoFWOhMBAQEBAQEBgQqEIQEBBFYjEAsOBgQJGgsPKh4GE4gvAQjIYgEBAQEBAQQBAQEBAQEBARqLOIR0EQeELQWPNYY+hj6BYYZgg3KJSyOCOIE+PDEBgkQBAQE Received: from 11.191-241-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.241.191.11]) by relay.skynet.be with ESMTP; 30 Apr 2015 21:39:09 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.9/8.14.9) with ESMTP id t3UJd7Xe004974; Thu, 30 Apr 2015 21:39:07 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Thu, 30 Apr 2015 21:39:02 +0200 From: Tijl Coosemans To: Bryan Drewery Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r282275 - in stable/10: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_modules... Message-ID: <20150430213902.21ee48fc@kalimero.tijl.coosemans.org> In-Reply-To: <55427802.80300@FreeBSD.org> References: <201504301608.t3UG8mNS004104@svn.freebsd.org> <55427802.80300@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/6klm17pZzuaratc4hqX+at0"; protocol="application/pgp-signature" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 19:40:37 -0000 --Sig_/6klm17pZzuaratc4hqX+at0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Thu, 30 Apr 2015 13:44:18 -0500 Bryan Drewery wro= te: > On 4/30/2015 11:08 AM, Tijl Coosemans wrote: >> Author: tijl >> Date: Thu Apr 30 16:08:47 2015 >> New Revision: 282275 >> URL: https://svnweb.freebsd.org/changeset/base/282275 >>=20 >> Log: >> MFC r275805: >> =20 >> Fix incorrect type of "invalids" argument in __iconv() prototype. >> =20 >> MFC r281550,281591: >> =20 >> Remove the const qualifier from iconv(3) to comply with POSIX: >> http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html >> =20 >> Adjust all code that calls iconv. >> =20 >> PR: 199099 >>=20 >> Modified: >> stable/10/UPDATING >> stable/10/bin/csh/config.h >> stable/10/bin/csh/iconv_stub.h >> stable/10/contrib/smbfs/include/netsmb/smb_lib.h >> stable/10/contrib/smbfs/lib/smb/nls.c >> stable/10/contrib/smbfs/lib/smb/print.c >> stable/10/contrib/smbfs/lib/smb/rq.c >> stable/10/include/iconv.h >> stable/10/lib/libarchive/Makefile >> stable/10/lib/libc/iconv/__iconv.c >> stable/10/lib/libc/iconv/bsd_iconv.c >> stable/10/lib/libc/iconv/citrus_iconv.h >> stable/10/lib/libc/iconv/citrus_iconv_local.h >> stable/10/lib/libc/iconv/citrus_none.c >> stable/10/lib/libc/iconv/citrus_stdenc.h >> stable/10/lib/libc/iconv/citrus_stdenc_local.h >> stable/10/lib/libc/iconv/citrus_stdenc_template.h >> stable/10/lib/libc/iconv/iconv-internal.h >> stable/10/lib/libc/iconv/iconv.3 >> stable/10/lib/libc/iconv/iconv.c >> stable/10/lib/libc/iconv/iconv_compat.c >> stable/10/lib/libc/locale/cXXrtomb_iconv.h >> stable/10/lib/libc/locale/mbrtocXX_iconv.h >> stable/10/lib/libiconv_modules/BIG5/citrus_big5.c >> stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c >> stable/10/lib/libiconv_modules/EUC/citrus_euc.c >> stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c >> stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c >> stable/10/lib/libiconv_modules/HZ/citrus_hz.c >> stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c >> stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c >> stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c >> stable/10/lib/libiconv_modules/UES/citrus_ues.c >> stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c >> stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c >> stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c >> stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c >> stable/10/lib/libiconv_modules/ZW/citrus_zw.c >> stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c >> stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c >> stable/10/lib/libkiconv/xlat16_iconv.c >> stable/10/sys/sys/param.h >> stable/10/usr.bin/iconv/iconv.c >> Directory Properties: >> stable/10/ (props changed) >>=20 >> Modified: stable/10/UPDATING >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- stable/10/UPDATING Thu Apr 30 15:48:48 2015 (r282274) >> +++ stable/10/UPDATING Thu Apr 30 16:08:47 2015 (r282275) >> @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH >> stable/10, and then rebuild without this option. The bootstrap process = from >> older version of current is a bit fragile. >> =20 >> +20150430: >> + The const qualifier has been removed from iconv(3) to comply with >> + POSIX. The ports tree is aware of this from r384038 onwards. >> + >=20 > Being an ABI change this seems wrong to MFC. Binaries are not only built > from Ports. >=20 > For a binary built on 10.1 will this change cause any issues? Removing const from a function parameter is not an ABI change, so there are no issues for binaries. The worst you can run into is a warning/error from a compiler (when you pass a const char** argument to what is now a char** parameter), but this should be trivial to fix. --Sig_/6klm17pZzuaratc4hqX+at0 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iF4EAREKAAYFAlVChNYACgkQfoCS2CCgtitKxwD/bMbwoaX6u5LAOUif8z78FLAR k5rIvzRZDcymResjj28A/iNkn6c+7Dabj1y8VpFSBthz4rDhMyZ+IYiCLIowFM+x =mktF -----END PGP SIGNATURE----- --Sig_/6klm17pZzuaratc4hqX+at0-- From owner-svn-src-stable@FreeBSD.ORG Thu Apr 30 20:02:12 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4096D96D for ; Thu, 30 Apr 2015 20:02:12 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 023491678 for ; Thu, 30 Apr 2015 20:02:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UK2Bcf096340 for ; Thu, 30 Apr 2015 20:02:11 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id t3UK2Bw3096337 for svn-src-stable@freebsd.org; Thu, 30 Apr 2015 20:02:11 GMT (envelope-from bdrewery) Received: (qmail 72482 invoked from network); 30 Apr 2015 15:02:07 -0500 Received: from unknown (HELO ?10.10.1.139?) (freebsd@shatow.net@10.10.1.139) by sweb.xzibition.com with ESMTPA; 30 Apr 2015 15:02:07 -0500 Message-ID: <55428A44.3090001@FreeBSD.org> Date: Thu, 30 Apr 2015 15:02:12 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Tijl Coosemans CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r282275 - in stable/10: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_modules... References: <201504301608.t3UG8mNS004104@svn.freebsd.org> <55427802.80300@FreeBSD.org> <20150430213902.21ee48fc@kalimero.tijl.coosemans.org> In-Reply-To: <20150430213902.21ee48fc@kalimero.tijl.coosemans.org> OpenPGP: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="reh9VbAglqQR7grJ30Ksv6vTtnpaMsMdI" X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 20:02:12 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --reh9VbAglqQR7grJ30Ksv6vTtnpaMsMdI Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 4/30/2015 2:39 PM, Tijl Coosemans wrote: > On Thu, 30 Apr 2015 13:44:18 -0500 Bryan Drewery = wrote: >> On 4/30/2015 11:08 AM, Tijl Coosemans wrote: >>> Author: tijl >>> Date: Thu Apr 30 16:08:47 2015 >>> New Revision: 282275 >>> URL: https://svnweb.freebsd.org/changeset/base/282275 >>> >>> Log: >>> MFC r275805: >>> =20 >>> Fix incorrect type of "invalids" argument in __iconv() prototype. >>> =20 >>> MFC r281550,281591: >>> =20 >>> Remove the const qualifier from iconv(3) to comply with POSIX: >>> http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.htm= l >>> =20 >>> Adjust all code that calls iconv. >>> =20 >>> PR: 199099 >>> >>> Modified: >>> stable/10/UPDATING >>> stable/10/bin/csh/config.h >>> stable/10/bin/csh/iconv_stub.h >>> stable/10/contrib/smbfs/include/netsmb/smb_lib.h >>> stable/10/contrib/smbfs/lib/smb/nls.c >>> stable/10/contrib/smbfs/lib/smb/print.c >>> stable/10/contrib/smbfs/lib/smb/rq.c >>> stable/10/include/iconv.h >>> stable/10/lib/libarchive/Makefile >>> stable/10/lib/libc/iconv/__iconv.c >>> stable/10/lib/libc/iconv/bsd_iconv.c >>> stable/10/lib/libc/iconv/citrus_iconv.h >>> stable/10/lib/libc/iconv/citrus_iconv_local.h >>> stable/10/lib/libc/iconv/citrus_none.c >>> stable/10/lib/libc/iconv/citrus_stdenc.h >>> stable/10/lib/libc/iconv/citrus_stdenc_local.h >>> stable/10/lib/libc/iconv/citrus_stdenc_template.h >>> stable/10/lib/libc/iconv/iconv-internal.h >>> stable/10/lib/libc/iconv/iconv.3 >>> stable/10/lib/libc/iconv/iconv.c >>> stable/10/lib/libc/iconv/iconv_compat.c >>> stable/10/lib/libc/locale/cXXrtomb_iconv.h >>> stable/10/lib/libc/locale/mbrtocXX_iconv.h >>> stable/10/lib/libiconv_modules/BIG5/citrus_big5.c >>> stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c >>> stable/10/lib/libiconv_modules/EUC/citrus_euc.c >>> stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c >>> stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c >>> stable/10/lib/libiconv_modules/HZ/citrus_hz.c >>> stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c >>> stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c >>> stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c >>> stable/10/lib/libiconv_modules/UES/citrus_ues.c >>> stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c >>> stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c >>> stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c >>> stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c >>> stable/10/lib/libiconv_modules/ZW/citrus_zw.c >>> stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c >>> stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c >>> stable/10/lib/libkiconv/xlat16_iconv.c >>> stable/10/sys/sys/param.h >>> stable/10/usr.bin/iconv/iconv.c >>> Directory Properties: >>> stable/10/ (props changed) >>> >>> Modified: stable/10/UPDATING >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- stable/10/UPDATING Thu Apr 30 15:48:48 2015 (r282274) >>> +++ stable/10/UPDATING Thu Apr 30 16:08:47 2015 (r282275) >>> @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH >>> stable/10, and then rebuild without this option. The bootstrap proce= ss from >>> older version of current is a bit fragile. >>> =20 >>> +20150430: >>> + The const qualifier has been removed from iconv(3) to comply with >>> + POSIX. The ports tree is aware of this from r384038 onwards. >>> + >> >> Being an ABI change this seems wrong to MFC. Binaries are not only bui= lt >> from Ports. >> >> For a binary built on 10.1 will this change cause any issues? >=20 > Removing const from a function parameter is not an ABI change, so there= > are no issues for binaries. The worst you can run into is a warning/er= ror > from a compiler (when you pass a const char** argument to what is now a= > char** parameter), but this should be trivial to fix. >=20 Thanks. I wasn't quite sure if it was really an ABI issue or just API. --=20 Regards, Bryan Drewery --reh9VbAglqQR7grJ30Ksv6vTtnpaMsMdI Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJVQopEAAoJEDXXcbtuRpfPq7YIAJqIfB20pRo1n+Miw2oXI/ro N+Urpl22ISQzQuxdjlt/EOvGhhswTJAtlkPgCOHm68PnW8xZUzEmN3NRRlhRqise KSD8DPtOTbJCm6PWz+Og8iCocgwt06HaX++KvEaqLbAymWkVEP/it325W5LX6c1P c8HqRMO+ew07dg8okLpl2/kMmCOM/ZR9D/O0n6DTtp2icdPZWsNN7rQwh7/8AGa3 ZVDJMkhysswDHiCNcUCU1l0ecGa9ZKpbf2xwlqVaDZWqna/FtUX1Tnd415x7Ta4d xXDMD7WgmxEMxxjYp9XnAGOfVr1A+kcy2dZ2uFHCThg1W4G2757knRNEXS32oeM= =anCv -----END PGP SIGNATURE----- --reh9VbAglqQR7grJ30Ksv6vTtnpaMsMdI-- From owner-svn-src-stable@FreeBSD.ORG Fri May 1 00:31:42 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1673952A; Fri, 1 May 2015 00:31:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAF5812C1; Fri, 1 May 2015 00:31:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t410Vfb1061216; Fri, 1 May 2015 00:31:41 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t410VeK3061207; Fri, 1 May 2015 00:31:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505010031.t410VeK3061207@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 1 May 2015 00:31:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282292 - stable/10/release/arm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 00:31:42 -0000 Author: gjb Date: Fri May 1 00:31:40 2015 New Revision: 282292 URL: https://svnweb.freebsd.org/changeset/base/282292 Log: MFC r282148: Fix CROCHETBRANCH. PR: 199760 Sponsored by: The FreeBSD Foundation Modified: stable/10/release/arm/BEAGLEBONE.conf stable/10/release/arm/PANDABOARD.conf stable/10/release/arm/RPI-B.conf stable/10/release/arm/WANDBOARD-QUAD.conf stable/10/release/arm/ZEDBOARD.conf Directory Properties: stable/10/ (props changed) Modified: stable/10/release/arm/BEAGLEBONE.conf ============================================================================== --- stable/10/release/arm/BEAGLEBONE.conf Thu Apr 30 23:48:05 2015 (r282291) +++ stable/10/release/arm/BEAGLEBONE.conf Fri May 1 00:31:40 2015 (r282292) @@ -25,6 +25,6 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="BEAGLEBONE" CROCHETSRC="https://github.com/freebsd/crochet" -CROCHETBRANCH="trunk@r744" +CROCHETBRANCH="trunk@rHEAD" set +a Modified: stable/10/release/arm/PANDABOARD.conf ============================================================================== --- stable/10/release/arm/PANDABOARD.conf Thu Apr 30 23:48:05 2015 (r282291) +++ stable/10/release/arm/PANDABOARD.conf Fri May 1 00:31:40 2015 (r282292) @@ -25,6 +25,6 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="PANDABOARD" CROCHETSRC="https://github.com/freebsd/crochet" -CROCHETBRANCH="trunk@r744" +CROCHETBRANCH="trunk@rHEAD" set +a Modified: stable/10/release/arm/RPI-B.conf ============================================================================== --- stable/10/release/arm/RPI-B.conf Thu Apr 30 23:48:05 2015 (r282291) +++ stable/10/release/arm/RPI-B.conf Fri May 1 00:31:40 2015 (r282292) @@ -25,7 +25,7 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="RPI-B" CROCHETSRC="https://github.com/freebsd/crochet" -CROCHETBRANCH="trunk@r744" +CROCHETBRANCH="trunk@rHEAD" UBOOTSRC="https://github.com/gonzoua/u-boot-pi" UBOOTBRANCH="trunk" UBOOTDIR="/tmp/crochet/u-boot-rpi" Modified: stable/10/release/arm/WANDBOARD-QUAD.conf ============================================================================== --- stable/10/release/arm/WANDBOARD-QUAD.conf Thu Apr 30 23:48:05 2015 (r282291) +++ stable/10/release/arm/WANDBOARD-QUAD.conf Fri May 1 00:31:40 2015 (r282292) @@ -25,6 +25,6 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="WANDBOARD-QUAD" CROCHETSRC="https://github.com/freebsd/crochet" -CROCHETBRANCH="trunk@r744" +CROCHETBRANCH="trunk@rHEAD" set +a Modified: stable/10/release/arm/ZEDBOARD.conf ============================================================================== --- stable/10/release/arm/ZEDBOARD.conf Thu Apr 30 23:48:05 2015 (r282291) +++ stable/10/release/arm/ZEDBOARD.conf Fri May 1 00:31:40 2015 (r282292) @@ -24,6 +24,6 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="ZEDBOARD" CROCHETSRC="https://github.com/freebsd/crochet" -CROCHETBRANCH="trunk@r744" +CROCHETBRANCH="trunk@rHEAD" set +a From owner-svn-src-stable@FreeBSD.ORG Fri May 1 17:29:46 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DD2A9CB; Fri, 1 May 2015 17:29:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B0861497; Fri, 1 May 2015 17:29:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41HTkYi064671; Fri, 1 May 2015 17:29:46 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41HTkBg064670; Fri, 1 May 2015 17:29:46 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201505011729.t41HTkBg064670@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 1 May 2015 17:29:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282306 - stable/10/usr.sbin/bhyve X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 17:29:46 -0000 Author: mav Date: Fri May 1 17:29:45 2015 New Revision: 282306 URL: https://svnweb.freebsd.org/changeset/base/282306 Log: MFC r281666: Make virtual AHCI more careful with I/O lengths. Modified: stable/10/usr.sbin/bhyve/pci_ahci.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bhyve/pci_ahci.c ============================================================================== --- stable/10/usr.sbin/bhyve/pci_ahci.c Fri May 1 17:18:07 2015 (r282305) +++ stable/10/usr.sbin/bhyve/pci_ahci.c Fri May 1 17:29:45 2015 (r282306) @@ -124,7 +124,7 @@ struct ahci_ioreq { uint32_t len; uint32_t done; int slot; - int prdtl; + int more; }; struct ahci_port { @@ -520,26 +520,77 @@ atapi_string(uint8_t *dest, const char * } } +/* + * Build up the iovec based on the PRDT, 'done' and 'len'. + */ static void -ahci_handle_dma(struct ahci_port *p, int slot, uint8_t *cfis, uint32_t done, - int seek) +ahci_build_iov(struct ahci_port *p, struct ahci_ioreq *aior, + struct ahci_prdt_entry *prdt, uint16_t prdtl) +{ + struct blockif_req *breq = &aior->io_req; + int i, j, skip, todo, left, extra; + uint32_t dbcsz; + + /* Copy part of PRDT between 'done' and 'len' bytes into the iov. */ + skip = aior->done; + left = aior->len - aior->done; + todo = 0; + for (i = 0, j = 0; i < prdtl && j < BLOCKIF_IOV_MAX && left > 0; + i++, prdt++) { + dbcsz = (prdt->dbc & DBCMASK) + 1; + /* Skip already done part of the PRDT */ + if (dbcsz <= skip) { + skip -= dbcsz; + continue; + } + dbcsz -= skip; + if (dbcsz > left) + dbcsz = left; + breq->br_iov[j].iov_base = paddr_guest2host(ahci_ctx(p->pr_sc), + prdt->dba + skip, dbcsz); + breq->br_iov[j].iov_len = dbcsz; + todo += dbcsz; + left -= dbcsz; + skip = 0; + j++; + } + + /* If we got limited by IOV length, round I/O down to sector size. */ + if (j == BLOCKIF_IOV_MAX) { + extra = todo % blockif_sectsz(p->bctx); + todo -= extra; + assert(todo > 0); + while (extra > 0) { + if (breq->br_iov[j - 1].iov_len > extra) { + breq->br_iov[j - 1].iov_len -= extra; + break; + } + extra -= breq->br_iov[j - 1].iov_len; + j--; + } + } + + breq->br_iovcnt = j; + aior->done += todo; + aior->more = (aior->done < aior->len && i < prdtl); +} + +static void +ahci_handle_rw(struct ahci_port *p, int slot, uint8_t *cfis, uint32_t done) { struct ahci_ioreq *aior; struct blockif_req *breq; - struct pci_ahci_softc *sc; struct ahci_prdt_entry *prdt; struct ahci_cmd_hdr *hdr; uint64_t lba; uint32_t len; - int i, err, iovcnt, ncq, readop; + int err, ncq, readop; - sc = p->pr_sc; prdt = (struct ahci_prdt_entry *)(cfis + 0x80); hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); ncq = 0; readop = 1; - prdt += seek; if (cfis[2] == ATA_WRITE || cfis[2] == ATA_WRITE48 || cfis[2] == ATA_WRITE_MUL || cfis[2] == ATA_WRITE_MUL48 || cfis[2] == ATA_WRITE_DMA || cfis[2] == ATA_WRITE_DMA48 || @@ -580,49 +631,25 @@ ahci_handle_dma(struct ahci_port *p, int lba *= blockif_sectsz(p->bctx); len *= blockif_sectsz(p->bctx); - /* - * Pull request off free list - */ + /* Pull request off free list */ aior = STAILQ_FIRST(&p->iofhd); assert(aior != NULL); STAILQ_REMOVE_HEAD(&p->iofhd, io_flist); + aior->cfis = cfis; aior->slot = slot; aior->len = len; aior->done = done; breq = &aior->io_req; breq->br_offset = lba + done; - iovcnt = hdr->prdtl - seek; - if (iovcnt > BLOCKIF_IOV_MAX) { - aior->prdtl = iovcnt - BLOCKIF_IOV_MAX; - iovcnt = BLOCKIF_IOV_MAX; - } else - aior->prdtl = 0; - breq->br_iovcnt = iovcnt; + ahci_build_iov(p, aior, prdt, hdr->prdtl); - /* - * Mark this command in-flight. - */ + /* Mark this command in-flight. */ p->pending |= 1 << slot; - /* - * Stuff request onto busy list - */ + /* Stuff request onto busy list. */ TAILQ_INSERT_HEAD(&p->iobhd, aior, io_blist); - /* - * Build up the iovec based on the prdt - */ - for (i = 0; i < iovcnt; i++) { - uint32_t dbcsz; - - dbcsz = (prdt->dbc & DBCMASK) + 1; - breq->br_iov[i].iov_base = paddr_guest2host(ahci_ctx(sc), - prdt->dba, dbcsz); - breq->br_iov[i].iov_len = dbcsz; - aior->done += dbcsz; - prdt++; - } if (readop) err = blockif_read(p->bctx, breq); else @@ -650,7 +677,7 @@ ahci_handle_flush(struct ahci_port *p, i aior->slot = slot; aior->len = 0; aior->done = 0; - aior->prdtl = 0; + aior->more = 0; breq = &aior->io_req; /* @@ -745,7 +772,7 @@ next: aior->slot = slot; aior->len = len; aior->done = done; - aior->prdtl = 0; + aior->more = (len != done); breq = &aior->io_req; breq->br_offset = elba * blockif_sectsz(p->bctx); @@ -1242,8 +1269,7 @@ atapi_report_luns(struct ahci_port *p, i } static void -atapi_read(struct ahci_port *p, int slot, uint8_t *cfis, - uint32_t done, int seek) +atapi_read(struct ahci_port *p, int slot, uint8_t *cfis, uint32_t done) { struct ahci_ioreq *aior; struct ahci_cmd_hdr *hdr; @@ -1253,14 +1279,13 @@ atapi_read(struct ahci_port *p, int slot uint8_t *acmd; uint64_t lba; uint32_t len; - int i, err, iovcnt; + int err; sc = p->pr_sc; acmd = cfis + 0x40; hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); prdt = (struct ahci_prdt_entry *)(cfis + 0x80); - prdt += seek; lba = be32dec(acmd + 2); if (acmd[0] == READ_10) len = be16dec(acmd + 7); @@ -1285,37 +1310,14 @@ atapi_read(struct ahci_port *p, int slot aior->done = done; breq = &aior->io_req; breq->br_offset = lba + done; - iovcnt = hdr->prdtl - seek; - if (iovcnt > BLOCKIF_IOV_MAX) { - aior->prdtl = iovcnt - BLOCKIF_IOV_MAX; - iovcnt = BLOCKIF_IOV_MAX; - } else - aior->prdtl = 0; - breq->br_iovcnt = iovcnt; + ahci_build_iov(p, aior, prdt, hdr->prdtl); - /* - * Mark this command in-flight. - */ + /* Mark this command in-flight. */ p->pending |= 1 << slot; - /* - * Stuff request onto busy list - */ + /* Stuff request onto busy list. */ TAILQ_INSERT_HEAD(&p->iobhd, aior, io_blist); - /* - * Build up the iovec based on the prdt - */ - for (i = 0; i < iovcnt; i++) { - uint32_t dbcsz; - - dbcsz = (prdt->dbc & DBCMASK) + 1; - breq->br_iov[i].iov_base = paddr_guest2host(ahci_ctx(sc), - prdt->dba, dbcsz); - breq->br_iov[i].iov_len = dbcsz; - aior->done += dbcsz; - prdt++; - } err = blockif_read(p->bctx, breq); assert(err == 0); } @@ -1515,7 +1517,7 @@ handle_packet_cmd(struct ahci_port *p, i break; case READ_10: case READ_12: - atapi_read(p, slot, cfis, 0, 0); + atapi_read(p, slot, cfis, 0); break; case REQUEST_SENSE: atapi_request_sense(p, slot, cfis); @@ -1614,7 +1616,7 @@ ahci_handle_cmd(struct ahci_port *p, int case ATA_WRITE_DMA48: case ATA_READ_FPDMA_QUEUED: case ATA_WRITE_FPDMA_QUEUED: - ahci_handle_dma(p, slot, cfis, 0, 0); + ahci_handle_rw(p, slot, cfis, 0); break; case ATA_FLUSHCACHE: case ATA_FLUSHCACHE48: @@ -1755,7 +1757,7 @@ ata_ioreq_cb(struct blockif_req *br, int struct pci_ahci_softc *sc; uint32_t tfd; uint8_t *cfis; - int pending, slot, ncq, dsm; + int slot, ncq, dsm; DPRINTF("%s %d\n", __func__, err); @@ -1764,7 +1766,6 @@ ata_ioreq_cb(struct blockif_req *br, int p = aior->io_pr; cfis = aior->cfis; slot = aior->slot; - pending = aior->prdtl; sc = p->pr_sc; hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); @@ -1792,25 +1793,18 @@ ata_ioreq_cb(struct blockif_req *br, int if (!err) hdr->prdbc = aior->done; - if (dsm) { - if (aior->done != aior->len && !err) { + if (!err && aior->more) { + if (dsm) ahci_handle_dsm_trim(p, slot, cfis, aior->done); - goto out; - } - } else { - if (pending && !err) { - ahci_handle_dma(p, slot, cfis, aior->done, - hdr->prdtl - pending); - goto out; - } + else + ahci_handle_rw(p, slot, cfis, aior->done); + goto out; } - if (!err && aior->done == aior->len) { + if (!err) tfd = ATA_S_READY | ATA_S_DSC; - } else { + else tfd = (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR; - } - if (ncq) ahci_write_fis_sdb(p, slot, cfis, tfd); else @@ -1836,7 +1830,7 @@ atapi_ioreq_cb(struct blockif_req *br, i struct pci_ahci_softc *sc; uint8_t *cfis; uint32_t tfd; - int pending, slot; + int slot; DPRINTF("%s %d\n", __func__, err); @@ -1844,7 +1838,6 @@ atapi_ioreq_cb(struct blockif_req *br, i p = aior->io_pr; cfis = aior->cfis; slot = aior->slot; - pending = aior->prdtl; sc = p->pr_sc; hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + aior->slot * AHCI_CL_SIZE); @@ -1863,19 +1856,18 @@ atapi_ioreq_cb(struct blockif_req *br, i if (!err) hdr->prdbc = aior->done; - if (pending && !err) { - atapi_read(p, slot, cfis, aior->done, hdr->prdtl - pending); + if (!err && aior->more) { + atapi_read(p, slot, cfis, aior->done); goto out; } - if (!err && aior->done == aior->len) { + if (!err) { tfd = ATA_S_READY | ATA_S_DSC; } else { p->sense_key = ATA_SENSE_ILLEGAL_REQUEST; p->asc = 0x21; tfd = (p->sense_key << 12) | ATA_S_READY | ATA_S_ERROR; } - cfis[4] = (cfis[4] & ~7) | ATA_I_CMD | ATA_I_IN; ahci_write_fis_d2h(p, slot, cfis, tfd); From owner-svn-src-stable@FreeBSD.ORG Fri May 1 17:31:01 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5427BB2A; Fri, 1 May 2015 17:31:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 35FF114B2; Fri, 1 May 2015 17:31:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41HV1St065541; Fri, 1 May 2015 17:31:01 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41HV0cN065531; Fri, 1 May 2015 17:31:00 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201505011731.t41HV0cN065531@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 1 May 2015 17:31:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282307 - stable/10/usr.sbin/bhyve X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 17:31:01 -0000 Author: mav Date: Fri May 1 17:30:59 2015 New Revision: 282307 URL: https://svnweb.freebsd.org/changeset/base/282307 Log: MFC r281700: Workaround bhyve virtual disks operation on top of GEOM providers. GEOM does not support scatter/gather lists in its I/Os. Such requests are cut in pieces by physio(), that may be problematic, if those pieces are not multiple of provider's sector size. If such case is detected, move the data through temporary sequential buffer. Modified: stable/10/usr.sbin/bhyve/block_if.c stable/10/usr.sbin/bhyve/block_if.h stable/10/usr.sbin/bhyve/pci_ahci.c stable/10/usr.sbin/bhyve/pci_virtio_block.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bhyve/block_if.c ============================================================================== --- stable/10/usr.sbin/bhyve/block_if.c Fri May 1 17:29:45 2015 (r282306) +++ stable/10/usr.sbin/bhyve/block_if.c Fri May 1 17:30:59 2015 (r282307) @@ -85,6 +85,7 @@ struct blockif_ctxt { int bc_magic; int bc_fd; int bc_ischr; + int bc_isgeom; int bc_candelete; int bc_rdonly; off_t bc_size; @@ -198,27 +199,93 @@ blockif_complete(struct blockif_ctxt *bc } static void -blockif_proc(struct blockif_ctxt *bc, struct blockif_elem *be) +blockif_proc(struct blockif_ctxt *bc, struct blockif_elem *be, uint8_t *buf) { struct blockif_req *br; off_t arg[2]; - int err; + ssize_t clen, len, off, boff, voff; + int i, err; br = be->be_req; + if (br->br_iovcnt <= 1) + buf = NULL; err = 0; - switch (be->be_op) { case BOP_READ: - if (preadv(bc->bc_fd, br->br_iov, br->br_iovcnt, - br->br_offset) < 0) - err = errno; + if (buf == NULL) { + if ((len = preadv(bc->bc_fd, br->br_iov, br->br_iovcnt, + br->br_offset)) < 0) + err = errno; + else + br->br_resid -= len; + break; + } + i = 0; + off = voff = 0; + while (br->br_resid > 0) { + len = MIN(br->br_resid, MAXPHYS); + if (pread(bc->bc_fd, buf, len, br->br_offset + + off) < 0) { + err = errno; + break; + } + boff = 0; + do { + clen = MIN(len - boff, br->br_iov[i].iov_len - + voff); + memcpy(br->br_iov[i].iov_base + voff, + buf + boff, clen); + if (clen < br->br_iov[i].iov_len - voff) + voff += clen; + else { + i++; + voff = 0; + } + boff += clen; + } while (boff < len); + off += len; + br->br_resid -= len; + } break; case BOP_WRITE: - if (bc->bc_rdonly) + if (bc->bc_rdonly) { err = EROFS; - else if (pwritev(bc->bc_fd, br->br_iov, br->br_iovcnt, - br->br_offset) < 0) - err = errno; + break; + } + if (buf == NULL) { + if ((len = pwritev(bc->bc_fd, br->br_iov, br->br_iovcnt, + br->br_offset)) < 0) + err = errno; + else + br->br_resid -= len; + break; + } + i = 0; + off = voff = 0; + while (br->br_resid > 0) { + len = MIN(br->br_resid, MAXPHYS); + boff = 0; + do { + clen = MIN(len - boff, br->br_iov[i].iov_len - + voff); + memcpy(buf + boff, + br->br_iov[i].iov_base + voff, clen); + if (clen < br->br_iov[i].iov_len - voff) + voff += clen; + else { + i++; + voff = 0; + } + boff += clen; + } while (boff < len); + if (pwrite(bc->bc_fd, buf, len, br->br_offset + + off) < 0) { + err = errno; + break; + } + off += len; + br->br_resid -= len; + } break; case BOP_FLUSH: if (bc->bc_ischr) { @@ -234,9 +301,11 @@ blockif_proc(struct blockif_ctxt *bc, st err = EROFS; else if (bc->bc_ischr) { arg[0] = br->br_offset; - arg[1] = br->br_iov[0].iov_len; + arg[1] = br->br_resid; if (ioctl(bc->bc_fd, DIOCGDELETE, arg)) err = errno; + else + br->br_resid = 0; } else err = EOPNOTSUPP; break; @@ -256,15 +325,20 @@ blockif_thr(void *arg) struct blockif_ctxt *bc; struct blockif_elem *be; pthread_t t; + uint8_t *buf; bc = arg; + if (bc->bc_isgeom) + buf = malloc(MAXPHYS); + else + buf = NULL; t = pthread_self(); pthread_mutex_lock(&bc->bc_mtx); for (;;) { while (blockif_dequeue(bc, t, &be)) { pthread_mutex_unlock(&bc->bc_mtx); - blockif_proc(bc, be); + blockif_proc(bc, be, buf); pthread_mutex_lock(&bc->bc_mtx); blockif_complete(bc, be); } @@ -275,6 +349,8 @@ blockif_thr(void *arg) } pthread_mutex_unlock(&bc->bc_mtx); + if (buf) + free(buf); pthread_exit(NULL); return (NULL); } @@ -315,13 +391,14 @@ struct blockif_ctxt * blockif_open(const char *optstr, const char *ident) { char tname[MAXCOMLEN + 1]; + char name[MAXPATHLEN]; char *nopt, *xopts; struct blockif_ctxt *bc; struct stat sbuf; struct diocgattr_arg arg; off_t size, psectsz, psectoff; int extra, fd, i, sectsz; - int nocache, sync, ro, candelete; + int nocache, sync, ro, candelete, geom; pthread_once(&blockif_once, blockif_init); @@ -375,7 +452,7 @@ blockif_open(const char *optstr, const c size = sbuf.st_size; sectsz = DEV_BSIZE; psectsz = psectoff = 0; - candelete = 0; + candelete = geom = 0; if (S_ISCHR(sbuf.st_mode)) { if (ioctl(fd, DIOCGMEDIASIZE, &size) < 0 || ioctl(fd, DIOCGSECTORSIZE, §sz)) { @@ -391,6 +468,8 @@ blockif_open(const char *optstr, const c arg.len = sizeof(arg.value.i); if (ioctl(fd, DIOCGATTR, &arg) == 0) candelete = arg.value.i; + if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0) + geom = 1; } else psectsz = sbuf.st_blksize; @@ -403,6 +482,7 @@ blockif_open(const char *optstr, const c bc->bc_magic = BLOCKIF_SIG; bc->bc_fd = fd; bc->bc_ischr = S_ISCHR(sbuf.st_mode); + bc->bc_isgeom = geom; bc->bc_candelete = candelete; bc->bc_rdonly = ro; bc->bc_size = size; Modified: stable/10/usr.sbin/bhyve/block_if.h ============================================================================== --- stable/10/usr.sbin/bhyve/block_if.h Fri May 1 17:29:45 2015 (r282306) +++ stable/10/usr.sbin/bhyve/block_if.h Fri May 1 17:30:59 2015 (r282307) @@ -45,6 +45,7 @@ struct blockif_req { struct iovec br_iov[BLOCKIF_IOV_MAX]; int br_iovcnt; off_t br_offset; + ssize_t br_resid; void (*br_callback)(struct blockif_req *req, int err); void *br_param; }; Modified: stable/10/usr.sbin/bhyve/pci_ahci.c ============================================================================== --- stable/10/usr.sbin/bhyve/pci_ahci.c Fri May 1 17:29:45 2015 (r282306) +++ stable/10/usr.sbin/bhyve/pci_ahci.c Fri May 1 17:30:59 2015 (r282307) @@ -571,6 +571,7 @@ ahci_build_iov(struct ahci_port *p, stru } breq->br_iovcnt = j; + breq->br_resid = todo; aior->done += todo; aior->more = (aior->done < aior->len && i < prdtl); } @@ -776,8 +777,7 @@ next: breq = &aior->io_req; breq->br_offset = elba * blockif_sectsz(p->bctx); - breq->br_iovcnt = 1; - breq->br_iov[0].iov_len = elen * blockif_sectsz(p->bctx); + breq->br_resid = elen * blockif_sectsz(p->bctx); /* * Mark this command in-flight. Modified: stable/10/usr.sbin/bhyve/pci_virtio_block.c ============================================================================== --- stable/10/usr.sbin/bhyve/pci_virtio_block.c Fri May 1 17:29:45 2015 (r282306) +++ stable/10/usr.sbin/bhyve/pci_virtio_block.c Fri May 1 17:30:59 2015 (r282307) @@ -198,7 +198,7 @@ pci_vtblk_proc(struct pci_vtblk_softc *s struct pci_vtblk_ioreq *io; int i, n; int err; - int iolen; + ssize_t iolen; int writeop, type; off_t offset; struct iovec iov[BLOCKIF_IOV_MAX + 2]; @@ -246,8 +246,9 @@ pci_vtblk_proc(struct pci_vtblk_softc *s assert(((flags[i] & VRING_DESC_F_WRITE) == 0) == writeop); iolen += iov[i].iov_len; } + io->io_req.br_resid = iolen; - DPRINTF(("virtio-block: %s op, %d bytes, %d segs, offset %ld\n\r", + DPRINTF(("virtio-block: %s op, %zd bytes, %d segs, offset %ld\n\r", writeop ? "write" : "read/ident", iolen, i - 1, offset)); switch (type) { From owner-svn-src-stable@FreeBSD.ORG Fri May 1 17:33:18 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E2A7DCC; Fri, 1 May 2015 17:33:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3BF21159F; Fri, 1 May 2015 17:33:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41HXIGn069002; Fri, 1 May 2015 17:33:18 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41HXI98069001; Fri, 1 May 2015 17:33:18 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201505011733.t41HXI98069001@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 1 May 2015 17:33:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282308 - stable/10/usr.sbin/bhyve X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 17:33:18 -0000 Author: mav Date: Fri May 1 17:33:17 2015 New Revision: 282308 URL: https://svnweb.freebsd.org/changeset/base/282308 Log: MFC r281782: Don't set bits that should be zero for SATA devices. Old value made Linux think that it is PATA device with SATA bridge. Modified: stable/10/usr.sbin/bhyve/pci_ahci.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bhyve/pci_ahci.c ============================================================================== --- stable/10/usr.sbin/bhyve/pci_ahci.c Fri May 1 17:30:59 2015 (r282307) +++ stable/10/usr.sbin/bhyve/pci_ahci.c Fri May 1 17:33:17 2015 (r282308) @@ -930,7 +930,6 @@ handle_identify(struct ahci_port *p, int buf[88] = 0x7f; if (p->xfermode & ATA_UDMA0) buf[88] |= (1 << ((p->xfermode & 7) + 8)); - buf[93] = (1 | 1 <<14); buf[100] = sectors; buf[101] = (sectors >> 16); buf[102] = (sectors >> 32); From owner-svn-src-stable@FreeBSD.ORG Fri May 1 17:35:11 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3BBD11C; Fri, 1 May 2015 17:35:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B09D515C4; Fri, 1 May 2015 17:35:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41HZBV3069420; Fri, 1 May 2015 17:35:11 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41HZBqO069418; Fri, 1 May 2015 17:35:11 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201505011735.t41HZBqO069418@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 1 May 2015 17:35:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282310 - stable/10/share/man/man4 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 17:35:11 -0000 Author: mav Date: Fri May 1 17:35:10 2015 New Revision: 282310 URL: https://svnweb.freebsd.org/changeset/base/282310 Log: MFC r281923, r281924: Add link to mvs(4). Modified: stable/10/share/man/man4/ada.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/ada.4 ============================================================================== --- stable/10/share/man/man4/ada.4 Fri May 1 17:33:32 2015 (r282309) +++ stable/10/share/man/man4/ada.4 Fri May 1 17:35:10 2015 (r282310) @@ -156,6 +156,7 @@ ATA device nodes .Xr ahci 4 , .Xr cam 4 , .Xr da 4 , +.Xr mvs 4 , .Xr siis 4 .Sh HISTORY The From owner-svn-src-stable@FreeBSD.ORG Fri May 1 17:36:14 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5348F260; Fri, 1 May 2015 17:36:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB8915D6; Fri, 1 May 2015 17:36:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41HaEUJ069633; Fri, 1 May 2015 17:36:14 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41HaEOj069632; Fri, 1 May 2015 17:36:14 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201505011736.t41HaEOj069632@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 1 May 2015 17:36:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282311 - stable/9/share/man/man4 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 17:36:14 -0000 Author: mav Date: Fri May 1 17:36:13 2015 New Revision: 282311 URL: https://svnweb.freebsd.org/changeset/base/282311 Log: MFC r281923, r281924: Add link to mvs(4). Modified: stable/9/share/man/man4/ada.4 Directory Properties: stable/9/ (props changed) stable/9/share/ (props changed) stable/9/share/man/ (props changed) stable/9/share/man/man4/ (props changed) Modified: stable/9/share/man/man4/ada.4 ============================================================================== --- stable/9/share/man/man4/ada.4 Fri May 1 17:35:10 2015 (r282310) +++ stable/9/share/man/man4/ada.4 Fri May 1 17:36:13 2015 (r282311) @@ -142,6 +142,7 @@ ATA device nodes .Xr ahci 4 , .Xr cam 4 , .Xr da 4 , +.Xr mvs 4 , .Xr siis 4 .Sh HISTORY The From owner-svn-src-stable@FreeBSD.ORG Sat May 2 12:18:29 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE88ECAB; Sat, 2 May 2015 12:18:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9BF4A1367; Sat, 2 May 2015 12:18:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t42CITmr030815; Sat, 2 May 2015 12:18:29 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t42CITni030814; Sat, 2 May 2015 12:18:29 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201505021218.t42CITni030814@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 2 May 2015 12:18:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282340 - stable/10/sys/fs/nfsserver X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 May 2015 12:18:29 -0000 Author: rmacklem Date: Sat May 2 12:18:28 2015 New Revision: 282340 URL: https://svnweb.freebsd.org/changeset/base/282340 Log: MFC: r281962 Fix the NFS server's handling of a bogus NFSv2 ROOT RPC. The ROOT RPC is deprecated in the NFSv2 RFC, RFC-1094 and should never be used by a client. Modified: stable/10/sys/fs/nfsserver/nfs_nfsdkrpc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/nfsserver/nfs_nfsdkrpc.c ============================================================================== --- stable/10/sys/fs/nfsserver/nfs_nfsdkrpc.c Sat May 2 12:08:28 2015 (r282339) +++ stable/10/sys/fs/nfsserver/nfs_nfsdkrpc.c Sat May 2 12:18:28 2015 (r282340) @@ -120,7 +120,8 @@ nfssvc_program(struct svc_req *rqst, SVC memset(&nd, 0, sizeof(nd)); if (rqst->rq_vers == NFS_VER2) { - if (rqst->rq_proc > NFSV2PROC_STATFS) { + if (rqst->rq_proc > NFSV2PROC_STATFS || + newnfs_nfsv3_procid[rqst->rq_proc] == NFSPROC_NOOP) { svcerr_noproc(rqst); svc_freereq(rqst); goto out; From owner-svn-src-stable@FreeBSD.ORG Sat May 2 12:58:05 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8896E350; Sat, 2 May 2015 12:58:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 742991711; Sat, 2 May 2015 12:58:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t42Cw5RH050752; Sat, 2 May 2015 12:58:05 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t42Cw5th050751; Sat, 2 May 2015 12:58:05 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201505021258.t42Cw5th050751@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 2 May 2015 12:58:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r282343 - stable/9/sys/fs/nfsserver X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 May 2015 12:58:05 -0000 Author: rmacklem Date: Sat May 2 12:58:04 2015 New Revision: 282343 URL: https://svnweb.freebsd.org/changeset/base/282343 Log: MFC: r281962 Fix the NFS server's handling of a bogus NFSv2 ROOT RPC. The ROOT RPC is deprecated in the NFSv2 RFC, RFC-1094 and should never be used by a client. Modified: stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c ============================================================================== --- stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c Sat May 2 12:22:24 2015 (r282342) +++ stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c Sat May 2 12:58:04 2015 (r282343) @@ -120,7 +120,8 @@ nfssvc_program(struct svc_req *rqst, SVC memset(&nd, 0, sizeof(nd)); if (rqst->rq_vers == NFS_VER2) { - if (rqst->rq_proc > NFSV2PROC_STATFS) { + if (rqst->rq_proc > NFSV2PROC_STATFS || + newnfs_nfsv3_procid[rqst->rq_proc] == NFSPROC_NOOP) { svcerr_noproc(rqst); svc_freereq(rqst); goto out;