From owner-svn-src-stable-10@freebsd.org Sun Mar 6 02:33:04 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E754A92338; Sun, 6 Mar 2016 02:33:04 +0000 (UTC) (envelope-from rpokala@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C0EC8AED; Sun, 6 Mar 2016 02:33:03 +0000 (UTC) (envelope-from rpokala@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u262X2De066639; Sun, 6 Mar 2016 02:33:02 GMT (envelope-from rpokala@FreeBSD.org) Received: (from rpokala@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u262X2Ju066636; Sun, 6 Mar 2016 02:33:02 GMT (envelope-from rpokala@FreeBSD.org) Message-Id: <201603060233.u262X2Ju066636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rpokala set sender to rpokala@FreeBSD.org using -f From: Ravi Pokala Date: Sun, 6 Mar 2016 02:33:02 +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: r296421 - in stable/10/sys: cam/ata dev/ata sys 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2016 02:33:04 -0000 Author: rpokala Date: Sun Mar 6 02:33:02 2016 New Revision: 296421 URL: https://svnweb.freebsd.org/changeset/base/296421 Log: MFC r295276: Add defines for WRITE_UNCORRECTABLE ATA command, and improve command logging Add #defines for ATA_WRITE_UNCORRECTABLE48 and its features. Update the decoding in ATACAM to recognize the new values. Also improve command decoding for a few other commands (SMART, NOP, SET_FEATURES). Bring the decoding in ata(4) up to parity with ATACAM. Sponsored by: Panasas, Inc. Modified: stable/10/sys/cam/ata/ata_all.c stable/10/sys/dev/ata/ata-all.c stable/10/sys/sys/ata.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ata/ata_all.c ============================================================================== --- stable/10/sys/cam/ata/ata_all.c Sun Mar 6 01:21:56 2016 (r296420) +++ stable/10/sys/cam/ata/ata_all.c Sun Mar 6 02:33:02 2016 (r296421) @@ -75,13 +75,18 @@ ata_op_string(struct ata_cmd *cmd) if (cmd->control & 0x04) return ("SOFT_RESET"); switch (cmd->command) { - case 0x00: return ("NOP"); + case 0x00: + switch (cmd->features) { + case 0x00: return ("NOP FLUSHQUEUE"); + case 0x01: return ("NOP AUTOPOLL"); + } + return ("NOP"); case 0x03: return ("CFA_REQUEST_EXTENDED_ERROR"); case 0x06: switch (cmd->features) { - case 0x01: return ("DSM TRIM"); - } - return "DSM"; + case 0x01: return ("DSM TRIM"); + } + return "DSM"; case 0x08: return ("DEVICE_RESET"); case 0x20: return ("READ"); case 0x24: return ("READ48"); @@ -105,6 +110,12 @@ ata_op_string(struct ata_cmd *cmd) case 0x3f: return ("WRITE_LOG_EXT"); case 0x40: return ("READ_VERIFY"); case 0x42: return ("READ_VERIFY48"); + case 0x45: + switch (cmd->features) { + case 0x55: return ("WRITE_UNCORRECTABLE48 PSEUDO"); + case 0xaa: return ("WRITE_UNCORRECTABLE48 FLAGGED"); + } + return "WRITE_UNCORRECTABLE48"; case 0x51: return ("CONFIGURE_STREAM"); case 0x60: return ("READ_FPDMA_QUEUED"); case 0x61: return ("WRITE_FPDMA_QUEUED"); @@ -128,7 +139,18 @@ ata_op_string(struct ata_cmd *cmd) case 0xa0: return ("PACKET"); case 0xa1: return ("ATAPI_IDENTIFY"); case 0xa2: return ("SERVICE"); - case 0xb0: return ("SMART"); + case 0xb0: + switch(cmd->features) { + case 0xd0: return ("SMART READ ATTR VALUES"); + case 0xd1: return ("SMART READ ATTR THRESHOLDS"); + case 0xd3: return ("SMART SAVE ATTR VALUES"); + case 0xd4: return ("SMART EXECUTE OFFLINE IMMEDIATE"); + case 0xd5: return ("SMART READ LOG DATA"); + case 0xd8: return ("SMART ENABLE OPERATION"); + case 0xd9: return ("SMART DISABLE OPERATION"); + case 0xda: return ("SMART RETURN STATUS"); + } + return ("SMART"); case 0xb1: return ("DEVICE CONFIGURATION"); case 0xc0: return ("CFA_ERASE"); case 0xc4: return ("READ_MUL"); @@ -158,18 +180,22 @@ ata_op_string(struct ata_cmd *cmd) case 0xed: return ("MEDIA_EJECT"); case 0xef: switch (cmd->features) { - case 0x03: return ("SETFEATURES SET TRANSFER MODE"); - case 0x02: return ("SETFEATURES ENABLE WCACHE"); - case 0x82: return ("SETFEATURES DISABLE WCACHE"); - case 0x06: return ("SETFEATURES ENABLE PUIS"); - case 0x86: return ("SETFEATURES DISABLE PUIS"); - case 0x07: return ("SETFEATURES SPIN-UP"); - case 0x10: return ("SETFEATURES ENABLE SATA FEATURE"); - case 0x90: return ("SETFEATURES DISABLE SATA FEATURE"); - case 0xaa: return ("SETFEATURES ENABLE RCACHE"); - case 0x55: return ("SETFEATURES DISABLE RCACHE"); - } - return "SETFEATURES"; + case 0x03: return ("SETFEATURES SET TRANSFER MODE"); + case 0x02: return ("SETFEATURES ENABLE WCACHE"); + case 0x82: return ("SETFEATURES DISABLE WCACHE"); + case 0x06: return ("SETFEATURES ENABLE PUIS"); + case 0x86: return ("SETFEATURES DISABLE PUIS"); + case 0x07: return ("SETFEATURES SPIN-UP"); + case 0x10: return ("SETFEATURES ENABLE SATA FEATURE"); + case 0x90: return ("SETFEATURES DISABLE SATA FEATURE"); + case 0xaa: return ("SETFEATURES ENABLE RCACHE"); + case 0x55: return ("SETFEATURES DISABLE RCACHE"); + case 0x5d: return ("SETFEATURES ENABLE RELIRQ"); + case 0xdd: return ("SETFEATURES DISABLE RELIRQ"); + case 0x5e: return ("SETFEATURES ENABLE SRVIRQ"); + case 0xde: return ("SETFEATURES DISABLE SRVIRQ"); + } + return "SETFEATURES"; case 0xf1: return ("SECURITY_SET_PASSWORD"); case 0xf2: return ("SECURITY_UNLOCK"); case 0xf3: return ("SECURITY_ERASE_PREPARE"); Modified: stable/10/sys/dev/ata/ata-all.c ============================================================================== --- stable/10/sys/dev/ata/ata-all.c Sun Mar 6 01:21:56 2016 (r296420) +++ stable/10/sys/dev/ata/ata-all.c Sun Mar 6 02:33:02 2016 (r296421) @@ -497,7 +497,18 @@ ata_cmd2str(struct ata_request *request) } } else { switch (request->u.ata.command) { - case 0x00: return ("NOP"); + case 0x00: + switch (request->u.ata.feature) { + case 0x00: return ("NOP FLUSHQUEUE"); + case 0x01: return ("NOP AUTOPOLL"); + } + return ("NOP"); + case 0x03: return ("CFA_REQUEST_EXTENDED_ERROR"); + case 0x06: + switch (request->u.ata.feature) { + case 0x01: return ("DSM TRIM"); + } + return "DSM"; case 0x08: return ("DEVICE_RESET"); case 0x20: return ("READ"); case 0x24: return ("READ48"); @@ -505,18 +516,65 @@ ata_cmd2str(struct ata_request *request) case 0x26: return ("READ_DMA_QUEUED48"); case 0x27: return ("READ_NATIVE_MAX_ADDRESS48"); case 0x29: return ("READ_MUL48"); + case 0x2a: return ("READ_STREAM_DMA48"); + case 0x2b: return ("READ_STREAM48"); + case 0x2f: return ("READ_LOG_EXT"); case 0x30: return ("WRITE"); case 0x34: return ("WRITE48"); case 0x35: return ("WRITE_DMA48"); case 0x36: return ("WRITE_DMA_QUEUED48"); case 0x37: return ("SET_MAX_ADDRESS48"); case 0x39: return ("WRITE_MUL48"); + case 0x3a: return ("WRITE_STREAM_DMA48"); + case 0x3b: return ("WRITE_STREAM48"); + case 0x3d: return ("WRITE_DMA_FUA48"); + case 0x3e: return ("WRITE_DMA_QUEUED_FUA48"); + case 0x3f: return ("WRITE_LOG_EXT"); + case 0x40: return ("READ_VERIFY"); + case 0x42: return ("READ_VERIFY48"); + case 0x45: + switch (request->u.ata.feature) { + case 0x55: return ("WRITE_UNCORRECTABLE48 PSEUDO"); + case 0xaa: return ("WRITE_UNCORRECTABLE48 FLAGGED"); + } + return "WRITE_UNCORRECTABLE48"; + case 0x51: return ("CONFIGURE_STREAM"); + case 0x60: return ("READ_FPDMA_QUEUED"); + case 0x61: return ("WRITE_FPDMA_QUEUED"); + case 0x63: return ("NCQ_NON_DATA"); + case 0x64: return ("SEND_FPDMA_QUEUED"); + case 0x65: return ("RECEIVE_FPDMA_QUEUED"); + case 0x67: + if (request->u.ata.feature == 0xec) + return ("SEP_ATTN IDENTIFY"); + switch (request->u.ata.lba) { + case 0x00: return ("SEP_ATTN READ BUFFER"); + case 0x02: return ("SEP_ATTN RECEIVE DIAGNOSTIC RESULTS"); + case 0x80: return ("SEP_ATTN WRITE BUFFER"); + case 0x82: return ("SEP_ATTN SEND DIAGNOSTIC"); + } + return ("SEP_ATTN"); case 0x70: return ("SEEK"); - case 0xa0: return ("PACKET_CMD"); + case 0x87: return ("CFA_TRANSLATE_SECTOR"); + case 0x90: return ("EXECUTE_DEVICE_DIAGNOSTIC"); + case 0x92: return ("DOWNLOAD_MICROCODE"); + case 0xa0: return ("PACKET"); case 0xa1: return ("ATAPI_IDENTIFY"); case 0xa2: return ("SERVICE"); - case 0xb0: return ("SMART"); - case 0xc0: return ("CFA ERASE"); + case 0xb0: + switch(request->u.ata.feature) { + case 0xd0: return ("SMART READ ATTR VALUES"); + case 0xd1: return ("SMART READ ATTR THRESHOLDS"); + case 0xd3: return ("SMART SAVE ATTR VALUES"); + case 0xd4: return ("SMART EXECUTE OFFLINE IMMEDIATE"); + case 0xd5: return ("SMART READ LOG DATA"); + case 0xd8: return ("SMART ENABLE OPERATION"); + case 0xd9: return ("SMART DISABLE OPERATION"); + case 0xda: return ("SMART RETURN STATUS"); + } + return ("SMART"); + case 0xb1: return ("DEVICE CONFIGURATION"); + case 0xc0: return ("CFA_ERASE"); case 0xc4: return ("READ_MUL"); case 0xc5: return ("WRITE_MUL"); case 0xc6: return ("SET_MULTI"); @@ -524,22 +582,48 @@ ata_cmd2str(struct ata_request *request) case 0xc8: return ("READ_DMA"); case 0xca: return ("WRITE_DMA"); case 0xcc: return ("WRITE_DMA_QUEUED"); + case 0xcd: return ("CFA_WRITE_MULTIPLE_WITHOUT_ERASE"); + case 0xce: return ("WRITE_MUL_FUA48"); + case 0xd1: return ("CHECK_MEDIA_CARD_TYPE"); + case 0xda: return ("GET_MEDIA_STATUS"); + case 0xde: return ("MEDIA_LOCK"); + case 0xdf: return ("MEDIA_UNLOCK"); + case 0xe0: return ("STANDBY_IMMEDIATE"); + case 0xe1: return ("IDLE_IMMEDIATE"); + case 0xe2: return ("STANDBY"); + case 0xe3: return ("IDLE"); + case 0xe4: return ("READ_BUFFER/PM"); + case 0xe5: return ("CHECK_POWER_MODE"); case 0xe6: return ("SLEEP"); case 0xe7: return ("FLUSHCACHE"); + case 0xe8: return ("WRITE_PM"); case 0xea: return ("FLUSHCACHE48"); case 0xec: return ("ATA_IDENTIFY"); + case 0xed: return ("MEDIA_EJECT"); case 0xef: switch (request->u.ata.feature) { case 0x03: return ("SETFEATURES SET TRANSFER MODE"); case 0x02: return ("SETFEATURES ENABLE WCACHE"); case 0x82: return ("SETFEATURES DISABLE WCACHE"); + case 0x06: return ("SETFEATURES ENABLE PUIS"); + case 0x86: return ("SETFEATURES DISABLE PUIS"); + case 0x07: return ("SETFEATURES SPIN-UP"); + case 0x10: return ("SETFEATURES ENABLE SATA FEATURE"); + case 0x90: return ("SETFEATURES DISABLE SATA FEATURE"); case 0xaa: return ("SETFEATURES ENABLE RCACHE"); case 0x55: return ("SETFEATURES DISABLE RCACHE"); + case 0x5d: return ("SETFEATURES ENABLE RELIRQ"); + case 0xdd: return ("SETFEATURES DISABLE RELIRQ"); + case 0x5e: return ("SETFEATURES ENABLE SRVIRQ"); + case 0xde: return ("SETFEATURES DISABLE SRVIRQ"); } - sprintf(buffer, "SETFEATURES 0x%02x", - request->u.ata.feature); - return (buffer); - case 0xf5: return ("SECURITY_FREE_LOCK"); + return "SETFEATURES"; + case 0xf1: return ("SECURITY_SET_PASSWORD"); + case 0xf2: return ("SECURITY_UNLOCK"); + case 0xf3: return ("SECURITY_ERASE_PREPARE"); + case 0xf4: return ("SECURITY_ERASE_UNIT"); + case 0xf5: return ("SECURITY_FREEZE_LOCK"); + case 0xf6: return ("SECURITY_DISABLE_PASSWORD"); case 0xf8: return ("READ_NATIVE_MAX_ADDRESS"); case 0xf9: return ("SET_MAX_ADDRESS"); } Modified: stable/10/sys/sys/ata.h ============================================================================== --- stable/10/sys/sys/ata.h Sun Mar 6 01:21:56 2016 (r296420) +++ stable/10/sys/sys/ata.h Sun Mar 6 02:33:02 2016 (r296421) @@ -368,6 +368,9 @@ struct ata_params { #define ATA_WRITE_LOG_EXT 0x3f #define ATA_READ_VERIFY 0x40 #define ATA_READ_VERIFY48 0x42 +#define ATA_WRITE_UNCORRECTABLE48 0x45 /* write uncorrectable 48bit LBA */ +#define ATA_WU_PSEUDO 0x55 /* pseudo-uncorrectable error */ +#define ATA_WU_FLAGGED 0xaa /* flagged-uncorrectable error */ #define ATA_READ_LOG_DMA_EXT 0x47 /* read log DMA ext - PIO Data-In */ #define ATA_READ_FPDMA_QUEUED 0x60 /* read DMA NCQ */ #define ATA_WRITE_FPDMA_QUEUED 0x61 /* write DMA NCQ */ From owner-svn-src-stable-10@freebsd.org Sun Mar 6 08:40:23 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C10B9DAAAA; Sun, 6 Mar 2016 08:40:23 +0000 (UTC) (envelope-from dwmalone@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 57C61AEE; Sun, 6 Mar 2016 08:40:23 +0000 (UTC) (envelope-from dwmalone@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u268eM5M000720; Sun, 6 Mar 2016 08:40:22 GMT (envelope-from dwmalone@FreeBSD.org) Received: (from dwmalone@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u268eMW9000716; Sun, 6 Mar 2016 08:40:22 GMT (envelope-from dwmalone@FreeBSD.org) Message-Id: <201603060840.u268eMW9000716@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dwmalone set sender to dwmalone@FreeBSD.org using -f From: David Malone Date: Sun, 6 Mar 2016 08:40: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: r296424 - in stable/10: lib/libc/db/hash usr.bin/cap_mkdb usr.sbin/pwd_mkdb usr.sbin/services_mkdb 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2016 08:40:23 -0000 Author: dwmalone Date: Sun Mar 6 08:40:21 2016 New Revision: 296424 URL: https://svnweb.freebsd.org/changeset/base/296424 Log: MFC: r295924: Make sure that hash-based db files fsync befor closing/syncing. r295925: We no longer need O_SYNC pwd_mkd r295465: We no longer need O_SYNC on services_mkdb r295800: We no longer need O_SYNC on cap_mkdb This should improve the performance of building db files. Modified: stable/10/lib/libc/db/hash/hash.c stable/10/usr.bin/cap_mkdb/cap_mkdb.c stable/10/usr.sbin/pwd_mkdb/pwd_mkdb.c stable/10/usr.sbin/services_mkdb/services_mkdb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/db/hash/hash.c ============================================================================== --- stable/10/lib/libc/db/hash/hash.c Sun Mar 6 04:38:08 2016 (r296423) +++ stable/10/lib/libc/db/hash/hash.c Sun Mar 6 08:40:21 2016 (r296424) @@ -422,8 +422,10 @@ hdestroy(HTAB *hashp) if (hashp->tmp_buf) free(hashp->tmp_buf); - if (hashp->fp != -1) + if (hashp->fp != -1) { + (void)_fsync(hashp->fp); (void)_close(hashp->fp); + } free(hashp); @@ -458,6 +460,8 @@ hash_sync(const DB *dbp, u_int32_t flags return (0); if (__buf_free(hashp, 0, 1) || flush_meta(hashp)) return (ERROR); + if (hashp->fp != -1 && _fsync(hashp->fp) != 0) + return (ERROR); hashp->new_file = 0; return (0); } Modified: stable/10/usr.bin/cap_mkdb/cap_mkdb.c ============================================================================== --- stable/10/usr.bin/cap_mkdb/cap_mkdb.c Sun Mar 6 04:38:08 2016 (r296423) +++ stable/10/usr.bin/cap_mkdb/cap_mkdb.c Sun Mar 6 08:40:21 2016 (r296424) @@ -119,7 +119,7 @@ main(int argc, char *argv[]) (void)snprintf(buf, sizeof(buf), "%s.db", capname ? capname : *argv); if ((capname = strdup(buf)) == NULL) errx(1, "strdup failed"); - if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR | O_SYNC, + if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR, DEFFILEMODE, DB_HASH, &openinfo)) == NULL) err(1, "%s", buf); Modified: stable/10/usr.sbin/pwd_mkdb/pwd_mkdb.c ============================================================================== --- stable/10/usr.sbin/pwd_mkdb/pwd_mkdb.c Sun Mar 6 04:38:08 2016 (r296423) +++ stable/10/usr.sbin/pwd_mkdb/pwd_mkdb.c Sun Mar 6 08:40:21 2016 (r296424) @@ -225,14 +225,14 @@ main(int argc, char *argv[]) clean = FILE_INSECURE; cp(buf2, buf, PERM_INSECURE); dp = dbopen(buf, - O_RDWR|O_EXCL|O_SYNC, PERM_INSECURE, DB_HASH, &openinfo); + O_RDWR|O_EXCL, PERM_INSECURE, DB_HASH, &openinfo); if (dp == NULL) error(buf); clean = FILE_SECURE; cp(sbuf2, sbuf, PERM_SECURE); sdp = dbopen(sbuf, - O_RDWR|O_EXCL|O_SYNC, PERM_SECURE, DB_HASH, &openinfo); + O_RDWR|O_EXCL, PERM_SECURE, DB_HASH, &openinfo); if (sdp == NULL) error(sbuf); @@ -289,13 +289,13 @@ main(int argc, char *argv[]) method = 0; } else { dp = dbopen(buf, - O_RDWR|O_CREAT|O_EXCL|O_SYNC, PERM_INSECURE, DB_HASH, &openinfo); + O_RDWR|O_CREAT|O_EXCL, PERM_INSECURE, DB_HASH, &openinfo); if (dp == NULL) error(buf); clean = FILE_INSECURE; sdp = dbopen(sbuf, - O_RDWR|O_CREAT|O_EXCL|O_SYNC, PERM_SECURE, DB_HASH, &openinfo); + O_RDWR|O_CREAT|O_EXCL, PERM_SECURE, DB_HASH, &openinfo); if (sdp == NULL) error(sbuf); clean = FILE_SECURE; Modified: stable/10/usr.sbin/services_mkdb/services_mkdb.c ============================================================================== --- stable/10/usr.sbin/services_mkdb/services_mkdb.c Sun Mar 6 04:38:08 2016 (r296423) +++ stable/10/usr.sbin/services_mkdb/services_mkdb.c Sun Mar 6 08:40:21 2016 (r296424) @@ -141,7 +141,7 @@ main(int argc, char *argv[]) err(1, "Cannot install exit handler"); (void)snprintf(tname, sizeof(tname), "%s.tmp", dbname); - db = dbopen(tname, O_RDWR | O_CREAT | O_EXCL | O_SYNC, + db = dbopen(tname, O_RDWR | O_CREAT | O_EXCL, (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH), DB_HASH, &hinfo); if (!db) err(1, "Error opening temporary database `%s'", tname); From owner-svn-src-stable-10@freebsd.org Sun Mar 6 08:52:05 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2420F9DAF47; Sun, 6 Mar 2016 08:52:05 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 F40B9174; Sun, 6 Mar 2016 08:52:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u268q4Be004419; Sun, 6 Mar 2016 08:52:04 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u268q3ws004416; Sun, 6 Mar 2016 08:52:03 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201603060852.u268q3ws004416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Sun, 6 Mar 2016 08:52:03 +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: r296425 - stable/10/sbin/ifconfig 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2016 08:52:05 -0000 Author: kp Date: Sun Mar 6 08:52:03 2016 New Revision: 296425 URL: https://svnweb.freebsd.org/changeset/base/296425 Log: MFC r295836: ifconfig(8): can't use 'name' or 'description' when creating interface with auto numbering If one does 'ifconfig tap create name blah', it will return error because the 'name' command doesn't properly populate the request sent to ioctl(...). The 'description' command has the same bug, and is also fixed with this patch. If one does 'ifconfig tap create mtu 9000 name blah', it DOES work, but 'tap0' (or other sequence number) is echoed, instead of the expected 'blah'. (assuming the name change actually succeeded) PR: 206876 Submitted by: Marie Helene Kvello-Aune Differential Revision: https://reviews.freebsd.org/D5341 Modified: stable/10/sbin/ifconfig/ifclone.c stable/10/sbin/ifconfig/ifconfig.c stable/10/sbin/ifconfig/ifconfig.h Modified: stable/10/sbin/ifconfig/ifclone.c ============================================================================== --- stable/10/sbin/ifconfig/ifclone.c Sun Mar 6 08:40:21 2016 (r296424) +++ stable/10/sbin/ifconfig/ifclone.c Sun Mar 6 08:52:03 2016 (r296425) @@ -144,11 +144,12 @@ ifclonecreate(int s, void *arg) } /* - * If we get a different name back than we put in, print it. + * If we get a different name back than we put in, update record and + * indicate it should be printed later. */ if (strncmp(name, ifr.ifr_name, sizeof(name)) != 0) { strlcpy(name, ifr.ifr_name, sizeof(name)); - printf("%s\n", name); + printifname = 1; } } Modified: stable/10/sbin/ifconfig/ifconfig.c ============================================================================== --- stable/10/sbin/ifconfig/ifconfig.c Sun Mar 6 08:40:21 2016 (r296424) +++ stable/10/sbin/ifconfig/ifconfig.c Sun Mar 6 08:52:03 2016 (r296425) @@ -93,6 +93,7 @@ int clearaddr; int newaddr = 1; int verbose; int noload; +int printifname = 0; int supmedia = 0; int printkeys = 0; /* Print keying material for interfaces. */ @@ -108,6 +109,8 @@ static struct afswtch *af_getbyname(cons static struct afswtch *af_getbyfamily(int af); static void af_other_status(int); +void printifnamemaybe(void); + static struct option *opts = NULL; void @@ -141,6 +144,12 @@ usage(void) exit(1); } +void printifnamemaybe() +{ + if (printifname) + printf("%s\n", name); +} + int main(int argc, char *argv[]) { @@ -156,6 +165,12 @@ main(int argc, char *argv[]) size_t iflen; all = downonly = uponly = namesonly = noload = verbose = 0; + + /* + * Ensure we print interface name when expected to, + * even if we terminate early due to error. + */ + atexit(printifnamemaybe); /* Parse leading line options */ strlcpy(options, "adklmnuv", sizeof(options)); @@ -856,6 +871,8 @@ setifname(const char *val, int dummy __u const struct afswtch *afp) { char *newname; + + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); newname = strdup(val); if (newname == NULL) @@ -865,6 +882,7 @@ setifname(const char *val, int dummy __u free(newname); err(1, "ioctl SIOCSIFNAME (set name)"); } + printifname = 1; strlcpy(name, newname, sizeof(name)); free(newname); } @@ -876,6 +894,8 @@ setifdescr(const char *val, int dummy __ { char *newdescr; + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + ifr.ifr_buffer.length = strlen(val) + 1; if (ifr.ifr_buffer.length == 1) { ifr.ifr_buffer.buffer = newdescr = NULL; Modified: stable/10/sbin/ifconfig/ifconfig.h ============================================================================== --- stable/10/sbin/ifconfig/ifconfig.h Sun Mar 6 08:40:21 2016 (r296424) +++ stable/10/sbin/ifconfig/ifconfig.h Sun Mar 6 08:52:03 2016 (r296425) @@ -133,6 +133,7 @@ extern int supmedia; extern int printkeys; extern int newaddr; extern int verbose; +extern int printifname; void setifcap(const char *, int value, int s, const struct afswtch *); From owner-svn-src-stable-10@freebsd.org Mon Mar 7 07:46:19 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51389AC2001; Mon, 7 Mar 2016 07:46:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 08998EEE; Mon, 7 Mar 2016 07:46:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u277kIBD023224; Mon, 7 Mar 2016 07:46:18 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u277kHwv023222; Mon, 7 Mar 2016 07:46:17 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201603070746.u277kHwv023222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 7 Mar 2016 07:46: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: r296436 - in stable/10/cddl/contrib/opensolaris/cmd: zfs zpool 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 07:46:19 -0000 Author: dim Date: Mon Mar 7 07:46:17 2016 New Revision: 296436 URL: https://svnweb.freebsd.org/changeset/base/296436 Log: MFC r295844: Fix "invalid type '(null)'" usage messages in zfs(8) and zpool(8). Currently, zfs(8) and zpool(8) print "invalid type '(null)'" or similar messages, if you pass in invalid types, sources or column names for "zfs get", "zfs list" and "zpool get". This is because the commands use getsubopt(3), and in case of failure, they print 'value', which is NULL when sub options don't match. They should print 'suboptarg' instead, which is the documented way to get at the non-matching sub option value. Reviewed by: smh Differential Revision: https://reviews.freebsd.org/D5365 Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Mar 6 21:32:54 2016 (r296435) +++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Mar 7 07:46:17 2016 (r296436) @@ -1712,7 +1712,7 @@ zfs_do_get(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid column name " - "'%s'\n"), value); + "'%s'\n"), suboptarg); usage(B_FALSE); } } @@ -1749,7 +1749,7 @@ zfs_do_get(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid source " - "'%s'\n"), value); + "'%s'\n"), suboptarg); usage(B_FALSE); } } @@ -1785,7 +1785,7 @@ zfs_do_get(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid type '%s'\n"), - value); + suboptarg); usage(B_FALSE); } } @@ -3155,7 +3155,7 @@ zfs_do_list(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid type '%s'\n"), - value); + suboptarg); usage(B_FALSE); } } Modified: stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Mar 6 21:32:54 2016 (r296435) +++ stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Mar 7 07:46:17 2016 (r296436) @@ -5431,7 +5431,7 @@ zpool_do_get(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid column name " - "'%s'\n"), value); + "'%s'\n"), suboptarg); usage(B_FALSE); } } From owner-svn-src-stable-10@freebsd.org Mon Mar 7 07:49:03 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49ACDAC20A5; Mon, 7 Mar 2016 07:49:03 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 1B349CC; Mon, 7 Mar 2016 07:49:03 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u277n2jd023388; Mon, 7 Mar 2016 07:49:02 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u277n26T023387; Mon, 7 Mar 2016 07:49:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201603070749.u277n26T023387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 7 Mar 2016 07:49:02 +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: r296437 - in stable: 10/contrib/binutils/bfd 9/contrib/binutils/bfd 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 07:49:03 -0000 Author: dim Date: Mon Mar 7 07:49:01 2016 New Revision: 296437 URL: https://svnweb.freebsd.org/changeset/base/296437 Log: MFC r295901: Fix a problem in ld, causing it to sometimes print messages similar to "invalid string offset 65521 >= 27261 for section `.strtab'". for object files produced by recent versions of clang. In BFD's elf_create_symbuf() function, the size of the symbol buffer ('ssymbuf') is not calculated correctly, and the initial value for the 'ssym' variable is off by one, since 'ssymbuf' has shndx_count + 1 members. Modified: stable/10/contrib/binutils/bfd/elf.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/contrib/binutils/bfd/elf.c Directory Properties: stable/9/ (props changed) stable/9/contrib/ (props changed) stable/9/contrib/binutils/ (props changed) Modified: stable/10/contrib/binutils/bfd/elf.c ============================================================================== --- stable/10/contrib/binutils/bfd/elf.c Mon Mar 7 07:46:17 2016 (r296436) +++ stable/10/contrib/binutils/bfd/elf.c Mon Mar 7 07:49:01 2016 (r296437) @@ -8934,14 +8934,14 @@ elf_create_symbuf (bfd_size_type symcoun shndx_count++; ssymbuf = bfd_malloc ((shndx_count + 1) * sizeof (*ssymbuf) - + (indbufend - indbuf) * sizeof (*ssymbuf)); + + (indbufend - indbuf) * sizeof (*ssym)); if (ssymbuf == NULL) { free (indbuf); return NULL; } - ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count); + ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count + 1); ssymbuf->ssym = NULL; ssymbuf->count = shndx_count; ssymbuf->st_shndx = 0; From owner-svn-src-stable-10@freebsd.org Mon Mar 7 07:54:49 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEAF7AC236D; Mon, 7 Mar 2016 07:54:49 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 CA8B48AC; Mon, 7 Mar 2016 07:54:49 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u277smUn026232; Mon, 7 Mar 2016 07:54:48 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u277sm86026230; Mon, 7 Mar 2016 07:54:48 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201603070754.u277sm86026230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 7 Mar 2016 07:54: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: r296438 - in stable/10/sys: boot/common 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 07:54:50 -0000 Author: dim Date: Mon Mar 7 07:54:48 2016 New Revision: 296438 URL: https://svnweb.freebsd.org/changeset/base/296438 Log: MFC r296419 (by kib): In the link_elf_obj.c, handle sections of type SHT_AMD64_UNWIND same as SHT_PROGBITS. This is needed after the clang 3.8 import, which generates that type for .eh_frame section, which had SHT_PROGBITS type before. Reported by: Nikolai Lifanov PR: 207729 Tested by: dim (previous version) Sponsored by: The FreeBSD Foundation MFC r296428: Since kernel modules can now contain sections of type SHT_AMD64_UNWIND, the boot loader should not skip over these anymore while loading images. Otherwise the kernel can still panic when it doesn't find the .eh_frame section belonging to the .rela.eh_frame section. Unfortunately this will require installing boot loaders from sys/boot before attempting to boot with a new kernel. Reviewed by: kib Modified: stable/10/sys/boot/common/load_elf_obj.c stable/10/sys/kern/link_elf_obj.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/boot/common/load_elf_obj.c ============================================================================== --- stable/10/sys/boot/common/load_elf_obj.c Mon Mar 7 07:49:01 2016 (r296437) +++ stable/10/sys/boot/common/load_elf_obj.c Mon Mar 7 07:54:48 2016 (r296438) @@ -221,6 +221,9 @@ __elfN(obj_loadimage)(struct preloaded_f switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: +#if defined(__i386__) || defined(__amd64__) + case SHT_AMD64_UNWIND: +#endif lastaddr = roundup(lastaddr, shdr[i].sh_addralign); shdr[i].sh_addr = (Elf_Addr)lastaddr; lastaddr += shdr[i].sh_size; Modified: stable/10/sys/kern/link_elf_obj.c ============================================================================== --- stable/10/sys/kern/link_elf_obj.c Mon Mar 7 07:49:01 2016 (r296437) +++ stable/10/sys/kern/link_elf_obj.c Mon Mar 7 07:54:48 2016 (r296438) @@ -257,6 +257,9 @@ link_elf_link_preload(linker_class_t cls switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: +#ifdef __amd64__ + case SHT_AMD64_UNWIND: +#endif ef->nprogtab++; break; case SHT_SYMTAB: @@ -327,9 +330,16 @@ link_elf_link_preload(linker_class_t cls switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: +#ifdef __amd64__ + case SHT_AMD64_UNWIND: +#endif ef->progtab[pb].addr = (void *)shdr[i].sh_addr; if (shdr[i].sh_type == SHT_PROGBITS) ef->progtab[pb].name = "<>"; +#ifdef __amd64__ + else if (shdr[i].sh_type == SHT_AMD64_UNWIND) + ef->progtab[pb].name = "<>"; +#endif else ef->progtab[pb].name = "<>"; ef->progtab[pb].size = shdr[i].sh_size; @@ -553,6 +563,9 @@ link_elf_load_file(linker_class_t cls, c switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: +#ifdef __amd64__ + case SHT_AMD64_UNWIND: +#endif ef->nprogtab++; break; case SHT_SYMTAB: @@ -659,6 +672,9 @@ link_elf_load_file(linker_class_t cls, c switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: +#ifdef __amd64__ + case SHT_AMD64_UNWIND: +#endif alignmask = shdr[i].sh_addralign - 1; mapsize += alignmask; mapsize &= ~alignmask; @@ -726,6 +742,9 @@ link_elf_load_file(linker_class_t cls, c switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: +#ifdef __amd64__ + case SHT_AMD64_UNWIND: +#endif alignmask = shdr[i].sh_addralign - 1; mapbase += alignmask; mapbase &= ~alignmask; @@ -734,6 +753,10 @@ link_elf_load_file(linker_class_t cls, c ef->shstrtab + shdr[i].sh_name; else if (shdr[i].sh_type == SHT_PROGBITS) ef->progtab[pb].name = "<>"; +#ifdef __amd64__ + else if (shdr[i].sh_type == SHT_AMD64_UNWIND) + ef->progtab[pb].name = "<>"; +#endif else ef->progtab[pb].name = "<>"; if (ef->progtab[pb].name != NULL && @@ -755,7 +778,11 @@ link_elf_load_file(linker_class_t cls, c } ef->progtab[pb].size = shdr[i].sh_size; ef->progtab[pb].sec = i; - if (shdr[i].sh_type == SHT_PROGBITS) { + if (shdr[i].sh_type == SHT_PROGBITS +#ifdef __amd64__ + || shdr[i].sh_type == SHT_AMD64_UNWIND +#endif + ) { error = vn_rdwr(UIO_READ, nd.ni_vp, ef->progtab[pb].addr, shdr[i].sh_size, shdr[i].sh_offset, From owner-svn-src-stable-10@freebsd.org Mon Mar 7 08:57:52 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CA7EAC3EC6; Mon, 7 Mar 2016 08:57:52 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 3DCACCBD; Mon, 7 Mar 2016 08:57:52 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u278vp8K045048; Mon, 7 Mar 2016 08:57:51 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u278vpea045047; Mon, 7 Mar 2016 08:57:51 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201603070857.u278vpea045047@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 7 Mar 2016 08:57:51 +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: r296440 - stable/10/etc/periodic/daily 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 08:57:52 -0000 Author: mav Date: Mon Mar 7 08:57:51 2016 New Revision: 296440 URL: https://svnweb.freebsd.org/changeset/base/296440 Log: MFC r295324: Add error check to not leak logs with syntax errors in case of failed `zpool history`. Modified: stable/10/etc/periodic/daily/800.scrub-zfs Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/periodic/daily/800.scrub-zfs ============================================================================== --- stable/10/etc/periodic/daily/800.scrub-zfs Mon Mar 7 07:57:57 2016 (r296439) +++ stable/10/etc/periodic/daily/800.scrub-zfs Mon Mar 7 08:57:51 2016 (r296440) @@ -63,6 +63,11 @@ case "$daily_scrub_zfs_enable" in _last_scrub=$(zpool history ${pool} | \ sed -ne '2s/ .*$//p') fi + if [ -z "${_last_scrub}" ]; then + echo " skipping scrubbing of pool '${pool}':" + echo " can't get last scrubbing date" + continue + fi # Now minus last scrub (both in seconds) converted to days. _scrub_diff=$(expr -e \( $(date +%s) - \ From owner-svn-src-stable-10@freebsd.org Mon Mar 7 08:59:08 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 435D8AC3F6B; Mon, 7 Mar 2016 08:59:08 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 15CACE2A; Mon, 7 Mar 2016 08:59:08 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u278x7aU045157; Mon, 7 Mar 2016 08:59:07 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u278x7Ds045156; Mon, 7 Mar 2016 08:59:07 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201603070859.u278x7Ds045156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 7 Mar 2016 08:59:07 +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: r296441 - stable/10/usr.sbin/ctld 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 08:59:08 -0000 Author: mav Date: Mon Mar 7 08:59:06 2016 New Revision: 296441 URL: https://svnweb.freebsd.org/changeset/base/296441 Log: MFC r295562: Don't check CmdSN for initial login request. This fixes connection errors for some initiators not starting CmdSN from zero. While there, fix wrong status details reported for couple errors. Modified: stable/10/usr.sbin/ctld/login.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/ctld/login.c ============================================================================== --- stable/10/usr.sbin/ctld/login.c Mon Mar 7 08:57:51 2016 (r296440) +++ stable/10/usr.sbin/ctld/login.c Mon Mar 7 08:59:06 2016 (r296441) @@ -126,15 +126,16 @@ login_receive(struct connection *conn, b log_errx(1, "received Login PDU with unsupported " "Version-min 0x%x", bhslr->bhslr_version_min); } - if (ISCSI_SNLT(ntohl(bhslr->bhslr_cmdsn), conn->conn_cmdsn)) { - login_send_error(request, 0x02, 0x05); + if (initial == false && + ISCSI_SNLT(ntohl(bhslr->bhslr_cmdsn), conn->conn_cmdsn)) { + login_send_error(request, 0x02, 0x00); log_errx(1, "received Login PDU with decreasing CmdSN: " "was %u, is %u", conn->conn_cmdsn, ntohl(bhslr->bhslr_cmdsn)); } if (initial == false && ntohl(bhslr->bhslr_expstatsn) != conn->conn_statsn) { - login_send_error(request, 0x02, 0x05); + login_send_error(request, 0x02, 0x00); log_errx(1, "received Login PDU with wrong ExpStatSN: " "is %u, should be %u", ntohl(bhslr->bhslr_expstatsn), conn->conn_statsn); From owner-svn-src-stable-10@freebsd.org Mon Mar 7 09:00:29 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 194E5AC11E7; Mon, 7 Mar 2016 09:00:29 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DEC86F81; Mon, 7 Mar 2016 09:00:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2790RH3045287; Mon, 7 Mar 2016 09:00:27 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2790RZO045286; Mon, 7 Mar 2016 09:00:27 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201603070900.u2790RZO045286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 7 Mar 2016 09:00:27 +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: r296442 - stable/10/sys/cam/ctl 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 09:00:29 -0000 Author: mav Date: Mon Mar 7 09:00:27 2016 New Revision: 296442 URL: https://svnweb.freebsd.org/changeset/base/296442 Log: MFC r296392: Set bhsdi_target_transfer_tag to reserved value, which is 0xffffffff. This should be a purely cosmetic change. Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Mon Mar 7 08:59:06 2016 (r296441) +++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Mon Mar 7 09:00:27 2016 (r296442) @@ -2369,6 +2369,7 @@ cfiscsi_datamove_in(union ctl_io *io) bhsdi->bhsdi_opcode = ISCSI_BHS_OPCODE_SCSI_DATA_IN; bhsdi->bhsdi_initiator_task_tag = bhssc->bhssc_initiator_task_tag; + bhsdi->bhsdi_target_transfer_tag = 0xffffffff; bhsdi->bhsdi_datasn = htonl(PDU_EXPDATASN(request)); PDU_EXPDATASN(request)++; bhsdi->bhsdi_buffer_offset = htonl(buffer_offset); From owner-svn-src-stable-10@freebsd.org Mon Mar 7 09:35:22 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0039FA9504A; Mon, 7 Mar 2016 09:35:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C5B721A9; Mon, 7 Mar 2016 09:35:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u279ZKOf057050; Mon, 7 Mar 2016 09:35:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u279ZKOx057049; Mon, 7 Mar 2016 09:35:20 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201603070935.u279ZKOx057049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 7 Mar 2016 09:35: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: r296443 - stable/10/sys/dev/usb/net 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 09:35:22 -0000 Author: hselasky Date: Mon Mar 7 09:35:20 2016 New Revision: 296443 URL: https://svnweb.freebsd.org/changeset/base/296443 Log: MFC r295608: Fix variable assignment inside if-clause in the smsc driver. Found by D5245 / PVS. Modified: stable/10/sys/dev/usb/net/if_smsc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/net/if_smsc.c ============================================================================== --- stable/10/sys/dev/usb/net/if_smsc.c Mon Mar 7 09:00:27 2016 (r296442) +++ stable/10/sys/dev/usb/net/if_smsc.c Mon Mar 7 09:35:20 2016 (r296443) @@ -1341,7 +1341,7 @@ smsc_chip_init(struct smsc_softc *sc) /* Reset the PHY */ smsc_write_reg(sc, SMSC_PM_CTRL, SMSC_PM_CTRL_PHY_RST); - if ((err = smsc_wait_for_bits(sc, SMSC_PM_CTRL, SMSC_PM_CTRL_PHY_RST) != 0)) { + if ((err = smsc_wait_for_bits(sc, SMSC_PM_CTRL, SMSC_PM_CTRL_PHY_RST)) != 0) { smsc_warn_printf(sc, "timed-out waiting for phy reset to complete\n"); goto init_failed; } From owner-svn-src-stable-10@freebsd.org Mon Mar 7 09:37:09 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D8A0A95190; Mon, 7 Mar 2016 09:37:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 F0E05366; Mon, 7 Mar 2016 09:37:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u279b8PJ057161; Mon, 7 Mar 2016 09:37:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u279b8di057160; Mon, 7 Mar 2016 09:37:08 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201603070937.u279b8di057160@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 7 Mar 2016 09:37: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: r296444 - stable/10/sys/dev/usb 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 09:37:09 -0000 Author: hselasky Date: Mon Mar 7 09:37:07 2016 New Revision: 296444 URL: https://svnweb.freebsd.org/changeset/base/296444 Log: MFC r295923: Be more verbose when truncating number of HID items. Suggested by: Larry Rosenman Modified: stable/10/sys/dev/usb/usb_hid.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/usb_hid.c ============================================================================== --- stable/10/sys/dev/usb/usb_hid.c Mon Mar 7 09:35:20 2016 (r296443) +++ stable/10/sys/dev/usb/usb_hid.c Mon Mar 7 09:37:07 2016 (r296444) @@ -354,7 +354,8 @@ hid_get_item(struct hid_data *s, struct /* range check usage count */ if (c->loc.count > 255) { DPRINTFN(0, "Number of " - "items truncated to 255\n"); + "items(%u) truncated to 255\n", + (unsigned)(c->loc.count)); s->ncount = 255; } else s->ncount = c->loc.count; From owner-svn-src-stable-10@freebsd.org Mon Mar 7 09:42:18 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73E2BA953B5; Mon, 7 Mar 2016 09:42:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2B409AF4; Mon, 7 Mar 2016 09:42:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u279gHAw060034; Mon, 7 Mar 2016 09:42:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u279gHk3060032; Mon, 7 Mar 2016 09:42:17 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201603070942.u279gHk3060032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 7 Mar 2016 09:42: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: r296446 - stable/10/sys/dev/usb/controller 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 09:42:18 -0000 Author: hselasky Date: Mon Mar 7 09:42:16 2016 New Revision: 296446 URL: https://svnweb.freebsd.org/changeset/base/296446 Log: MFC r295928: Configure the correct bMaxPacketSize for control endpoints before requesting the initial complete device descriptor and not as part of the subsequent babble error recovery. Babble means that the received USB packet was bigger than than configured maximum packet size. This only affects enumeration of FULL speed USB devices which use a bMaxPacketSize different from 8 bytes. This patch might help fix enumeration of USB devices which exhibit USB I/O errors in dmesg during boot. Modified: stable/10/sys/dev/usb/controller/xhci.c stable/10/sys/dev/usb/controller/xhci.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/controller/xhci.c ============================================================================== --- stable/10/sys/dev/usb/controller/xhci.c Mon Mar 7 09:39:35 2016 (r296445) +++ stable/10/sys/dev/usb/controller/xhci.c Mon Mar 7 09:42:16 2016 (r296446) @@ -2363,6 +2363,8 @@ xhci_configure_endpoint(struct usb_devic /* store endpoint mode */ pepext->trb_ep_mode = ep_mode; + /* store bMaxPacketSize for control endpoints */ + pepext->trb_ep_maxp = edesc->wMaxPacketSize[0]; usb_pc_cpu_flush(pepext->page_cache); if (ep_mode == USB_EP_MODE_STREAMS) { @@ -2909,6 +2911,17 @@ xhci_transfer_insert(struct usb_xfer *xf return (USB_ERR_NOMEM); } + /* check if bMaxPacketSize changed */ + if (xfer->flags_int.control_xfr != 0 && + pepext->trb_ep_maxp != xfer->endpoint->edesc->wMaxPacketSize[0]) { + + DPRINTFN(8, "Reconfigure control endpoint\n"); + + /* force driver to reconfigure endpoint */ + pepext->trb_halted = 1; + pepext->trb_running = 0; + } + /* check for stopped condition, after putting transfer on interrupt queue */ if (pepext->trb_running == 0) { struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus); Modified: stable/10/sys/dev/usb/controller/xhci.h ============================================================================== --- stable/10/sys/dev/usb/controller/xhci.h Mon Mar 7 09:39:35 2016 (r296445) +++ stable/10/sys/dev/usb/controller/xhci.h Mon Mar 7 09:42:16 2016 (r296446) @@ -383,6 +383,7 @@ struct xhci_endpoint_ext { uint8_t trb_halted; uint8_t trb_running; uint8_t trb_ep_mode; + uint8_t trb_ep_maxp; }; enum { From owner-svn-src-stable-10@freebsd.org Mon Mar 7 10:56:40 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E0B8AC16B8; Mon, 7 Mar 2016 10:56:40 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 F3FE31B03; Mon, 7 Mar 2016 10:56:39 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27AudxO082068; Mon, 7 Mar 2016 10:56:39 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27AucF7082062; Mon, 7 Mar 2016 10:56:38 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201603071056.u27AucF7082062@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 7 Mar 2016 10:56:38 +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: r296450 - in stable/10/release/doc: en_US.ISO8859-1/errata en_US.ISO8859-1/hardware en_US.ISO8859-1/readme 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 10:56:40 -0000 Author: hrs Date: Mon Mar 7 10:56:38 2016 New Revision: 296450 URL: https://svnweb.freebsd.org/changeset/base/296450 Log: - Use FPI and catalog resolution instead of system entities. This change fixes build with a non-standard DOC_PREFIX, but it is still a temporal measure because some of them should be done by using XInclude, not by entity reference. - Trim old entries and bump version numbers. Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml stable/10/release/doc/en_US.ISO8859-1/readme/article.xml stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml stable/10/release/doc/share/xml/catalog.xml stable/10/release/doc/share/xml/release.ent Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Mon Mar 7 10:56:21 2016 (r296449) +++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Mon Mar 7 10:56:38 2016 (r296450) @@ -4,8 +4,10 @@ %release; - - + + ]>
%release; Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Mon Mar 7 10:56:21 2016 (r296449) +++ stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Mon Mar 7 10:56:38 2016 (r296450) @@ -1,6 +1,6 @@ %release; ]> Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Mar 7 10:56:21 2016 (r296449) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Mar 7 10:56:38 2016 (r296450) @@ -1,14 +1,19 @@ + "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ + %release; - + %sponsor; - + %vendor; - - + + ]>
@@ -26,7 +31,7 @@ - 2015 + 2016 The &os; Documentation Project @@ -166,42 +171,13 @@ Userland Application Changes - The &man.jail.8; utility has been - updated to include a new flag, -l, which - ensures a clean environment in the target jail when used. - Additionally, &man.jail.8; will run a shell within the target - jail when run no commands are specified. - - The &man.mkimg.1; utility has been - updated to include support for NTFS - filesystems in both MBR and - GPT partitioning schemes. - - The - &man.ar.1; utility now enables deterministic mode - (-D) by default. This behavior can be - disabled by specifying the -U flag. - - The &man.pciconf.8; utility has been - updated to use the PCI ID database from the misc/pciids package, if present, - falling back to the PCI ID database in the &os; base - system. - - A - new utility, &man.sesutil.8;, has been added, which is used - to manage &man.ses.4; devices. +   Contributed Software - The &man.libarchive.3; library has been - updated to properly skip a sparse file entry in a &man.tar.1; - file, which would previously produce errors. - - Timezone data files have been updated to - version 2015f. +   @@ -247,10 +223,7 @@ Kernel Bug Fixes - The &man.kqueue.2; system call has been - updated to handle write events to files larger than 2 - gigabytes. + @@ -262,10 +235,7 @@ System Tuning and Controls - The &man.uart.4; driver has been - updated to allow tuning pulses per second captured in the - CTS line during runtime, whereas previously only the DCD line - could be used without rebuilding the kernel. + @@ -284,12 +254,7 @@ Storage Drivers - The - CTL High Availability implementation has - been rewritten. - - The &man.ctl.4; driver has been updated - to support CD-ROM and removable devices. + @@ -316,9 +281,7 @@ Virtualization Support - The &man.xen.4; driver has been updated - to include support for blkif indirect - segment I/O. + @@ -349,11 +312,7 @@ ZFS - The &man.zfs.8; l2arc - code has been updated to take ashift into - account when gathering buffers to be written to the - l2arc device. + Modified: stable/10/release/doc/share/xml/catalog.xml ============================================================================== --- stable/10/release/doc/share/xml/catalog.xml Mon Mar 7 10:56:21 2016 (r296449) +++ stable/10/release/doc/share/xml/catalog.xml Mon Mar 7 10:56:38 2016 (r296450) @@ -9,5 +9,8 @@ + + + Modified: stable/10/release/doc/share/xml/release.ent ============================================================================== --- stable/10/release/doc/share/xml/release.ent Mon Mar 7 10:56:21 2016 (r296449) +++ stable/10/release/doc/share/xml/release.ent Mon Mar 7 10:56:38 2016 (r296450) @@ -6,23 +6,23 @@ - + - + - + - + From owner-svn-src-stable-10@freebsd.org Mon Mar 7 10:59:29 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAD64AC1879; Mon, 7 Mar 2016 10:59:29 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 AC7991D40; Mon, 7 Mar 2016 10:59:29 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27AxS3p082203; Mon, 7 Mar 2016 10:59:28 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27AxSlT082201; Mon, 7 Mar 2016 10:59:28 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201603071059.u27AxSlT082201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 7 Mar 2016 10:59:28 +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: r296451 - stable/10/release/doc/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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 10:59:30 -0000 Author: hrs Date: Mon Mar 7 10:59:28 2016 New Revision: 296451 URL: https://svnweb.freebsd.org/changeset/base/296451 Log: Trim old entries. Modified: stable/10/release/doc/share/xml/errata.xml stable/10/release/doc/share/xml/security.xml Modified: stable/10/release/doc/share/xml/errata.xml ============================================================================== --- stable/10/release/doc/share/xml/errata.xml Mon Mar 7 10:56:38 2016 (r296450) +++ stable/10/release/doc/share/xml/errata.xml Mon Mar 7 10:59:28 2016 (r296451) @@ -19,98 +19,7 @@ - FreeBSD-EN-15:11.toolchain - 18 August 2015 - Fix &man.make.1; syntax errors when upgrading - from &os; 9.x and earlier. - - - - FreeBSD-EN-15:12.netstat - 18 August 2015 - Fix incorrect &man.netstat.1; data handling on - 32-bit systems. - - - - FreeBSD-EN-15:13.vidcontrol - 18 August 2015 - Allow size argument to &man.vidcontrol.1; for - &man.syscons.4;. - - - - FreeBSD-EN-15:15.pkg - 25 August 2015 - Insufficient check of supported &man.pkg.7; - signature methods. - - - - FreeBSD-EN-15:16.pw - 16 September 2015 - Fix &man.pw.8; regression when creating numeric - users or groups. - - - - FreeBSD-EN-15:17.libc - 16 September 2015 - Fix libc handling of signals for multi-threaded - processes. - - - - FreeBSD-EN-15:18.pkg - 16 September 2015 - Implement pubkey support for - &man.pkg.7; bootstrap. - - - - FreeBSD-EN-15:19.kqueue - 4 November 2015 - &man.kqueue.2; write events never fire for files - larger than 2GB. - - - - FreeBSD-EN-15:20.vm - 4 November 2015 - Applications exiting due to segmentation - violation on a correct memory address. - - - - FreeBSD-EN-16:01.filemon - 14 January 2016 - bmake and - &man.filemon.4; stability issues. - - - - FreeBSD-EN-16:02.pf - 14 January 2016 - Invalid TCP checksum issue. - - - - FreeBSD-EN-16:03.yplib - 14 January 2016 - YP/NIS library - bug. + Modified: stable/10/release/doc/share/xml/security.xml ============================================================================== --- stable/10/release/doc/share/xml/security.xml Mon Mar 7 10:56:38 2016 (r296450) +++ stable/10/release/doc/share/xml/security.xml Mon Mar 7 10:59:28 2016 (r296451) @@ -19,116 +19,7 @@ - FreeBSD-SA-15:20.expat - 18 August 2015 - Fix multiple integer overflows in - &man.libbsdxml.3;. - - - - FreeBSD-SA-15:22.openssh - 25 August 2015 - Multiple vulnerabilities - - - - FreeBSD-SA-15:24.rpcbind - 29 September 2015 - Remote denial of service - - - - FreeBSD-SA-15:25.ntp - 26 October 2015 - Multiple vulnerabilities - - - - FreeBSD-SA-15:26.openssl - 5 December 2015 - Multiple vulnerabilities - - - - FreeBSD-SA-16:01.sctp - 14 January 2016 - ICMPv6 error message vulnerability - - - - FreeBSD-SA-16:02.ntp - 14 January 2016 - Panic threshold bypass - vulnerability - - - - FreeBSD-SA-16:03.linux - 14 January 2016 - Incorrect futex - handling - - - - FreeBSD-SA-16:04.linux - 14 January 2016 - &man.setgroups.2; system call - vulnerability - - - - FreeBSD-SA-16:05.tcp - 14 January 2016 - MD5 signature denial of service - - - - FreeBSD-SA-16:06.bsnmpd - 14 January 2016 - Insecure default configuration file - permissions - - - - FreeBSD-SA-16:07.openssh - 14 January 2016 - OpenSSH client - information leak - - - - FreeBSD-SA-16:09.ntp - 27 January 2016 - Multiple vulnerabilities. - - - - FreeBSD-SA-16:10.linux - 27 January 2016 - &man.issetugid.2; system call - vulnerability. - - - - FreeBSD-SA-16:11.openssl - 30 January 2016 - SSLv2 cipher suite downgrade - vulnerability. + From owner-svn-src-stable-10@freebsd.org Mon Mar 7 13:43:25 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2456DAB9424; Mon, 7 Mar 2016 13:43:25 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E9ABE9AC; Mon, 7 Mar 2016 13:43:24 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27DhNCf033019; Mon, 7 Mar 2016 13:43:23 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27DhN3a033018; Mon, 7 Mar 2016 13:43:23 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201603071343.u27DhN3a033018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 7 Mar 2016 13:43:23 +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: r296452 - stable/10/sys/dev/ixgbe 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 13:43:25 -0000 Author: sbruno Date: Mon Mar 7 13:43:23 2016 New Revision: 296452 URL: https://svnweb.freebsd.org/changeset/base/296452 Log: Spell "maximum" correctly. noted by mav@ Modified: stable/10/sys/dev/ixgbe/if_ix.c Modified: stable/10/sys/dev/ixgbe/if_ix.c ============================================================================== --- stable/10/sys/dev/ixgbe/if_ix.c Mon Mar 7 10:59:28 2016 (r296451) +++ stable/10/sys/dev/ixgbe/if_ix.c Mon Mar 7 13:43:23 2016 (r296452) @@ -332,7 +332,7 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix static int ixgbe_num_queues = 0; TUNABLE_INT("hw.ix.num_queues", &ixgbe_num_queues); SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, &ixgbe_num_queues, 0, - "Number of queues to configure up to a mximum of 8," + "Number of queues to configure up to a maximum of 8," "0 indicates autoconfigure"); /* From owner-svn-src-stable-10@freebsd.org Mon Mar 7 15:52:53 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02B81AC2FF1; Mon, 7 Mar 2016 15:52:53 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C8025188; Mon, 7 Mar 2016 15:52:52 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27Fqpo7073635; Mon, 7 Mar 2016 15:52:51 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27FqpMm073634; Mon, 7 Mar 2016 15:52:51 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201603071552.u27FqpMm073634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 7 Mar 2016 15:52:51 +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: r296458 - stable/10/sys/dev/firewire 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 15:52:53 -0000 Author: pfg Date: Mon Mar 7 15:52:51 2016 New Revision: 296458 URL: https://svnweb.freebsd.org/changeset/base/296458 Log: MFC r295810: firewire: fix a mismatch introduced in r230558. Found by: PVS Static Analysis Reviewed by: sbruno Modified: stable/10/sys/dev/firewire/sbp_targ.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/firewire/sbp_targ.c ============================================================================== --- stable/10/sys/dev/firewire/sbp_targ.c Mon Mar 7 15:44:54 2016 (r296457) +++ stable/10/sys/dev/firewire/sbp_targ.c Mon Mar 7 15:52:51 2016 (r296458) @@ -1327,7 +1327,7 @@ sbp_targ_action1(struct cam_sim *sim, un | PIT_DISCONNECT | PIT_TERM_IO; cpi->transport = XPORT_SPI; /* FIXME add XPORT_FW type to cam */ - cpi->hba_misc = PIM_NOBUSRESET | PIM_NOBUSRESET; + cpi->hba_misc = PIM_NOBUSRESET | PIM_NO_6_BYTE; cpi->hba_eng_cnt = 0; cpi->max_target = 7; /* XXX */ cpi->max_lun = MAX_LUN - 1; From owner-svn-src-stable-10@freebsd.org Mon Mar 7 16:05:55 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D65DAC3704; Mon, 7 Mar 2016 16:05:55 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 1C40DC50; Mon, 7 Mar 2016 16:05:55 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27G5sPe076721; Mon, 7 Mar 2016 16:05:54 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27G5sM9076720; Mon, 7 Mar 2016 16:05:54 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201603071605.u27G5sM9076720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 7 Mar 2016 16:05: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: r296459 - stable/10/sys/dev/pms/freebsd/driver/ini/src 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 16:05:55 -0000 Author: pfg Date: Mon Mar 7 16:05:53 2016 New Revision: 296459 URL: https://svnweb.freebsd.org/changeset/base/296459 Log: MFC r295861: ostiInitiatorIOCompleted(): wrong sizeof() argument. Detected by: PVS Static Analysis CID: 1331601, 1331523 Modified: stable/10/sys/dev/pms/freebsd/driver/ini/src/osapi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/pms/freebsd/driver/ini/src/osapi.c ============================================================================== --- stable/10/sys/dev/pms/freebsd/driver/ini/src/osapi.c Mon Mar 7 15:52:51 2016 (r296458) +++ stable/10/sys/dev/pms/freebsd/driver/ini/src/osapi.c Mon Mar 7 16:05:53 2016 (r296459) @@ -313,7 +313,7 @@ ostiInitiatorIOCompleted(tiRoot_t * } sense_len = MIN( pSenseData->senseLen, pccb->senseLen - csio->sense_resid ); - bzero(&csio->sense_data, sizeof(&csio->sense_data)); + bzero(&csio->sense_data, sizeof(csio->sense_data)); AGTIAPI_PRINTK("ostiInitiatorIOCompleted: check condition copying\n"); memcpy( (void *)pccb->pSenseData, pSenseData->senseData, From owner-svn-src-stable-10@freebsd.org Mon Mar 7 16:12:06 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 547B6AC3947; Mon, 7 Mar 2016 16:12:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 23963EF; Mon, 7 Mar 2016 16:12:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27GC52b077635; Mon, 7 Mar 2016 16:12:05 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27GC5Ru077634; Mon, 7 Mar 2016 16:12:05 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201603071612.u27GC5Ru077634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 7 Mar 2016 16:12: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: r296460 - stable/10/usr.sbin/cron/cron 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 16:12:06 -0000 Author: pfg Date: Mon Mar 7 16:12:04 2016 New Revision: 296460 URL: https://svnweb.freebsd.org/changeset/base/296460 Log: MFC r295671: cron: use (char *)NULL instead of (char *)0 in execle. Obtained from: OpenBSD (CVS Rev 1.25) Modified: stable/10/usr.sbin/cron/cron/do_command.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/cron/cron/do_command.c ============================================================================== --- stable/10/usr.sbin/cron/cron/do_command.c Mon Mar 7 16:05:53 2016 (r296459) +++ stable/10/usr.sbin/cron/cron/do_command.c Mon Mar 7 16:12:04 2016 (r296460) @@ -337,8 +337,9 @@ child_process(e, u) _exit(OK_EXIT); } # endif /*DEBUGGING*/ - execle(shell, shell, "-c", e->cmd, (char *)0, e->envp); - warn("execl: couldn't exec `%s'", shell); + execle(shell, shell, "-c", e->cmd, (char *)NULL, + e->envp); + warn("execle: couldn't exec `%s'", shell); _exit(ERROR_EXIT); } break; From owner-svn-src-stable-10@freebsd.org Mon Mar 7 16:18:53 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 819FCAC3D2D; Mon, 7 Mar 2016 16:18:53 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 52F309FB; Mon, 7 Mar 2016 16:18:53 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27GIq6F079971; Mon, 7 Mar 2016 16:18:52 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27GIqdO079970; Mon, 7 Mar 2016 16:18:52 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201603071618.u27GIqdO079970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 7 Mar 2016 16:18: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: r296463 - stable/10/usr.sbin/cron/crontab 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 16:18:53 -0000 Author: pfg Date: Mon Mar 7 16:18:52 2016 New Revision: 296463 URL: https://svnweb.freebsd.org/changeset/base/296463 Log: MFC r295672: crontab: ftruncate() with ftello() instead of ftell(). Obtained from: OpenBSD (CVS rev. 1.47) Modified: stable/10/usr.sbin/cron/crontab/crontab.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/cron/crontab/crontab.c ============================================================================== --- stable/10/usr.sbin/cron/crontab/crontab.c Mon Mar 7 16:18:07 2016 (r296462) +++ stable/10/usr.sbin/cron/crontab/crontab.c Mon Mar 7 16:18:52 2016 (r296463) @@ -532,7 +532,7 @@ replace_cmd() { Set_LineNum(1) while (EOF != (ch = get_char(NewCrontab))) putc(ch, tmp); - ftruncate(fileno(tmp), ftell(tmp)); + ftruncate(fileno(tmp), ftello(tmp)); fflush(tmp); rewind(tmp); if (ferror(tmp)) { From owner-svn-src-stable-10@freebsd.org Tue Mar 8 14:38:08 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B45EAC7367; Tue, 8 Mar 2016 14:38:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 0BBA7F5F; Tue, 8 Mar 2016 14:38:07 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u28Ec7rB096170; Tue, 8 Mar 2016 14:38:07 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u28Ec75O096169; Tue, 8 Mar 2016 14:38:07 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201603081438.u28Ec75O096169@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 8 Mar 2016 14:38:07 +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: r296498 - stable/10/usr.bin/mail 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2016 14:38:08 -0000 Author: pfg Date: Tue Mar 8 14:38:06 2016 New Revision: 296498 URL: https://svnweb.freebsd.org/changeset/base/296498 Log: MFC r295675: Fix "naive" use of ftell(3). Secure coding practices, FIO19-C. Modified: stable/10/usr.bin/mail/def.h Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/mail/def.h ============================================================================== --- stable/10/usr.bin/mail/def.h Tue Mar 8 11:04:08 2016 (r296497) +++ stable/10/usr.bin/mail/def.h Tue Mar 8 14:38:06 2016 (r296498) @@ -270,5 +270,5 @@ struct ignoretab { */ #define trunc(stream) { \ (void)fflush(stream); \ - (void)ftruncate(fileno(stream), (off_t)ftell(stream)); \ + (void)ftruncate(fileno(stream), ftello(stream)); \ } From owner-svn-src-stable-10@freebsd.org Tue Mar 8 20:24:14 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A868AC8154; Tue, 8 Mar 2016 20:24:14 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B0E14A1B; Tue, 8 Mar 2016 20:24:13 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u28KOCpT010845; Tue, 8 Mar 2016 20:24:12 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u28KOCFR010844; Tue, 8 Mar 2016 20:24:12 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201603082024.u28KOCFR010844@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Tue, 8 Mar 2016 20:24:12 +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: r296547 - stable/10/sys/dev/ichsmb 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2016 20:24:14 -0000 Author: vangyzen Date: Tue Mar 8 20:24:12 2016 New Revision: 296547 URL: https://svnweb.freebsd.org/changeset/base/296547 Log: MFC r281920,r284247,r284248,r295651 ichsmb: Add PCI device IDs for Intel Sunrise Point-H, Wellsburg, and Lynx-Point LP SMBus controllers. Remove whitespace. Sponsored by: Dell Inc. Modified: stable/10/sys/dev/ichsmb/ichsmb_pci.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/ichsmb/ichsmb_pci.c ============================================================================== --- stable/10/sys/dev/ichsmb/ichsmb_pci.c Tue Mar 8 19:40:01 2016 (r296546) +++ stable/10/sys/dev/ichsmb/ichsmb_pci.c Tue Mar 8 20:24:12 2016 (r296547) @@ -5,7 +5,7 @@ * Copyright (c) 2000 Whistle Communications, Inc. * All rights reserved. * Author: Archie Cobbs - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -16,7 +16,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -88,8 +88,11 @@ __FBSDID("$FreeBSD$"); #define ID_AVOTON 0x1f3c8086 #define ID_COLETOCRK 0x23B08086 #define ID_LPT 0x8c228086 +#define ID_LPTLP 0x9c228086 #define ID_WCPT 0x8ca28086 #define ID_WCPTLP 0x9ca28086 +#define ID_WELLSBURG 0x8d228086 +#define ID_SRPT 0xa1238086 #define PCIS_SERIALBUS_SMBUS_PROGIF 0x00 @@ -199,6 +202,9 @@ ichsmb_pci_probe(device_t dev) case ID_LPT: device_set_desc(dev, "Intel Lynx Point SMBus controller"); break; + case ID_LPTLP: + device_set_desc(dev, "Intel Lynx Point-LP SMBus controller"); + break; case ID_WCPT: device_set_desc(dev, "Intel Wildcat Point SMBus controller"); break; @@ -208,6 +214,12 @@ ichsmb_pci_probe(device_t dev) case ID_COLETOCRK: device_set_desc(dev, "Intel Coleto Creek SMBus controller"); break; + case ID_WELLSBURG: + device_set_desc(dev, "Intel Wellsburg SMBus controller"); + break; + case ID_SRPT: + device_set_desc(dev, "Intel Sunrise Point-H SMBus controller"); + break; default: return (ENXIO); } From owner-svn-src-stable-10@freebsd.org Wed Mar 9 10:01:30 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53264AC8BB5; Wed, 9 Mar 2016 10:01:30 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 21374D7; Wed, 9 Mar 2016 10:01:30 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u29A1Tec058568; Wed, 9 Mar 2016 10:01:29 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u29A1TX3058567; Wed, 9 Mar 2016 10:01:29 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201603091001.u29A1TX3058567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 9 Mar 2016 10:01: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: r296558 - stable/10/sys/netipsec 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 10:01:30 -0000 Author: ae Date: Wed Mar 9 10:01:28 2016 New Revision: 296558 URL: https://svnweb.freebsd.org/changeset/base/296558 Log: MFC r295967: Fix useless check. m_pkthdr.len should be equal to orglen. Modified: stable/10/sys/netipsec/key.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netipsec/key.c ============================================================================== --- stable/10/sys/netipsec/key.c Wed Mar 9 09:12:40 2016 (r296557) +++ stable/10/sys/netipsec/key.c Wed Mar 9 10:01:28 2016 (r296558) @@ -7245,8 +7245,7 @@ key_parse(struct mbuf *m, struct socket orglen = PFKEY_UNUNIT64(msg->sadb_msg_len); target = KEY_SENDUP_ONE; - if ((m->m_flags & M_PKTHDR) == 0 || - m->m_pkthdr.len != m->m_pkthdr.len) { + if ((m->m_flags & M_PKTHDR) == 0 || m->m_pkthdr.len != orglen) { ipseclog((LOG_DEBUG, "%s: invalid message length.\n",__func__)); PFKEYSTAT_INC(out_invlen); error = EINVAL; From owner-svn-src-stable-10@freebsd.org Wed Mar 9 10:09:53 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16E68AC8FA5; Wed, 9 Mar 2016 10:09:53 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DC8C16BE; Wed, 9 Mar 2016 10:09:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u29A9pQw061038; Wed, 9 Mar 2016 10:09:51 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u29A9pVi061037; Wed, 9 Mar 2016 10:09:51 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603091009.u29A9pVi061037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 9 Mar 2016 10:09:51 +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: r296559 - stable/10/share/man/man9 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 10:09:53 -0000 Author: kib Date: Wed Mar 9 10:09:51 2016 New Revision: 296559 URL: https://svnweb.freebsd.org/changeset/base/296559 Log: MFC r295998: Remove references to Giant in the description of vrele(9). Add notes about vnode lock and sleeping. MFC r296001: Fix year. Modified: stable/10/share/man/man9/vrele.9 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man9/vrele.9 ============================================================================== --- stable/10/share/man/man9/vrele.9 Wed Mar 9 10:01:28 2016 (r296558) +++ stable/10/share/man/man9/vrele.9 Wed Mar 9 10:09:51 2016 (r296559) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 20, 2010 +.Dd February 24, 2016 .Dt VRELE 9 .Os .Sh NAME @@ -81,9 +81,11 @@ If the .Va v_usecount field of the non-doomed vnode reaches zero, then it will be inactivated and placed on the free list. -Since the functions might need to call VOPs for the vnode, the -.Va Giant -mutex should be conditionally locked around the call. +.Pp +The +.Fn vrele +function may lock the vnode. +All three functions may sleep. .Pp The hold count for the vnode is always greater or equal to the usecount. Non-forced unmount fails when mount point owns a vnode that has non-zero From owner-svn-src-stable-10@freebsd.org Wed Mar 9 10:19:34 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 681E7AC9379; Wed, 9 Mar 2016 10:19:34 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2E329CF2; Wed, 9 Mar 2016 10:19:34 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u29AJXY7064060; Wed, 9 Mar 2016 10:19:33 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u29AJX0D064059; Wed, 9 Mar 2016 10:19:33 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603091019.u29AJX0D064059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 9 Mar 2016 10:19: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: r296561 - stable/10/sys/net 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 10:19:34 -0000 Author: kib Date: Wed Mar 9 10:19:32 2016 New Revision: 296561 URL: https://svnweb.freebsd.org/changeset/base/296561 Log: MFC r296009: In bpf_getdltlist(), do not call copyout(9) while holding bpf lock. Copy the data into temprorary malloced buffer and drop the lock for copyout. Modified: stable/10/sys/net/bpf.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/net/bpf.c ============================================================================== --- stable/10/sys/net/bpf.c Wed Mar 9 10:14:53 2016 (r296560) +++ stable/10/sys/net/bpf.c Wed Mar 9 10:19:32 2016 (r296561) @@ -2616,26 +2616,44 @@ bpf_ifdetach(void *arg __unused, struct static int bpf_getdltlist(struct bpf_d *d, struct bpf_dltlist *bfl) { - int n, error; struct ifnet *ifp; struct bpf_if *bp; + u_int *lst; + int error, n, n1; BPF_LOCK_ASSERT(); ifp = d->bd_bif->bif_ifp; +again: + n1 = 0; + LIST_FOREACH(bp, &bpf_iflist, bif_next) { + if (bp->bif_ifp == ifp) + n1++; + } + if (bfl->bfl_list == NULL) { + bfl->bfl_len = n1; + return (0); + } + if (n1 > bfl->bfl_len) + return (ENOMEM); + BPF_UNLOCK(); + lst = malloc(n1 * sizeof(u_int), M_TEMP, M_WAITOK); n = 0; - error = 0; + BPF_LOCK(); LIST_FOREACH(bp, &bpf_iflist, bif_next) { if (bp->bif_ifp != ifp) continue; - if (bfl->bfl_list != NULL) { - if (n >= bfl->bfl_len) - return (ENOMEM); - error = copyout(&bp->bif_dlt, - bfl->bfl_list + n, sizeof(u_int)); + if (n > n1) { + free(lst, M_TEMP); + goto again; } + lst[n] = bp->bif_dlt; n++; } + BPF_UNLOCK(); + error = copyout(lst, bfl->bfl_list, sizeof(u_int) * n); + free(lst, M_TEMP); + BPF_LOCK(); bfl->bfl_len = n; return (error); } From owner-svn-src-stable-10@freebsd.org Wed Mar 9 10:21:15 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08E0AAC959A; Wed, 9 Mar 2016 10:21:15 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 CB404F0E; Wed, 9 Mar 2016 10:21:14 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u29ALDhS066769; Wed, 9 Mar 2016 10:21:13 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u29ALDKk066768; Wed, 9 Mar 2016 10:21:13 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603091021.u29ALDKk066768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 9 Mar 2016 10:21: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: r296562 - stable/10/sys/amd64/amd64 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 10:21:15 -0000 Author: kib Date: Wed Mar 9 10:21:13 2016 New Revision: 296562 URL: https://svnweb.freebsd.org/changeset/base/296562 Log: MFC r295966: Return dst as the result from memcpy(9) on amd64. PR: 207422 Modified: stable/10/sys/amd64/amd64/support.S Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/amd64/support.S ============================================================================== --- stable/10/sys/amd64/amd64/support.S Wed Mar 9 10:19:32 2016 (r296561) +++ stable/10/sys/amd64/amd64/support.S Wed Mar 9 10:21:13 2016 (r296562) @@ -152,6 +152,7 @@ END(bcopy) */ ENTRY(memcpy) PUSH_FRAME_POINTER + movq %rdi,%rax movq %rdx,%rcx shrq $3,%rcx /* copy by 64-bit words */ cld /* copy forwards */ From owner-svn-src-stable-10@freebsd.org Wed Mar 9 17:40:35 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44D5DAC9E19; Wed, 9 Mar 2016 17:40:35 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 16924C62; Wed, 9 Mar 2016 17:40:35 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u29HeYjG098117; Wed, 9 Mar 2016 17:40:34 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u29HeYmU098116; Wed, 9 Mar 2016 17:40:34 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201603091740.u29HeYmU098116@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 9 Mar 2016 17:40:34 +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: r296568 - stable/10/contrib/diff/src 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 17:40:35 -0000 Author: truckman Date: Wed Mar 9 17:40:33 2016 New Revision: 296568 URL: https://svnweb.freebsd.org/changeset/base/296568 Log: MFC r283869 (by araujo) Fix the wrong format, format specifies type 'int' but the argument has type 'long', it was spotted by clang. Modified: stable/10/contrib/diff/src/context.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/diff/src/context.c ============================================================================== --- stable/10/contrib/diff/src/context.c Wed Mar 9 16:05:13 2016 (r296567) +++ stable/10/contrib/diff/src/context.c Wed Mar 9 17:40:33 2016 (r296568) @@ -62,7 +62,7 @@ print_context_label (char const *mark, { time_t sec = inf->stat.st_mtime; verify (info_preserved, sizeof inf->stat.st_mtime <= sizeof sec); - sprintf (buf, "%jd.%.9d", (intmax_t)sec, nsec); + sprintf (buf, "%jd.%.9ld", (intmax_t)sec, nsec); } fprintf (outfile, "%s %s\t%s\n", mark, inf->name, buf); } From owner-svn-src-stable-10@freebsd.org Wed Mar 9 21:30:23 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77338AC8FBE; Wed, 9 Mar 2016 21:30:23 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 309651B4A; Wed, 9 Mar 2016 21:30:23 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u29LUMOI069852; Wed, 9 Mar 2016 21:30:22 GMT (envelope-from davidcs@FreeBSD.org) Received: (from davidcs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u29LUMbt069850; Wed, 9 Mar 2016 21:30:22 GMT (envelope-from davidcs@FreeBSD.org) Message-Id: <201603092130.u29LUMbt069850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: davidcs set sender to davidcs@FreeBSD.org using -f From: David C Somayajulu Date: Wed, 9 Mar 2016 21:30: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: r296580 - in stable/10/sys: dev/bxe modules/bxe 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 21:30:23 -0000 Author: davidcs Date: Wed Mar 9 21:30:21 2016 New Revision: 296580 URL: https://svnweb.freebsd.org/changeset/base/296580 Log: MFC r296071 Upgrade the firmware carried in driver and loaded during hardware initialization (a.k.a STORM firmware) to version 7.13.1 (latest version) Modified: stable/10/sys/dev/bxe/57710_init_values.c stable/10/sys/dev/bxe/57710_int_offsets.h stable/10/sys/dev/bxe/57711_init_values.c stable/10/sys/dev/bxe/57711_int_offsets.h stable/10/sys/dev/bxe/57712_init_values.c stable/10/sys/dev/bxe/57712_int_offsets.h stable/10/sys/dev/bxe/bxe.c stable/10/sys/dev/bxe/bxe.h stable/10/sys/dev/bxe/bxe_elink.c stable/10/sys/dev/bxe/bxe_elink.h stable/10/sys/dev/bxe/bxe_stats.c stable/10/sys/dev/bxe/ecore_fw_defs.h stable/10/sys/dev/bxe/ecore_hsi.h stable/10/sys/dev/bxe/ecore_init.h stable/10/sys/dev/bxe/ecore_init_ops.h stable/10/sys/dev/bxe/ecore_mfw_req.h stable/10/sys/dev/bxe/ecore_reg.h stable/10/sys/dev/bxe/ecore_sp.c stable/10/sys/dev/bxe/ecore_sp.h stable/10/sys/modules/bxe/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/bxe/57710_init_values.c ============================================================================== --- stable/10/sys/dev/bxe/57710_init_values.c Wed Mar 9 21:12:26 2016 (r296579) +++ stable/10/sys/dev/bxe/57710_init_values.c Wed Mar 9 21:30:21 2016 (r296580) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. + * Copyright (c) 2007-2017 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS @@ -104,19 +104,19 @@ static const struct raw_op init_ops_e1[] /* #define CFC_COMMON_START 88 */ {OP_ZR, 0x104c00, 0x100}, {OP_WR, 0x104028, 0x10}, - {OP_WR, 0x104044, 0x3fff}, + {OP_SW, 0x104040, 0x20469}, {OP_WR, 0x104058, 0x280000}, {OP_WR, 0x104084, 0x84924a}, {OP_WR, 0x104058, 0x0}, /* #define CFC_COMMON_END 89 */ /* #define CSDM_COMMON_START 110 */ - {OP_SW, 0xc2008, 0x30469}, - {OP_SW, 0xc201c, 0x4046c}, - {OP_SW, 0xc2038, 0x110470}, + {OP_SW, 0xc2008, 0x3046b}, + {OP_SW, 0xc201c, 0x4046e}, + {OP_SW, 0xc2038, 0x110472}, {OP_ZR, 0xc207c, 0x4f}, - {OP_SW, 0xc21b8, 0x110481}, + {OP_SW, 0xc21b8, 0x110483}, {OP_ZR, 0xc21fc, 0xf}, - {OP_SW, 0xc2238, 0x40492}, + {OP_SW, 0xc2238, 0x40494}, {OP_RD, 0xc2248, 0x0}, {OP_RD, 0xc224c, 0x0}, {OP_RD, 0xc2250, 0x0}, @@ -141,76 +141,76 @@ static const struct raw_op init_ops_e1[] /* #define CSDM_COMMON_END 111 */ /* #define CSEM_COMMON_START 132 */ {OP_FW, 0x200400, 0xe00000}, - {OP_WR_64, 0x200780, 0x100496}, + {OP_WR_64, 0x200780, 0x100498}, {OP_ZR, 0x220000, 0x1600}, {OP_ZR, 0x228000, 0x40}, {OP_ZR, 0x223bd0, 0x8}, {OP_ZR, 0x224800, 0x6}, - {OP_SW, 0x224818, 0x40498}, + {OP_SW, 0x224818, 0x4049a}, {OP_ZR, 0x224828, 0xc}, - {OP_SW, 0x224858, 0x4049c}, + {OP_SW, 0x224858, 0x4049e}, {OP_ZR, 0x224868, 0xc}, - {OP_SW, 0x224898, 0x404a0}, + {OP_SW, 0x224898, 0x404a2}, {OP_ZR, 0x2248a8, 0xc}, - {OP_SW, 0x2248d8, 0x404a4}, + {OP_SW, 0x2248d8, 0x404a6}, {OP_ZR, 0x2248e8, 0xc}, - {OP_SW, 0x224918, 0x404a8}, + {OP_SW, 0x224918, 0x404aa}, {OP_ZR, 0x224928, 0xc}, - {OP_SW, 0x224958, 0x404ac}, + {OP_SW, 0x224958, 0x404ae}, {OP_ZR, 0x224968, 0xc}, - {OP_SW, 0x224998, 0x404b0}, + {OP_SW, 0x224998, 0x404b2}, {OP_ZR, 0x2249a8, 0xc}, - {OP_SW, 0x2249d8, 0x404b4}, + {OP_SW, 0x2249d8, 0x404b6}, {OP_ZR, 0x2249e8, 0xc}, - {OP_SW, 0x224a18, 0x404b8}, + {OP_SW, 0x224a18, 0x404ba}, {OP_ZR, 0x224a28, 0xc}, - {OP_SW, 0x224a58, 0x404bc}, + {OP_SW, 0x224a58, 0x404be}, {OP_ZR, 0x224a68, 0xc}, - {OP_SW, 0x224a98, 0x404c0}, + {OP_SW, 0x224a98, 0x404c2}, {OP_ZR, 0x224aa8, 0xc}, - {OP_SW, 0x224ad8, 0x404c4}, + {OP_SW, 0x224ad8, 0x404c6}, {OP_ZR, 0x224ae8, 0xc}, - {OP_SW, 0x224b18, 0x404c8}, + {OP_SW, 0x224b18, 0x404ca}, {OP_ZR, 0x224b28, 0xc}, - {OP_SW, 0x224b58, 0x404cc}, + {OP_SW, 0x224b58, 0x404ce}, {OP_ZR, 0x224b68, 0xc}, - {OP_SW, 0x224b98, 0x404d0}, + {OP_SW, 0x224b98, 0x404d2}, {OP_ZR, 0x224ba8, 0xc}, - {OP_SW, 0x224bd8, 0x404d4}, + {OP_SW, 0x224bd8, 0x404d6}, {OP_ZR, 0x224be8, 0xc}, - {OP_SW, 0x224c18, 0x404d8}, + {OP_SW, 0x224c18, 0x404da}, {OP_ZR, 0x224c28, 0xc}, - {OP_SW, 0x224c58, 0x404dc}, + {OP_SW, 0x224c58, 0x404de}, {OP_ZR, 0x224c68, 0xc}, - {OP_SW, 0x224c98, 0x404e0}, + {OP_SW, 0x224c98, 0x404e2}, {OP_ZR, 0x224ca8, 0xc}, - {OP_SW, 0x224cd8, 0x404e4}, + {OP_SW, 0x224cd8, 0x404e6}, {OP_ZR, 0x224ce8, 0xc}, - {OP_SW, 0x224d18, 0x404e8}, + {OP_SW, 0x224d18, 0x404ea}, {OP_ZR, 0x224d28, 0xc}, - {OP_SW, 0x224d58, 0x404ec}, + {OP_SW, 0x224d58, 0x404ee}, {OP_ZR, 0x224d68, 0xc}, - {OP_SW, 0x224d98, 0x404f0}, + {OP_SW, 0x224d98, 0x404f2}, {OP_ZR, 0x224da8, 0xc}, - {OP_SW, 0x224dd8, 0x404f4}, + {OP_SW, 0x224dd8, 0x404f6}, {OP_ZR, 0x224de8, 0xc}, - {OP_SW, 0x224e18, 0x404f8}, + {OP_SW, 0x224e18, 0x404fa}, {OP_ZR, 0x224e28, 0xc}, - {OP_SW, 0x224e58, 0x404fc}, + {OP_SW, 0x224e58, 0x404fe}, {OP_ZR, 0x224e68, 0xc}, - {OP_SW, 0x224e98, 0x40500}, + {OP_SW, 0x224e98, 0x40502}, {OP_ZR, 0x224ea8, 0xc}, - {OP_SW, 0x224ed8, 0x40504}, + {OP_SW, 0x224ed8, 0x40506}, {OP_ZR, 0x224ee8, 0xc}, - {OP_SW, 0x224f18, 0x40508}, + {OP_SW, 0x224f18, 0x4050a}, {OP_ZR, 0x224f28, 0xc}, - {OP_SW, 0x224f58, 0x4050c}, + {OP_SW, 0x224f58, 0x4050e}, {OP_ZR, 0x224f68, 0xc}, - {OP_SW, 0x224f98, 0x40510}, + {OP_SW, 0x224f98, 0x40512}, {OP_ZR, 0x224fa8, 0xc}, - {OP_SW, 0x224fd8, 0x40514}, + {OP_SW, 0x224fd8, 0x40516}, {OP_ZR, 0x224fe8, 0x6}, - {OP_SW, 0x225198, 0x40518}, + {OP_SW, 0x225198, 0x4051a}, {OP_WR, 0x238000, 0x10}, {OP_WR, 0x238040, 0x12}, {OP_WR, 0x238080, 0x30}, @@ -227,16 +227,16 @@ static const struct raw_op init_ops_e1[] {OP_IF_MODE_AND, 2, 0x4}, /* emul */ {OP_WR, 0x238300, 0x138}, {OP_WR, 0x238340, 0x0}, - {OP_FW, 0x240000, 0x27300000}, - {OP_WR_64, 0x249cc0, 0x6ace051c}, + {OP_FW, 0x240000, 0x22600000}, + {OP_WR_64, 0x248980, 0x6d36051e}, {OP_RD, 0x200000, 0x0}, {OP_RD, 0x200004, 0x0}, {OP_RD, 0x200008, 0x0}, {OP_RD, 0x20000c, 0x0}, {OP_RD, 0x200010, 0x0}, {OP_RD, 0x200014, 0x0}, - {OP_SW, 0x200020, 0x1a051e}, - {OP_SW, 0x2000a4, 0x20538}, + {OP_SW, 0x200020, 0x1a0520}, + {OP_SW, 0x2000a4, 0x2053a}, {OP_WR, 0x200224, 0x0}, {OP_WR, 0x200234, 0x0}, {OP_WR, 0x20024c, 0x0}, @@ -259,17 +259,17 @@ static const struct raw_op init_ops_e1[] /* #define CSEM_PORT1_END 137 */ /* #define DMAE_COMMON_START 176 */ {OP_ZR, 0x102400, 0xe0}, - {OP_SW, 0x10201c, 0x2053a}, + {OP_SW, 0x10201c, 0x2053c}, {OP_WR, 0x1020c0, 0x1}, - {OP_SW, 0x102004, 0x2053c}, + {OP_SW, 0x102004, 0x2053e}, /* #define DMAE_COMMON_END 177 */ /* #define DORQ_COMMON_START 198 */ {OP_WR, 0x170008, 0x2}, {OP_WR, 0x17002c, 0x3}, - {OP_SW, 0x170038, 0x2053e}, - {OP_SW, 0x170044, 0x60540}, - {OP_SW, 0x170060, 0x50546}, - {OP_SW, 0x170078, 0x2054b}, + {OP_SW, 0x170038, 0x20540}, + {OP_SW, 0x170044, 0x60542}, + {OP_SW, 0x170060, 0x50548}, + {OP_SW, 0x170078, 0x2054d}, {OP_WR, 0x170004, 0xf}, /* #define DORQ_COMMON_END 199 */ /* #define HC_COMMON_START 220 */ @@ -280,7 +280,7 @@ static const struct raw_op init_ops_e1[] {OP_ZR, 0x108040, 0x2}, {OP_ZR, 0x108028, 0x2}, {OP_WR, 0x108038, 0x10}, - {OP_SW, 0x108040, 0x2054d}, + {OP_SW, 0x108040, 0x2054f}, {OP_WR, 0x108050, 0x0}, {OP_WR, 0x108100, 0x0}, {OP_ZR, 0x108120, 0x2}, @@ -300,7 +300,7 @@ static const struct raw_op init_ops_e1[] {OP_ZR, 0x108048, 0x2}, {OP_ZR, 0x108030, 0x2}, {OP_WR, 0x10803c, 0x10}, - {OP_SW, 0x108048, 0x2054f}, + {OP_SW, 0x108048, 0x20551}, {OP_WR, 0x108054, 0x0}, {OP_WR, 0x108104, 0x0}, {OP_ZR, 0x108128, 0x2}, @@ -318,13 +318,13 @@ static const struct raw_op init_ops_e1[] /* #define MISC_COMMON_START 264 */ {OP_WR, 0xa468, 0xaffdc}, {OP_WR, 0xa280, 0x1}, - {OP_SW, 0xa294, 0x40551}, + {OP_SW, 0xa294, 0x40553}, {OP_WR, 0xa4fc, 0xff000000}, /* #define MISC_COMMON_END 265 */ /* #define NIG_COMMON_START 286 */ - {OP_SW, 0x100b4, 0x20555}, + {OP_SW, 0x100b4, 0x20557}, {OP_WR, 0x100dc, 0x1}, - {OP_SW, 0x10100, 0x20557}, + {OP_SW, 0x10100, 0x20559}, /* #define NIG_COMMON_END 287 */ /* #define NIG_PORT0_START 288 */ {OP_WR, 0x1007c, 0x300000}, @@ -355,7 +355,7 @@ static const struct raw_op init_ops_e1[] /* #define PBF_COMMON_START 308 */ {OP_WR, 0x140000, 0x1}, {OP_WR, 0x14000c, 0x1}, - {OP_SW, 0x140040, 0x20559}, + {OP_SW, 0x140040, 0x2055b}, {OP_WR, 0x14000c, 0x0}, {OP_WR, 0x140000, 0x0}, {OP_WR, 0x14006c, 0x0}, @@ -373,16 +373,16 @@ static const struct raw_op init_ops_e1[] {OP_WR, 0x140060, 0x0}, /* #define PBF_PORT1_END 313 */ /* #define PRS_COMMON_START 352 */ - {OP_SW, 0x40004, 0x12055b}, - {OP_SW, 0x40054, 0x3056d}, + {OP_SW, 0x40004, 0x12055d}, + {OP_SW, 0x40054, 0x3056f}, {OP_WR, 0x40070, 0x4}, - {OP_SW, 0x40078, 0x40570}, + {OP_SW, 0x40078, 0x40572}, {OP_ZR, 0x40088, 0x5}, - {OP_SW, 0x4009c, 0x30574}, + {OP_SW, 0x4009c, 0x30576}, {OP_ZR, 0x400a8, 0x4}, - {OP_SW, 0x400b8, 0x50577}, + {OP_SW, 0x400b8, 0x50579}, {OP_ZR, 0x400cc, 0x4}, - {OP_SW, 0x400dc, 0x4057c}, + {OP_SW, 0x400dc, 0x4057e}, {OP_ZR, 0x400ec, 0x4}, {OP_RD, 0x40124, 0x0}, {OP_RD, 0x40128, 0x0}, @@ -391,67 +391,67 @@ static const struct raw_op init_ops_e1[] {OP_WR, 0x40134, 0xf}, /* #define PRS_COMMON_END 353 */ /* #define PXP2_COMMON_START 374 */ - {OP_SW, 0x120490, 0x220580}, + {OP_SW, 0x120490, 0x220582}, {OP_WR, 0x120520, 0x2}, {OP_WR, 0x120388, 0x64}, {OP_WR, 0x120390, 0x8}, - {OP_SW, 0x12039c, 0x305a2}, + {OP_SW, 0x12039c, 0x305a4}, {OP_WR, 0x1203bc, 0x4}, {OP_WR, 0x1203c4, 0x4}, {OP_WR, 0x1203d0, 0x0}, {OP_WR, 0x1203dc, 0x0}, {OP_WR, 0x12036c, 0x1}, {OP_WR, 0x120368, 0x3f}, - {OP_SW, 0x1201bc, 0x3c05a5}, - {OP_SW, 0x1202b0, 0x205e1}, - {OP_SW, 0x120324, 0x205e3}, + {OP_SW, 0x1201bc, 0x3c05a7}, + {OP_SW, 0x1202b0, 0x205e3}, + {OP_SW, 0x120324, 0x205e5}, {OP_WR, 0x1201b0, 0x1}, /* #define PXP2_COMMON_END 375 */ /* #define PXP_COMMON_START 396 */ - {OP_WB, 0x103800, 0x505e5}, - {OP_WB, 0x103c00, 0x505ea}, - {OP_WB, 0x103c20, 0x505ef}, + {OP_WB, 0x103800, 0x505e7}, + {OP_WB, 0x103c00, 0x505ec}, + {OP_WB, 0x103c20, 0x505f1}, /* #define PXP_COMMON_END 397 */ /* #define QM_COMMON_START 418 */ - {OP_SW, 0x168030, 0x805f4}, + {OP_SW, 0x168030, 0x805f6}, {OP_WR, 0x168054, 0x2}, - {OP_SW, 0x168060, 0x505fc}, + {OP_SW, 0x168060, 0x505fe}, {OP_ZR, 0x168074, 0x7}, - {OP_SW, 0x168090, 0x20601}, - {OP_SW, 0x16809c, 0x50603}, + {OP_SW, 0x168090, 0x20603}, + {OP_SW, 0x16809c, 0x50605}, {OP_ZR, 0x1680b0, 0x7}, - {OP_SW, 0x1680cc, 0x80608}, + {OP_SW, 0x1680cc, 0x8060a}, {OP_WR, 0x1680f0, 0x7}, {OP_ZR, 0x1680f4, 0xc}, - {OP_SW, 0x168124, 0x40610}, + {OP_SW, 0x168124, 0x40612}, {OP_ZR, 0x168134, 0xc}, - {OP_SW, 0x168164, 0x3b0614}, + {OP_SW, 0x168164, 0x3b0616}, {OP_ZR, 0x168250, 0x4}, - {OP_SW, 0x168260, 0x2064f}, + {OP_SW, 0x168260, 0x20651}, {OP_ZR, 0x168268, 0x8}, - {OP_SW, 0x168288, 0x80651}, + {OP_SW, 0x168288, 0x80653}, {OP_ZR, 0x1682a8, 0xa}, {OP_WR, 0x168804, 0x4}, - {OP_SW, 0x16880c, 0x100659}, + {OP_SW, 0x16880c, 0x10065b}, {OP_WR, 0x1680ec, 0xff}, /* #define QM_COMMON_END 419 */ /* #define SRC_COMMON_START 440 */ - {OP_SW, 0x40408, 0x140669}, + {OP_SW, 0x40408, 0x14066b}, /* #define SRC_COMMON_END 441 */ /* #define TCM_COMMON_START 462 */ - {OP_SW, 0x50044, 0x2067d}, - {OP_SW, 0x50050, 0x4067f}, + {OP_SW, 0x50044, 0x2067f}, + {OP_SW, 0x50050, 0x40681}, {OP_ZR, 0x50060, 0x4}, - {OP_SW, 0x50090, 0x130683}, + {OP_SW, 0x50090, 0x130685}, {OP_WR, 0x50114, 0x1}, - {OP_SW, 0x5011c, 0x20696}, + {OP_SW, 0x5011c, 0x20698}, {OP_WR, 0x50204, 0x1}, - {OP_SW, 0x5020c, 0x20698}, - {OP_SW, 0x5021c, 0x3069a}, + {OP_SW, 0x5020c, 0x2069a}, + {OP_SW, 0x5021c, 0x3069c}, {OP_ZR, 0x50240, 0xa}, - {OP_SW, 0x50280, 0x20069d}, + {OP_SW, 0x50280, 0x20069f}, {OP_ZR, 0x54000, 0xd00}, - {OP_SW, 0x50004, 0x1006bd}, + {OP_SW, 0x50004, 0x1006bf}, /* #define TCM_COMMON_END 463 */ /* #define TCM_PORT0_START 464 */ {OP_WR, 0x500e0, 0xe}, @@ -461,7 +461,7 @@ static const struct raw_op init_ops_e1[] /* #define TCM_PORT1_END 467 */ /* #define TM_COMMON_START 484 */ {OP_ZR, 0x164024, 0x2}, - {OP_SW, 0x164030, 0x306cd}, + {OP_SW, 0x164030, 0x306cf}, {OP_WR, 0x164044, 0x20}, {OP_WR, 0x164070, 0x1c}, {OP_WR, 0x164208, 0x1}, @@ -479,7 +479,7 @@ static const struct raw_op init_ops_e1[] {OP_WR, 0x16401c, 0x9c}, {OP_WR, 0x164000, 0x1}, {OP_WR, 0x1640d8, 0x1}, - {OP_SW, 0x164008, 0x306d0}, + {OP_SW, 0x164008, 0x306d2}, /* #define TM_COMMON_END 485 */ /* #define TM_PORT0_START 486 */ {OP_WR, 0x164240, 0x0}, @@ -492,10 +492,10 @@ static const struct raw_op init_ops_e1[] {OP_WB_ZR, 0x164280, 0x2}, /* #define TM_PORT1_END 489 */ /* #define TSDM_COMMON_START 506 */ - {OP_SW, 0x42008, 0x406d3}, - {OP_SW, 0x4201c, 0x406d7}, + {OP_SW, 0x42008, 0x406d5}, + {OP_SW, 0x4201c, 0x406d9}, {OP_ZR, 0x42038, 0x80}, - {OP_SW, 0x42238, 0x406db}, + {OP_SW, 0x42238, 0x406dd}, {OP_RD, 0x42248, 0x0}, {OP_RD, 0x4224c, 0x0}, {OP_RD, 0x42250, 0x0}, @@ -520,17 +520,17 @@ static const struct raw_op init_ops_e1[] /* #define TSDM_COMMON_END 507 */ /* #define TSEM_COMMON_START 528 */ {OP_FW, 0x180400, 0xd80000}, - {OP_WR_64, 0x180760, 0x1406df}, + {OP_WR_64, 0x180760, 0x1406e1}, {OP_ZR, 0x1a0000, 0x1600}, {OP_ZR, 0x1a8000, 0x40}, - {OP_SW, 0x1a08b0, 0x206e1}, - {OP_SW, 0x1a19c8, 0x206e3}, - {OP_SW, 0x1a2fc0, 0x406e5}, + {OP_SW, 0x1a08b0, 0x206e3}, + {OP_SW, 0x1a19c8, 0x206e5}, + {OP_SW, 0x1a2fc0, 0x406e7}, {OP_ZR, 0x1a2fd0, 0x6}, - {OP_SW, 0x1a2fe8, 0x206e9}, - {OP_SW, 0x1a3000, 0x3f906eb}, + {OP_SW, 0x1a2fe8, 0x206eb}, + {OP_SW, 0x1a3000, 0x3f906ed}, {OP_ZR, 0x1a3fe4, 0x7}, - {OP_SW, 0x1a4870, 0x40ae4}, + {OP_SW, 0x1a4870, 0x40ae6}, {OP_WR, 0x1b8000, 0x34}, {OP_WR, 0x1b8040, 0x18}, {OP_WR, 0x1b8080, 0xc}, @@ -547,16 +547,16 @@ static const struct raw_op init_ops_e1[] {OP_IF_MODE_AND, 2, 0x4}, /* emul */ {OP_WR, 0x1b8300, 0x138}, {OP_WR, 0x1b8340, 0x0}, - {OP_FW, 0x1c0000, 0x535c0000}, - {OP_WR_64, 0x1d4d70, 0x56520ae8}, + {OP_FW, 0x1c0000, 0x48600000}, + {OP_WR_64, 0x1d2180, 0x5bd00aea}, {OP_RD, 0x180000, 0x0}, {OP_RD, 0x180004, 0x0}, {OP_RD, 0x180008, 0x0}, {OP_RD, 0x18000c, 0x0}, {OP_RD, 0x180010, 0x0}, {OP_RD, 0x180014, 0x0}, - {OP_SW, 0x180020, 0x1a0aea}, - {OP_SW, 0x1800a4, 0x20b04}, + {OP_SW, 0x180020, 0x1a0aec}, + {OP_SW, 0x1800a4, 0x20b06}, {OP_WR, 0x180224, 0x0}, {OP_WR, 0x180234, 0x0}, {OP_WR, 0x18024c, 0x0}, @@ -570,11 +570,11 @@ static const struct raw_op init_ops_e1[] {OP_ZR, 0x1a2500, 0x10}, {OP_ZR, 0x1a2580, 0x12}, {OP_ZR, 0x1a2610, 0x12}, - {OP_SW, 0x1a2fb0, 0x20b06}, + {OP_SW, 0x1a2fb0, 0x20b08}, {OP_ZR, 0x1a4000, 0x6}, {OP_ZR, 0x1a4030, 0x2}, {OP_ZR, 0x1a4820, 0x2}, - {OP_SW, 0x1a4c50, 0x20b08}, + {OP_SW, 0x1a4c50, 0x20b0a}, /* #define TSEM_PORT0_END 531 */ /* #define TSEM_PORT1_START 532 */ {OP_ZR, 0x1a0810, 0x2}, @@ -583,26 +583,26 @@ static const struct raw_op init_ops_e1[] {OP_ZR, 0x1a2540, 0x10}, {OP_ZR, 0x1a25c8, 0x12}, {OP_ZR, 0x1a2658, 0x12}, - {OP_SW, 0x1a2fb8, 0x20b0a}, + {OP_SW, 0x1a2fb8, 0x20b0c}, {OP_ZR, 0x1a4018, 0x6}, {OP_ZR, 0x1a4038, 0x2}, {OP_ZR, 0x1a4828, 0x2}, - {OP_SW, 0x1a4c58, 0x20b0c}, + {OP_SW, 0x1a4c58, 0x20b0e}, /* #define TSEM_PORT1_END 533 */ /* #define UCM_COMMON_START 550 */ {OP_WR, 0xe004c, 0x32}, - {OP_SW, 0xe0054, 0x40b0e}, + {OP_SW, 0xe0054, 0x40b10}, {OP_ZR, 0xe0064, 0x4}, - {OP_SW, 0xe0094, 0x130b12}, + {OP_SW, 0xe0094, 0x130b14}, {OP_WR, 0xe0144, 0x1}, - {OP_SW, 0xe014c, 0x20b25}, + {OP_SW, 0xe014c, 0x20b27}, {OP_WR, 0xe0204, 0x1}, - {OP_SW, 0xe020c, 0x20b27}, - {OP_SW, 0xe021c, 0x40b29}, - {OP_SW, 0xe0280, 0x1b0b2d}, + {OP_SW, 0xe020c, 0x20b29}, + {OP_SW, 0xe021c, 0x40b2b}, + {OP_SW, 0xe0280, 0x1b0b2f}, {OP_ZR, 0xe02ec, 0x17}, {OP_ZR, 0xe2000, 0x800}, - {OP_SW, 0xe0004, 0x110b48}, + {OP_SW, 0xe0004, 0x110b4a}, /* #define UCM_COMMON_END 551 */ /* #define UCM_PORT0_START 552 */ {OP_WR, 0xe0110, 0xf}, @@ -614,13 +614,13 @@ static const struct raw_op init_ops_e1[] {OP_WR, 0xc1000, 0x28}, /* #define UPB_COMMON_END 573 */ /* #define USDM_COMMON_START 594 */ - {OP_SW, 0xc4008, 0x40b59}, - {OP_SW, 0xc401c, 0x40b5d}, - {OP_SW, 0xc4038, 0x20b61}, + {OP_SW, 0xc4008, 0x40b5b}, + {OP_SW, 0xc401c, 0x40b5f}, + {OP_SW, 0xc4038, 0x20b63}, {OP_ZR, 0xc4040, 0x5e}, {OP_WR, 0xc41b8, 0x1}, {OP_ZR, 0xc41bc, 0x1f}, - {OP_SW, 0xc4238, 0x40b63}, + {OP_SW, 0xc4238, 0x40b65}, {OP_RD, 0xc4248, 0x0}, {OP_RD, 0xc424c, 0x0}, {OP_RD, 0xc4250, 0x0}, @@ -646,13 +646,13 @@ static const struct raw_op init_ops_e1[] /* #define USDM_COMMON_END 595 */ /* #define USEM_COMMON_START 616 */ {OP_FW, 0x300400, 0xda0000}, - {OP_WR_64, 0x300768, 0x130b67}, + {OP_WR_64, 0x300768, 0x130b69}, {OP_ZR, 0x320000, 0x1600}, {OP_ZR, 0x328000, 0x40}, - {OP_SW, 0x321830, 0x20b69}, - {OP_SW, 0x322e70, 0x40b6b}, + {OP_SW, 0x321830, 0x20b6b}, + {OP_SW, 0x322e70, 0x40b6d}, {OP_ZR, 0x325080, 0x8}, - {OP_SW, 0x3250a0, 0x20b6f}, + {OP_SW, 0x3250a0, 0x20b71}, {OP_WR, 0x338000, 0x1a}, {OP_WR, 0x338040, 0x4e}, {OP_WR, 0x338080, 0x10}, @@ -669,16 +669,16 @@ static const struct raw_op init_ops_e1[] {OP_IF_MODE_AND, 2, 0x4}, /* emul */ {OP_WR, 0x338300, 0x138}, {OP_WR, 0x338340, 0x0}, - {OP_FW, 0x340000, 0x59440000}, - {OP_WR_64, 0x356510, 0x535e0b71}, + {OP_FW, 0x340000, 0x88540000}, + {OP_WR_64, 0x362150, 0x3bd60b73}, {OP_RD, 0x300000, 0x0}, {OP_RD, 0x300004, 0x0}, {OP_RD, 0x300008, 0x0}, {OP_RD, 0x30000c, 0x0}, {OP_RD, 0x300010, 0x0}, {OP_RD, 0x300014, 0x0}, - {OP_SW, 0x300020, 0x1a0b73}, - {OP_SW, 0x3000a4, 0x20b8d}, + {OP_SW, 0x300020, 0x1a0b75}, + {OP_SW, 0x3000a4, 0x20b8f}, {OP_WR, 0x300224, 0x0}, {OP_WR, 0x300234, 0x0}, {OP_WR, 0x30024c, 0x0}, @@ -733,23 +733,23 @@ static const struct raw_op init_ops_e1[] /* #define USEM_PORT1_END 621 */ /* #define XCM_COMMON_START 638 */ {OP_WR, 0x20058, 0x32}, - {OP_SW, 0x20060, 0x40b8f}, + {OP_SW, 0x20060, 0x40b91}, {OP_ZR, 0x20070, 0x4}, - {OP_SW, 0x200a0, 0xe0b93}, - {OP_SW, 0x200dc, 0x70ba1}, + {OP_SW, 0x200a0, 0xe0b95}, + {OP_SW, 0x200dc, 0x70ba3}, {OP_WR, 0x200fc, 0x6}, {OP_WR, 0x20120, 0x0}, {OP_WR, 0x20134, 0x2}, {OP_WR, 0x201b0, 0x1}, {OP_WR, 0x2020c, 0x1}, - {OP_SW, 0x20214, 0x20ba8}, + {OP_SW, 0x20214, 0x20baa}, {OP_WR, 0x20404, 0x1}, - {OP_SW, 0x2040c, 0x20baa}, - {OP_SW, 0x2041c, 0x40bac}, - {OP_SW, 0x20480, 0x1f0bb0}, + {OP_SW, 0x2040c, 0x20bac}, + {OP_SW, 0x2041c, 0x40bae}, + {OP_SW, 0x20480, 0x1f0bb2}, {OP_ZR, 0x204fc, 0x13}, {OP_ZR, 0x28000, 0x2000}, - {OP_SW, 0x20004, 0x140bcf}, + {OP_SW, 0x20004, 0x140bd1}, /* #define XCM_COMMON_END 639 */ /* #define XCM_PORT0_START 640 */ {OP_WR, 0x20108, 0xc8}, @@ -775,15 +775,15 @@ static const struct raw_op init_ops_e1[] {OP_WR, 0x161000, 0x28}, /* #define XPB_COMMON_END 661 */ /* #define XSDM_COMMON_START 682 */ - {OP_SW, 0x166008, 0x30be3}, - {OP_SW, 0x16601c, 0x40be6}, - {OP_SW, 0x166038, 0xd0bea}, + {OP_SW, 0x166008, 0x30be5}, + {OP_SW, 0x16601c, 0x40be8}, + {OP_SW, 0x166038, 0xd0bec}, {OP_ZR, 0x16606c, 0x13}, - {OP_SW, 0x1660b8, 0x20bf7}, + {OP_SW, 0x1660b8, 0x20bf9}, {OP_ZR, 0x1660c0, 0x3e}, {OP_WR, 0x1661b8, 0x1}, {OP_ZR, 0x1661bc, 0x1f}, - {OP_SW, 0x166238, 0x40bf9}, + {OP_SW, 0x166238, 0x40bfb}, {OP_RD, 0x166248, 0x0}, {OP_RD, 0x16624c, 0x0}, {OP_RD, 0x166250, 0x0}, @@ -808,19 +808,19 @@ static const struct raw_op init_ops_e1[] /* #define XSDM_COMMON_END 683 */ /* #define XSEM_COMMON_START 704 */ {OP_FW, 0x280400, 0xda0000}, - {OP_WR_64, 0x280768, 0x130bfd}, + {OP_WR_64, 0x280768, 0x130bff}, {OP_ZR, 0x2a0000, 0x1600}, {OP_ZR, 0x2a8000, 0x40}, - {OP_SW, 0x2a2500, 0x20bff}, - {OP_SW, 0x2a2960, 0x40c01}, - {OP_SW, 0x2a2f48, 0x20c05}, - {OP_SW, 0x2a3368, 0x20c07}, - {OP_SW, 0x2a3920, 0x20c09}, - {OP_SW, 0x2a3930, 0x20c0b}, - {OP_SW, 0x2a3ac8, 0x20c0d}, + {OP_SW, 0x2a2500, 0x20c01}, + {OP_SW, 0x2a2960, 0x40c03}, + {OP_SW, 0x2a2f48, 0x20c07}, + {OP_SW, 0x2a3368, 0x20c09}, + {OP_SW, 0x2a3920, 0x20c0b}, + {OP_SW, 0x2a3930, 0x20c0d}, + {OP_SW, 0x2a3ac8, 0x20c0f}, {OP_ZR, 0x2a3ad0, 0x6}, - {OP_SW, 0x2a3b98, 0x20c0f}, - {OP_SW, 0x2a3c20, 0x40c11}, + {OP_SW, 0x2a3b98, 0x20c11}, + {OP_SW, 0x2a3c20, 0x40c13}, {OP_WR, 0x2a3cd0, 0x0}, {OP_WR, 0x2b8000, 0x0}, {OP_WR, 0x2b8040, 0x18}, @@ -840,16 +840,16 @@ static const struct raw_op init_ops_e1[] {OP_WR, 0x2b8340, 0x0}, {OP_IF_MODE_AND, 1, 0x20}, /* port2 */ {OP_WR, 0x2a3cd4, 0x0}, - {OP_FW, 0x2c0000, 0x6c0c0000}, - {OP_WR_64, 0x2db030, 0x49fa0c15}, + {OP_FW, 0x2c0000, 0x64e40000}, + {OP_WR_64, 0x2d9390, 0x4d8e0c17}, {OP_RD, 0x280000, 0x0}, {OP_RD, 0x280004, 0x0}, {OP_RD, 0x280008, 0x0}, {OP_RD, 0x28000c, 0x0}, {OP_RD, 0x280010, 0x0}, {OP_RD, 0x280014, 0x0}, - {OP_SW, 0x280020, 0x1a0c17}, - {OP_SW, 0x2800a4, 0x20c31}, + {OP_SW, 0x280020, 0x1a0c19}, + {OP_SW, 0x2800a4, 0x20c33}, {OP_WR, 0x280224, 0x0}, {OP_WR, 0x280234, 0x0}, {OP_WR, 0x28024c, 0x0}, @@ -860,8 +860,8 @@ static const struct raw_op init_ops_e1[] {OP_ZR, 0x2a3910, 0x2}, {OP_ZR, 0x2a3938, 0x20}, {OP_ZR, 0x2a3a38, 0x10}, - {OP_SW, 0x2a3ae8, 0x20c33}, - {OP_SW, 0x2a3af8, 0x100c35}, + {OP_SW, 0x2a3ae8, 0x20c35}, + {OP_SW, 0x2a3af8, 0x100c37}, {OP_ZR, 0x2a3c30, 0x2}, {OP_ZR, 0x2a5000, 0x2}, {OP_ZR, 0x2a5010, 0x2}, @@ -874,8 +874,8 @@ static const struct raw_op init_ops_e1[] {OP_ZR, 0x2a3918, 0x2}, {OP_ZR, 0x2a39b8, 0x20}, {OP_ZR, 0x2a3a78, 0x10}, - {OP_SW, 0x2a3af0, 0x20c45}, - {OP_SW, 0x2a3b38, 0x100c47}, + {OP_SW, 0x2a3af0, 0x20c47}, + {OP_SW, 0x2a3b38, 0x100c49}, {OP_ZR, 0x2a3c38, 0x2}, {OP_ZR, 0x2a5008, 0x2}, {OP_ZR, 0x2a5018, 0x2}, @@ -888,20 +888,20 @@ static const struct raw_op init_ops_e1[] {OP_ZR, 0xa000, 0x16}, /* #define MISC_AEU_COMMON_END 727 */ /* #define MISC_AEU_PORT0_START 728 */ - {OP_SW, 0xa06c, 0x60c57}, + {OP_SW, 0xa06c, 0x60c59}, {OP_ZR, 0xa084, 0x5}, {OP_WR, 0xa098, 0xfe00000}, {OP_ZR, 0xa09c, 0x14}, - {OP_SW, 0xa0ec, 0x80c5d}, + {OP_SW, 0xa0ec, 0x80c5f}, {OP_ZR, 0xa22c, 0x4}, {OP_WR, 0xa060, 0x307}, /* #define MISC_AEU_PORT0_END 729 */ /* #define MISC_AEU_PORT1_START 730 */ - {OP_SW, 0xa10c, 0x60c65}, + {OP_SW, 0xa10c, 0x60c67}, {OP_ZR, 0xa124, 0x5}, {OP_WR, 0xa138, 0xfe00000}, {OP_ZR, 0xa13c, 0x14}, - {OP_SW, 0xa18c, 0x80c6b}, + {OP_SW, 0xa18c, 0x80c6d}, {OP_ZR, 0xa23c, 0x4}, {OP_WR, 0xa064, 0x307}, /* #define MISC_AEU_PORT1_END 731 */ @@ -1183,14 +1183,15 @@ static const uint32_t init_data_e1[] = { 0x00000000, 0x00100000, 0x00000000, 0xffffffff, 0x00cfffff, 0x00000000, 0x00000000, 0x000000cc, 0x00000000, 0x00200000, 0x00000000, 0xffffffff, 0x00cfffff, 0x00000000, 0x00000000, 0x000000cc, 0x00000000, 0x00400000, - 0x00000000, 0x00000a11, 0x00000a00, 0x00000a04, 0x0000ffff, 0x0000ffff, - 0x0000ffff, 0x0000ffff, 0x00000020, 0x00000021, 0x00000022, 0x00000023, - 0x00000024, 0x00000025, 0x00000026, 0x00000027, 0x00000028, 0x00000029, - 0x0000002a, 0x0000002b, 0x0000002c, 0x0000002d, 0x0000002e, 0x0000002f, - 0x00000010, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, + 0x00000000, 0x00000200, 0x00003dff, 0x00000a11, 0x00000a00, 0x00000a04, + 0x0000ffff, 0x0000ffff, 0x0000ffff, 0x0000ffff, 0x00000020, 0x00000021, + 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027, + 0x00000028, 0x00000029, 0x0000002a, 0x0000002b, 0x0000002c, 0x0000002d, + 0x0000002e, 0x0000002f, 0x00000010, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, - 0x07ffffff, 0x0000003f, 0x07ffffff, 0x0000000f, 0x00007ff8, 0x00007ff8, + 0x00000001, 0x00000001, 0x07ffffff, 0x0000003f, 0x07ffffff, 0x0000000f, + 0x00007ff8, 0x00007ff8, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, @@ -1211,347 +1212,346 @@ static const uint32_t init_data_e1[] = { 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, - 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, - 0x0000ff1c, 0x0fffffff, 0x0000ff00, 0x00000000, 0x0000ff00, 0x00000000, - 0x00000312, 0x00003500, 0x00000001, 0x00000002, 0x00000003, 0x00000000, - 0x00000004, 0x00000001, 0x00000000, 0x00000001, 0x00000004, 0x00000000, - 0x00000001, 0x00000003, 0x00000000, 0x00000001, 0x00000004, 0x00000000, - 0x00000001, 0x00000003, 0x00000000, 0x00000001, 0x00000004, 0x00000000, - 0x00000004, 0x00000003, 0x00000000, 0x00000000, 0x00003fff, 0x000003ff, - 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x007c1004, 0x00000004, - 0x00000000, 0x00000002, 0x00000090, 0x00000090, 0x00800090, 0x08100000, - 0x0000008a, 0x00000080, 0x00000081, 0x00000080, 0x00000006, 0x000007d0, - 0x0000076c, 0x0000ffff, 0x0000ffff, 0x0000ffff, 0x0000ffff, 0x071d2911, - 0x00000000, 0x009c0424, 0x00000000, 0x00000001, 0x00000001, 0x00000001, - 0x00000001, 0x00000001, 0x00007fff, 0x000000ff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x0000003e, - 0x00000000, 0x0000003f, 0x0000003f, 0x0000003f, 0x00000000, 0x0000003f, - 0x0000003f, 0x0000003f, 0x0000000f, 0x00000043, 0x00000000, 0x00000006, - 0x00000000, 0x12170000, 0x22170000, 0x32170000, 0x12150000, 0x22150000, - 0x32150000, 0x02100000, 0x00100000, 0x10100000, 0x20100000, 0x30100000, - 0x00100000, 0x12140000, 0x22140000, 0x32140000, 0x00e38340, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xf0003000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffff3328, 0xffff3338, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, + 0x0000ff1c, 0x0fffffff, 0x0000ff1c, 0x0fffffff, 0x0000ff00, 0x00000000, + 0x0000ff00, 0x00000000, 0x00000002, 0x00001500, 0x00000001, 0x00000002, + 0x00000003, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000001, + 0x00000004, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000001, + 0x00000004, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000001, + 0x00000004, 0x00000000, 0x00000004, 0x00000003, 0x00000000, 0x00000000, + 0x00003fff, 0x000003ff, 0x00000000, 0x00000001, 0x00000001, 0x00000001, + 0x007c1004, 0x00000004, 0x00000000, 0x00000002, 0x00000090, 0x00000090, + 0x00800090, 0x08100000, 0x0000008a, 0x00000080, 0x00000081, 0x00000080, + 0x00000006, 0x000007d0, 0x0000076c, 0x0000ffff, 0x0000ffff, 0x0000ffff, + 0x0000ffff, 0x071d2911, 0x00000000, 0x009c0424, 0x00000000, 0x00000001, + 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00007fff, 0x000000ff, + 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x0000003e, 0x00000000, 0x0000003f, 0x0000003f, 0x0000003f, + 0x00000000, 0x0000003f, 0x0000003f, 0x0000003f, 0x0000000f, 0x00000043, + 0x00000000, 0x00000006, 0x00000000, 0x12170000, 0x22170000, 0x32170000, + 0x12150000, 0x22150000, 0x32150000, 0x02100000, 0x00100000, 0x10100000, + 0x20100000, 0x30100000, 0x00100000, 0x12140000, 0x22140000, 0x32140000, + 0x00e38340, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, + 0xffffffff, 0xffffffff, 0xffffffff, 0xf0003000, 0xffffffff, 0xffffffff, + 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffff3328, + 0xffff3338, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0x00003c10, 0x00000008, 0x00000000, 0x00000000, 0x00000040, - 0x00001808, 0x00000803, 0x00000803, 0x00000040, 0x00000003, 0x00000803, - 0x00000803, 0x00000803, 0x00010003, 0x00000803, 0x00000803, 0x00000003, - 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, + 0xffffffff, 0xffffffff, 0xffffffff, 0x00003c10, 0x00000008, 0x00000000, + 0x00000000, 0x00000040, 0x00001808, 0x00000803, 0x00000803, 0x00000040, + 0x00000003, 0x00000803, 0x00000803, 0x00000803, 0x00010003, 0x00000803, + 0x00000803, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, - 0x00000003, 0x00000003, 0x00002403, 0x0000002f, 0x00000009, 0x00000019, - 0x00000184, 0x00000183, 0x00000306, 0x00000019, 0x00000006, 0x00000306, - 0x00000306, 0x00000306, 0x00000c86, 0x00000306, 0x00000306, 0x00000006, + 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00002403, 0x0000002f, + 0x00000009, 0x00000019, 0x00000184, 0x00000183, 0x00000306, 0x00000019, + 0x00000006, 0x00000306, 0x00000306, 0x00000306, 0x00000c86, 0x00000306, + 0x00000306, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, - 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000006, - 0x00000006, 0x00000006, 0x00000306, 0x00000013, 0x00000006, 0x00001004, - 0x00001004, 0x00106440, 0x00106440, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00002000, - 0x0000007c, 0x0000003d, 0x0000003f, 0x0000009c, 0x00000006, 0x00000005, - 0x0000000a, 0x00000005, 0x00000140, 0x00000140, 0x00000000, 0x00000000, - 0x000000c0, 0x0000013f, 0x00007fff, 0x00000048, 0x00000048, 0x00000000, - 0x00000000, 0x00000048, 0x00000004, 0x00000004, 0x00000004, 0x00000004, - 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000009, - 0x0000000b, 0x0000000a, 0x00000004, 0x00000009, 0x0000000b, 0x0000000a, + 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00000306, 0x00000013, + 0x00000006, 0x00001004, 0x00001004, 0x00106440, 0x00106440, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00002000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00002000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00002000, 0x0000007c, 0x0000003d, 0x0000003f, 0x0000009c, + 0x00000006, 0x00000005, 0x0000000a, 0x00000005, 0x00000140, 0x00000140, + 0x00000000, 0x00000000, 0x000000c0, 0x0000013f, 0x00007fff, 0x00000048, + 0x00000048, 0x00000000, 0x00000000, 0x00000048, 0x00000004, 0x00000004, + 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000004, + 0x00000004, 0x00000009, 0x0000000b, 0x0000000a, 0x00000004, 0x00000009, + 0x0000000b, 0x0000000a, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, + 0x00000001, 0x00000001, 0x00000004, 0x00000009, 0x0000000b, 0x0000000a, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, - 0x00000004, 0x00000009, 0x0000000b, 0x0000000a, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, - 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000004, 0x00000009, - 0x0000000b, 0x0000000a, 0x00000000, 0x00000000, 0x00000800, 0x00000200, - 0x000001ff, 0x00000400, 0x00000000, 0x00000000, 0x1e491e49, 0x1e491e49, - 0x0e490e49, 0x0e490e49, 0xffffffff, 0x00000000, 0xffffffff, 0x00000000, - 0x000025e4, 0x00008000, 0x00000013, 0x0fff0fff, 0x00000000, 0x00000000, - 0x0fff0fff, 0x10001000, 0x10001000, 0x20002000, 0x20002000, 0x80008000, - 0x80008000, 0x40004000, 0x40004000, 0x00000000, 0x00000001, 0x01010101, - 0x01200101, 0x20010101, 0x01011001, 0x01010101, 0x01200101, 0x20010101, - 0x01011001, 0x20010101, 0x01011001, 0x01010101, 0x01200101, 0x20010101, - 0x01011001, 0x01010101, 0x01200101, 0x00000123, 0x00000123, 0x00000123, + 0x00000004, 0x00000009, 0x0000000b, 0x0000000a, 0x00000000, 0x00000000, + 0x00000800, 0x00000200, 0x000001ff, 0x00000400, 0x00000000, 0x00000000, + 0x1e491e49, 0x1e491e49, 0x0e490e49, 0x0e490e49, 0xffffffff, 0x00000000, + 0xffffffff, 0x00000000, 0x000025e4, 0x00008000, 0x00000013, 0x0fff0fff, + 0x00000000, 0x00000000, 0x0fff0fff, 0x10001000, 0x10001000, 0x20002000, + 0x20002000, 0x80008000, 0x80008000, 0x40004000, 0x40004000, 0x00000000, + 0x00000001, 0x01010101, 0x01200101, 0x20010101, 0x01011001, 0x01010101, + 0x01200101, 0x20010101, 0x01011001, 0x20010101, 0x01011001, 0x01010101, + 0x01200101, 0x20010101, 0x01011001, 0x01010101, 0x01200101, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, - 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000123, 0x00000020, - 0x00000032, 0x00000007, 0x00000007, 0x00000000, 0x00000008, 0x02150020, - 0x02150020, 0x00000030, 0x08100000, 0x00000033, 0x00000030, 0x00000031, - 0x00000002, 0x00000005, 0x00000006, 0x00000002, 0x00000002, 0x00000000, - 0x00000005, 0x00000002, 0x00000002, 0x00000002, 0x00000001, 0x00000006, - 0x00000001, 0x00000002, 0x00000040, 0x00000040, 0x00000020, 0x00000013, - 0x00000020, 0x00010000, 0x000204c0, 0x00030980, 0x00040e40, 0x00051300, - 0x000617c0, 0x00071c80, 0x00082140, 0x00092600, 0x000a2ac0, 0x000b2f80, - 0x000c3440, 0x000d3900, 0x000e3dc0, 0x000f4280, 0x00104740, 0x00114c00, - 0x001250c0, 0x00135580, 0x00145a40, 0x00155f00, 0x001663c0, 0x00176880, - 0x00186d40, 0x00197200, 0x001a76c0, 0x001b7b80, 0x001c8040, 0x001d8500, - 0x001e89c0, 0x001f8e80, 0x00009340, 0x00000001, 0x00000001, 0x00000001, - 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, - 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, - 0x00000001, 0x00000008, 0x0000000c, 0x00000010, 0x00000001, 0x00000001, - 0x00000001, 0x00000211, 0x00000200, 0x00000204, 0x00000219, 0x0000ffff, - 0x0000ffff, 0x0000ffff, 0x0000ffff, 0x07ffffff, 0x0000003f, 0x07ffffff, - 0x0000000f, 0x00007ff8, 0x00007ff8, 0x00000000, 0x140aff00, 0x00000000, - 0x00000001, 0x00201001, 0x00000000, 0x01008600, 0x00000100, 0x00000001, - 0x00000000, 0x00008602, 0x00000000, 0x00000000, 0x00000000, 0x00008604, - 0x00000000, 0x00000000, 0x00000000, 0x00008606, 0x00000000, 0x00000000, - 0x00000000, 0x00008608, 0x00000000, 0x00000000, 0x00000000, 0x0000860a, - 0x00000000, 0x00000000, 0x00000000, 0x0000860c, 0x00000000, 0x00000000, - 0x00000000, 0x0000860e, 0x00000000, 0x00000000, 0x00000000, 0x00008610, - 0x00000000, 0x00000000, 0x00000000, 0x00008612, 0x00000000, 0x00000000, - 0x00000000, 0x00008614, 0x00000000, 0x00000000, 0x00000000, 0x00008616, - 0x00000000, 0x00000000, 0x00000000, 0x00008618, 0x00000000, 0x00000000, - 0x00000000, 0x0000861a, 0x00000000, 0x00000000, 0x00000000, 0x0000861c, - 0x00000000, 0x00000000, 0x00000000, 0x0000861e, 0x00000000, 0x00000000, - 0x00000000, 0x00008620, 0x00000000, 0x00000000, 0x00000000, 0x00008622, - 0x00000000, 0x00000000, 0x00000000, 0x00008624, 0x00000000, 0x00000000, - 0x00000000, 0x00008626, 0x00000000, 0x00000000, 0x00000000, 0x00008628, - 0x00000000, 0x00000000, 0x00000000, 0x0000862a, 0x00000000, 0x00000000, - 0x00000000, 0x0000862c, 0x00000000, 0x00000000, 0x00000000, 0x0000862e, - 0x00000000, 0x00000000, 0x00000000, 0x00008630, 0x00000000, 0x00000000, - 0x00000000, 0x00008632, 0x00000000, 0x00000000, 0x00000000, 0x00008634, - 0x00000000, 0x00000000, 0x00000000, 0x00008636, 0x00000000, 0x00000000, - 0x00000000, 0x00008638, 0x00000000, 0x00000000, 0x00000000, 0x0000863a, - 0x00000000, 0x00000000, 0x00000000, 0x0000863c, 0x00000000, 0x00000000, - 0x00000000, 0x0000863e, 0x00000000, 0x00000000, 0x00000000, 0x00008640, - 0x00000000, 0x00000000, 0x00000000, 0x00008642, 0x00000000, 0x00000000, - 0x00000000, 0x00008644, 0x00000000, 0x00000000, 0x00000000, 0x00008646, - 0x00000000, 0x00000000, 0x00000000, 0x00008648, 0x00000000, 0x00000000, - 0x00000000, 0x0000864a, 0x00000000, 0x00000000, 0x00000000, 0x0000864c, - 0x00000000, 0x00000000, 0x00000000, 0x0000864e, 0x00000000, 0x00000000, - 0x00000000, 0x00008650, 0x00000000, 0x00000000, 0x00000000, 0x00008652, - 0x00000000, 0x00000000, 0x00000000, 0x00008654, 0x00000000, 0x00000000, - 0x00000000, 0x00008656, 0x00000000, 0x00000000, 0x00000000, 0x00008658, - 0x00000000, 0x00000000, 0x00000000, 0x0000865a, 0x00000000, 0x00000000, - 0x00000000, 0x0000865c, 0x00000000, 0x00000000, 0x00000000, 0x0000865e, - 0x00000000, 0x00000000, 0x00000000, 0x00008660, 0x00000000, 0x00000000, - 0x00000000, 0x00008662, 0x00000000, 0x00000000, 0x00000000, 0x00008664, - 0x00000000, 0x00000000, 0x00000000, 0x00008666, 0x00000000, 0x00000000, - 0x00000000, 0x00008668, 0x00000000, 0x00000000, 0x00000000, 0x0000866a, - 0x00000000, 0x00000000, 0x00000000, 0x0000866c, 0x00000000, 0x00000000, - 0x00000000, 0x0000866e, 0x00000000, 0x00000000, 0x00000000, 0x00008670, - 0x00000000, 0x00000000, 0x00000000, 0x00008672, 0x00000000, 0x00000000, - 0x00000000, 0x00008674, 0x00000000, 0x00000000, 0x00000000, 0x00008676, - 0x00000000, 0x00000000, 0x00000000, 0x00008678, 0x00000000, 0x00000000, - 0x00000000, 0x0000867a, 0x00000000, 0x00000000, 0x00000000, 0x0000867c, - 0x00000000, 0x00000000, 0x00000000, 0x0000867e, 0x00000000, 0x00000000, - 0x00000000, 0x00008680, 0x00000000, 0x00000000, 0x00000000, 0x00008682, - 0x00000000, 0x00000000, 0x00000000, 0x00008684, 0x00000000, 0x00000000, - 0x00000000, 0x00008686, 0x00000000, 0x00000000, 0x00000000, 0x00008688, - 0x00000000, 0x00000000, 0x00000000, 0x0000868a, 0x00000000, 0x00000000, - 0x00000000, 0x0000868c, 0x00000000, 0x00000000, 0x00000000, 0x0000868e, - 0x00000000, 0x00000000, 0x00000000, 0x00008690, 0x00000000, 0x00000000, - 0x00000000, 0x00008692, 0x00000000, 0x00000000, 0x00000000, 0x00008694, - 0x00000000, 0x00000000, 0x00000000, 0x00008696, 0x00000000, 0x00000000, - 0x00000000, 0x00008698, 0x00000000, 0x00000000, 0x00000000, 0x0000869a, - 0x00000000, 0x00000000, 0x00000000, 0x0000869c, 0x00000000, 0x00000000, - 0x00000000, 0x0000869e, 0x00000000, 0x00000000, 0x00000000, 0x000086a0, - 0x00000000, 0x00000000, 0x00000000, 0x000086a2, 0x00000000, 0x00000000, - 0x00000000, 0x000086a4, 0x00000000, 0x00000000, 0x00000000, 0x000086a6, - 0x00000000, 0x00000000, 0x00000000, 0x000086a8, 0x00000000, 0x00000000, - 0x00000000, 0x000086aa, 0x00000000, 0x00000000, 0x00000000, 0x000086ac, - 0x00000000, 0x00000000, 0x00000000, 0x000086ae, 0x00000000, 0x00000000, - 0x00000000, 0x000086b0, 0x00000000, 0x00000000, 0x00000000, 0x000086b2, - 0x00000000, 0x00000000, 0x00000000, 0x000086b4, 0x00000000, 0x00000000, - 0x00000000, 0x000086b6, 0x00000000, 0x00000000, 0x00000000, 0x000086b8, - 0x00000000, 0x00000000, 0x00000000, 0x000086ba, 0x00000000, 0x00000000, - 0x00000000, 0x000086bc, 0x00000000, 0x00000000, 0x00000000, 0x000086be, - 0x00000000, 0x00000000, 0x00000000, 0x000086c0, 0x00000000, 0x00000000, - 0x00000000, 0x000086c2, 0x00000000, 0x00000000, 0x00000000, 0x000086c4, - 0x00000000, 0x00000000, 0x00000000, 0x000086c6, 0x00000000, 0x00000000, - 0x00000000, 0x000086c8, 0x00000000, 0x00000000, 0x00000000, 0x000086ca, - 0x00000000, 0x00000000, 0x00000000, 0x000086cc, 0x00000000, 0x00000000, - 0x00000000, 0x000086ce, 0x00000000, 0x00000000, 0x00000000, 0x000086d0, - 0x00000000, 0x00000000, 0x00000000, 0x000086d2, 0x00000000, 0x00000000, - 0x00000000, 0x000086d4, 0x00000000, 0x00000000, 0x00000000, 0x000086d6, - 0x00000000, 0x00000000, 0x00000000, 0x000086d8, 0x00000000, 0x00000000, - 0x00000000, 0x000086da, 0x00000000, 0x00000000, 0x00000000, 0x000086dc, - 0x00000000, 0x00000000, 0x00000000, 0x000086de, 0x00000000, 0x00000000, - 0x00000000, 0x000086e0, 0x00000000, 0x00000000, 0x00000000, 0x000086e2, - 0x00000000, 0x00000000, 0x00000000, 0x000086e4, 0x00000000, 0x00000000, - 0x00000000, 0x000086e6, 0x00000000, 0x00000000, 0x00000000, 0x000086e8, - 0x00000000, 0x00000000, 0x00000000, 0x000086ea, 0x00000000, 0x00000000, - 0x00000000, 0x000086ec, 0x00000000, 0x00000000, 0x00000000, 0x000086ee, - 0x00000000, 0x00000000, 0x00000000, 0x000086f0, 0x00000000, 0x00000000, - 0x00000000, 0x000086f2, 0x00000000, 0x00000000, 0x00000000, 0x000086f4, - 0x00000000, 0x00000000, 0x00000000, 0x000086f6, 0x00000000, 0x00000000, - 0x00000000, 0x000086f8, 0x00000000, 0x00000000, 0x00000000, 0x000086fa, - 0x00000000, 0x00000000, 0x00000000, 0x000086fc, 0x00000000, 0x00000000, - 0x00000000, 0x000086fe, 0x00000000, 0x00000000, 0x00000000, 0x00008700, - 0x00000000, 0x00000000, 0x00000000, 0x00008702, 0x00000000, 0x00000000, - 0x00000000, 0x00008704, 0x00000000, 0x00000000, 0x00000000, 0x00008706, - 0x00000000, 0x00000000, 0x00000000, 0x00008708, 0x00000000, 0x00000000, - 0x00000000, 0x0000870a, 0x00000000, 0x00000000, 0x00000000, 0x0000870c, - 0x00000000, 0x00000000, 0x00000000, 0x0000870e, 0x00000000, 0x00000000, - 0x00000000, 0x00008710, 0x00000000, 0x00000000, 0x00000000, 0x00008712, - 0x00000000, 0x00000000, 0x00000000, 0x00008714, 0x00000000, 0x00000000, - 0x00000000, 0x00008716, 0x00000000, 0x00000000, 0x00000000, 0x00008718, - 0x00000000, 0x00000000, 0x00000000, 0x0000871a, 0x00000000, 0x00000000, - 0x00000000, 0x0000871c, 0x00000000, 0x00000000, 0x00000000, 0x0000871e, - 0x00000000, 0x00000000, 0x00000000, 0x00008720, 0x00000000, 0x00000000, - 0x00000000, 0x00008722, 0x00000000, 0x00000000, 0x00000000, 0x00008724, - 0x00000000, 0x00000000, 0x00000000, 0x00008726, 0x00000000, 0x00000000, - 0x00000000, 0x00008728, 0x00000000, 0x00000000, 0x00000000, 0x0000872a, - 0x00000000, 0x00000000, 0x00000000, 0x0000872c, 0x00000000, 0x00000000, - 0x00000000, 0x0000872e, 0x00000000, 0x00000000, 0x00000000, 0x00008730, - 0x00000000, 0x00000000, 0x00000000, 0x00008732, 0x00000000, 0x00000000, - 0x00000000, 0x00008734, 0x00000000, 0x00000000, 0x00000000, 0x00008736, - 0x00000000, 0x00000000, 0x00000000, 0x00008738, 0x00000000, 0x00000000, - 0x00000000, 0x0000873a, 0x00000000, 0x00000000, 0x00000000, 0x0000873c, - 0x00000000, 0x00000000, 0x00000000, 0x0000873e, 0x00000000, 0x00000000, - 0x00000000, 0x00008740, 0x00000000, 0x00000000, 0x00000000, 0x00008742, - 0x00000000, 0x00000000, 0x00000000, 0x00008744, 0x00000000, 0x00000000, - 0x00000000, 0x00008746, 0x00000000, 0x00000000, 0x00000000, 0x00008748, - 0x00000000, 0x00000000, 0x00000000, 0x0000874a, 0x00000000, 0x00000000, - 0x00000000, 0x0000874c, 0x00000000, 0x00000000, 0x00000000, 0x0000874e, - 0x00000000, 0x00000000, 0x00000000, 0x00008750, 0x00000000, 0x00000000, - 0x00000000, 0x00008752, 0x00000000, 0x00000000, 0x00000000, 0x00008754, - 0x00000000, 0x00000000, 0x00000000, 0x00008756, 0x00000000, 0x00000000, - 0x00000000, 0x00008758, 0x00000000, 0x00000000, 0x00000000, 0x0000875a, - 0x00000000, 0x00000000, 0x00000000, 0x0000875c, 0x00000000, 0x00000000, - 0x00000000, 0x0000875e, 0x00000000, 0x00000000, 0x00000000, 0x00008760, - 0x00000000, 0x00000000, 0x00000000, 0x00008762, 0x00000000, 0x00000000, - 0x00000000, 0x00008764, 0x00000000, 0x00000000, 0x00000000, 0x00008766, - 0x00000000, 0x00000000, 0x00000000, 0x00008768, 0x00000000, 0x00000000, - 0x00000000, 0x0000876a, 0x00000000, 0x00000000, 0x00000000, 0x0000876c, - 0x00000000, 0x00000000, 0x00000000, 0x0000876e, 0x00000000, 0x00000000, - 0x00000000, 0x00008770, 0x00000000, 0x00000000, 0x00000000, 0x00008772, - 0x00000000, 0x00000000, 0x00000000, 0x00008774, 0x00000000, 0x00000000, - 0x00000000, 0x00008776, 0x00000000, 0x00000000, 0x00000000, 0x00008778, - 0x00000000, 0x00000000, 0x00000000, 0x0000877a, 0x00000000, 0x00000000, - 0x00000000, 0x0000877c, 0x00000000, 0x00000000, 0x00000000, 0x0000877e, - 0x00000000, 0x00000000, 0x00000000, 0x00008780, 0x00000000, 0x00000000, - 0x00000000, 0x00008782, 0x00000000, 0x00000000, 0x00000000, 0x00008784, - 0x00000000, 0x00000000, 0x00000000, 0x00008786, 0x00000000, 0x00000000, - 0x00000000, 0x00008788, 0x00000000, 0x00000000, 0x00000000, 0x0000878a, - 0x00000000, 0x00000000, 0x00000000, 0x0000878c, 0x00000000, 0x00000000, - 0x00000000, 0x0000878e, 0x00000000, 0x00000000, 0x00000000, 0x00008790, - 0x00000000, 0x00000000, 0x00000000, 0x00008792, 0x00000000, 0x00000000, - 0x00000000, 0x00008794, 0x00000000, 0x00000000, 0x00000000, 0x00008796, - 0x00000000, 0x00000000, 0x00000000, 0x00008798, 0x00000000, 0x00000000, - 0x00000000, 0x0000879a, 0x00000000, 0x00000000, 0x00000000, 0x0000879c, - 0x00000000, 0x00000000, 0x00000000, 0x0000879e, 0x00000000, 0x00000000, - 0x00000000, 0x000087a0, 0x00000000, 0x00000000, 0x00000000, 0x000087a2, - 0x00000000, 0x00000000, 0x00000000, 0x000087a4, 0x00000000, 0x00000000, - 0x00000000, 0x000087a6, 0x00000000, 0x00000000, 0x00000000, 0x000087a8, - 0x00000000, 0x00000000, 0x00000000, 0x000087aa, 0x00000000, 0x00000000, - 0x00000000, 0x000087ac, 0x00000000, 0x00000000, 0x00000000, 0x000087ae, - 0x00000000, 0x00000000, 0x00000000, 0x000087b0, 0x00000000, 0x00000000, - 0x00000000, 0x000087b2, 0x00000000, 0x00000000, 0x00000000, 0x000087b4, - 0x00000000, 0x00000000, 0x00000000, 0x000087b6, 0x00000000, 0x00000000, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-10@freebsd.org Thu Mar 10 23:37:17 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C49C0ACB662; Thu, 10 Mar 2016 23:37:17 +0000 (UTC) (envelope-from smh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 87A992A9; Thu, 10 Mar 2016 23:37:17 +0000 (UTC) (envelope-from smh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2ANbGK6052809; Thu, 10 Mar 2016 23:37:16 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2ANbGwh052807; Thu, 10 Mar 2016 23:37:16 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201603102337.u2ANbGwh052807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Thu, 10 Mar 2016 23:37:16 +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: r296629 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2016 23:37:18 -0000 Author: smh Date: Thu Mar 10 23:37:16 2016 New Revision: 296629 URL: https://svnweb.freebsd.org/changeset/base/296629 Log: MFC r296610: ZFS send fails to transmit some holes PR: 207714 Approved by: re (gjb) Sponsored by: Multiplay Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c Thu Mar 10 23:19:35 2016 (r296628) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c Thu Mar 10 23:37:16 2016 (r296629) @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013, 2014 by Delphix. All rights reserved. + * Copyright (c) 2013, 2015 by Delphix. All rights reserved. * Copyright 2014 HybridCluster. All rights reserved. */ @@ -50,6 +50,12 @@ dmu_object_alloc(objset_t *os, dmu_objec * reasonably sparse (at most 1/4 full). Look from the * beginning once, but after that keep looking from here. * If we can't find one, just keep going from here. + * + * Note that dmu_traverse depends on the behavior that we use + * multiple blocks of the dnode object before going back to + * reuse objects. Any change to this algorithm should preserve + * that property or find another solution to the issues + * described in traverse_visitbp. */ if (P2PHASE(object, L2_dnode_count) == 0) { uint64_t offset = restarted ? object << DNODE_SHIFT : 0; Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c Thu Mar 10 23:19:35 2016 (r296628) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c Thu Mar 10 23:37:16 2016 (r296629) @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2016 by Delphix. All rights reserved. * Copyright (c) 2015 Chunwei Chen. All rights reserved. */ @@ -63,6 +63,7 @@ typedef struct traverse_data { uint64_t td_hole_birth_enabled_txg; blkptr_cb_t *td_func; void *td_arg; + boolean_t td_realloc_possible; } traverse_data_t; static int traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp, @@ -232,18 +233,30 @@ traverse_visitbp(traverse_data_t *td, co if (bp->blk_birth == 0) { /* - * Since this block has a birth time of 0 it must be a - * hole created before the SPA_FEATURE_HOLE_BIRTH - * feature was enabled. If SPA_FEATURE_HOLE_BIRTH - * was enabled before the min_txg for this traveral we - * know the hole must have been created before the - * min_txg for this traveral, so we can skip it. If - * SPA_FEATURE_HOLE_BIRTH was enabled after the min_txg - * for this traveral we cannot tell if the hole was - * created before or after the min_txg for this - * traversal, so we cannot skip it. + * Since this block has a birth time of 0 it must be one of + * two things: a hole created before the + * SPA_FEATURE_HOLE_BIRTH feature was enabled, or a hole + * which has always been a hole in an object. + * + * If a file is written sparsely, then the unwritten parts of + * the file were "always holes" -- that is, they have been + * holes since this object was allocated. However, we (and + * our callers) can not necessarily tell when an object was + * allocated. Therefore, if it's possible that this object + * was freed and then its object number reused, we need to + * visit all the holes with birth==0. + * + * If it isn't possible that the object number was reused, + * then if SPA_FEATURE_HOLE_BIRTH was enabled before we wrote + * all the blocks we will visit as part of this traversal, + * then this hole must have always existed, so we can skip + * it. We visit blocks born after (exclusive) td_min_txg. + * + * Note that the meta-dnode cannot be reallocated. */ - if (td->td_hole_birth_enabled_txg < td->td_min_txg) + if ((!td->td_realloc_possible || + zb->zb_object == DMU_META_DNODE_OBJECT) && + td->td_hole_birth_enabled_txg <= td->td_min_txg) return (0); } else if (bp->blk_birth <= td->td_min_txg) { return (0); @@ -338,6 +351,15 @@ traverse_visitbp(traverse_data_t *td, co objset_phys_t *osp = buf->b_data; prefetch_dnode_metadata(td, &osp->os_meta_dnode, zb->zb_objset, DMU_META_DNODE_OBJECT); + /* + * See the block comment above for the goal of this variable. + * If the maxblkid of the meta-dnode is 0, then we know that + * we've never had more than DNODES_PER_BLOCK objects in the + * dataset, which means we can't have reused any object ids. + */ + if (osp->os_meta_dnode.dn_maxblkid == 0) + td->td_realloc_possible = B_FALSE; + if (arc_buf_size(buf) >= sizeof (objset_phys_t)) { prefetch_dnode_metadata(td, &osp->os_groupused_dnode, zb->zb_objset, DMU_GROUPUSED_OBJECT); @@ -544,12 +566,13 @@ traverse_impl(spa_t *spa, dsl_dataset_t td.td_pfd = &pd; td.td_flags = flags; td.td_paused = B_FALSE; + td.td_realloc_possible = (txg_start == 0 ? B_FALSE : B_TRUE); if (spa_feature_is_active(spa, SPA_FEATURE_HOLE_BIRTH)) { VERIFY(spa_feature_enabled_txg(spa, SPA_FEATURE_HOLE_BIRTH, &td.td_hole_birth_enabled_txg)); } else { - td.td_hole_birth_enabled_txg = 0; + td.td_hole_birth_enabled_txg = UINT64_MAX; } pd.pd_flags = flags; From owner-svn-src-stable-10@freebsd.org Fri Mar 11 01:39:30 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 148A0ACB274; Fri, 11 Mar 2016 01:39:30 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D9462A7D; Fri, 11 Mar 2016 01:39:29 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2B1dS3S001770; Fri, 11 Mar 2016 01:39:28 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2B1dSnt001769; Fri, 11 Mar 2016 01:39:28 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201603110139.u2B1dSnt001769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Fri, 11 Mar 2016 01:39:28 +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: r296638 - stable/10/usr.sbin/portsnap/portsnap 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2016 01:39:30 -0000 Author: jgh (doc,ports committer) Date: Fri Mar 11 01:39:28 2016 New Revision: 296638 URL: https://svnweb.freebsd.org/changeset/base/296638 Log: MFC 296280: PR: 202971 Submitted by: adamw@FreeBSD.org Reviewed by: bdrewery@ Approved by: wblock@ MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D5429 Modified: stable/10/usr.sbin/portsnap/portsnap/portsnap.8 Modified: stable/10/usr.sbin/portsnap/portsnap/portsnap.8 ============================================================================== --- stable/10/usr.sbin/portsnap/portsnap/portsnap.8 Fri Mar 11 01:35:39 2016 (r296637) +++ stable/10/usr.sbin/portsnap/portsnap/portsnap.8 Fri Mar 11 01:39:28 2016 (r296638) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 14, 2012 +.Dd March 1, 2016 .Dt PORTSNAP 8 .Os FreeBSD .Sh NAME @@ -212,7 +212,7 @@ However, running .Fl I .Cm update is probably safe, and can be used together with -.Xr portversion 1 +.Xr pkg-version 8 to identify installed software which is out of date. .It If you wish to use @@ -260,6 +260,8 @@ Default location where the ports tree is .Xr fetch 1 , .Xr sha256 1 , .Xr fetch 3 , -.Xr portsnap.conf 5 +.Xr portsnap.conf 5 , +.Xr pkg 7 , +.Xr pkg-version 8 .Sh AUTHORS .An Colin Percival Aq cperciva@FreeBSD.org From owner-svn-src-stable-10@freebsd.org Fri Mar 11 09:41:47 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D84EAACC13C; Fri, 11 Mar 2016 09:41:47 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 A9E7918C1; Fri, 11 Mar 2016 09:41:47 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2B9fkJS052073; Fri, 11 Mar 2016 09:41:46 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2B9fkr3052072; Fri, 11 Mar 2016 09:41:46 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201603110941.u2B9fkr3052072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Fri, 11 Mar 2016 09:41: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: r296649 - stable/10/sys/netpfil/ipfw 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2016 09:41:48 -0000 Author: ae Date: Fri Mar 11 09:41:46 2016 New Revision: 296649 URL: https://svnweb.freebsd.org/changeset/base/296649 Log: MFC r296348: Use correct size for malloc. Modified: stable/10/sys/netpfil/ipfw/ip_fw_dynamic.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netpfil/ipfw/ip_fw_dynamic.c ============================================================================== --- stable/10/sys/netpfil/ipfw/ip_fw_dynamic.c Fri Mar 11 06:07:09 2016 (r296648) +++ stable/10/sys/netpfil/ipfw/ip_fw_dynamic.c Fri Mar 11 09:41:46 2016 (r296649) @@ -487,7 +487,7 @@ resize_dynamic_table(struct ip_fw_chain V_curr_dyn_buckets, nbuckets); /* Allocate and initialize new hash */ - dyn_v = malloc(nbuckets * sizeof(ipfw_dyn_rule), M_IPFW, + dyn_v = malloc(nbuckets * sizeof(*dyn_v), M_IPFW, M_WAITOK | M_ZERO); for (i = 0 ; i < nbuckets; i++) From owner-svn-src-stable-10@freebsd.org Sat Mar 12 17:12:03 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1350FACEBF7; Sat, 12 Mar 2016 17:12:03 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D8159F6D; Sat, 12 Mar 2016 17:12:02 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CHC2ts037139; Sat, 12 Mar 2016 17:12:02 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CHC14E037127; Sat, 12 Mar 2016 17:12:01 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603121712.u2CHC14E037127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 12 Mar 2016 17: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: r296727 - in stable/10/libexec/rtld-elf: . amd64 arm i386 powerpc powerpc64 sparc64 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 17:12:03 -0000 Author: kib Date: Sat Mar 12 17:12:00 2016 New Revision: 296727 URL: https://svnweb.freebsd.org/changeset/base/296727 Log: MFC r257811 (by markj): Include rtld itself when iterating over loaded ELF objects in dl_iterate_phdr(3). MFC r294373: Do not call callbacks for dl_iterate_phdr(3) with the rtld bind and phdr locks locked. MFC r294470 (by kan): Fix initlist_add_object invocation parameters. MFC r294936 (by kan): Do not unlock rtld_phdr_lock over callback invocations. Modified: stable/10/libexec/rtld-elf/amd64/reloc.c stable/10/libexec/rtld-elf/arm/reloc.c stable/10/libexec/rtld-elf/debug.c stable/10/libexec/rtld-elf/i386/reloc.c stable/10/libexec/rtld-elf/powerpc/reloc.c stable/10/libexec/rtld-elf/powerpc64/reloc.c stable/10/libexec/rtld-elf/rtld.c stable/10/libexec/rtld-elf/rtld.h stable/10/libexec/rtld-elf/sparc64/reloc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/libexec/rtld-elf/amd64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/amd64/reloc.c Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/amd64/reloc.c Sat Mar 12 17:12:00 2016 (r296727) @@ -85,7 +85,8 @@ do_copy_relocations(Obj_Entry *dstobj) req.ventry = fetch_ventry(dstobj, ELF_R_SYM(rela->r_info)); req.flags = SYMLOOK_EARLY; - for (srcobj = dstobj->next; srcobj != NULL; srcobj = srcobj->next) { + for (srcobj = globallist_next(dstobj); srcobj != NULL; + srcobj = globallist_next(srcobj)) { res = symlook_obj(&req, srcobj); if (res == 0) { srcsym = req.sym_out; Modified: stable/10/libexec/rtld-elf/arm/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/arm/reloc.c Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/arm/reloc.c Sat Mar 12 17:12:00 2016 (r296727) @@ -56,8 +56,8 @@ do_copy_relocations(Obj_Entry *dstobj) ELF_R_SYM(rel->r_info)); req.flags = SYMLOOK_EARLY; - for (srcobj = dstobj->next; srcobj != NULL; - srcobj = srcobj->next) { + for (srcobj = globallist_next(dstobj); srcobj != NULL; + srcobj = globallist_next(srcobj)) { res = symlook_obj(&req, srcobj); if (res == 0) { srcsym = req.sym_out; Modified: stable/10/libexec/rtld-elf/debug.c ============================================================================== --- stable/10/libexec/rtld-elf/debug.c Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/debug.c Sat Mar 12 17:12:00 2016 (r296727) @@ -62,7 +62,8 @@ dump_relocations (Obj_Entry *obj0) { Obj_Entry *obj; - for (obj = obj0; obj != NULL; obj = obj->next) { + for (obj = globallist_curr(obj0); obj != NULL; + obj = globallist_next(obj)) { dump_obj_relocations(obj); } } Modified: stable/10/libexec/rtld-elf/i386/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/i386/reloc.c Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/i386/reloc.c Sat Mar 12 17:12:00 2016 (r296727) @@ -86,7 +86,8 @@ do_copy_relocations(Obj_Entry *dstobj) req.ventry = fetch_ventry(dstobj, ELF_R_SYM(rel->r_info)); req.flags = SYMLOOK_EARLY; - for (srcobj = dstobj->next; srcobj != NULL; srcobj = srcobj->next) { + for (srcobj = globallist_next(dstobj); srcobj != NULL; + srcobj = globallist_next(srcobj)) { res = symlook_obj(&req, srcobj); if (res == 0) { srcsym = req.sym_out; Modified: stable/10/libexec/rtld-elf/powerpc/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/powerpc/reloc.c Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/powerpc/reloc.c Sat Mar 12 17:12:00 2016 (r296727) @@ -94,8 +94,8 @@ do_copy_relocations(Obj_Entry *dstobj) req.ventry = fetch_ventry(dstobj, ELF_R_SYM(rela->r_info)); req.flags = SYMLOOK_EARLY; - for (srcobj = dstobj->next; srcobj != NULL; - srcobj = srcobj->next) { + for (srcobj = globallist_next(dstobj); srcobj != NULL; + srcobj = globallist_next(srcobj)) { res = symlook_obj(&req, srcobj); if (res == 0) { srcsym = req.sym_out; Modified: stable/10/libexec/rtld-elf/powerpc64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/powerpc64/reloc.c Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/powerpc64/reloc.c Sat Mar 12 17:12:00 2016 (r296727) @@ -88,8 +88,8 @@ do_copy_relocations(Obj_Entry *dstobj) req.ventry = fetch_ventry(dstobj, ELF_R_SYM(rela->r_info)); req.flags = SYMLOOK_EARLY; - for (srcobj = dstobj->next; srcobj != NULL; - srcobj = srcobj->next) { + for (srcobj = globallist_next(dstobj); srcobj != NULL; + srcobj = globallist_next(srcobj)) { res = symlook_obj(&req, srcobj); if (res == 0) { srcsym = req.sym_out; Modified: stable/10/libexec/rtld-elf/rtld.c ============================================================================== --- stable/10/libexec/rtld-elf/rtld.c Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/rtld.c Sat Mar 12 17:12:00 2016 (r296727) @@ -95,7 +95,7 @@ static void init_dag(Obj_Entry *); static void init_pagesizes(Elf_Auxinfo **aux_info); static void init_rtld(caddr_t, Elf_Auxinfo **); static void initlist_add_neededs(Needed_Entry *, Objlist *); -static void initlist_add_objects(Obj_Entry *, Obj_Entry **, Objlist *); +static void initlist_add_objects(Obj_Entry *, Obj_Entry *, Objlist *); static void linkmap_add(Obj_Entry *); static void linkmap_delete(Obj_Entry *); static void load_filtees(Obj_Entry *, int flags, RtldLockState *); @@ -180,12 +180,11 @@ static char *ld_preload; /* Environment static char *ld_elf_hints_path; /* Environment variable for alternative hints path */ static char *ld_tracing; /* Called from ldd to print libs */ static char *ld_utrace; /* Use utrace() to log events. */ -static Obj_Entry *obj_list; /* Head of linked list of shared objects */ -static Obj_Entry **obj_tail; /* Link field of last object in list */ +static struct obj_entry_q obj_list; /* Queue of all loaded objects */ static Obj_Entry *obj_main; /* The main program shared object */ static Obj_Entry obj_rtld; /* The dynamic linker shared object */ static unsigned int obj_count; /* Number of objects in obj_list */ -static unsigned int obj_loads; /* Number of objects in obj_list */ +static unsigned int obj_loads; /* Number of loads of objects (gen count) */ static Objlist list_global = /* Objects dlopened with RTLD_GLOBAL */ STAILQ_HEAD_INITIALIZER(list_global); @@ -343,7 +342,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ const char *argv0; Objlist_Entry *entry; Obj_Entry *obj; - Obj_Entry **preload_tail; + Obj_Entry *preload_tail; Obj_Entry *last_interposer; Objlist initlist; RtldLockState lockstate; @@ -538,8 +537,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ linkmap_add(&obj_rtld); /* Link the main program into the list of objects. */ - *obj_tail = obj_main; - obj_tail = &obj_main->next; + TAILQ_INSERT_HEAD(&obj_list, obj_main, next); obj_count++; obj_loads++; @@ -554,7 +552,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ dbg("loading LD_PRELOAD libraries"); if (load_preload_objects() == -1) rtld_die(); - preload_tail = obj_tail; + preload_tail = globallist_curr(TAILQ_LAST(&obj_list, obj_entry_q)); dbg("loading needed objects"); if (load_needed_objects(obj_main, 0) == -1) @@ -562,7 +560,9 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ /* Make a list of all objects loaded at startup. */ last_interposer = obj_main; - for (obj = obj_list; obj != NULL; obj = obj->next) { + TAILQ_FOREACH(obj, &obj_list, next) { + if (obj->marker) + continue; if (obj->z_interpose && obj != obj_main) { objlist_put_after(&list_main, last_interposer, obj); last_interposer = obj; @@ -620,7 +620,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ * might be the subject for relocations. */ dbg("initializing initial thread local storage"); - allocate_initial_tls(obj_list); + allocate_initial_tls(globallist_curr(TAILQ_FIRST(&obj_list))); dbg("initializing key program variables"); set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : ""); @@ -629,7 +629,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ /* Make a list of init functions to call. */ objlist_init(&initlist); - initlist_add_objects(obj_list, preload_tail, &initlist); + initlist_add_objects(globallist_curr(TAILQ_FIRST(&obj_list)), + preload_tail, &initlist); r_debug_state(NULL, &obj_main->linkmap); /* say hello to gdb! */ @@ -659,7 +660,9 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ _r_debug_postinit(&obj_main->linkmap); objlist_clear(&initlist); dbg("loading filtees"); - for (obj = obj_list->next; obj != NULL; obj = obj->next) { + TAILQ_FOREACH(obj, &obj_list, next) { + if (obj->marker) + continue; if (ld_loadfltr || obj->z_loadfltr) load_filtees(obj, 0, &lockstate); } @@ -1373,9 +1376,10 @@ dlcheck(void *handle) { Obj_Entry *obj; - for (obj = obj_list; obj != NULL; obj = obj->next) + TAILQ_FOREACH(obj, &obj_list, next) { if (obj == (Obj_Entry *) handle) break; + } if (obj == NULL || obj->refcount == 0 || obj->dl_refcount == 0) { _rtld_error("Invalid shared object handle %p", handle); @@ -1779,6 +1783,32 @@ init_dag(Obj_Entry *root) root->dag_inited = true; } +Obj_Entry * +globallist_curr(const Obj_Entry *obj) +{ + + for (;;) { + if (obj == NULL) + return (NULL); + if (!obj->marker) + return (__DECONST(Obj_Entry *, obj)); + obj = TAILQ_PREV(obj, obj_entry_q, next); + } +} + +Obj_Entry * +globallist_next(const Obj_Entry *obj) +{ + + for (;;) { + obj = TAILQ_NEXT(obj, next); + if (obj == NULL) + return (NULL); + if (!obj->marker) + return (__DECONST(Obj_Entry *, obj)); + } +} + static void process_z(Obj_Entry *root) { @@ -1861,7 +1891,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo * } /* Initialize the object list. */ - obj_tail = &obj_list; + TAILQ_INIT(&obj_list); /* Now that non-local variables can be accesses, copy out obj_rtld. */ memcpy(&obj_rtld, &objtmp, sizeof(obj_rtld)); @@ -1942,7 +1972,7 @@ initlist_add_neededs(Needed_Entry *neede /* Process the current needed object. */ if (needed->obj != NULL) - initlist_add_objects(needed->obj, &needed->obj->next, list); + initlist_add_objects(needed->obj, needed->obj, list); } /* @@ -1955,16 +1985,18 @@ initlist_add_neededs(Needed_Entry *neede * held when this function is called. */ static void -initlist_add_objects(Obj_Entry *obj, Obj_Entry **tail, Objlist *list) +initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list) { + Obj_Entry *nobj; if (obj->init_scanned || obj->init_done) return; obj->init_scanned = true; /* Recursively process the successor objects. */ - if (&obj->next != tail) - initlist_add_objects(obj->next, tail, list); + nobj = globallist_next(obj); + if (nobj != NULL && obj != tail) + initlist_add_objects(nobj, tail, list); /* Recursively process the needed objects. */ if (obj->needed != NULL) @@ -2067,7 +2099,10 @@ load_needed_objects(Obj_Entry *first, in { Obj_Entry *obj; - for (obj = first; obj != NULL; obj = obj->next) { + obj = first; + TAILQ_FOREACH_FROM(obj, &obj_list, next) { + if (obj->marker) + continue; if (process_needed(obj, obj->needed, flags) == -1) return (-1); } @@ -2128,7 +2163,9 @@ load_object(const char *name, int fd_u, char *path; if (name != NULL) { - for (obj = obj_list->next; obj != NULL; obj = obj->next) { + TAILQ_FOREACH(obj, &obj_list, next) { + if (obj->marker) + continue; if (object_match_name(obj, name)) return (obj); } @@ -2169,9 +2206,12 @@ load_object(const char *name, int fd_u, free(path); return NULL; } - for (obj = obj_list->next; obj != NULL; obj = obj->next) + TAILQ_FOREACH(obj, &obj_list, next) { + if (obj->marker) + continue; if (obj->ino == sb.st_ino && obj->dev == sb.st_dev) break; + } if (obj != NULL && name != NULL) { object_add_name(obj, name); free(path); @@ -2239,8 +2279,7 @@ do_load_object(int fd, const char *name, } obj->dlopened = (flags & RTLD_LO_DLOPEN) != 0; - *obj_tail = obj; - obj_tail = &obj->next; + TAILQ_INSERT_TAIL(&obj_list, obj, next); obj_count++; obj_loads++; linkmap_add(obj); /* for GDB & dlinfo() */ @@ -2261,7 +2300,9 @@ obj_from_addr(const void *addr) { Obj_Entry *obj; - for (obj = obj_list; obj != NULL; obj = obj->next) { + TAILQ_FOREACH(obj, &obj_list, next) { + if (obj->marker) + continue; if (addr < (void *) obj->mapbase) continue; if (addr < (void *) (obj->mapbase + obj->mapsize)) @@ -2387,8 +2428,11 @@ objlist_call_init(Objlist *list, RtldLoc * possibly initialized earlier if any of vectors called below * cause the change by using dlopen. */ - for (obj = obj_list; obj != NULL; obj = obj->next) + TAILQ_FOREACH(obj, &obj_list, next) { + if (obj->marker) + continue; obj->init_scanned = false; + } /* * Preserve the current error message since an init function might @@ -2632,7 +2676,11 @@ relocate_objects(Obj_Entry *first, bool Obj_Entry *obj; int error; - for (error = 0, obj = first; obj != NULL; obj = obj->next) { + error = 0; + obj = first; + TAILQ_FOREACH_FROM(obj, &obj_list, next) { + if (obj->marker) + continue; error = relocate_object(obj, bind_now, rtldobj, flags, lockstate); if (error == -1) @@ -2670,7 +2718,10 @@ resolve_objects_ifunc(Obj_Entry *first, { Obj_Entry *obj; - for (obj = first; obj != NULL; obj = obj->next) { + obj = first; + TAILQ_FOREACH_FROM(obj, &obj_list, next) { + if (obj->marker) + continue; if (resolve_object_ifunc(obj, bind_now, flags, lockstate) == -1) return (-1); } @@ -2921,7 +2972,7 @@ static Obj_Entry * dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, int mode, RtldLockState *lockstate) { - Obj_Entry **old_obj_tail; + Obj_Entry *old_obj_tail; Obj_Entry *obj; Objlist initlist; RtldLockState mlockstate; @@ -2935,7 +2986,7 @@ dlopen_object(const char *name, int fd, } GDB_STATE(RT_ADD,NULL); - old_obj_tail = obj_tail; + old_obj_tail = globallist_curr(TAILQ_LAST(&obj_list, obj_entry_q)); obj = NULL; if (name == NULL && fd == -1) { obj = obj_main; @@ -2948,8 +2999,9 @@ dlopen_object(const char *name, int fd, obj->dl_refcount++; if (mode & RTLD_GLOBAL && objlist_find(&list_global, obj) == NULL) objlist_push_tail(&list_global, obj); - if (*old_obj_tail != NULL) { /* We loaded something new. */ - assert(*old_obj_tail == obj); + if (globallist_next(old_obj_tail) != NULL) { + /* We loaded something new. */ + assert(globallist_next(old_obj_tail) == obj); result = load_needed_objects(obj, lo_flags & (RTLD_LO_DLOPEN | RTLD_LO_EARLY)); init_dag(obj); @@ -2976,7 +3028,7 @@ dlopen_object(const char *name, int fd, */ } else { /* Make list of init functions to call. */ - initlist_add_objects(obj, &obj->next, &initlist); + initlist_add_objects(obj, obj, &initlist); } /* * Process all no_delete or global objects here, given @@ -3084,8 +3136,10 @@ do_dlsym(void *handle, const char *name, } else if (handle == RTLD_NEXT || /* Objects after caller's */ handle == RTLD_SELF) { /* ... caller included */ if (handle == RTLD_NEXT) - obj = obj->next; - for (; obj != NULL; obj = obj->next) { + obj = globallist_next(obj); + TAILQ_FOREACH_FROM(obj, &obj_list, next) { + if (obj->marker) + continue; res = symlook_obj(&req, obj); if (res == 0) { if (def == NULL || @@ -3361,26 +3415,41 @@ rtld_fill_dl_phdr_info(const Obj_Entry * int dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param) { - struct dl_phdr_info phdr_info; - const Obj_Entry *obj; - RtldLockState bind_lockstate, phdr_lockstate; - int error; - - wlock_acquire(rtld_phdr_lock, &phdr_lockstate); - rlock_acquire(rtld_bind_lock, &bind_lockstate); - - error = 0; + struct dl_phdr_info phdr_info; + Obj_Entry *obj, marker; + RtldLockState bind_lockstate, phdr_lockstate; + int error; - for (obj = obj_list; obj != NULL; obj = obj->next) { - rtld_fill_dl_phdr_info(obj, &phdr_info); - if ((error = callback(&phdr_info, sizeof phdr_info, param)) != 0) - break; + bzero(&marker, sizeof(marker)); + marker.marker = true; + error = 0; - } - lock_release(rtld_bind_lock, &bind_lockstate); - lock_release(rtld_phdr_lock, &phdr_lockstate); + wlock_acquire(rtld_phdr_lock, &phdr_lockstate); + rlock_acquire(rtld_bind_lock, &bind_lockstate); + for (obj = globallist_curr(TAILQ_FIRST(&obj_list)); obj != NULL;) { + TAILQ_INSERT_AFTER(&obj_list, obj, &marker, next); + rtld_fill_dl_phdr_info(obj, &phdr_info); + lock_release(rtld_bind_lock, &bind_lockstate); + + error = callback(&phdr_info, sizeof phdr_info, param); + + rlock_acquire(rtld_bind_lock, &bind_lockstate); + obj = globallist_next(&marker); + TAILQ_REMOVE(&obj_list, &marker, next); + if (error != 0) { + lock_release(rtld_bind_lock, &bind_lockstate); + lock_release(rtld_phdr_lock, &phdr_lockstate); + return (error); + } + } - return (error); + if (error == 0) { + rtld_fill_dl_phdr_info(&obj_rtld, &phdr_info); + lock_release(rtld_bind_lock, &bind_lockstate); + error = callback(&phdr_info, sizeof(phdr_info), param); + } + lock_release(rtld_phdr_lock, &phdr_lockstate); + return (error); } static void * @@ -4100,11 +4169,13 @@ trace_loaded_objects(Obj_Entry *obj) list_containers = getenv(LD_ "TRACE_LOADED_OBJECTS_ALL"); - for (; obj; obj = obj->next) { + TAILQ_FOREACH_FROM(obj, &obj_list, next) { Needed_Entry *needed; char *name, *path; bool is_lib; + if (obj->marker) + continue; if (list_containers && obj->needed != NULL) rtld_printf("%s:\n", obj->path); for (needed = obj->needed; needed; needed = needed->next) { @@ -4187,34 +4258,30 @@ trace_loaded_objects(Obj_Entry *obj) static void unload_object(Obj_Entry *root) { - Obj_Entry *obj; - Obj_Entry **linkp; + Obj_Entry *obj, *obj1; - assert(root->refcount == 0); + assert(root->refcount == 0); - /* - * Pass over the DAG removing unreferenced objects from - * appropriate lists. - */ - unlink_object(root); + /* + * Pass over the DAG removing unreferenced objects from + * appropriate lists. + */ + unlink_object(root); - /* Unmap all objects that are no longer referenced. */ - linkp = &obj_list->next; - while ((obj = *linkp) != NULL) { - if (obj->refcount == 0) { - LD_UTRACE(UTRACE_UNLOAD_OBJECT, obj, obj->mapbase, obj->mapsize, 0, - obj->path); - dbg("unloading \"%s\"", obj->path); - unload_filtees(root); - munmap(obj->mapbase, obj->mapsize); - linkmap_delete(obj); - *linkp = obj->next; - obj_count--; - obj_free(obj); - } else - linkp = &obj->next; - } - obj_tail = linkp; + /* Unmap all objects that are no longer referenced. */ + TAILQ_FOREACH_SAFE(obj, &obj_list, next, obj1) { + if (obj->marker || obj->refcount != 0) + continue; + LD_UTRACE(UTRACE_UNLOAD_OBJECT, obj, obj->mapbase, + obj->mapsize, 0, obj->path); + dbg("unloading \"%s\"", obj->path); + unload_filtees(root); + munmap(obj->mapbase, obj->mapsize); + linkmap_delete(obj); + TAILQ_REMOVE(&obj_list, obj, next); + obj_count--; + obj_free(obj); + } } static void @@ -4346,7 +4413,8 @@ allocate_tls(Obj_Entry *objs, void *oldt dtv[0] = tls_dtv_generation; dtv[1] = tls_max_index; - for (obj = objs; obj; obj = obj->next) { + for (obj = globallist_curr(objs); obj != NULL; + obj = globallist_next(obj)) { if (obj->tlsoffset > 0) { addr = (Elf_Addr)tls + obj->tlsoffset; if (obj->tlsinitsize > 0) @@ -4445,15 +4513,16 @@ allocate_tls(Obj_Entry *objs, void *oldt */ free_tls(oldtls, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); } else { - for (obj = objs; obj; obj = obj->next) { - if (obj->tlsoffset) { + obj = objs; + TAILQ_FOREACH_FROM(obj, &obj_list, next) { + if (obj->marker || obj->tlsoffset == 0) + continue; addr = segbase - obj->tlsoffset; memset((void*) (addr + obj->tlsinitsize), 0, obj->tlssize - obj->tlsinitsize); if (obj->tlsinit) memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize); dtv[obj->tlsindex + 1] = addr; - } } } @@ -4502,7 +4571,9 @@ allocate_module_tls(int index) Obj_Entry* obj; char* p; - for (obj = obj_list; obj; obj = obj->next) { + TAILQ_FOREACH(obj, &obj_list, next) { + if (obj->marker) + continue; if (obj->tlsindex == index) break; } @@ -4581,7 +4652,8 @@ _rtld_allocate_tls(void *oldtls, size_t RtldLockState lockstate; wlock_acquire(rtld_bind_lock, &lockstate); - ret = allocate_tls(obj_list, oldtls, tcbsize, tcbalign); + ret = allocate_tls(globallist_curr(TAILQ_FIRST(&obj_list)), oldtls, + tcbsize, tcbalign); lock_release(rtld_bind_lock, &lockstate); return (ret); } Modified: stable/10/libexec/rtld-elf/rtld.h ============================================================================== --- stable/10/libexec/rtld-elf/rtld.h Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/rtld.h Sat Mar 12 17:12:00 2016 (r296727) @@ -155,7 +155,7 @@ typedef struct Struct_Obj_Entry { Elf_Size magic; /* Magic number (sanity check) */ Elf_Size version; /* Version number of struct format */ - struct Struct_Obj_Entry *next; + TAILQ_ENTRY(Struct_Obj_Entry) next; char *path; /* Pathname of underlying file (%) */ char *origin_path; /* Directory path of origin file */ int refcount; @@ -277,6 +277,7 @@ typedef struct Struct_Obj_Entry { bool valid_hash_sysv : 1; /* A valid System V hash hash tag is available */ bool valid_hash_gnu : 1; /* A valid GNU hash tag is available */ bool dlopened : 1; /* dlopen()-ed (vs. load statically) */ + bool marker : 1; /* marker on the global obj list */ struct link_map linkmap; /* For GDB and dlinfo() */ Objlist dldags; /* Object belongs to these dlopened DAGs (%) */ @@ -289,6 +290,8 @@ typedef struct Struct_Obj_Entry { #define RTLD_MAGIC 0xd550b87a #define RTLD_VERSION 1 +TAILQ_HEAD(obj_entry_q, Struct_Obj_Entry); + #define RTLD_STATIC_TLS_EXTRA 128 /* Flags to be passed into symlook_ family of functions. */ @@ -380,6 +383,8 @@ const Elf_Sym *find_symdef(unsigned long void init_pltgot(Obj_Entry *); void lockdflt_init(void); void digest_notes(Obj_Entry *, Elf_Addr, Elf_Addr); +Obj_Entry *globallist_curr(const Obj_Entry *obj); +Obj_Entry *globallist_next(const Obj_Entry *obj); void obj_free(Obj_Entry *); Obj_Entry *obj_new(void); void _rtld_bind_start(void); Modified: stable/10/libexec/rtld-elf/sparc64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/sparc64/reloc.c Sat Mar 12 17:06:45 2016 (r296726) +++ stable/10/libexec/rtld-elf/sparc64/reloc.c Sat Mar 12 17:12:00 2016 (r296727) @@ -266,8 +266,8 @@ do_copy_relocations(Obj_Entry *dstobj) ELF_R_SYM(rela->r_info)); req.flags = SYMLOOK_EARLY; - for (srcobj = dstobj->next; srcobj != NULL; - srcobj = srcobj->next) { + for (srcobj = globallist_next(dstobj); srcobj != NULL; + srcobj = globallist_next(srcobj)) { res = symlook_obj(&req, srcobj); if (res == 0) { srcsym = req.sym_out; From owner-svn-src-stable-10@freebsd.org Sat Mar 12 17:17:35 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E78DACEF7B; Sat, 12 Mar 2016 17:17:35 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 5DEDFAF8; Sat, 12 Mar 2016 17:17:35 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CHHYtb038351; Sat, 12 Mar 2016 17:17:34 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CHHYfr038350; Sat, 12 Mar 2016 17:17:34 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603121717.u2CHHYfr038350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 12 Mar 2016 17:17:34 +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: r296728 - 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 17:17:35 -0000 Author: kib Date: Sat Mar 12 17:17:34 2016 New Revision: 296728 URL: https://svnweb.freebsd.org/changeset/base/296728 Log: MFC r295488: Finish r173600. There is no need to test a condition if both cases result in the same value. Modified: stable/10/sys/kern/subr_turnstile.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/subr_turnstile.c ============================================================================== --- stable/10/sys/kern/subr_turnstile.c Sat Mar 12 17:12:00 2016 (r296727) +++ stable/10/sys/kern/subr_turnstile.c Sat Mar 12 17:17:34 2016 (r296728) @@ -1027,8 +1027,7 @@ print_thread(struct thread *td, const ch { db_printf("%s%p (tid %d, pid %d, \"%s\")\n", prefix, td, td->td_tid, - td->td_proc->p_pid, td->td_name[0] != '\0' ? td->td_name : - td->td_name); + td->td_proc->p_pid, td->td_name); } static void @@ -1110,8 +1109,7 @@ print_lockchain(struct thread *td, const */ while (!db_pager_quit) { db_printf("%sthread %d (pid %d, %s) ", prefix, td->td_tid, - td->td_proc->p_pid, td->td_name[0] != '\0' ? td->td_name : - td->td_name); + td->td_proc->p_pid, td->td_name); switch (td->td_state) { case TDS_INACTIVE: db_printf("is inactive\n"); @@ -1194,8 +1192,7 @@ print_sleepchain(struct thread *td, cons */ while (!db_pager_quit) { db_printf("%sthread %d (pid %d, %s) ", prefix, td->td_tid, - td->td_proc->p_pid, td->td_name[0] != '\0' ? td->td_name : - td->td_name); + td->td_proc->p_pid, td->td_name); switch (td->td_state) { case TDS_INACTIVE: db_printf("is inactive\n"); From owner-svn-src-stable-10@freebsd.org Sat Mar 12 17:23:17 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63378ACD23F; Sat, 12 Mar 2016 17:23:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 3AD78B0; Sat, 12 Mar 2016 17:23:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CHNGAJ041702; Sat, 12 Mar 2016 17:23:16 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CHNG5A041700; Sat, 12 Mar 2016 17:23:16 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603121723.u2CHNG5A041700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 12 Mar 2016 17:23:16 +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: r296729 - 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 17:23:17 -0000 Author: kib Date: Sat Mar 12 17:23:15 2016 New Revision: 296729 URL: https://svnweb.freebsd.org/changeset/base/296729 Log: MFC r295489: Remove useless checks for NULL before calling free(9), in the kernel elf linkers. Modified: stable/10/sys/kern/link_elf.c stable/10/sys/kern/link_elf_obj.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/link_elf.c ============================================================================== --- stable/10/sys/kern/link_elf.c Sat Mar 12 17:17:34 2016 (r296728) +++ stable/10/sys/kern/link_elf.c Sat Mar 12 17:23:15 2016 (r296729) @@ -1027,10 +1027,8 @@ out: vn_close(nd.ni_vp, FREAD, td->td_ucred, td); if (error != 0 && lf != NULL) linker_file_unload(lf, LINKER_UNLOAD_FORCE); - if (shdr != NULL) - free(shdr, M_LINKER); - if (firstpage != NULL) - free(firstpage, M_LINKER); + free(shdr, M_LINKER); + free(firstpage, M_LINKER); return (error); } @@ -1092,19 +1090,13 @@ link_elf_unload_file(linker_file_t file) + (ef->object->size << PAGE_SHIFT)); } #else - if (ef->address != NULL) - free(ef->address, M_LINKER); + free(ef->address, M_LINKER); #endif - if (ef->symbase != NULL) - free(ef->symbase, M_LINKER); - if (ef->strbase != NULL) - free(ef->strbase, M_LINKER); - if (ef->ctftab != NULL) - free(ef->ctftab, M_LINKER); - if (ef->ctfoff != NULL) - free(ef->ctfoff, M_LINKER); - if (ef->typoff != NULL) - free(ef->typoff, M_LINKER); + free(ef->symbase, M_LINKER); + free(ef->strbase, M_LINKER); + free(ef->ctftab, M_LINKER); + free(ef->ctfoff, M_LINKER); + free(ef->typoff, M_LINKER); } static void Modified: stable/10/sys/kern/link_elf_obj.c ============================================================================== --- stable/10/sys/kern/link_elf_obj.c Sat Mar 12 17:17:34 2016 (r296728) +++ stable/10/sys/kern/link_elf_obj.c Sat Mar 12 17:23:15 2016 (r296729) @@ -896,8 +896,7 @@ out: vn_close(nd.ni_vp, FREAD, td->td_ucred, td); if (error && lf) linker_file_unload(lf, LINKER_UNLOAD_FORCE); - if (hdr) - free(hdr, M_LINKER); + free(hdr, M_LINKER); return error; } @@ -928,18 +927,12 @@ link_elf_unload_file(linker_file_t file) } } if (ef->preloaded) { - if (ef->reltab) - free(ef->reltab, M_LINKER); - if (ef->relatab) - free(ef->relatab, M_LINKER); - if (ef->progtab) - free(ef->progtab, M_LINKER); - if (ef->ctftab) - free(ef->ctftab, M_LINKER); - if (ef->ctfoff) - free(ef->ctfoff, M_LINKER); - if (ef->typoff) - free(ef->typoff, M_LINKER); + free(ef->reltab, M_LINKER); + free(ef->relatab, M_LINKER); + free(ef->progtab, M_LINKER); + free(ef->ctftab, M_LINKER); + free(ef->ctfoff, M_LINKER); + free(ef->typoff, M_LINKER); if (file->filename != NULL) preload_delete_name(file->filename); /* XXX reclaim module memory? */ @@ -947,37 +940,25 @@ link_elf_unload_file(linker_file_t file) } for (i = 0; i < ef->nreltab; i++) - if (ef->reltab[i].rel) - free(ef->reltab[i].rel, M_LINKER); + free(ef->reltab[i].rel, M_LINKER); for (i = 0; i < ef->nrelatab; i++) - if (ef->relatab[i].rela) - free(ef->relatab[i].rela, M_LINKER); - if (ef->reltab) - free(ef->reltab, M_LINKER); - if (ef->relatab) - free(ef->relatab, M_LINKER); - if (ef->progtab) - free(ef->progtab, M_LINKER); + free(ef->relatab[i].rela, M_LINKER); + free(ef->reltab, M_LINKER); + free(ef->relatab, M_LINKER); + free(ef->progtab, M_LINKER); if (ef->object) { vm_map_remove(kernel_map, (vm_offset_t) ef->address, (vm_offset_t) ef->address + (ef->object->size << PAGE_SHIFT)); } - if (ef->e_shdr) - free(ef->e_shdr, M_LINKER); - if (ef->ddbsymtab) - free(ef->ddbsymtab, M_LINKER); - if (ef->ddbstrtab) - free(ef->ddbstrtab, M_LINKER); - if (ef->shstrtab) - free(ef->shstrtab, M_LINKER); - if (ef->ctftab) - free(ef->ctftab, M_LINKER); - if (ef->ctfoff) - free(ef->ctfoff, M_LINKER); - if (ef->typoff) - free(ef->typoff, M_LINKER); + free(ef->e_shdr, M_LINKER); + free(ef->ddbsymtab, M_LINKER); + free(ef->ddbstrtab, M_LINKER); + free(ef->shstrtab, M_LINKER); + free(ef->ctftab, M_LINKER); + free(ef->ctfoff, M_LINKER); + free(ef->typoff, M_LINKER); } static const char * From owner-svn-src-stable-10@freebsd.org Sat Mar 12 17:25:34 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B2AFACD326; Sat, 12 Mar 2016 17:25:34 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 6B61526C; Sat, 12 Mar 2016 17:25:34 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CHPXKp041905; Sat, 12 Mar 2016 17:25:33 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CHPXUI041904; Sat, 12 Mar 2016 17:25:33 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603121725.u2CHPXUI041904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 12 Mar 2016 17:25: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: r296730 - stable/10/sys/dev/hwpmc 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 17:25:34 -0000 Author: kib Date: Sat Mar 12 17:25:33 2016 New Revision: 296730 URL: https://svnweb.freebsd.org/changeset/base/296730 Log: MFC r295352: Do not call vn_fullpath(9) (through the pmc_getfilename() wrapper) when its result is immediately ignored, i.e. for kernel processes forked from the user process. Do not test for non-null before freeing string. Modified: stable/10/sys/dev/hwpmc/hwpmc_mod.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- stable/10/sys/dev/hwpmc/hwpmc_mod.c Sat Mar 12 17:23:15 2016 (r296729) +++ stable/10/sys/dev/hwpmc/hwpmc_mod.c Sat Mar 12 17:25:33 2016 (r296730) @@ -1014,14 +1014,14 @@ pmc_attach_one_process(struct proc *p, s /* issue an attach event to a configured log file */ if (pm->pm_owner->po_flags & PMC_PO_OWNS_LOGFILE) { - pmc_getfilename(p->p_textvp, &fullpath, &freepath); if (p->p_flag & P_KTHREAD) { fullpath = kernelname; freepath = NULL; - } else + } else { + pmc_getfilename(p->p_textvp, &fullpath, &freepath); pmclog_process_pmcattach(pm, p->p_pid, fullpath); - if (freepath) - free(freepath, M_TEMP); + } + free(freepath, M_TEMP); if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) pmc_log_process_mappings(pm->pm_owner, p); } From owner-svn-src-stable-10@freebsd.org Sat Mar 12 17:28:32 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D108ACD422; Sat, 12 Mar 2016 17:28:32 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 F21F6639; Sat, 12 Mar 2016 17:28:31 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CHSVmm042165; Sat, 12 Mar 2016 17:28:31 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CHSU5f042164; Sat, 12 Mar 2016 17:28:30 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603121728.u2CHSU5f042164@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 12 Mar 2016 17:28:30 +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: r296731 - 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 17:28:32 -0000 Author: kib Date: Sat Mar 12 17:28:30 2016 New Revision: 296731 URL: https://svnweb.freebsd.org/changeset/base/296731 Log: MFC r295391: Remove the assert which outlived its usefulness. Modified: stable/10/sys/kern/kern_proc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_proc.c ============================================================================== --- stable/10/sys/kern/kern_proc.c Sat Mar 12 17:25:33 2016 (r296730) +++ stable/10/sys/kern/kern_proc.c Sat Mar 12 17:28:30 2016 (r296731) @@ -2908,6 +2908,12 @@ static SYSCTL_NODE(_kern_proc, KERN_PROC int allproc_gen; +/* + * stop_all_proc() purpose is to stop all process which have usermode, + * except current process for obvious reasons. This makes it somewhat + * unreliable when invoked from multithreaded process. The service + * must not be user-callable anyway. + */ void stop_all_proc(void) { @@ -2916,17 +2922,6 @@ stop_all_proc(void) bool restart, seen_stopped, seen_exiting, stopped_some; cp = curproc; - /* - * stop_all_proc() assumes that all process which have - * usermode must be stopped, except current process, for - * obvious reasons. Since other threads in the process - * establishing global stop could unstop something, disable - * calls from multithreaded processes as precaution. The - * service must not be user-callable anyway. - */ - KASSERT((cp->p_flag & P_HADTHREADS) == 0 || - (cp->p_flag & P_KTHREAD) != 0, ("mt stop_all_proc")); - allproc_loop: sx_xlock(&allproc_lock); gen = allproc_gen; @@ -3013,7 +3008,7 @@ resume_all_proc(void) sx_xunlock(&allproc_lock); } -#define TOTAL_STOP_DEBUG 1 +/* #define TOTAL_STOP_DEBUG 1 */ #ifdef TOTAL_STOP_DEBUG volatile static int ap_resume; #include From owner-svn-src-stable-10@freebsd.org Sat Mar 12 17:33:43 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A572ACD743; Sat, 12 Mar 2016 17:33:43 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C2A4AB58; Sat, 12 Mar 2016 17:33:42 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CHXfBM045134; Sat, 12 Mar 2016 17:33:41 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CHXfOn045126; Sat, 12 Mar 2016 17:33:41 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201603121733.u2CHXfOn045126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 12 Mar 2016 17:33:41 +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: r296732 - in stable/10/lib: libc/gen libc/include libc/sys libthr 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 17:33:43 -0000 Author: kib Date: Sat Mar 12 17:33:40 2016 New Revision: 296732 URL: https://svnweb.freebsd.org/changeset/base/296732 Log: MFC r295407: Make libc __pthread_map_stacks_exec() interposed. Modified: stable/10/lib/libc/gen/elf_utils.c stable/10/lib/libc/include/libc_private.h stable/10/lib/libc/sys/interposing_table.c stable/10/lib/libthr/pthread.map stable/10/lib/libthr/thread/thr_private.h stable/10/lib/libthr/thread/thr_stack.c stable/10/lib/libthr/thread/thr_syscalls.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/gen/elf_utils.c ============================================================================== --- stable/10/lib/libc/gen/elf_utils.c Sat Mar 12 17:28:30 2016 (r296731) +++ stable/10/lib/libc/gen/elf_utils.c Sat Mar 12 17:33:40 2016 (r296732) @@ -32,6 +32,7 @@ #include #include #include +#include "libc_private.h" int __elf_phdr_match_addr(struct dl_phdr_info *phdr_info, void *addr) @@ -51,9 +52,8 @@ __elf_phdr_match_addr(struct dl_phdr_inf return (i != phdr_info->dlpi_phnum); } -#pragma weak __pthread_map_stacks_exec void -__pthread_map_stacks_exec(void) +__libc_map_stacks_exec(void) { int mib[2]; struct rlimit rlim; @@ -72,3 +72,10 @@ __pthread_map_stacks_exec(void) rlim.rlim_cur, _rtld_get_stack_prot()); } +#pragma weak __pthread_map_stacks_exec +void +__pthread_map_stacks_exec(void) +{ + + ((void (*)(void))__libc_interposing[INTERPOS_map_stacks_exec])(); +} Modified: stable/10/lib/libc/include/libc_private.h ============================================================================== --- stable/10/lib/libc/include/libc_private.h Sat Mar 12 17:28:30 2016 (r296731) +++ stable/10/lib/libc/include/libc_private.h Sat Mar 12 17:33:40 2016 (r296732) @@ -224,6 +224,7 @@ enum { INTERPOS_kevent, INTERPOS_wait6, INTERPOS_ppoll, + INTERPOS_map_stacks_exec, INTERPOS_MAX }; @@ -390,6 +391,7 @@ int _elf_aux_info(int aux, void *buf, in struct dl_phdr_info; int __elf_phdr_match_addr(struct dl_phdr_info *, void *); void __init_elf_aux_vector(void); +void __libc_map_stacks_exec(); void _pthread_cancel_enter(int); void _pthread_cancel_leave(int); Modified: stable/10/lib/libc/sys/interposing_table.c ============================================================================== --- stable/10/lib/libc/sys/interposing_table.c Sat Mar 12 17:28:30 2016 (r296731) +++ stable/10/lib/libc/sys/interposing_table.c Sat Mar 12 17:33:40 2016 (r296732) @@ -78,6 +78,7 @@ interpos_func_t __libc_interposing[INTER SLOT(kevent, __sys_kevent), SLOT(wait6, __sys_wait6), SLOT(ppoll, __sys_ppoll), + SLOT(map_stacks_exec, __libc_map_stacks_exec), }; #undef SLOT Modified: stable/10/lib/libthr/pthread.map ============================================================================== --- stable/10/lib/libthr/pthread.map Sat Mar 12 17:28:30 2016 (r296731) +++ stable/10/lib/libthr/pthread.map Sat Mar 12 17:33:40 2016 (r296732) @@ -295,8 +295,6 @@ FBSDprivate_1.0 { _thread_size_key; _thread_state_running; _thread_state_zoombie; - - __pthread_map_stacks_exec; }; FBSD_1.1 { Modified: stable/10/lib/libthr/thread/thr_private.h ============================================================================== --- stable/10/lib/libthr/thread/thr_private.h Sat Mar 12 17:28:30 2016 (r296731) +++ stable/10/lib/libthr/thread/thr_private.h Sat Mar 12 17:33:40 2016 (r296732) @@ -928,6 +928,8 @@ int __thr_sigwait(const sigset_t *set, i int __thr_sigwaitinfo(const sigset_t *set, siginfo_t *info); int __thr_swapcontext(ucontext_t *oucp, const ucontext_t *ucp); +void __thr_map_stacks_exec(void); + struct _spinlock; void __thr_spinunlock(struct _spinlock *lck); void __thr_spinlock(struct _spinlock *lck); Modified: stable/10/lib/libthr/thread/thr_stack.c ============================================================================== --- stable/10/lib/libthr/thread/thr_stack.c Sat Mar 12 17:28:30 2016 (r296731) +++ stable/10/lib/libthr/thread/thr_stack.c Sat Mar 12 17:33:40 2016 (r296732) @@ -161,9 +161,8 @@ singlethread_map_stacks_exec(void) rlim.rlim_cur, _rtld_get_stack_prot()); } -void __pthread_map_stacks_exec(void); void -__pthread_map_stacks_exec(void) +__thr_map_stacks_exec(void) { struct pthread *curthread, *thrd; struct stack *st; Modified: stable/10/lib/libthr/thread/thr_syscalls.c ============================================================================== --- stable/10/lib/libthr/thread/thr_syscalls.c Sat Mar 12 17:28:30 2016 (r296731) +++ stable/10/lib/libthr/thread/thr_syscalls.c Sat Mar 12 17:33:40 2016 (r296732) @@ -664,6 +664,7 @@ __thr_interpose_libc(void) SLOT(kevent); SLOT(wait6); SLOT(ppoll); + SLOT(map_stacks_exec); #undef SLOT *(__libc_interposing_slot( INTERPOS__pthread_mutex_init_calloc_cb)) = From owner-svn-src-stable-10@freebsd.org Sat Mar 12 18:36:14 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 951D5ACEDD8; Sat, 12 Mar 2016 18:36:14 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 62B97B25; Sat, 12 Mar 2016 18:36:14 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CIaDjW063756; Sat, 12 Mar 2016 18:36:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CIaDTV063755; Sat, 12 Mar 2016 18:36:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603121836.u2CIaDTV063755@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 12 Mar 2016 18:36: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: r296733 - stable/10/contrib/smbfs/smbutil 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 18:36:14 -0000 Author: ngie Date: Sat Mar 12 18:36:13 2016 New Revision: 296733 URL: https://svnweb.freebsd.org/changeset/base/296733 Log: MFC r295118: Add #include to mute warning from clang/gcc about implicitly declaring strcmp(3) Modified: stable/10/contrib/smbfs/smbutil/print.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/smbfs/smbutil/print.c ============================================================================== --- stable/10/contrib/smbfs/smbutil/print.c Sat Mar 12 17:33:40 2016 (r296732) +++ stable/10/contrib/smbfs/smbutil/print.c Sat Mar 12 18:36:13 2016 (r296733) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include From owner-svn-src-stable-10@freebsd.org Sat Mar 12 18:40:53 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 284C7ACEFAA; Sat, 12 Mar 2016 18:40:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E9DA2CB; Sat, 12 Mar 2016 18:40:52 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CIepRJ064086; Sat, 12 Mar 2016 18:40:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CIepol064085; Sat, 12 Mar 2016 18:40:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603121840.u2CIepol064085@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 12 Mar 2016 18:40:51 +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: r296736 - stable/10/sbin/rcorder 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 18:40:53 -0000 Author: ngie Date: Sat Mar 12 18:40:51 2016 New Revision: 296736 URL: https://svnweb.freebsd.org/changeset/base/296736 Log: MFC r295119: Remove `r_tmp` to fix a -Wunused-but-set-variable warning with gcc 4.9 Modified: stable/10/sbin/rcorder/rcorder.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/rcorder/rcorder.c ============================================================================== --- stable/10/sbin/rcorder/rcorder.c Sat Mar 12 18:38:51 2016 (r296735) +++ stable/10/sbin/rcorder/rcorder.c Sat Mar 12 18:40:51 2016 (r296736) @@ -701,7 +701,7 @@ keep_ok(filenode *fnode) static void do_file(filenode *fnode) { - f_reqnode *r, *r_tmp; + f_reqnode *r; f_provnode *p, *p_tmp; provnode *pnode; int was_set; @@ -728,13 +728,8 @@ do_file(filenode *fnode) */ r = fnode->req_list; while (r != NULL) { - r_tmp = r; satisfy_req(r, fnode->filename); r = r->next; -#if 0 - if (was_set == 0) - free(r_tmp); -#endif } fnode->req_list = NULL; From owner-svn-src-stable-10@freebsd.org Sat Mar 12 18:51:39 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0CC4ACC3C9; Sat, 12 Mar 2016 18:51:39 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7D86AB38; Sat, 12 Mar 2016 18:51:39 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CIpcFe069178; Sat, 12 Mar 2016 18:51:38 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CIpc5t069177; Sat, 12 Mar 2016 18:51:38 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121851.u2CIpc5t069177@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 18:51:38 +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: r296739 - stable/10/share/mk 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 18:51:39 -0000 Author: bdrewery Date: Sat Mar 12 18:51:38 2016 New Revision: 296739 URL: https://svnweb.freebsd.org/changeset/base/296739 Log: MFC r295976: PROGS: Only recurse on called targets like done for SUBDIR in r291635. Modified: stable/10/share/mk/bsd.progs.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.progs.mk ============================================================================== --- stable/10/share/mk/bsd.progs.mk Sat Mar 12 18:47:28 2016 (r296738) +++ stable/10/share/mk/bsd.progs.mk Sat Mar 12 18:51:38 2016 (r296739) @@ -144,6 +144,8 @@ $p.$t: .PHONY .MAKE # Depend main pseudo targets on all PROG.pseudo targets too. .for t in ${PROGS_TARGETS:O:u} +.if make(${t}) $t: ${PROGS:%=%.$t} +.endif .endfor .endif # !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG) From owner-svn-src-stable-10@freebsd.org Sat Mar 12 18:54:03 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCF16ACC5C9; Sat, 12 Mar 2016 18:54:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 89CA9DFB; Sat, 12 Mar 2016 18:54:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CIs2fH069930; Sat, 12 Mar 2016 18:54:02 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CIs2LI069928; Sat, 12 Mar 2016 18:54:02 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121854.u2CIs2LI069928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 18:54:02 +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: r296740 - in stable/10/usr.bin: mkcsmapper_static mkesdb_static 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 18:54:03 -0000 Author: bdrewery Date: Sat Mar 12 18:54:02 2016 New Revision: 296740 URL: https://svnweb.freebsd.org/changeset/base/296740 Log: MFC r295977: Properly fix these builds by adding NO_WMISSING_VARIABLE_DECLARATIONS from r249657. Modified: stable/10/usr.bin/mkcsmapper_static/Makefile stable/10/usr.bin/mkesdb_static/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/mkcsmapper_static/Makefile ============================================================================== --- stable/10/usr.bin/mkcsmapper_static/Makefile Sat Mar 12 18:51:38 2016 (r296739) +++ stable/10/usr.bin/mkcsmapper_static/Makefile Sat Mar 12 18:54:02 2016 (r296740) @@ -7,6 +7,7 @@ SRCS= citrus_bcs.c citrus_db_factory.c c citrus_lookup_factory.c citrus_pivot_factory.c MAN= NO_SHARED= yes +NO_WMISSING_VARIABLE_DECLARATIONS= build-tools: mkcsmapper_static Modified: stable/10/usr.bin/mkesdb_static/Makefile ============================================================================== --- stable/10/usr.bin/mkesdb_static/Makefile Sat Mar 12 18:51:38 2016 (r296739) +++ stable/10/usr.bin/mkesdb_static/Makefile Sat Mar 12 18:54:02 2016 (r296740) @@ -7,6 +7,7 @@ SRCS= citrus_bcs.c citrus_db_factory.c c citrus_lookup_factory.c MAN= NO_SHARED= yes +NO_WMISSING_VARIABLE_DECLARATIONS= build-tools: mkesdb_static From owner-svn-src-stable-10@freebsd.org Sat Mar 12 18:55:18 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B39FACC6C1; Sat, 12 Mar 2016 18:55:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D04B3F7C; Sat, 12 Mar 2016 18:55:17 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CItGIm070053; Sat, 12 Mar 2016 18:55:16 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CItGVK070052; Sat, 12 Mar 2016 18:55:16 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121855.u2CItGVK070052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 18:55:16 +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: r296741 - stable/10 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 18:55:18 -0000 Author: bdrewery Date: Sat Mar 12 18:55:16 2016 New Revision: 296741 URL: https://svnweb.freebsd.org/changeset/base/296741 Log: MFC r295980: Support a WANT_MAKE_VERSION. Modified: stable/10/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/Makefile ============================================================================== --- stable/10/Makefile Sat Mar 12 18:54:02 2016 (r296740) +++ stable/10/Makefile Sat Mar 12 18:55:16 2016 (r296741) @@ -331,11 +331,9 @@ kernel: buildkernel installkernel # Perform a few tests to determine if the installed tools are adequate # for building the world. # -# Note: if we ever need to care about the version of bmake, simply testing -# MAKE_VERSION against a required version should suffice. -# upgrade_checks: -.if ${HAVE_MAKE} != ${WANT_MAKE} +.if ${HAVE_MAKE} != ${WANT_MAKE} || \ + (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION}) @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,}) .elif ${WANT_MAKE} == "fmake" @if ! (cd ${.CURDIR}/tools/build/make_check && \ From owner-svn-src-stable-10@freebsd.org Sat Mar 12 18:55:50 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 203EAACC75B; Sat, 12 Mar 2016 18:55:50 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E566C17F; Sat, 12 Mar 2016 18:55:49 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CItmdM070124; Sat, 12 Mar 2016 18:55:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CItmrB070123; Sat, 12 Mar 2016 18:55:48 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603121855.u2CItmrB070123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 12 Mar 2016 18:55: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: r296742 - stable/10/sbin/swapon 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 18:55:50 -0000 Author: ngie Date: Sat Mar 12 18:55:48 2016 New Revision: 296742 URL: https://svnweb.freebsd.org/changeset/base/296742 Log: MFC r295121: Delete argsize to fix a -Wunused-but-set-variable warning with gcc 4.9 The variable isn't actually checked -- just the end result which gets returned from the function Modified: stable/10/sbin/swapon/swapon.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/swapon/swapon.c ============================================================================== --- stable/10/sbin/swapon/swapon.c Sat Mar 12 18:55:16 2016 (r296741) +++ stable/10/sbin/swapon/swapon.c Sat Mar 12 18:55:48 2016 (r296742) @@ -315,7 +315,7 @@ swap_on_geli_args(const char *mntops) const char *aalgo, *ealgo, *keylen_str, *sectorsize_str; const char *aflag, *eflag, *lflag, *sflag; char *p, *args, *token, *string, *ops; - int argsize, pagesize; + int pagesize; size_t pagesize_len; u_long ul; @@ -387,7 +387,7 @@ swap_on_geli_args(const char *mntops) sectorsize_str = p; } - argsize = asprintf(&args, "%s%s%s%s%s%s%s%s -d", + (void)asprintf(&args, "%s%s%s%s%s%s%s%s -d", aflag, aalgo, eflag, ealgo, lflag, keylen_str, sflag, sectorsize_str); From owner-svn-src-stable-10@freebsd.org Sat Mar 12 18:57:35 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD4B7ACC86E; Sat, 12 Mar 2016 18:57:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7E03131C; Sat, 12 Mar 2016 18:57:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CIvYas070260; Sat, 12 Mar 2016 18:57:34 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CIvYaY070259; Sat, 12 Mar 2016 18:57:34 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121857.u2CIvYaY070259@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 18:57:34 +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: r296743 - stable/10/share/mk 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 18:57:35 -0000 Author: bdrewery Date: Sat Mar 12 18:57:34 2016 New Revision: 296743 URL: https://svnweb.freebsd.org/changeset/base/296743 Log: MFC r295994,r296000: r295994: PROGS: Remove the 'build one' optimization since it breaks 'build multiple' r296000: PROGS: Only the main process will install INCS. Modified: stable/10/share/mk/bsd.progs.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.progs.mk ============================================================================== --- stable/10/share/mk/bsd.progs.mk Sat Mar 12 18:55:48 2016 (r296742) +++ stable/10/share/mk/bsd.progs.mk Sat Mar 12 18:57:34 2016 (r296743) @@ -31,18 +31,6 @@ UPDATE_DEPENDFILE_PROG = ${PROGS:[1]} UPDATE_DEPENDFILE_PROG?= no .endif -.ifndef PROG -# They may have asked us to build just one -.for t in ${PROGS} -.if make($t) -.if ${PROGS_CXX:U:M${t}} -PROG_CXX ?= $t -.endif -PROG ?= $t -.endif -.endfor -.endif - .if defined(PROG) # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \ @@ -82,7 +70,7 @@ UPDATE_DEPENDFILE = NO # These are handled by the main make process. .ifdef _RECURSING_PROGS -_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS SCRIPTS +_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS INCSGROUPS SCRIPTS .for v in ${_PROGS_GLOBAL_VARS} $v = .endfor From owner-svn-src-stable-10@freebsd.org Sat Mar 12 18:59:05 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61FC7ACC966; Sat, 12 Mar 2016 18:59:05 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 23C766DD; Sat, 12 Mar 2016 18:59:05 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CIx4Xr070393; Sat, 12 Mar 2016 18:59:04 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CIx4Rr070392; Sat, 12 Mar 2016 18:59:04 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121859.u2CIx4Rr070392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 18:59: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: r296744 - stable/10/gnu/lib/libgcc 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 18:59:05 -0000 Author: bdrewery Date: Sat Mar 12 18:59:03 2016 New Revision: 296744 URL: https://svnweb.freebsd.org/changeset/base/296744 Log: MFC r296002,r296012: r296002: Don't hide AR command as bsd.lib.mk's r283925 changed as well. r296012: OBJS and POBJS have not been used since r215127. Modified: stable/10/gnu/lib/libgcc/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/gnu/lib/libgcc/Makefile ============================================================================== --- stable/10/gnu/lib/libgcc/Makefile Sat Mar 12 18:57:34 2016 (r296743) +++ stable/10/gnu/lib/libgcc/Makefile Sat Mar 12 18:59:03 2016 (r296744) @@ -31,7 +31,7 @@ LDFLAGS+= -nodefaultlibs DPADD+= ${LIBC} LDADD+= -lc -OBJS= # added to below in various ways depending on TARGET_CPUARCH +SOBJS= # added to below in various ways depending on TARGET_CPUARCH #--------------------------------------------------------------------------- # @@ -227,7 +227,7 @@ OBJ_GRPS += FPBIT DPBIT ${T}_OBJS_T = ${${T}_FUNCS:S/$/.o/} ${T}_OBJS_P = ${${T}_FUNCS:S/$/.po/} ${T}_OBJS_S = ${${T}_FUNCS:S/$/.So/} -OBJS += ${${T}_FUNCS:S/$/.o/} +SOBJS += ${${T}_FUNCS:S/$/.So/} ${${T}_OBJS_T}: ${${T}_CFILE} ${COMMONHDRS} ${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} @@ -242,9 +242,7 @@ ${${T}_OBJS_S}: ${${T}_CFILE} ${COMMONHD # Extra objects coming from separate files # .if !empty(LIB2ADD) -OBJS += ${LIB2ADD:R:S/$/.o/} SOBJS += ${LIB2ADD:R:S/$/.So/} -POBJS += ${LIB2ADD:R:S/$/.po/} .endif #----------------------------------------------------------------------- @@ -270,7 +268,7 @@ ASM_T = ${LIB1ASMFUNCS:S/$/.o/} ASM_P = ${LIB1ASMFUNCS:S/$/.po/} ASM_S = ${LIB1ASMFUNCS:S/$/.So/} ASM_V = ${LIB1ASMFUNCS:S/$/.vis/} -OBJS += ${LIB1ASMFUNCS:S/$/.o/} +SOBJS += ${LIB1ASMFUNCS:S/$/.So/} ${ASM_T}: ${LIB1ASMSRC} ${.PREFIX}.vis ${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \ @@ -335,7 +333,7 @@ SHLIB_MAPFILES += ${GCCDIR}/config/arm/ .endif VERSION_MAP = libgcc.map -libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS} ${OBJS:R:S/$/.So/} +libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS} ( ${NM} -pg ${SOBJS};echo %% ; \ cat ${SHLIB_MAPFILES} \ | sed -e '/^[ ]*#/d' \ @@ -352,7 +350,7 @@ CLEANFILES += libgcc.map libgcc_eh.a: ${EH_OBJS_T} @${ECHO} building static gcc_eh library @rm -f ${.TARGET} - @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` + ${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` ${RANLIB} ${RANLIBFLAGS} ${.TARGET} all: libgcc_eh.a @@ -361,7 +359,7 @@ all: libgcc_eh.a libgcc_eh_p.a: ${EH_OBJS_P} @${ECHO} building profiled gcc_eh library @rm -f ${.TARGET} - @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` + ${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` ${RANLIB} ${RANLIBFLAGS} ${.TARGET} all: libgcc_eh_p.a .endif From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:00:44 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C054ACCA61; Sat, 12 Mar 2016 19:00:44 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DD8B3A0C; Sat, 12 Mar 2016 19:00:43 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJ0gpn070576; Sat, 12 Mar 2016 19:00:42 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJ0gif070575; Sat, 12 Mar 2016 19:00:42 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603121900.u2CJ0gif070575@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 12 Mar 2016 19:00: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: r296746 - stable/10/tests/sys/acl 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:00:44 -0000 Author: ngie Date: Sat Mar 12 19:00:42 2016 New Revision: 296746 URL: https://svnweb.freebsd.org/changeset/base/296746 Log: MFC r295341,r295345: r295341: Require /bin/getfacl and /bin/setfacl when running the acl tests For cases where these utilities aren't installed, the tests would fail today in a non-intuitive manner on sub-testcase #3 in each of the test scripts r295345: Use basenames for getfacl, setfacl, and zpool to work around the fact that Jenkins hardcodes image sizes to 2GB with the FreeBSD_HEAD job This is to stop the unnecessary failure emails because we've gone over the 2GB limit Modified: stable/10/tests/sys/acl/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/tests/sys/acl/Makefile ============================================================================== --- stable/10/tests/sys/acl/Makefile Sat Mar 12 18:59:56 2016 (r296745) +++ stable/10/tests/sys/acl/Makefile Sat Mar 12 19:00:42 2016 (r296746) @@ -22,8 +22,14 @@ TAP_TESTS_SH+= 04 TEST_METADATA.$t+= required_user="root" .endfor +_ACL_PROGS= getfacl setfacl + .for t in 01 03 04 -TEST_METADATA.$t+= required_programs="/sbin/zpool" +TEST_METADATA.$t+= required_programs="zpool ${_ACL_PROGS}" +.endfor + +.for t in 00 02 +TEST_METADATA.$t+= required_programs="${_ACL_PROGS}" .endfor .include From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:02:21 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5EDF4ACCC79; Sat, 12 Mar 2016 19:02:21 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2FF43EA6; Sat, 12 Mar 2016 19:02:21 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJ2Keb073342; Sat, 12 Mar 2016 19:02:20 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJ2KPO073341; Sat, 12 Mar 2016 19:02:20 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121902.u2CJ2KPO073341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:02: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: r296748 - stable/10 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:02:21 -0000 Author: bdrewery Date: Sat Mar 12 19:02:20 2016 New Revision: 296748 URL: https://svnweb.freebsd.org/changeset/base/296748 Log: MFC r295161,r296014: r295161: Add order for installworld/distribution. r296014: Add order for installworld/installkernel. Modified: stable/10/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/Makefile ============================================================================== --- stable/10/Makefile Sat Mar 12 19:01:45 2016 (r296747) +++ stable/10/Makefile Sat Mar 12 19:02:20 2016 (r296748) @@ -123,6 +123,8 @@ TGTS+= ${BITGTS} .ORDER: buildworld installworld .ORDER: buildworld distributeworld .ORDER: buildworld buildkernel +.ORDER: installworld distribution +.ORDER: installworld installkernel .ORDER: buildkernel installkernel .ORDER: buildkernel installkernel.debug .ORDER: buildkernel reinstallkernel From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:05:50 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB6DDACCDCE; Sat, 12 Mar 2016 19:05:50 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 95ECA369; Sat, 12 Mar 2016 19:05:50 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJ5nHv073736; Sat, 12 Mar 2016 19:05:49 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJ5nMU073735; Sat, 12 Mar 2016 19:05:49 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603121905.u2CJ5nMU073735@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 12 Mar 2016 19:05:49 +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: r296750 - stable/10/contrib/netbsd-tests/lib/libc/sys 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:05:50 -0000 Author: ngie Date: Sat Mar 12 19:05:49 2016 New Revision: 296750 URL: https://svnweb.freebsd.org/changeset/base/296750 Log: MFC r294894: Adjust vm.max_wired in order to avoid hitting EAGAIN artificially Set vm.max_wired to INT_MAX in :mlock_err, :mlock_mmap, and :mlock_nested to avoid hitting EAGAIN artificially on the system when running the tests Require root privileges in order to set the sysctl Add allow_sysctl_side_effects to require.config as this test is now adjusting sysctls that can affect the global system state Unlike the version submitted by cem in OneFS, this version uses a scratch file to save/restore the previous value of the sysctl. I _really_, _really_ wish there were better hooks in atf/kyua for per test suite setup/teardown -- using a file is kludgy, but it's the best I can do to avoid situations where (for instance), sysctl(3) may fail and drop a core outside the kyua sandbox. Based on a patch submitted by cem, but modified to take business logic out of ATF_TP_ADD_TCS(3). Modified: stable/10/contrib/netbsd-tests/lib/libc/sys/t_mlock.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/netbsd-tests/lib/libc/sys/t_mlock.c ============================================================================== --- stable/10/contrib/netbsd-tests/lib/libc/sys/t_mlock.c Sat Mar 12 19:05:41 2016 (r296749) +++ stable/10/contrib/netbsd-tests/lib/libc/sys/t_mlock.c Sat Mar 12 19:05:49 2016 (r296750) @@ -47,12 +47,89 @@ __RCSID("$NetBSD: t_mlock.c,v 1.5 2014/0 #include #ifdef __FreeBSD__ +#include #define _KMEMUSER #include #endif static long page = 0; +#ifdef __FreeBSD__ +#define VM_MAX_WIRED "vm.max_wired" + +static void +vm_max_wired_sysctl(int *old_value, int *new_value) +{ + size_t old_len; + size_t new_len = (new_value == NULL ? 0 : sizeof(int)); + + if (old_value == NULL) + printf("Setting the new value to %d\n", *new_value); + else { + ATF_REQUIRE_MSG(sysctlbyname(VM_MAX_WIRED, NULL, &old_len, + new_value, new_len) == 0, + "sysctlbyname(%s) failed: %s", VM_MAX_WIRED, strerror(errno)); + } + + ATF_REQUIRE_MSG(sysctlbyname(VM_MAX_WIRED, old_value, &old_len, + new_value, new_len) == 0, + "sysctlbyname(%s) failed: %s", VM_MAX_WIRED, strerror(errno)); + + if (old_value != NULL) + printf("Saved the old value (%d)\n", *old_value); +} + +static void +set_vm_max_wired(int new_value) +{ + FILE *fp; + int old_value; + + fp = fopen(VM_MAX_WIRED, "w"); + if (fp == NULL) { + atf_tc_skip("could not open %s for writing: %s", + VM_MAX_WIRED, strerror(errno)); + return; + } + + vm_max_wired_sysctl(&old_value, NULL); + + ATF_REQUIRE_MSG(fprintf(fp, "%d", old_value) > 0, + "saving %s failed", VM_MAX_WIRED); + + fclose(fp); + + vm_max_wired_sysctl(NULL, &new_value); +} + +static void +restore_vm_max_wired(void) +{ + FILE *fp; + int saved_max_wired; + + fp = fopen(VM_MAX_WIRED, "r"); + if (fp == NULL) { + perror("fopen failed\n"); + return; + } + + if (fscanf(fp, "%d", &saved_max_wired) != 1) { + perror("fscanf failed\n"); + fclose(fp); + return; + } + + fclose(fp); + printf("old value in %s: %d\n", VM_MAX_WIRED, saved_max_wired); + + if (saved_max_wired == 0) /* This will cripple the test host */ + return; + + vm_max_wired_sysctl(NULL, &saved_max_wired); +} +#endif + ATF_TC(mlock_clip); ATF_TC_HEAD(mlock_clip, tc) { @@ -78,11 +155,19 @@ ATF_TC_BODY(mlock_clip, tc) free(buf); } +#ifdef __FreeBSD__ +ATF_TC_WITH_CLEANUP(mlock_err); +#else ATF_TC(mlock_err); +#endif ATF_TC_HEAD(mlock_err, tc) { atf_tc_set_md_var(tc, "descr", "Test error conditions in mlock(2) and munlock(2)"); +#ifdef __FreeBSD__ + atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects"); + atf_tc_set_md_var(tc, "require.user", "root"); +#endif } ATF_TC_BODY(mlock_err, tc) @@ -99,6 +184,8 @@ ATF_TC_BODY(mlock_err, tc) if ((uintptr_t)VM_MIN_ADDRESS > 0) null_errno = EINVAL; /* NULL is not inside user VM */ #endif + /* Set max_wired really really high to avoid EAGAIN */ + set_vm_max_wired(INT_MAX); #else if (sysctlbyname("vm.minaddress", &vmin, &len, NULL, 0) != 0) atf_tc_fail("failed to read vm.minaddress"); @@ -139,6 +226,14 @@ ATF_TC_BODY(mlock_err, tc) ATF_REQUIRE_ERRNO(ENOMEM, munlock(invalid_ptr, page) == -1); } +#ifdef __FreeBSD__ +ATF_TC_CLEANUP(mlock_err, tc) +{ + + restore_vm_max_wired(); +} +#endif + ATF_TC(mlock_limits); ATF_TC_HEAD(mlock_limits, tc) { @@ -200,10 +295,18 @@ ATF_TC_BODY(mlock_limits, tc) free(buf); } +#ifdef __FreeBSD__ +ATF_TC_WITH_CLEANUP(mlock_mmap); +#else ATF_TC(mlock_mmap); +#endif ATF_TC_HEAD(mlock_mmap, tc) { atf_tc_set_md_var(tc, "descr", "Test mlock(2)-mmap(2) interaction"); +#ifdef __FreeBSD__ + atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects"); + atf_tc_set_md_var(tc, "require.user", "root"); +#endif } ATF_TC_BODY(mlock_mmap, tc) @@ -215,6 +318,11 @@ ATF_TC_BODY(mlock_mmap, tc) #endif void *buf; +#ifdef __FreeBSD__ + /* Set max_wired really really high to avoid EAGAIN */ + set_vm_max_wired(INT_MAX); +#endif + /* * Make a wired RW mapping and check that mlock(2) * does not fail for the (already locked) mapping. @@ -248,11 +356,27 @@ ATF_TC_BODY(mlock_mmap, tc) ATF_REQUIRE(munmap(buf, page) == 0); } +#ifdef __FreeBSD__ +ATF_TC_CLEANUP(mlock_mmap, tc) +{ + + restore_vm_max_wired(); +} +#endif + +#ifdef __FreeBSD__ +ATF_TC_WITH_CLEANUP(mlock_nested); +#else ATF_TC(mlock_nested); +#endif ATF_TC_HEAD(mlock_nested, tc) { atf_tc_set_md_var(tc, "descr", "Test that consecutive mlock(2) calls succeed"); +#ifdef __FreeBSD__ + atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects"); + atf_tc_set_md_var(tc, "require.user", "root"); +#endif } ATF_TC_BODY(mlock_nested, tc) @@ -260,6 +384,11 @@ ATF_TC_BODY(mlock_nested, tc) const size_t maxiter = 100; void *buf; +#ifdef __FreeBSD__ + /* Set max_wired really really high to avoid EAGAIN */ + set_vm_max_wired(INT_MAX); +#endif + buf = malloc(page); ATF_REQUIRE(buf != NULL); @@ -270,6 +399,14 @@ ATF_TC_BODY(mlock_nested, tc) free(buf); } +#ifdef __FreeBSD__ +ATF_TC_CLEANUP(mlock_nested, tc) +{ + + restore_vm_max_wired(); +} +#endif + ATF_TP_ADD_TCS(tp) { From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:07:23 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EF8BACCF0F; Sat, 12 Mar 2016 19:07:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C66B688B; Sat, 12 Mar 2016 19:07:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJ7LVa073908; Sat, 12 Mar 2016 19:07:21 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJ7LcM073904; Sat, 12 Mar 2016 19:07:21 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121907.u2CJ7LcM073904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:07: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: r296752 - in stable/10: share/man/man4 sys/dev/filemon 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:07:23 -0000 Author: bdrewery Date: Sat Mar 12 19:07:21 2016 New Revision: 296752 URL: https://svnweb.freebsd.org/changeset/base/296752 Log: MFC r296286,r296470,r296472,r296473,r296575: r296286: Remove filemon->lock wrappers. r296470: Only call bwillwrite() for logging to vnodes, as other fo_write() calls do. r296472: Require kldunload -f to unload. r296473: Add missing break for r296472. r296575: FILEMON_SET_FD: Disallow changing the fd. Modified: stable/10/share/man/man4/filemon.4 stable/10/sys/dev/filemon/filemon.c stable/10/sys/dev/filemon/filemon_lock.c stable/10/sys/dev/filemon/filemon_wrapper.c Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/filemon.4 ============================================================================== --- stable/10/share/man/man4/filemon.4 Sat Mar 12 19:07:08 2016 (r296751) +++ stable/10/share/man/man4/filemon.4 Sat Mar 12 19:07:21 2016 (r296752) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 28, 2016 +.Dd March 9, 2016 .Dt FILEMON 4 .Os .Sh NAME @@ -125,6 +125,19 @@ function returns the value 0 if successf otherwise the value \-1 is returned and the global variable .Va errno is set to indicate the error. +.Sh ERRORS +The +.Fn ioctl +system call +with +.Dv FILEMON_SET_FD +will fail if: +.Bl -tag -width Er +.It Bq Er EEXIST +The +.Nm +handle is already associated with a file descriptor. +.El .Sh FILES .Bl -tag -width ".Pa /dev/filemon" .It Pa /dev/filemon @@ -193,3 +206,6 @@ Only children of the set process are log Processes can escape being traced by double forking. This is not seen as a problem as the intended use is build monitoring, which does not make sense to have daemons for. +.Pp +Unloading the module may panic the system, thus requires using +.Ic kldunload -f . Modified: stable/10/sys/dev/filemon/filemon.c ============================================================================== --- stable/10/sys/dev/filemon/filemon.c Sat Mar 12 19:07:08 2016 (r296751) +++ stable/10/sys/dev/filemon/filemon.c Sat Mar 12 19:07:21 2016 (r296752) @@ -71,8 +71,6 @@ extern struct sysentvec elf64_freebsd_sy static d_close_t filemon_close; static d_ioctl_t filemon_ioctl; static d_open_t filemon_open; -static int filemon_unload(void); -static void filemon_load(void *); static struct cdevsw filemon_cdevsw = { .d_version = D_VERSION, @@ -130,7 +128,7 @@ filemon_dtr(void *data) /* Follow same locking order as filemon_pid_check. */ filemon_lock_write(); - filemon_filemon_lock(filemon); + sx_xlock(&filemon->lock); /* Remove from the in-use list. */ TAILQ_REMOVE(&filemons_inuse, filemon, link); @@ -143,7 +141,7 @@ filemon_dtr(void *data) TAILQ_INSERT_TAIL(&filemons_free, filemon, link); /* Give up write access. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); filemon_unlock_write(); if (fp != NULL) @@ -165,13 +163,15 @@ filemon_ioctl(struct cdev *dev, u_long c if ((error = devfs_get_cdevpriv((void **) &filemon)) != 0) return (error); - filemon_filemon_lock(filemon); + sx_xlock(&filemon->lock); switch (cmd) { /* Set the output file descriptor. */ case FILEMON_SET_FD: - if (filemon->fp != NULL) - fdrop(filemon->fp, td); + if (filemon->fp != NULL) { + error = EEXIST; + break; + } error = fget_write(td, *(int *)data, #if __FreeBSD_version >= 900041 @@ -198,7 +198,7 @@ filemon_ioctl(struct cdev *dev, u_long c break; } - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); return (error); } @@ -308,6 +308,14 @@ filemon_modevent(module_t mod __unused, error = filemon_unload(); break; + case MOD_QUIESCE: + /* + * The wrapper implementation is unsafe for reliable unload. + * Require forcing an unload. + */ + error = EBUSY; + break; + case MOD_SHUTDOWN: break; Modified: stable/10/sys/dev/filemon/filemon_lock.c ============================================================================== --- stable/10/sys/dev/filemon/filemon_lock.c Sat Mar 12 19:07:08 2016 (r296751) +++ stable/10/sys/dev/filemon/filemon_lock.c Sat Mar 12 19:07:21 2016 (r296752) @@ -29,20 +29,6 @@ __FBSDID("$FreeBSD$"); static __inline void -filemon_filemon_lock(struct filemon *filemon) -{ - - sx_xlock(&filemon->lock); -} - -static __inline void -filemon_filemon_unlock(struct filemon *filemon) -{ - - sx_xunlock(&filemon->lock); -} - -static __inline void filemon_lock_read(void) { Modified: stable/10/sys/dev/filemon/filemon_wrapper.c ============================================================================== --- stable/10/sys/dev/filemon/filemon_wrapper.c Sat Mar 12 19:07:08 2016 (r296751) +++ stable/10/sys/dev/filemon/filemon_wrapper.c Sat Mar 12 19:07:21 2016 (r296752) @@ -80,7 +80,8 @@ filemon_output(struct filemon *filemon, auio.uio_td = curthread; auio.uio_offset = (off_t) -1; - bwillwrite(); + if (filemon->fp->f_type == DTYPE_VNODE) + bwillwrite(); fo_write(filemon->fp, &auio, curthread->td_ucred, 0, curthread); } @@ -100,7 +101,7 @@ filemon_pid_check(struct proc *p) TAILQ_FOREACH(filemon, &filemons_inuse, link) { if (p == filemon->p) { sx_sunlock(&proctree_lock); - filemon_filemon_lock(filemon); + sx_xlock(&filemon->lock); filemon_unlock_read(); return (filemon); } @@ -131,8 +132,7 @@ filemon_wrapper_chdir(struct thread *td, filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -160,8 +160,7 @@ filemon_event_process_exec(void *arg __u filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); free(freepath, M_TEMP); } @@ -199,8 +198,7 @@ filemon_wrapper_open(struct thread *td, curproc->p_pid, filemon->fname1); filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -252,8 +250,7 @@ filemon_wrapper_openat(struct thread *td curproc->p_pid, filemon->fname2, filemon->fname1); filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -281,8 +278,7 @@ filemon_wrapper_rename(struct thread *td filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -310,8 +306,7 @@ filemon_wrapper_link(struct thread *td, filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -339,8 +334,7 @@ filemon_wrapper_symlink(struct thread *t filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -369,8 +363,7 @@ filemon_wrapper_linkat(struct thread *td filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -397,8 +390,7 @@ filemon_wrapper_stat(struct thread *td, filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -426,8 +418,7 @@ filemon_wrapper_freebsd32_stat(struct th filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -462,8 +453,7 @@ filemon_event_process_exit(void *arg __u filemon->p = NULL; } - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -486,8 +476,7 @@ filemon_wrapper_unlink(struct thread *td filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } @@ -508,8 +497,7 @@ filemon_event_process_fork(void *arg __u filemon_output(filemon, filemon->msgbufr, len); - /* Unlock the found filemon structure. */ - filemon_filemon_unlock(filemon); + sx_xunlock(&filemon->lock); } } From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:09:00 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5BD95ACD0B3; Sat, 12 Mar 2016 19:09:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2D54BCA5; Sat, 12 Mar 2016 19:09:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJ8xjZ074092; Sat, 12 Mar 2016 19:08:59 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJ8xC4074091; Sat, 12 Mar 2016 19:08:59 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121908.u2CJ8xC4074091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:08: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: r296755 - stable/10/share/man/man9 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:09:00 -0000 Author: bdrewery Date: Sat Mar 12 19:08:58 2016 New Revision: 296755 URL: https://svnweb.freebsd.org/changeset/base/296755 Log: MFC r296322: Remove self-reference to destroy_dev_drain(9). Modified: stable/10/share/man/man9/make_dev.9 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man9/make_dev.9 ============================================================================== --- stable/10/share/man/man9/make_dev.9 Sat Mar 12 19:08:46 2016 (r296754) +++ stable/10/share/man/man9/make_dev.9 Sat Mar 12 19:08:58 2016 (r296755) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Jan 3, 2016 +.Dd March 2, 2016 .Dt MAKE_DEV 9 .Os .Sh NAME @@ -460,7 +460,6 @@ flag was specified and the provided devi .Sh SEE ALSO .Xr devctl 4 , .Xr devfs 5 , -.Xr destroy_dev_drain 9 , .Xr dev_clone 9 .Sh HISTORY The From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:09:53 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3BCB5ACD17D; Sat, 12 Mar 2016 19:09:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 099E0EEA; Sat, 12 Mar 2016 19:09:52 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJ9pqm074299; Sat, 12 Mar 2016 19:09:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJ9pBM074298; Sat, 12 Mar 2016 19:09:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603121909.u2CJ9pBM074298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 12 Mar 2016 19:09:51 +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: r296756 - stable/10/libexec/atrun 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:09:53 -0000 Author: ngie Date: Sat Mar 12 19:09:51 2016 New Revision: 296756 URL: https://svnweb.freebsd.org/changeset/base/296756 Log: MFC r295079: Fix the type for hw.ncpu, so sysctlbyname doesn't consistently fail on 64-bit architectures where sizeof(int) != sizeof(size_t). PR: 206758 Modified: stable/10/libexec/atrun/atrun.c Directory Properties: stable/10/ (props changed) Modified: stable/10/libexec/atrun/atrun.c ============================================================================== --- stable/10/libexec/atrun/atrun.c Sat Mar 12 19:08:58 2016 (r296755) +++ stable/10/libexec/atrun/atrun.c Sat Mar 12 19:09:51 2016 (r296756) @@ -459,8 +459,9 @@ main(int argc, char *argv[]) int c; int run_batch; #ifdef __FreeBSD__ - size_t ncpu, ncpusz; + size_t ncpusz; double load_avg = -1; + int ncpu; #else double load_avg = LOADAVG_MX; #endif From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:12:54 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F7CDACD448; Sat, 12 Mar 2016 19:12:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D4CC513E4; Sat, 12 Mar 2016 19:12:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJCq6r077295; Sat, 12 Mar 2016 19:12:52 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJCq9J077294; Sat, 12 Mar 2016 19:12:52 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121912.u2CJCq9J077294@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:12: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: r296758 - stable/10/share/mk 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:12:54 -0000 Author: bdrewery Date: Sat Mar 12 19:12:52 2016 New Revision: 296758 URL: https://svnweb.freebsd.org/changeset/base/296758 Log: MFC r296122: (partial) Move PROGS logic to proper place and remove redundant and unneeded logic. Modified: stable/10/share/mk/bsd.test.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.test.mk ============================================================================== --- stable/10/share/mk/bsd.test.mk Sat Mar 12 19:11:45 2016 (r296757) +++ stable/10/share/mk/bsd.test.mk Sat Mar 12 19:12:52 2016 (r296758) @@ -101,9 +101,4 @@ test: beforetest realtest test: aftertest .endif -.if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS) .include -.endif -.include - -.include From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:14:23 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45F42ACD55B; Sat, 12 Mar 2016 19:14:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 17587162E; Sat, 12 Mar 2016 19:14:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJEMtg077387; Sat, 12 Mar 2016 19:14:22 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJEMFt077386; Sat, 12 Mar 2016 19:14:22 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121914.u2CJEMFt077386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:14: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: r296759 - stable/10/share/mk 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:14:23 -0000 Author: bdrewery Date: Sat Mar 12 19:14:21 2016 New Revision: 296759 URL: https://svnweb.freebsd.org/changeset/base/296759 Log: MFC r296554: Remove things set already by bsd.progs.mk. Modified: stable/10/share/mk/bsd.test.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.test.mk ============================================================================== --- stable/10/share/mk/bsd.test.mk Sat Mar 12 19:12:52 2016 (r296758) +++ stable/10/share/mk/bsd.test.mk Sat Mar 12 19:14:21 2016 (r296759) @@ -79,10 +79,6 @@ SUBDIR+= ${ts} MAN= .endif -# tell progs.mk we might want to install things -PROG_VARS+= BINDIR -PROGS_TARGETS+= install - .if !defined(NOT_FOR_TEST_SUITE) .include .endif From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:15:11 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52141ACD5F2; Sat, 12 Mar 2016 19:15:11 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 23BD218B0; Sat, 12 Mar 2016 19:15:11 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJFAqf077473; Sat, 12 Mar 2016 19:15:10 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJFAV5077472; Sat, 12 Mar 2016 19:15:10 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603121915.u2CJFAV5077472@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 12 Mar 2016 19:15: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: r296760 - stable/10/contrib/netbsd-tests/lib/libc/sys 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:15:11 -0000 Author: ngie Date: Sat Mar 12 19:15:09 2016 New Revision: 296760 URL: https://svnweb.freebsd.org/changeset/base/296760 Log: MFC r294899: Add debug output via ATF_REQUIRE_MSG when the first call to mlock(2) fails This helps identify the problem with running this test on my VM hosts (ENOMEM) Modified: stable/10/contrib/netbsd-tests/lib/libc/sys/t_mincore.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/netbsd-tests/lib/libc/sys/t_mincore.c ============================================================================== --- stable/10/contrib/netbsd-tests/lib/libc/sys/t_mincore.c Sat Mar 12 19:14:21 2016 (r296759) +++ stable/10/contrib/netbsd-tests/lib/libc/sys/t_mincore.c Sat Mar 12 19:15:09 2016 (r296760) @@ -206,7 +206,8 @@ ATF_TC_BODY(mincore_resid, tc) "might be low on memory"); #ifdef __FreeBSD__ - ATF_REQUIRE(mlock(addr, npgs * page) == 0); + ATF_REQUIRE_MSG(mlock(addr, npgs * page) == 0, "mlock failed: %s", + strerror(errno)); #endif ATF_REQUIRE(check_residency(addr, npgs) == npgs); ATF_REQUIRE(munmap(addr, npgs * page) == 0); From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:18:29 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 938E8ACD786; Sat, 12 Mar 2016 19:18:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 517C71BCA; Sat, 12 Mar 2016 19:18:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJISJp077792; Sat, 12 Mar 2016 19:18:28 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJISXm077790; Sat, 12 Mar 2016 19:18:28 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121918.u2CJISXm077790@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:18:28 +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: r296761 - stable/10/sys/dev/filemon 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:18:29 -0000 Author: bdrewery Date: Sat Mar 12 19:18:27 2016 New Revision: 296761 URL: https://svnweb.freebsd.org/changeset/base/296761 Log: MFC r296148: Remove old compatibility checks. Modified: stable/10/sys/dev/filemon/filemon.c stable/10/sys/dev/filemon/filemon_wrapper.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/filemon/filemon.c ============================================================================== --- stable/10/sys/dev/filemon/filemon.c Sat Mar 12 19:15:09 2016 (r296760) +++ stable/10/sys/dev/filemon/filemon.c Sat Mar 12 19:18:27 2016 (r296761) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -52,10 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include -#if __FreeBSD_version >= 900041 -#include -#endif - #include "filemon.h" #if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32) @@ -156,9 +153,7 @@ filemon_ioctl(struct cdev *dev, u_long c int error = 0; struct filemon *filemon; struct proc *p; -#if __FreeBSD_version >= 900041 cap_rights_t rights; -#endif if ((error = devfs_get_cdevpriv((void **) &filemon)) != 0) return (error); @@ -174,9 +169,7 @@ filemon_ioctl(struct cdev *dev, u_long c } error = fget_write(td, *(int *)data, -#if __FreeBSD_version >= 900041 cap_rights_init(&rights, CAP_PWRITE), -#endif &filemon->fp); if (error == 0) /* Write the file header. */ Modified: stable/10/sys/dev/filemon/filemon_wrapper.c ============================================================================== --- stable/10/sys/dev/filemon/filemon_wrapper.c Sat Mar 12 19:15:09 2016 (r296760) +++ stable/10/sys/dev/filemon/filemon_wrapper.c Sat Mar 12 19:18:27 2016 (r296761) @@ -36,27 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#if __FreeBSD_version > 800032 -#define FILEMON_HAS_LINKAT -#endif - -#if __FreeBSD_version < 900044 /* r225617 (2011-09-16) failed to bump - __FreeBSD_version. This really should - be based on "900045". "900044" is r225469 - (2011-09-10) so this code is broken for - 9-CURRENT September 10th-16th. */ -#define sys_chdir chdir -#define sys_link link -#define sys_open open -#define sys_rename rename -#define sys_stat stat -#define sys_symlink symlink -#define sys_unlink unlink -#ifdef FILEMON_HAS_LINKAT -#define sys_linkat linkat -#endif -#endif /* __FreeBSD_version */ - static eventhandler_tag filemon_exec_tag; static eventhandler_tag filemon_exit_tag; static eventhandler_tag filemon_fork_tag; @@ -341,7 +320,6 @@ filemon_wrapper_symlink(struct thread *t return (ret); } -#ifdef FILEMON_HAS_LINKAT static int filemon_wrapper_linkat(struct thread *td, struct linkat_args *uap) { @@ -369,7 +347,6 @@ filemon_wrapper_linkat(struct thread *td return (ret); } -#endif static int filemon_wrapper_stat(struct thread *td, struct stat_args *uap) @@ -518,9 +495,7 @@ filemon_wrapper_install(void) sv_table[SYS_unlink].sy_call = (sy_call_t *) filemon_wrapper_unlink; sv_table[SYS_link].sy_call = (sy_call_t *) filemon_wrapper_link; sv_table[SYS_symlink].sy_call = (sy_call_t *) filemon_wrapper_symlink; -#ifdef FILEMON_HAS_LINKAT sv_table[SYS_linkat].sy_call = (sy_call_t *) filemon_wrapper_linkat; -#endif #if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32) sv_table = ia32_freebsd_sysvec.sv_table; @@ -533,9 +508,7 @@ filemon_wrapper_install(void) sv_table[FREEBSD32_SYS_unlink].sy_call = (sy_call_t *) filemon_wrapper_unlink; sv_table[FREEBSD32_SYS_link].sy_call = (sy_call_t *) filemon_wrapper_link; sv_table[FREEBSD32_SYS_symlink].sy_call = (sy_call_t *) filemon_wrapper_symlink; -#ifdef FILEMON_HAS_LINKAT sv_table[FREEBSD32_SYS_linkat].sy_call = (sy_call_t *) filemon_wrapper_linkat; -#endif #endif /* COMPAT_ARCH32 */ filemon_exec_tag = EVENTHANDLER_REGISTER(process_exec, @@ -563,9 +536,7 @@ filemon_wrapper_deinstall(void) sv_table[SYS_unlink].sy_call = (sy_call_t *)sys_unlink; sv_table[SYS_link].sy_call = (sy_call_t *)sys_link; sv_table[SYS_symlink].sy_call = (sy_call_t *)sys_symlink; -#ifdef FILEMON_HAS_LINKAT sv_table[SYS_linkat].sy_call = (sy_call_t *)sys_linkat; -#endif #if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32) sv_table = ia32_freebsd_sysvec.sv_table; @@ -578,9 +549,7 @@ filemon_wrapper_deinstall(void) sv_table[FREEBSD32_SYS_unlink].sy_call = (sy_call_t *)sys_unlink; sv_table[FREEBSD32_SYS_link].sy_call = (sy_call_t *)sys_link; sv_table[FREEBSD32_SYS_symlink].sy_call = (sy_call_t *)sys_symlink; -#ifdef FILEMON_HAS_LINKAT sv_table[FREEBSD32_SYS_linkat].sy_call = (sy_call_t *)sys_linkat; -#endif #endif /* COMPAT_ARCH32 */ EVENTHANDLER_DEREGISTER(process_exec, filemon_exec_tag); From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:20:50 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A089ACD8A4; Sat, 12 Mar 2016 19:20:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 CF60D1E9D; Sat, 12 Mar 2016 19:20:49 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJKmMS080104; Sat, 12 Mar 2016 19:20:48 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJKm4H080103; Sat, 12 Mar 2016 19:20:48 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121920.u2CJKm4H080103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:20: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: r296763 - stable/10/share/mk 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:20:50 -0000 Author: bdrewery Date: Sat Mar 12 19:20:48 2016 New Revision: 296763 URL: https://svnweb.freebsd.org/changeset/base/296763 Log: MFC r294878: Revert yacc dependency back to pre-r241298. Modified: stable/10/share/mk/bsd.dep.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.dep.mk ============================================================================== --- stable/10/share/mk/bsd.dep.mk Sat Mar 12 19:18:53 2016 (r296762) +++ stable/10/share/mk/bsd.dep.mk Sat Mar 12 19:20:48 2016 (r296763) @@ -104,8 +104,8 @@ ${_YC} y.tab.h: ${_YSRC} CLEANFILES+= y.tab.c y.tab.h .elif !empty(YFLAGS:M-d) .for _YH in ${_YC:R}.h -${_YH}: ${_YC} -${_YC}: ${_YSRC} +.ORDER: ${_YC} ${_YH} +${_YC} ${_YH}: ${_YSRC} ${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC} SRCS+= ${_YH} CLEANFILES+= ${_YH} From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:22:20 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC3B2ACDA84; Sat, 12 Mar 2016 19:22:20 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 BC8D22E0; Sat, 12 Mar 2016 19:22:20 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJMJp2080890; Sat, 12 Mar 2016 19:22:19 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJMJMq080889; Sat, 12 Mar 2016 19:22:19 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121922.u2CJMJMq080889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:22:19 +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: r296764 - stable/10/share/mk 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:22:21 -0000 Author: bdrewery Date: Sat Mar 12 19:22:19 2016 New Revision: 296764 URL: https://svnweb.freebsd.org/changeset/base/296764 Log: MFC r294873: Set a value for _RECURSING_PROGS for debugging. Modified: stable/10/share/mk/bsd.progs.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.progs.mk ============================================================================== --- stable/10/share/mk/bsd.progs.mk Sat Mar 12 19:20:48 2016 (r296763) +++ stable/10/share/mk/bsd.progs.mk Sat Mar 12 19:22:19 2016 (r296764) @@ -114,7 +114,7 @@ x.$p= PROG_CXX=$p # Main PROG target $p ${p}_p: .PHONY .MAKE (cd ${.CURDIR} && \ - NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ + NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS=t \ PROG=$p \ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ ${x.$p}) @@ -123,7 +123,7 @@ $p ${p}_p: .PHONY .MAKE .for t in ${PROGS_TARGETS:O:u} $p.$t: .PHONY .MAKE (cd ${.CURDIR} && \ - NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ + NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS=t \ PROG=$p \ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ ${x.$p} ${@:E}) From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:26:22 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76226ACDBBF; Sat, 12 Mar 2016 19:26:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 436B077E; Sat, 12 Mar 2016 19:26:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJQL0N081114; Sat, 12 Mar 2016 19:26:21 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJQLUd081113; Sat, 12 Mar 2016 19:26:21 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121926.u2CJQLUd081113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:26: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: r296765 - stable/10/lib/libc/net 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:26:22 -0000 Author: bdrewery Date: Sat Mar 12 19:26:21 2016 New Revision: 296765 URL: https://svnweb.freebsd.org/changeset/base/296765 Log: MFC r268620,r294876,r294877: r268620: Make generation of nslexer.c more robust. r294876: nslexer.c does not depend on nsparser.h. r294877: Replace nslexer.l->nslexer.c custom rule with a -D CFLAG. Modified: stable/10/lib/libc/net/Makefile.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/net/Makefile.inc ============================================================================== --- stable/10/lib/libc/net/Makefile.inc Sat Mar 12 19:22:19 2016 (r296764) +++ stable/10/lib/libc/net/Makefile.inc Sat Mar 12 19:26:21 2016 (r296765) @@ -12,7 +12,7 @@ SRCS+= base64.c ether_addr.c eui64.c \ getproto.c getprotoent.c getprotoname.c getservent.c \ if_indextoname.c if_nameindex.c if_nametoindex.c \ ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \ - nsdispatch.c nslexer.c nsparser.y nss_compat.c \ + nsdispatch.c nslexer.l nsparser.y nss_compat.c \ rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \ sockatmark.c sourcefilter.c vars.c @@ -34,11 +34,8 @@ CFLAGS+=-I${.CURDIR}/resolv YFLAGS+=-p_nsyy LFLAGS+=-P_nsyy -CLEANFILES+=nslexer.c - -nslexer.c: nslexer.l nsparser.h - ${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \ - sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} +CFLAGS.nslexer.c= -DYY_BUF_SIZE=1024 +CFLAGS+= ${CFLAGS.${.IMPSRC:T}} MAN+= byteorder.3 ethers.3 eui64.3 \ getaddrinfo.3 gai_strerror.3 gethostbyname.3 \ From owner-svn-src-stable-10@freebsd.org Sat Mar 12 19:55:23 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85157ACE571; Sat, 12 Mar 2016 19:55:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 528FD1491; Sat, 12 Mar 2016 19:55:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CJtMWc090327; Sat, 12 Mar 2016 19:55:22 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CJtMdp090326; Sat, 12 Mar 2016 19:55:22 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603121955.u2CJtMdp090326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 12 Mar 2016 19:55: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: r296767 - stable/10/lib/libc/include 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 19:55:23 -0000 Author: bdrewery Date: Sat Mar 12 19:55:22 2016 New Revision: 296767 URL: https://svnweb.freebsd.org/changeset/base/296767 Log: MFC r295416: Fix the gcc build after r295407. Modified: stable/10/lib/libc/include/libc_private.h Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/include/libc_private.h ============================================================================== --- stable/10/lib/libc/include/libc_private.h Sat Mar 12 19:41:38 2016 (r296766) +++ stable/10/lib/libc/include/libc_private.h Sat Mar 12 19:55:22 2016 (r296767) @@ -391,7 +391,7 @@ int _elf_aux_info(int aux, void *buf, in struct dl_phdr_info; int __elf_phdr_match_addr(struct dl_phdr_info *, void *); void __init_elf_aux_vector(void); -void __libc_map_stacks_exec(); +void __libc_map_stacks_exec(void); void _pthread_cancel_enter(int); void _pthread_cancel_leave(int); From owner-svn-src-stable-10@freebsd.org Sat Mar 12 23:11:10 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79435ACEAE1; Sat, 12 Mar 2016 23:11:10 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 5199F18AC; Sat, 12 Mar 2016 23:11:10 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CNB97a048736; Sat, 12 Mar 2016 23:11:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CNB98K048733; Sat, 12 Mar 2016 23:11:09 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603122311.u2CNB98K048733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 12 Mar 2016 23:11: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: r296777 - stable/10/tools/regression/geom_concat 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 23:11:10 -0000 Author: ngie Date: Sat Mar 12 23:11:08 2016 New Revision: 296777 URL: https://svnweb.freebsd.org/changeset/base/296777 Log: MFC r293434: - Use attach_md for memory disks so they can be tracked. - Add a geom_concat specific cleanup function and trap on that function at exit so things are cleaned up properly - Don't hardcode /tmp for temporary files, which violates the kyua sandbox Modified: stable/10/tools/regression/geom_concat/conf.sh stable/10/tools/regression/geom_concat/test-1.t stable/10/tools/regression/geom_concat/test-2.t Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/regression/geom_concat/conf.sh ============================================================================== --- stable/10/tools/regression/geom_concat/conf.sh Sat Mar 12 23:04:10 2016 (r296776) +++ stable/10/tools/regression/geom_concat/conf.sh Sat Mar 12 23:11:08 2016 (r296777) @@ -5,4 +5,11 @@ name="$(mktemp -u concat.XXXXXX)" class="concat" base=`basename $0` +gconcat_test_cleanup() +{ + [ -c /dev/$class/$name ] && gconcat destroy $name + geom_test_cleanup +} +trap gconcat_test_cleanup ABRT EXIT INT TERM + . `dirname $0`/../geom_subr.sh Modified: stable/10/tools/regression/geom_concat/test-1.t ============================================================================== --- stable/10/tools/regression/geom_concat/test-1.t Sat Mar 12 23:04:10 2016 (r296776) +++ stable/10/tools/regression/geom_concat/test-1.t Sat Mar 12 23:11:08 2016 (r296777) @@ -5,13 +5,11 @@ echo '1..1' -us=45 +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 +gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait # Size of created device should be 1MB + 2MB + 3MB. @@ -23,8 +21,3 @@ if [ $size -eq 6291456 ]; then else echo "not ok - Size is 6291456" fi - -gconcat destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` Modified: stable/10/tools/regression/geom_concat/test-2.t ============================================================================== --- stable/10/tools/regression/geom_concat/test-2.t Sat Mar 12 23:04:10 2016 (r296776) +++ stable/10/tools/regression/geom_concat/test-2.t Sat Mar 12 23:11:08 2016 (r296777) @@ -5,18 +5,17 @@ echo '1..1' -us=45 tsize=6 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 +dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 -gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 +gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait dd if=${src} of=/dev/concat/${name} bs=1m count=$tsize >/dev/null 2>&1 @@ -28,8 +27,4 @@ else echo "ok - md5 checksum comparison" fi -gconcat destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` rm -f ${src} ${dst} From owner-svn-src-stable-10@freebsd.org Sat Mar 12 23:53:21 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1C2EACDDC9; Sat, 12 Mar 2016 23:53:21 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 5BECC11B; Sat, 12 Mar 2016 23:53:21 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CNrKqY063290; Sat, 12 Mar 2016 23:53:20 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CNrK3g063288; Sat, 12 Mar 2016 23:53:20 GMT (envelope-from des@FreeBSD.org) Message-Id: <201603122353.u2CNrK3g063288@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Sat, 12 Mar 2016 23:53: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: r296781 - in stable/10: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/openssh/regress crypto/opens... 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-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2016 23:53:21 -0000 Author: des Date: Sat Mar 12 23:53:20 2016 New Revision: 296781 URL: https://svnweb.freebsd.org/changeset/base/296781 Log: MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug) MFH (r296634): re-add aes-cbc to server-side default cipher list MFH (r296651, r296657): fix gcc build of pam_ssh PR: 207679 Security: CVE-2016-3115 Added: stable/10/crypto/openssh/platform-pledge.c - copied unchanged from r296633, head/crypto/openssh/platform-pledge.c stable/10/crypto/openssh/regress/cert-file.sh - copied unchanged from r296633, head/crypto/openssh/regress/cert-file.sh stable/10/crypto/openssh/regress/check-perm.c - copied unchanged from r296633, head/crypto/openssh/regress/check-perm.c stable/10/crypto/openssh/sandbox-pledge.c - copied unchanged from r296633, head/crypto/openssh/sandbox-pledge.c stable/10/crypto/openssh/sandbox-solaris.c - copied unchanged from r296633, head/crypto/openssh/sandbox-solaris.c Deleted: stable/10/crypto/openssh/roaming_client.c stable/10/crypto/openssh/roaming_common.c stable/10/crypto/openssh/roaming_dummy.c stable/10/crypto/openssh/roaming_serv.c Modified: stable/10/crypto/openssh/ChangeLog stable/10/crypto/openssh/FREEBSD-upgrade stable/10/crypto/openssh/Makefile.in stable/10/crypto/openssh/README stable/10/crypto/openssh/README.platform stable/10/crypto/openssh/auth-bsdauth.c stable/10/crypto/openssh/auth-krb5.c stable/10/crypto/openssh/auth-options.c stable/10/crypto/openssh/auth-pam.c stable/10/crypto/openssh/auth.h stable/10/crypto/openssh/auth2-pubkey.c stable/10/crypto/openssh/authfd.c stable/10/crypto/openssh/authfd.h stable/10/crypto/openssh/authfile.c stable/10/crypto/openssh/channels.c stable/10/crypto/openssh/cipher.c stable/10/crypto/openssh/clientloop.c stable/10/crypto/openssh/clientloop.h stable/10/crypto/openssh/config.h stable/10/crypto/openssh/configure.ac stable/10/crypto/openssh/contrib/redhat/openssh.spec stable/10/crypto/openssh/contrib/ssh-copy-id stable/10/crypto/openssh/contrib/ssh-copy-id.1 stable/10/crypto/openssh/contrib/suse/openssh.spec stable/10/crypto/openssh/defines.h stable/10/crypto/openssh/dh.h stable/10/crypto/openssh/includes.h stable/10/crypto/openssh/kex.c stable/10/crypto/openssh/kex.h stable/10/crypto/openssh/kexc25519s.c stable/10/crypto/openssh/kexdhs.c stable/10/crypto/openssh/kexecdhs.c stable/10/crypto/openssh/kexgexs.c stable/10/crypto/openssh/key.c stable/10/crypto/openssh/key.h stable/10/crypto/openssh/krl.c stable/10/crypto/openssh/krl.h stable/10/crypto/openssh/loginrec.c stable/10/crypto/openssh/misc.c stable/10/crypto/openssh/monitor.c stable/10/crypto/openssh/monitor_wrap.c stable/10/crypto/openssh/monitor_wrap.h stable/10/crypto/openssh/mux.c stable/10/crypto/openssh/myproposal.h stable/10/crypto/openssh/opacket.c stable/10/crypto/openssh/opacket.h stable/10/crypto/openssh/openbsd-compat/bsd-misc.c stable/10/crypto/openssh/openbsd-compat/bsd-misc.h stable/10/crypto/openssh/openbsd-compat/bsd-poll.h stable/10/crypto/openssh/openbsd-compat/glob.c stable/10/crypto/openssh/openbsd-compat/glob.h stable/10/crypto/openssh/openbsd-compat/openbsd-compat.h stable/10/crypto/openssh/openbsd-compat/port-solaris.c stable/10/crypto/openssh/openbsd-compat/port-solaris.h stable/10/crypto/openssh/openbsd-compat/realpath.c stable/10/crypto/openssh/packet.c stable/10/crypto/openssh/packet.h stable/10/crypto/openssh/platform.h stable/10/crypto/openssh/readconf.c stable/10/crypto/openssh/readconf.h stable/10/crypto/openssh/readpass.c stable/10/crypto/openssh/regress/Makefile stable/10/crypto/openssh/regress/agent-ptrace.sh stable/10/crypto/openssh/regress/dhgex.sh stable/10/crypto/openssh/regress/hostkey-rotate.sh stable/10/crypto/openssh/regress/keys-command.sh stable/10/crypto/openssh/regress/keyscan.sh stable/10/crypto/openssh/regress/limit-keytype.sh stable/10/crypto/openssh/regress/principals-command.sh stable/10/crypto/openssh/regress/proxy-connect.sh stable/10/crypto/openssh/regress/rekey.sh stable/10/crypto/openssh/regress/setuid-allowed.c stable/10/crypto/openssh/regress/sftp-chroot.sh stable/10/crypto/openssh/regress/unittests/sshkey/test_file.c stable/10/crypto/openssh/regress/unittests/sshkey/test_fuzz.c stable/10/crypto/openssh/regress/unittests/sshkey/test_sshkey.c stable/10/crypto/openssh/roaming.h stable/10/crypto/openssh/sandbox-seccomp-filter.c stable/10/crypto/openssh/sandbox-systrace.c stable/10/crypto/openssh/scp.1 stable/10/crypto/openssh/scp.c stable/10/crypto/openssh/servconf.c stable/10/crypto/openssh/serverloop.c stable/10/crypto/openssh/session.c stable/10/crypto/openssh/sftp-client.c stable/10/crypto/openssh/sftp-client.h stable/10/crypto/openssh/sftp-server-main.c stable/10/crypto/openssh/sftp-server.c stable/10/crypto/openssh/sftp.1 stable/10/crypto/openssh/sftp.c stable/10/crypto/openssh/ssh-add.c stable/10/crypto/openssh/ssh-agent.1 stable/10/crypto/openssh/ssh-agent.c stable/10/crypto/openssh/ssh-dss.c stable/10/crypto/openssh/ssh-ecdsa.c stable/10/crypto/openssh/ssh-keygen.1 stable/10/crypto/openssh/ssh-keygen.c stable/10/crypto/openssh/ssh-keyscan.1 stable/10/crypto/openssh/ssh-keyscan.c stable/10/crypto/openssh/ssh-keysign.8 stable/10/crypto/openssh/ssh-keysign.c stable/10/crypto/openssh/ssh-pkcs11-client.c stable/10/crypto/openssh/ssh-pkcs11-helper.c stable/10/crypto/openssh/ssh-pkcs11.c stable/10/crypto/openssh/ssh-rsa.c stable/10/crypto/openssh/ssh.1 stable/10/crypto/openssh/ssh.c stable/10/crypto/openssh/ssh.h stable/10/crypto/openssh/ssh2.h stable/10/crypto/openssh/ssh_api.c stable/10/crypto/openssh/ssh_config stable/10/crypto/openssh/ssh_config.5 stable/10/crypto/openssh/ssh_namespace.h stable/10/crypto/openssh/sshbuf-getput-basic.c stable/10/crypto/openssh/sshbuf.c stable/10/crypto/openssh/sshbuf.h stable/10/crypto/openssh/sshconnect.c stable/10/crypto/openssh/sshconnect.h stable/10/crypto/openssh/sshconnect1.c stable/10/crypto/openssh/sshconnect2.c stable/10/crypto/openssh/sshd.8 stable/10/crypto/openssh/sshd.c stable/10/crypto/openssh/sshd_config stable/10/crypto/openssh/sshd_config.5 stable/10/crypto/openssh/ssherr.c stable/10/crypto/openssh/sshkey.c stable/10/crypto/openssh/sshkey.h stable/10/crypto/openssh/sshlogin.c stable/10/crypto/openssh/uidswap.c stable/10/crypto/openssh/version.h stable/10/crypto/openssh/xmalloc.c stable/10/crypto/openssh/xmalloc.h stable/10/lib/libpam/modules/pam_ssh/Makefile stable/10/lib/libpam/modules/pam_ssh/pam_ssh.c stable/10/secure/lib/libssh/Makefile stable/10/secure/libexec/sftp-server/Makefile stable/10/secure/libexec/ssh-keysign/Makefile stable/10/secure/libexec/ssh-pkcs11-helper/Makefile stable/10/secure/usr.bin/scp/Makefile stable/10/secure/usr.bin/sftp/Makefile stable/10/secure/usr.bin/ssh-add/Makefile stable/10/secure/usr.bin/ssh-agent/Makefile stable/10/secure/usr.bin/ssh-keygen/Makefile stable/10/secure/usr.bin/ssh-keyscan/Makefile stable/10/secure/usr.bin/ssh/Makefile stable/10/secure/usr.sbin/sshd/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/crypto/openssh/ChangeLog ============================================================================== --- stable/10/crypto/openssh/ChangeLog Sat Mar 12 23:50:19 2016 (r296780) +++ stable/10/crypto/openssh/ChangeLog Sat Mar 12 23:53:20 2016 (r296781) @@ -1,7615 +1,8905 @@ -commit c88ac102f0eb89f2eaa314cb2e2e0ca3c890c443 +commit 5c35450a0c901d9375fb23343a8dc82397da5f75 Author: Damien Miller -Date: Thu Jan 14 11:08:19 2016 +1100 +Date: Thu Mar 10 05:04:48 2016 +1100 - bump version numbers + update versions for release -commit 302bc21e6fadacb04b665868cd69b625ef69df90 +commit 9d47b8d3f50c3a6282896df8274147e3b9a38c56 Author: Damien Miller -Date: Thu Jan 14 11:04:04 2016 +1100 +Date: Thu Mar 10 05:03:39 2016 +1100 - openssh-7.1p2 + sanitise characters destined for xauth(1) + + reported by github.com/tintinweb -commit 6b33763242c063e4e0593877e835eeb1fd1b60aa -Author: Damien Miller -Date: Thu Jan 14 11:02:58 2016 +1100 +commit 72b061d4ba0f909501c595d709ea76e06b01e5c9 +Author: Darren Tucker +Date: Fri Feb 26 14:40:04 2016 +1100 - forcibly disable roaming support in the client + Add a note about using xlc on AIX. -commit 34d364f0d2e1e30a444009f0e04299bb7c94ba13 -Author: djm@openbsd.org -Date: Mon Oct 5 17:11:21 2015 +0000 +commit fd4e4f2416baa2e6565ea49d52aade296bad3e28 +Author: Darren Tucker +Date: Wed Feb 24 10:44:25 2016 +1100 - upstream commit + Skip PrintLastLog in config dump mode. - some more bzero->explicit_bzero, from Michael McConville - - Upstream-ID: 17f19545685c33327db2efdc357c1c9225ff00d0 + When DISABLE_LASTLOG is set, do not try to include PrintLastLog in the + config dump since it'll be reported as UNKNOWN. -commit 8f5b93026797b9f7fba90d0c717570421ccebbd3 -Author: guenther@openbsd.org -Date: Fri Sep 11 08:50:04 2015 +0000 +commit 99135c764fa250801da5ec3b8d06cbd0111caae8 +Author: Damien Miller +Date: Tue Feb 23 20:17:23 2016 +1100 + + update spec/README versions ahead of release + +commit b86a334aaaa4d1e643eb1fd71f718573d6d948b5 +Author: Damien Miller +Date: Tue Feb 23 20:16:53 2016 +1100 + + put back portable patchlevel to p1 + +commit 555dd35ff176847e3c6bd068ba2e8db4022eb24f +Author: djm@openbsd.org +Date: Tue Feb 23 09:14:34 2016 +0000 upstream commit - Use explicit_bzero() when zeroing before free() - - from Michael McConville (mmcconv1 (at) sccs.swarthmore.edu) - ok millert@ djm@ + openssh-7.2 - Upstream-ID: 2e3337db046c3fe70c7369ee31515ac73ec00f50 + Upstream-ID: 9db776b26014147fc907ece8460ef2bcb0f11e78 -commit d77148e3a3ef6c29b26ec74331455394581aa257 -Author: djm@openbsd.org -Date: Sun Nov 8 21:59:11 2015 +0000 +commit 1acc058d0a7913838c830ed998a1a1fb5b7864bf +Author: Damien Miller +Date: Tue Feb 23 16:12:13 2016 +1100 - upstream commit + Disable tests where fs perms are incorrect - fix OOB read in packet code caused by missing return - statement found by Ben Hawkes; ok markus@ deraadt@ + Some tests have strict requirements on the filesystem permissions + for certain files and directories. This adds a regress/check-perm + tool that copies the relevant logic from sshd to exactly test + the paths in question. This lets us skip tests when the local + filesystem doesn't conform to our expectations rather than + continuing and failing the test run. - Upstream-ID: a3e3a85434ebfa0690d4879091959591f30efc62 + ok dtucker@ -commit 076d849e17ab12603627f87b301e2dca71bae518 +commit 39f303b1f36d934d8410b05625f25c7bcb75db4d Author: Damien Miller -Date: Sat Nov 14 18:44:49 2015 +1100 +Date: Tue Feb 23 12:56:59 2016 +1100 - read back from libcrypto RAND when privdropping + fix sandbox on OSX Lion - makes certain libcrypto implementations cache a /dev/urandom fd - in preparation of sandboxing. Based on patch by Greg Hartman. + sshd was failing with: + + ssh_sandbox_child: sandbox_init: dlopen(/usr/lib/libsandbox.1.dylib, 261):cw + image not found [preauth] + + caused by chroot before sandboxing. Avoid by explicitly linking libsandbox + to sshd. Spotted by Darren. -commit f72adc0150011a28f177617a8456e1f83733099d +commit 0d1451a32c7436e6d3d482351e776bc5e7824ce4 Author: djm@openbsd.org -Date: Sun Dec 13 22:42:23 2015 +0000 +Date: Tue Feb 23 01:34:14 2016 +0000 upstream commit - unbreak connections with peers that set - first_kex_follows; fix from Matt Johnston va bz#2515 + fix spurious error message when incorrect passphrase + entered for keys; reported by espie@ ok deraadt@ - Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b + Upstream-ID: 58b2e46e63ed6912ed1ee780bd3bd8560f9a5899 -commit 04bd8d019ccd906cac1a2b362517b8505f3759e6 -Author: djm@openbsd.org -Date: Tue Jan 12 23:42:54 2016 +0000 +commit 09d87d79741beb85768b5e788d7dfdf4bc3543dc +Author: sobrado@openbsd.org +Date: Sat Feb 20 23:06:23 2016 +0000 upstream commit - use explicit_bzero() more liberally in the buffer code; ok - deraadt + set ssh(1) protocol version to 2 only. - Upstream-ID: 0ece37069fd66bc6e4f55eb1321f93df372b65bf + ok djm@ + + Upstream-ID: e168daf9d27d7e392e3c9923826bd8e87b2b3a10 -commit e91346dc2bbf460246df2ab591b7613908c1b0ad -Author: Damien Miller -Date: Fri Aug 21 14:49:03 2015 +1000 +commit 9262e07826ba5eebf8423f7ac9e47ec488c47869 +Author: sobrado@openbsd.org +Date: Sat Feb 20 23:02:39 2016 +0000 - we don't use Github for issues/pull-requests + upstream commit + + add missing ~/.ssh/id_ecdsa and ~/.ssh/id_ed25519 to + IdentityFile. + + ok djm@ + + Upstream-ID: 6ce99466312e4ae7708017c3665e3edb976f70cf -commit a4f5b507c708cc3dc2c8dd2d02e4416d7514dc23 -Author: Damien Miller -Date: Fri Aug 21 14:43:55 2015 +1000 +commit c12f0fdce8f985fca8d71829fd64c5b89dc777f5 +Author: sobrado@openbsd.org +Date: Sat Feb 20 23:01:46 2016 +0000 - fix URL for connect.c + upstream commit + + AddressFamily defaults to any. + + ok djm@ + + Upstream-ID: 0d94aa06a4b889bf57a7f631c45ba36d24c13e0c -commit d026a8d3da0f8186598442997c7d0a28e7275414 -Author: Damien Miller -Date: Fri Aug 21 13:47:10 2015 +1000 +commit 907091acb188b1057d50c2158f74c3ecf1c2302b +Author: Darren Tucker +Date: Fri Feb 19 09:05:39 2016 +1100 - update version numbers for 7.1 + Make Solaris privs code build on older systems. + + Not all systems with Solaris privs have priv_basicset so factor that + out and provide backward compatibility code. Similarly, not all have + PRIV_NET_ACCESS so wrap that in #ifdef. Based on code from + alex at cooperi.net and djm@ with help from carson at taltos.org and + wieland at purdue.edu. -commit 78f8f589f0ca1c9f41e5a9bae3cda5ce8a6b42ed +commit 292a8dee14e5e67dcd1b49ba5c7b9023e8420d59 Author: djm@openbsd.org -Date: Fri Aug 21 03:45:26 2015 +0000 +Date: Wed Feb 17 22:20:14 2016 +0000 upstream commit - openssh-7.1 + rekey refactor broke SSH1; spotted by Tom G. Christensen - Upstream-ID: ff7b1ef4b06caddfb45e08ba998128c88be3d73f + Upstream-ID: 43f0d57928cc077c949af0bfa71ef574dcb58243 -commit 32a181980c62fce94f7f9ffaf6a79d90f0c309cf +commit 3a13cb543df9919aec2fc6b75f3dd3802facaeca Author: djm@openbsd.org -Date: Fri Aug 21 03:42:19 2015 +0000 +Date: Wed Feb 17 08:57:34 2016 +0000 upstream commit - fix inverted logic that broke PermitRootLogin; reported - by Mantas Mikulenas; ok markus@ + rsa-sha2-512,rsa-sha2-256 cannot be selected explicitly + in *KeyTypes options yet. Remove them from the lists of algorithms for now. + committing on behalf of markus@ ok djm@ - Upstream-ID: 260dd6a904c1bb7e43267e394b1c9cf70bdd5ea5 + Upstream-ID: c6e8820eb8e610ac21551832c0c89684a9a51bb7 -commit ce445b0ed927e45bd5bdce8f836eb353998dd65c -Author: deraadt@openbsd.org -Date: Thu Aug 20 22:32:42 2015 +0000 +commit a685ae8d1c24fb7c712c55a4f3280ee76f5f1e4b +Author: jmc@openbsd.org +Date: Wed Feb 17 07:38:19 2016 +0000 upstream commit - Do not cast result of malloc/calloc/realloc* if stdlib.h - is in scope ok krw millert - - Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667 - -commit 05291e5288704d1a98bacda269eb5a0153599146 -Author: naddy@openbsd.org -Date: Thu Aug 20 19:20:06 2015 +0000 - - upstream commit + since these pages now clearly tell folks to avoid v1, + normalise the docs from a v2 perspective (i.e. stop pointing out which bits + are v2 only); - In the certificates section, be consistent about using - "host_key" and "user_key" for the respective key types. ok sthen@ deraadt@ + ok/tweaks djm ok markus - Upstream-ID: 9e037ea3b15577b238604c5533e082a3947f13cb + Upstream-ID: eb474f8c36fb6a532dc05c282f7965e38dcfa129 -commit 8543d4ef6f2e9f98c3e6b77c894ceec30c5e4ae4 +commit c5c3f3279a0e4044b8de71b70d3570d692d0f29d Author: djm@openbsd.org -Date: Wed Aug 19 23:21:42 2015 +0000 +Date: Wed Feb 17 05:29:04 2016 +0000 upstream commit - Better compat matching for WinSCP, add compat matching - for FuTTY (fork of PuTTY); ok markus@ deraadt@ + make sandboxed privilege separation the default, not just + for new installs; "absolutely" deraadt@ - Upstream-ID: 24001d1ac115fa3260fbdc329a4b9aeb283c5389 + Upstream-ID: 5221ef3b927d2df044e9aa3f5db74ae91743f69b -commit ec6eda16ebab771aa3dfc90629b41953b999cb1e -Author: djm@openbsd.org -Date: Wed Aug 19 23:19:01 2015 +0000 +commit eb3f7337a651aa01d5dec019025e6cdc124ed081 +Author: jmc@openbsd.org +Date: Tue Feb 16 07:47:54 2016 +0000 upstream commit - fix double-free() in error path of DSA key generation - reported by Mateusz Kocielski; ok markus@ + no need to state that protocol 2 is the default twice; - Upstream-ID: 4735d8f888b10599a935fa1b374787089116713c + Upstream-ID: b1e4c36b0c2e12e338e5b66e2978f2ac953b95eb -commit 45b0eb752c94954a6de046bfaaf129e518ad4b5b +commit e7901efa9b24e5b0c7e74f2c5520d47eead4d005 Author: djm@openbsd.org -Date: Wed Aug 19 23:18:26 2015 +0000 +Date: Tue Feb 16 05:11:04 2016 +0000 upstream commit - fix free() of uninitialised pointer reported by Mateusz - Kocielski; ok markus@ + Replace list of ciphers and MACs adjacent to -1/-2 flag + descriptions in ssh(1) with a strong recommendation not to use protocol 1. + Add a similar warning to the Protocol option descriptions in ssh_config(5) + and sshd_config(5); - Upstream-ID: 519552b050618501a06b7b023de5cb104e2c5663 + prompted by and ok mmcc@ + + Upstream-ID: 961f99e5437d50e636feca023978950a232ead5e -commit c837643b93509a3ef538cb6624b678c5fe32ff79 +commit 5a0fcb77287342e2fc2ba1cee79b6af108973dc2 Author: djm@openbsd.org -Date: Wed Aug 19 23:17:51 2015 +0000 +Date: Tue Feb 16 03:37:48 2016 +0000 upstream commit - fixed unlink([uninitialised memory]) reported by Mateusz - Kocielski; ok markus@ + add a "Close session" log entry (at loglevel=verbose) to + correspond to the existing "Starting session" one. Also include the session + id number to make multiplexed sessions more apparent. - Upstream-ID: 14a0c4e7d891f5a8dabc4b89d4f6b7c0d5a20109 + feedback and ok dtucker@ + + Upstream-ID: e72d2ac080e02774376325136e532cb24c2e617c -commit 1f8d3d629cd553031021068eb9c646a5f1e50994 -Author: jmc@openbsd.org -Date: Fri Aug 14 15:32:41 2015 +0000 +commit 624fd395b559820705171f460dd33d67743d13d6 +Author: djm@openbsd.org +Date: Wed Feb 17 02:24:17 2016 +0000 upstream commit - match myproposal.h order; from brian conway (i snuck in a - tweak while here) - - ok dtucker + include bad $SSH_CONNECTION in failure output - Upstream-ID: 35174a19b5237ea36aa3798f042bf5933b772c67 + Upstream-Regress-ID: b22d72edfde78c403aaec2b9c9753ef633cc0529 -commit 1dc8d93ce69d6565747eb44446ed117187621b26 -Author: deraadt@openbsd.org -Date: Thu Aug 6 14:53:21 2015 +0000 +commit 60d860e54b4f199e5e89963b1c086981309753cb +Author: Darren Tucker +Date: Wed Feb 17 13:37:09 2016 +1100 - upstream commit - - add prohibit-password as a synonymn for without-password, - since the without-password is causing too many questions. Harden it to ban - all but pubkey, hostbased, and GSSAPI auth (when the latter is enabled) from - djm, ok markus + Rollback addition of va_start. - Upstream-ID: d53317d7b28942153e6236d3fd6e12ceb482db7a + va_start was added in 0f754e29dd3760fc0b172c1220f18b753fb0957e, however + it has the wrong number of args and it's not usable in non-variadic + functions anyway so it breaks things (for example Solaris 2.6 as + reported by Tom G. Christensen).i ok djm@ -commit 90a95a4745a531b62b81ce3b025e892bdc434de5 -Author: Damien Miller -Date: Tue Aug 11 13:53:41 2015 +1000 +commit 2fee909c3cee2472a98b26eb82696297b81e0d38 +Author: Darren Tucker +Date: Wed Feb 17 09:48:15 2016 +1100 - update version in README + Look for gethostbyname in libresolv and libnsl. + + Should fix build problem on Solaris 2.6 reported by Tom G. Christensen. -commit 318c37743534b58124f1bab37a8a0087a3a9bd2f +commit 5ac712d81a84396aab441a272ec429af5b738302 Author: Damien Miller -Date: Tue Aug 11 13:53:09 2015 +1000 +Date: Tue Feb 16 10:45:02 2016 +1100 - update versions in *.spec + make existing ssh_malloc_init only for __OpenBSD__ -commit 5e75f5198769056089fb06c4d738ab0e5abc66f7 -Author: Damien Miller -Date: Tue Aug 11 13:34:12 2015 +1000 +commit 24c9bded569d9f2449ded73f92fb6d12db7a9eec +Author: djm@openbsd.org +Date: Mon Feb 15 23:32:37 2016 +0000 - set sshpam_ctxt to NULL after free + upstream commit - Avoids use-after-free in monitor when privsep child is compromised. - Reported by Moritz Jodeit; ok dtucker@ - -commit d4697fe9a28dab7255c60433e4dd23cf7fce8a8b -Author: Damien Miller -Date: Tue Aug 11 13:33:24 2015 +1000 - - Don't resend username to PAM; it already has it. + memleak of algorithm name in mm_answer_sign; reported by + Jakub Jelen - Pointed out by Moritz Jodeit; ok dtucker@ + Upstream-ID: ccd742cd25952240ebd23d7d4d6b605862584d08 -commit 88763a6c893bf3dfe951ba9271bf09715e8d91ca -Author: Darren Tucker -Date: Mon Jul 27 12:14:25 2015 +1000 +commit ffb1e7e896139a42ceb78676f637658f44612411 +Author: dtucker@openbsd.org +Date: Mon Feb 15 09:47:49 2016 +0000 - Import updated moduli file from OpenBSD. + upstream commit + + Add a function to enable security-related malloc_options. + With and ok deraadt@, something similar has been in the snaps for a while. + + Upstream-ID: 43a95523b832b7f3b943d2908662191110c380ed -commit 55b263fb7cfeacb81aaf1c2036e0394c881637da +commit ef39e8c0497ff0564990a4f9e8b7338b3ba3507c Author: Damien Miller -Date: Mon Aug 10 11:13:44 2015 +1000 +Date: Tue Feb 16 10:34:39 2016 +1100 - let principals-command.sh work for noexec /var/run + sync ssh-copy-id with upstream 783ef08b0a75 -commit 2651e34cd11b1aac3a0fe23b86d8c2ff35c07897 -Author: Damien Miller -Date: Thu Aug 6 11:43:42 2015 +1000 +commit d2d772f55b19bb0e8d03c2fe1b9bb176d9779efd +Author: djm@openbsd.org +Date: Fri Feb 12 00:20:30 2016 +0000 - work around echo -n / sed behaviour in tests + upstream commit + + avoid fatal() for PKCS11 tokens that present empty key IDs + bz#1773, ok markus@ + + Upstream-ID: 044a764fee526f2c4a9d530bd10695422d01fc54 -commit d85dad81778c1aa8106acd46930b25fdf0d15b2a +commit e4c918a6c721410792b287c9fd21356a1bed5805 Author: djm@openbsd.org -Date: Wed Aug 5 05:27:33 2015 +0000 +Date: Thu Feb 11 02:56:32 2016 +0000 upstream commit - adjust for RSA minimum modulus switch; ok deraadt@ + sync crypto algorithm lists in ssh_config(5) and + sshd_config(5) with current reality. bz#2527 - Upstream-Regress-ID: 5a72c83431b96224d583c573ca281cd3a3ebfdae + Upstream-ID: d7fd1b6c1ed848d866236bcb1d7049d2bb9b2ff6 -commit 57e8e229bad5fe6056b5f1199665f5f7008192c6 +commit e30cabfa4ab456a30b3224f7f545f1bdfc4a2517 Author: djm@openbsd.org -Date: Tue Aug 4 05:23:06 2015 +0000 +Date: Thu Feb 11 02:21:34 2016 +0000 upstream commit - backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this - release; problems spotted by sthen@ ok deraadt@ markus@ + fix regression in openssh-6.8 sftp client: existing + destination directories would incorrectly terminate recursive uploads; + bz#2528 - Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822 + Upstream-ID: 3306be469f41f26758e3d447987ac6d662623e18 -commit f097d0ea1e0889ca0fa2e53a00214e43ab7fa22a +commit 714e367226ded4dc3897078be48b961637350b05 Author: djm@openbsd.org -Date: Sun Aug 2 09:56:42 2015 +0000 +Date: Tue Feb 9 05:30:04 2016 +0000 upstream commit - openssh 7.0; ok deraadt@ + turn off more old crypto in the client: hmac-md5, ripemd, + truncated HMACs, RC4, blowfish. ok markus@ dtucker@ - Upstream-ID: c63afdef537f57f28ae84145c5a8e29e9250221f + Upstream-ID: 96aa11c2c082be45267a690c12f1d2aae6acd46e -commit 3d5728a0f6874ce4efb16913a12963595070f3a9 -Author: chris@openbsd.org -Date: Fri Jul 31 15:38:09 2015 +0000 +commit 5a622844ff7f78dcb75e223399f9ef0977e8d0a3 +Author: djm@openbsd.org +Date: Mon Feb 8 23:40:12 2016 +0000 upstream commit - Allow PermitRootLogin to be overridden by config - - ok markus@ deeradt@ + don't attempt to percent_expand() already-canonicalised + addresses, avoiding unnecessary failures when attempting to connect to scoped + IPv6 addresses (that naturally contain '%' characters) - Upstream-ID: 5cf3e26ed702888de84e2dc9d0054ccf4d9125b4 + Upstream-ID: f24569cffa1a7cbde5f08dc739a72f4d78aa5c6a -commit 6f941396b6835ad18018845f515b0c4fe20be21a +commit 19bcf2ea2d17413f2d9730dd2a19575ff86b9b6a Author: djm@openbsd.org -Date: Thu Jul 30 23:09:15 2015 +0000 +Date: Mon Feb 8 10:57:07 2016 +0000 upstream commit - fix pty permissions; patch from Nikolay Edigaryev; ok - deraadt + refactor activation of rekeying - Upstream-ID: 40ff076d2878b916fbfd8e4f45dbe5bec019e550 + This makes automatic rekeying internal to the packet code (previously + the server and client loops needed to assist). In doing to it makes + application of rekey limits more accurate by accounting for packets + about to be sent as well as packets queued during rekeying events + themselves. + + Based on a patch from dtucker@ which was in turn based on a patch + Aleksander Adamowski in bz#2521; ok markus@ + + Upstream-ID: a441227fd64f9739850ca97b4cf794202860fcd8 -commit f4373ed1e8fbc7c8ce3fc4ea97d0ba2e0c1d7ef0 -Author: deraadt@openbsd.org -Date: Thu Jul 30 19:23:02 2015 +0000 +commit 603ba41179e4b53951c7b90ee95b6ef3faa3f15d +Author: naddy@openbsd.org +Date: Fri Feb 5 13:28:19 2016 +0000 upstream commit - change default: PermitRootLogin without-password matching - install script changes coming as well ok djm markus + Only check errno if read() has returned an error. EOF is + not an error. This fixes a problem where the mux master would sporadically + fail to notice that the client had exited. ok mikeb@ djm@ - Upstream-ID: 0e2a6c4441daf5498b47a61767382bead5eb8ea6 + Upstream-ID: 3c2dadc21fac6ef64665688aac8a75fffd57ae53 -commit 0c30ba91f87fcda7e975e6ff8a057f624e87ea1c -Author: Damien Miller -Date: Thu Jul 30 12:31:39 2015 +1000 +commit 56d7dac790693ce420d225119283bc355cff9185 +Author: jsg@openbsd.org +Date: Fri Feb 5 04:31:21 2016 +0000 - downgrade OOM adjustment logging: verbose -> debug + upstream commit + + avoid an uninitialised value when NumberOfPasswordPrompts + is 0 ok markus@ djm@ + + Upstream-ID: 11b068d83c2865343aeb46acf1e9eec00f829b6b -commit f9eca249d4961f28ae4b09186d7dc91de74b5895 +commit deae7d52d59c5019c528f977360d87fdda15d20b Author: djm@openbsd.org -Date: Thu Jul 30 00:01:34 2015 +0000 +Date: Fri Feb 5 03:07:06 2016 +0000 upstream commit - Allow ssh_config and sshd_config kex parameters options be - prefixed by a '+' to indicate that the specified items be appended to the - default rather than replacing it. - - approach suggested by dtucker@, feedback dlg@, ok markus@ + mention internal DH-GEX fallback groups; bz#2302 - Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a + Upstream-ID: e7b395fcca3122cd825515f45a2e41c9a157e09e -commit 5cefe769105a2a2e3ca7479d28d9a325d5ef0163 +commit cac3b6665f884d46192c0dc98a64112e8b11a766 Author: djm@openbsd.org -Date: Wed Jul 29 08:34:54 2015 +0000 +Date: Fri Feb 5 02:37:56 2016 +0000 upstream commit - fix bug in previous; was printing incorrect string for - failed host key algorithms negotiation + better description for MaxSessions; bz#2531 - Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e + Upstream-ID: e2c0d74ee185cd1a3e9d4ca1f1b939b745b354da -commit f319912b0d0e1675b8bb051ed8213792c788bcb2 +commit 5ef4b0fdcc7a239577a754829b50022b91ab4712 +Author: Damien Miller +Date: Wed Jan 27 17:45:56 2016 +1100 + + avoid FreeBSD RCS Id in comment + + Change old $FreeBSD version string in comment so it doesn't + become an RCS ident downstream; requested by des AT des.no + +commit 696d12683c90d20a0a9c5f4275fc916b7011fb04 Author: djm@openbsd.org -Date: Wed Jul 29 04:43:06 2015 +0000 +Date: Thu Feb 4 23:43:48 2016 +0000 upstream commit - include the peer's offer when logging a failure to - negotiate a mutual set of algorithms (kex, pubkey, ciphers, etc.) ok markus@ + printf argument casts to avoid warnings on strict + compilers - Upstream-ID: bbb8caabf5c01790bb845f5ce135565248d7c796 + Upstream-ID: 7b9f6712cef01865ad29070262d366cf13587c9c -commit b6ea0e573042eb85d84defb19227c89eb74cf05a -Author: djm@openbsd.org -Date: Tue Jul 28 23:20:42 2015 +0000 +commit 5658ef2501e785fbbdf5de2dc33b1ff7a4dca73a +Author: millert@openbsd.org +Date: Mon Feb 1 21:18:17 2016 +0000 upstream commit - add Cisco to the list of clients that choke on the - hostkeys update extension. Pointed out by Howard Kash + Avoid ugly "DISPLAY "(null)" invalid; disabling X11 + forwarding" message when DISPLAY is not set. This could also result in a + crash on systems with a printf that doesn't handle NULL. OK djm@ - Upstream-ID: c9eadde28ecec056c73d09ee10ba4570dfba7e84 + Upstream-ID: 20ee0cfbda678a247264c20ed75362042b90b412 -commit 3f628c7b537291c1019ce86af90756fb4e66d0fd -Author: guenther@openbsd.org -Date: Mon Jul 27 16:29:23 2015 +0000 +commit 537f88ec7bcf40bd444ac5584c707c5588c55c43 +Author: dtucker@openbsd.org +Date: Fri Jan 29 05:18:15 2016 +0000 upstream commit - Permit kbind(2) use in the sandbox now, to ease testing - of ld.so work using it - - reminded by miod@, ok deraadt@ + Add regression test for RekeyLimit parsing of >32bit values + (4G and 8G). - Upstream-ID: 523922e4d1ba7a091e3824e77a8a3c818ee97413 + Upstream-Regress-ID: 548390350c62747b6234f522a99c319eee401328 -commit ebe27ebe520098bbc0fe58945a87ce8490121edb -Author: millert@openbsd.org -Date: Mon Jul 20 18:44:12 2015 +0000 +commit 4c6cb8330460f94e6c7ae28a364236d4188156a3 +Author: dtucker@openbsd.org +Date: Fri Jan 29 23:04:46 2016 +0000 upstream commit - Move .Pp before .Bl, not after to quiet mandoc -Tlint. - Noticed by jmc@ + Remove leftover roaming dead code. ok djm markus. - Upstream-ID: 59fadbf8407cec4e6931e50c53cfa0214a848e23 + Upstream-ID: 13d1f9c8b65a5109756bcfd3b74df949d53615be -commit d5d91d0da819611167782c66ab629159169d94d4 -Author: millert@openbsd.org -Date: Mon Jul 20 18:42:35 2015 +0000 +commit 28136471809806d6246ef41e4341467a39fe2f91 +Author: djm@openbsd.org +Date: Fri Jan 29 05:46:01 2016 +0000 upstream commit - Sync usage with SYNOPSIS + include packet type of non-data packets in debug3 output; + ok markus dtucker - Upstream-ID: 7a321a170181a54f6450deabaccb6ef60cf3f0b7 + Upstream-ID: 034eaf639acc96459b9c5ce782db9fcd8bd02d41 -commit 79ec2142fbc68dd2ed9688608da355fc0b1ed743 -Author: millert@openbsd.org -Date: Mon Jul 20 15:39:52 2015 +0000 +commit 6fd6e28daccafaa35f02741036abe64534c361a1 +Author: dtucker@openbsd.org +Date: Fri Jan 29 03:31:03 2016 +0000 upstream commit - Better desciption of Unix domain socket forwarding. - bz#2423; ok jmc@ + Revert "account for packets buffered but not yet + processed" change as it breaks for very small RekeyLimit values due to + continuous rekeying. ok djm@ - Upstream-ID: 85e28874726897e3f26ae50dfa2e8d2de683805d - -commit d56fd1828074a4031b18b8faa0bf949669eb18a0 -Author: Damien Miller -Date: Mon Jul 20 11:19:51 2015 +1000 - - make realpath.c compile -Wsign-compare clean + Upstream-ID: 7e03f636cb45ab60db18850236ccf19079182a19 -commit c63c9a691dca26bb7648827f5a13668832948929 -Author: djm@openbsd.org -Date: Mon Jul 20 00:30:01 2015 +0000 +commit 921ff00b0ac429666fb361d2d6cb1c8fff0006cb +Author: dtucker@openbsd.org +Date: Fri Jan 29 02:54:45 2016 +0000 upstream commit - mention that the default of UseDNS=no implies that - hostnames cannot be used for host matching in sshd_config and - authorized_keys; bz#2045, ok dtucker@ + Allow RekeyLimits in excess of 4G up to 2**63 bits + (limited by the return type of scan_scaled). Part of bz#2521, ok djm. - Upstream-ID: 0812705d5f2dfa59aab01f2764ee800b1741c4e1 + Upstream-ID: 13bea82be566b9704821b1ea05bf7804335c7979 -commit 63ebcd0005e9894fcd6871b7b80aeea1fec0ff76 -Author: djm@openbsd.org -Date: Sat Jul 18 08:02:17 2015 +0000 +commit c0060a65296f01d4634f274eee184c0e93ba0f23 +Author: dtucker@openbsd.org +Date: Fri Jan 29 02:42:46 2016 +0000 upstream commit - don't ignore PKCS#11 hosted keys that return empty - CKA_ID; patch by Jakub Jelen via bz#2429; ok markus + Account for packets buffered but not yet processed when + computing whether or not it is time to perform rekeying. bz#2521, based + loosely on a patch from olo at fb.com, ok djm@ - Upstream-ID: 2f7c94744eb0342f8ee8bf97b2351d4e00116485 + Upstream-ID: 67e268b547f990ed220f3cb70a5624d9bda12b8c -commit b15fd989c8c62074397160147a8d5bc34b3f3c63 +commit 44cf930e670488c85c9efeb373fa5f4b455692ac Author: djm@openbsd.org -Date: Sat Jul 18 08:00:21 2015 +0000 +Date: Wed Jan 27 06:44:58 2016 +0000 upstream commit - skip uninitialised PKCS#11 slots; patch from Jakub Jelen - in bz#2427 ok markus@ + change old $FreeBSD version string in comment so it doesn't + become an RCS ident downstream; requested by des AT des.no - Upstream-ID: 744c1e7796e237ad32992d0d02148e8a18f27d29 + Upstream-ID: 8ca558c01f184e596b45e4fc8885534b2c864722 -commit 5b64f85bb811246c59ebab70aed331f26ba37b18 +commit ebacd377769ac07d1bf3c75169644336056b7060 Author: djm@openbsd.org -Date: Sat Jul 18 07:57:14 2015 +0000 +Date: Wed Jan 27 00:53:12 2016 +0000 upstream commit - only query each keyboard-interactive device once per - authentication request regardless of how many times it is listed; ok markus@ + make the debug messages a bit more useful here - Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1 + Upstream-ID: 478ccd4e897e0af8486b294aa63aa3f90ab78d64 -commit cd7324d0667794eb5c236d8a4e0f236251babc2d -Author: djm@openbsd.org -Date: Fri Jul 17 03:34:27 2015 +0000 +commit 458abc2934e82034c5c281336d8dc0f910aecad3 +Author: jsg@openbsd.org +Date: Sat Jan 23 05:31:35 2016 +0000 upstream commit - remove -u flag to diff (only used for error output) to make - things easier for -portable + Zero a stack buffer with explicit_bzero() instead of + memset() when returning from client_loop() for consistency with + buffer_free()/sshbuf_free(). - Upstream-Regress-ID: a5d6777d2909540d87afec3039d9bb2414ade548 + ok dtucker@ deraadt@ djm@ + + Upstream-ID: bc9975b2095339811c3b954694d7d15ea5c58f66 -commit deb8d99ecba70b67f4af7880b11ca8768df9ec3a -Author: djm@openbsd.org -Date: Fri Jul 17 03:09:19 2015 +0000 +commit 65a3c0dacbc7dbb75ddb6a70ebe22d8de084d0b0 +Author: dtucker@openbsd.org +Date: Wed Jan 20 09:22:39 2016 +0000 upstream commit - direct-streamlocal@openssh.com Unix domain foward - messages do not contain a "reserved for future use" field and in fact, - serverloop.c checks that there isn't one. Remove erroneous mention from - PROTOCOL description. bz#2421 from Daniel Black + Include sys/time.h for gettimeofday. From sortie at + maxsi.org. - Upstream-ID: 3d51a19e64f72f764682f1b08f35a8aa810a43ac + Upstream-ID: 6ed0c33b836d9de0a664cd091e86523ecaa2fb3b -commit 356b61f365405b5257f5b2ab446e5d7bd33a7b52 -Author: djm@openbsd.org -Date: Fri Jul 17 03:04:27 2015 +0000 +commit fc77ccdc2ce6d5d06628b8da5048a6a5f6ffca5a +Author: markus@openbsd.org +Date: Thu Jan 14 22:56:56 2016 +0000 upstream commit - describe magic for setting up Unix domain socket fowards - via the mux channel; bz#2422 patch from Daniel Black + fd leaks; report Qualys Security Advisory team; ok + deraadt@ - Upstream-ID: 943080fe3864715c423bdeb7c920bb30c4eee861 + Upstream-ID: 4ec0f12b9d8fa202293c9effa115464185aa071d -commit d3e2aee41487d55b8d7d40f538b84ff1db7989bc -Author: Darren Tucker -Date: Fri Jul 17 12:52:34 2015 +1000 +commit a306863831c57ec5fad918687cc5d289ee8e2635 +Author: markus@openbsd.org +Date: Thu Jan 14 16:17:39 2016 +0000 - Check if realpath works on nonexistent files. - - On some platforms the native realpath doesn't work with non-existent - files (this is actually specified in some versions of POSIX), however - the sftp spec says its realpath with "canonicalize any given path name". - On those platforms, use realpath from the compat library. + upstream commit - In addition, when compiling with -DFORTIFY_SOURCE, glibc redefines - the realpath symbol to the checked version, so redefine ours to - something else so we pick up the compat version we want. + remove roaming support; ok djm@ - bz#2428, ok djm@ + Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56 -commit 25b14610dab655646a109db5ef8cb4c4bf2a48a0 -Author: djm@openbsd.org -Date: Fri Jul 17 02:47:45 2015 +0000 +commit 6ef49e83e30688504552ac10875feabd5521565f +Author: deraadt@openbsd.org +Date: Thu Jan 14 14:34:34 2016 +0000 upstream commit - fix incorrect test for SSH1 keys when compiled without SSH1 - support + Disable experimental client-side roaming support. Server + side was disabled/gutted for years already, but this aspect was surprisingly + forgotten. Thanks for report from Qualys - Upstream-ID: 6004d720345b8e481c405e8ad05ce2271726e451 + Upstream-ID: 2328004b58f431a554d4c1bf67f5407eae3389df -commit df56a8035d429b2184ee94aaa7e580c1ff67f73a +commit 8d7b523b96d3be180572d9d338cedaafc0570f60 +Author: Damien Miller +Date: Thu Jan 14 11:08:19 2016 +1100 + + bump version numbers + +commit 8c3d512a1fac8b9c83b4d0c9c3f2376290bd84ca +Author: Damien Miller +Date: Thu Jan 14 11:04:04 2016 +1100 + + openssh-7.1p2 + +commit e6c85f8889c5c9eb04796fdb76d2807636b9eef5 +Author: Damien Miller +Date: Fri Jan 15 01:30:36 2016 +1100 + + forcibly disable roaming support in the client + +commit ed4ce82dbfa8a3a3c8ea6fa0db113c71e234416c Author: djm@openbsd.org -Date: Wed Jul 15 08:00:11 2015 +0000 +Date: Wed Jan 13 23:04:47 2016 +0000 upstream commit - fix NULL-deref when SSH1 reenabled + eliminate fallback from untrusted X11 forwarding to trusted + forwarding when the X server disables the SECURITY extension; Reported by + Thomas Hoger; ok deraadt@ - Upstream-ID: f22fd805288c92b3e9646782d15b48894b2d5295 + Upstream-ID: f76195bd2064615a63ef9674a0e4096b0713f938 -commit 41e38c4d49dd60908484e6703316651333f16b93 +commit 9a728cc918fad67c8a9a71201088b1e150340ba4 Author: djm@openbsd.org -Date: Wed Jul 15 07:19:50 2015 +0000 +Date: Tue Jan 12 23:42:54 2016 +0000 upstream commit - regen RSA1 test keys; the last batch was missing their - private parts + use explicit_bzero() more liberally in the buffer code; ok + deraadt - Upstream-Regress-ID: 7ccf437305dd63ff0b48dd50c5fd0f4d4230c10a + Upstream-ID: 0ece37069fd66bc6e4f55eb1321f93df372b65bf -commit 5bf0933184cb622ca3f96d224bf3299fd2285acc -Author: markus@openbsd.org -Date: Fri Jul 10 06:23:25 2015 +0000 +commit 4626cbaf78767fc8e9c86dd04785386c59ae0839 +Author: Damien Miller +Date: Fri Jan 8 14:24:56 2016 +1100 - upstream commit + Support Illumos/Solaris fine-grained privileges - Adapt tests, now that DSA if off by default; use - PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA. + Includes a pre-auth privsep sandbox and several pledge() + emulations. bz#2511, patch by Alex Wilson. - Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c + ok dtucker@ -commit 7a6e3fd7b41dbd3756b6bf9acd67954c0b1564cc -Author: markus@openbsd.org -Date: Tue Jul 7 14:54:16 2015 +0000 +commit 422d1b3ee977ff4c724b597fb2e437d38fc8de9d +Author: djm@openbsd.org +Date: Thu Dec 31 00:33:52 2015 +0000 upstream commit - regen test data after mktestdata.sh changes + fix three bugs in KRL code related to (unused) signature + support: verification length was being incorrectly calculated, multiple + signatures were being incorrectly processed and a NULL dereference that + occurred when signatures were verified. Reported by Carl Jackson - Upstream-Regress-ID: 3495ecb082b9a7c048a2d7c5c845d3bf181d25a4 + Upstream-ID: e705e97ad3ccce84291eaa651708dd1b9692576b -commit 7c8c174c69f681d4910fa41c37646763692b28e2 -Author: markus@openbsd.org -Date: Tue Jul 7 14:53:30 2015 +0000 +commit 6074c84bf95d00f29cc7d5d3cd3798737851aa1a +Author: djm@openbsd.org +Date: Wed Dec 30 23:46:14 2015 +0000 upstream commit - adapt tests to new minimum RSA size and default FP format + unused prototype - Upstream-Regress-ID: a4b30afd174ce82b96df14eb49fb0b81398ffd0e + Upstream-ID: f3eef4389d53ed6c0d5c77dcdcca3060c745da97 -commit 6a977a4b68747ade189e43d302f33403fd4a47ac -Author: djm@openbsd.org -Date: Fri Jul 3 04:39:23 2015 +0000 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***