From owner-svn-src-stable-10@FreeBSD.ORG Sun Sep 7 00:44:59 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD3B6A92; Sun, 7 Sep 2014 00:44:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8BD71A26; Sun, 7 Sep 2014 00:44:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s870ixuE029315; Sun, 7 Sep 2014 00:44:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s870ixEv029314; Sun, 7 Sep 2014 00:44:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409070044.s870ixEv029314@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 7 Sep 2014 00:44: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: r271214 - stable/10/etc/rc.d 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.18-1 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, 07 Sep 2014 00:44:59 -0000 Author: gjb Date: Sun Sep 7 00:44:59 2014 New Revision: 271214 URL: http://svnweb.freebsd.org/changeset/base/271214 Log: MFC r271078: Fix typo: s/_maske/_mask/ Approved by: re (rodrigc) Sponsored by: The FreeBSD Foundation Modified: stable/10/etc/rc.d/jail Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/rc.d/jail ============================================================================== --- stable/10/etc/rc.d/jail Sat Sep 6 22:38:32 2014 (r271213) +++ stable/10/etc/rc.d/jail Sun Sep 7 00:44:59 2014 (r271214) @@ -319,7 +319,7 @@ jail_extract_address() _mask=${_mask:-/32} elif [ "${_type}" = "inet6" ]; then - # In case _maske is not set for IPv6, use /128. + # In case _mask is not set for IPv6, use /128. _mask=${_mask:-/128} fi } From owner-svn-src-stable-10@FreeBSD.ORG Sun Sep 7 13:22:52 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 9A1BFC10; Sun, 7 Sep 2014 13:22:52 +0000 (UTC) Date: Sun, 7 Sep 2014 13:22:52 +0000 From: Alexey Dokuchaev To: Alexander Motin Subject: Re: svn commit: r271193 - stable/10/sys/dev/sound/pcm Message-ID: <20140907132252.GB35819@FreeBSD.org> References: <201409061524.s86FOmLs056184@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201409061524.s86FOmLs056184@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-10@freebsd.org X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 07 Sep 2014 13:22:52 -0000 On Sat, Sep 06, 2014 at 03:24:48PM +0000, Alexander Motin wrote: > New Revision: 271193 > URL: http://svnweb.freebsd.org/changeset/base/271193 > > Log: > MFC r269228: > Add support for SOUND_MIXER_INFO IOCTL, used by gstreamer. If these changes are also applicable to stable/8, I'd appreciate if you could MFC them there as well. Thank you, ./danfe From owner-svn-src-stable-10@FreeBSD.ORG Sun Sep 7 18:43:27 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 778486AE; Sun, 7 Sep 2014 18:43:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49C3F1CF0; Sun, 7 Sep 2014 18:43:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87IhRSG040476; Sun, 7 Sep 2014 18:43:27 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87IhQjH040473; Sun, 7 Sep 2014 18:43:26 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201409071843.s87IhQjH040473@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 7 Sep 2014 18:43:26 +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: r271234 - in stable/10/sys: amd64/conf conf i386/conf 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.18-1 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, 07 Sep 2014 18:43:27 -0000 Author: markj Date: Sun Sep 7 18:43:26 2014 New Revision: 271234 URL: http://svnweb.freebsd.org/changeset/base/271234 Log: MFC r271137: Add mrsas(4) to GENERIC for i386 and amd64. Approved by: re (gjb) Modified: stable/10/sys/amd64/conf/GENERIC stable/10/sys/conf/NOTES stable/10/sys/i386/conf/GENERIC Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/conf/GENERIC ============================================================================== --- stable/10/sys/amd64/conf/GENERIC Sun Sep 7 18:42:45 2014 (r271233) +++ stable/10/sys/amd64/conf/GENERIC Sun Sep 7 18:43:26 2014 (r271234) @@ -156,6 +156,7 @@ device aacraid # Adaptec by PMC RAID device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID Modified: stable/10/sys/conf/NOTES ============================================================================== --- stable/10/sys/conf/NOTES Sun Sep 7 18:42:45 2014 (r271233) +++ stable/10/sys/conf/NOTES Sun Sep 7 18:43:26 2014 (r271234) @@ -1672,6 +1672,7 @@ device amrp # SCSI Passthrough interfa device mfi # LSI MegaRAID SAS device mfip # LSI MegaRAID SAS passthrough, requires CAM options MFI_DEBUG +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s # # 3ware ATA RAID Modified: stable/10/sys/i386/conf/GENERIC ============================================================================== --- stable/10/sys/i386/conf/GENERIC Sun Sep 7 18:42:45 2014 (r271233) +++ stable/10/sys/i386/conf/GENERIC Sun Sep 7 18:43:26 2014 (r271234) @@ -162,6 +162,7 @@ device aacraid # Adaptec by PMC RAID device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID From owner-svn-src-stable-10@FreeBSD.ORG Sun Sep 7 20:11:23 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9E5A8B62; Sun, 7 Sep 2014 20:11:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 88A3115AA; Sun, 7 Sep 2014 20:11:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87KBN0c082492; Sun, 7 Sep 2014 20:11:23 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87KBN8d082491; Sun, 7 Sep 2014 20:11:23 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201409072011.s87KBN8d082491@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Sun, 7 Sep 2014 20:11: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: r271236 - stable/10/sys/netinet6 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.18-1 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, 07 Sep 2014 20:11:23 -0000 Author: rodrigc Date: Sun Sep 7 20:11:23 2014 New Revision: 271236 URL: http://svnweb.freebsd.org/changeset/base/271236 Log: MFC r262351: Remove KASSERT from in6p_lookup_mcast_ifp(). When the devel/jenkins port, version 1.551 was started, the kernel would panic if INVARIANTS was enabled in the kernel config. Suggested by: bms Approved by: re (gjb) Modified: stable/10/sys/netinet6/in6_mcast.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet6/in6_mcast.c ============================================================================== --- stable/10/sys/netinet6/in6_mcast.c Sun Sep 7 19:33:38 2014 (r271235) +++ stable/10/sys/netinet6/in6_mcast.c Sun Sep 7 20:11:23 2014 (r271236) @@ -1779,8 +1779,6 @@ in6p_lookup_mcast_ifp(const struct inpcb ("%s: not INP_IPV6 inpcb", __func__)); KASSERT(gsin6->sin6_family == AF_INET6, ("%s: not AF_INET6 group", __func__)); - KASSERT(IN6_IS_ADDR_MULTICAST(&gsin6->sin6_addr), - ("%s: not multicast", __func__)); ifp = NULL; memset(&ro6, 0, sizeof(struct route_in6)); From owner-svn-src-stable-10@FreeBSD.ORG Sun Sep 7 21:30:50 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5352B83A; Sun, 7 Sep 2014 21:30:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3285E1E98; Sun, 7 Sep 2014 21:30:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87LUo8U018339; Sun, 7 Sep 2014 21:30:50 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87LUl52018324; Sun, 7 Sep 2014 21:30:47 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201409072130.s87LUl52018324@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Sun, 7 Sep 2014 21:30:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271238 - in stable/10/sys: cam/ata cam/scsi cddl/contrib/opensolaris/uts/common/fs/zfs cddl/contrib/opensolaris/uts/common/fs/zfs/sys geom 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.18-1 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, 07 Sep 2014 21:30:50 -0000 Author: smh Date: Sun Sep 7 21:30:47 2014 New Revision: 271238 URL: http://svnweb.freebsd.org/changeset/base/271238 Log: MFC r256956: Improve ZFS N-way mirror read performance by using load and locality information. MFC r260713: Fix ZFS mirror code for handling multiple DVA's Also make the addition of the d_rotation_rate binary compatible. This allows storage drivers compiled for 10.0 to work by preserving the ABI for disks. Approved by: re (gjb) Sponsored by: Multiplay Modified: stable/10/sys/cam/ata/ata_da.c stable/10/sys/cam/scsi/scsi_all.h stable/10/sys/cam/scsi/scsi_da.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c stable/10/sys/geom/geom.h stable/10/sys/geom/geom_disk.c stable/10/sys/geom/geom_disk.h stable/10/sys/geom/geom_subr.c stable/10/sys/sys/ata.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ata/ata_da.c ============================================================================== --- stable/10/sys/cam/ata/ata_da.c Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/cam/ata/ata_da.c Sun Sep 7 21:30:47 2014 (r271238) @@ -1229,12 +1229,13 @@ adaregister(struct cam_periph *periph, v "kern.cam.ada.%d.write_cache", periph->unit_number); TUNABLE_INT_FETCH(announce_buf, &softc->write_cache); /* Disable queue sorting for non-rotational media by default. */ - if (cgd->ident_data.media_rotation_rate == 1) + if (cgd->ident_data.media_rotation_rate == ATA_RATE_NON_ROTATING) softc->sort_io_queue = 0; else softc->sort_io_queue = -1; adagetparams(periph, cgd); softc->disk = disk_alloc(); + softc->disk->d_rotation_rate = cgd->ident_data.media_rotation_rate; softc->disk->d_devstat = devstat_new_entry(periph->periph_name, periph->unit_number, softc->params.secsize, DEVSTAT_ALL_SUPPORTED, Modified: stable/10/sys/cam/scsi/scsi_all.h ============================================================================== --- stable/10/sys/cam/scsi/scsi_all.h Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/cam/scsi/scsi_all.h Sun Sep 7 21:30:47 2014 (r271238) @@ -2302,7 +2302,7 @@ struct scsi_vpd_block_characteristics u_int8_t page_length[2]; u_int8_t medium_rotation_rate[2]; #define SVPD_BDC_RATE_NOT_REPORTED 0x00 -#define SVPD_BDC_RATE_NONE_ROTATING 0x01 +#define SVPD_BDC_RATE_NON_ROTATING 0x01 u_int8_t reserved1; u_int8_t nominal_form_factor; #define SVPD_BDC_FORM_NOT_REPORTED 0x00 Modified: stable/10/sys/cam/scsi/scsi_da.c ============================================================================== --- stable/10/sys/cam/scsi/scsi_da.c Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/cam/scsi/scsi_da.c Sun Sep 7 21:30:47 2014 (r271238) @@ -3390,9 +3390,18 @@ dadone(struct cam_periph *periph, union * Disable queue sorting for non-rotational media * by default. */ - if (scsi_2btoul(bdc->medium_rotation_rate) == - SVPD_BDC_RATE_NONE_ROTATING) + u_int old_rate = softc->disk->d_rotation_rate; + + softc->disk->d_rotation_rate = + scsi_2btoul(bdc->medium_rotation_rate); + if (softc->disk->d_rotation_rate == + SVPD_BDC_RATE_NON_ROTATING) { softc->sort_io_queue = 0; + } + if (softc->disk->d_rotation_rate != old_rate) { + disk_attr_changed(softc->disk, + "GEOM::rotation_rate", M_NOWAIT); + } } else { int error; error = daerror(done_ccb, CAM_RETRY_SELTO, @@ -3427,6 +3436,8 @@ dadone(struct cam_periph *periph, union ptr = (uint16_t *)ata_params; if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { + uint16_t old_rate; + for (i = 0; i < sizeof(*ata_params) / 2; i++) ptr[i] = le16toh(ptr[i]); if (ata_params->support_dsm & ATA_SUPPORT_DSM_TRIM && @@ -3442,8 +3453,18 @@ dadone(struct cam_periph *periph, union * Disable queue sorting for non-rotational media * by default. */ - if (ata_params->media_rotation_rate == 1) + old_rate = softc->disk->d_rotation_rate; + softc->disk->d_rotation_rate = + ata_params->media_rotation_rate; + if (softc->disk->d_rotation_rate == + ATA_RATE_NON_ROTATING) { softc->sort_io_queue = 0; + } + + if (softc->disk->d_rotation_rate != old_rate) { + disk_attr_changed(softc->disk, + "GEOM::rotation_rate", M_NOWAIT); + } } else { int error; error = daerror(done_ccb, CAM_RETRY_SELTO, Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h Sun Sep 7 21:30:47 2014 (r271238) @@ -120,6 +120,9 @@ extern void vdev_queue_init(vdev_t *vd); extern void vdev_queue_fini(vdev_t *vd); extern zio_t *vdev_queue_io(zio_t *zio); extern void vdev_queue_io_done(zio_t *zio); +extern int vdev_queue_length(vdev_t *vd); +extern uint64_t vdev_queue_lastoffset(vdev_t *vd); +extern void vdev_queue_register_lastoffset(vdev_t *vd, zio_t *zio); extern void vdev_config_dirty(vdev_t *vd); extern void vdev_config_clean(vdev_t *vd); Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h Sun Sep 7 21:30:47 2014 (r271238) @@ -116,6 +116,7 @@ struct vdev_queue { uint64_t vq_last_offset; hrtime_t vq_io_complete_ts; /* time last i/o completed */ kmutex_t vq_lock; + uint64_t vq_lastoffset; }; /* @@ -227,7 +228,10 @@ struct vdev { spa_aux_vdev_t *vdev_aux; /* for l2cache vdevs */ zio_t *vdev_probe_zio; /* root of current probe */ vdev_aux_t vdev_label_aux; /* on-disk aux state */ - struct trim_map *vdev_trimmap; + struct trim_map *vdev_trimmap; /* map on outstanding trims */ + uint16_t vdev_rotation_rate; /* rotational rate of the media */ +#define VDEV_RATE_UNKNOWN 0 +#define VDEV_RATE_NON_ROTATING 1 /* * For DTrace to work in userland (libzpool) context, these fields must Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Sun Sep 7 21:30:47 2014 (r271238) @@ -42,9 +42,11 @@ * Virtual device vector for GEOM. */ +static g_attrchanged_t vdev_geom_attrchanged; struct g_class zfs_vdev_class = { .name = "ZFS::VDEV", .version = G_VERSION, + .attrchanged = vdev_geom_attrchanged, }; DECLARE_GEOM_CLASS(zfs_vdev_class, zfs_vdev); @@ -62,6 +64,34 @@ SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, bio_ &vdev_geom_bio_delete_disable, 0, "Disable BIO_DELETE"); static void +vdev_geom_set_rotation_rate(vdev_t *vd, struct g_consumer *cp) +{ + int error; + uint16_t rate; + + error = g_getattr("GEOM::rotation_rate", cp, &rate); + if (error == 0) + vd->vdev_rotation_rate = rate; + else + vd->vdev_rotation_rate = VDEV_RATE_UNKNOWN; +} + +static void +vdev_geom_attrchanged(struct g_consumer *cp, const char *attr) +{ + vdev_t *vd; + + vd = cp->private; + if (vd == NULL) + return; + + if (strcmp(attr, "GEOM::rotation_rate") == 0) { + vdev_geom_set_rotation_rate(vd, cp); + return; + } +} + +static void vdev_geom_orphan(struct g_consumer *cp) { vdev_t *vd; @@ -689,6 +719,11 @@ vdev_geom_open(vdev_t *vd, uint64_t *psi vd->vdev_physpath = kmem_alloc(bufsize, KM_SLEEP); snprintf(vd->vdev_physpath, bufsize, "/dev/%s", pp->name); + /* + * Determine the device's rotation rate. + */ + vdev_geom_set_rotation_rate(vd, cp); + return (0); } Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c Sun Sep 7 21:30:47 2014 (r271238) @@ -41,27 +41,97 @@ typedef struct mirror_child { vdev_t *mc_vd; uint64_t mc_offset; int mc_error; + int mc_load; uint8_t mc_tried; uint8_t mc_skipped; uint8_t mc_speculative; } mirror_child_t; typedef struct mirror_map { + int *mm_preferred; + int mm_preferred_cnt; int mm_children; - int mm_replacing; - int mm_preferred; - int mm_root; - mirror_child_t mm_child[1]; + boolean_t mm_replacing; + boolean_t mm_root; + mirror_child_t mm_child[]; } mirror_map_t; -int vdev_mirror_shift = 21; +static int vdev_mirror_shift = 21; + +SYSCTL_DECL(_vfs_zfs_vdev); +static SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, mirror, CTLFLAG_RD, 0, + "ZFS VDEV Mirror"); + +/* + * The load configuration settings below are tuned by default for + * the case where all devices are of the same rotational type. + * + * If there is a mixture of rotating and non-rotating media, setting + * non_rotating_seek_inc to 0 may well provide better results as it + * will direct more reads to the non-rotating vdevs which are more + * likely to have a higher performance. + */ + +/* Rotating media load calculation configuration. */ +static int rotating_inc = 0; +TUNABLE_INT("vfs.zfs.vdev.mirror.rotating_inc", &rotating_inc); +SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_inc, CTLFLAG_RW, + &rotating_inc, 0, "Rotating media load increment for non-seeking I/O's"); + +static int rotating_seek_inc = 5; +TUNABLE_INT("vfs.zfs.vdev.mirror.rotating_seek_inc", &rotating_seek_inc); +SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_inc, CTLFLAG_RW, + &rotating_seek_inc, 0, "Rotating media load increment for seeking I/O's"); + +static int rotating_seek_offset = 1 * 1024 * 1024; +TUNABLE_INT("vfs.zfs.vdev.mirror.rotating_seek_offset", &rotating_seek_offset); +SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_offset, CTLFLAG_RW, + &rotating_seek_offset, 0, "Offset in bytes from the last I/O which " + "triggers a reduced rotating media seek increment"); + +/* Non-rotating media load calculation configuration. */ +static int non_rotating_inc = 0; +TUNABLE_INT("vfs.zfs.vdev.mirror.non_rotating_inc", &non_rotating_inc); +SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_inc, CTLFLAG_RW, + &non_rotating_inc, 0, + "Non-rotating media load increment for non-seeking I/O's"); + +static int non_rotating_seek_inc = 1; +TUNABLE_INT("vfs.zfs.vdev.mirror.non_rotating_seek_inc", + &non_rotating_seek_inc); +SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_seek_inc, CTLFLAG_RW, + &non_rotating_seek_inc, 0, + "Non-rotating media load increment for seeking I/O's"); + + +static inline size_t +vdev_mirror_map_size(int children) +{ + return (offsetof(mirror_map_t, mm_child[children]) + + sizeof(int) * children); +} + +static inline mirror_map_t * +vdev_mirror_map_alloc(int children, boolean_t replacing, boolean_t root) +{ + mirror_map_t *mm; + + mm = kmem_zalloc(vdev_mirror_map_size(children), KM_SLEEP); + mm->mm_children = children; + mm->mm_replacing = replacing; + mm->mm_root = root; + mm->mm_preferred = (int *)((uintptr_t)mm + + offsetof(mirror_map_t, mm_child[children])); + + return mm; +} static void vdev_mirror_map_free(zio_t *zio) { mirror_map_t *mm = zio->io_vsd; - kmem_free(mm, offsetof(mirror_map_t, mm_child[mm->mm_children])); + kmem_free(mm, vdev_mirror_map_size(mm->mm_children)); } static const zio_vsd_ops_t vdev_mirror_vsd_ops = { @@ -69,55 +139,80 @@ static const zio_vsd_ops_t vdev_mirror_v zio_vsd_default_cksum_report }; +static int +vdev_mirror_load(mirror_map_t *mm, vdev_t *vd, uint64_t zio_offset) +{ + uint64_t lastoffset; + int load; + + /* All DVAs have equal weight at the root. */ + if (mm->mm_root) + return (INT_MAX); + + /* + * We don't return INT_MAX if the device is resilvering i.e. + * vdev_resilver_txg != 0 as when tested performance was slightly + * worse overall when resilvering with compared to without. + */ + + /* Standard load based on pending queue length. */ + load = vdev_queue_length(vd); + lastoffset = vdev_queue_lastoffset(vd); + + if (vd->vdev_rotation_rate == VDEV_RATE_NON_ROTATING) { + /* Non-rotating media. */ + if (lastoffset == zio_offset) + return (load + non_rotating_inc); + + /* + * Apply a seek penalty even for non-rotating devices as + * sequential I/O'a can be aggregated into fewer operations + * on the device, thus avoiding unnecessary per-command + * overhead and boosting performance. + */ + return (load + non_rotating_seek_inc); + } + + /* Rotating media I/O's which directly follow the last I/O. */ + if (lastoffset == zio_offset) + return (load + rotating_inc); + + /* + * Apply half the seek increment to I/O's within seek offset + * of the last I/O queued to this vdev as they should incure less + * of a seek increment. + */ + if (ABS(lastoffset - zio_offset) < rotating_seek_offset) + return (load + (rotating_seek_inc / 2)); + + /* Apply the full seek increment to all other I/O's. */ + return (load + rotating_seek_inc); +} + + static mirror_map_t * -vdev_mirror_map_alloc(zio_t *zio) +vdev_mirror_map_init(zio_t *zio) { mirror_map_t *mm = NULL; mirror_child_t *mc; vdev_t *vd = zio->io_vd; - int c, d; + int c; if (vd == NULL) { dva_t *dva = zio->io_bp->blk_dva; spa_t *spa = zio->io_spa; - c = BP_GET_NDVAS(zio->io_bp); - - mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_SLEEP); - mm->mm_children = c; - mm->mm_replacing = B_FALSE; - mm->mm_preferred = spa_get_random(c); - mm->mm_root = B_TRUE; - - /* - * Check the other, lower-index DVAs to see if they're on - * the same vdev as the child we picked. If they are, use - * them since they are likely to have been allocated from - * the primary metaslab in use at the time, and hence are - * more likely to have locality with single-copy data. - */ - for (c = mm->mm_preferred, d = c - 1; d >= 0; d--) { - if (DVA_GET_VDEV(&dva[d]) == DVA_GET_VDEV(&dva[c])) - mm->mm_preferred = d; - } - + mm = vdev_mirror_map_alloc(BP_GET_NDVAS(zio->io_bp), B_FALSE, + B_TRUE); for (c = 0; c < mm->mm_children; c++) { mc = &mm->mm_child[c]; - mc->mc_vd = vdev_lookup_top(spa, DVA_GET_VDEV(&dva[c])); mc->mc_offset = DVA_GET_OFFSET(&dva[c]); } } else { - c = vd->vdev_children; - - mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_SLEEP); - mm->mm_children = c; - mm->mm_replacing = (vd->vdev_ops == &vdev_replacing_ops || - vd->vdev_ops == &vdev_spare_ops); - mm->mm_preferred = mm->mm_replacing ? 0 : - (zio->io_offset >> vdev_mirror_shift) % c; - mm->mm_root = B_FALSE; - + mm = vdev_mirror_map_alloc(vd->vdev_children, + (vd->vdev_ops == &vdev_replacing_ops || + vd->vdev_ops == &vdev_spare_ops), B_FALSE); for (c = 0; c < mm->mm_children; c++) { mc = &mm->mm_child[c]; mc->mc_vd = vd->vdev_child[c]; @@ -211,50 +306,124 @@ vdev_mirror_scrub_done(zio_t *zio) } /* - * Try to find a child whose DTL doesn't contain the block we want to read. + * Check the other, lower-index DVAs to see if they're on the same + * vdev as the child we picked. If they are, use them since they + * are likely to have been allocated from the primary metaslab in + * use at the time, and hence are more likely to have locality with + * single-copy data. + */ +static int +vdev_mirror_dva_select(zio_t *zio, int p) +{ + dva_t *dva = zio->io_bp->blk_dva; + mirror_map_t *mm = zio->io_vsd; + int preferred; + int c; + + preferred = mm->mm_preferred[p]; + for (p-- ; p >= 0; p--) { + c = mm->mm_preferred[p]; + if (DVA_GET_VDEV(&dva[c]) == DVA_GET_VDEV(&dva[preferred])) + preferred = c; + } + return (preferred); +} + +static int +vdev_mirror_preferred_child_randomize(zio_t *zio) +{ + mirror_map_t *mm = zio->io_vsd; + int p; + + if (mm->mm_root) { + p = spa_get_random(mm->mm_preferred_cnt); + return (vdev_mirror_dva_select(zio, p)); + } + + /* + * To ensure we don't always favour the first matching vdev, + * which could lead to wear leveling issues on SSD's, we + * use the I/O offset as a pseudo random seed into the vdevs + * which have the lowest load. + */ + p = (zio->io_offset >> vdev_mirror_shift) % mm->mm_preferred_cnt; + return (mm->mm_preferred[p]); +} + +/* + * Try to find a vdev whose DTL doesn't contain the block we want to read + * prefering vdevs based on determined load. + * * If we can't, try the read on any vdev we haven't already tried. */ static int vdev_mirror_child_select(zio_t *zio) { mirror_map_t *mm = zio->io_vsd; - mirror_child_t *mc; uint64_t txg = zio->io_txg; - int i, c; + int c, lowest_load; ASSERT(zio->io_bp == NULL || BP_PHYSICAL_BIRTH(zio->io_bp) == txg); - /* - * Try to find a child whose DTL doesn't contain the block to read. - * If a child is known to be completely inaccessible (indicated by - * vdev_readable() returning B_FALSE), don't even try. - */ - for (i = 0, c = mm->mm_preferred; i < mm->mm_children; i++, c++) { - if (c >= mm->mm_children) - c = 0; + lowest_load = INT_MAX; + mm->mm_preferred_cnt = 0; + for (c = 0; c < mm->mm_children; c++) { + mirror_child_t *mc; + mc = &mm->mm_child[c]; if (mc->mc_tried || mc->mc_skipped) continue; + if (!vdev_readable(mc->mc_vd)) { mc->mc_error = SET_ERROR(ENXIO); mc->mc_tried = 1; /* don't even try */ mc->mc_skipped = 1; continue; } - if (!vdev_dtl_contains(mc->mc_vd, DTL_MISSING, txg, 1)) - return (c); - mc->mc_error = SET_ERROR(ESTALE); - mc->mc_skipped = 1; - mc->mc_speculative = 1; + + if (vdev_dtl_contains(mc->mc_vd, DTL_MISSING, txg, 1)) { + mc->mc_error = SET_ERROR(ESTALE); + mc->mc_skipped = 1; + mc->mc_speculative = 1; + continue; + } + + mc->mc_load = vdev_mirror_load(mm, mc->mc_vd, mc->mc_offset); + if (mc->mc_load > lowest_load) + continue; + + if (mc->mc_load < lowest_load) { + lowest_load = mc->mc_load; + mm->mm_preferred_cnt = 0; + } + mm->mm_preferred[mm->mm_preferred_cnt] = c; + mm->mm_preferred_cnt++; + } + + if (mm->mm_preferred_cnt == 1) { + vdev_queue_register_lastoffset( + mm->mm_child[mm->mm_preferred[0]].mc_vd, zio); + return (mm->mm_preferred[0]); + } + + if (mm->mm_preferred_cnt > 1) { + int c = vdev_mirror_preferred_child_randomize(zio); + + vdev_queue_register_lastoffset(mm->mm_child[c].mc_vd, zio); + return (c); } /* * Every device is either missing or has this txg in its DTL. * Look for any child we haven't already tried before giving up. */ - for (c = 0; c < mm->mm_children; c++) - if (!mm->mm_child[c].mc_tried) + for (c = 0; c < mm->mm_children; c++) { + if (!mm->mm_child[c].mc_tried) { + vdev_queue_register_lastoffset(mm->mm_child[c].mc_vd, + zio); return (c); + } + } /* * Every child failed. There's no place left to look. @@ -269,7 +438,7 @@ vdev_mirror_io_start(zio_t *zio) mirror_child_t *mc; int c, children; - mm = vdev_mirror_map_alloc(zio); + mm = vdev_mirror_map_init(zio); if (zio->io_type == ZIO_TYPE_READ) { if ((zio->io_flags & ZIO_FLAG_SCRUB) && !mm->mm_replacing) { Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Sun Sep 7 21:30:47 2014 (r271238) @@ -289,6 +289,8 @@ vdev_queue_init(vdev_t *vd) vdev_queue_offset_compare, sizeof (zio_t), offsetof(struct zio, io_queue_node)); } + + vq->vq_lastoffset = 0; } void @@ -815,3 +817,26 @@ vdev_queue_io_done(zio_t *zio) mutex_exit(&vq->vq_lock); } + +/* + * As these three methods are only used for load calculations we're not concerned + * if we get an incorrect value on 32bit platforms due to lack of vq_lock mutex + * use here, instead we prefer to keep it lock free for performance. + */ +int +vdev_queue_length(vdev_t *vd) +{ + return (avl_numnodes(&vd->vdev_queue.vq_active_tree)); +} + +uint64_t +vdev_queue_lastoffset(vdev_t *vd) +{ + return (vd->vdev_queue.vq_lastoffset); +} + +void +vdev_queue_register_lastoffset(vdev_t *vd, zio_t *zio) +{ + vd->vdev_queue.vq_lastoffset = zio->io_offset + zio->io_size; +} Modified: stable/10/sys/geom/geom.h ============================================================================== --- stable/10/sys/geom/geom.h Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/geom/geom.h Sun Sep 7 21:30:47 2014 (r271238) @@ -274,6 +274,7 @@ int g_handleattr(struct bio *bp, const c int len); int g_handleattr_int(struct bio *bp, const char *attribute, int val); int g_handleattr_off_t(struct bio *bp, const char *attribute, off_t val); +int g_handleattr_uint16_t(struct bio *bp, const char *attribute, uint16_t val); int g_handleattr_str(struct bio *bp, const char *attribute, const char *str); struct g_consumer * g_new_consumer(struct g_geom *gp); struct g_geom * g_new_geomf(struct g_class *mp, const char *fmt, ...) Modified: stable/10/sys/geom/geom_disk.c ============================================================================== --- stable/10/sys/geom/geom_disk.c Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/geom/geom_disk.c Sun Sep 7 21:30:47 2014 (r271238) @@ -412,23 +412,32 @@ g_disk_start(struct bio *bp) break; else if (g_handleattr_str(bp, "GEOM::ident", dp->d_ident)) break; - else if (g_handleattr(bp, "GEOM::hba_vendor", - &dp->d_hba_vendor, 2)) + else if (g_handleattr_uint16_t(bp, "GEOM::hba_vendor", + dp->d_hba_vendor)) break; - else if (g_handleattr(bp, "GEOM::hba_device", - &dp->d_hba_device, 2)) + else if (g_handleattr_uint16_t(bp, "GEOM::hba_device", + dp->d_hba_device)) break; - else if (g_handleattr(bp, "GEOM::hba_subvendor", - &dp->d_hba_subvendor, 2)) + else if (g_handleattr_uint16_t(bp, "GEOM::hba_subvendor", + dp->d_hba_subvendor)) break; - else if (g_handleattr(bp, "GEOM::hba_subdevice", - &dp->d_hba_subdevice, 2)) + else if (g_handleattr_uint16_t(bp, "GEOM::hba_subdevice", + dp->d_hba_subdevice)) break; else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump")) g_disk_kerneldump(bp, dp); else if (!strcmp(bp->bio_attribute, "GEOM::setstate")) g_disk_setstate(bp, sc); - else + else if (!strcmp(bp->bio_attribute, "GEOM::rotation_rate")) { + uint64_t v; + + if ((dp->d_flags & DISKFLAG_LACKS_ROTRATE) == 0) + v = dp->d_rotation_rate; + else + v = 0; /* rate unknown */ + g_handleattr_uint16_t(bp, "GEOM::rotation_rate", v); + break; + } else error = ENOIOCTL; break; case BIO_FLUSH: @@ -694,6 +703,8 @@ disk_create(struct disk *dp, int version dp->d_name, dp->d_unit); return; } + if (version < DISK_VERSION_04) + dp->d_flags |= DISKFLAG_LACKS_ROTRATE; KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy")); KASSERT(dp->d_name != NULL, ("disk_create need d_name")); KASSERT(*dp->d_name != 0, ("disk_create need d_name")); Modified: stable/10/sys/geom/geom_disk.h ============================================================================== --- stable/10/sys/geom/geom_disk.h Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/geom/geom_disk.h Sun Sep 7 21:30:47 2014 (r271238) @@ -100,6 +100,9 @@ struct disk { /* Fields private to the driver */ void *d_drv1; + + /* New field - don't use if DISKFLAG_LACKS_ROTRATE is set */ + uint16_t d_rotation_rate; }; #define DISKFLAG_NEEDSGIANT 0x1 @@ -108,6 +111,7 @@ struct disk { #define DISKFLAG_CANFLUSHCACHE 0x8 #define DISKFLAG_UNMAPPED_BIO 0x10 #define DISKFLAG_DIRECT_COMPLETION 0x20 +#define DISKFLAG_LACKS_ROTRATE 0x40 struct disk *disk_alloc(void); void disk_create(struct disk *disk, int version); @@ -122,7 +126,8 @@ int disk_resize(struct disk *dp, int fla #define DISK_VERSION_01 0x5856105a #define DISK_VERSION_02 0x5856105b #define DISK_VERSION_03 0x5856105c -#define DISK_VERSION DISK_VERSION_03 +#define DISK_VERSION_04 0x5856105d +#define DISK_VERSION DISK_VERSION_04 #endif /* _KERNEL */ #endif /* _GEOM_GEOM_DISK_H_ */ Modified: stable/10/sys/geom/geom_subr.c ============================================================================== --- stable/10/sys/geom/geom_subr.c Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/geom/geom_subr.c Sun Sep 7 21:30:47 2014 (r271238) @@ -952,6 +952,13 @@ g_handleattr_int(struct bio *bp, const c } int +g_handleattr_uint16_t(struct bio *bp, const char *attribute, uint16_t val) +{ + + return (g_handleattr(bp, attribute, &val, sizeof val)); +} + +int g_handleattr_off_t(struct bio *bp, const char *attribute, off_t val) { Modified: stable/10/sys/sys/ata.h ============================================================================== --- stable/10/sys/sys/ata.h Sun Sep 7 20:27:48 2014 (r271237) +++ stable/10/sys/sys/ata.h Sun Sep 7 21:30:47 2014 (r271238) @@ -262,6 +262,8 @@ struct ata_params { /*215*/ u_int16_t nv_cache_size_1; u_int16_t nv_cache_size_2; /*217*/ u_int16_t media_rotation_rate; +#define ATA_RATE_NOT_REPORTED 0x0000 +#define ATA_RATE_NON_ROTATING 0x0001 u_int16_t reserved218; /*219*/ u_int16_t nv_cache_opt; /*220*/ u_int16_t wrv_mode; From owner-svn-src-stable-10@FreeBSD.ORG Sun Sep 7 21:40:15 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7353BB3A; Sun, 7 Sep 2014 21:40:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E17C1F76; Sun, 7 Sep 2014 21:40:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87LeFZH022507; Sun, 7 Sep 2014 21:40:15 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87LeFUK022506; Sun, 7 Sep 2014 21:40:15 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201409072140.s87LeFUK022506@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sun, 7 Sep 2014 21:40:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271239 - stable/10/sys/ia64/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.18-1 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, 07 Sep 2014 21:40:15 -0000 Author: marcel Date: Sun Sep 7 21:40:14 2014 New Revision: 271239 URL: http://svnweb.freebsd.org/changeset/base/271239 Log: Fix previous commit: unbreak build of libkvm by including sys/systm.h only when _KERNEL is defined. Approved by: re@ (implicit) Modified: stable/10/sys/ia64/include/pcpu.h Modified: stable/10/sys/ia64/include/pcpu.h ============================================================================== --- stable/10/sys/ia64/include/pcpu.h Sun Sep 7 21:30:47 2014 (r271238) +++ stable/10/sys/ia64/include/pcpu.h Sun Sep 7 21:40:14 2014 (r271239) @@ -31,7 +31,6 @@ #define _MACHINE_PCPU_H_ #include -#include #include struct pcpu_stats { @@ -72,6 +71,8 @@ struct pcpu_md { #ifdef _KERNEL +#include + struct pcpu; register struct pcpu * volatile pcpup __asm__("r13"); From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 08:25:34 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 003C382C; Mon, 8 Sep 2014 08:25:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3E3518E6; Mon, 8 Sep 2014 08:25:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s888PXOU027389; Mon, 8 Sep 2014 08:25:33 GMT (envelope-from kadesai@FreeBSD.org) Received: (from kadesai@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s888PXk3027387; Mon, 8 Sep 2014 08:25:33 GMT (envelope-from kadesai@FreeBSD.org) Message-Id: <201409080825.s888PXk3027387@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kadesai set sender to kadesai@FreeBSD.org using -f From: Kashyap D Desai Date: Mon, 8 Sep 2014 08: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: r271252 - stable/10/sys/dev/mrsas 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.18-1 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, 08 Sep 2014 08:25:34 -0000 Author: kadesai Date: Mon Sep 8 08:25:33 2014 New Revision: 271252 URL: http://svnweb.freebsd.org/changeset/base/271252 Log: MFC r270973 r270973 Fix for WITNESS warning while doing xpt_rescan. This happen when converting any JBOD to RAID or creating any new RAID from Unconfigured Drives. Without this fix, user may see call trace if WITNESS is enabled. System may panic when reconfiguring the RAID. Reviewed by: ambrisko Approved by: re (gleb) --- Modified: stable/10/sys/dev/mrsas/mrsas.h stable/10/sys/dev/mrsas/mrsas_cam.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mrsas/mrsas.h ============================================================================== --- stable/10/sys/dev/mrsas/mrsas.h Mon Sep 8 08:12:09 2014 (r271251) +++ stable/10/sys/dev/mrsas/mrsas.h Mon Sep 8 08:25:33 2014 (r271252) @@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$"); */ #define BYTE_ALIGNMENT 1 #define MRSAS_MAX_NAME_LENGTH 32 -#define MRSAS_VERSION "06.704.01.00-fbsd" +#define MRSAS_VERSION "06.704.01.01-fbsd" #define MRSAS_ULONG_MAX 0xFFFFFFFFFFFFFFFF #define MRSAS_DEFAULT_TIMEOUT 0x14 //temp #define DONE 0 Modified: stable/10/sys/dev/mrsas/mrsas_cam.c ============================================================================== --- stable/10/sys/dev/mrsas/mrsas_cam.c Mon Sep 8 08:12:09 2014 (r271251) +++ stable/10/sys/dev/mrsas/mrsas_cam.c Mon Sep 8 08:25:33 2014 (r271252) @@ -1116,18 +1116,16 @@ int mrsas_bus_scan(struct mrsas_softc *s union ccb *ccb_0; union ccb *ccb_1; - mtx_lock(&sc->sim_lock); if ((ccb_0 = xpt_alloc_ccb()) == NULL) { - mtx_unlock(&sc->sim_lock); return(ENOMEM); } if ((ccb_1 = xpt_alloc_ccb()) == NULL) { xpt_free_ccb(ccb_0); - mtx_unlock(&sc->sim_lock); return(ENOMEM); } + mtx_lock(&sc->sim_lock); if (xpt_create_path(&ccb_0->ccb_h.path, xpt_periph, cam_sim_path(sc->sim_0), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP){ xpt_free_ccb(ccb_0); @@ -1144,9 +1142,9 @@ int mrsas_bus_scan(struct mrsas_softc *s return(EIO); } + mtx_unlock(&sc->sim_lock); xpt_rescan(ccb_0); xpt_rescan(ccb_1); - mtx_unlock(&sc->sim_lock); return(0); } @@ -1161,19 +1159,18 @@ int mrsas_bus_scan_sim(struct mrsas_soft { union ccb *ccb; - mtx_lock(&sc->sim_lock); if ((ccb = xpt_alloc_ccb()) == NULL) { - mtx_unlock(&sc->sim_lock); return(ENOMEM); } + mtx_lock(&sc->sim_lock); if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP){ xpt_free_ccb(ccb); mtx_unlock(&sc->sim_lock); return(EIO); } - xpt_rescan(ccb); mtx_unlock(&sc->sim_lock); + xpt_rescan(ccb); return(0); } From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 11:18:28 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FC1848D; Mon, 8 Sep 2014 11:18:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FAB41D13; Mon, 8 Sep 2014 11:18:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88BIS3P006513; Mon, 8 Sep 2014 11:18:28 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88BIRpu006510; Mon, 8 Sep 2014 11:18:27 GMT (envelope-from des@FreeBSD.org) Message-Id: <201409081118.s88BIRpu006510@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: des set sender to des@FreeBSD.org using -f From: Dag-Erling Smørgrav Date: Mon, 8 Sep 2014 11:18: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: r271260 - in stable/10: etc etc/mtree share/man/man5 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 11:18:28 -0000 Author: des Date: Mon Sep 8 11:18:27 2014 New Revision: 271260 URL: http://svnweb.freebsd.org/changeset/base/271260 Log: MFH (r270392, r270676, r270679, r270698): add support for subdirectories in rc.conf.d Approved by: re (glebius) Modified: stable/10/etc/mtree/BSD.root.dist stable/10/etc/rc.subr stable/10/share/man/man5/rc.conf.5 Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/mtree/BSD.root.dist ============================================================================== --- stable/10/etc/mtree/BSD.root.dist Mon Sep 8 11:01:57 2014 (r271259) +++ stable/10/etc/mtree/BSD.root.dist Mon Sep 8 11:18:27 2014 (r271260) @@ -58,6 +58,8 @@ .. ppp .. + rc.conf.d + .. rc.d .. security Modified: stable/10/etc/rc.subr ============================================================================== --- stable/10/etc/rc.subr Mon Sep 8 11:01:57 2014 (r271259) +++ stable/10/etc/rc.subr Mon Sep 8 11:18:27 2014 (r271260) @@ -1270,7 +1270,7 @@ run_rc_script() # load_rc_config() { - local _name _rcvar_val _var _defval _v _msg _new + local _name _rcvar_val _var _defval _v _msg _new _d _name=$1 if [ -z "$_name" ]; then err 3 'USAGE: load_rc_config name' @@ -1289,10 +1289,21 @@ load_rc_config() fi _rc_conf_loaded=true fi - if [ -f /etc/rc.conf.d/"$_name" ]; then - debug "Sourcing /etc/rc.conf.d/${_name}" - . /etc/rc.conf.d/"$_name" - fi + + for _d in /etc ${local_startup%*/rc.d}; do + if [ -f ${_d}/rc.conf.d/"$_name" ]; then + debug "Sourcing ${_d}/rc.conf.d/$_name" + . ${_d}/rc.conf.d/"$_name" + elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then + local _rc + for _rc in ${_d}/rc.conf.d/"$_name"/* ; do + if [ -f "$_rc" ] ; then + debug "Sourcing $_rc" + . "$_rc" + fi + done + fi + done # Set defaults if defined. for _var in $rcvar; do Modified: stable/10/share/man/man5/rc.conf.5 ============================================================================== --- stable/10/share/man/man5/rc.conf.5 Mon Sep 8 11:01:57 2014 (r271259) +++ stable/10/share/man/man5/rc.conf.5 Mon Sep 8 11:18:27 2014 (r271260) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2014 +.Dd August 27, 2014 .Dt RC.CONF 5 .Os .Sh NAME @@ -63,18 +63,37 @@ The file is used to override settings in .Pa /etc/rc.conf for historical reasons. +.Pp In addition to .Pa /etc/rc.conf.local you can also place smaller configuration files for each .Xr rc 8 script in the .Pa /etc/rc.conf.d -directory, which will be included by the +directory or +.Ao Ar dir Ac Ns Pa /rc.conf.d +directories specified in +.Va local_startup , +which will be included by the .Va load_rc_config function. For jail configurations you could use the file .Pa /etc/rc.conf.d/jail to store jail specific configuration options. +If +.Va local_startup +contains +.Pa /usr/local/etc/rc.d +and +.Pa /opt/conf , +.Pa /usr/local/rc.conf.d/jail +and +.Pa /opt/conf/rc.conf.d/jail +will be loaded. +If +.Ao Ar dir Ac Ns Pa /rc.conf.d/ Ns Ao Ar name Ac +is a directory, +all of files in the directory will be loaded. Also see the .Va rc_conf_files variable below. From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:45:59 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0D1B4847; Mon, 8 Sep 2014 14:45:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ECAF5180A; Mon, 8 Sep 2014 14:45:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88Ejws1006893; Mon, 8 Sep 2014 14:45:58 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88Ejwii006892; Mon, 8 Sep 2014 14:45:58 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201409081445.s88Ejwii006892@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 8 Sep 2014 14:45:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271263 - stable/10/lib/libc/gen X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:45:59 -0000 Author: jhb Date: Mon Sep 8 14:45:58 2014 New Revision: 271263 URL: http://svnweb.freebsd.org/changeset/base/271263 Log: MFC 271048: Always seek back to the beginning of a regular directory, even if the previous seek location was 0. Without this, readdir() would see dd_loc of zero and call getdirentries() which would start reading entries at the current seek location of the directory ignoring the first batch of entries. Also, rewinddir() should always seek so that it reads the directory from the beginning to get updated entries. PR: 192935 Approved by: re (gjb) Modified: stable/10/lib/libc/gen/rewinddir.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/gen/rewinddir.c ============================================================================== --- stable/10/lib/libc/gen/rewinddir.c Mon Sep 8 12:26:52 2014 (r271262) +++ stable/10/lib/libc/gen/rewinddir.c Mon Sep 8 14:45:58 2014 (r271263) @@ -53,7 +53,7 @@ rewinddir(dirp) _pthread_mutex_lock(&dirp->dd_lock); if (dirp->dd_flags & __DTF_READALL) _filldir(dirp, false); - else if (dirp->dd_seek != 0) { + else { (void) lseek(dirp->dd_fd, 0, SEEK_SET); dirp->dd_seek = 0; } From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:44 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8419CD12; Mon, 8 Sep 2014 14:59:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F5661988; Mon, 8 Sep 2014 14:59:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88ExiKo012211; Mon, 8 Sep 2014 14:59:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88Exilp012210; Mon, 8 Sep 2014 14:59:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88Exilp012210@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59:44 +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: r271264 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:59:44 -0000 Author: gjb Date: Mon Sep 8 14:59:43 2014 New Revision: 271264 URL: http://svnweb.freebsd.org/changeset/base/271264 Log: Document r271095, vt(4) keymap support added to the syscons rc(8) startup script. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:45:58 2014 (r271263) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:43 2014 (r271264) @@ -1224,6 +1224,10 @@ script now generates ED25519 &man.sshd.8; host keys if keys do not already exist when ssh_keygen_alg() is invoked. + + Support for &man.vt.4; keyboard maps + has been added to the syscons + &man.rc.d.8; startup script. From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:46 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7436ADEF; Mon, 8 Sep 2014 14:59:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FF2C198B; Mon, 8 Sep 2014 14:59:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88Exkvn012259; Mon, 8 Sep 2014 14:59:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88ExkRB012258; Mon, 8 Sep 2014 14:59:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88ExkRB012258@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59: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: r271265 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:59:46 -0000 Author: gjb Date: Mon Sep 8 14:59:45 2014 New Revision: 271265 URL: http://svnweb.freebsd.org/changeset/base/271265 Log: Document r271111, vt(4) enabled for PS3. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:43 2014 (r271264) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:45 2014 (r271265) @@ -197,6 +197,11 @@ The &man.asmc.4; driver has been updated to support the &apple; Mac Mini 3,1. + The &os;/&arch.powerpc64; default kernel + configuration, GENERIC64, has been + updated to enable the &man.vt.4; console driver for the + Sony® Playstation 3™ platform. + Virtualization Support From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:52 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 421F71CB; Mon, 8 Sep 2014 14:59:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CFE91990; Mon, 8 Sep 2014 14:59:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88Exq35012393; Mon, 8 Sep 2014 14:59:52 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88ExqA5012392; Mon, 8 Sep 2014 14:59:52 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88ExqA5012392@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59: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: r271268 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:59:52 -0000 Author: gjb Date: Mon Sep 8 14:59:51 2014 New Revision: 271268 URL: http://svnweb.freebsd.org/changeset/base/271268 Log: Document r271130, sys/boot/libstand moved to 32-bit specific directory naming convention. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:49 2014 (r271267) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:51 2014 (r271268) @@ -400,6 +400,13 @@ &man.loader.conf.5; as a comma- or space-separated list. By default, kernel and kernel.old are listed. + + The + sys/boot/ sources + have been rearranged, moving &man.libstand.3; to a directory + indicating the library is built as 32-bit. A 64-bit version + of &man.libstand.3; will be added in a future &os; + release. From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:56 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1BB6F3F7; Mon, 8 Sep 2014 14:59:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 079551992; Mon, 8 Sep 2014 14:59:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88Extsc012477; Mon, 8 Sep 2014 14:59:55 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88ExtgI012476; Mon, 8 Sep 2014 14:59:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88ExtgI012476@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59:55 +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: r271270 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:59:56 -0000 Author: gjb Date: Mon Sep 8 14:59:55 2014 New Revision: 271270 URL: http://svnweb.freebsd.org/changeset/base/271270 Log: Document r271153, KSTACK_PAGES increased 4 -> 8 on powerpc64. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:53 2014 (r271269) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:55 2014 (r271270) @@ -220,6 +220,11 @@ performance enchancements to the &man.vt.4; driver have been merged from &os;-CURRENT. + The default stack size + (KSTACK_PAGES) has been increased from + 4 to 8 for the + &arch.powerpc64; architecture. + Virtualization Support From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:58 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0F15B426; Mon, 8 Sep 2014 14:59:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EE9591994; Mon, 8 Sep 2014 14:59:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88ExvTW012529; Mon, 8 Sep 2014 14:59:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88Exvag012528; Mon, 8 Sep 2014 14:59:57 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88Exvag012528@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271271 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:59:58 -0000 Author: gjb Date: Mon Sep 8 14:59:57 2014 New Revision: 271271 URL: http://svnweb.freebsd.org/changeset/base/271271 Log: Document r271205, powerpc ATI Radeon 9700 backlight fix. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:55 2014 (r271270) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:57 2014 (r271271) @@ -225,6 +225,11 @@ 4 to 8 for the &arch.powerpc64; architecture. + The &os;/&arch.powerpc; ATI driver + has been updated to support enabling and disabling the + Radeon 9700 backlight, found in the + &apple; PowerBook™ G4. + Virtualization Support From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:59 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDF324A3; Mon, 8 Sep 2014 14:59:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA1251997; Mon, 8 Sep 2014 14:59:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88Exx9V012589; Mon, 8 Sep 2014 14:59:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88Exx8W012588; Mon, 8 Sep 2014 14:59:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88Exx8W012588@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59: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: r271272 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 15:00:00 -0000 Author: gjb Date: Mon Sep 8 14:59:59 2014 New Revision: 271272 URL: http://svnweb.freebsd.org/changeset/base/271272 Log: Document r271234, mrsas(4) enabled in GENERIC for amd64 and i386. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:57 2014 (r271271) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:59 2014 (r271272) @@ -835,6 +835,11 @@ The &man.hptnr.4; driver has been updated to version 1.0.1. + + The &man.mrsas.4; driver has been + added to the GENERIC kernel + configuration on &arch.amd64; and &arch.i386; + architectures. From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:48 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65BFBED3; Mon, 8 Sep 2014 14:59:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 518AF198E; Mon, 8 Sep 2014 14:59:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88ExmgK012303; Mon, 8 Sep 2014 14:59:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88ExmZ4012302; Mon, 8 Sep 2014 14:59:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88ExmZ4012302@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59: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: r271266 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:59:48 -0000 Author: gjb Date: Mon Sep 8 14:59:47 2014 New Revision: 271266 URL: http://svnweb.freebsd.org/changeset/base/271266 Log: Document r271116, ofwfb updated to work with x11-servers/xorg-server. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:45 2014 (r271265) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:47 2014 (r271266) @@ -202,6 +202,20 @@ updated to enable the &man.vt.4; console driver for the Sony® Playstation 3™ platform. + The + &os;/&arch.powerpc; ofwfb driver, used to + provide a graphics console when the &man.vt.4; console driver + is used, has been modified to work with the x11-drivers/xf86-video-scfb + port. + + + If using an ATI graphics card with + the &man.vt.4; driver, the x11-servers/xorg-server package + must be updated to version 1.12.4_8 or newer. + + Virtualization Support From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:50 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FCFAC1; Mon, 8 Sep 2014 14:59:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B39E198F; Mon, 8 Sep 2014 14:59:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88ExoO5012345; Mon, 8 Sep 2014 14:59:50 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88ExoKv012344; Mon, 8 Sep 2014 14:59:50 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88ExoKv012344@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271267 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:59:50 -0000 Author: gjb Date: Mon Sep 8 14:59:49 2014 New Revision: 271267 URL: http://svnweb.freebsd.org/changeset/base/271267 Log: Document r271128, several performance enhancements to vt(4). Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:47 2014 (r271266) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:49 2014 (r271267) @@ -216,6 +216,10 @@ must be updated to version 1.12.4_8 or newer. + Several + performance enchancements to the &man.vt.4; driver have been + merged from &os;-CURRENT. + Virtualization Support From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 14:59:54 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B0402CF; Mon, 8 Sep 2014 14:59:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1CD381991; Mon, 8 Sep 2014 14:59:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88ExrKj012435; Mon, 8 Sep 2014 14:59:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88ExrXm012434; Mon, 8 Sep 2014 14:59:53 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081459.s88ExrXm012434@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 14:59:53 +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: r271269 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 14:59:54 -0000 Author: gjb Date: Mon Sep 8 14:59:53 2014 New Revision: 271269 URL: http://svnweb.freebsd.org/changeset/base/271269 Log: - Refine entry for r271130 since a follow-up commit adds 64-bit libstand. - Document r271135, initial UEFI boot support. - Document r271136, boot1.efi, boot1.efifat, loader.efi installed to /boot. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:51 2014 (r271268) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:53 2014 (r271269) @@ -404,9 +404,40 @@ The sys/boot/ sources have been rearranged, moving &man.libstand.3; to a directory - indicating the library is built as 32-bit. A 64-bit version - of &man.libstand.3; will be added in a future &os; - release. + indicating the library is built as 32-bit. + + The + &man.libstand.3; library has been updated to produce + a 64-bit shared library for the &os;/&arch.amd64; and + &os;/&arch.powerpc64; architectures. + + Initial support for UEFI + boot has been added. + + Three + new files are installed to /boot, supporting + UEFI boot: + + + + boot1.efi: The + UEFI first stage bootstrap + file. + + + + boot1.efifat: + A FAT filesystem image containing + an EFI system partition. + + + + loader.efi: The third stage + bootstrap file. + + From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 15:00:02 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 04A4D642; Mon, 8 Sep 2014 15:00:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9678199D; Mon, 8 Sep 2014 15:00:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88F0112012766; Mon, 8 Sep 2014 15:00:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88F01cr012764; Mon, 8 Sep 2014 15:00:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081500.s88F01cr012764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 15:00: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: r271273 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 15:00:02 -0000 Author: gjb Date: Mon Sep 8 15:00:01 2014 New Revision: 271273 URL: http://svnweb.freebsd.org/changeset/base/271273 Log: Document r271260, support for /etc/rc.d// subdirectories. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 14:59:59 2014 (r271272) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 15:00:01 2014 (r271273) @@ -1304,6 +1304,14 @@ Support for &man.vt.4; keyboard maps has been added to the syscons &man.rc.d.8; startup script. + + Support for subdirectories within + /etc/rc.conf.d/service/ + has been added the &man.rc.d.8;. This allows creating + separate configuration files for services such as + netif, for example, where each network + interface can have a separate configuration file. From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 15:28:17 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD9C125E; Mon, 8 Sep 2014 15:28:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A90E71D1A; Mon, 8 Sep 2014 15:28:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88FSHGw026783; Mon, 8 Sep 2014 15:28:17 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88FSHTB026782; Mon, 8 Sep 2014 15:28:17 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409081528.s88FSHTB026782@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 8 Sep 2014 15:28: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: r271274 - 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.18-1 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, 08 Sep 2014 15:28:17 -0000 Author: emaste Date: Mon Sep 8 15:28:17 2014 New Revision: 271274 URL: http://svnweb.freebsd.org/changeset/base/271274 Log: MFC r270976: Allow standalone debug for non-default ${PROG} targets This allows WITH_DEBUG_FILES to produce standalone debug for the ELF runtime linker. We previously disabled standalone debug files for bsd.prog.mk consumers that included a non-default ${PROG} target, but this is not required. Consumers that do not support standalone debug are still handled by disabling it for statically linked binaries, and for those that specify a non-default binary format. Sponsored by: DARPA, AFRL Approved by: re Modified: stable/10/share/mk/bsd.prog.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.prog.mk ============================================================================== --- stable/10/share/mk/bsd.prog.mk Mon Sep 8 15:00:01 2014 (r271273) +++ stable/10/share/mk/bsd.prog.mk Mon Sep 8 15:28:17 2014 (r271274) @@ -28,9 +28,7 @@ CTFFLAGS+= -g PROG= ${PROG_CXX} .endif -.if defined(PROG) && target(${PROG}) -MK_DEBUG_FILES= no -.elif !empty(LDFLAGS:M-Wl,*--oformat,*) || !empty(LDFLAGS:M-static) +.if !empty(LDFLAGS:M-Wl,*--oformat,*) || !empty(LDFLAGS:M-static) MK_DEBUG_FILES= no .endif From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 15:40:55 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBF999CA; Mon, 8 Sep 2014 15:40:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B72F51E70; Mon, 8 Sep 2014 15:40:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88FetJ8035109; Mon, 8 Sep 2014 15:40:55 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88FetqZ035087; Mon, 8 Sep 2014 15:40:55 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409081540.s88FetqZ035087@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 8 Sep 2014 15:40:55 +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: r271275 - stable/10/share/zoneinfo 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.18-1 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, 08 Sep 2014 15:40:55 -0000 Author: emaste Date: Mon Sep 8 15:40:55 2014 New Revision: 271275 URL: http://svnweb.freebsd.org/changeset/base/271275 Log: MFC r271047: Avoid ./ in zoneinfo entries in METALOG Use of "find ." resulted in METALOG entries with an extra ./ -- e.g., ./usr/share/zoneinfo/./America/Toronto. Avoid this by using globbing via "find *" instead. Approved by: re Sponsored by: DARPA, AFRL Modified: stable/10/share/zoneinfo/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/share/zoneinfo/Makefile ============================================================================== --- stable/10/share/zoneinfo/Makefile Mon Sep 8 15:28:17 2014 (r271274) +++ stable/10/share/zoneinfo/Makefile Mon Sep 8 15:40:55 2014 (r271275) @@ -79,7 +79,7 @@ zoneinfo: yearistype ${TDATA} beforeinstall: cd ${TZBUILDDIR} && \ - find . -type f -print -exec ${INSTALL} \ + find * -type f -print -exec ${INSTALL} \ -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ \{} ${DESTDIR}/usr/share/zoneinfo/\{} \; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 15:42:46 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 780B6B33; Mon, 8 Sep 2014 15:42:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6351E1F1E; Mon, 8 Sep 2014 15:42:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88FgkBk036090; Mon, 8 Sep 2014 15:42:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88Fgkin036089; Mon, 8 Sep 2014 15:42:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081542.s88Fgkin036089@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 15:42: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: r271276 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 15:42:46 -0000 Author: gjb Date: Mon Sep 8 15:42:45 2014 New Revision: 271276 URL: http://svnweb.freebsd.org/changeset/base/271276 Log: Document r263720, hostname- and IP-based restrictions added to ctld(8). Submitted by: trasz Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 15:40:55 2014 (r271275) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 15:42:45 2014 (r271276) @@ -654,6 +654,11 @@ deferring wakeup until enough data has been received to read or write a file, reducing CPU usage and throughput performance with large I/O workloads. + + Support for hostname- and IP-based access + restriction has been added to the iSCSI + &man.ctld.8; daemon. From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 15:42:48 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6879CB34; Mon, 8 Sep 2014 15:42:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 537C11F1F; Mon, 8 Sep 2014 15:42:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88FgmEP036133; Mon, 8 Sep 2014 15:42:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88FgmUe036132; Mon, 8 Sep 2014 15:42:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409081542.s88FgmUe036132@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 8 Sep 2014 15:42: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: r271277 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 08 Sep 2014 15:42:48 -0000 Author: gjb Date: Mon Sep 8 15:42:47 2014 New Revision: 271277 URL: http://svnweb.freebsd.org/changeset/base/271277 Log: - Document 263725, ctld(8) 'portal-group' is overrideable. - Document 263726, ctld(8) 'auth-group' default entry. Submitted by: trasz Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 15:42:45 2014 (r271276) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 8 15:42:47 2014 (r271277) @@ -659,6 +659,17 @@ sponsor="&ff;">Support for hostname- and IP-based access restriction has been added to the iSCSI &man.ctld.8; daemon. + + The &man.ctld.8; daemon has been updated + to allow overriding the default + portal-group configuration. + + The &man.ctld.8; daemon now includes a new + auth-group, default, + defaulting to deny, which is possible + to override. From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 19:40:59 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E324CB17; Mon, 8 Sep 2014 19:40:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CDE761014; Mon, 8 Sep 2014 19:40:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88JexYU052489; Mon, 8 Sep 2014 19:40:59 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88JexqS052487; Mon, 8 Sep 2014 19:40:59 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201409081940.s88JexqS052487@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 8 Sep 2014 19:40: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: r271288 - in stable/10: sys/netinet6 usr.bin/netstat 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.18-1 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, 08 Sep 2014 19:41:00 -0000 Author: ae Date: Mon Sep 8 19:40:59 2014 New Revision: 271288 URL: http://svnweb.freebsd.org/changeset/base/271288 Log: MFC r270927: Add the reverse part to rule #9. Also change its description in the netstat(8) output. Approved by: re (gjb) Modified: stable/10/sys/netinet6/in6_src.c stable/10/usr.bin/netstat/inet6.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet6/in6_src.c ============================================================================== --- stable/10/sys/netinet6/in6_src.c Mon Sep 8 19:26:21 2014 (r271287) +++ stable/10/sys/netinet6/in6_src.c Mon Sep 8 19:40:59 2014 (r271288) @@ -447,6 +447,8 @@ in6_selectsrc(struct sockaddr_in6 *dstso */ if (ifa_preferred(&ia_best->ia_ifa, &ia->ia_ifa)) REPLACE(9); + if (ifa_preferred(&ia->ia_ifa, &ia_best->ia_ifa)) + NEXT(9); /* * Rule 14: Use longest matching prefix. Modified: stable/10/usr.bin/netstat/inet6.c ============================================================================== --- stable/10/usr.bin/netstat/inet6.c Mon Sep 8 19:26:21 2014 (r271287) +++ stable/10/usr.bin/netstat/inet6.c Mon Sep 8 19:40:59 2014 (r271288) @@ -345,7 +345,7 @@ static const char *srcrule_str[] = { "matching label", "public/temporary address", "alive interface", - "preferred interface", + "better virtual status", "rule #10", "rule #11", "rule #12", From owner-svn-src-stable-10@FreeBSD.ORG Mon Sep 8 21:10:51 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ADFB96E7; Mon, 8 Sep 2014 21:10:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 994701D38; Mon, 8 Sep 2014 21:10:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88LApeE096923; Mon, 8 Sep 2014 21:10:51 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88LAppo096922; Mon, 8 Sep 2014 21:10:51 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409082110.s88LAppo096922@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 8 Sep 2014 21:10: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: r271289 - 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.18-1 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, 08 Sep 2014 21:10:51 -0000 Author: emaste Date: Mon Sep 8 21:10:51 2014 New Revision: 271289 URL: http://svnweb.freebsd.org/changeset/base/271289 Log: MFC r265014: Report boot method (BIOS/UEFI) via sysctl machdep.bootmethod Approved by: re Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/amd64/amd64/machdep.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/amd64/machdep.c ============================================================================== --- stable/10/sys/amd64/amd64/machdep.c Mon Sep 8 19:40:59 2014 (r271288) +++ stable/10/sys/amd64/amd64/machdep.c Mon Sep 8 21:10:51 2014 (r271289) @@ -1519,6 +1519,10 @@ add_efi_map_entries(struct efi_map_heade } } +static char bootmethod[16] = ""; +SYSCTL_STRING(_machdep, OID_AUTO, bootmethod, CTLFLAG_RD, bootmethod, 0, + "System firmware boot method"); + /* * Populate the (physmap) array with base/bound pairs describing the * available physical memory in the system, then test this memory and @@ -1549,12 +1553,15 @@ getmemsize(caddr_t kmdp, u_int64_t first smapbase = (struct bios_smap *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_SMAP); - if (efihdr != NULL) + if (efihdr != NULL) { add_efi_map_entries(efihdr, physmap, &physmap_idx); - else if (smapbase != NULL) + strlcpy(bootmethod, "UEFI", sizeof(bootmethod)); + } else if (smapbase != NULL) { add_smap_entries(smapbase, physmap, &physmap_idx); - else + strlcpy(bootmethod, "BIOS", sizeof(bootmethod)); + } else { panic("No BIOS smap or EFI map info from loader!"); + } /* * Find the 'base memory' segment for SMP From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 04:00:33 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7AAEF8C1; Tue, 9 Sep 2014 04:00:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A3A889D; Tue, 9 Sep 2014 04:00:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8940XrC099658; Tue, 9 Sep 2014 04:00:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8940Vwv099647; Tue, 9 Sep 2014 04:00:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201409090400.s8940Vwv099647@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 9 Sep 2014 04:00:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271298 - in stable/10: . etc/mtree libexec/atf libexec/atf/atf-check libexec/atf/atf-sh share/mk tools/build/mk usr.bin 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.18-1 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, 09 Sep 2014 04:00:33 -0000 Author: ngie Date: Tue Sep 9 04:00:30 2014 New Revision: 271298 URL: http://svnweb.freebsd.org/changeset/base/271298 Log: MFC r267176, r267181, r268445 (ATF-related commits): Phabric: https://reviews.freebsd.org/D706 Approved by: rpaulo (mentor) Approved by: re (gjb) Reviewed by: jmmv Sponsored by: EMC / Isilon Storage Division r267176: Add the *_TESTS_SH_SED_* functionality to atf.test.mk. This exists already in plain.test.mk and tap.test.mk and should have been added to atf.test.mk too when the feature was first introduced. (It is probably time to address the related TODOs but I will do that separately.) r267181: Move atf-sh from /usr/bin/ to /usr/libexec/ In r266650, we made libatf-c and libatf-c++ private libraries so that no components outside of the source tree could unintendedly depend on them. This change does the same for the "atf-sh library" by moving the atf-sh interpreter from its public location in /usr/bin/ to the private location in /usr/libexec/. Our build system will ensure that our own test programs use the right binary, but users won't be able to depend on atf-sh by "mistake". Committing this now to ride the UPDATING notice added with r267172 today. r268445: Fix atf-sh's integration_test With the move of atf-sh into /usr/libexec in r267181, some of the tests in the integration_test program broke because they could not execute atf-sh from the path any longer. This slipped through because I do have a local atf installation in my home directory that appears in my path, hence the tests could still execute my own version. Fix this by forcing /usr/libexec to appear at the beginning of the path when attempting to execute atf-sh. To make upgrading easy (and to avoid an unnecessary entry in UPDATING), make integration_test depend on the Makefile so that a rebuild of the shell script is triggered. This requires a hack in the *.test.mk files to ensure the Makefile is not treated as a source to the generated program. Ugly, I know, but I don't have a better way of doing this at the moment. Will think of one once I address the TODO in the *.test.mk files that suggests generalizing the file generation functionality. PR: 191052 Reviewed by: Garrett Cooper Added: stable/10/libexec/atf/atf-sh/ - copied from r267181, head/libexec/atf/atf-sh/ Modified: stable/10/UPDATING stable/10/etc/mtree/BSD.tests.dist stable/10/libexec/atf/Makefile stable/10/libexec/atf/Makefile.inc stable/10/libexec/atf/atf-check/Makefile stable/10/libexec/atf/atf-sh/Makefile stable/10/share/mk/atf.test.mk stable/10/share/mk/plain.test.mk stable/10/share/mk/tap.test.mk stable/10/tools/build/mk/OptionalObsoleteFiles.inc stable/10/usr.bin/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/UPDATING ============================================================================== --- stable/10/UPDATING Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/UPDATING Tue Sep 9 04:00:30 2014 (r271298) @@ -33,11 +33,16 @@ older version of current is a bit fragil programs once the operator executes "make delete-old-libs" after a "make installworld". + Additionally, the atf-sh binary was made private by moving it into + /usr/libexec/. Already-built shell test programs will keep the + path to the old binary so they will break after "make delete-old" + is run. + If you are using WITH_TESTS=yes (not the default), wipe the object tree and rebuild from scratch to prevent spurious test failures. - This is only needed once: the old, misnumbered libraries have been - added to OptionalObsoleteFiles.inc so they will be removed during a - clean upgrade. + This is only needed once: the misnumbered libraries and misplaced + binaries have been added to OptionalObsoleteFiles.inc so they will + be removed during a clean upgrade. 20140814: The ixgbe tunables now match their sysctl counterparts, for example: Modified: stable/10/etc/mtree/BSD.tests.dist ============================================================================== --- stable/10/etc/mtree/BSD.tests.dist Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/etc/mtree/BSD.tests.dist Tue Sep 9 04:00:30 2014 (r271298) @@ -92,6 +92,8 @@ atf atf-check .. + atf-sh + .. .. .. sbin @@ -133,10 +135,6 @@ usr.bin apply .. - atf - atf-sh - .. - .. calendar .. comm Modified: stable/10/libexec/atf/Makefile ============================================================================== --- stable/10/libexec/atf/Makefile Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/libexec/atf/Makefile Tue Sep 9 04:00:30 2014 (r271298) @@ -25,6 +25,6 @@ # # $FreeBSD$ -SUBDIR= atf-check tests +SUBDIR= atf-check atf-sh tests .include Modified: stable/10/libexec/atf/Makefile.inc ============================================================================== --- stable/10/libexec/atf/Makefile.inc Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/libexec/atf/Makefile.inc Tue Sep 9 04:00:30 2014 (r271298) @@ -28,3 +28,5 @@ CFLAGS+= -DHAVE_CONFIG_H WARNS?= 3 + +.include "../Makefile.inc" Modified: stable/10/libexec/atf/atf-check/Makefile ============================================================================== --- stable/10/libexec/atf/atf-check/Makefile Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/libexec/atf/atf-check/Makefile Tue Sep 9 04:00:30 2014 (r271298) @@ -30,7 +30,6 @@ ATF= ${.CURDIR:H:H:H}/contrib/atf .PATH: ${ATF}/atf-sh -BINDIR= /usr/libexec PROG_CXX= atf-check SRCS= atf-check.cpp MAN= atf-check.1 Modified: stable/10/libexec/atf/atf-sh/Makefile ============================================================================== --- head/libexec/atf/atf-sh/Makefile Fri Jun 6 18:58:06 2014 (r267181) +++ stable/10/libexec/atf/atf-sh/Makefile Tue Sep 9 04:00:30 2014 (r271298) @@ -25,7 +25,6 @@ # # $FreeBSD$ -.include .include ATF= ${.CURDIR:H:H:H}/contrib/atf Modified: stable/10/share/mk/atf.test.mk ============================================================================== --- stable/10/share/mk/atf.test.mk Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/share/mk/atf.test.mk Tue Sep 9 04:00:30 2014 (r271298) @@ -98,10 +98,15 @@ _TESTS+= ${ATF_TESTS_SH} SCRIPTSDIR_${_T}= ${TESTSDIR} TEST_INTERFACE.${_T}= atf CLEANFILES+= ${_T} ${_T}.tmp +# TODO(jmmv): It seems to me that this SED and SRC functionality should +# exist in bsd.prog.mk along the support for SCRIPTS. Move it there if +# this proves to be useful within the tests. +ATF_TESTS_SH_SED_${_T}?= # empty ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh ${_T}: ${ATF_TESTS_SH_SRC_${_T}} - echo '#! /usr/bin/atf-sh' > ${.TARGET}.tmp - cat ${.ALLSRC} >> ${.TARGET}.tmp + echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp + cat ${.ALLSRC:N*Makefile*} \ + | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp chmod +x ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .endfor Modified: stable/10/share/mk/plain.test.mk ============================================================================== --- stable/10/share/mk/plain.test.mk Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/share/mk/plain.test.mk Tue Sep 9 04:00:30 2014 (r271298) @@ -57,7 +57,8 @@ CLEANFILES+= ${_T} ${_T}.tmp PLAIN_TESTS_SH_SED_${_T}?= # empty PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh ${_T}: ${PLAIN_TESTS_SH_SRC_${_T}} - cat ${.ALLSRC} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp + cat ${.ALLSRC:N*Makefile*} \ + | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp chmod +x ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .endfor Modified: stable/10/share/mk/tap.test.mk ============================================================================== --- stable/10/share/mk/tap.test.mk Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/share/mk/tap.test.mk Tue Sep 9 04:00:30 2014 (r271298) @@ -66,7 +66,7 @@ TAP_TESTS_PERL_SRC_${_T}?= ${_T}.pl ${_T}: ${TAP_TESTS_PERL_SRC_${_T}} { \ echo '#! ${TAP_PERL_INTERPRETER}'; \ - cat ${.ALLSRC} | sed ${TAP_TESTS_PERL_SED_${_T}}; \ + cat ${.ALLSRC:N*Makefile*} | sed ${TAP_TESTS_PERL_SED_${_T}}; \ } >${.TARGET}.tmp chmod +x ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Tue Sep 9 04:00:30 2014 (r271298) @@ -4070,6 +4070,7 @@ OLD_FILES+=usr/share/man/man8/telnetd.8. .endif .if ${MK_TESTS} == yes +OLD_FILES+=usr/bin/atf-sh OLD_LIBS+=usr/lib/libatf-c++.a OLD_LIBS+=usr/lib/libatf-c++.so OLD_LIBS+=usr/lib/libatf-c++.so.1 @@ -4130,6 +4131,17 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/pr OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test +OLD_FILES+=usr/tests/usr.bin/atf/Kyuafile +OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/Kyuafile +OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/atf_check_test +OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/config_test +OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/integration_test +OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/misc_helpers +OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/normalize_test +OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tc_test +OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tp_test +OLD_DIRS+=usr/tests/usr.bin/atf/atf-sh +OLD_DIRS+=usr/tests/usr.bin/atf .if ${MK_MAKE} == yes && ${MK_BMAKE} == yes OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile Modified: stable/10/usr.bin/Makefile ============================================================================== --- stable/10/usr.bin/Makefile Tue Sep 9 03:10:21 2014 (r271297) +++ stable/10/usr.bin/Makefile Tue Sep 9 04:00:30 2014 (r271298) @@ -12,7 +12,6 @@ SUBDIR= alias \ apply \ asa \ - ${_atf} \ awk \ banner \ basename \ @@ -335,7 +334,6 @@ SUBDIR+= telnet .endif .if ${MK_TESTS} != "no" -_atf= atf _tests= tests .endif From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 10:29:27 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 96EC425B; Tue, 9 Sep 2014 10:29:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 829FEFEA; Tue, 9 Sep 2014 10:29:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89ATRfw076288; Tue, 9 Sep 2014 10:29:27 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89ATR2p076287; Tue, 9 Sep 2014 10:29:27 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201409091029.s89ATR2p076287@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 9 Sep 2014 10:29: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: r271306 - stable/10/sys/netpfil/pf 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.18-1 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, 09 Sep 2014 10:29:27 -0000 Author: glebius Date: Tue Sep 9 10:29:27 2014 New Revision: 271306 URL: http://svnweb.freebsd.org/changeset/base/271306 Log: Merge r270928: explicitly free packet on PF_DROP, otherwise a "quick" rule with "route-to" may still forward it. PR: 177808 Approved by: re (gjb) Modified: stable/10/sys/netpfil/pf/pf.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netpfil/pf/pf.c ============================================================================== --- stable/10/sys/netpfil/pf/pf.c Tue Sep 9 10:13:46 2014 (r271305) +++ stable/10/sys/netpfil/pf/pf.c Tue Sep 9 10:29:27 2014 (r271306) @@ -6003,6 +6003,10 @@ done: *m0 = NULL; action = PF_PASS; break; + case PF_DROP: + m_freem(*m0); + *m0 = NULL; + break; default: /* pf_route() returns unlocked. */ if (r->rt) { @@ -6379,6 +6383,10 @@ done: *m0 = NULL; action = PF_PASS; break; + case PF_DROP: + m_freem(*m0); + *m0 = NULL; + break; default: /* pf_route6() returns unlocked. */ if (r->rt) { From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 16:11:05 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EAD55F16; Tue, 9 Sep 2014 16:11:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4606167; Tue, 9 Sep 2014 16:11:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89GB4Oi045628; Tue, 9 Sep 2014 16:11:04 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89GB44g045627; Tue, 9 Sep 2014 16:11:04 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409091611.s89GB44g045627@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 9 Sep 2014 16:11: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: r271318 - stable/10/release/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.18-1 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, 09 Sep 2014 16:11:05 -0000 Author: emaste Date: Tue Sep 9 16:11:04 2014 New Revision: 271318 URL: http://svnweb.freebsd.org/changeset/base/271318 Log: MFC UEFI memstick build script r264935 (gjb): Add a separate script to build the memstick.img and the mini-memstick.img with UEFI support. As the comments in the file suggest, 1) there must be existing ${.OBJDIR}/usr/src/release/{release,bootonly}; 2) TARGET/TARGET_ARCH must be amd64; and 3) it must be a vt(4)-enabled kernel with vt_efifb (*not* vt_vga). This script is not hooked into release/Makefile in any way until further testing is complete. r264992 (nwhitehorn): Make a dual-boot BIOS/UEFI memstick image. Testing required before this gets renamed make-memstick.sh. r265017 (nwhitehorn): loader's GPT support on BIOS does not seem to like the root filesystem being the last filesystem on the disk for some reason when made by this script. Add a vestigial swap partition to allow this to boot with QEMU BIOS. Approved by: re Sponsored by: The FreeBSD Foundation Added: stable/10/release/amd64/make-uefi-memstick.sh - copied, changed from r264935, head/release/amd64/make-uefi-memstick.sh Modified: Directory Properties: stable/10/ (props changed) Copied and modified: stable/10/release/amd64/make-uefi-memstick.sh (from r264935, head/release/amd64/make-uefi-memstick.sh) ============================================================================== --- head/release/amd64/make-uefi-memstick.sh Fri Apr 25 21:11:00 2014 (r264935, copy source) +++ stable/10/release/amd64/make-uefi-memstick.sh Tue Sep 9 16:11:04 2014 (r271318) @@ -1,12 +1,9 @@ #!/bin/sh # -# This script generates a "memstick image" for UEFI-capable systems. -# -# Prerequisites: -# - 'make release' -# - KERNCONF *must* be VT (or vt_efifb(4) compiled into the kernel) -# -# Note: This only works for amd64, because i386 lacks the EFI boot bits. +# This script generates a "memstick image" (image that can be copied to a +# USB memory stick) from a directory tree. Note that the script does not +# clean up after itself very well for error conditions on purpose so the +# problem can be diagnosed (full filesystem most likely but ...). # # Usage: make-memstick.sh # @@ -31,43 +28,14 @@ if [ -e ${2} ]; then exit 1 fi -dirsize=$(du -shLm ${1} | awk '{print $1}') -dirsize=$(( $(( $(( ${dirsize} + 256 )) * 1024 * 1024 )) )) -truncate -s ${dirsize} ${2} - -unit=$(mdconfig -a -t vnode -f ${2}) -gpart create -s mbr /dev/${unit} -gpart add -t '!0xEF' -s 32M /dev/${unit} -gpart add -t freebsd /dev/${unit} -gpart set -a active -i 2 /dev/${unit} -gpart bootcode -b ${1}/boot/boot0 /dev/${unit} -gpart create -s bsd -n 20 /dev/${unit}s2 -gpart add -t freebsd-ufs /dev/${unit}s2 -gpart bootcode -b ${1}/boot/boot /dev/${unit}s2 -newfs_msdos /dev/${unit}s1 -newfs -L rootfs /dev/${unit}s2a -mkdir -p ${1}/mnt -mount -t msdosfs /dev/${unit}s1 ${1}/mnt -mkdir -p ${1}/mnt/efi/boot -cp -p ${1}/boot/boot1.efi ${1}/mnt/efi/boot/BOOTx64.efi - -while ! umount ${1}/mnt; do - sleep 1 -done - -mkdir -p mnt -mount /dev/${unit}s2a mnt -tar -cf - -C ${1} . | tar -xf - -C mnt -echo "/dev/ufs/rootfs / ufs ro,noatime 1 1" > mnt/etc/fstab - -while ! umount mnt; do - sleep 1 -done - -# Default boot selection to MBR so systems that do not support UEFI -# do not fail to boot without human interaction. -boot0cfg -s 2 /dev/${unit} +echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab +makefs -B little -o label=FreeBSD_Install ${2}.part ${1} +if [ $? -ne 0 ]; then + echo "makefs failed" + exit 1 +fi +rm ${1}/etc/fstab -mdconfig -d -u ${unit} -rmdir mnt +mkimg -s gpt -b ${1}/boot/pmbr -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2} +rm ${2}.part From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 17:38:55 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E941F9E9; Tue, 9 Sep 2014 17:38:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3258CA8; Tue, 9 Sep 2014 17:38:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89Hctsq088831; Tue, 9 Sep 2014 17:38:55 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89HctlO088830; Tue, 9 Sep 2014 17:38:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409091738.s89HctlO088830@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 9 Sep 2014 17:38:55 +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: r271324 - in stable: 10/release/doc/en_US.ISO8859-1/errata 9/release/doc/en_US.ISO8859-1/errata 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.18-1 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, 09 Sep 2014 17:38:56 -0000 Author: gjb Date: Tue Sep 9 17:38:55 2014 New Revision: 271324 URL: http://svnweb.freebsd.org/changeset/base/271324 Log: Document SA-14:18. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Changes in other areas also in this revision: Modified: stable/9/release/doc/en_US.ISO8859-1/errata/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Tue Sep 9 17:22:39 2014 (r271323) +++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Tue Sep 9 17:38:55 2014 (r271324) @@ -221,6 +221,12 @@ Kernel memory disclosure in control messages and SCTP notifications + + + SA-14:18.openssl + 9 September 2014 + Multiple vulnerabilities + From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 18:17:44 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4C02DCD; Tue, 9 Sep 2014 18:17:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95867128; Tue, 9 Sep 2014 18:17:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89IHinC007878; Tue, 9 Sep 2014 18:17:44 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89IHiBd007876; Tue, 9 Sep 2014 18:17:44 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201409091817.s89IHiBd007876@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Tue, 9 Sep 2014 18:17:44 +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: r271327 - in stable/10/sys/arm: arm 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.18-1 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, 09 Sep 2014 18:17:44 -0000 Author: ian Date: Tue Sep 9 18:17:43 2014 New Revision: 271327 URL: http://svnweb.freebsd.org/changeset/base/271327 Log: MFC r270862, r270878: MMU fixes for kernel startup. Fix the handling of MMU type in the AP entry code. The ARM_MMU_V6/V7 symbols are always #defined to 0 or 1, so use #if SYM not #if defined(SYM). Also, it helps if you include the header file that defines the symbols. The Marvell PJ4B cpu family is armv7, not armv6. Approved by: re(gjb) Modified: stable/10/sys/arm/arm/locore.S stable/10/sys/arm/include/cpuconf.h Modified: stable/10/sys/arm/arm/locore.S ============================================================================== --- stable/10/sys/arm/arm/locore.S Tue Sep 9 17:52:27 2014 (r271326) +++ stable/10/sys/arm/arm/locore.S Tue Sep 9 18:17:43 2014 (r271327) @@ -37,6 +37,7 @@ #include #include #include +#include #include __FBSDID("$FreeBSD$"); @@ -365,9 +366,9 @@ ASENTRY_NP(mpentry) nop CPWAIT(r0) -#if defined(ARM_MMU_V6) +#if ARM_MMU_V6 bl armv6_idcache_inv_all /* Modifies r0 only */ -#elif defined(ARM_MMU_V7) +#elif ARM_MMU_V7 bl armv7_idcache_inv_all /* Modifies r0-r3, ip */ #endif Modified: stable/10/sys/arm/include/cpuconf.h ============================================================================== --- stable/10/sys/arm/include/cpuconf.h Tue Sep 9 17:52:27 2014 (r271326) +++ stable/10/sys/arm/include/cpuconf.h Tue Sep 9 18:17:43 2014 (r271327) @@ -135,13 +135,13 @@ #define ARM_MMU_GENERIC 0 #endif -#if defined(CPU_ARM1136) || defined(CPU_ARM1176) || defined(CPU_MV_PJ4B) +#if defined(CPU_ARM1136) || defined(CPU_ARM1176) #define ARM_MMU_V6 1 #else #define ARM_MMU_V6 0 #endif -#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) +#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B) #define ARM_MMU_V7 1 #else #define ARM_MMU_V7 0 From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 19:26:56 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0DB08B0A; Tue, 9 Sep 2014 19:26:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED239B0C; Tue, 9 Sep 2014 19:26:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89JQtls041937; Tue, 9 Sep 2014 19:26:55 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89JQt0n041930; Tue, 9 Sep 2014 19:26:55 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201409091926.s89JQt0n041930@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Tue, 9 Sep 2014 19:26:55 +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: r271329 - stable/10/sys/arm/conf 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.18-1 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, 09 Sep 2014 19:26:56 -0000 Author: ian Date: Tue Sep 9 19:26:55 2014 New Revision: 271329 URL: http://svnweb.freebsd.org/changeset/base/271329 Log: MFC r270858, 270879: Remove duplicated option FDT from individual Wandboard configs, leave the one in the common IMX6 file that they all include. Approved by: re(gjb) Modified: stable/10/sys/arm/conf/WANDBOARD-DUAL stable/10/sys/arm/conf/WANDBOARD-QUAD stable/10/sys/arm/conf/WANDBOARD-SOLO Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/conf/WANDBOARD-DUAL ============================================================================== --- stable/10/sys/arm/conf/WANDBOARD-DUAL Tue Sep 9 18:36:00 2014 (r271328) +++ stable/10/sys/arm/conf/WANDBOARD-DUAL Tue Sep 9 19:26:55 2014 (r271329) @@ -23,7 +23,6 @@ include "IMX6" ident WANDBOARD-DUAL # Flattened Device Tree -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=wandboard-dual.dts Modified: stable/10/sys/arm/conf/WANDBOARD-QUAD ============================================================================== --- stable/10/sys/arm/conf/WANDBOARD-QUAD Tue Sep 9 18:36:00 2014 (r271328) +++ stable/10/sys/arm/conf/WANDBOARD-QUAD Tue Sep 9 19:26:55 2014 (r271329) @@ -23,7 +23,6 @@ include "IMX6" ident WANDBOARD-QUAD # Flattened Device Tree -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=wandboard-quad.dts Modified: stable/10/sys/arm/conf/WANDBOARD-SOLO ============================================================================== --- stable/10/sys/arm/conf/WANDBOARD-SOLO Tue Sep 9 18:36:00 2014 (r271328) +++ stable/10/sys/arm/conf/WANDBOARD-SOLO Tue Sep 9 19:26:55 2014 (r271329) @@ -23,7 +23,6 @@ include "IMX6" ident WANDBOARD-SOLO # Flattened Device Tree -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=wandboard-solo.dts From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 19:47:36 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 025C034E; Tue, 9 Sep 2014 19:47:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1B42D50; Tue, 9 Sep 2014 19:47:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89JlZ5o051668; Tue, 9 Sep 2014 19:47:35 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89JlZ6o051667; Tue, 9 Sep 2014 19:47:35 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201409091947.s89JlZ6o051667@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Tue, 9 Sep 2014 19:47:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271330 - stable/10/sys/arm/freescale/imx 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.18-1 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, 09 Sep 2014 19:47:36 -0000 Author: ian Date: Tue Sep 9 19:47:35 2014 New Revision: 271330 URL: http://svnweb.freebsd.org/changeset/base/271330 Log: MFC r270065: Move the imx6 sysctl temperature info to hw.imx6 where all the other soc-wide info lives. It was under dev.imx6_anatop.0. Approved by: re(gjb) Modified: stable/10/sys/arm/freescale/imx/imx6_anatop.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/freescale/imx/imx6_anatop.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx6_anatop.c Tue Sep 9 19:26:55 2014 (r271329) +++ stable/10/sys/arm/freescale/imx/imx6_anatop.c Tue Sep 9 19:47:35 2014 (r271330) @@ -561,7 +561,6 @@ static void initialize_tempmon(struct imx6_anatop_softc *sc) { uint32_t cal; - struct sysctl_ctx_list *ctx; /* * Fetch calibration data: a sensor count at room temperature (25C), @@ -605,11 +604,10 @@ initialize_tempmon(struct imx6_anatop_so callout_reset_sbt(&sc->temp_throttle_callout, sc->temp_throttle_delay, 0, tempmon_throttle_check, sc, 0); - ctx = device_get_sysctl_ctx(sc->dev); - SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)), + SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6), OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, sc, 0, temp_sysctl_handler, "IK", "Current die temperature"); - SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)), + SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6), OID_AUTO, "throttle_temperature", CTLTYPE_INT | CTLFLAG_RW, sc, 0, temp_throttle_sysctl_handler, "IK", "Throttle CPU when exceeding this temperature"); From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 20:36:57 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 560CD798; Tue, 9 Sep 2014 20:36:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 402AD332; Tue, 9 Sep 2014 20:36:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89Kavll076235; Tue, 9 Sep 2014 20:36:57 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89KauJ7076229; Tue, 9 Sep 2014 20:36:56 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409092036.s89KauJ7076229@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 9 Sep 2014 20:36:56 +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: r271333 - in stable/10: . share/vt/fonts 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.18-1 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, 09 Sep 2014 20:36:57 -0000 Author: emaste Date: Tue Sep 9 20:36:56 2014 New Revision: 271333 URL: http://svnweb.freebsd.org/changeset/base/271333 Log: MFC improved vt(4) font generation r266851: Add VGAROM 8x8, 8x14 and 8x16 fonts for vt(4) These are converted from syscons(4) cp437 fonts. r267306: Add vgarom font source These are in 'GNU Unifont' format, and are converted from syscons(4) cp437 fonts. r267400: Add thin versions of VGAROM 8x8 and 8x16 fonts for vt(4) These are converted from syscons(4) cp437-thin-8x* fonts. r267423: Build vt(4) fonts during buildworld vtfontcvt(8) is now built during buildworld, so can be used as a bootstrap tool to create vt(4) fonts from source .hex or .bdf font files, rather than having uuencoded binary fonts in the tree. r267578: Add glyphs from converted syscons iso* fonts This consists of the unique glyphs from the following font files in /usr/share/syscons/fonts: iso*.fnt ISO-8859-1 West European iso02*.fnt ISO-8859-2 Central European iso04*.fnt ISO-8859-4 Baltic iso05*.fnt ISO-8859-5 Cyrillic iso07*.fnt ISO-8859-7 Greek iso08*.fnt ISO-8859-8 Hebrew iso09*.fnt ISO-8859-9 Turkish iso15*.fnt ISO-8859-15 West European r268022: Rename the WITHOUT_VT_SUPPORT knob to WITHOUT_VT The _SUPPORT knobs have a consistent meaning which differs from the behaviour controlled by this knob. As the knob is opt-out and has not appeared in a release the impact should be low. Approved by: re Sponsored by: The FreeBSD Foundation Added: stable/10/share/vt/fonts/vgarom-8x14.hex - copied, changed from r267306, head/share/vt/fonts/vgarom-8x14.hex stable/10/share/vt/fonts/vgarom-8x16.hex - copied, changed from r267306, head/share/vt/fonts/vgarom-8x16.hex stable/10/share/vt/fonts/vgarom-8x8.hex - copied, changed from r267306, head/share/vt/fonts/vgarom-8x8.hex stable/10/share/vt/fonts/vgarom-thin-8x16.hex - copied, changed from r267400, head/share/vt/fonts/vgarom-thin-8x16.hex stable/10/share/vt/fonts/vgarom-thin-8x8.hex - copied unchanged from r267400, head/share/vt/fonts/vgarom-thin-8x8.hex Modified: stable/10/Makefile.inc1 stable/10/share/vt/fonts/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Tue Sep 9 19:58:55 2014 (r271332) +++ stable/10/Makefile.inc1 Tue Sep 9 20:36:56 2014 (r271333) @@ -1215,6 +1215,10 @@ _gperf= gnu/usr.bin/gperf _groff= gnu/usr.bin/groff .endif +.if ${MK_VT} != "no" +_vtfontcvt= usr.bin/vtfontcvt +.endif + .if ${BOOTSTRAPPING} < 800022 _ar= usr.bin/ar .endif @@ -1323,7 +1327,8 @@ bootstrap-tools: .MAKE ${_gensnmptree} \ usr.sbin/config \ ${_crunch} \ - ${_nmtree} + ${_nmtree} \ + ${_vtfontcvt} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ Modified: stable/10/share/vt/fonts/Makefile ============================================================================== --- stable/10/share/vt/fonts/Makefile Tue Sep 9 19:58:55 2014 (r271332) +++ stable/10/share/vt/fonts/Makefile Tue Sep 9 20:36:56 2014 (r271333) @@ -1,12 +1,20 @@ # $FreeBSD$ -FILES= gallant.fnt +FILES= gallant.fnt \ + vgarom-8x8.fnt \ + vgarom-8x14.fnt \ + vgarom-8x16.fnt \ + vgarom-thin-8x8.fnt \ + vgarom-thin-8x16.fnt CLEANFILES+= ${FILES} -.SUFFIXES: .uu -.uu: - uudecode < ${.IMPSRC} +.SUFFIXES: .fnt .fnt.uu .hex +.hex.fnt: + vtfontcvt ${.IMPSRC} ${.TARGET} + +.fnt.uu.fnt: + uudecode -p < ${.IMPSRC} > ${.TARGET} FILESDIR= ${SHAREDIR}/vt/fonts Copied and modified: stable/10/share/vt/fonts/vgarom-8x14.hex (from r267306, head/share/vt/fonts/vgarom-8x14.hex) ============================================================================== --- head/share/vt/fonts/vgarom-8x14.hex Mon Jun 9 21:06:46 2014 (r267306, copy source) +++ stable/10/share/vt/fonts/vgarom-8x14.hex Tue Sep 9 20:36:56 2014 (r271333) @@ -101,34 +101,70 @@ 00A1:000018180018183C3C3C18000000 00A2:0018183C666060663C1818000000 00A3:00386C6460F0606060E6FC000000 +00A4:000000423C6666663C4200000000 00A5:000066663C187E187E1818000000 +00A6:0000181818180018181818000000 00A7:007CC660386CC6C66C380CC67C00 +00A8:0063630000000000000000000000 +00A9:0000003E415D51515D413E000000 00AA:003C6C6C3E007E00000000000000 00AB:00000000366CD86C360000000000 00AC:000000000000FE06060600000000 +00AD:0000000000007F00000000000000 +00AE:0000003E415D555955413E000000 +00AF:007E000000000000000000000000 00B0:00386C6C38000000000000000000 00B1:00000018187E18180000FF000000 00B2:0070D83060C8F800000000000000 +00B3:007C0C380C6C3800000000000000 +00B4:00060C1800000000000000000000 00B5:00000000666666667C6060C00000 00B6:00007FDBDBDB7B1B1B1B1B000000 00B7:0000000000000018000000000000 +00B8:000000000000000000000C0C061C +00B9:0030703030307800000000000000 00BA:00386C6C38007C00000000000000 00BB:00000000D86C366CD80000000000 00BC:00C0C0C6CCD83066CE9E3E060600 00BD:00C0C0C6CCD83060DC860C183E00 +00BE:00F03063F66C183367CF1F030300 00BF:0000303000303060C6C67C000000 +00C0:603018001C3663637F6363000000 +00C1:03060C001C3663637F6363000000 +00C2:081C36001C3663637F6363000000 +00C3:3B6E00081C3663637F6363000000 00C4:00C6C610386CC6C6FEC6C6000000 00C5:386C3800386CC6C6FEC6C6000000 00C6:00003E6CCCCCFECCCCCCCE000000 00C7:00003C66C2C0C0C2663C0C067C00 +00C8:603018007F33303E30337F000000 00C9:18306000FE66607C6066FE000000 +00CA:081C36007F33303E30337F000000 +00CB:006363007F33303E30337F000000 +00CC:603018003C18181818183C000000 +00CD:060C18003C18181818183C000000 +00CE:183C66003C18181818183C000000 +00CF:006666003C18181818183C000000 +00D0:00003C3633337B3333363C000000 00D1:76DC00C6E6F6FEDECEC6C6000000 +00D2:603018001C36636363361C000000 +00D3:03060C001C36636363361C000000 +00D4:081C36001C36636363361C000000 +00D5:003B6E001C36636363361C000000 00D6:00C6C6386CC6C6C6C66C38000000 +00D7:00000063361C081C366300000000 +00D8:00031E36676F6B7B73363C600000 +00D9:603018006363636363633E000000 +00DA:03060C006363636363633E000000 +00DB:081C36006363636363633E000000 00DC:00C6C600C6C6C6C6C6C67C000000 +00DD:060C18006666663C18183C000000 +00DE:0078303E33333E30303078000000 00DF:000000007CC6FCC6C6FCC0C04000 00E0:0060301800780C7CCCCC76000000 00E1:0018306000780C7CCCCC76000000 00E2:0010386C00780C7CCCCC76000000 +00E3:00003B6E003C063E66663B000000 00E4:0000CCCC00780C7CCCCC76000000 00E5:00386C3800780C7CCCCC76000000 00E6:00000000CC76367ED8D86E000000 @@ -141,34 +177,322 @@ 00ED:000C18300038181818183C000000 00EE:00183C660038181818183C000000 00EF:000066660038181818183C000000 +00F0:0000361C36063E6666663C000000 00F1:000076DC00DC6666666666000000 00F2:00603018007CC6C6C6C67C000000 00F3:00183060007CC6C6C6C67C000000 00F4:0010386C007CC6C6C6C67C000000 +00F5:00003B6E003E636363633E000000 00F6:0000C6C6007CC6C6C6C67C000000 00F7:0000001818007E00181800000000 +00F8:00000000033E676F7B733E600000 00F9:0060301800CCCCCCCCCC76000000 00FA:0018306000CCCCCCCCCC76000000 00FB:003078CC00CCCCCCCCCC76000000 00FC:0000CCCC00CCCCCCCCCC76000000 +00FD:00060C1800636666663E06663C00 +00FE:00000078303E333333333E307800 00FF:0000C6C600C6C6C6C67E060C7800 +0100:7C00387CC6C6C6FEC6C6C6C60000 +0101:0000007C00780C7CCCCCCC760000 +0102:C67C0010386CC6FEC6C6C6000000 +0103:0000C67C00780C7CCCCC76000000 +0104:000010386CC6C6FEC6C6CE180E00 +0105:0000000000780C7CCCCC76301C00 +0106:0C18003C66C2C0C0C2663C000000 +0107:000C1830007CC6C0C0C67C000000 +010C:6C38003C66C2C0C0C2663C000000 +010D:00006C38007CC6C0C0C67C000000 +010E:6C3800F86C666666666CF8000000 +010F:6C38001C0C0C3C6CCCCC76000000 +0110:0000F86C6666F666666CF8000000 +0111:00000C0C7E0C3C6CCCCC76000000 +0112:7C00FE6660607C60606066FE0000 +0113:0000007C007CC6C6FEC0C67C0000 +0116:1818FE6660607C60606066FE0000 +0117:00001818007CC6C6FEC0C67C0000 +0118:0000FE66626878686266FE301C00 +0119:00000000007CC6FEC0C67C301C00 +011A:6C3800FE666278686266FE000000 +011B:00006C38007CC6FEC0C67C000000 +0122:00007CC6C6C0C0CEC6C6C67C0C78 +0123:3C60380076CEC6C6C6CE7606FC00 +0128:76DC003C181818181818183C0000 +0129:000076DC003818181818183C0000 +012A:7E003C18181818181818183C0000 +012B:0000007C003818181818183C0000 +012E:00003C18181818181818183C301E +012F:00001818003818181818183C301E +0136:0000C6C6CCD8F0F0D8CCC6C60C78 +0137:0000E0606066666C786C66E60C78 +0138:0000000000E66C78786C66E60000 +0139:0000F66C606060606266FE000000 +013A:0000E66C606060606060F0000000 +013B:0000F06060606060606266FE0C78 +013C:00003818181818181818183C18F0 +013D:001BEE60606060606266FE000000 +013E:001BEE60606060606060F0000000 +0141:0000F0646C7870E0E266FE000000 +0142:0000381A1E1C183878583C000000 +0143:0C1800C6E6F6FEDECEC6C6000000 +0144:000C183000DC6666666666000000 +0145:0000C6C6E6E6F6DECECEC6C60C78 +0146:0000000000DC6666666666660C78 +0147:6C3800C6E6F6FEDECEC6C6000000 +0148:00006C3800DC6666666666000000 +014A:0000DCFEF6E6C6C6C6C6C6DC0000 +014B:00000000DCFEF6E6C6C6061C0000 +014C:7C007CC6C6C6C6C6C6C6C67C0000 +014D:0000007C007CC6C6C6C6C67C0000 +0150:366C007CC6C6C6C6C6C67C000000 +0151:0000366C007CC6C6C6C67C000000 +0152:001F366666676666361F00000000 +0153:00000000366B6B6E683700000000 +0154:0C1800FC66667C6C6666E6000000 +0155:000C183000DC76666060F0000000 +0156:0000FC6666667C786C6666E60C78 +0157:0000000000DC7666606060F030E0 +0158:6C3800FC66667C6C6666E6000000 +0159:00006C3800DC76666060F0000000 +015A:0C18007CC6C6701CC6C67C000000 +015B:000C1830007CC6701CC67C000000 +015E:00007CC6C660380CC6C67C187000 +015F:00000000007CC6701CC67C187000 +0160:6C38007CC6C6701CC6C67C000000 +0161:00006C38007CC6701CC67C000000 +0162:00007E7E5A18181818183C0C3800 +0163:0000103030FC303030361C0C3800 +0164:361C007E7E5A181818183C000000 +0165:6C3800103030FC3030361C000000 +0166:0000FFDB99181E3C7818183C0000 +0167:0000303030FC303C78F0361C0000 +0168:76DC00C6C6C6C6C6C6C6C67C0000 +0169:000076DC00CCCCCCCCCCCC760000 +016A:7C00C6C6C6C6C6C6C6C6C67C0000 +016B:000000FC00CCCCCCCCCCCC760000 +016E:386C38C6C6C6C6C6C6C67C000000 +016F:00386C3800CCCCCCCCCC76000000 +0170:366C00C6C6C6C6C6C6C67C000000 +0171:00006CD800CCCCCCCCCC76000000 +0172:0000C6C6C6C6C6C6C6C6C67C301C +0173:0000000000CCCCCCCCCCCC76301E +0178:6600666666663C18183C00000000 +0179:0C1800FEC68C183062C6FE000000 +017A:000C183000FECC183066FE000000 +017B:181800FEC68C183062C6FE000000 +017C:0000181800FECC183066FE000000 +017D:6C3800FEC68C183062C6FE000000 +017E:00006C3800FECC183066FE000000 0192:000E1B1818187E18181818D87000 +02C7:006C380000000000000000000000 +02D8:00C67C0000000000000000000000 +02D9:0018180000000000000000000000 +02DB:0000000000000000000030301C00 +02DD:00366CD800000000000000000000 +037A:0000000000000000000000000000 +0384:060C180000000000000000000000 +0385:060C18C300000000000000000000 +0386:0000C090B86CC6C6FEC6C6C60000 +0388:000000BFB130303E3031313F0000 +0389:000000B3B333333F333333330000 +038A:000000BC981818181818183C0000 +038C:0000009EB33333333333331E0000 +038E:000000B3B333331E0C0C0C1E0000 +038F:0000009EB3212121213312330000 +0390:000C0800660018181818180E0000 +0391:00000010386CC6C6FEC6C6C60000 +0392:000000FC6666667C666666FC0000 0393:0000FEC6C6C0C0C0C0C0C0000000 +0394:00000010386CC6C6C6C6C6FE0000 +0395:000000FE66626878686266FE0000 +0396:000000FEC6860C183062C6FE0000 +0397:000000C6C6C6C6FEC6C6C6C60000 0398:0000386CC6C6FEC6C66C38000000 +0399:0000003C181818181818183C0000 +039A:000000E666666C786C6666E60000 +039B:00000010386CC6C6C6C6C6C60000 +039C:000000C6EEFEFED6C6C6C6C60000 +039D:000000C6E6F6FEDECEC6C6C60000 +039E:000000FE8200007C000082FE0000 +039F:0000007CC6C6C6C6C6C6C67C0000 +03A0:000000FEC6C6C6C6C6C6C6C60000 +03A1:000000FC6666667C606060F00000 03A3:0000FEC66030183060C6FE000000 +03A4:0000007E7E5A18181818183C0000 +03A5:000000666666663C1818183C0000 03A6:00007E183C6666663C187E000000 +03A7:000000C6C66C7C387C6CC6C60000 +03A8:00000018DBDBDBDB7E18183C0000 03A9:0000386CC6C6C66C6C6CEE000000 +03AA:0000C31818181818181818180000 +03AB:00C300666666663C1818183C0000 +03AC:0000003810007BCECCCCCC7B0000 +03AD:00003810007CC6C078C0C67C0000 +03AE:000000381000DC66666666660606 +03AF:00000038100018181818180E0000 +03B0:000018C30000E7666666663C0000 03B1:000000000076DCD8D8DC76000000 +03B2:0000007CC6C6C6FCC6C6C6FCC0C0 +03B3:0000000000C3663C183C6642663C 03B4:00001E30180C3E6666663C000000 03B5:00001C3060607C6060301C000000 +03B6:00FC0C183060C0C0C0C0780C0C78 +03B7:000000000000DC66666666660606 +03B8:0000003E6363637F6363633E0000 +03B9:00000000000018181818180E0000 +03BA:000000000000E66C786C66E60000 +03BB:000000386C0C0C0C366666660000 +03BC:00000000000066666666667F6060 +03BD:00000000000082C6C66C6C380000 +03BE:00FC60C0783060C0C0C07C06067C +03BF:0000000000007CC6C6C6C67C0000 03C0:00000000FE6C6C6C6C6C6C000000 +03C1:0000000000003C666666667C6060 +03C2:0000000000003E63C060380CC67C 03C3:00000000007ED8D8D8D870000000 03C4:0000000076DC1818181818000000 +03C5:000000000000E7666666663C0000 03C6:000003067EDBDBF37E60C0000000 +03C7:000000000000C66C38386CC60000 +03C8:000000000000D6D6D6D6D67C1010 +03C9:00000000000066C3C3DBFF660000 +03CA:000000C3000018181818180E0000 +03CB:000000C30000E7666666663C0000 +03CC:0000003810007CC6C6C6C67C0000 +03CD:000000381000E7666666663C0000 +03CE:00000038100066C3C3DBFF660000 +0401:6C6C00FEC6C0F0C0C0C6FE000000 +0402:0000F86060607C6666666C000000 +0403:1830007E60606060606060000000 +0404:00007CC6C0C0F8C0C0C67C000000 +0405:00007CC6C660380CC6C67C000000 +0406:0018003C1818181818183C000000 +0407:0066003C1818181818183C000000 +0408:00001E0C0C0C0C0CCCCC78000000 +0409:0000183878D8DEDBDBDBDE000000 +040A:0000D8D8D8D8FEDBDBDBDE000000 +040B:0000FC3030303C36363636000000 +040C:183000CCD8F0F0D8CCCCCC000000 +040E:281000C6C6C6C67E06C67C000000 +040F:0000C6C6C6C6C6C6FE3838000000 +0410:00003E66C6C6C6FEC6C6C6000000 +0411:0000FEC0C0FCC6C6C6C6FC000000 +0412:0000FCC6C6C6FCC6C6C6FC000000 +0413:0000FEC6C0C0C0C0C0C0C0000000 +0414:00003C6C6C6C6C6C6C6CFEC68200 +0415:0000FEC6C0C0F0C0C0C6FE000000 +0416:0000D6D6D6547CD6D6D6D6000000 +0417:00007CC6061C0606C6C67C000000 +0418:0000C6C6C6CEDEF6E6C6C6000000 +0419:000CDAC6C6CEDEF6E6C6C6000000 +041A:0000C6CCD8F0F0D8CCC6C6000000 +041B:00001E3666C6C6C6C6C6C6000000 +041C:000082C6C6EEEEFED6C6C6000000 +041D:0000C6C6C6C6FEC6C6C6C6000000 +041E:00007EC6C6C6C6C6C6C6FC000000 +041F:0000FEC6C6C6C6C6C6C6C6000000 +0420:0000FCC6C6C6C6FCC0C0C0000000 +0421:00007CC6C6C0C0C0C6C67C000000 +0422:00007E7E5A181818181818000000 +0423:0000C6C6C6C6C67E06C67C000000 +0424:00007CD6D6D6D6D67C1038000000 +0425:0000C6C66C38386CC6C6C6000000 +0426:0000CCCCCCCCCCCCCCCCFE020600 +0427:0000C6C6C6C6C67E060606000000 +0428:00D6D6D6D6D6D6D6D6D6FE000000 +0429:00D6D6D6D6D6D6D6D6D6FE020600 +042A:0000E0E0607C666666667C000000 +042B:0000C6C6C6E6B6B6B6B6E6000000 +042C:0000C0C0C0FCC6C6C6C6FC000000 +042D:00007CC6061E0606C6C67C000000 +042E:00009CB6B6B6F6B6B6B69C000000 +042F:00007EC6C6C6C67E3666C6000000 +0430:00000000007CC6C6FEC6C6000000 +0431:0000000000FEC0FCC6C6FC000000 +0432:0000000000FCC6FCC6C6FC000000 +0433:0000000000FEC2C0C0C0C0000000 +0434:00000000003C6C6C6C6CFEC68200 +0435:00000000007CC6FCC0C67C000000 +0436:0000000000D6D67CD6D6D6000000 +0437:00000000007CC61C06C67C000000 +0438:0000000000C6CEDEF6E6C6000000 +0439:0000000C18C6CEDEF6E6C6000000 +043A:0000000000C6CCF8D8CCC6000000 +043B:00000000003E66666666C6000000 +043C:0000000000C6EEFED6C6C6000000 +043D:0000000000C6C6C6FEC6C6000000 +043E:00000000007EC6C6C6C6FC000000 +043F:0000000000FEC6C6C6C6C6000000 +0440:0000000000FCC6C6C6C6FCC0C000 +0441:00000000007CC6C0C0C67C000000 +0442:00000000007E5A18181818000000 +0443:0000000000C6C6C6C6C67E067C00 +0444:00000000107CD6D6D6D67C103800 +0445:0000000000C66C38386CC6000000 +0446:0000000000CCCCCCCCCCFE060C00 +0447:0000000000C6C6C67E0606000000 +0448:0000000000D6D6D6D6D6FE000000 +0449:0000000000D6D6D6D6D6FE020600 +044A:0000000000E0607C66667C000000 +044B:0000000000C6C6E6B6B6E6000000 +044C:0000000000C0C0FCC6C6FC000000 +044D:00000000007CC61E06C67C000000 +044E:00000000009CB6B6F6B69C000000 +044F:00000000007EC67E3666C6000000 +0451:00006C6C007CC6FCC0C67C000000 +0452:00006060F8607C666666660C0000 +0453:00001830007C6060606060000000 +0454:00000000007CC6F0C0C67C000000 +0455:00000000007CC6701CC67C000000 +0456:000010100038181818183C000000 +0457:000028280038181818183C000000 +0458:00000404000E0606060666663C00 +0459:00000000003878DEDBDBDE000000 +045A:0000000000D8D8FEDBDBDE000000 +045B:00003030FC303C36363636000000 +045C:0000183000CCD8F0D8CCCC000000 +045E:0000281000C6C6C6C6C67E067C00 +045F:0000000000C6C6C6FE3838000000 +05D0:0000006363333B6E666363000000 +05D1:0000007C0606060606067F000000 +05D2:0000001C060606061E3663000000 +05D3:0000007F06060606060606000000 +05D4:0000007E03030363636363000000 +05D5:000000380C0C0C0C0C0C0C000000 +05D6:0000007E1818180C0C1830000000 +05D7:0000007E33636363636363000000 +05D8:000000666B6B636363663C000000 +05D9:0000003C0606060C000000000000 +05DA:0000007E03030606060606060700 +05DB:0000007E0303030303067C000000 +05DC:0060607E030303060C1818000000 +05DD:0000007E6363636363637F000000 +05DE:0000006E7B33636363636F000000 +05DF:0000001C06060C0C0C0C0C0C0E00 +05E0:0000001C0606060606063E000000 +05E1:0000007E3363636363663C000000 +05E2:00000033333333331B0E7C000000 +05E3:0000007C26667606060606060700 +05E4:0000007E2363730303037F000000 +05E5:000000666666666C786060607000 +05E6:0000006363331E0C06037F000000 +05E7:0000007E03033336363730303000 +05E8:0000007E03030303030303000000 +05E9:0000006B6B6B6B6B7B633E000000 +05EA:0000007E33333333333373000000 +200E:0000000000000000000000000000 +200F:0000000000000000000000000000 +2015:00000000000000FF000000000000 +2017:00000000000000000000FF00FF00 +2018:0030606030000000000000000000 +2019:000C06060C000000000000000000 2022:0000000000183C3C180000000000 203C:0000666666666666006666000000 207F:00D86C6C6C6C6C00000000000000 20A7:00F8CCCCF8C4CCDECCCCC6000000 +20AC:0000000000000000000000000000 +20AF:0000000000000000000000000000 +2116:0000888ACDEAB8988B888B000000 2190:000000003060FE60300000000000 2191:0000183C7E181818181818000000 2192:00000000180CFE0C180000000000 Copied and modified: stable/10/share/vt/fonts/vgarom-8x16.hex (from r267306, head/share/vt/fonts/vgarom-8x16.hex) ============================================================================== --- head/share/vt/fonts/vgarom-8x16.hex Mon Jun 9 21:06:46 2014 (r267306, copy source) +++ stable/10/share/vt/fonts/vgarom-8x16.hex Tue Sep 9 20:36:56 2014 (r271333) @@ -101,34 +101,70 @@ 00A1:00001818001818183C3C3C1800000000 00A2:0018183C66606060663C181800000000 00A3:00386C6460F060606060E6FC00000000 +00A4:00000082C67CC6C6C6C67CC682000000 00A5:000066663C187E187E18181800000000 +00A6:00001818181800181818181800000000 00A7:007CC660386CC6C66C380CC67C000000 +00A8:00C60000000000000000000000000000 +00A9:00007CC682BAA2A2BA82C67C00000000 00AA:003C6C6C3E007E000000000000000000 00AB:0000000000366CD86C36000000000000 00AC:000000000000FE060606060000000000 +00AD:000000000000007C0000000000000000 +00AE:00007CC682BAAAB2AA82C67C00000000 +00AF:00FE0000000000000000000000000000 00B0:00386C6C380000000000000000000000 00B1:0000000018187E18180000FF00000000 00B2:0070D83060C8F8000000000000000000 +00B3:00F8183018D870000000000000000000 +00B4:18306000000000000000000000000000 00B5:0000000066666666667C6060C0000000 00B6:00007FDBDBDB7B1B1B1B1B1B00000000 00B7:00000000000000001800000000000000 +00B8:00000000000000000000180C063C0000 +00B9:0060E0606060F0000000000000000000 00BA:00386C6C38007C000000000000000000 00BB:0000000000D86C366CD8000000000000 00BC:00C0C0C2C6CC183066CE9E3E06060000 00BD:00C0C0C2C6CC183060DC860C183E0000 +00BE:00F0307236EC183066CE963E06060000 00BF:0000303000303060C0C6C67C00000000 +00C0:60301800386CC6C6FEC6C6C600000000 +00C1:0C183000386CC6C6FEC6C6C600000000 +00C2:10386C00386CC6C6FEC6C6C600000000 +00C3:0076DC00386CC6C6FEC6C6C600000000 00C4:00C60010386CC6C6FEC6C6C600000000 00C5:386C3800386CC6C6FEC6C6C600000000 00C6:00003E6CCCCCFECCCCCCCCCE00000000 00C7:00003C66C2C0C0C0C2663C0C067C0000 +00C8:30180C00FE66607C606066FE00000000 00C9:18306000FE66607C606066FE00000000 +00CA:10386C00FE66607C606066FE00000000 +00CB:00C600FE6660607C606066FE00000000 +00CC:30180C003C1818181818183C00000000 +00CD:0C1830003C1818181818183C00000000 +00CE:183C66003C1818181818183C00000000 +00CF:0066003C181818181818183C00000000 +00D0:0000786C666666F666666C7800000000 00D1:76DC00C6E6F6FEDECEC6C6C600000000 +00D2:603018007CC6C6C6C6C6C67C00000000 +00D3:0C1830007CC6C6C6C6C6C67C00000000 +00D4:10386C007CC6C6C6C6C6C67C00000000 +00D5:76DC007CC6C6C6C6C6C6C67C00000000 00D6:00C6007CC6C6C6C6C6C6C67C00000000 +00D7:00000000C66C3810386CC60000000000 +00D8:02067CCECEDED6D6F6E6E67CC0800000 +00D9:60301800C6C6C6C6C6C6C67C00000000 +00DA:0C183000C6C6C6C6C6C6C67C00000000 +00DB:10386C00C6C6C6C6C6C6C67C00000000 00DC:00C600C6C6C6C6C6C6C6C67C00000000 +00DD:0C183000C3C3663C1818183C00000000 +00DE:F0607C6666667C60606060F000000000 00DF:000078CCCCCCD8CCC6C6C6CC00000000 00E0:0060301800780C7CCCCCCC7600000000 00E1:0018306000780C7CCCCCCC7600000000 00E2:0010386C00780C7CCCCCCC7600000000 +00E3:000076DC00780C7CCCCCCC7600000000 00E4:0000CC0000780C7CCCCCCC7600000000 00E5:00386C3800780C7CCCCCCC7600000000 00E6:0000000000CC76367ED8D86E00000000 @@ -141,34 +177,326 @@ 00ED:000C1830003818181818183C00000000 00EE:00183C66003818181818183C00000000 00EF:00006600003818181818183C00000000 +00F0:006C38386C0C3C6CCCCCCC7800000000 00F1:000076DC00DC66666666666600000000 00F2:00603018007CC6C6C6C6C67C00000000 00F3:00183060007CC6C6C6C6C67C00000000 00F4:0010386C007CC6C6C6C6C67C00000000 +00F5:000076DC007CC6C6C6C6C67C00000000 00F6:0000C600007CC6C6C6C6C67C00000000 00F7:000000001818007E0018180000000000 +00F8:00000002067CCEDED6F6E67CC0800000 00F9:0060301800CCCCCCCCCCCC7600000000 00FA:0018306000CCCCCCCCCCCC7600000000 00FB:003078CC00CCCCCCCCCCCC7600000000 00FC:0000CC0000CCCCCCCCCCCC7600000000 +00FD:0018306000C6C6C6C6C6C67E060CF800 +00FE:000000F0607C66666666667C6060F000 00FF:0000C60000C6C6C6C6C6C67E060C7800 +0100:007C00386CC6C6C6FEC6C6C6C6000000 +0101:000000007C00780C7CCCCCCC76000000 +0102:C67C0010386CC6C6FEC6C6C600000000 +0103:0000C67C00780C7CCCCCCC7600000000 +0104:000010386CC6C6FEC6C6C6C618301E00 +0105:0000000000780C7CCCCCCC7618301E00 +0106:0C18003C66C2C0C0C0C2663C00000000 +0107:000C1830007CC6C0C0C0C67C00000000 +010C:6C38003C66C2C0C0C0C2663C00000000 +010D:00006C38007CC6C0C0C0C67C00000000 +010E:6C3800F86C66666666666CF800000000 +010F:6C38001C0C0C3C6CCCCCCC7600000000 +0110:0000F86C6666F66666666CF800000000 +0111:00000C0C7E0C3C6CCCCCCC7600000000 +0112:7C0000FE6660607C60606066FE000000 +0113:000000007C007CC6C6FEC0C67C000000 +0116:181800FE6660607860606066FE000000 +0117:0000103810007CC6C6FEC0C67C000000 +0118:0000FE6662687868606266FE18301E00 +0119:00000000007CC6FEC0C0C67C30603C00 +011A:6C3800FE66626878686266FE00000000 +011B:00006C38007CC6FEC0C0C67C00000000 +011E:423C003C66C2C0DEC6C6663A00000000 +011F:000044380076CCCCCCCCCC7C0CCC7800 +0122:0000007CC6C6C0C0CECEC6C67C0C7800 +0123:00003C60300076CEC6C6C6CE7606FC00 +0128:76DC003C18181818181818183C000000 +0129:00000076DC003818181818183C000000 +012A:003C003C18181818181818183C000000 +012B:000000007C003818181818183C000000 +012E:0000003C18181818181818183C301E00 +012F:0000001818003818181818183C301C00 +0130:000018003C1818181818183C00000000 +0131:00000000003818181818183C00000000 +0136:000000C6C6CCD8F0F0D8CCC6C60C7800 +0137:000000E0606066666C786C66E618F000 +0138:000000000000E66C78786C66E6000000 +0139:0000F66C60606060606266FE00000000 +013A:0000E66C60606060606060F000000000 +013B:000000F06060606060606266FE0C7800 +013C:0000003818181818181818183C0C7800 +013D:001BEE6060606060606266FE00000000 +013E:001BEE6060606060606060F000000000 +0141:0000F0646C7870E0E06266FE00000000 +0142:0000381A1E1C18387858183C00000000 +0143:0C1800C6E6F6FEDECEC6C6C600000000 +0144:000C183000DC66666666666600000000 +0145:000000C6C6E6F6FEDECEC6C6C60C7800 +0146:000000000000DC6666666666660C7800 +0147:6C3800C6E6F6FEDECEC6C6C600000000 +0148:00006C3800DC66666666666600000000 +014A:000000DCFEE6C6C6C6C6C6C6DC000000 +014B:0000000000DCFEE6C6C6C6061C000000 +014C:007C007CC6C6C6C6C6C6C6C67C000000 +014D:000000007C007CC6C6C6C6C67C000000 +0150:366C007CC6C6C6C6C6C6C67C00000000 +0151:0000366C007CC6C6C6C6C67C00000000 +0152:00007ECCCCCCCECCCCCCCC7E00000000 +0153:00000000006EDBDBDED8DC6700000000 +0154:0C1800FC6666667C6C6666E600000000 +0155:000C183000DC7666606060F000000000 +0156:000000FC6666667C786C6666F618F000 +0157:000000000000DC6660606060F018F000 +0158:6C3800FC6666667C6C6666E600000000 +0159:00006C3800DC7666606060F000000000 +015A:0C18007CC6C660380CC6C67C00000000 +015B:000C1830007CC660380CC67C00000000 +015E:00007CC6C660380C06C6C67C180C7800 +015F:00000000007CC660380CC67C180C7800 +0160:6C38007CC6C660380CC6C67C00000000 +0161:00006C38007CC660380CC67C00000000 +0162:00007E7E5A1818181818183C180C7800 +0163:0000103030FC30303030361C180C7800 +0164:361C007E7E5A18181818183C00000000 +0165:6C3800103030FC303030361C00000000 +0166:000000FFDB99181E3C7818183C000000 +0167:000000303030FC303C78F0361C000000 +0168:76DC00C6C6C6C6C6C6C6C6C67C000000 +0169:00000076DC00CCCCCCCCCCCC76000000 +016A:007C00C6C6C6C6C6C6C6C6C67C000000 +016B:00000000FC00CCCCCCCCCCCC76000000 +016E:386C38C6C6C6C6C6C6C6C67C00000000 +016F:00386C3800CCCCCCCCCCCC7600000000 +0170:366C00C6C6C6C6C6C6C6C67C00000000 +0171:0000366C00CCCCCCCCCCCC7600000000 +0172:000000C6C6C6C6C6C6C6C6C67C603C00 +0173:000000000000CCCCCCCCCCCC76603C00 +0178:00C300C3C3663C181818183C00000000 +0179:0C1800FEC68C183060C2C6FE00000000 +017A:000C183000FECC183060C6FE00000000 +017B:181800FEC68C183060C2C6FE00000000 +017C:0000181800FECC183060C6FE00000000 +017D:6C3800FEC68C183060C2C6FE00000000 +017E:00006C3800FECC183060C6FE00000000 0192:000E1B1818187E1818181818D8700000 +02C7:006C3800000000000000000000000000 +02D8:00C67C00000000000000000000000000 +02D9:00181800000000000000000000000000 +02DB:00000000000000000000000030603C00 +02DD:00366CD8000000000000000000000000 +037A:00000000000000000000000000000000 +0384:060C1800000000000000000000000000 +0385:060C18C3000000000000000000000000 +0386:00C090B86CC6C6FEC6C6C6C600000000 +0388:0000BFB130303E303031313F00000000 +0389:0000B3B333333F333333330000000000 +038A:0000BC98181818181818183C00000000 +038C:00009EB33333333333331E0000000000 +038E:0000B3B333331E0C0C0C0C1E00000000 +038F:00009EB3212121212133123300000000 +0390:0C080066001818181818180E00000000 +0391:000010386CC6C6FEC6C6C6C600000000 +0392:0000FC6666667C66666666FC00000000 0393:0000FEC6C6C0C0C0C0C0C0C000000000 +0394:000010386CC6C6C6C6C6C6FE00000000 +0395:0000FE6662687868606266FE00000000 +0396:0000FEC6860C183060C2C6FE00000000 +0397:0000C6C6C6C6FEC6C6C6C6C600000000 0398:000000386CC6C6FEC6C66C3800000000 +0399:00003C18181818181818183C00000000 +039A:0000E666666C78786C6666E600000000 +039B:000010386CC6C6C6C6C6C6C600000000 +039C:0000C6EEFEFED6C6C6C6C6C600000000 +039D:0000C6E6F6FEDECEC6C6C6C600000000 +039E:0000FE8200007C00000082FE00000000 +039F:00007CC6C6C6C6C6C6C6C67C00000000 +03A0:0000FEC6C6C6C6C6C6C6C6C600000000 +03A1:0000FC6666667C60606060F000000000 03A3:000000FEC66030183060C6FE00000000 +03A4:00007E7E5A1818181818183C00000000 +03A5:0000666666663C181818183C00000000 03A6:0000007E183C6666663C187E00000000 +03A7:0000C6C66C7C38387C6CC6C600000000 +03A8:000018DBDBDBDBDB7E18183C00000000 03A9:0000386CC6C6C66C6C6C6CEE00000000 +03AA:00C31818181818181818181800000000 +03AB:C300666666663C181818183C00000000 +03AC:00003810007BCECCCCCCCC7B00000000 +03AD:00003810007CC6C078C0C67C00000000 +03AE:0000381000DC66666666666606060600 +03AF:00003810001818181818180E00000000 +03B0:0018C30000E766666666663C00000000 03B1:000000000076DCD8D8D8DC7600000000 +03B2:00007CC6C6C6C6FCC6C6C6FCC0C0C000 +03B3:0000000000C3663C183C6642663C0000 03B4:00001E30180C3E666666663C00000000 03B5:00001C3060607C606060301C00000000 +03B6:0000FC0C183060C0C0C0C0780C0C7800 +03B7:0000000000DC66666666666606060600 +03B8:00003E6363637F636363633E00000000 +03B9:00000000001818181818180E00000000 +03BA:0000000000E66C78786C66E600000000 +03BB:0000386C0C0C0C366666666600000000 +03BC:00000000006666666666667F60606000 +03BD:000000000082C6C66C6C383800000000 +03BE:0000FC60C0783060C0C0C07C06063C00 +03BF:00000000007CC6C6C6C6C67C00000000 03C0:00000000FE6C6C6C6C6C6C6C00000000 +03C1:00000000003C66666666667C60606000 +03C2:00000000003E63C0C060380CC67C0000 03C3:00000000007ED8D8D8D8D87000000000 03C4:0000000076DC18181818181800000000 +03C5:0000000000E766666666663C00000000 03C6:00000003067EDBDBF37E60C000000000 +03C7:0000000000C66C3838386CC600000000 +03C8:0000000000D6D6D6D6D6D67C10101000 +03C9:000000000066C3C3C3DBFF6600000000 +03CA:0000C300001818181818180E00000000 +03CB:0000C30000E766666666663C00000000 +03CC:00003810007CC6C6C6C6C67C00000000 +03CD:0000381000E766666666663C00000000 +03CE:000038100066C3C3C3DBFF6600000000 +0401:666600FEC6C0C0F0C0C0C6FE00000000 +0402:0000F86060607C666666666C00000000 +0403:1830007E606060606060606000000000 +0404:00003C66C0C0F8C0C0C0663C00000000 +0405:00007CC6C660380C06C6C67C00000000 +0406:0018003C181818181818183C00000000 +0407:0066003C181818181818183C00000000 +0408:00001E0C0C0C0C0CCCCCCC7800000000 +0409:0000183878D8D8DEDBDBDBDE00000000 +040A:0000D8D8D8D8D8FEDBDBDBDE00000000 +040B:0000FC3030303C363636363600000000 +040C:183000C6CCD8F0F8CCC6C6C600000000 +040E:281000C6C6C6C67E0606C67C00000000 +040F:0000C6C6C6C6C6C6C6FE383800000000 +0410:00003E66C6C6C6FEC6C6C6C600000000 +0411:0000FEC0C0C0FCC6C6C6C6FC00000000 +0412:0000FCC6C6C6FCC6C6C6C6FC00000000 +0413:0000FEC6C0C0C0C0C0C0C0C000000000 +0414:00003C6C6C6C6C6C6C6C6CFEC6820000 +0415:0000FEC6C0C0F0C0C0C0C6FE00000000 +0416:0000D6D6D6547CD6D6D6D6D600000000 +0417:00007CC606061C0606C6C67C00000000 +0418:0000C6C6C6C6CEDEF6E6C6C600000000 +0419:000CDAC6C6C6CEDEF6E6C6C600000000 +041A:0000C6CCD8F0F0D8CCC6C6C600000000 +041B:00001E3666C6C6C6C6C6C6C600000000 +041C:0000C6C6EEEEFEFED6D6C6C600000000 +041D:0000C6C6C6C6FEC6C6C6C6C600000000 +041E:00007EC6C6C6C6C6C6C6C6FC00000000 +041F:0000FEC6C6C6C6C6C6C6C6C600000000 +0420:0000FCC6C6C6C6C6FCC0C0C000000000 +0421:00007CC6C6C0C0C0C0C6C67C00000000 +0422:00007E7E5A1818181818181800000000 +0423:0000C6C6C6C6C6C67E06C67C00000000 +0424:00007CD6D6D6D6D6D67C103800000000 +0425:0000C6C66C38386CC6C6C6C600000000 +0426:0000CCCCCCCCCCCCCCCCCCFE02060400 +0427:0000C6C6C6C6C67E0606060600000000 +0428:0000D6D6D6D6D6D6D6D6D6FE00000000 +0429:0000D6D6D6D6D6D6D6D6D6FE02060400 +042A:0000E0E060607C666666667C00000000 +042B:0000C6C6C6C6E6B6B6B6B6E600000000 +042C:0000C0C0C0C0FCC6C6C6C6FC00000000 +042D:000078CC06061E1E0606CC7800000000 +042E:00009CB6B6B6F6B6B6B6B69C00000000 +042F:00007EC6C6C6C67E3666C6C600000000 +0430:00000000007CC6C6C6FEC6C600000000 +0431:0000000000FEC0FCC6C6C6FC00000000 +0432:0000000000FCC6C6FCC6C6FC00000000 +0433:0000000000FEC6C2C0C0C0C000000000 +0434:00000000003C6C6C6C6C6CFEC6820000 +0435:00000000007CC6C6FCC0C67C00000000 +0436:0000000000D6D6D67CD6D6D600000000 +0437:00000000007CC6061C06C67C00000000 +0438:0000000000C6C6CEDEF6E6C600000000 +0439:0000000C18C6C6CEDEF6E6C600000000 +043A:0000000000C6CCD8F8D8CCC600000000 +043B:00000000003E6666666666C600000000 +043C:0000000000C6EEFED6C6C6C600000000 +043D:0000000000C6C6C6FEC6C6C600000000 +043E:00000000007EC6C6C6C6C6FC00000000 +043F:0000000000FEC6C6C6C6C6C600000000 +0440:0000000000FCC6C6C6C6C6FCC0C0C000 +0441:00000000007CC6C0C0C2C67C00000000 +0442:00000000007E5A181818181800000000 +0443:0000000000C6C6C6C6C6C67E06C67C00 +0444:00000000107CD6D6D6D6D67C10380000 +0445:0000000000C66C38386CC6C600000000 +0446:0000000000CCCCCCCCCCCCFE060C0000 +0447:0000000000C6C6C6C67E060600000000 +0448:0000000000D6D6D6D6D6D6FE00000000 +0449:0000000000D6D6D6D6D6D6FE02060400 +044A:0000000000E0607C6666667C00000000 +044B:0000000000C6C6E6B6B6B6E600000000 +044C:0000000000C0C0FCC6C6C6FC00000000 +044D:00000000007CC6061E06C67C00000000 +044E:00000000009CB6B6F6B6B69C00000000 +044F:00000000007EC6C67E3666C600000000 +0451:00006C6C007CC6C6FCC0C67C00000000 +0452:0000606060F8607C666666660C000000 +0453:00001830007C60606060606000000000 +0454:00000000007CC6C0F0C0C67C00000000 +0455:00000000007CC660380CC67C00000000 +0456:00001010003818181818183C00000000 +0457:00002828003818181818183C00000000 +0458:00000404000E06060606060666663C00 +0459:0000000000183878DEDBDBDE00000000 +045A:0000000000D8D8D8FEDBDBDE00000000 +045B:0000303030FC303C3636363600000000 +045C:0000183000C4CCD8F0D8CCCC00000000 +045E:0000281000C6C6C6C6C6C67E06C67C00 +045F:0000000000C6C6C6C6FE383800000000 +05D0:00000000C6C66676DCCCC6C600000000 +05D1:00000000F80C0C0C0C0C0CFE00000000 +05D2:00000000380C0C0C0C1C36E600000000 +05D3:00000000FE0C0C0C0C0C0C0C00000000 +05D4:00000000FC060606C6C6C6C600000000 +05D5:00000000701818181818181800000000 +05D6:00000000FC3030301818306000000000 +05D7:00000000FC66C6C6C6C6C6C600000000 +05D8:00000000CCD6D6C6C6C6C67C00000000 +05D9:00000000701818183000000000000000 +05DA:00000000FC0606060C0C0C0C0C0C0E00 +05DB:00000000FC060606060606FC00000000 +05DC:0000C0C0FC060606060C181800000000 +05DD:00000000FC66C6C6C6C6C6FE00000000 +05DE:00000000DC7666C6C6C6C6DE00000000 +05DF:00000000380C0C181818181818181C00 +05E0:00000000380C0C0C0C0C0C7C00000000 +05E1:00000000FC66C6C6C6C6CC7800000000 +05E2:00000000EE66666666662CF800000000 +05E3:00000000F84CCCCCEC0C0C0C0C0C0E00 +05E4:00000000FC46C6C6E60606FE00000000 +05E5:00000000EE66666C7860606060607000 +05E6:00000000EE666634180C06FE00000000 +05E7:00000000FC060666646C6E6060606000 +05E8:00000000FC0606060606060600000000 +05E9:00000000D6D6D6D6D6F6C67C00000000 +05EA:00000000FC6666666666E6E600000000 +200E:00000000000000000000000000000000 +200F:00000000000000000000000000000000 +2015:00000000000000FF0000000000000000 +2017:000000000000000000000000FF00FF00 +2018:00306060300000000000000000000000 +2019:000C06060C0000000000000000000000 2022:000000000000183C3C18000000000000 203C:00006666666666666600666600000000 207F:00D86C6C6C6C6C000000000000000000 20A7:00F8CCCCF8C4CCDECCCCCCC600000000 +20AC:00000000000000000000000000000000 +20AF:00000000000000000000000000000000 +2116:0000888ACDEAB8988B888B8800000000 2190:00000000003060FE6030000000000000 2191:0000183C7E1818181818181800000000 2192:0000000000180CFE0C18000000000000 Copied and modified: stable/10/share/vt/fonts/vgarom-8x8.hex (from r267306, head/share/vt/fonts/vgarom-8x8.hex) ============================================================================== --- head/share/vt/fonts/vgarom-8x8.hex Mon Jun 9 21:06:46 2014 (r267306, copy source) +++ stable/10/share/vt/fonts/vgarom-8x8.hex Tue Sep 9 20:36:56 2014 (r271333) @@ -100,34 +100,70 @@ 00A1:1818001818181800 00A2:18187EC0C07E1818 00A3:386C64F060E6FC00 +00A4:00C33C66663CC300 00A5:CCCC78FC30FC3030 +00A6:1818180018181800 00A7:3E63386C6C38CC78 +00A8:C600000000000000 +00A9:7C82BAA2BA827C00 00AA:3C6C6C3E007E0000 00AB:003366CC66330000 00AC:000000FC0C0C0000 +00AD:0000000000000000 +00AE:7C82BAB2AA827C00 +00AF:FE00000000000000 00B0:386C6C3800000000 00B1:3030FC303000FC00 00B2:7018306078000000 +00B3:1E020E021E000000 +00B4:1830000000000000 00B5:00666666667C60C0 00B6:7FDBDB7B1B1B1B00 00B7:0000000018000000 +00B8:0000000000001830 +00B9:060E060606000000 00BA:386C6C38007C0000 00BB:00CC663366CC0000 00BC:C3C6CCDB376FCF03 00BD:C3C6CCDE3366CC0F +00BE:F020966C33670F03 00BF:30003060C0CC7800 +00C0:180C3078CCFCCC00 +00C1:60C03078CCFCCC00 +00C2:78843078CCFCCC00 +00C3:66983078CCFCCC00 00C4:C6386CC6FEC6C600 00C5:30300078CCFCCC00 00C6:3E6CCCFECCCCCE00 00C7:78CCC0CC78180C78 +00C8:3018FE627862FE00 00C9:1C00FC607860FC00 +00CA:3844FE627862FE00 +00CB:6600FE627862FE00 +00CC:6030783030307800 +00CD:1830783030307800 +00CE:7884783030307800 +00CF:CC00783030307800 +00D0:786C66F6666C7800 00D1:FC00CCECFCDCCC00 +00D2:30187CC6C6C67C00 +00D3:18307CC6C6C67C00 +00D4:38447CC6C6C67C00 +00D5:66987CC6C6C67C00 00D6:C3183C66663C1800 +00D7:00C66C38386CC600 +00D8:067CCE9AB2E678C0 +00D9:6030CCCCCCCCFC00 +00DA:1830CCCCCCCCFC00 +00DB:7884CCCCCCCCFC00 00DC:CC00CCCCCCCC7800 +00DD:1830CCCC78307800 +00DE:60786C7860606000 00DF:0078CCF8CCF8C0C0 00E0:E000780C7CCC7E00 00E1:1C00780C7CCC7E00 00E2:7EC33C063E663F00 +00E3:6698780C7CCC7600 00E4:CC00780C7CCC7E00 00E5:3030780C7CCC7E00 00E6:00007F0C7FCC7F00 @@ -140,34 +176,322 @@ 00ED:3800703030307800 00EE:7CC6381818183C00 00EF:CC00703030307800 +00F0:6C386C0C6CCC7800 00F1:00F800F8CCCCCC00 00F2:00E00078CCCC7800 00F3:001C0078CCCC7800 00F4:78CC0078CCCC7800 +00F5:6698007CC6C67C00 00F6:00CC0078CCCC7800 00F7:303000FC00303000 +00F8:0000067CDEF67CC0 00F9:00E000CCCCCC7E00 00FA:001C00CCCCCC7E00 00FB:78CC00CCCCCC7E00 00FC:00CC00CCCCCC7E00 +00FD:1830CCCCCC7C0CF8 +00FE:E0786C666C78E000 00FF:00CC00CCCC7C0CF8 +0100:7C007CC6C6FEC6C6 +0101:007C00780C7CCC76 +0102:663C3C667E666600 +0103:C67C780C7CCC7600 +0104:183C667E666E180E +0105:0000780C7CCC761C +0106:0C187CC6C0C67C00 +0107:0C18003C60603C00 +010C:6C387CC6C0C67C00 +010D:361C003C60603C00 +010E:6C38FC666666FC00 +010F:6C380C0C7CCC7600 +0110:F86C66F6666CF800 +0111:0C3E0C7CCCCC7600 +0112:7C00FE607C6066FE +0113:007C007CC6FEC07C +0116:18FE66607C6066FE +0117:0038007CC6FEC07C +0118:FE6268786862FE1C +0119:00003C667E603C1C +011A:6C38FE607860FE00 +011B:361C3C667E603C00 +0122:3C66C0CE663E1870 +0123:3860307ECC7C0CF8 +0128:76DC38181818183C +0129:0076DC003818183C +012A:3C003C181818183C +012B:003C00381818183C +012E:783030303078301C +012F:18003818183C180E +0136:C6CCF8D8CCC60C38 +0137:00E0666C786CE61C +0138:000000E66C786CE6 +0139:E66C60606266FE00 +013A:7336303030307800 +013B:F060606266FE1870 +013C:38181818183C1870 +013D:FB6E60606266FE00 +013E:FB6E60606060F000 +0141:F06878F0E266FE00 +0142:381A1E3C78183C00 +0143:0C18E6F6DECEC600 +0144:0C187C6666666600 +0145:C6E6F6DECEC60C38 +0146:0000DCE6C6C61870 +0147:6C38E6F6DECEC600 +0148:6C387C6666666600 +014A:00DCFEF6C6C6C6DC +014B:0000DCFEF6C6061C +014C:7C007CC6C6C6C67C +014D:007C007CC6C6C67C +0150:366C7CC6C6C67C00 +0151:366C003C66663C00 +0152:58D8DCD8583E0000 +0153:006CD2DED06E0000 +0154:0C18FCC6FCCCC600 +0155:0C18DC766660F000 +0156:FC667E6C66E61870 +0157:0000DC7666F030E0 +0158:6C38FCC6FCCCC600 +0159:6C38DC766660F000 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 21:07:21 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF16B74F; Tue, 9 Sep 2014 21:07:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA3AD90B; Tue, 9 Sep 2014 21:07:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89L7Ljk090450; Tue, 9 Sep 2014 21:07:21 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89L7L49090449; Tue, 9 Sep 2014 21:07:21 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409092107.s89L7L49090449@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 9 Sep 2014 21: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: r271334 - stable/10/release X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 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, 09 Sep 2014 21:07:21 -0000 Author: gjb Date: Tue Sep 9 21:07:21 2014 New Revision: 271334 URL: http://svnweb.freebsd.org/changeset/base/271334 Log: Connect the UEFI-capable memstick.img to the build. This is a direct commit to stable/10, as the script in head/ does UEFI by default. Approved by: re (rodrigc) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/Makefile Modified: stable/10/release/Makefile ============================================================================== --- stable/10/release/Makefile Tue Sep 9 20:36:56 2014 (r271333) +++ stable/10/release/Makefile Tue Sep 9 21:07:21 2014 (r271334) @@ -93,6 +93,10 @@ RELEASE_TARGETS+= mini-memstick.img IMAGES+= memstick.img IMAGES+= mini-memstick.img .endif +.if exists(${.CURDIR}/${TARGET}/make-uefi-memstick.sh) +RELEASE_TARGETS+=uefi-memstick.img +IMAGES+= uefi-memstick.img +.endif CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES} .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) @@ -230,6 +234,12 @@ mini-memstick: mini-memstick.img mini-memstick.img: system sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET} +uefi-memstick: uefi-memstick.img +uefi-memstick.img: system +.if exists(${.CURDIR}/${TARGET}/make-uefi-memstick.sh) + sh ${.CURDIR}/${TARGET}/make-uefi-memstick.sh release ${.TARGET} +.endif + packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST touch ${.TARGET} From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 22:24:06 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C60750B; Tue, 9 Sep 2014 22:24:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84CB6139; Tue, 9 Sep 2014 22:24:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89MO6t4029207; Tue, 9 Sep 2014 22:24:06 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89MO1me029173; Tue, 9 Sep 2014 22:24:01 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201409092224.s89MO1me029173@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Tue, 9 Sep 2014 22:24: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: r271337 - in stable/10: lib/libc/arm/gen lib/libc/arm/string lib/libc/arm/sys sys/arm/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.18-1 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, 09 Sep 2014 22:24:06 -0000 Author: ian Date: Tue Sep 9 22:24:01 2014 New Revision: 271337 URL: http://svnweb.freebsd.org/changeset/base/271337 Log: MFC r270882, r270930: In ARM asm code, ensure that every ENTRY(foo) has a matching END(foo). The EABI unwind info requires a .fnend for every .fnstart, and newer binutils will complain about seeing two .fnstart in a row. This change allows newer tools to compile our code. Do not generate unwind info in asm functions if _STANDALONE is defined. The .fnend op causes the assembler to emit RELOC references to unwind support functions that don't exist in libstand. Approved by: re(gjb) Modified: stable/10/lib/libc/arm/gen/__aeabi_read_tp.S stable/10/lib/libc/arm/gen/_ctx_start.S stable/10/lib/libc/arm/gen/_setjmp.S stable/10/lib/libc/arm/gen/alloca.S stable/10/lib/libc/arm/gen/divsi3.S stable/10/lib/libc/arm/gen/setjmp.S stable/10/lib/libc/arm/gen/sigsetjmp.S stable/10/lib/libc/arm/string/ffs.S stable/10/lib/libc/arm/string/memcmp.S stable/10/lib/libc/arm/string/memcpy_arm.S stable/10/lib/libc/arm/string/memcpy_xscale.S stable/10/lib/libc/arm/string/memmove.S stable/10/lib/libc/arm/string/memset.S stable/10/lib/libc/arm/string/strcmp.S stable/10/lib/libc/arm/string/strlen.S stable/10/lib/libc/arm/string/strncmp.S stable/10/lib/libc/arm/sys/Ovfork.S stable/10/lib/libc/arm/sys/brk.S stable/10/lib/libc/arm/sys/cerror.S stable/10/lib/libc/arm/sys/pipe.S stable/10/lib/libc/arm/sys/ptrace.S stable/10/lib/libc/arm/sys/sbrk.S stable/10/sys/arm/include/asm.h Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/arm/gen/__aeabi_read_tp.S ============================================================================== --- stable/10/lib/libc/arm/gen/__aeabi_read_tp.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/gen/__aeabi_read_tp.S Tue Sep 9 22:24:01 2014 (r271337) @@ -38,6 +38,7 @@ ENTRY(__aeabi_read_tp) mrc p15, 0, r0, c13, c0, 3 #endif RET +END(__aeabi_read_tp) #ifdef ARM_TP_ADDRESS .Larm_tp_address: Modified: stable/10/lib/libc/arm/gen/_ctx_start.S ============================================================================== --- stable/10/lib/libc/arm/gen/_ctx_start.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/gen/_ctx_start.S Tue Sep 9 22:24:01 2014 (r271337) @@ -7,3 +7,4 @@ ENTRY(_ctx_start) mov r0, r5 bl _C_LABEL(ctx_done) bl _C_LABEL(abort) +END(_ctx_start) Modified: stable/10/lib/libc/arm/gen/_setjmp.S ============================================================================== --- stable/10/lib/libc/arm/gen/_setjmp.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/gen/_setjmp.S Tue Sep 9 22:24:01 2014 (r271337) @@ -89,6 +89,7 @@ ENTRY(_setjmp) mov r0, #0x00000000 RET +END(_setjmp) .L_setjmp_magic: .word _JB_MAGIC__SETJMP @@ -140,3 +141,4 @@ botch: #else b . #endif +END(_longjmp) Modified: stable/10/lib/libc/arm/gen/alloca.S ============================================================================== --- stable/10/lib/libc/arm/gen/alloca.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/gen/alloca.S Tue Sep 9 22:24:01 2014 (r271337) @@ -43,3 +43,4 @@ ENTRY(alloca) sub sp, sp, r0 /* Adjust the stack pointer */ mov r0, sp /* r0 = base of new space */ RET +END(alloca) Modified: stable/10/lib/libc/arm/gen/divsi3.S ============================================================================== --- stable/10/lib/libc/arm/gen/divsi3.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/gen/divsi3.S Tue Sep 9 22:24:01 2014 (r271337) @@ -29,6 +29,7 @@ ENTRY(__umodsi3) add sp, sp, #4 /* unalign stack */ mov r0, r1 ldmfd sp!, {pc} +END(__umodsi3) ENTRY(__modsi3) stmfd sp!, {lr} @@ -48,6 +49,7 @@ ENTRY(__modsi3) mvn r0, #0 #endif RET +END(__modsi3) ENTRY(__udivsi3) .L_udivide: /* r0 = r0 / r1; r1 = r0 % r1 */ @@ -70,6 +72,7 @@ ENTRY(__udivsi3) mov r0, r1 mov r1, #0 RET +END(__udivsi3) ENTRY(__divsi3) .L_divide: /* r0 = r0 / r1; r1 = r0 % r1 */ @@ -385,3 +388,4 @@ ENTRY(__divsi3) addhs r3, r3, r2 mov r0, r3 RET +END(__divsi3) Modified: stable/10/lib/libc/arm/gen/setjmp.S ============================================================================== --- stable/10/lib/libc/arm/gen/setjmp.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/gen/setjmp.S Tue Sep 9 22:24:01 2014 (r271337) @@ -101,7 +101,7 @@ ENTRY(setjmp) .Lfpu_present: .word PIC_SYM(_libc_arm_fpu_present, GOTOFF) #endif /* __ARM_EABI__ */ - +END(setjmp) .weak _C_LABEL(longjmp) .set _C_LABEL(longjmp), _C_LABEL(__longjmp) @@ -150,3 +150,4 @@ ENTRY(__longjmp) bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(_C_LABEL(abort), PLT) b . - 8 /* Cannot get here */ +END(__longjmp) Modified: stable/10/lib/libc/arm/gen/sigsetjmp.S ============================================================================== --- stable/10/lib/libc/arm/gen/sigsetjmp.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/gen/sigsetjmp.S Tue Sep 9 22:24:01 2014 (r271337) @@ -51,6 +51,7 @@ ENTRY(sigsetjmp) teq r1, #0 beq PIC_SYM(_C_LABEL(_setjmp), PLT) b PIC_SYM(_C_LABEL(setjmp), PLT) +END(sigsetjmp) .L_setjmp_magic: .word _JB_MAGIC__SETJMP @@ -64,3 +65,4 @@ ENTRY(siglongjmp) teq r2, r3 /* magic correct? */ beq PIC_SYM(_C_LABEL(_longjmp), PLT) b PIC_SYM(_C_LABEL(longjmp), PLT) +END(siglongjmp) Modified: stable/10/lib/libc/arm/string/ffs.S ============================================================================== --- stable/10/lib/libc/arm/string/ffs.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/ffs.S Tue Sep 9 22:24:01 2014 (r271337) @@ -80,3 +80,4 @@ ENTRY(ffs) rsbne r0, r0, #32 RET #endif +END(ffs) Modified: stable/10/lib/libc/arm/string/memcmp.S ============================================================================== --- stable/10/lib/libc/arm/string/memcmp.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/memcmp.S Tue Sep 9 22:24:01 2014 (r271337) @@ -178,3 +178,4 @@ ENTRY(memcmp) sub r0, r3, r2 /* r0 = b1#5 - b2#5 */ RET #endif +END(memcmp) Modified: stable/10/lib/libc/arm/string/memcpy_arm.S ============================================================================== --- stable/10/lib/libc/arm/string/memcpy_arm.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/memcpy_arm.S Tue Sep 9 22:24:01 2014 (r271337) @@ -330,3 +330,4 @@ ENTRY(memcpy) .Lmemcpy_srcul3l4: sub r1, r1, #1 b .Lmemcpy_l4 +END(memcpy) Modified: stable/10/lib/libc/arm/string/memcpy_xscale.S ============================================================================== --- stable/10/lib/libc/arm/string/memcpy_xscale.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/memcpy_xscale.S Tue Sep 9 22:24:01 2014 (r271337) @@ -1781,3 +1781,4 @@ ENTRY(memcpy) strb r1, [r0, #0x0b] bx lr #endif /* !_STANDALONE */ +END(memcpy) Modified: stable/10/lib/libc/arm/string/memmove.S ============================================================================== --- stable/10/lib/libc/arm/string/memmove.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/memmove.S Tue Sep 9 22:24:01 2014 (r271337) @@ -580,3 +580,8 @@ ENTRY(bcopy) .Lmemmove_bsrcul1l4: add r1, r1, #1 b .Lmemmove_bl4 +#ifndef _BCOPY +END(memmove) +#else +END(bcopy) +#endif Modified: stable/10/lib/libc/arm/string/memset.S ============================================================================== --- stable/10/lib/libc/arm/string/memset.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/memset.S Tue Sep 9 22:24:01 2014 (r271337) @@ -234,3 +234,8 @@ ENTRY(memset) strgeb r3, [ip], #0x01 /* Set another byte */ strgtb r3, [ip] /* and a third */ RET /* Exit */ +#ifdef _BZERO +END(bzero) +#else +END(memset) +#endif Modified: stable/10/lib/libc/arm/string/strcmp.S ============================================================================== --- stable/10/lib/libc/arm/string/strcmp.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/strcmp.S Tue Sep 9 22:24:01 2014 (r271337) @@ -41,3 +41,4 @@ ENTRY(strcmp) beq 1b sub r0, r2, r3 RET +END(strcmp) Modified: stable/10/lib/libc/arm/string/strlen.S ============================================================================== --- stable/10/lib/libc/arm/string/strlen.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/strlen.S Tue Sep 9 22:24:01 2014 (r271337) @@ -76,3 +76,4 @@ ENTRY(strlen) .Lexit: mov r0, r1 RET +END(strlen) Modified: stable/10/lib/libc/arm/string/strncmp.S ============================================================================== --- stable/10/lib/libc/arm/string/strncmp.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/string/strncmp.S Tue Sep 9 22:24:01 2014 (r271337) @@ -52,3 +52,4 @@ ENTRY(strncmp) beq 1b sub r0, r2, r3 RET +END(strncmp) Modified: stable/10/lib/libc/arm/sys/Ovfork.S ============================================================================== --- stable/10/lib/libc/arm/sys/Ovfork.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/sys/Ovfork.S Tue Sep 9 22:24:01 2014 (r271337) @@ -52,3 +52,4 @@ ENTRY(vfork) sub r1, r1, #1 /* r1 == 0xffffffff if parent, 0 if child */ and r0, r0, r1 /* r0 == 0 if child, else unchanged */ mov r15, r2 +END(vfork) Modified: stable/10/lib/libc/arm/sys/brk.S ============================================================================== --- stable/10/lib/libc/arm/sys/brk.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/sys/brk.S Tue Sep 9 22:24:01 2014 (r271337) @@ -98,3 +98,4 @@ ENTRY(_brk) .word PIC_SYM(_C_LABEL(minbrk), GOT) .Lcurbrk: .word PIC_SYM(CURBRK, GOT) +END(_brk) Modified: stable/10/lib/libc/arm/sys/cerror.S ============================================================================== --- stable/10/lib/libc/arm/sys/cerror.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/sys/cerror.S Tue Sep 9 22:24:01 2014 (r271337) @@ -46,3 +46,4 @@ ASENTRY(CERROR) mvn r0, #0x00000000 mvn r1, #0x00000000 ldmfd sp!, {r4, pc} +END(CERROR) Modified: stable/10/lib/libc/arm/sys/pipe.S ============================================================================== --- stable/10/lib/libc/arm/sys/pipe.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/sys/pipe.S Tue Sep 9 22:24:01 2014 (r271337) @@ -48,3 +48,4 @@ ENTRY(_pipe) str r1, [r2, #0x0004] mov r0, #0x00000000 RET +END(_pipe) Modified: stable/10/lib/libc/arm/sys/ptrace.S ============================================================================== --- stable/10/lib/libc/arm/sys/ptrace.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/sys/ptrace.S Tue Sep 9 22:24:01 2014 (r271337) @@ -46,3 +46,4 @@ ENTRY(ptrace) SYSTRAP(ptrace) bcs PIC_SYM(CERROR, PLT) RET +END(ptrace) Modified: stable/10/lib/libc/arm/sys/sbrk.S ============================================================================== --- stable/10/lib/libc/arm/sys/sbrk.S Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/lib/libc/arm/sys/sbrk.S Tue Sep 9 22:24:01 2014 (r271337) @@ -86,3 +86,4 @@ ENTRY(_sbrk) #endif .Lcurbrk: .word PIC_SYM(CURBRK, GOT) +END(_sbrk) Modified: stable/10/sys/arm/include/asm.h ============================================================================== --- stable/10/sys/arm/include/asm.h Tue Sep 9 22:14:15 2014 (r271336) +++ stable/10/sys/arm/include/asm.h Tue Sep 9 22:24:01 2014 (r271337) @@ -53,7 +53,7 @@ # define _ALIGN_TEXT .align 0 #endif -#ifdef __ARM_EABI__ +#if defined(__ARM_EABI__) && !defined(_STANDALONE) #define STOP_UNWINDING .cantunwind #define _FNSTART .fnstart #define _FNEND .fnend From owner-svn-src-stable-10@FreeBSD.ORG Tue Sep 9 23:31:32 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9EA55593; Tue, 9 Sep 2014 23:31:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 888ED9CE; Tue, 9 Sep 2014 23:31:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89NVWBV061681; Tue, 9 Sep 2014 23:31:32 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89NVVW0061673; Tue, 9 Sep 2014 23:31:31 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201409092331.s89NVVW0061673@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Tue, 9 Sep 2014 23:31:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271339 - stable/10/sys/arm/conf 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.18-1 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, 09 Sep 2014 23:31:32 -0000 Author: ian Date: Tue Sep 9 23:31:30 2014 New Revision: 271339 URL: http://svnweb.freebsd.org/changeset/base/271339 Log: MFC r271050: Disable DIAGNOSTIC on low-end ARM platforms. Approved by: re(gjb) Modified: stable/10/sys/arm/conf/DB-78XXX stable/10/sys/arm/conf/DB-88F5XXX stable/10/sys/arm/conf/DB-88F6XXX stable/10/sys/arm/conf/DOCKSTAR stable/10/sys/arm/conf/DREAMPLUG-1001 stable/10/sys/arm/conf/EA3250 Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/conf/DB-78XXX ============================================================================== --- stable/10/sys/arm/conf/DB-78XXX Tue Sep 9 22:35:02 2014 (r271338) +++ stable/10/sys/arm/conf/DB-78XXX Tue Sep 9 23:31:30 2014 (r271339) @@ -44,7 +44,7 @@ options NO_SWAPPING options ALT_BREAK_TO_DEBUGGER options DDB #options DEADLKRES # Enable the deadlock resolver -options DIAGNOSTIC +#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB Modified: stable/10/sys/arm/conf/DB-88F5XXX ============================================================================== --- stable/10/sys/arm/conf/DB-88F5XXX Tue Sep 9 22:35:02 2014 (r271338) +++ stable/10/sys/arm/conf/DB-88F5XXX Tue Sep 9 23:31:30 2014 (r271339) @@ -43,7 +43,7 @@ options NO_SWAPPING options ALT_BREAK_TO_DEBUGGER options DDB #options DEADLKRES # Enable the deadlock resolver -options DIAGNOSTIC +#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB Modified: stable/10/sys/arm/conf/DB-88F6XXX ============================================================================== --- stable/10/sys/arm/conf/DB-88F6XXX Tue Sep 9 22:35:02 2014 (r271338) +++ stable/10/sys/arm/conf/DB-88F6XXX Tue Sep 9 23:31:30 2014 (r271339) @@ -44,7 +44,7 @@ options NO_SWAPPING options ALT_BREAK_TO_DEBUGGER options DDB #options DEADLKRES # Enable the deadlock resolver -options DIAGNOSTIC +#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB Modified: stable/10/sys/arm/conf/DOCKSTAR ============================================================================== --- stable/10/sys/arm/conf/DOCKSTAR Tue Sep 9 22:35:02 2014 (r271338) +++ stable/10/sys/arm/conf/DOCKSTAR Tue Sep 9 23:31:30 2014 (r271339) @@ -145,7 +145,7 @@ options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER options DDB options KDB -options DIAGNOSTIC +#options DIAGNOSTIC options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles Modified: stable/10/sys/arm/conf/DREAMPLUG-1001 ============================================================================== --- stable/10/sys/arm/conf/DREAMPLUG-1001 Tue Sep 9 22:35:02 2014 (r271338) +++ stable/10/sys/arm/conf/DREAMPLUG-1001 Tue Sep 9 23:31:30 2014 (r271339) @@ -153,7 +153,7 @@ options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER options DDB options KDB -options DIAGNOSTIC +#options DIAGNOSTIC options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles Modified: stable/10/sys/arm/conf/EA3250 ============================================================================== --- stable/10/sys/arm/conf/EA3250 Tue Sep 9 22:35:02 2014 (r271338) +++ stable/10/sys/arm/conf/EA3250 Tue Sep 9 23:31:30 2014 (r271339) @@ -44,7 +44,7 @@ options NO_SWAPPING options ALT_BREAK_TO_DEBUGGER options DDB #options DEADLKRES # Enable the deadlock resolver -options DIAGNOSTIC +#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB From owner-svn-src-stable-10@FreeBSD.ORG Wed Sep 10 00:19:34 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CEE85FA3; Wed, 10 Sep 2014 00:19:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B9184DE0; Wed, 10 Sep 2014 00:19:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A0JYFk082301; Wed, 10 Sep 2014 00:19:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8A0JYhs082300; Wed, 10 Sep 2014 00:19:34 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409100019.s8A0JYhs082300@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 10 Sep 2014 00:19: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: r271341 - head/sys/sys stable/10/sys/sys stable/8/sys/sys stable/9/sys/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.18-1 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, 10 Sep 2014 00:19:34 -0000 Author: gjb Date: Wed Sep 10 00:19:33 2014 New Revision: 271341 URL: http://svnweb.freebsd.org/changeset/base/271341 Log: Bump __FreeBSD_version after SA-14:18 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/sys/param.h Changes in other areas also in this revision: Modified: head/sys/sys/param.h stable/8/sys/sys/param.h stable/9/sys/sys/param.h Modified: stable/10/sys/sys/param.h ============================================================================== --- stable/10/sys/sys/param.h Tue Sep 9 23:39:43 2014 (r271340) +++ stable/10/sys/sys/param.h Wed Sep 10 00:19:33 2014 (r271341) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000714 /* Master, propagated to newvers */ +#define __FreeBSD_version 1000715 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-stable-10@FreeBSD.ORG Wed Sep 10 06:48:24 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31A4BB63; Wed, 10 Sep 2014 06:48:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C945FE5; Wed, 10 Sep 2014 06:48:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A6mNtT063514; Wed, 10 Sep 2014 06:48:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8A6mNcL063513; Wed, 10 Sep 2014 06:48:23 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201409100648.s8A6mNcL063513@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 10 Sep 2014 06:48: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: r271355 - 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.18-1 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, 10 Sep 2014 06:48:24 -0000 Author: hselasky Date: Wed Sep 10 06:48:23 2014 New Revision: 271355 URL: http://svnweb.freebsd.org/changeset/base/271355 Log: MFC r270992: Fix logical error. Approved by: re, glebius Modified: stable/10/sys/dev/usb/net/if_aue.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/net/if_aue.c ============================================================================== --- stable/10/sys/dev/usb/net/if_aue.c Wed Sep 10 06:35:00 2014 (r271354) +++ stable/10/sys/dev/usb/net/if_aue.c Wed Sep 10 06:48:23 2014 (r271355) @@ -745,7 +745,7 @@ aue_intr_callback(struct usb_xfer *xfer, if (pkt.aue_txstat0) ifp->if_oerrors++; - if (pkt.aue_txstat0 & (AUE_TXSTAT0_LATECOLL & + if (pkt.aue_txstat0 & (AUE_TXSTAT0_LATECOLL | AUE_TXSTAT0_EXCESSCOLL)) ifp->if_collisions++; } From owner-svn-src-stable-10@FreeBSD.ORG Wed Sep 10 09:40:52 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F134171B; Wed, 10 Sep 2014 09:40:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC082153F; Wed, 10 Sep 2014 09:40:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A9epgf046924; Wed, 10 Sep 2014 09:40:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8A9ep63046922; Wed, 10 Sep 2014 09:40:51 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201409100940.s8A9ep63046922@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 10 Sep 2014 09: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: r271370 - in stable/10/sys/dev/usb: . quirk 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.18-1 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, 10 Sep 2014 09:40:52 -0000 Author: hselasky Date: Wed Sep 10 09:40:51 2014 New Revision: 271370 URL: http://svnweb.freebsd.org/changeset/base/271370 Log: MFC r271017 and r271018: Add new quirk. PR: 193279 Approved by: re, marius Modified: stable/10/sys/dev/usb/quirk/usb_quirk.c stable/10/sys/dev/usb/usbdevs Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/quirk/usb_quirk.c ============================================================================== --- stable/10/sys/dev/usb/quirk/usb_quirk.c Wed Sep 10 09:37:55 2014 (r271369) +++ stable/10/sys/dev/usb/quirk/usb_quirk.c Wed Sep 10 09:40:51 2014 (r271370) @@ -130,6 +130,8 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(MICROSOFT, WLINTELLIMOUSE, 0x0000, 0xffff, UQ_MS_LEADING_BYTE), /* Quirk for Corsair Vengeance K60 keyboard */ USB_QUIRK(CORSAIR, K60, 0x0000, 0xffff, UQ_KBD_BOOTPROTO), + /* Quirk for Corsair Vengeance K70 keyboard */ + USB_QUIRK(CORSAIR, K70, 0x0000, 0xffff, UQ_KBD_BOOTPROTO), /* umodem(4) device quirks */ USB_QUIRK(METRICOM, RICOCHET_GS, 0x100, 0x100, UQ_ASSUME_CM_OVER_DATA), USB_QUIRK(SANYO, SCP4900, 0x000, 0x000, UQ_ASSUME_CM_OVER_DATA), Modified: stable/10/sys/dev/usb/usbdevs ============================================================================== --- stable/10/sys/dev/usb/usbdevs Wed Sep 10 09:37:55 2014 (r271369) +++ stable/10/sys/dev/usb/usbdevs Wed Sep 10 09:40:51 2014 (r271370) @@ -1486,6 +1486,7 @@ product COREGA FETHER_USB_TXC 0x9601 FEt /* Corsair products */ product CORSAIR K60 0x0a60 Corsair Vengeance K60 keyboard +product CORSAIR K70 0x1b09 Corsair Vengeance K70 keyboard /* Creative products */ product CREATIVE NOMAD_II 0x1002 Nomad II MP3 player From owner-svn-src-stable-10@FreeBSD.ORG Wed Sep 10 09:47:17 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCDBFAC4; Wed, 10 Sep 2014 09:47:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7E2B1636; Wed, 10 Sep 2014 09:47:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A9lHwo048975; Wed, 10 Sep 2014 09:47:17 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8A9lHWH048973; Wed, 10 Sep 2014 09:47:17 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201409100947.s8A9lHWH048973@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 10 Sep 2014 09:47: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: r271372 - in stable/10/sys: kern 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.18-1 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, 10 Sep 2014 09:47:18 -0000 Author: kib Date: Wed Sep 10 09:47:16 2014 New Revision: 271372 URL: http://svnweb.freebsd.org/changeset/base/271372 Log: MFC r271000: Delay the return from thread_single(SINGLE_EXIT) until all threads are really destroyed by thread_stash() after the last switch out. MFC r271007: Retire thread_unthread(). MFC r271008: Style. Approved by: re (marius) Modified: stable/10/sys/kern/kern_thread.c stable/10/sys/sys/proc.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_thread.c ============================================================================== --- stable/10/sys/kern/kern_thread.c Wed Sep 10 09:42:10 2014 (r271371) +++ stable/10/sys/kern/kern_thread.c Wed Sep 10 09:47:16 2014 (r271372) @@ -433,6 +433,7 @@ thread_exit(void) */ if (p->p_flag & P_HADTHREADS) { if (p->p_numthreads > 1) { + atomic_add_int(&td->td_proc->p_exitthreads, 1); thread_unlink(td); td2 = FIRST_THREAD_IN_PROC(p); sched_exit_thread(td2, td); @@ -453,7 +454,6 @@ thread_exit(void) } } - atomic_add_int(&td->td_proc->p_exitthreads, 1); PCPU_SET(deadthread, td); } else { /* @@ -508,14 +508,12 @@ thread_wait(struct proc *p) struct thread *td; mtx_assert(&Giant, MA_NOTOWNED); - KASSERT((p->p_numthreads == 1), ("Multiple threads in wait1()")); + KASSERT(p->p_numthreads == 1, ("multiple threads in thread_wait()")); + KASSERT(p->p_exitthreads == 0, ("p_exitthreads leaking")); td = FIRST_THREAD_IN_PROC(p); /* Lock the last thread so we spin until it exits cpu_throw(). */ thread_lock(td); thread_unlock(td); - /* Wait for any remaining threads to exit cpu_throw(). */ - while (p->p_exitthreads) - sched_relinquish(curthread); lock_profile_thread_exit(td); cpuset_rel(td->td_cpuset); td->td_cpuset = NULL; @@ -552,18 +550,6 @@ thread_link(struct thread *td, struct pr } /* - * Convert a process with one thread to an unthreaded process. - */ -void -thread_unthread(struct thread *td) -{ - struct proc *p = td->td_proc; - - KASSERT((p->p_numthreads == 1), ("Unthreading with >1 threads")); - p->p_flag &= ~P_HADTHREADS; -} - -/* * Called from: * thread_exit() */ @@ -715,14 +701,24 @@ stopme: } if (mode == SINGLE_EXIT) { /* - * We have gotten rid of all the other threads and we - * are about to either exit or exec. In either case, - * we try our utmost to revert to being a non-threaded - * process. + * Convert the process to an unthreaded process. The + * SINGLE_EXIT is called by exit1() or execve(), in + * both cases other threads must be retired. */ + KASSERT(p->p_numthreads == 1, ("Unthreading with >1 threads")); p->p_singlethread = NULL; - p->p_flag &= ~(P_STOPPED_SINGLE | P_SINGLE_EXIT); - thread_unthread(td); + p->p_flag &= ~(P_STOPPED_SINGLE | P_SINGLE_EXIT | P_HADTHREADS); + + /* + * Wait for any remaining threads to exit cpu_throw(). + */ + while (p->p_exitthreads != 0) { + PROC_SUNLOCK(p); + PROC_UNLOCK(p); + sched_relinquish(td); + PROC_LOCK(p); + PROC_SLOCK(p); + } } PROC_SUNLOCK(p); return (0); Modified: stable/10/sys/sys/proc.h ============================================================================== --- stable/10/sys/sys/proc.h Wed Sep 10 09:42:10 2014 (r271371) +++ stable/10/sys/sys/proc.h Wed Sep 10 09:47:16 2014 (r271372) @@ -952,7 +952,6 @@ void thread_suspend_one(struct thread *t void thread_unlink(struct thread *td); void thread_unsuspend(struct proc *p); int thread_unsuspend_one(struct thread *td); -void thread_unthread(struct thread *td); void thread_wait(struct proc *p); struct thread *thread_find(struct proc *p, lwpid_t tid); From owner-svn-src-stable-10@FreeBSD.ORG Wed Sep 10 10:09:35 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E4212A2; Wed, 10 Sep 2014 10:09:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18B54185F; Wed, 10 Sep 2014 10:09:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AA9YoX058948; Wed, 10 Sep 2014 10:09:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8AA9YVI058947; Wed, 10 Sep 2014 10:09:34 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201409101009.s8AA9YVI058947@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 10 Sep 2014 10:09: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: r271375 - stable/10/sys/dev/sound/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.18-1 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, 10 Sep 2014 10:09:35 -0000 Author: hselasky Date: Wed Sep 10 10:09:34 2014 New Revision: 271375 URL: http://svnweb.freebsd.org/changeset/base/271375 Log: MFC r271218: Update mixer description for FastTrackPro. Approved by: re, marius Modified: stable/10/sys/dev/sound/usb/uaudio.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/10/sys/dev/sound/usb/uaudio.c Wed Sep 10 10:04:25 2014 (r271374) +++ stable/10/sys/dev/sound/usb/uaudio.c Wed Sep 10 10:09:34 2014 (r271375) @@ -2730,14 +2730,14 @@ uaudio_mixer_controls_create_ftu(struct uaudio_mixer_add_ctl(sc, &MIX(sc)); - MIX(sc).wValue[0] = MAKE_WORD(9, chy + 1); + MIX(sc).wValue[0] = MAKE_WORD(9, chy + 1 + 8); MIX(sc).type = MIX_SIGNED_16; MIX(sc).ctl = SOUND_MIXER_NRDEVICES; MIX(sc).name = "effect_send"; MIX(sc).nchan = 1; MIX(sc).update[0] = 1; snprintf(MIX(sc).desc, sizeof(MIX(sc).desc), - "Effect Send DIn%d Volume", chy + 1 + 8); + "Effect Send DIn%d Volume", chy + 1); uaudio_mixer_add_ctl(sc, &MIX(sc)); } From owner-svn-src-stable-10@FreeBSD.ORG Wed Sep 10 13:13:30 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CDEE226E; Wed, 10 Sep 2014 13:13:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B811810AF; Wed, 10 Sep 2014 13:13:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8ADDU1p053947; Wed, 10 Sep 2014 13:13:30 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8ADDUiv053946; Wed, 10 Sep 2014 13:13:30 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201409101313.s8ADDUiv053946@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 10 Sep 2014 13:13: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: r271390 - stable/10/cddl/contrib/opensolaris/cmd/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.18-1 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, 10 Sep 2014 13:13:30 -0000 Author: delphij Date: Wed Sep 10 13:13:30 2014 New Revision: 271390 URL: http://svnweb.freebsd.org/changeset/base/271390 Log: MFC r271222: Fix typo. Submitted by: Dmitry Morozovsky Approved by: re (gjb) Modified: stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Wed Sep 10 13:07:01 2014 (r271389) +++ stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Wed Sep 10 13:13:30 2014 (r271390) @@ -414,7 +414,7 @@ or smaller can take advantage of this fe When this feature is enabled, the contents of highly-compressible blocks are stored in the block "pointer" itself .Po a misnomer in this case, as it contains -the compresseed data, rather than a pointer to its location on disk +the compressed data, rather than a pointer to its location on disk .Pc . Thus the space of the block From owner-svn-src-stable-10@FreeBSD.ORG Wed Sep 10 13:21:45 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F3348EA; Wed, 10 Sep 2014 13:21:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29040115B; Wed, 10 Sep 2014 13:21:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8ADLj43058381; Wed, 10 Sep 2014 13:21:45 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8ADLjhU058380; Wed, 10 Sep 2014 13:21:45 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201409101321.s8ADLjhU058380@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 10 Sep 2014 13:21:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271392 - 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.18-1 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, 10 Sep 2014 13:21:45 -0000 Author: delphij Date: Wed Sep 10 13:21:44 2014 New Revision: 271392 URL: http://svnweb.freebsd.org/changeset/base/271392 Log: MFC r271226: MFV r271223: In dnode_sync(), do dnode_increase_indirection() before processing the dn_next_nblkptr. Illumos issue: 5117 space map reallocation can cause corruption Approved by: re (gjb) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c Wed Sep 10 13:17:35 2014 (r271391) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c Wed Sep 10 13:21:44 2014 (r271392) @@ -684,6 +684,11 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx) return; } + if (dn->dn_next_nlevels[txgoff]) { + dnode_increase_indirection(dn, tx); + dn->dn_next_nlevels[txgoff] = 0; + } + if (dn->dn_next_nblkptr[txgoff]) { /* this should only happen on a realloc */ ASSERT(dn->dn_allocated_txg == tx->tx_txg); @@ -708,11 +713,6 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx) mutex_exit(&dn->dn_mtx); } - if (dn->dn_next_nlevels[txgoff]) { - dnode_increase_indirection(dn, tx); - dn->dn_next_nlevels[txgoff] = 0; - } - dbuf_sync_list(list, tx); if (!DMU_OBJECT_IS_SPECIAL(dn->dn_object)) { From owner-svn-src-stable-10@FreeBSD.ORG Wed Sep 10 15:45:19 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A27DC67F; Wed, 10 Sep 2014 15:45:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C0F8151F; Wed, 10 Sep 2014 15:45:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AFjIlk032161; Wed, 10 Sep 2014 15:45:18 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8AFjIbV032159; Wed, 10 Sep 2014 15:45:18 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201409101545.s8AFjIbV032159@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 10 Sep 2014 15:45:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271399 - in stable: 10/sys/kern 10/sys/sys 8/sys/kern 8/sys/sys 9/sys/kern 9/sys/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.18-1 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, 10 Sep 2014 15:45:19 -0000 Author: jhb Date: Wed Sep 10 15:45:18 2014 New Revision: 271399 URL: http://svnweb.freebsd.org/changeset/base/271399 Log: MFC 270823,270825,270829: Use a unit number allocator to provide suitable st_dev and st_ino values for POSIX shared memory descriptors. The implementation is similar to that used for pipes. Approved by: re (gjb for 10) Modified: stable/10/sys/kern/uipc_shm.c stable/10/sys/sys/mman.h Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/8/sys/kern/uipc_shm.c stable/8/sys/sys/mman.h stable/9/sys/kern/uipc_shm.c stable/9/sys/sys/mman.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/kern/ (props changed) stable/8/sys/sys/ (props changed) stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/10/sys/kern/uipc_shm.c ============================================================================== --- stable/10/sys/kern/uipc_shm.c Wed Sep 10 15:25:15 2014 (r271398) +++ stable/10/sys/kern/uipc_shm.c Wed Sep 10 15:45:18 2014 (r271399) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -101,12 +102,14 @@ static LIST_HEAD(, shm_mapping) *shm_dic static struct sx shm_dict_lock; static struct mtx shm_timestamp_lock; static u_long shm_hash; +static struct unrhdr *shm_ino_unr; +static dev_t shm_dev_ino; #define SHM_HASH(fnv) (&shm_dictionary[(fnv) & shm_hash]) static int shm_access(struct shmfd *shmfd, struct ucred *ucred, int flags); static struct shmfd *shm_alloc(struct ucred *ucred, mode_t mode); -static void shm_dict_init(void *arg); +static void shm_init(void *arg); static void shm_drop(struct shmfd *shmfd); static struct shmfd *shm_hold(struct shmfd *shmfd); static void shm_insert(char *path, Fnv32_t fnv, struct shmfd *shmfd); @@ -408,6 +411,8 @@ shm_stat(struct file *fp, struct stat *s sb->st_uid = shmfd->shm_uid; sb->st_gid = shmfd->shm_gid; mtx_unlock(&shm_timestamp_lock); + sb->st_dev = shm_dev_ino; + sb->st_ino = shmfd->shm_ino; return (0); } @@ -539,6 +544,7 @@ static struct shmfd * shm_alloc(struct ucred *ucred, mode_t mode) { struct shmfd *shmfd; + int ino; shmfd = malloc(sizeof(*shmfd), M_SHMFD, M_WAITOK | M_ZERO); shmfd->shm_size = 0; @@ -555,6 +561,11 @@ shm_alloc(struct ucred *ucred, mode_t mo vfs_timestamp(&shmfd->shm_birthtime); shmfd->shm_atime = shmfd->shm_mtime = shmfd->shm_ctime = shmfd->shm_birthtime; + ino = alloc_unr(shm_ino_unr); + if (ino == -1) + shmfd->shm_ino = 0; + else + shmfd->shm_ino = ino; refcount_init(&shmfd->shm_refs, 1); mtx_init(&shmfd->shm_mtx, "shmrl", NULL, MTX_DEF); rangelock_init(&shmfd->shm_rl); @@ -585,6 +596,8 @@ shm_drop(struct shmfd *shmfd) rangelock_destroy(&shmfd->shm_rl); mtx_destroy(&shmfd->shm_mtx); vm_object_deallocate(shmfd->shm_object); + if (shmfd->shm_ino != 0) + free_unr(shm_ino_unr, shmfd->shm_ino); free(shmfd, M_SHMFD); } } @@ -617,14 +630,18 @@ shm_access(struct shmfd *shmfd, struct u * the mappings in a hash table. */ static void -shm_dict_init(void *arg) +shm_init(void *arg) { mtx_init(&shm_timestamp_lock, "shm timestamps", NULL, MTX_DEF); sx_init(&shm_dict_lock, "shm dictionary"); shm_dictionary = hashinit(1024, M_SHMFD, &shm_hash); + shm_ino_unr = new_unrhdr(1, INT32_MAX, NULL); + KASSERT(shm_ino_unr != NULL, ("shm fake inodes not initialized")); + shm_dev_ino = devfs_alloc_cdp_inode(); + KASSERT(shm_dev_ino > 0, ("shm dev inode not initialized")); } -SYSINIT(shm_dict_init, SI_SUB_SYSV_SHM, SI_ORDER_ANY, shm_dict_init, NULL); +SYSINIT(shm_init, SI_SUB_SYSV_SHM, SI_ORDER_ANY, shm_init, NULL); static struct shmfd * shm_lookup(char *path, Fnv32_t fnv) Modified: stable/10/sys/sys/mman.h ============================================================================== --- stable/10/sys/sys/mman.h Wed Sep 10 15:25:15 2014 (r271398) +++ stable/10/sys/sys/mman.h Wed Sep 10 15:45:18 2014 (r271399) @@ -219,6 +219,7 @@ struct shmfd { struct timespec shm_mtime; struct timespec shm_ctime; struct timespec shm_birthtime; + ino_t shm_ino; struct label *shm_label; /* MAC label */ const char *shm_path; From owner-svn-src-stable-10@FreeBSD.ORG Thu Sep 11 01:53:56 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8EBCC626; Thu, 11 Sep 2014 01:53:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FB21A4F; Thu, 11 Sep 2014 01:53:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8B1ruJk007322; Thu, 11 Sep 2014 01:53:56 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8B1rutC007318; Thu, 11 Sep 2014 01:53:56 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409110153.s8B1rutC007318@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 11 Sep 2014 01:53:56 +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: r271414 - in stable/10/contrib/llvm: patches tools/clang/lib/CodeGen 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.18-1 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, 11 Sep 2014 01:53:56 -0000 Author: emaste Date: Thu Sep 11 01:53:55 2014 New Revision: 271414 URL: http://svnweb.freebsd.org/changeset/base/271414 Log: MFC Clang debug info crash fix r271282: Merge Clang debug info crash fix rev 200797: Debug info: fix a crasher when when emitting debug info for not-yet-completed templated types. getTypeSize() needs a complete type. rdar://problem/15931354 r271283: Add clang patch for r271282 Note that r271282 contains only the src change from Clang rev 200797. This patch file includes two follow-on changes to the test case, which do not apply to the copy in the FreeBSD tree. Upstream Clang revisions: 200797: Debug info: fix a crasher when when emitting debug info for not-yet-completed templated types. getTypeSize() needs a complete type. rdar://problem/15931354 200798: Simplify testcase from r200797 some more. 200805: Further simplify r200797 and add an explanatory comment. PR: 193347 Approved by: re Sponsored by: DARPA, AFRL Added: stable/10/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff - copied unchanged from r271283, head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff Modified: stable/10/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp Directory Properties: stable/10/ (props changed) Copied: stable/10/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff (from r271283, head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff Thu Sep 11 01:53:55 2014 (r271414, copy of r271283, head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff) @@ -0,0 +1,51 @@ +diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp +index 59ba47c..dddc7e7 100644 +--- a/lib/CodeGen/CGDebugInfo.cpp ++++ b/lib/CodeGen/CGDebugInfo.cpp +@@ -2251,9 +2251,10 @@ llvm::DICompositeType CGDebugInfo::CreateLimitedType(const RecordType *Ty) { + if (T && (!T.isForwardDecl() || !RD->getDefinition())) + return T; + +- // If this is just a forward declaration, construct an appropriately +- // marked node and just return it. +- if (!RD->getDefinition()) ++ // If this is just a forward or incomplete declaration, construct an ++ // appropriately marked node and just return it. ++ const RecordDecl *D = RD->getDefinition(); ++ if (!D || !D->isCompleteDefinition()) + return getOrCreateRecordFwdDecl(Ty, RDContext); + + uint64_t Size = CGM.getContext().getTypeSize(Ty); +diff --git a/test/CodeGenCXX/debug-info-template-fwd.cpp b/test/CodeGenCXX/debug-info-template-fwd.cpp +new file mode 100644 +index 0000000..b2b7073 +--- /dev/null ++++ b/test/CodeGenCXX/debug-info-template-fwd.cpp +@@ -0,0 +1,27 @@ ++// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin -g -emit-llvm -o - | FileCheck %s ++// This test is for a crash when emitting debug info for not-yet-completed ++// types. ++// Test that we don't actually emit a forward decl for the offending class: ++// CHECK: [ DW_TAG_structure_type ] [Derived] {{.*}} [def] ++// rdar://problem/15931354 ++template class Derived; ++ ++template class Base { ++ static Derived *create(); ++}; ++ ++template struct Derived : Base { ++}; ++ ++Base *f; ++ ++// During the instantiation of Derived, Base becomes required to be ++// complete - since the declaration has already been emitted (due to 'f', ++// above), we immediately try to build debug info for Base which then ++// requires the (incomplete definition) of Derived which is problematic. ++// ++// (if 'f' is not present, the point at which Base becomes required to be ++// complete during the instantiation of Derived is a no-op because ++// Base was never emitted so we ignore it and carry on until we ++// wire up the base class of Derived in the debug info later on) ++Derived d; Modified: stable/10/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp ============================================================================== --- stable/10/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp Thu Sep 11 01:04:56 2014 (r271413) +++ stable/10/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp Thu Sep 11 01:53:55 2014 (r271414) @@ -2235,9 +2235,10 @@ llvm::DICompositeType CGDebugInfo::Creat if (T && (!T.isForwardDecl() || !RD->getDefinition())) return T; - // If this is just a forward declaration, construct an appropriately - // marked node and just return it. - if (!RD->getDefinition()) + // If this is just a forward or incomplete declaration, construct an + // appropriately marked node and just return it. + const RecordDecl *D = RD->getDefinition(); + if (!D || !D->isCompleteDefinition()) return getOrCreateRecordFwdDecl(Ty, RDContext); uint64_t Size = CGM.getContext().getTypeSize(Ty); From owner-svn-src-stable-10@FreeBSD.ORG Thu Sep 11 11:25:10 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E25F7A92; Thu, 11 Sep 2014 11:25:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CDBEF6C3; Thu, 11 Sep 2014 11:25:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8BBPA7B074836; Thu, 11 Sep 2014 11:25:10 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8BBPA5L074835; Thu, 11 Sep 2014 11:25:10 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201409111125.s8BBPA5L074835@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 11 Sep 2014 11:25: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: r271423 - 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.18-1 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, 11 Sep 2014 11:25:11 -0000 Author: kib Date: Thu Sep 11 11:25:10 2014 New Revision: 271423 URL: http://svnweb.freebsd.org/changeset/base/271423 Log: MFC r270993 (by mjg): Fix up proc_realparent to always return correct process. Approved by: re (delphij) Modified: stable/10/sys/kern/kern_exit.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_exit.c ============================================================================== --- stable/10/sys/kern/kern_exit.c Thu Sep 11 10:53:57 2014 (r271422) +++ stable/10/sys/kern/kern_exit.c Thu Sep 11 11:25:10 2014 (r271423) @@ -106,8 +106,12 @@ proc_realparent(struct proc *child) sx_assert(&proctree_lock, SX_LOCKED); if ((child->p_treeflag & P_TREE_ORPHANED) == 0) { - return (child->p_pptr->p_pid == child->p_oppid ? - child->p_pptr : initproc); + if (child->p_oppid == 0 || + child->p_pptr->p_pid == child->p_oppid) + parent = child->p_pptr; + else + parent = initproc; + return (parent); } for (p = child; (p->p_treeflag & P_TREE_FIRST_ORPHAN) == 0;) { /* Cannot use LIST_PREV(), since the list head is not known. */ From owner-svn-src-stable-10@FreeBSD.ORG Thu Sep 11 15:36:40 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE0317AF; Thu, 11 Sep 2014 15:36:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 98078CE5; Thu, 11 Sep 2014 15:36:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8BFaeir096384; Thu, 11 Sep 2014 15:36:40 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8BFaaCn096361; Thu, 11 Sep 2014 15:36:36 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201409111536.s8BFaaCn096361@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Thu, 11 Sep 2014 15:36:36 +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: r271428 - stable/10/sys/arm/conf 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.18-1 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, 11 Sep 2014 15:36:40 -0000 Author: ian Date: Thu Sep 11 15:36:36 2014 New Revision: 271428 URL: http://svnweb.freebsd.org/changeset/base/271428 Log: Disable debugging-related options in all ARM kernel configs for stable-10. This is a direct commit to stable-10. The following options are disabled in all arm kernel configs: DEADLKRES DIAGNOSTIC INVARIANTS INVARIANTS_SUPPORT WITNESS WITNESS_SKIPSPIN Approved by: re(gjb) Modified: stable/10/sys/arm/conf/AC100 stable/10/sys/arm/conf/AVILA stable/10/sys/arm/conf/BEAGLEBONE stable/10/sys/arm/conf/CAMBRIA stable/10/sys/arm/conf/CUBIEBOARD stable/10/sys/arm/conf/CUBIEBOARD2 stable/10/sys/arm/conf/DB-78XXX stable/10/sys/arm/conf/DB-88F5XXX stable/10/sys/arm/conf/DB-88F6XXX stable/10/sys/arm/conf/DIGI-CCWMX53 stable/10/sys/arm/conf/DOCKSTAR stable/10/sys/arm/conf/DREAMPLUG-1001 stable/10/sys/arm/conf/EA3250 stable/10/sys/arm/conf/EFIKA_MX stable/10/sys/arm/conf/LN2410SBC stable/10/sys/arm/conf/RADXA stable/10/sys/arm/conf/RPI-B stable/10/sys/arm/conf/VERSATILEPB Modified: stable/10/sys/arm/conf/AC100 ============================================================================== --- stable/10/sys/arm/conf/AC100 Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/AC100 Thu Sep 11 15:36:36 2014 (r271428) @@ -47,9 +47,9 @@ options VERBOSE_SYSINIT #options ALT_BREAK_TO_DEBUGGER options DDB options GDB -options DIAGNOSTIC -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options DIAGNOSTIC +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB options KDB_TRACE #options KTR @@ -57,8 +57,8 @@ options KDB_TRACE #options KTR_ENTRIES=16384 #options KTR_MASK=(KTR_SPARE2) #options KTR_COMPILE=KTR_ALL -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options WITNESS_KDB options MUTEX_DEBUG Modified: stable/10/sys/arm/conf/AVILA ============================================================================== --- stable/10/sys/arm/conf/AVILA Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/AVILA Thu Sep 11 15:36:36 2014 (r271428) @@ -39,8 +39,8 @@ options KDB #options GDB options DDB # Enable the kernel debugger #options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options DIAGNOSTIC Modified: stable/10/sys/arm/conf/BEAGLEBONE ============================================================================== --- stable/10/sys/arm/conf/BEAGLEBONE Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/BEAGLEBONE Thu Sep 11 15:36:36 2014 (r271428) @@ -59,10 +59,10 @@ options BREAK_TO_DEBUGGER #options VERBOSE_SYSINIT # Enable verbose sysinit messages options KDB options DDB # Enable the kernel debugger -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options DIAGNOSTIC # NFS support Modified: stable/10/sys/arm/conf/CAMBRIA ============================================================================== --- stable/10/sys/arm/conf/CAMBRIA Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/CAMBRIA Thu Sep 11 15:36:36 2014 (r271428) @@ -39,8 +39,8 @@ options KDB #options GDB options DDB # Enable the kernel debugger #options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options DIAGNOSTIC Modified: stable/10/sys/arm/conf/CUBIEBOARD ============================================================================== --- stable/10/sys/arm/conf/CUBIEBOARD Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/CUBIEBOARD Thu Sep 11 15:36:36 2014 (r271428) @@ -58,10 +58,10 @@ options BREAK_TO_DEBUGGER #options VERBOSE_SYSINIT # Enable verbose sysinit messages options KDB options DDB # Enable the kernel debugger -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options DIAGNOSTIC # NFS support Modified: stable/10/sys/arm/conf/CUBIEBOARD2 ============================================================================== --- stable/10/sys/arm/conf/CUBIEBOARD2 Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/CUBIEBOARD2 Thu Sep 11 15:36:36 2014 (r271428) @@ -58,10 +58,10 @@ options BREAK_TO_DEBUGGER #options VERBOSE_SYSINIT # Enable verbose sysinit messages options KDB options DDB # Enable the kernel debugger -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options DIAGNOSTIC # NFS support Modified: stable/10/sys/arm/conf/DB-78XXX ============================================================================== --- stable/10/sys/arm/conf/DB-78XXX Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/DB-78XXX Thu Sep 11 15:36:36 2014 (r271428) @@ -48,8 +48,8 @@ options DDB #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options WITNESS_KDB device pci Modified: stable/10/sys/arm/conf/DB-88F5XXX ============================================================================== --- stable/10/sys/arm/conf/DB-88F5XXX Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/DB-88F5XXX Thu Sep 11 15:36:36 2014 (r271428) @@ -47,8 +47,8 @@ options DDB #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options WITNESS_KDB device pci Modified: stable/10/sys/arm/conf/DB-88F6XXX ============================================================================== --- stable/10/sys/arm/conf/DB-88F6XXX Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/DB-88F6XXX Thu Sep 11 15:36:36 2014 (r271428) @@ -48,8 +48,8 @@ options DDB #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options WITNESS_KDB device pci Modified: stable/10/sys/arm/conf/DIGI-CCWMX53 ============================================================================== --- stable/10/sys/arm/conf/DIGI-CCWMX53 Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/DIGI-CCWMX53 Thu Sep 11 15:36:36 2014 (r271428) @@ -86,10 +86,10 @@ options KDB # Enable kernel debugger # For full debugger support use this instead: options DDB # Support DDB. #options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles +#options DEADLKRES # Enable the deadlock resolver +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! Modified: stable/10/sys/arm/conf/DOCKSTAR ============================================================================== --- stable/10/sys/arm/conf/DOCKSTAR Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/DOCKSTAR Thu Sep 11 15:36:36 2014 (r271428) @@ -146,8 +146,8 @@ options ALT_BREAK_TO_DEBUGGER options DDB options KDB #options DIAGNOSTIC -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options WITNESS_KDB Modified: stable/10/sys/arm/conf/DREAMPLUG-1001 ============================================================================== --- stable/10/sys/arm/conf/DREAMPLUG-1001 Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/DREAMPLUG-1001 Thu Sep 11 15:36:36 2014 (r271428) @@ -154,8 +154,8 @@ options ALT_BREAK_TO_DEBUGGER options DDB options KDB #options DIAGNOSTIC -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options WITNESS_KDB Modified: stable/10/sys/arm/conf/EA3250 ============================================================================== --- stable/10/sys/arm/conf/EA3250 Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/EA3250 Thu Sep 11 15:36:36 2014 (r271428) @@ -48,8 +48,8 @@ options DDB #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options WITNESS_KDB # Pseudo devices Modified: stable/10/sys/arm/conf/EFIKA_MX ============================================================================== --- stable/10/sys/arm/conf/EFIKA_MX Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/EFIKA_MX Thu Sep 11 15:36:36 2014 (r271428) @@ -86,10 +86,10 @@ options KDB # Enable kernel debugger # For full debugger support use this instead: options DDB # Support DDB. #options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles +#options DEADLKRES # Enable the deadlock resolver +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! Modified: stable/10/sys/arm/conf/LN2410SBC ============================================================================== --- stable/10/sys/arm/conf/LN2410SBC Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/LN2410SBC Thu Sep 11 15:36:36 2014 (r271428) @@ -73,10 +73,10 @@ device bpf device uart # Debugging for use in -current -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed device md Modified: stable/10/sys/arm/conf/RADXA ============================================================================== --- stable/10/sys/arm/conf/RADXA Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/RADXA Thu Sep 11 15:36:36 2014 (r271428) @@ -60,9 +60,9 @@ options KDB options DDB # Enable the kernel debugger #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options DIAGNOSTIC +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options DIAGNOSTIC # NFS support #options NFSCL Modified: stable/10/sys/arm/conf/RPI-B ============================================================================== --- stable/10/sys/arm/conf/RPI-B Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/RPI-B Thu Sep 11 15:36:36 2014 (r271428) @@ -89,8 +89,8 @@ device bcm2835_bsc options KDB options DDB # Enable the kernel debugger -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS device md device random # Entropy device Modified: stable/10/sys/arm/conf/VERSATILEPB ============================================================================== --- stable/10/sys/arm/conf/VERSATILEPB Thu Sep 11 13:18:41 2014 (r271427) +++ stable/10/sys/arm/conf/VERSATILEPB Thu Sep 11 15:36:36 2014 (r271428) @@ -92,8 +92,8 @@ makeoptions SC_DFLT_FONT=cp437 options KDB options DDB # Enable the kernel debugger -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS device md device random # Entropy device From owner-svn-src-stable-10@FreeBSD.ORG Thu Sep 11 18:42:52 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2CE3AF25; Thu, 11 Sep 2014 18:42:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C941362; Thu, 11 Sep 2014 18:42:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8BIgpRJ087093; Thu, 11 Sep 2014 18:42:51 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8BIgpoX087092; Thu, 11 Sep 2014 18:42:51 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201409111842.s8BIgpoX087092@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Thu, 11 Sep 2014 18:42: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: r271435 - 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.18-1 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, 11 Sep 2014 18:42:52 -0000 Author: smh Date: Thu Sep 11 18:42:51 2014 New Revision: 271435 URL: http://svnweb.freebsd.org/changeset/base/271435 Log: MFC r266497: Add sysctls for ZFS dirty data tuning. MFC r266533: Improve sysctl descriptions for new ZFS sysctls. Approved by: re (marius) Sponsored by: Multiplay Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c Thu Sep 11 18:24:16 2014 (r271434) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c Thu Sep 11 18:42:51 2014 (r271435) @@ -46,6 +46,11 @@ #include #include +#ifdef __FreeBSD__ +#include +#include +#endif + /* * ZFS Write Throttle * ------------------ @@ -130,33 +135,83 @@ uint64_t zfs_delay_scale = 1000 * 1000 * * per-pool basis using zfs.conf. */ +#ifdef __FreeBSD__ + +extern int zfs_vdev_async_write_active_max_dirty_percent; SYSCTL_DECL(_vfs_zfs); -#if 0 -TUNABLE_INT("vfs.zfs.no_write_throttle", &zfs_no_write_throttle); -SYSCTL_INT(_vfs_zfs, OID_AUTO, no_write_throttle, CTLFLAG_RDTUN, - &zfs_no_write_throttle, 0, ""); -TUNABLE_INT("vfs.zfs.write_limit_shift", &zfs_write_limit_shift); -SYSCTL_INT(_vfs_zfs, OID_AUTO, write_limit_shift, CTLFLAG_RDTUN, - &zfs_write_limit_shift, 0, "2^N of physical memory"); -SYSCTL_DECL(_vfs_zfs_txg); -TUNABLE_INT("vfs.zfs.txg.synctime_ms", &zfs_txg_synctime_ms); -SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, synctime_ms, CTLFLAG_RDTUN, - &zfs_txg_synctime_ms, 0, "Target milliseconds to sync a txg"); - -TUNABLE_QUAD("vfs.zfs.write_limit_min", &zfs_write_limit_min); -SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, write_limit_min, CTLFLAG_RDTUN, - &zfs_write_limit_min, 0, "Minimum write limit"); -TUNABLE_QUAD("vfs.zfs.write_limit_max", &zfs_write_limit_max); -SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, write_limit_max, CTLFLAG_RDTUN, - &zfs_write_limit_max, 0, "Maximum data payload per txg"); -TUNABLE_QUAD("vfs.zfs.write_limit_inflated", &zfs_write_limit_inflated); -SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, write_limit_inflated, CTLFLAG_RDTUN, - &zfs_write_limit_inflated, 0, "Maximum size of the dynamic write limit"); -TUNABLE_QUAD("vfs.zfs.write_limit_override", &zfs_write_limit_override); -SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, write_limit_override, CTLFLAG_RDTUN, - &zfs_write_limit_override, 0, - "Force a txg if dirty buffers exceed this value (bytes)"); + +TUNABLE_QUAD("vfs.zfs.dirty_data_max", &zfs_dirty_data_max); +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, dirty_data_max, CTLFLAG_RWTUN, + &zfs_dirty_data_max, 0, + "The maximum amount of dirty data in bytes after which new writes are " + "halted until space becomes available"); + +TUNABLE_QUAD("vfs.zfs.dirty_data_max_max", &zfs_dirty_data_max_max); +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, dirty_data_max_max, CTLFLAG_RDTUN, + &zfs_dirty_data_max_max, 0, + "The absolute cap on dirty_data_max when auto calculating"); + +TUNABLE_INT("vfs.zfs.dirty_data_max_percent", &zfs_dirty_data_max_percent); +SYSCTL_INT(_vfs_zfs, OID_AUTO, dirty_data_max_percent, CTLFLAG_RDTUN, + &zfs_dirty_data_max_percent, 0, + "The percent of physical memory used to auto calculate dirty_data_max"); + +TUNABLE_QUAD("vfs.zfs.dirty_data_sync", &zfs_dirty_data_sync); +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, dirty_data_sync, CTLFLAG_RWTUN, + &zfs_dirty_data_sync, 0, + "Force a txg if the number of dirty buffer bytes exceed this value"); + +static int sysctl_zfs_delay_min_dirty_percent(SYSCTL_HANDLER_ARGS); +/* No zfs_delay_min_dirty_percent tunable due to limit requirements */ +SYSCTL_PROC(_vfs_zfs, OID_AUTO, delay_min_dirty_percent, + CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, 0, sizeof(int), + sysctl_zfs_delay_min_dirty_percent, "I", + "The limit of outstanding dirty data before transations are delayed"); + +static int sysctl_zfs_delay_scale(SYSCTL_HANDLER_ARGS); +/* No zfs_delay_scale tunable due to limit requirements */ +SYSCTL_PROC(_vfs_zfs, OID_AUTO, delay_scale, + CTLTYPE_U64 | CTLFLAG_MPSAFE | CTLFLAG_RW, 0, sizeof(uint64_t), + sysctl_zfs_delay_scale, "QU", + "Controls how quickly the delay approaches infinity"); + +static int +sysctl_zfs_delay_min_dirty_percent(SYSCTL_HANDLER_ARGS) +{ + int val, err; + + val = zfs_delay_min_dirty_percent; + err = sysctl_handle_int(oidp, &val, 0, req); + if (err != 0 || req->newptr == NULL) + return (err); + + if (val < zfs_vdev_async_write_active_max_dirty_percent) + return (EINVAL); + + zfs_delay_min_dirty_percent = val; + + return (0); +} + +static int +sysctl_zfs_delay_scale(SYSCTL_HANDLER_ARGS) +{ + uint64_t val; + int err; + + val = zfs_delay_scale; + err = sysctl_handle_64(oidp, &val, 0, req); + if (err != 0 || req->newptr == NULL) + return (err); + + if (val > UINT64_MAX / zfs_dirty_data_max) + return (EINVAL); + + zfs_delay_scale = val; + + return (0); +} #endif hrtime_t zfs_throttle_delay = MSEC2NSEC(10); From owner-svn-src-stable-10@FreeBSD.ORG Fri Sep 12 00:05:16 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 13570104; Fri, 12 Sep 2014 00:05:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F333298D; Fri, 12 Sep 2014 00:05:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8C05F5f043008; Fri, 12 Sep 2014 00:05:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8C05FlA043007; Fri, 12 Sep 2014 00:05:15 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409120005.s8C05FlA043007@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 12 Sep 2014 00:05:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271444 - stable/10/sys/conf 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.18-1 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, 12 Sep 2014 00:05:16 -0000 Author: gjb Date: Fri Sep 12 00:05:15 2014 New Revision: 271444 URL: http://svnweb.freebsd.org/changeset/base/271444 Log: Update stable/10 to -BETA1 as part of the 10.1-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/conf/newvers.sh Modified: stable/10/sys/conf/newvers.sh ============================================================================== --- stable/10/sys/conf/newvers.sh Thu Sep 11 22:40:11 2014 (r271443) +++ stable/10/sys/conf/newvers.sh Fri Sep 12 00:05:15 2014 (r271444) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.1" -BRANCH="PRERELEASE" +BRANCH="BETA1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-stable-10@FreeBSD.ORG Fri Sep 12 16:22:04 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1ED01640; Fri, 12 Sep 2014 16:22:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F27487AE; Fri, 12 Sep 2014 16:22:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CGM3xB026690; Fri, 12 Sep 2014 16:22:03 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CGM2kC026674; Fri, 12 Sep 2014 16:22:02 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201409121622.s8CGM2kC026674@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 12 Sep 2014 16:22: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: r271469 - in stable/10/libexec/rtld-elf: . amd64 arm i386 ia64 mips 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.18-1 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, 12 Sep 2014 16:22:04 -0000 Author: kib Date: Fri Sep 12 16:22:01 2014 New Revision: 271469 URL: http://svnweb.freebsd.org/changeset/base/271469 Log: MFC r270798: Process STT_GNU_IFUNC when doing non-plt relocations. MFC r270802: Only do the second pass over non-plt relocations when the first pass found IFUNCs. Approved by: re (gjb) Modified: stable/10/libexec/rtld-elf/amd64/reloc.c stable/10/libexec/rtld-elf/arm/reloc.c stable/10/libexec/rtld-elf/i386/reloc.c stable/10/libexec/rtld-elf/ia64/reloc.c stable/10/libexec/rtld-elf/mips/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 Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/amd64/reloc.c Fri Sep 12 16:22:01 2014 (r271469) @@ -125,213 +125,188 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry const Elf_Rela *relalim; const Elf_Rela *rela; SymCache *cache; - int r = -1; + const Elf_Sym *def; + const Obj_Entry *defobj; + Elf_Addr *where, symval; + Elf32_Addr *where32; + int r; + r = -1; /* * The dynamic loader may be called from a thread, we have * limited amounts of stack available so we cannot use alloca(). */ if (obj != obj_rtld) { - cache = calloc(obj->dynsymcount, sizeof(SymCache)); - /* No need to check for NULL here */ + cache = calloc(obj->dynsymcount, sizeof(SymCache)); + /* No need to check for NULL here */ } else - cache = NULL; + cache = NULL; - relalim = (const Elf_Rela *) ((caddr_t) obj->rela + obj->relasize); + relalim = (const Elf_Rela *)((caddr_t)obj->rela + obj->relasize); for (rela = obj->rela; rela < relalim; rela++) { - Elf_Addr *where = (Elf_Addr *) (obj->relocbase + rela->r_offset); - Elf32_Addr *where32 = (Elf32_Addr *)where; - - switch (ELF_R_TYPE(rela->r_info)) { - - case R_X86_64_NONE: - break; - - case R_X86_64_64: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where = (Elf_Addr) (defobj->relocbase + def->st_value + rela->r_addend); - } - break; - - case R_X86_64_PC32: - /* - * I don't think the dynamic linker should ever see this - * type of relocation. But the binutils-2.6 tools sometimes - * generate it. - */ - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where32 = (Elf32_Addr) (unsigned long) (defobj->relocbase + - def->st_value + rela->r_addend - (Elf_Addr) where); - } - break; - /* missing: R_X86_64_GOT32 R_X86_64_PLT32 */ - - case R_X86_64_COPY: /* - * These are deferred until all other relocations have - * been done. All we do here is make sure that the COPY - * relocation is not in a shared library. They are allowed - * only in executable files. + * First, resolve symbol for relocations which + * reference symbols. */ - if (!obj->mainprog) { - _rtld_error("%s: Unexpected R_X86_64_COPY relocation" - " in shared library", obj->path); - goto done; - } - break; - - case R_X86_64_GLOB_DAT: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where = (Elf_Addr) (defobj->relocbase + def->st_value); - } - break; - - case R_X86_64_TPOFF64: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - /* - * We lazily allocate offsets for static TLS as we - * see the first relocation that references the - * TLS block. This allows us to support (small - * amounts of) static TLS in dynamically loaded - * modules. If we run out of space, we generate an - * error. - */ - if (!defobj->tls_done) { - if (!allocate_tls_offset((Obj_Entry*) defobj)) { - _rtld_error("%s: No space available for static " - "Thread Local Storage", obj->path); - goto done; + switch (ELF_R_TYPE(rela->r_info)) { + case R_X86_64_64: + case R_X86_64_PC32: + case R_X86_64_GLOB_DAT: + case R_X86_64_TPOFF64: + case R_X86_64_TPOFF32: + case R_X86_64_DTPMOD64: + case R_X86_64_DTPOFF64: + case R_X86_64_DTPOFF32: + def = find_symdef(ELF_R_SYM(rela->r_info), obj, + &defobj, flags, cache, lockstate); + if (def == NULL) + goto done; + /* + * If symbol is IFUNC, only perform relocation + * when caller allowed it by passing + * SYMLOOK_IFUNC flag. Skip the relocations + * otherwise. + * + * Also error out in case IFUNC relocations + * are specified for TLS, which cannot be + * usefully interpreted. + */ + if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) { + switch (ELF_R_TYPE(rela->r_info)) { + case R_X86_64_64: + case R_X86_64_PC32: + case R_X86_64_GLOB_DAT: + if ((flags & SYMLOOK_IFUNC) == 0) { + obj->non_plt_gnu_ifunc = true; + continue; + } + symval = (Elf_Addr)rtld_resolve_ifunc( + defobj, def); + break; + case R_X86_64_TPOFF64: + case R_X86_64_TPOFF32: + case R_X86_64_DTPMOD64: + case R_X86_64_DTPOFF64: + case R_X86_64_DTPOFF32: + _rtld_error("%s: IFUNC for TLS reloc", + obj->path); + goto done; + } + } else { + if ((flags & SYMLOOK_IFUNC) != 0) + continue; + symval = (Elf_Addr)defobj->relocbase + + def->st_value; } - } - - *where = (Elf_Addr) (def->st_value - defobj->tlsoffset + - rela->r_addend); + break; + default: + if ((flags & SYMLOOK_IFUNC) != 0) + continue; + break; } - break; - - case R_X86_64_TPOFF32: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; + where = (Elf_Addr *)(obj->relocbase + rela->r_offset); + where32 = (Elf32_Addr *)where; - /* - * We lazily allocate offsets for static TLS as we - * see the first relocation that references the - * TLS block. This allows us to support (small - * amounts of) static TLS in dynamically loaded - * modules. If we run out of space, we generate an - * error. - */ - if (!defobj->tls_done) { - if (!allocate_tls_offset((Obj_Entry*) defobj)) { - _rtld_error("%s: No space available for static " - "Thread Local Storage", obj->path); - goto done; + switch (ELF_R_TYPE(rela->r_info)) { + case R_X86_64_NONE: + break; + case R_X86_64_64: + *where = symval + rela->r_addend; + break; + case R_X86_64_PC32: + /* + * I don't think the dynamic linker should + * ever see this type of relocation. But the + * binutils-2.6 tools sometimes generate it. + */ + *where32 = (Elf32_Addr)(unsigned long)(symval + + rela->r_addend - (Elf_Addr)where); + break; + /* missing: R_X86_64_GOT32 R_X86_64_PLT32 */ + case R_X86_64_COPY: + /* + * These are deferred until all other relocations have + * been done. All we do here is make sure that the COPY + * relocation is not in a shared library. They are allowed + * only in executable files. + */ + if (!obj->mainprog) { + _rtld_error("%s: Unexpected R_X86_64_COPY " + "relocation in shared library", obj->path); + goto done; } - } - - *where32 = (Elf32_Addr) (def->st_value - - defobj->tlsoffset + - rela->r_addend); - } - break; - - case R_X86_64_DTPMOD64: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where += (Elf_Addr) defobj->tlsindex; - } - break; - - case R_X86_64_DTPOFF64: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where += (Elf_Addr) (def->st_value + rela->r_addend); - } - break; - - case R_X86_64_DTPOFF32: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) + break; + case R_X86_64_GLOB_DAT: + *where = symval; + break; + case R_X86_64_TPOFF64: + /* + * We lazily allocate offsets for static TLS + * as we see the first relocation that + * references the TLS block. This allows us to + * support (small amounts of) static TLS in + * dynamically loaded modules. If we run out + * of space, we generate an error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available " + "for static Thread Local Storage", + obj->path); + goto done; + } + } + *where = (Elf_Addr)(def->st_value - defobj->tlsoffset + + rela->r_addend); + break; + case R_X86_64_TPOFF32: + /* + * We lazily allocate offsets for static TLS + * as we see the first relocation that + * references the TLS block. This allows us to + * support (small amounts of) static TLS in + * dynamically loaded modules. If we run out + * of space, we generate an error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available " + "for static Thread Local Storage", + obj->path); + goto done; + } + } + *where32 = (Elf32_Addr)(def->st_value - + defobj->tlsoffset + rela->r_addend); + break; + case R_X86_64_DTPMOD64: + *where += (Elf_Addr)defobj->tlsindex; + break; + case R_X86_64_DTPOFF64: + *where += (Elf_Addr)(def->st_value + rela->r_addend); + break; + case R_X86_64_DTPOFF32: + *where32 += (Elf32_Addr)(def->st_value + + rela->r_addend); + break; + case R_X86_64_RELATIVE: + *where = (Elf_Addr)(obj->relocbase + rela->r_addend); + break; + /* + * missing: + * R_X86_64_GOTPCREL, R_X86_64_32, R_X86_64_32S, R_X86_64_16, + * R_X86_64_PC16, R_X86_64_8, R_X86_64_PC8 + */ + default: + _rtld_error("%s: Unsupported relocation type %u" + " in non-PLT relocations\n", obj->path, + (unsigned int)ELF_R_TYPE(rela->r_info)); goto done; - - *where32 += (Elf32_Addr) (def->st_value + rela->r_addend); } - break; - - case R_X86_64_RELATIVE: - *where = (Elf_Addr)(obj->relocbase + rela->r_addend); - break; - - /* missing: R_X86_64_GOTPCREL, R_X86_64_32, R_X86_64_32S, R_X86_64_16, R_X86_64_PC16, R_X86_64_8, R_X86_64_PC8 */ - - default: - _rtld_error("%s: Unsupported relocation type %u" - " in non-PLT relocations\n", obj->path, - (unsigned int)ELF_R_TYPE(rela->r_info)); - goto done; - } } r = 0; done: - if (cache != NULL) - free(cache); + free(cache); return (r); } Modified: stable/10/libexec/rtld-elf/arm/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/arm/reloc.c Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/arm/reloc.c Fri Sep 12 16:22:01 2014 (r271469) @@ -324,6 +324,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry /* The relocation for the dynamic loader has already been done. */ if (obj == obj_rtld) return (0); + if ((flags & SYMLOOK_IFUNC) != 0) + /* XXX not implemented */ + return (0); + /* * The dynamic loader may be called from a thread, we have * limited amounts of stack available so we cannot use alloca(). Modified: stable/10/libexec/rtld-elf/i386/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/i386/reloc.c Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/i386/reloc.c Fri Sep 12 16:22:01 2014 (r271469) @@ -126,168 +126,144 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry const Elf_Rel *rellim; const Elf_Rel *rel; SymCache *cache; - int r = -1; + const Elf_Sym *def; + const Obj_Entry *defobj; + Elf_Addr *where, symval, add; + int r; + r = -1; /* * The dynamic loader may be called from a thread, we have * limited amounts of stack available so we cannot use alloca(). */ if (obj != obj_rtld) { - cache = calloc(obj->dynsymcount, sizeof(SymCache)); - /* No need to check for NULL here */ + cache = calloc(obj->dynsymcount, sizeof(SymCache)); + /* No need to check for NULL here */ } else - cache = NULL; + cache = NULL; - rellim = (const Elf_Rel *) ((caddr_t) obj->rel + obj->relsize); + rellim = (const Elf_Rel *)((caddr_t) obj->rel + obj->relsize); for (rel = obj->rel; rel < rellim; rel++) { - Elf_Addr *where = (Elf_Addr *) (obj->relocbase + rel->r_offset); - - switch (ELF_R_TYPE(rel->r_info)) { - - case R_386_NONE: - break; - - case R_386_32: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where += (Elf_Addr) (defobj->relocbase + def->st_value); - } - break; - - case R_386_PC32: - /* - * I don't think the dynamic linker should ever see this - * type of relocation. But the binutils-2.6 tools sometimes - * generate it. - */ - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where += - (Elf_Addr) (defobj->relocbase + def->st_value) - - (Elf_Addr) where; - } - break; - - case R_386_COPY: - /* - * These are deferred until all other relocations have - * been done. All we do here is make sure that the COPY - * relocation is not in a shared library. They are allowed - * only in executable files. - */ - if (!obj->mainprog) { - _rtld_error("%s: Unexpected R_386_COPY relocation" - " in shared library", obj->path); - goto done; - } - break; - - case R_386_GLOB_DAT: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where = (Elf_Addr) (defobj->relocbase + def->st_value); + switch (ELF_R_TYPE(rel->r_info)) { + case R_386_32: + case R_386_PC32: + case R_386_GLOB_DAT: + case R_386_TLS_TPOFF: + case R_386_TLS_TPOFF32: + case R_386_TLS_DTPMOD32: + case R_386_TLS_DTPOFF32: + def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, + flags, cache, lockstate); + if (def == NULL) + goto done; + if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) { + switch (ELF_R_TYPE(rel->r_info)) { + case R_386_32: + case R_386_PC32: + case R_386_GLOB_DAT: + if ((flags & SYMLOOK_IFUNC) == 0) { + obj->non_plt_gnu_ifunc = true; + continue; + } + symval = (Elf_Addr)rtld_resolve_ifunc( + defobj, def); + break; + case R_386_TLS_TPOFF: + case R_386_TLS_TPOFF32: + case R_386_TLS_DTPMOD32: + case R_386_TLS_DTPOFF32: + _rtld_error("%s: IFUNC for TLS reloc", + obj->path); + goto done; + } + } else { + if ((flags & SYMLOOK_IFUNC) != 0) + continue; + symval = (Elf_Addr)defobj->relocbase + + def->st_value; + } + break; + default: + if ((flags & SYMLOOK_IFUNC) != 0) + continue; + break; } - break; - - case R_386_RELATIVE: - *where += (Elf_Addr) obj->relocbase; - break; - - case R_386_TLS_TPOFF: - case R_386_TLS_TPOFF32: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - Elf_Addr add; - - def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; + where = (Elf_Addr *)(obj->relocbase + rel->r_offset); + switch (ELF_R_TYPE(rel->r_info)) { + case R_386_NONE: + break; + case R_386_32: + *where += symval; + break; + case R_386_PC32: /* - * We lazily allocate offsets for static TLS as we - * see the first relocation that references the - * TLS block. This allows us to support (small - * amounts of) static TLS in dynamically loaded - * modules. If we run out of space, we generate an - * error. + * I don't think the dynamic linker should ever + * see this type of relocation. But the + * binutils-2.6 tools sometimes generate it. */ - if (!defobj->tls_done) { - if (!allocate_tls_offset((Obj_Entry*) defobj)) { - _rtld_error("%s: No space available for static " - "Thread Local Storage", obj->path); - goto done; + *where += symval - (Elf_Addr)where; + break; + case R_386_COPY: + /* + * These are deferred until all other + * relocations have been done. All we do here + * is make sure that the COPY relocation is + * not in a shared library. They are allowed + * only in executable files. + */ + if (!obj->mainprog) { + _rtld_error("%s: Unexpected R_386_COPY " + "relocation in shared library", obj->path); + goto done; } - } - add = (Elf_Addr) (def->st_value - defobj->tlsoffset); - if (ELF_R_TYPE(rel->r_info) == R_386_TLS_TPOFF) - *where += add; - else - *where -= add; - } - break; - - case R_386_TLS_DTPMOD32: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) - goto done; - - *where += (Elf_Addr) defobj->tlsindex; - } - break; - - case R_386_TLS_DTPOFF32: - { - const Elf_Sym *def; - const Obj_Entry *defobj; - - def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, - flags, cache, lockstate); - if (def == NULL) + break; + case R_386_GLOB_DAT: + *where = symval; + break; + case R_386_RELATIVE: + *where += (Elf_Addr)obj->relocbase; + break; + case R_386_TLS_TPOFF: + case R_386_TLS_TPOFF32: + /* + * We lazily allocate offsets for static TLS + * as we see the first relocation that + * references the TLS block. This allows us to + * support (small amounts of) static TLS in + * dynamically loaded modules. If we run out + * of space, we generate an error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available " + "for static Thread Local Storage", + obj->path); + goto done; + } + } + add = (Elf_Addr)(def->st_value - defobj->tlsoffset); + if (ELF_R_TYPE(rel->r_info) == R_386_TLS_TPOFF) + *where += add; + else + *where -= add; + break; + case R_386_TLS_DTPMOD32: + *where += (Elf_Addr)defobj->tlsindex; + break; + case R_386_TLS_DTPOFF32: + *where += (Elf_Addr) def->st_value; + break; + default: + _rtld_error("%s: Unsupported relocation type %d" + " in non-PLT relocations\n", obj->path, + ELF_R_TYPE(rel->r_info)); goto done; - - *where += (Elf_Addr) def->st_value; } - break; - - default: - _rtld_error("%s: Unsupported relocation type %d" - " in non-PLT relocations\n", obj->path, - ELF_R_TYPE(rel->r_info)); - goto done; - } } r = 0; done: - if (cache != NULL) - free(cache); + free(cache); return (r); } Modified: stable/10/libexec/rtld-elf/ia64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/ia64/reloc.c Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/ia64/reloc.c Fri Sep 12 16:22:01 2014 (r271469) @@ -351,6 +351,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry int bytes = obj->dynsymcount * sizeof(SymCache); int r = -1; + if ((flags & SYMLOOK_IFUNC) != 0) + /* XXX not implemented */ + return (0); + /* * The dynamic loader may be called from a thread, we have * limited amounts of stack available so we cannot use alloca(). Modified: stable/10/libexec/rtld-elf/mips/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/mips/reloc.c Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/mips/reloc.c Fri Sep 12 16:22:01 2014 (r271469) @@ -275,6 +275,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry if (obj == obj_rtld) return (0); + if ((flags & SYMLOOK_IFUNC) != 0) + /* XXX not implemented */ + return (0); + #ifdef SUPPORT_OLD_BROKEN_LD broken = 0; sym = obj->symtab; Modified: stable/10/libexec/rtld-elf/powerpc/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/powerpc/reloc.c Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/powerpc/reloc.c Fri Sep 12 16:22:01 2014 (r271469) @@ -294,6 +294,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry SymCache *cache; int r = -1; + if ((flags & SYMLOOK_IFUNC) != 0) + /* XXX not implemented */ + return (0); + /* * The dynamic loader may be called from a thread, we have * limited amounts of stack available so we cannot use alloca(). Modified: stable/10/libexec/rtld-elf/powerpc64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/powerpc64/reloc.c Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/powerpc64/reloc.c Fri Sep 12 16:22:01 2014 (r271469) @@ -290,6 +290,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry int bytes = obj->dynsymcount * sizeof(SymCache); int r = -1; + if ((flags & SYMLOOK_IFUNC) != 0) + /* XXX not implemented */ + return (0); + /* * The dynamic loader may be called from a thread, we have * limited amounts of stack available so we cannot use alloca(). Modified: stable/10/libexec/rtld-elf/rtld.c ============================================================================== --- stable/10/libexec/rtld-elf/rtld.c Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/rtld.c Fri Sep 12 16:22:01 2014 (r271469) @@ -2475,7 +2475,7 @@ relocate_object(Obj_Entry *obj, bool bin } } - /* Process the non-PLT relocations. */ + /* Process the non-PLT non-IFUNC relocations. */ if (reloc_non_plt(obj, rtldobj, flags, lockstate)) return (-1); @@ -2488,7 +2488,6 @@ relocate_object(Obj_Entry *obj, bool bin } } - /* Set the special PLT or GOT entries. */ init_pltgot(obj); @@ -2500,6 +2499,16 @@ relocate_object(Obj_Entry *obj, bool bin if (reloc_jmpslots(obj, flags, lockstate) == -1) return (-1); + /* + * Process the non-PLT IFUNC relocations. The relocations are + * processed in two phases, because IFUNC resolvers may + * reference other symbols, which must be readily processed + * before resolvers are called. + */ + if (obj->non_plt_gnu_ifunc && + reloc_non_plt(obj, rtldobj, flags | SYMLOOK_IFUNC, lockstate)) + return (-1); + if (obj->relro_size > 0) { if (mprotect(obj->relro_page, obj->relro_size, PROT_READ) == -1) { Modified: stable/10/libexec/rtld-elf/rtld.h ============================================================================== --- stable/10/libexec/rtld-elf/rtld.h Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/rtld.h Fri Sep 12 16:22:01 2014 (r271469) @@ -268,6 +268,7 @@ typedef struct Struct_Obj_Entry { bool filtees_loaded : 1; /* Filtees loaded */ bool irelative : 1; /* Object has R_MACHDEP_IRELATIVE relocs */ bool gnu_ifunc : 1; /* Object has references to STT_GNU_IFUNC */ + bool non_plt_gnu_ifunc : 1; /* Object has non-plt IFUNC references */ bool crt_no_init : 1; /* Object' crt does not call _init/_fini */ 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 */ @@ -290,6 +291,8 @@ typedef struct Struct_Obj_Entry { #define SYMLOOK_DLSYM 0x02 /* Return newest versioned symbol. Used by dlsym. */ #define SYMLOOK_EARLY 0x04 /* Symlook is done during initialization. */ +#define SYMLOOK_IFUNC 0x08 /* Allow IFUNC processing in + reloc_non_plt(). */ /* Flags for load_object(). */ #define RTLD_LO_NOLOAD 0x01 /* dlopen() specified RTLD_NOLOAD. */ Modified: stable/10/libexec/rtld-elf/sparc64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/sparc64/reloc.c Fri Sep 12 15:54:18 2014 (r271468) +++ stable/10/libexec/rtld-elf/sparc64/reloc.c Fri Sep 12 16:22:01 2014 (r271469) @@ -300,6 +300,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry SymCache *cache; int r = -1; + if ((flags & SYMLOOK_IFUNC) != 0) + /* XXX not implemented */ + return (0); + /* * The dynamic loader may be called from a thread, we have * limited amounts of stack available so we cannot use alloca(). From owner-svn-src-stable-10@FreeBSD.ORG Fri Sep 12 16:37:57 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72B42E67; Fri, 12 Sep 2014 16:37:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CB2F91B; Fri, 12 Sep 2014 16:37:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CGbv96032513; Fri, 12 Sep 2014 16:37:57 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CGbvmJ032512; Fri, 12 Sep 2014 16:37:57 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409121637.s8CGbvmJ032512@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 12 Sep 2014 16:37:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271470 - stable/10/release/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.18-1 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, 12 Sep 2014 16:37:57 -0000 Author: emaste Date: Fri Sep 12 16:37:56 2014 New Revision: 271470 URL: http://svnweb.freebsd.org/changeset/base/271470 Log: MFC r264995 (nwhitehorn): Add script to setup bootable CD ISOs for both BIOS and EFI systems. Tested and working on QEMU. Actually using this script as the regular image generator, like with the memstick one, will require that the kernel support EFI too. In particular, the following two things are required: 1. vt(9) be the default console driver 2. vt_efifb and vt_vga be able to coexist usefully in the same kernel One other note here is that this requires newfs_msdos and mdconfig, which is really ugly. NetBSD's makefs at least seems to support FAT now. If that actually works, it should be imported and we can get rid of the mdconfig mess. Approved by: re Relnotes: Yes Sponsored by: The FreeBSD Foundation Added: stable/10/release/amd64/mkisoimages-uefi.sh - copied unchanged from r264995, head/release/amd64/mkisoimages-uefi.sh Modified: Directory Properties: stable/10/ (props changed) Copied: stable/10/release/amd64/mkisoimages-uefi.sh (from r264995, head/release/amd64/mkisoimages-uefi.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/amd64/mkisoimages-uefi.sh Fri Sep 12 16:37:56 2014 (r271470, copy of r264995, head/release/amd64/mkisoimages-uefi.sh) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# Module: mkisoimages.sh +# Author: Jordan K Hubbard +# Date: 22 June 2001 +# +# $FreeBSD$ +# +# This script is used by release/Makefile to build the (optional) ISO images +# for a FreeBSD release. It is considered architecture dependent since each +# platform has a slightly unique way of making bootable CDs. This script +# is also allowed to generate any number of images since that is more of +# publishing decision than anything else. +# +# Usage: +# +# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir] +# +# Where -b is passed if the ISO image should be made "bootable" by +# whatever standards this architecture supports (may be unsupported), +# image-label is the ISO image label, image-name is the filename of the +# resulting ISO image, base-bits-dir contains the image contents and +# extra-bits-dir, if provided, contains additional files to be merged +# into base-bits-dir as part of making the image. + +if [ "x$1" = "x-b" ]; then + # This is highly x86-centric and will be used directly below. + bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" + + # Make EFI system partition (should be done with makefs in the future) + dd if=/dev/zero of=efiboot.img bs=4k count=100 + device=`mdconfig -a -t vnode -f efiboot.img` + newfs_msdos -F 12 -m 0xf8 /dev/$device + mkdir efi + mount -t msdosfs /dev/$device efi + mkdir -p efi/efi/boot + cp ${4}/boot/loader.efi efi/efi/boot/bootx64.efi + umount efi + rmdir efi + mdconfig -d -u $device + bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable" + + shift +else + bootable="" +fi + +if [ $# -lt 3 ]; then + echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' + exit 1 +fi + +LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift +NAME=$1; shift + +publisher="The FreeBSD Project. http://www.FreeBSD.org/" +echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab +makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $* +rm $1/etc/fstab +rm -f efiboot.img From owner-svn-src-stable-10@FreeBSD.ORG Fri Sep 12 17:01:15 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6BD077EA; Fri, 12 Sep 2014 17:01:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5558EB57; Fri, 12 Sep 2014 17:01:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CH1F5u045271; Fri, 12 Sep 2014 17:01:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CH1E3G045266; Fri, 12 Sep 2014 17:01:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409121701.s8CH1E3G045266@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 12 Sep 2014 17:01:14 +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: r271471 - in stable/10/release/doc: en_US.ISO8859-1/share/xml share/mk 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.18-1 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, 12 Sep 2014 17:01:15 -0000 Author: gjb Date: Fri Sep 12 17:01:14 2014 New Revision: 271471 URL: http://svnweb.freebsd.org/changeset/base/271471 Log: MFC r271331: Change how the recommended mailing list to track is added to the footer of the release/doc/ pages by moving a hard-coded value (that is subject to human error to change) to release.ent where other values are regularly changed, and adding parsing logic to release.xsl. Approved by: re (implicit, relnotes) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl stable/10/release/doc/share/mk/doc.relnotes.mk stable/10/release/doc/share/xml/release.ent stable/10/release/doc/share/xml/release.xsl Directory Properties: stable/10/ (props changed) Modified: stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl Fri Sep 12 16:37:56 2014 (r271470) +++ stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl Fri Sep 12 17:01:14 2014 (r271471) @@ -8,6 +8,7 @@ +

This file, and other release-related documents, @@ -17,8 +18,8 @@ documentation before contacting <questions@FreeBSD.org>.

-

All users of FreeBSD stable should - subscribe to the <stable@FreeBSD.org> +

All users of FreeBSD should + subscribe to the <@FreeBSD.org> mailing list.

For questions about this documentation, Modified: stable/10/release/doc/share/mk/doc.relnotes.mk ============================================================================== --- stable/10/release/doc/share/mk/doc.relnotes.mk Fri Sep 12 16:37:56 2014 (r271470) +++ stable/10/release/doc/share/mk/doc.relnotes.mk Fri Sep 12 17:01:14 2014 (r271471) @@ -6,6 +6,7 @@ DOC_PREFIX?= ${RELN_ROOT}/../../../doc RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|' RELEASEURL!= grep -o 'release.url \"[^\"]*\"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|' RELEASEBRANCH!= grep -o 'release.branch "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|' +RELEASEMAILLIST!= grep -o 'release.maillist "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|' .if ${RELEASETYPE} == "current" PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'" .elif ${RELEASETYPE} == "snapshot" @@ -15,6 +16,7 @@ PROFILING+= --param profile.attribute "' .endif XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'" XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'" +XSLTPROCFLAGS+= --param release.maillist "'${RELEASEMAILLIST}'" # Find the RELNOTESng document catalogs EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \ Modified: stable/10/release/doc/share/xml/release.ent ============================================================================== --- stable/10/release/doc/share/xml/release.ent Fri Sep 12 16:37:56 2014 (r271470) +++ stable/10/release/doc/share/xml/release.ent Fri Sep 12 17:01:14 2014 (r271471) @@ -27,6 +27,9 @@ + + +