From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 3 16:11:39 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 5E47AED0; Sun, 3 Nov 2013 16:11:39 +0000 (UTC) (envelope-from kib@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4873F2579; Sun, 3 Nov 2013 16:11:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3GBdqI038760; Sun, 3 Nov 2013 16:11:39 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3GBdeY038759; Sun, 3 Nov 2013 16:11:39 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201311031611.rA3GBdeY038759@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 3 Nov 2013 16:11:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257577 - stable/9/sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 16:11:39 -0000 Author: kib Date: Sun Nov 3 16:11:38 2013 New Revision: 257577 URL: http://svnweb.freebsd.org/changeset/base/257577 Log: MFC r257214: Inform about the kdb re-entry. Modified: stable/9/sys/kern/subr_kdb.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kern/subr_kdb.c ============================================================================== --- stable/9/sys/kern/subr_kdb.c Sun Nov 3 16:04:36 2013 (r257576) +++ stable/9/sys/kern/subr_kdb.c Sun Nov 3 16:11:38 2013 (r257577) @@ -498,6 +498,8 @@ kdb_reenter(void) if (!kdb_active || kdb_jmpbufp == NULL) return; + printf("KDB: reentering\n"); + kdb_backtrace(); longjmp(kdb_jmpbufp, 1); /* NOTREACHED */ } From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 3 16:17:07 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 5095EC8; Sun, 3 Nov 2013 16:17:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3E104259E; Sun, 3 Nov 2013 16:17:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3GH7XF039729; Sun, 3 Nov 2013 16:17:07 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3GH7OZ039728; Sun, 3 Nov 2013 16:17:07 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201311031617.rA3GH7OZ039728@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 3 Nov 2013 16:17:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257578 - stable/9/sys/amd64/amd64 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 16:17:07 -0000 Author: kib Date: Sun Nov 3 16:17:06 2013 New Revision: 257578 URL: http://svnweb.freebsd.org/changeset/base/257578 Log: MFC r257216: Several small fixes for the amd64 minidump code. Modified: stable/9/sys/amd64/amd64/minidump_machdep.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- stable/9/sys/amd64/amd64/minidump_machdep.c Sun Nov 3 16:11:38 2013 (r257577) +++ stable/9/sys/amd64/amd64/minidump_machdep.c Sun Nov 3 16:17:06 2013 (r257578) @@ -125,8 +125,9 @@ report_progress(size_t progress, size_t int sofar, i; sofar = 100 - ((progress * 100) / dumpsize); - for (i = 0; i < 10; i++) { - if (sofar < progress_track[i].min_per || sofar > progress_track[i].max_per) + for (i = 0; i < nitems(progress_track); i++) { + if (sofar < progress_track[i].min_per || + sofar > progress_track[i].max_per) continue; if (progress_track[i].visited) return; @@ -155,8 +156,8 @@ blk_write(struct dumperinfo *di, char *p printf("cant have both va and pa!\n"); return (EINVAL); } - if (pa != 0 && (((uintptr_t)ptr) % PAGE_SIZE) != 0) { - printf("address not page aligned\n"); + if ((((uintptr_t)pa) % PAGE_SIZE) != 0) { + printf("address not page aligned %p\n", ptr); return (EINVAL); } if (ptr != NULL) { @@ -228,6 +229,8 @@ minidumpsys(struct dumperinfo *di) retry: retry_count++; counter = 0; + for (i = 0; i < nitems(progress_track); i++) + progress_track[i].visited = 0; /* Walk page table pages, set bits in vm_page_dump */ pmapsize = 0; pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys); From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 3 20:50:49 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id CD70DBB6; Sun, 3 Nov 2013 20:50:49 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B8AC521DB; Sun, 3 Nov 2013 20:50:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3Kon7j034347; Sun, 3 Nov 2013 20:50:49 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3KomWb034340; Sun, 3 Nov 2013 20:50:48 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201311032050.rA3KomWb034340@svn.freebsd.org> From: Jim Harris Date: Sun, 3 Nov 2013 20:50:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257587 - in stable/9/sys/dev: nvd nvme X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 20:50:49 -0000 Author: jimharris Date: Sun Nov 3 20:50:48 2013 New Revision: 257587 URL: http://svnweb.freebsd.org/changeset/base/257587 Log: MFC r256151: Add driver-assisted striping for upcoming Intel NVMe controllers that can benefit from it. Sponsored by: Intel Modified: stable/9/sys/dev/nvd/nvd.c stable/9/sys/dev/nvme/nvme.h stable/9/sys/dev/nvme/nvme_ns.c stable/9/sys/dev/nvme/nvme_private.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/nvd/nvd.c ============================================================================== --- stable/9/sys/dev/nvd/nvd.c Sun Nov 3 20:38:51 2013 (r257586) +++ stable/9/sys/dev/nvd/nvd.c Sun Nov 3 20:50:48 2013 (r257587) @@ -187,17 +187,6 @@ nvd_done(void *arg, const struct nvme_co atomic_add_int(&ndisk->cur_depth, -1); - /* - * TODO: add more extensive translation of NVMe status codes - * to different bio error codes (i.e. EIO, EINVAL, etc.) - */ - if (nvme_completion_is_error(cpl)) { - bp->bio_error = EIO; - bp->bio_flags |= BIO_ERROR; - bp->bio_resid = bp->bio_bcount; - } else - bp->bio_resid = 0; - biodone(bp); } Modified: stable/9/sys/dev/nvme/nvme.h ============================================================================== --- stable/9/sys/dev/nvme/nvme.h Sun Nov 3 20:38:51 2013 (r257586) +++ stable/9/sys/dev/nvme/nvme.h Sun Nov 3 20:50:48 2013 (r257587) @@ -532,7 +532,7 @@ struct nvme_controller_data { uint8_t reserved6[1024]; /* bytes 3072-4095: vendor specific */ - uint8_t reserved7[1024]; + uint8_t vs[1024]; } __packed __aligned(4); struct nvme_namespace_data { Modified: stable/9/sys/dev/nvme/nvme_ns.c ============================================================================== --- stable/9/sys/dev/nvme/nvme_ns.c Sun Nov 3 20:38:51 2013 (r257586) +++ stable/9/sys/dev/nvme/nvme_ns.c Sun Nov 3 20:50:48 2013 (r257587) @@ -34,13 +34,31 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +#include + #include "nvme_private.h" +static void nvme_bio_child_inbed(struct bio *parent, int bio_error); +static void nvme_bio_child_done(void *arg, + const struct nvme_completion *cpl); +static uint32_t nvme_get_num_segments(uint64_t addr, uint64_t size, + uint32_t alignment); +static void nvme_free_child_bios(int num_bios, + struct bio **child_bios); +static struct bio ** nvme_allocate_child_bios(int num_bios); +static struct bio ** nvme_construct_child_bios(struct bio *bp, + uint32_t alignment, + int *num_bios); +static int nvme_ns_split_bio(struct nvme_namespace *ns, + struct bio *bp, + uint32_t alignment); + static int nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, struct thread *td) @@ -202,18 +220,218 @@ nvme_ns_bio_done(void *arg, const struct if (bp->bio_driver2) free(bp->bio_driver2, M_NVME); + if (nvme_completion_is_error(status)) { + bp->bio_flags |= BIO_ERROR; + if (bp->bio_error == 0) + bp->bio_error = EIO; + } + + if ((bp->bio_flags & BIO_ERROR) == 0) + bp->bio_resid = 0; + else + bp->bio_resid = bp->bio_bcount; + bp_cb_fn(bp, status); } +static void +nvme_bio_child_inbed(struct bio *parent, int bio_error) +{ + struct nvme_completion parent_cpl; + int inbed; + + if (bio_error != 0) { + parent->bio_flags |= BIO_ERROR; + parent->bio_error = bio_error; + } + + /* + * atomic_fetchadd will return value before adding 1, so we still + * must add 1 to get the updated inbed number. + */ + inbed = atomic_fetchadd_int(&parent->bio_inbed, 1) + 1; + if (inbed == parent->bio_children) { + bzero(&parent_cpl, sizeof(parent_cpl)); + if (parent->bio_flags & BIO_ERROR) + parent_cpl.status.sc = NVME_SC_DATA_TRANSFER_ERROR; + nvme_ns_bio_done(parent, &parent_cpl); + } +} + +static void +nvme_bio_child_done(void *arg, const struct nvme_completion *cpl) +{ + struct bio *child = arg; + struct bio *parent; + int bio_error; + + parent = child->bio_parent; + g_destroy_bio(child); + bio_error = nvme_completion_is_error(cpl) ? EIO : 0; + nvme_bio_child_inbed(parent, bio_error); +} + +static uint32_t +nvme_get_num_segments(uint64_t addr, uint64_t size, uint32_t align) +{ + uint32_t num_segs, offset, remainder; + + if (align == 0) + return (1); + + KASSERT((align & (align - 1)) == 0, ("alignment not power of 2\n")); + + num_segs = size / align; + remainder = size & (align - 1); + offset = addr & (align - 1); + if (remainder > 0 || offset > 0) + num_segs += 1 + (remainder + offset - 1) / align; + return (num_segs); +} + +static void +nvme_free_child_bios(int num_bios, struct bio **child_bios) +{ + int i; + + for (i = 0; i < num_bios; i++) { + if (child_bios[i] != NULL) + g_destroy_bio(child_bios[i]); + } + + free(child_bios, M_NVME); +} + +static struct bio ** +nvme_allocate_child_bios(int num_bios) +{ + struct bio **child_bios; + int err = 0, i; + + child_bios = malloc(num_bios * sizeof(struct bio *), M_NVME, M_NOWAIT); + if (child_bios == NULL) + return (NULL); + + for (i = 0; i < num_bios; i++) { + child_bios[i] = g_new_bio(); + if (child_bios[i] == NULL) + err = ENOMEM; + } + + if (err == ENOMEM) { + nvme_free_child_bios(num_bios, child_bios); + return (NULL); + } + + return (child_bios); +} + +static struct bio ** +nvme_construct_child_bios(struct bio *bp, uint32_t alignment, int *num_bios) +{ + struct bio **child_bios; + struct bio *child; + uint64_t cur_offset; + caddr_t data; + uint32_t rem_bcount; + int i; +#ifdef NVME_UNMAPPED_BIO_SUPPORT + struct vm_page **ma; + uint32_t ma_offset; +#endif + + *num_bios = nvme_get_num_segments(bp->bio_offset, bp->bio_bcount, + alignment); + child_bios = nvme_allocate_child_bios(*num_bios); + if (child_bios == NULL) + return (NULL); + + bp->bio_children = *num_bios; + bp->bio_inbed = 0; + cur_offset = bp->bio_offset; + rem_bcount = bp->bio_bcount; + data = bp->bio_data; +#ifdef NVME_UNMAPPED_BIO_SUPPORT + ma_offset = bp->bio_ma_offset; + ma = bp->bio_ma; +#endif + + for (i = 0; i < *num_bios; i++) { + child = child_bios[i]; + child->bio_parent = bp; + child->bio_cmd = bp->bio_cmd; + child->bio_offset = cur_offset; + child->bio_bcount = min(rem_bcount, + alignment - (cur_offset & (alignment - 1))); + child->bio_flags = bp->bio_flags; +#ifdef NVME_UNMAPPED_BIO_SUPPORT + if (bp->bio_flags & BIO_UNMAPPED) { + child->bio_ma_offset = ma_offset; + child->bio_ma = ma; + child->bio_ma_n = + nvme_get_num_segments(child->bio_ma_offset, + child->bio_bcount, PAGE_SIZE); + ma_offset = (ma_offset + child->bio_bcount) & + PAGE_MASK; + ma += child->bio_ma_n; + if (ma_offset != 0) + ma -= 1; + } else +#endif + { + child->bio_data = data; + data += child->bio_bcount; + } + cur_offset += child->bio_bcount; + rem_bcount -= child->bio_bcount; + } + + return (child_bios); +} + +static int +nvme_ns_split_bio(struct nvme_namespace *ns, struct bio *bp, + uint32_t alignment) +{ + struct bio *child; + struct bio **child_bios; + int err, i, num_bios; + + child_bios = nvme_construct_child_bios(bp, alignment, &num_bios); + if (child_bios == NULL) + return (ENOMEM); + + for (i = 0; i < num_bios; i++) { + child = child_bios[i]; + err = nvme_ns_bio_process(ns, child, nvme_bio_child_done); + if (err != 0) { + nvme_bio_child_inbed(bp, err); + g_destroy_bio(child); + } + } + + free(child_bios, M_NVME); + return (0); +} + int nvme_ns_bio_process(struct nvme_namespace *ns, struct bio *bp, nvme_cb_fn_t cb_fn) { struct nvme_dsm_range *dsm_range; + uint32_t num_bios; int err; bp->bio_driver1 = cb_fn; + if (ns->stripesize > 0 && + (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE)) { + num_bios = nvme_get_num_segments(bp->bio_offset, + bp->bio_bcount, ns->stripesize); + if (num_bios > 1) + return (nvme_ns_split_bio(ns, bp, ns->stripesize)); + } + switch (bp->bio_cmd) { case BIO_READ: err = nvme_ns_cmd_read_bio(ns, bp, nvme_ns_bio_done, bp); @@ -276,6 +494,11 @@ nvme_ns_construct(struct nvme_namespace ns->ctrlr = ctrlr; ns->id = id; + ns->stripesize = 0; + + if (pci_get_devid(ctrlr->dev) == 0x09538086 && ctrlr->cdata.vs[3] != 0) + ns->stripesize = + (1 << ctrlr->cdata.vs[3]) * ctrlr->min_page_size; /* * Namespaces are reconstructed after a controller reset, so check Modified: stable/9/sys/dev/nvme/nvme_private.h ============================================================================== --- stable/9/sys/dev/nvme/nvme_private.h Sun Nov 3 20:38:51 2013 (r257586) +++ stable/9/sys/dev/nvme/nvme_private.h Sun Nov 3 20:50:48 2013 (r257587) @@ -238,6 +238,7 @@ struct nvme_namespace { uint16_t flags; struct cdev *cdev; void *cons_cookie[NVME_MAX_CONSUMERS]; + uint32_t stripesize; struct mtx lock; }; From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 3 20:52:14 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 95B3BD27; Sun, 3 Nov 2013 20:52:14 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8173D21FF; Sun, 3 Nov 2013 20:52:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3KqEWo036404; Sun, 3 Nov 2013 20:52:14 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3KqDjZ036401; Sun, 3 Nov 2013 20:52:13 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201311032052.rA3KqDjZ036401@svn.freebsd.org> From: Jim Harris Date: Sun, 3 Nov 2013 20:52:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257588 - in stable/9: sbin/nvmecontrol sys/dev/nvme X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 20:52:14 -0000 Author: jimharris Date: Sun Nov 3 20:52:13 2013 New Revision: 257588 URL: http://svnweb.freebsd.org/changeset/base/257588 Log: MFC r256152: Extend some 32-bit fields and variables to 64-bit to prevent overflow when calculating data in nvmecontrol perftest. Sponsored by: Intel Modified: stable/9/sbin/nvmecontrol/perftest.c stable/9/sys/dev/nvme/nvme.h stable/9/sys/dev/nvme/nvme_test.c Directory Properties: stable/9/sbin/nvmecontrol/ (props changed) stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sbin/nvmecontrol/perftest.c ============================================================================== --- stable/9/sbin/nvmecontrol/perftest.c Sun Nov 3 20:50:48 2013 (r257587) +++ stable/9/sbin/nvmecontrol/perftest.c Sun Nov 3 20:52:13 2013 (r257588) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -45,7 +46,8 @@ __FBSDID("$FreeBSD$"); static void print_perftest(struct nvme_io_test *io_test, bool perthread) { - uint32_t i, io_completed = 0, iops, mbps; + uint64_t io_completed = 0, iops, mbps; + uint32_t i; for (i = 0; i < io_test->num_threads; i++) io_completed += io_test->io_completed[i]; @@ -53,15 +55,15 @@ print_perftest(struct nvme_io_test *io_t iops = io_completed/io_test->time; mbps = iops * io_test->size / (1024*1024); - printf("Threads: %2d Size: %6d %5s Time: %3d IO/s: %7d MB/s: %4d\n", + printf("Threads: %2d Size: %6d %5s Time: %3d IO/s: %7ju MB/s: %4ju\n", io_test->num_threads, io_test->size, io_test->opc == NVME_OPC_READ ? "READ" : "WRITE", - io_test->time, iops, mbps); + io_test->time, (uintmax_t)iops, (uintmax_t)mbps); if (perthread) for (i = 0; i < io_test->num_threads; i++) - printf("\t%3d: %8d IO/s\n", i, - io_test->io_completed[i]/io_test->time); + printf("\t%3d: %8ju IO/s\n", i, + (uintmax_t)io_test->io_completed[i]/io_test->time); exit(1); } Modified: stable/9/sys/dev/nvme/nvme.h ============================================================================== --- stable/9/sys/dev/nvme/nvme.h Sun Nov 3 20:50:48 2013 (r257587) +++ stable/9/sys/dev/nvme/nvme.h Sun Nov 3 20:52:13 2013 (r257588) @@ -717,7 +717,7 @@ struct nvme_io_test { uint32_t time; /* in seconds */ uint32_t num_threads; uint32_t flags; - uint32_t io_completed[NVME_TEST_MAX_THREADS]; + uint64_t io_completed[NVME_TEST_MAX_THREADS]; }; enum nvme_io_test_flags { Modified: stable/9/sys/dev/nvme/nvme_test.c ============================================================================== --- stable/9/sys/dev/nvme/nvme_test.c Sun Nov 3 20:50:48 2013 (r257587) +++ stable/9/sys/dev/nvme/nvme_test.c Sun Nov 3 20:52:13 2013 (r257588) @@ -53,7 +53,7 @@ struct nvme_io_test_thread { void *buf; uint32_t size; uint32_t time; - uint32_t io_completed; + uint64_t io_completed; }; struct nvme_io_test_internal { @@ -66,7 +66,7 @@ struct nvme_io_test_internal { uint32_t td_active; uint32_t td_idx; uint32_t flags; - uint32_t io_completed[NVME_TEST_MAX_THREADS]; + uint64_t io_completed[NVME_TEST_MAX_THREADS]; }; static void @@ -90,8 +90,8 @@ nvme_ns_bio_test(void *arg) struct cdev *dev; void *buf; struct timeval t; - uint64_t offset; - uint32_t idx, io_completed = 0; + uint64_t io_completed = 0, offset; + uint32_t idx; #if __FreeBSD_version >= 900017 int ref; #endif From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 3 20:53:45 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id EA1E9E63; Sun, 3 Nov 2013 20:53:45 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D45A8220C; Sun, 3 Nov 2013 20:53:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3KrjLS036800; Sun, 3 Nov 2013 20:53:45 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3Krjt3036799; Sun, 3 Nov 2013 20:53:45 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201311032053.rA3Krjt3036799@svn.freebsd.org> From: Jim Harris Date: Sun, 3 Nov 2013 20:53:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257589 - stable/9/sys/dev/nvme X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 20:53:46 -0000 Author: jimharris Date: Sun Nov 3 20:53:45 2013 New Revision: 257589 URL: http://svnweb.freebsd.org/changeset/base/257589 Log: MFC r256153: Do not enable temperature threshold as an asynchronous event notification on NVMe controllers that do not support it. Sponsored by: Intel Modified: stable/9/sys/dev/nvme/nvme_ctrlr.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/nvme/nvme_ctrlr.c ============================================================================== --- stable/9/sys/dev/nvme/nvme_ctrlr.c Sun Nov 3 20:52:13 2013 (r257588) +++ stable/9/sys/dev/nvme/nvme_ctrlr.c Sun Nov 3 20:53:45 2013 (r257589) @@ -708,12 +708,26 @@ nvme_ctrlr_construct_and_submit_aer(stru static void nvme_ctrlr_configure_aer(struct nvme_controller *ctrlr) { + struct nvme_completion_poll_status status; union nvme_critical_warning_state state; struct nvme_async_event_request *aer; uint32_t i; state.raw = 0xFF; state.bits.reserved = 0; + + status.done = FALSE; + nvme_ctrlr_cmd_get_feature(ctrlr, NVME_FEAT_TEMPERATURE_THRESHOLD, + 0, NULL, 0, nvme_completion_poll_cb, &status); + while (status.done == FALSE) + pause("nvme", 1); + if (nvme_completion_is_error(&status.cpl) || + (status.cpl.cdw0 & 0xFFFF) == 0xFFFF || + (status.cpl.cdw0 & 0xFFFF) == 0x0000) { + nvme_printf(ctrlr, "temperature threshold not supported\n"); + state.bits.temperature = 0; + } + nvme_ctrlr_cmd_set_async_event_config(ctrlr, state, NULL, NULL); /* aerl is a zero-based value, so we need to add 1 here. */ From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 3 20:55:25 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id A9C34FAE; Sun, 3 Nov 2013 20:55:25 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86EC8221D; Sun, 3 Nov 2013 20:55:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3KtP65037329; Sun, 3 Nov 2013 20:55:25 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3KtPJb037327; Sun, 3 Nov 2013 20:55:25 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201311032055.rA3KtPJb037327@svn.freebsd.org> From: Jim Harris Date: Sun, 3 Nov 2013 20:55:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257590 - stable/9/sys/dev/nvme X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 20:55:25 -0000 Author: jimharris Date: Sun Nov 3 20:55:24 2013 New Revision: 257590 URL: http://svnweb.freebsd.org/changeset/base/257590 Log: MFC r256154: Log and then disable asynchronous notification of persistent events after they occur. This prevents repeated notifications of the same event. Status of these events may be viewed at any time by viewing the SMART/Health Info Page using nvmecontrol, whether or not asynchronous events notifications for those events are enabled. This log page can be viewed using: nvmecontrol logpage -p 2 Future enhancements may re-enable these notifications on a periodic basis so that if the notified condition persists, it will continue to be logged. Sponsored by: Intel Modified: stable/9/sys/dev/nvme/nvme_ctrlr.c stable/9/sys/dev/nvme/nvme_private.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/nvme/nvme_ctrlr.c ============================================================================== --- stable/9/sys/dev/nvme/nvme_ctrlr.c Sun Nov 3 20:53:45 2013 (r257589) +++ stable/9/sys/dev/nvme/nvme_ctrlr.c Sun Nov 3 20:55:24 2013 (r257590) @@ -617,9 +617,35 @@ nvme_ctrlr_get_log_page_size(struct nvme } static void +nvme_ctrlr_log_critical_warnings(struct nvme_controller *ctrlr, + union nvme_critical_warning_state state) +{ + + if (state.bits.available_spare == 1) + nvme_printf(ctrlr, "available spare space below threshold\n"); + + if (state.bits.temperature == 1) + nvme_printf(ctrlr, "temperature above threshold\n"); + + if (state.bits.device_reliability == 1) + nvme_printf(ctrlr, "device reliability degraded\n"); + + if (state.bits.read_only == 1) + nvme_printf(ctrlr, "media placed in read only mode\n"); + + if (state.bits.volatile_memory_backup == 1) + nvme_printf(ctrlr, "volatile memory backup device failed\n"); + + if (state.bits.reserved != 0) + nvme_printf(ctrlr, + "unknown critical warning(s): state = 0x%02x\n", state.raw); +} + +static void nvme_ctrlr_async_event_log_page_cb(void *arg, const struct nvme_completion *cpl) { - struct nvme_async_event_request *aer = arg; + struct nvme_async_event_request *aer = arg; + struct nvme_health_information_page *health_info; /* * If the log page fetch for some reason completed with an error, @@ -629,13 +655,33 @@ nvme_ctrlr_async_event_log_page_cb(void if (nvme_completion_is_error(cpl)) nvme_notify_async_consumers(aer->ctrlr, &aer->cpl, aer->log_page_id, NULL, 0); - else + else { + if (aer->log_page_id == NVME_LOG_HEALTH_INFORMATION) { + health_info = (struct nvme_health_information_page *) + aer->log_page_buffer; + nvme_ctrlr_log_critical_warnings(aer->ctrlr, + health_info->critical_warning); + /* + * Critical warnings reported through the + * SMART/health log page are persistent, so + * clear the associated bits in the async event + * config so that we do not receive repeated + * notifications for the same event. + */ + aer->ctrlr->async_event_config.raw &= + ~health_info->critical_warning.raw; + nvme_ctrlr_cmd_set_async_event_config(aer->ctrlr, + aer->ctrlr->async_event_config, NULL, NULL); + } + + /* * Pass the cpl data from the original async event completion, * not the log page fetch. */ nvme_notify_async_consumers(aer->ctrlr, &aer->cpl, aer->log_page_id, aer->log_page_buffer, aer->log_page_size); + } /* * Repost another asynchronous event request to replace the one @@ -709,12 +755,11 @@ static void nvme_ctrlr_configure_aer(struct nvme_controller *ctrlr) { struct nvme_completion_poll_status status; - union nvme_critical_warning_state state; struct nvme_async_event_request *aer; uint32_t i; - state.raw = 0xFF; - state.bits.reserved = 0; + ctrlr->async_event_config.raw = 0xFF; + ctrlr->async_event_config.bits.reserved = 0; status.done = FALSE; nvme_ctrlr_cmd_get_feature(ctrlr, NVME_FEAT_TEMPERATURE_THRESHOLD, @@ -725,10 +770,11 @@ nvme_ctrlr_configure_aer(struct nvme_con (status.cpl.cdw0 & 0xFFFF) == 0xFFFF || (status.cpl.cdw0 & 0xFFFF) == 0x0000) { nvme_printf(ctrlr, "temperature threshold not supported\n"); - state.bits.temperature = 0; + ctrlr->async_event_config.bits.temperature = 0; } - nvme_ctrlr_cmd_set_async_event_config(ctrlr, state, NULL, NULL); + nvme_ctrlr_cmd_set_async_event_config(ctrlr, + ctrlr->async_event_config, NULL, NULL); /* aerl is a zero-based value, so we need to add 1 here. */ ctrlr->num_aers = min(NVME_MAX_ASYNC_EVENTS, (ctrlr->cdata.aerl+1)); Modified: stable/9/sys/dev/nvme/nvme_private.h ============================================================================== --- stable/9/sys/dev/nvme/nvme_private.h Sun Nov 3 20:53:45 2013 (r257589) +++ stable/9/sys/dev/nvme/nvme_private.h Sun Nov 3 20:55:24 2013 (r257590) @@ -322,6 +322,9 @@ struct nvme_controller { struct cdev *cdev; + /** bit mask of warning types currently enabled for async events */ + union nvme_critical_warning_state async_event_config; + uint32_t num_aers; struct nvme_async_event_request aer[NVME_MAX_ASYNC_EVENTS]; From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 3 20:56:29 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 6432F170; Sun, 3 Nov 2013 20:56:29 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9362223; Sun, 3 Nov 2013 20:56:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3KuTTf037637; Sun, 3 Nov 2013 20:56:29 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3KuT9e037636; Sun, 3 Nov 2013 20:56:29 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201311032056.rA3KuT9e037636@svn.freebsd.org> From: Jim Harris Date: Sun, 3 Nov 2013 20:56:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257591 - stable/9/sys/dev/nvme X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 20:56:29 -0000 Author: jimharris Date: Sun Nov 3 20:56:28 2013 New Revision: 257591 URL: http://svnweb.freebsd.org/changeset/base/257591 Log: MFC r256155: Do not leak resources during attach if nvme_ctrlr_construct() or the initial controller resets fail. Sponsored by: Intel Modified: stable/9/sys/dev/nvme/nvme.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/nvme/nvme.c ============================================================================== --- stable/9/sys/dev/nvme/nvme.c Sun Nov 3 20:55:24 2013 (r257590) +++ stable/9/sys/dev/nvme/nvme.c Sun Nov 3 20:56:28 2013 (r257591) @@ -237,8 +237,10 @@ nvme_attach(device_t dev) status = nvme_ctrlr_construct(ctrlr, dev); - if (status != 0) + if (status != 0) { + nvme_ctrlr_destruct(ctrlr, dev); return (status); + } /* * Reset controller twice to ensure we do a transition from cc.en==1 @@ -246,12 +248,16 @@ nvme_attach(device_t dev) * the controller was left in when boot handed off to OS. */ status = nvme_ctrlr_hw_reset(ctrlr); - if (status != 0) + if (status != 0) { + nvme_ctrlr_destruct(ctrlr, dev); return (status); + } status = nvme_ctrlr_hw_reset(ctrlr); - if (status != 0) + if (status != 0) { + nvme_ctrlr_destruct(ctrlr, dev); return (status); + } nvme_sysctl_initialize_ctrlr(ctrlr); From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 3 21:12:02 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 394F849D; Sun, 3 Nov 2013 21:12:02 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2553722E5; Sun, 3 Nov 2013 21:12:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3LC2Lh046254; Sun, 3 Nov 2013 21:12:02 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3LC1T0046247; Sun, 3 Nov 2013 21:12:01 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201311032112.rA3LC1T0046247@svn.freebsd.org> From: Jim Harris Date: Sun, 3 Nov 2013 21:12:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257593 - stable/9/sys/dev/isci X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 21:12:02 -0000 Author: jimharris Date: Sun Nov 3 21:12:01 2013 New Revision: 257593 URL: http://svnweb.freebsd.org/changeset/base/257593 Log: MFC r256231: Improve logging around some of the isci(4) reset and recovery paths. Sponsored by: Intel Modified: stable/9/sys/dev/isci/isci_io_request.c stable/9/sys/dev/isci/isci_sysctl.c stable/9/sys/dev/isci/isci_task_request.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/isci/isci_io_request.c ============================================================================== --- stable/9/sys/dev/isci/isci_io_request.c Sun Nov 3 21:05:44 2013 (r257592) +++ stable/9/sys/dev/isci/isci_io_request.c Sun Nov 3 21:12:01 2013 (r257593) @@ -153,11 +153,16 @@ isci_io_request_complete(SCI_CONTROLLER_ case SCI_IO_FAILURE_REMOTE_DEVICE_RESET_REQUIRED: isci_remote_device_reset(isci_remote_device, NULL); + ccb->ccb_h.status |= CAM_REQ_TERMIO; + isci_log_message(0, "ISCI", + "isci: bus=%x target=%x lun=%x cdb[0]=%x remote device reset required\n", + ccb->ccb_h.path_id, ccb->ccb_h.target_id, + ccb->ccb_h.target_lun, ccb->csio.cdb_io.cdb_bytes[0]); + break; - /* drop through */ case SCI_IO_FAILURE_TERMINATED: ccb->ccb_h.status |= CAM_REQ_TERMIO; - isci_log_message(1, "ISCI", + isci_log_message(0, "ISCI", "isci: bus=%x target=%x lun=%x cdb[0]=%x terminated\n", ccb->ccb_h.path_id, ccb->ccb_h.target_id, ccb->ccb_h.target_lun, ccb->csio.cdb_io.cdb_bytes[0]); Modified: stable/9/sys/dev/isci/isci_sysctl.c ============================================================================== --- stable/9/sys/dev/isci/isci_sysctl.c Sun Nov 3 21:05:44 2013 (r257592) +++ stable/9/sys/dev/isci/isci_sysctl.c Sun Nov 3 21:12:01 2013 (r257593) @@ -193,6 +193,35 @@ isci_sysctl_start_phy(SYSCTL_HANDLER_ARG return 0; } +static int +isci_sysctl_log_frozen_lun_masks(SYSCTL_HANDLER_ARGS) +{ + struct isci_softc *isci = (struct isci_softc *)arg1; + struct ISCI_REMOTE_DEVICE *device; + int32_t log_frozen_devices = 0; + int error, i, j; + + error = sysctl_handle_int(oidp, &log_frozen_devices, 0, req); + + if (error || log_frozen_devices == 0) + return (error); + + for (i = 0; i < isci->controller_count; i++) { + for (j = 0; j < SCI_MAX_REMOTE_DEVICES; j++) { + device = isci->controllers[i].remote_device[j]; + + if (device == NULL) + continue; + + device_printf(isci->device, + "controller %d device %3d frozen_lun_mask 0x%02x\n", + i, j, device->frozen_lun_mask); + } + } + + return (0); +} + void isci_sysctl_initialize(struct isci_softc *isci) { struct sysctl_ctx_list *sysctl_ctx = device_get_sysctl_ctx(isci->device); @@ -225,5 +254,10 @@ void isci_sysctl_initialize(struct isci_ SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "start_phy", CTLTYPE_UINT| CTLFLAG_RW, isci, 0, isci_sysctl_start_phy, "IU", "Start PHY on a controller"); + + SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, + "log_frozen_lun_masks", CTLTYPE_UINT| CTLFLAG_RW, isci, 0, + isci_sysctl_log_frozen_lun_masks, "IU", + "Log frozen lun masks to kernel log"); } Modified: stable/9/sys/dev/isci/isci_task_request.c ============================================================================== --- stable/9/sys/dev/isci/isci_task_request.c Sun Nov 3 21:05:44 2013 (r257592) +++ stable/9/sys/dev/isci/isci_task_request.c Sun Nov 3 21:12:01 2013 (r257593) @@ -194,11 +194,20 @@ isci_task_request_complete(SCI_CONTROLLE break; case SCI_TASK_FAILURE_INVALID_STATE: + retry_task = TRUE; + isci_log_message(0, "ISCI", + "task failure (invalid state) - retrying\n"); + break; + case SCI_TASK_FAILURE_INSUFFICIENT_RESOURCES: - case SCI_FAILURE_TIMEOUT: retry_task = TRUE; isci_log_message(0, "ISCI", - "unhandled task completion code 0x%x\n", completion_status); + "task failure (insufficient resources) - retrying\n"); + break; + + case SCI_FAILURE_TIMEOUT: + retry_task = TRUE; + isci_log_message(0, "ISCI", "task timeout - retrying\n"); break; case SCI_TASK_FAILURE: From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 4 05:46:31 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id EF437E8E; Mon, 4 Nov 2013 05:46:31 +0000 (UTC) (envelope-from yongari@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DACB429F6; Mon, 4 Nov 2013 05:46:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA45kVV5021509; Mon, 4 Nov 2013 05:46:31 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA45kVqK021507; Mon, 4 Nov 2013 05:46:31 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201311040546.rA45kVqK021507@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 4 Nov 2013 05:46:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257609 - in stable/9/sys: dev/re pci X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 05:46:32 -0000 Author: yongari Date: Mon Nov 4 05:46:31 2013 New Revision: 257609 URL: http://svnweb.freebsd.org/changeset/base/257609 Log: r256827: Correct MAC revision bits. Previously it always cleared bit 20 and bit 21. Modified: stable/9/sys/dev/re/if_re.c stable/9/sys/pci/if_rlreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/re/if_re.c ============================================================================== --- stable/9/sys/dev/re/if_re.c Mon Nov 4 05:43:32 2013 (r257608) +++ stable/9/sys/dev/re/if_re.c Mon Nov 4 05:46:31 2013 (r257609) @@ -1367,10 +1367,11 @@ re_attach(device_t dev) break; default: device_printf(dev, "Chip rev. 0x%08x\n", hwrev & 0x7c800000); + sc->rl_macrev = hwrev & 0x00700000; hwrev &= RL_TXCFG_HWREV; break; } - device_printf(dev, "MAC rev. 0x%08x\n", hwrev & 0x00700000); + device_printf(dev, "MAC rev. 0x%08x\n", sc->rl_macrev); while (hw_rev->rl_desc != NULL) { if (hw_rev->rl_rev == hwrev) { sc->rl_type = hw_rev->rl_type; @@ -1429,7 +1430,7 @@ re_attach(device_t dev) sc->rl_flags |= RL_FLAG_MACSLEEP; /* FALLTHROUGH */ case RL_HWREV_8168C: - if ((hwrev & 0x00700000) == 0x00200000) + if (sc->rl_macrev == 0x00200000) sc->rl_flags |= RL_FLAG_MACSLEEP; /* FALLTHROUGH */ case RL_HWREV_8168CP: Modified: stable/9/sys/pci/if_rlreg.h ============================================================================== --- stable/9/sys/pci/if_rlreg.h Mon Nov 4 05:43:32 2013 (r257608) +++ stable/9/sys/pci/if_rlreg.h Mon Nov 4 05:46:31 2013 (r257609) @@ -877,6 +877,7 @@ struct rl_softc { bus_dma_tag_t rl_parent_tag; uint8_t rl_type; const struct rl_hwrev *rl_hwrev; + uint32_t rl_macrev; int rl_eecmd_read; int rl_eewidth; int rl_expcap; From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 4 05:49:57 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 6865B286; Mon, 4 Nov 2013 05:49:57 +0000 (UTC) (envelope-from yongari@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3EE372A43; Mon, 4 Nov 2013 05:49:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA45nvwU021985; Mon, 4 Nov 2013 05:49:57 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA45nuHN021983; Mon, 4 Nov 2013 05:49:56 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201311040549.rA45nuHN021983@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 4 Nov 2013 05:49:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257611 - in stable/9/sys: dev/re pci X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 05:49:57 -0000 Author: yongari Date: Mon Nov 4 05:49:56 2013 New Revision: 257611 URL: http://svnweb.freebsd.org/changeset/base/257611 Log: MFC r256828: Add preliminary support for RTL8106E PCIe FastEthernet. Modified: stable/9/sys/dev/re/if_re.c stable/9/sys/pci/if_rlreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/re/if_re.c ============================================================================== --- stable/9/sys/dev/re/if_re.c Mon Nov 4 05:48:12 2013 (r257610) +++ stable/9/sys/dev/re/if_re.c Mon Nov 4 05:49:56 2013 (r257611) @@ -223,6 +223,7 @@ static const struct rl_hwrev re_hwrevs[] { RL_HWREV_8402, RL_8169, "8402", RL_MTU }, { RL_HWREV_8105E, RL_8169, "8105E", RL_MTU }, { RL_HWREV_8105E_SPIN1, RL_8169, "8105E", RL_MTU }, + { RL_HWREV_8106E, RL_8169, "8106E", RL_MTU }, { RL_HWREV_8168B_SPIN2, RL_8169, "8168", RL_JUMBO_MTU }, { RL_HWREV_8168B_SPIN3, RL_8169, "8168", RL_JUMBO_MTU }, { RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, @@ -1409,6 +1410,7 @@ re_attach(device_t dev) case RL_HWREV_8401E: case RL_HWREV_8105E: case RL_HWREV_8105E_SPIN1: + case RL_HWREV_8106E: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD; Modified: stable/9/sys/pci/if_rlreg.h ============================================================================== --- stable/9/sys/pci/if_rlreg.h Mon Nov 4 05:48:12 2013 (r257610) +++ stable/9/sys/pci/if_rlreg.h Mon Nov 4 05:49:56 2013 (r257611) @@ -189,6 +189,7 @@ #define RL_HWREV_8105E 0x40800000 #define RL_HWREV_8105E_SPIN1 0x40C00000 #define RL_HWREV_8402 0x44000000 +#define RL_HWREV_8106E 0x44800000 #define RL_HWREV_8168F 0x48000000 #define RL_HWREV_8411 0x48800000 #define RL_HWREV_8139 0x60000000 From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 4 05:54:14 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 8798D64D; Mon, 4 Nov 2013 05:54:14 +0000 (UTC) (envelope-from yongari@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5AE5C2A8C; Mon, 4 Nov 2013 05:54:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA45sENH024687; Mon, 4 Nov 2013 05:54:14 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA45sEqp024685; Mon, 4 Nov 2013 05:54:14 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201311040554.rA45sEqp024685@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 4 Nov 2013 05:54:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257614 - stable/9/sys/dev/mii X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 05:54:14 -0000 Author: yongari Date: Mon Nov 4 05:54:13 2013 New Revision: 257614 URL: http://svnweb.freebsd.org/changeset/base/257614 Log: MFC r257304: Add support for new Gigabit PHY of RealTek. I don't have a copy of data sheet so I'm not sure exact PHY model name. Vendor's web page indicates RTL8251 is latest PHY so I used the name. This PHY is used with RTL8168G, RTL8168GU and RTL8411B. Modified: stable/9/sys/dev/mii/miidevs stable/9/sys/dev/mii/rgephy.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/mii/miidevs ============================================================================== --- stable/9/sys/dev/mii/miidevs Mon Nov 4 05:52:42 2013 (r257613) +++ stable/9/sys/dev/mii/miidevs Mon Nov 4 05:54:13 2013 (r257614) @@ -299,6 +299,7 @@ model yyREALTEK RTL8201L 0x0020 RTL8201L model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface model REALTEK RTL8305SC 0x0005 RTL8305SC 10/100 802.1q switch model REALTEK RTL8201E 0x0008 RTL8201E 10/100 media interface +model REALTEK RTL8251 0x0000 RTL8251 1000BASE-T media interface model REALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface /* Seeq Seeq PHYs */ Modified: stable/9/sys/dev/mii/rgephy.c ============================================================================== --- stable/9/sys/dev/mii/rgephy.c Mon Nov 4 05:52:42 2013 (r257613) +++ stable/9/sys/dev/mii/rgephy.c Mon Nov 4 05:54:13 2013 (r257614) @@ -90,6 +90,7 @@ static void rgephy_load_dspcode(struct m static const struct mii_phydesc rgephys[] = { MII_PHY_DESC(REALTEK, RTL8169S), + MII_PHY_DESC(REALTEK, RTL8251), MII_PHY_END }; @@ -406,7 +407,8 @@ rgephy_loop(struct mii_softc *sc) { int i; - if (sc->mii_mpd_rev < 2) { + if (sc->mii_mpd_model != MII_MODEL_REALTEK_RTL8251 && + sc->mii_mpd_rev < 2) { PHY_WRITE(sc, RGEPHY_MII_BMCR, RGEPHY_BMCR_PDOWN); DELAY(1000); } @@ -439,7 +441,8 @@ rgephy_load_dspcode(struct mii_softc *sc { int val; - if (sc->mii_mpd_rev >= 2) + if (sc->mii_mpd_model == MII_MODEL_REALTEK_RTL8251 || + sc->mii_mpd_rev >= 2) return; PHY_WRITE(sc, 31, 0x0001); From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 4 05:57:25 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 635D38C0; Mon, 4 Nov 2013 05:57:25 +0000 (UTC) (envelope-from yongari@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5037E2A9B; Mon, 4 Nov 2013 05:57:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA45vPIc025187; Mon, 4 Nov 2013 05:57:25 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA45vOBA025185; Mon, 4 Nov 2013 05:57:24 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201311040557.rA45vOBA025185@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 4 Nov 2013 05:57:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257616 - in stable/9/sys: dev/re pci X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 05:57:25 -0000 Author: yongari Date: Mon Nov 4 05:57:24 2013 New Revision: 257616 URL: http://svnweb.freebsd.org/changeset/base/257616 Log: MFC r257305: Add preliminary support for RTL8168G, RTL8168GU and RTL8411B. RTL8168GU has two variants(GMII and MII) but it uses the same chip revision id. Driver checks PCI device id of controller and sets internal capability flag(i.e. jumbo frame and link speed down in WOL). Modified: stable/9/sys/dev/re/if_re.c stable/9/sys/pci/if_rlreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/re/if_re.c ============================================================================== --- stable/9/sys/dev/re/if_re.c Mon Nov 4 05:56:02 2013 (r257615) +++ stable/9/sys/dev/re/if_re.c Mon Nov 4 05:57:24 2013 (r257616) @@ -181,7 +181,7 @@ static const struct rl_type re_devs[] = { RT_VENDORID, RT_DEVICEID_8101E, 0, "RealTek 810xE PCIe 10/100baseTX" }, { RT_VENDORID, RT_DEVICEID_8168, 0, - "RealTek 8168/8111 B/C/CP/D/DP/E/F PCIe Gigabit Ethernet" }, + "RealTek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, 0, "RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169SC, 0, @@ -234,7 +234,10 @@ static const struct rl_hwrev re_hwrevs[] { RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K}, { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K}, { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168G, RL_8169, "8168G/8111G", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168GU, RL_8169, "8168GU/8111GU", RL_JUMBO_MTU_9K}, { RL_HWREV_8411, RL_8169, "8411", RL_JUMBO_MTU_9K}, + { RL_HWREV_8411B, RL_8169, "8411B", RL_JUMBO_MTU_9K}, { 0, 0, NULL, 0 } }; @@ -1459,12 +1462,25 @@ re_attach(device_t dev) break; case RL_HWREV_8168E_VL: case RL_HWREV_8168F: + case RL_HWREV_8168G: case RL_HWREV_8411: + case RL_HWREV_8411B: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2 | RL_FLAG_CMDSTOP_WAIT_TXQ | RL_FLAG_WOL_MANLINK; break; + case RL_HWREV_8168GU: + if (pci_get_device(dev) == RT_DEVICEID_8101E) { + /* RTL8106EUS */ + sc->rl_flags |= RL_FLAG_FASTETHER; + } else + sc->rl_flags |= RL_FLAG_JUMBOV2 | RL_FLAG_WOL_MANLINK; + + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | + RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | + RL_FLAG_AUTOPAD | RL_FLAG_CMDSTOP_WAIT_TXQ; + break; case RL_HWREV_8169_8110SB: case RL_HWREV_8169_8110SBL: case RL_HWREV_8169_8110SC: @@ -3335,7 +3351,9 @@ re_ioctl(struct ifnet *ifp, u_long comma switch (command) { case SIOCSIFMTU: if (ifr->ifr_mtu < ETHERMIN || - ifr->ifr_mtu > sc->rl_hwrev->rl_max_mtu) { + ifr->ifr_mtu > sc->rl_hwrev->rl_max_mtu || + ((sc->rl_flags & RL_FLAG_FASTETHER) != 0 && + ifr->ifr_mtu > RL_MTU)) { error = EINVAL; break; } Modified: stable/9/sys/pci/if_rlreg.h ============================================================================== --- stable/9/sys/pci/if_rlreg.h Mon Nov 4 05:56:02 2013 (r257615) +++ stable/9/sys/pci/if_rlreg.h Mon Nov 4 05:57:24 2013 (r257616) @@ -192,6 +192,9 @@ #define RL_HWREV_8106E 0x44800000 #define RL_HWREV_8168F 0x48000000 #define RL_HWREV_8411 0x48800000 +#define RL_HWREV_8168G 0x4C000000 +#define RL_HWREV_8168GU 0x50800000 +#define RL_HWREV_8411B 0x5C800000 #define RL_HWREV_8139 0x60000000 #define RL_HWREV_8139A 0x70000000 #define RL_HWREV_8139AG 0x70800000 From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 4 06:00:13 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 2948FC73; Mon, 4 Nov 2013 06:00:13 +0000 (UTC) (envelope-from yongari@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 168A12ABA; Mon, 4 Nov 2013 06:00:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA460Chj027499; Mon, 4 Nov 2013 06:00:12 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA460CQu027497; Mon, 4 Nov 2013 06:00:12 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201311040600.rA460CQu027497@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 4 Nov 2013 06:00:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257618 - in stable/9/sys: dev/re pci X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 06:00:13 -0000 Author: yongari Date: Mon Nov 4 06:00:12 2013 New Revision: 257618 URL: http://svnweb.freebsd.org/changeset/base/257618 Log: MFC r257306: Add preliminary support for RTL8168EP. Modified: stable/9/sys/dev/re/if_re.c stable/9/sys/pci/if_rlreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/re/if_re.c ============================================================================== --- stable/9/sys/dev/re/if_re.c Mon Nov 4 05:58:59 2013 (r257617) +++ stable/9/sys/dev/re/if_re.c Mon Nov 4 06:00:12 2013 (r257618) @@ -233,6 +233,7 @@ static const struct rl_hwrev re_hwrevs[] { RL_HWREV_8168DP, RL_8169, "8168DP/8111DP", RL_JUMBO_MTU_9K }, { RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K}, { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K}, + { RL_HWREV_8168EP, RL_8169, "8168EP/8111EP", RL_JUMBO_MTU_9K}, { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K}, { RL_HWREV_8168G, RL_8169, "8168G/8111G", RL_JUMBO_MTU_9K}, { RL_HWREV_8168GU, RL_8169, "8168GU/8111GU", RL_JUMBO_MTU_9K}, @@ -1461,6 +1462,7 @@ re_attach(device_t dev) RL_FLAG_WOL_MANLINK; break; case RL_HWREV_8168E_VL: + case RL_HWREV_8168EP: case RL_HWREV_8168F: case RL_HWREV_8168G: case RL_HWREV_8411: Modified: stable/9/sys/pci/if_rlreg.h ============================================================================== --- stable/9/sys/pci/if_rlreg.h Mon Nov 4 05:58:59 2013 (r257617) +++ stable/9/sys/pci/if_rlreg.h Mon Nov 4 06:00:12 2013 (r257618) @@ -193,6 +193,7 @@ #define RL_HWREV_8168F 0x48000000 #define RL_HWREV_8411 0x48800000 #define RL_HWREV_8168G 0x4C000000 +#define RL_HWREV_8168EP 0x50000000 #define RL_HWREV_8168GU 0x50800000 #define RL_HWREV_8411B 0x5C800000 #define RL_HWREV_8139 0x60000000 From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 4 08:47:37 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 2F5BAAA1; Mon, 4 Nov 2013 08:47:37 +0000 (UTC) (envelope-from yongari@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1ACB324F7; Mon, 4 Nov 2013 08:47:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA48laHh083366; Mon, 4 Nov 2013 08:47:36 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA48laVq083365; Mon, 4 Nov 2013 08:47:36 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201311040847.rA48laVq083365@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 4 Nov 2013 08:47:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257624 - stable/9/sys/dev/bce X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 08:47:37 -0000 Author: yongari Date: Mon Nov 4 08:47:36 2013 New Revision: 257624 URL: http://svnweb.freebsd.org/changeset/base/257624 Log: MFC r257307: Fix regression introduced in r235816. r235816 triggered kernel panic or hang after warm boot. Don't blindly restore BCE_EMAC_MODE media configuration in bce_reset(). If driver is about to shutdown it will invoke bce_reset() which in turn results in restoring BCE_EMAC_MODE media configuration. This operation seems to confuse controller firmware. Modified: stable/9/sys/dev/bce/if_bce.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/bce/if_bce.c ============================================================================== --- stable/9/sys/dev/bce/if_bce.c Mon Nov 4 08:46:50 2013 (r257623) +++ stable/9/sys/dev/bce/if_bce.c Mon Nov 4 08:47:36 2013 (r257624) @@ -5064,9 +5064,11 @@ bce_reset(struct bce_softc *sc, u32 rese bce_reset_exit: /* Restore EMAC Mode bits needed to keep ASF/IPMI running. */ - val = REG_RD(sc, BCE_EMAC_MODE); - val = (val & ~emac_mode_mask) | emac_mode_save; - REG_WR(sc, BCE_EMAC_MODE, val); + if (reset_code == BCE_DRV_MSG_CODE_RESET) { + val = REG_RD(sc, BCE_EMAC_MODE); + val = (val & ~emac_mode_mask) | emac_mode_save; + REG_WR(sc, BCE_EMAC_MODE, val); + } DBEXIT(BCE_VERBOSE_RESET); return (rc); From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 5 06:37:16 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 3EDE3C50; Tue, 5 Nov 2013 06:37:16 +0000 (UTC) (envelope-from edwin@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2A8952F01; Tue, 5 Nov 2013 06:37:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA56bGZX035943; Tue, 5 Nov 2013 06:37:16 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA56bEuU035931; Tue, 5 Nov 2013 06:37:14 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201311050637.rA56bEuU035931@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 5 Nov 2013 06:37:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257682 - stable/9/contrib/tzdata X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 06:37:16 -0000 Author: edwin Date: Tue Nov 5 06:37:14 2013 New Revision: 257682 URL: http://svnweb.freebsd.org/changeset/base/257682 Log: MFC of 257681: tzdata2013f - Jordan goes to winter time on the last Friday in October. - Tocantins in Brazil will not go into summer time in October. - Indonesian time zones renames. - Lots of cleanups in with regarding to links and historical data. tzdata2013h - Libya didn't go back to DST. - Fix Morocco 2038 issue. - Brazil/Acre and ?Western Amazonas are chaning timezones. Added: stable/9/contrib/tzdata/leap-seconds.list - copied unchanged from r257681, head/contrib/tzdata/leap-seconds.list Modified: stable/9/contrib/tzdata/africa stable/9/contrib/tzdata/antarctica stable/9/contrib/tzdata/asia stable/9/contrib/tzdata/australasia stable/9/contrib/tzdata/backward stable/9/contrib/tzdata/etcetera stable/9/contrib/tzdata/europe stable/9/contrib/tzdata/northamerica stable/9/contrib/tzdata/southamerica stable/9/contrib/tzdata/zone.tab Directory Properties: stable/9/contrib/tzdata/ (props changed) Modified: stable/9/contrib/tzdata/africa ============================================================================== --- stable/9/contrib/tzdata/africa Tue Nov 5 06:32:23 2013 (r257681) +++ stable/9/contrib/tzdata/africa Tue Nov 5 06:37:14 2013 (r257682) @@ -451,6 +451,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # (either two days before them or five days after them, so as to fall on # lastFri instead of lastSun). +# From Even Scharning (2013-10-25): +# The scheduled end of DST in Libya on Friday, October 25, 2013 was +# cancelled yesterday.... +# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# +# From Paul Eggert (2013-10-25): +# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -467,8 +475,8 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 Rule Libya 1987 1989 - Oct 1 0:00 0 - Rule Libya 1997 only - Apr 4 0:00 1:00 S Rule Libya 1997 only - Oct 4 0:00 0 - -Rule Libya 2013 max - Mar lastFri 1:00 1:00 S -Rule Libya 2013 max - Oct lastFri 2:00 0 - +Rule Libya 2013 only - Mar lastFri 1:00 1:00 S +Rule Libya 2013 only - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 @@ -479,7 +487,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 2:00 - EET 1996 Sep 30 1:00 Libya CE%sT 1997 Oct 4 2:00 - EET 2012 Nov 10 2:00 - 1:00 Libya CE%sT + 1:00 Libya CE%sT 2013 Oct 25 2:00 + 2:00 - EET # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -684,15 +693,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # -# From Alex Krivenyshev (2008-05-09): -# Is Western Sahara (part which administrated by Morocco) going to follow -# Morocco DST changes? Any information? What about other part of -# Western Sahara - under administration of POLISARIO Front (also named -# SADR Saharawi Arab Democratic Republic)? - -# From Arthur David Olson (2008-05-09): -# XXX--guess that it is only Morocco for now; guess only 2008 for now. - # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 # and September 1. They originally planned to observe DST to near the end @@ -858,13 +858,23 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # transitions would be 2013-07-07 and 2013-08-10; see: # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 -# From Paul Eggert (2013-07-03): +# From Steffen Thorsen (2013-09-28): +# Morocco extends DST by one month, on very short notice, just 1 day +# before it was going to end. There is a new decree (2.13.781) for +# this, where DST from now on goes from last Sunday of March at 02:00 +# to last Sunday of October at 03:00, similar to EU rules. Official +# source (French): +# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013 +# Another source (specifying the time for start and end in the decree): +# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html + +# From Paul Eggert (2013-10-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2014 through 2021 were determined by running +# transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: # # (let ((islamic-year 1435)) -# (while (< islamic-year 1444) +# (while (< islamic-year 1461) # (let ((a # (calendar-gregorian-from-absolute # (calendar-islamic-to-absolute (list 9 1 islamic-year)))) @@ -879,13 +889,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) # -# with the results hand-edited for 2020-2022, when the normal spring-forward -# date falls during the estimated Ramadan. -# -# From 2023 through 2038 Ramadan is not predicted to overlap with -# daylight saving time. Starting in 2039 there will be overlap again, -# but 32-bit time_t values roll around in 2038 so for now do not worry -# about dates after 2038. +# with spring-forward transitions removed for 2023-2025, when the +# normal spring-forward date falls during the estimated Ramadan; with +# all transitions removed for 2026-2035, where the estimated Ramadan +# falls entirely outside daylight-saving time; and with fall-back +# transitions removed for 2036-2037, where the normal fall-back +# date falls during the estimated Ramadan. Normally, the table would +# stop after 2037 because 32-bit time_t values roll around early in 2038, +# but that would imply a prediction of perpetual DST after March 2038 +# due to the year-2037 glitches. So, this table instead stops after +# 2038, the first non-glitchy year after the 32-bit rollover. +# An advantage of stopping after 2038 is that it lets zic guess +# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future. # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -912,12 +927,14 @@ Rule Morocco 2010 only - May 2 0:00 1: Rule Morocco 2010 only - Aug 8 0:00 0 - Rule Morocco 2011 only - Apr 3 0:00 1:00 S Rule Morocco 2011 only - Jul 31 0 0 - -Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S -Rule Morocco 2012 max - Sep lastSun 3:00 0 - +Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S +Rule Morocco 2012 only - Sep 30 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Aug 10 2:00 1:00 S +Rule Morocco 2013 2035 - Oct lastSun 3:00 0 - +Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S Rule Morocco 2014 only - Jun 29 3:00 0 - Rule Morocco 2014 only - Jul 29 2:00 1:00 S Rule Morocco 2015 only - Jun 18 3:00 0 - @@ -930,20 +947,42 @@ Rule Morocco 2018 only - May 16 3:00 0 Rule Morocco 2018 only - Jun 15 2:00 1:00 S Rule Morocco 2019 only - May 6 3:00 0 - Rule Morocco 2019 only - Jun 5 2:00 1:00 S +Rule Morocco 2020 only - Apr 24 3:00 0 - Rule Morocco 2020 only - May 24 2:00 1:00 S +Rule Morocco 2021 only - Apr 13 3:00 0 - Rule Morocco 2021 only - May 13 2:00 1:00 S +Rule Morocco 2022 only - Apr 3 3:00 0 - Rule Morocco 2022 only - May 3 2:00 1:00 S -Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S +Rule Morocco 2023 only - Apr 22 2:00 1:00 S +Rule Morocco 2024 only - Apr 10 2:00 1:00 S +Rule Morocco 2025 only - Mar 31 2:00 1:00 S +Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S +Rule Morocco 2036 only - Oct 21 3:00 0 - +Rule Morocco 2037 only - Oct 11 3:00 0 - +Rule Morocco 2038 only - Sep 30 3:00 0 - +Rule Morocco 2038 only - Oct 30 2:00 1:00 S +Rule Morocco 2038 max - Oct lastSun 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 0:00 Morocco WE%sT 1984 Mar 16 1:00 - CET 1986 0:00 Morocco WE%sT + # Western Sahara +# +# From Gwillim Law (2013-10-22): +# A correspondent who is usually well informed about time zone matters +# ... says that Western Sahara observes daylight saving time, just as +# Morocco does. +# +# From Paul Eggert (2013-10-23): +# Assume that this has been true since Western Sahara switched to GMT, +# since most of it was then controlled by Morocco. + Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan -1:00 - WAT 1976 Apr 14 - 0:00 - WET + 0:00 Morocco WE%sT # Mozambique # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1100,9 +1139,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 3:00 - EAT # South Sudan -Zone Africa/Juba 2:06:24 - LMT 1931 - 2:00 Sudan CA%sT 2000 Jan 15 12:00 - 3:00 - EAT +Link Africa/Khartoum Africa/Juba # Swaziland # Zone NAME GMTOFF RULES FORMAT [UNTIL] Modified: stable/9/contrib/tzdata/antarctica ============================================================================== --- stable/9/contrib/tzdata/antarctica Tue Nov 5 06:32:23 2013 (r257681) +++ stable/9/contrib/tzdata/antarctica Tue Nov 5 06:37:14 2013 (r257682) @@ -16,9 +16,9 @@ # # Except for the French entries, # I made up all time zone abbreviations mentioned here; corrections welcome! -# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited. +# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. -# These rules are stolen from the `southamerica' file. +# These rules are stolen from the 'southamerica' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule ArgAQ 1964 1966 - Mar 1 0:00 0 - Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S @@ -228,9 +228,10 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 # Scott Island (never inhabited) # # year-round base -# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo. +# Scott Base, Ross Island, since 1957-01. +# See Pacific/Auckland. # -# These rules for New Zealand are stolen from the `australasia' file. +# These rules for New Zealand are stolen from the 'australasia' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D @@ -268,11 +269,11 @@ Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 # From Lee Hotz (2001-03-08): # I queried the folks at Columbia who spent the summer at Vostok and this is # what they had to say about time there: -# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo) +# "in the US Camp (East Camp) we have been on New Zealand (McMurdo) # time, which is 12 hours ahead of GMT. The Russian Station Vostok was # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead # of GMT). This is a time zone I think two hours east of Moscow. The -# natural time zone is in between the two: 8 hours ahead of GMT.'' +# natural time zone is in between the two: 8 hours ahead of GMT." # # From Paul Eggert (2001-05-04): # This seems to be hopelessly confusing, so I asked Lee Hotz about it @@ -337,16 +338,8 @@ Zone Antarctica/Palmer 0 - zzz 1965 -4:00 ChileAQ CL%sT # # -# McMurdo, Ross Island, since 1955-12 -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/McMurdo 0 - zzz 1956 - 12:00 NZAQ NZ%sT -# -# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20 -# -# From Paul Eggert (1996-09-03): -# Normally it wouldn't have a separate entry, since it's like the -# larger Antarctica/McMurdo since 1970, but it's too famous to omit. +# McMurdo Station, Ross Island, since 1955-12 +# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20 # # From Chris Carrier (1996-06-27): # Siple, the first commander of the South Pole station, @@ -368,4 +361,4 @@ Zone Antarctica/McMurdo 0 - zzz 1956 # we have to go around and set them back 5 minutes or so. # Maybe if we let them run fast all of the time, we'd get to leave here sooner!! # -Link Antarctica/McMurdo Antarctica/South_Pole +# See 'australasia' for Antarctica/McMurdo. Modified: stable/9/contrib/tzdata/asia ============================================================================== --- stable/9/contrib/tzdata/asia Tue Nov 5 06:32:23 2013 (r257681) +++ stable/9/contrib/tzdata/asia Tue Nov 5 06:37:14 2013 (r257682) @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # tz@iana.org for general use in the future). -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2013-08-11): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -44,11 +44,11 @@ # 4:00 GST Gulf* # 5:30 IST India # 7:00 ICT Indochina* -# 7:00 WIT west Indonesia -# 8:00 CIT central Indonesia +# 7:00 WIB west Indonesia (Waktu Indonesia Barat) +# 8:00 WITA central Indonesia (Waktu Indonesia Tengah) # 8:00 CST China # 9:00 CJT Central Japanese Time (1896/1937)* -# 9:00 EIT east Indonesia +# 9:00 WIT east Indonesia (Waktu Indonesia Timur) # 9:00 JST JDT Japan # 9:00 KST KDT Korea # 9:30 CST (Australian) Central Standard Time @@ -756,7 +756,7 @@ Zone Asia/Dili 8:22:20 - LMT 1912 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time 9:00 - JST 1945 Sep 23 9:00 - TLT 1976 May 3 - 8:00 - CIT 2000 Sep 17 00:00 + 8:00 - WITA 2000 Sep 17 00:00 9:00 - TLT # India @@ -793,36 +793,53 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # K # (Hollandia). For now, assume all Indonesian locations other than Jayapura # switched on 1945-09-23. # +# From Paul Eggert (2013-08-11): +# Normally the tz database uses English-language abbreviations, but in +# Indonesia it's typical to use Indonesian-language abbreviations even +# when writing in English. For example, see the English-language +# summary published by the Time and Frequency Laboratory of the +# Research Center for Calibration, Instrumentation and Metrology, +# Indonesia, (2006-09-29). +# The abbreviations are: +# +# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time) +# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time) +# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time) +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] +# Java, Sumatra Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13, # but this must be a typo. - 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta + 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia 7:20 - JAVT 1932 Nov # Java Time - 7:30 - WIT 1942 Mar 23 + 7:30 - WIB 1942 Mar 23 9:00 - JST 1945 Sep 23 - 7:30 - WIT 1948 May - 8:00 - WIT 1950 May - 7:30 - WIT 1964 - 7:00 - WIT + 7:30 - WIB 1948 May + 8:00 - WIB 1950 May + 7:30 - WIB 1964 + 7:00 - WIB +# west and central Borneo Zone Asia/Pontianak 7:17:20 - LMT 1908 May 7:17:20 - PMT 1932 Nov # Pontianak MT - 7:30 - WIT 1942 Jan 29 + 7:30 - WIB 1942 Jan 29 9:00 - JST 1945 Sep 23 - 7:30 - WIT 1948 May - 8:00 - WIT 1950 May - 7:30 - WIT 1964 - 8:00 - CIT 1988 Jan 1 - 7:00 - WIT + 7:30 - WIB 1948 May + 8:00 - WIB 1950 May + 7:30 - WIB 1964 + 8:00 - WITA 1988 Jan 1 + 7:00 - WIB +# Sulawesi, Lesser Sundas, east and south Borneo Zone Asia/Makassar 7:57:36 - LMT 1920 7:57:36 - MMT 1932 Nov # Macassar MT - 8:00 - CIT 1942 Feb 9 + 8:00 - WITA 1942 Feb 9 9:00 - JST 1945 Sep 23 - 8:00 - CIT + 8:00 - WITA +# Maluku Islands, West Papua, Papua Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov - 9:00 - EIT 1944 Sep 1 + 9:00 - WIT 1944 Sep 1 9:30 - CST 1964 - 9:00 - EIT + 9:00 - WIT # Iran @@ -1364,9 +1381,11 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # until about the same time next year (at least). # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 # -# From Paul Eggert (2012-10-25): -# For now, assume this is just a one-year measure. If it becomes -# permanent, we should move Jordan from EET to AST effective tomorrow. +# From Paul Eggert (2013-09-21): +# It's looking like this change will be permanent; see +# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20) +# . +# So move Jordan to UTC+3 as of the abovementioned date. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S @@ -1392,15 +1411,15 @@ Rule Jordan 1995 1998 - Sep Fri>=15 0:00 Rule Jordan 1999 only - Jul 1 0:00s 1:00 S Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S -Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S +Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S Rule Jordan 2003 only - Oct 24 0:00s 0 - Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - -Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - -Rule Jordan 2013 max - Oct lastFri 0:00s 0 - +Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 - 2:00 Jordan EE%sT + 2:00 Jordan EE%sT 2012 Oct 26 0:00s + 3:00 - AST # Kazakhstan @@ -2280,9 +2299,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # http://www.samanews.com/index.php?act=Show&id=154120 # http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html -# From Paul Eggert (2013-04-15): +# From Steffen Thorsen (2013-09-24): +# The Gaza and West Bank are ending DST Thursday at midnight +# (2013-09-27 00:00:00) (one hour earlier than last year...). +# This source in English, says "that winter time will go into effect +# at midnight on Thursday in the West Bank and Gaza Strip": +# http://english.wafa.ps/index.php?action=detail&id=23246 +# official source...: +# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252 + +# From Paul Eggert (2013-09-24): # For future dates, guess the last Thursday in March at 24:00 through -# the first Friday on or after September 21 at 01:00. This is consistent with +# the first Friday on or after September 21 at 00:00. This is consistent with # the predictions in today's editions of the following URLs, # which are for Gaza and Hebron respectively: # http://www.timeanddate.com/worldclock/timezone.html?n=702 @@ -2313,7 +2341,8 @@ Rule Palestine 2011 only - Aug 1 0:00 0 Rule Palestine 2011 only - Aug 30 0:00 1:00 S Rule Palestine 2011 only - Sep 30 0:00 0 - Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S -Rule Palestine 2012 max - Sep Fri>=21 1:00 0 - +Rule Palestine 2012 only - Sep 21 1:00 0 - +Rule Palestine 2013 max - Sep Fri>=21 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct Modified: stable/9/contrib/tzdata/australasia ============================================================================== --- stable/9/contrib/tzdata/australasia Tue Nov 5 06:32:23 2013 (r257681) +++ stable/9/contrib/tzdata/australasia Tue Nov 5 06:37:14 2013 (r257682) @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -487,6 +496,7 @@ Zone Pacific/Auckland 11:39:04 - LMT 186 Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1 12:45 Chatham CHA%sT +Link Pacific/Auckland Antarctica/McMurdo # Auckland Is # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers, @@ -736,7 +746,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # 1886-1891; Baker was similar but exact dates are not known. # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944; # uninhabited thereafter. -# Howland observed Hawaii Standard Time (UTC-10:30) in 1937; +# Howland observed Hawaii Standard Time (UT-10:30) in 1937; # see page 206 of Elgen M. Long and Marie K. Long, # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000). # So most likely Howland and Baker observed Hawaii Time from 1935 @@ -749,8 +759,17 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # no information; was probably like Pacific/Kiritimati # Johnston -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Johnston -10:00 - HST +# +# From Paul Eggert (2013-09-03): +# In his memoirs of June 6th to October 4, 1945 +# (2005), Herbert C. Bach writes, +# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM +# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and +# confirms that Johnston kept the same time as Honolulu in summer 1945. +# We have no better information, so for now, assume this has been true +# indefinitely into the past. +# +# See 'northamerica' for Pacific/Johnston. # Kingman # uninhabited Modified: stable/9/contrib/tzdata/backward ============================================================================== --- stable/9/contrib/tzdata/backward Tue Nov 5 06:32:23 2013 (r257681) +++ stable/9/contrib/tzdata/backward Tue Nov 5 06:37:14 2013 (r257682) @@ -22,15 +22,17 @@ Link America/Kentucky/Louisville America Link America/Argentina/Mendoza America/Mendoza Link America/Rio_Branco America/Porto_Acre Link America/Argentina/Cordoba America/Rosario -Link America/St_Thomas America/Virgin +Link America/Denver America/Shiprock +Link America/Port_of_Spain America/Virgin +Link Pacific/Auckland Antarctica/South_Pole Link Asia/Ashgabat Asia/Ashkhabad +Link Asia/Kolkata Asia/Calcutta Link Asia/Chongqing Asia/Chungking Link Asia/Dhaka Asia/Dacca Link Asia/Kathmandu Asia/Katmandu -Link Asia/Kolkata Asia/Calcutta Link Asia/Macau Asia/Macao -Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Ho_Chi_Minh Asia/Saigon +Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Thimphu Asia/Thimbu Link Asia/Makassar Asia/Ujung_Pandang Link Asia/Ulaanbaatar Asia/Ulan_Bator @@ -88,10 +90,10 @@ Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo Link Asia/Shanghai PRC +Link Pacific/Pohnpei Pacific/Ponape Link Pacific/Pago_Pago Pacific/Samoa -Link Pacific/Chuuk Pacific/Yap Link Pacific/Chuuk Pacific/Truk -Link Pacific/Pohnpei Pacific/Ponape +Link Pacific/Chuuk Pacific/Yap Link Europe/Warsaw Poland Link Europe/Lisbon Portugal Link Asia/Taipei ROC Modified: stable/9/contrib/tzdata/etcetera ============================================================================== --- stable/9/contrib/tzdata/etcetera Tue Nov 5 06:32:23 2013 (r257681) +++ stable/9/contrib/tzdata/etcetera Tue Nov 5 06:37:14 2013 (r257682) @@ -31,9 +31,9 @@ Link Etc/GMT Etc/GMT0 # even though this is the opposite of what many people expect. # POSIX has positive signs west of Greenwich, but many people expect # positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses -# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC +# the abbreviation "GMT+4" and corresponds to 4 hours behind UT # (i.e. west of Greenwich) even though many people would expect it to -# mean 4 hours ahead of UTC (i.e. east of Greenwich). +# mean 4 hours ahead of UT (i.e. east of Greenwich). # # In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for # TZ='+4'; if you want time zone abbreviations conforming to Modified: stable/9/contrib/tzdata/europe ============================================================================== --- stable/9/contrib/tzdata/europe Tue Nov 5 06:32:23 2013 (r257681) +++ stable/9/contrib/tzdata/europe Tue Nov 5 06:37:14 2013 (r257682) @@ -42,7 +42,7 @@ # (1998-09-21, in Portuguese) # -# I invented the abbreviations marked `*' in the following table; +# I invented the abbreviations marked '*' in the following table; # the rest are from earlier versions of this file, or from other sources. # Corrections are welcome! # std dst 2dst @@ -96,7 +96,7 @@ # and a sketch map showing some of the sightlines involved. One paragraph # of the text said: # -# `An old stone obelisk marking a forgotten terrestrial meridian stands +# 'An old stone obelisk marking a forgotten terrestrial meridian stands # beside the river at Kew. In the 18th century, before time and longitude # was standardised by the Royal Observatory in Greenwich, scholars observed # this stone and the movement of stars from Kew Observatory nearby. They @@ -140,7 +140,7 @@ # From Paul Eggert (2003-09-27): # Summer Time was first seriously proposed by William Willett (1857-1915), # a London builder and member of the Royal Astronomical Society -# who circulated a pamphlet ``The Waste of Daylight'' (1907) +# who circulated a pamphlet "The Waste of Daylight" (1907) # that proposed advancing clocks 20 minutes on each of four Sundays in April, # and retarding them by the same amount on four Sundays in September. # A bill was drafted in 1909 and introduced in Parliament several times, @@ -165,10 +165,10 @@ # # From Paul Eggert (1996-09-03): -# The OED Supplement says that the English originally said ``Daylight Saving'' +# The OED Supplement says that the English originally said "Daylight Saving" # when they were debating the adoption of DST in 1908; but by 1916 this # term appears only in quotes taken from DST's opponents, whereas the -# proponents (who eventually won the argument) are quoted as using ``Summer''. +# proponents (who eventually won the argument) are quoted as using "Summer". # From Arthur David Olson (1989-01-19): # @@ -208,9 +208,9 @@ # which could not be said to run counter to any official description. # From Paul Eggert (2000-10-02): -# Howse writes (p 157) `DBST' too, but `BDST' seems to have been common +# Howse writes (p 157) 'DBST' too, but 'BDST' seems to have been common # and follows the more usual convention of putting the location name first, -# so we use `BDST'. +# so we use 'BDST'. # Peter Ilieve (1998-04-19) described at length # the history of summer time legislation in the United Kingdom. @@ -431,6 +431,8 @@ Rule GB-Eire 1981 1989 - Oct Sun>=23 1:0 Rule GB-Eire 1990 1995 - Oct Sun>=22 1:00u 0 GMT # Summer Time Order 1997 (S.I. 1997/2982) # See EU for rules starting in 1996. +# +# Use Europe/London for Jersey, Guernsey, and the Isle of Man. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s @@ -797,7 +799,7 @@ Zone Europe/Brussels 0:17:30 - LMT 1880 1:00 EU CE%sT # Bosnia and Herzegovina -# see Serbia +# See Europe/Belgrade. # Bulgaria # @@ -825,10 +827,10 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 2:00 EU EE%sT # Croatia -# see Serbia +# See Europe/Belgrade. # Cyprus -# Please see the `asia' file for Asia/Nicosia. +# Please see the 'asia' file for Asia/Nicosia. # Czech Republic # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -845,6 +847,7 @@ Zone Europe/Prague 0:57:44 - LMT 1850 1:00 C-Eur CE%sT 1944 Sep 17 2:00s 1:00 Czech CE%sT 1979 1:00 EU CE%sT +# Use Europe/Prague also for Slovakia. # Denmark, Faroe Islands, and Greenland @@ -1008,12 +1011,12 @@ Zone America/Thule -4:35:08 - LMT 1916 J # From Peter Ilieve (1996-10-28): # [IATA SSIM (1992/1996) claims that the Baltic republics switch at 01:00s, # but a relative confirms that Estonia still switches at 02:00s, writing:] -# ``I do not [know] exactly but there are some little different +# "I do not [know] exactly but there are some little different # (confusing) rules for International Air and Railway Transport Schedules # conversion in Sunday connected with end of summer time in Estonia.... # A discussion is running about the summer time efficiency and effect on # human physiology. It seems that Estonia maybe will not change to -# summer time next spring.'' +# summer time next spring." # From Peter Ilieve (1998-11-04), heavily edited: # @@ -1068,7 +1071,7 @@ Zone Europe/Tallinn 1:39:00 - LMT 1880 # Well, here in Helsinki we're just changing from summer time to regular one, # and it's supposed to change at 4am... -# From Janne Snabb (2010-0715): +# From Janne Snabb (2010-07-15): # # I noticed that the Finland data is not accurate for years 1981 and 1982. # During these two first trial years the DST adjustment was made one hour @@ -1125,7 +1128,7 @@ Link Europe/Helsinki Europe/Mariehamn # -# Shank & Pottenger seem to use `24:00' ambiguously; resolve it with Whitman. +# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule France 1916 only - Jun 14 23:00s 1:00 S Rule France 1916 1919 - Oct Sun>=1 23:00s 0 - @@ -1415,7 +1418,7 @@ Zone Atlantic/Reykjavik -1:27:24 - LMT 1 # # Day-light Saving Time in Italy (2006-02-03) # -# (`FP' below), taken from an Italian National Electrotechnical Institute +# ('FP' below), taken from an Italian National Electrotechnical Institute # publication. When the three sources disagree, guess who's right, as follows: # # year FP Shanks&P. (S) Whitman (W) Go with: @@ -1561,10 +1564,22 @@ Zone Europe/Riga 1:36:24 - LMT 1880 2:00 EU EE%sT # Liechtenstein -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Europe/Vaduz 0:38:04 - LMT 1894 Jun - 1:00 - CET 1981 - 1:00 EU CE%sT + +# From Paul Eggert (2013-09-09): +# Shanks & Pottenger say Vaduz is like Zurich. + +# From Alois Treindl (2013-09-18): +# http://www.eliechtensteinensia.li/LIJ/1978/1938-1978/1941.pdf +# ... confirms on p. 6 that Liechtenstein followed Switzerland in 1941 and 1942. +# I ... translate only the last two paragraphs: +# ... during second world war, in the years 1941 and 1942, Liechtenstein +# introduced daylight saving time, adapting to Switzerland. From 1943 on +# central European time was in force throughout the year. +# From a report of the duke's government to the high council, +# regarding the introduction of a time law, of 31 May 1977. + +Link Europe/Zurich Europe/Vaduz + # Lithuania @@ -1652,7 +1667,7 @@ Zone Europe/Luxembourg 0:24:36 - LMT 190 1:00 EU CE%sT # Macedonia -# see Serbia +# See Europe/Belgrade. # Malta # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1745,7 +1760,7 @@ Zone Europe/Monaco 0:29:32 - LMT 1891 Ma 1:00 EU CE%sT # Montenegro -# see Serbia +# See Europe/Belgrade. # Netherlands @@ -1860,7 +1875,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan # before 1895, and therefore probably changed the local time somewhere # between 1895 and 1925 (inclusive). -# From Paul Eggert (2001-05-01): +# From Paul Eggert (2013-09-04): # # Actually, Jan Mayen was never occupied by Germany during World War II, # so it must have diverged from Oslo time during the war, as Oslo was @@ -1871,7 +1886,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan # 1941 with a small Norwegian garrison and continued operations despite # frequent air ttacks from Germans. In 1943 the Americans established a # radiolocating station on the island, called "Atlantic City". Possibly -# the UTC offset changed during the war, but I think it unlikely that +# the UT offset changed during the war, but I think it unlikely that # Jan Mayen used German daylight-saving rules. # # Svalbard is more complicated, as it was raided in August 1941 by an @@ -1884,9 +1899,8 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan # the German armed forces at the Svalbard weather station code-named # Haudegen did not surrender to the Allies until September 1945. # -# All these events predate our cutoff date of 1970. Unless we can -# come up with more definitive info about the timekeeping during the -# war years it's probably best just do...the following for now: +# All these events predate our cutoff date of 1970, so use Europe/Oslo +# for these regions. Link Europe/Oslo Arctic/Longyearbyen # Poland @@ -2144,7 +2158,7 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 # so we (Novosibirsk) simply did not switch. # # From Andrey A. Chernov (1996-10-04): -# `MSK' and `MSD' were born and used initially on Moscow computers with +# 'MSK' and 'MSD' were born and used initially on Moscow computers with # UNIX-like OSes by several developer groups (e.g. Demos group, Kiae group).... # The next step was the UUCP network, the Relcom predecessor # (used mainly for mail), and MSK/MSD was actively used there. @@ -2443,6 +2457,9 @@ Zone Asia/Anadyr 11:49:56 - LMT 1924 May 11:00 Russia ANA%sT 2011 Mar 27 2:00s 12:00 - ANAT +# San Marino +# See Europe/Rome. + # Serbia # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Belgrade 1:22:00 - LMT 1884 @@ -2465,7 +2482,7 @@ Link Europe/Belgrade Europe/Zagreb # Cro Link Europe/Prague Europe/Bratislava # Slovenia -# see Serbia +# See Europe/Belgrade. # Spain # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -2599,7 +2616,7 @@ Zone Europe/Stockholm 1:12:12 - LMT 1879 # and their performance improved enormously. Communities began to keep # mean time in preference to apparent time -- Geneva from 1780 .... # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -# From Whitman (who writes ``Midnight?''): +# From Whitman (who writes "Midnight?"): # Rule Swiss 1940 only - Nov 2 0:00 1:00 S # Rule Swiss 1940 only - Dec 31 0:00 0 - # From Shanks & Pottenger: @@ -2644,23 +2661,53 @@ Zone Europe/Stockholm 1:12:12 - LMT 1879 # The 1940 rules must be deleted. # # One further detail for Switzerland, which is probably out of scope for -# most users of tzdata: -# The zone file -# Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12 -# 0:29:44 - BMT 1894 Jun #Bern Mean Time -# 1:00 Swiss CE%sT 1981 -# 1:00 EU CE%sT +# most users of tzdata: The [Europe/Zurich zone] ... # describes all of Switzerland correctly, with the exception of # the Cantone Geneve (Geneva, Genf). Between 1848 and 1894 Geneve did not # follow Bern Mean Time but kept its own local mean time. # To represent this, an extra zone would be needed. +# +# From Alois Treindl (2013-09-11): +# The Federal regulations say +# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html +# ... the meridian for Bern mean time ... is 7 degrees 26'22.50". +# Expressed in time, it is 0h29m45.5s. + +# From Pierre-Yves Berger (2013-09-11): +# the "Circulaire du conseil federal" (December 11 1893) +# ... +# clearly states that the [1894-06-01] change should be done at midnight +# but if no one is present after 11 at night, could be postponed until one +# hour before the beginning of service. + +# From Paul Eggert (2013-09-11): +# Round BMT to the nearest even second, 0:29:46. +# +# We can find no reliable source for Shanks's assertion that all of Switzerland +# except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12. This book: +# +# Jakob Messerli. Gleichmassig, punktlich, schnell: Zeiteinteilung und +# Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995, +# ISBN 3-905311-68-2, OCLC 717570797. +# +# suggests that the transition was more gradual, and that the Swiss did not +# agree about civil time during the transition. The timekeeping it gives the +# most detail for is postal and telegraph time: here, federal legislation (the +# "Bundesgesetz uber die Erstellung von elektrischen Telegraphen") passed on +# 1851-11-23, and an official implementation notice was published 1853-07-16 +# (Bundesblatt 1853, Bd. II, S. 859). On p 72 Messerli writes that in +# practice since July 1853 Bernese time was used in "all postal and telegraph +# offices in Switzerland from Geneva to St. Gallen and Basel to Chiasso" +# (Google translation). For now, model this transition as occurring on +# 1853-07-16, though it probably occurred at some other date in Zurich, and +# legal civil time probably changed at still some other transition date. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12 - 0:29:44 - BMT 1894 Jun # Bern Mean Time +Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment. + 0:29:46 - BMT 1894 Jun # Bern Mean Time 1:00 Swiss CE%sT 1981 1:00 EU CE%sT @@ -2884,7 +2931,7 @@ Zone Europe/Simferopol 2:16:24 - LMT 188 # From Paul Eggert (2006-03-22): # The _Economist_ (1994-05-28, p 45) reports that central Crimea switched # from Kiev to Moscow time sometime after the January 1994 elections. -# Shanks (1999) says ``date of change uncertain'', but implies that it happened +# Shanks (1999) says "date of change uncertain", but implies that it happened # sometime between the 1994 DST switches. Shanks & Pottenger simply say # 1994-09-25 03:00, but that can't be right. For now, guess it # changed in May. @@ -2898,6 +2945,9 @@ Zone Europe/Simferopol 2:16:24 - LMT 188 3:00 - MSK 1997 Mar lastSun 1:00u 2:00 EU EE%sT +# Vatican City +# See Europe/Rome. + ############################################################################### # One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from Copied: stable/9/contrib/tzdata/leap-seconds.list (from r257681, head/contrib/tzdata/leap-seconds.list) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/contrib/tzdata/leap-seconds.list Tue Nov 5 06:37:14 2013 (r257682, copy of r257681, head/contrib/tzdata/leap-seconds.list) @@ -0,0 +1,231 @@ +# +# In the following text, the symbol '#' introduces +# a comment, which continues from that symbol until +# the end of the line. A plain comment line has a +# whitespace character following the comment indicator. +# There are also special comment lines defined below. +# A special comment will always have a non-whitespace +# character in column 2. +# +# A blank line should be ignored. +# +# The following table shows the corrections that must +# be applied to compute International Atomic Time (TAI) +# from the Coordinated Universal Time (UTC) values that +# are transmitted by almost all time services. +# +# The first column shows an epoch as a number of seconds +# since 1900.0 and the second column shows the number of +# seconds that must be added to UTC to compute TAI for +# any timestamp at or after that epoch. The value on +# each line is valid from the indicated initial instant +# until the epoch given on the next one or indefinitely +# into the future if there is no next line. +# (The comment on each line shows the representation of +# the corresponding initial epoch in the usual +# day-month-year format. The epoch always begins at +# 00:00:00 UTC on the indicated day. See Note 5 below.) +# +# Important notes: +# +# 1. Coordinated Universal Time (UTC) is often referred to +# as Greenwich Mean Time (GMT). The GMT time scale is no +# longer used, and the use of GMT to designate UTC is +# discouraged. +# +# 2. The UTC time scale is realized by many national +# laboratories and timing centers. Each laboratory +# identifies its realization with its name: Thus +# UTC(NIST), UTC(USNO), etc. The differences among +# these different realizations are typically on the +# order of a few nanoseconds (i.e., 0.000 000 00x s) +# and can be ignored for many purposes. These differences +# are tabulated in Circular T, which is published monthly +# by the International Bureau of Weights and Measures +# (BIPM). See www.bipm.fr for more information. +# +# 3. The current defintion of the relationship between UTC +# and TAI dates from 1 January 1972. A number of different +# time scales were in use before than epoch, and it can be +# quite difficult to compute precise timestamps and time +# intervals in those "prehistoric" days. For more information, +# consult: +# +# The Explanatory Supplement to the Astronomical +# Ephemeris. +# or +# Terry Quinn, "The BIPM and the Accurate Measurement +# of Time," Proc. of the IEEE, Vol. 79, pp. 894-905, +# July, 1991. +# +# 4. The insertion of leap seconds into UTC is currently the +# responsibility of the International Earth Rotation Service, +# which is located at the Paris Observatory: +# +# Central Bureau of IERS +# 61, Avenue de l'Observatoire +# 75014 Paris, France. +# +# Leap seconds are announced by the IERS in its Bulletin C +# +# See hpiers.obspm.fr or www.iers.org for more details. +# +# All national laboratories and timing centers use the +# data from the BIPM and the IERS to construct their +# local realizations of UTC. +# +# Although the definition also includes the possibility +# of dropping seconds ("negative" leap seconds), this has +# never been done and is unlikely to be necessary in the +# foreseeable future. +# +# 5. If your system keeps time as the number of seconds since +# some epoch (e.g., NTP timestamps), then the algorithm for +# assigning a UTC time stamp to an event that happens during a positive +# leap second is not well defined. The official name of that leap +# second is 23:59:60, but there is no way of representing that time +# in these systems. +# Many systems of this type effectively stop the system clock for +# one second during the leap second and use a time that is equivalent +# to 23:59:59 UTC twice. For these systems, the corresponding TAI +# timestamp would be obtained by advancing to the next entry in the +# following table when the time equivalent to 23:59:59 UTC +# is used for the second time. Thus the leap second which +# occurred on 30 June 1972 at 23:59:59 UTC would have TAI +# timestamps computed as follows: +# +# ... +# 30 June 1972 23:59:59 (2287785599, first time): TAI= UTC + 10 seconds +# 30 June 1972 23:59:60 (2287785599,second time): TAI= UTC + 11 seconds +# 1 July 1972 00:00:00 (2287785600) TAI= UTC + 11 seconds +# ... +# +# If your system realizes the leap second by repeating 00:00:00 UTC twice +# (this is possible but not usual), then the advance to the next entry +# in the table must occur the second time that a time equivlent to +# 00:00:00 UTC is used. Thus, using the same example as above: +# +# ... +# 30 June 1972 23:59:59 (2287785599): TAI= UTC + 10 seconds +# 30 June 1972 23:59:60 (2287785600, first time): TAI= UTC + 10 seconds +# 1 July 1972 00:00:00 (2287785600,second time): TAI= UTC + 11 seconds +# ... +# +# in both cases the use of timestamps based on TAI produces a smooth +# time scale with no discontinuity in the time interval. +# +# This complexity would not be needed for negative leap seconds (if they +# are ever used). The UTC time would skip 23:59:59 and advance from +# 23:59:58 to 00:00:00 in that case. The TAI offset would decrease by +# 1 second at the same instant. This is a much easier situation to deal +# with, since the difficulty of unambiguously representing the epoch +# during the leap second does not arise. +# +# Questions or comments to: +# Judah Levine +# Time and Frequency Division +# NIST +# Boulder, Colorado +# jlevine@boulder.nist.gov +# +# Last Update of leap second values: 11 January 2012 +# +# The following line shows this last update date in NTP timestamp *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 5 06:48:58 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id D8E78774; Tue, 5 Nov 2013 06:48:58 +0000 (UTC) (envelope-from yongari@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C68602F92; Tue, 5 Nov 2013 06:48:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA56mwJC040102; Tue, 5 Nov 2013 06:48:58 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA56mwKW040101; Tue, 5 Nov 2013 06:48:58 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201311050648.rA56mwKW040101@svn.freebsd.org> From: Pyun YongHyeon Date: Tue, 5 Nov 2013 06:48:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257688 - stable/9/sys/dev/msk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 06:48:58 -0000 Author: yongari Date: Tue Nov 5 06:48:58 2013 New Revision: 257688 URL: http://svnweb.freebsd.org/changeset/base/257688 Log: MFC r257490: Perform media change after setting IFF_DRV_RUNNING flag. Without it, driver would ignore the first link state update if controller already established a link. Modified: stable/9/sys/dev/msk/if_msk.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/msk/if_msk.c ============================================================================== --- stable/9/sys/dev/msk/if_msk.c Tue Nov 5 06:48:12 2013 (r257687) +++ stable/9/sys/dev/msk/if_msk.c Tue Nov 5 06:48:58 2013 (r257688) @@ -4068,12 +4068,12 @@ msk_init_locked(struct msk_if_softc *sc_ CSR_WRITE_4(sc, B0_IMSK, sc->msk_intrmask); CSR_READ_4(sc, B0_IMSK); - sc_if->msk_flags &= ~MSK_FLAG_LINK; - mii_mediachg(mii); - ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + sc_if->msk_flags &= ~MSK_FLAG_LINK; + mii_mediachg(mii); + callout_reset(&sc_if->msk_tick_ch, hz, msk_tick, sc_if); } From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 5 15:56:16 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 3E85D6CB; Tue, 5 Nov 2013 15:56:16 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2B99C21A2; Tue, 5 Nov 2013 15:56:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5FuGYo029685; Tue, 5 Nov 2013 15:56:16 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5FuGgZ029684; Tue, 5 Nov 2013 15:56:16 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201311051556.rA5FuGgZ029684@svn.freebsd.org> From: Jim Harris Date: Tue, 5 Nov 2013 15:56:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257708 - stable/9/sbin/nvmecontrol X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 15:56:16 -0000 Author: jimharris Date: Tue Nov 5 15:56:15 2013 New Revision: 257708 URL: http://svnweb.freebsd.org/changeset/base/257708 Log: MFC r257531: Do not exit with error status after printing data for perftest. Sponsored by: Intel Modified: stable/9/sbin/nvmecontrol/perftest.c Directory Properties: stable/9/sbin/nvmecontrol/ (props changed) Modified: stable/9/sbin/nvmecontrol/perftest.c ============================================================================== --- stable/9/sbin/nvmecontrol/perftest.c Tue Nov 5 15:54:52 2013 (r257707) +++ stable/9/sbin/nvmecontrol/perftest.c Tue Nov 5 15:56:15 2013 (r257708) @@ -64,8 +64,6 @@ print_perftest(struct nvme_io_test *io_t for (i = 0; i < io_test->num_threads; i++) printf("\t%3d: %8ju IO/s\n", i, (uintmax_t)io_test->io_completed[i]/io_test->time); - - exit(1); } static void From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 5 15:57:25 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 4986C812; Tue, 5 Nov 2013 15:57:25 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1C15C21B0; Tue, 5 Nov 2013 15:57:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5FvOk4029892; Tue, 5 Nov 2013 15:57:24 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5FvOAQ029890; Tue, 5 Nov 2013 15:57:24 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201311051557.rA5FvOAQ029890@svn.freebsd.org> From: Jim Harris Date: Tue, 5 Nov 2013 15:57:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257709 - stable/9/sys/dev/nvme X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 15:57:25 -0000 Author: jimharris Date: Tue Nov 5 15:57:24 2013 New Revision: 257709 URL: http://svnweb.freebsd.org/changeset/base/257709 Log: MFC r257534: Create a unique unit number for each controller and namespace cdev. Sponsored by: Intel Modified: stable/9/sys/dev/nvme/nvme_ctrlr.c stable/9/sys/dev/nvme/nvme_ns.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/nvme/nvme_ctrlr.c ============================================================================== --- stable/9/sys/dev/nvme/nvme_ctrlr.c Tue Nov 5 15:56:15 2013 (r257708) +++ stable/9/sys/dev/nvme/nvme_ctrlr.c Tue Nov 5 15:57:24 2013 (r257709) @@ -1150,8 +1150,8 @@ intx: if (status != 0) return (status); - ctrlr->cdev = make_dev(&nvme_ctrlr_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "nvme%d", device_get_unit(dev)); + ctrlr->cdev = make_dev(&nvme_ctrlr_cdevsw, device_get_unit(dev), + UID_ROOT, GID_WHEEL, 0600, "nvme%d", device_get_unit(dev)); if (ctrlr->cdev == NULL) return (ENXIO); Modified: stable/9/sys/dev/nvme/nvme_ns.c ============================================================================== --- stable/9/sys/dev/nvme/nvme_ns.c Tue Nov 5 15:56:15 2013 (r257708) +++ stable/9/sys/dev/nvme/nvme_ns.c Tue Nov 5 15:57:24 2013 (r257709) @@ -491,6 +491,7 @@ nvme_ns_construct(struct nvme_namespace struct nvme_controller *ctrlr) { struct nvme_completion_poll_status status; + int unit; ns->ctrlr = ctrlr; ns->id = id; @@ -552,6 +553,12 @@ nvme_ns_construct(struct nvme_namespace if (ns->cdev != NULL) return (0); + /* + * Namespace IDs start at 1, so we need to subtract 1 to create a + * correct unit number. + */ + unit = device_get_unit(ctrlr->dev) * NVME_MAX_NAMESPACES + ns->id - 1; + /* * MAKEDEV_ETERNAL was added in r210923, for cdevs that will never * be destroyed. This avoids refcounting on the cdev object. @@ -559,11 +566,11 @@ nvme_ns_construct(struct nvme_namespace * surprise removal nor namespace deletion. */ #ifdef MAKEDEV_ETERNAL_KLD - ns->cdev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &nvme_ns_cdevsw, 0, + ns->cdev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &nvme_ns_cdevsw, unit, NULL, UID_ROOT, GID_WHEEL, 0600, "nvme%dns%d", device_get_unit(ctrlr->dev), ns->id); #else - ns->cdev = make_dev_credf(0, &nvme_ns_cdevsw, 0, + ns->cdev = make_dev_credf(0, &nvme_ns_cdevsw, unit, NULL, UID_ROOT, GID_WHEEL, 0600, "nvme%dns%d", device_get_unit(ctrlr->dev), ns->id); #endif From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 5 19:54:14 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 4577388B; Tue, 5 Nov 2013 19:54:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 19B7C2232; Tue, 5 Nov 2013 19:54:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5JsDZX015892; Tue, 5 Nov 2013 19:54:13 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5JsDQ5015891; Tue, 5 Nov 2013 19:54:13 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201311051954.rA5JsDQ5015891@svn.freebsd.org> From: John Baldwin Date: Tue, 5 Nov 2013 19:54:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257716 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 19:54:14 -0000 Author: jhb Date: Tue Nov 5 19:54:13 2013 New Revision: 257716 URL: http://svnweb.freebsd.org/changeset/base/257716 Log: MFC 253656: Enhance the description of NOTE_TRACK: - NOTE_TRACK has never triggered a NOTE_TRACK event from the parent pid. If NOTE_FORK is set, the listener will get a NOTE_FORK event from the parent pid, but not a separate NOTE_TRACK event. - Explicitly note that the event added to monitor the child process preserves the fflags from the original event. - Move the description of NOTE_TRACKERR under NOTE_TRACK as it is not a bit for the user to set (which is what this list pupports to be). Also, explicitly note that if an error occurs, the NOTE_CHILD event will not be generated. Modified: stable/9/lib/libc/sys/kqueue.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/kqueue.2 ============================================================================== --- stable/9/lib/libc/sys/kqueue.2 Tue Nov 5 19:49:53 2013 (r257715) +++ stable/9/lib/libc/sys/kqueue.2 Tue Nov 5 19:54:13 2013 (r257716) @@ -388,20 +388,25 @@ The process has called .It NOTE_EXEC The process has executed a new process via .Xr execve 2 -or similar call. +or a similar call. .It NOTE_TRACK Follow a process across .Fn fork calls. -The parent process will return with NOTE_TRACK set in the +The parent process registers a new kevent to monitor the child process +using the same .Va fflags -field, while the child process will return with NOTE_CHILD set in +as the original event. +The child process will signal an event with NOTE_CHILD set in .Va fflags and the parent PID in .Va data . -.It NOTE_TRACKERR -This flag is returned if the system was unable to attach an event to -the child process, usually due to resource limitations. +.Pp +If the parent process fails to register a new kevent +.Pq usually due to resource limitations , +it will signal an event with NOTE_TRACKERR set in +.Va fflags , +and the child process will not signal a NOTE_CHILD event. .El .Pp On return, From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 5 20:00:18 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 3B10BE71; Tue, 5 Nov 2013 20:00:18 +0000 (UTC) (envelope-from delphij@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0DE5E22A5; Tue, 5 Nov 2013 20:00:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5K0Hre017157; Tue, 5 Nov 2013 20:00:17 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5K0HGW017156; Tue, 5 Nov 2013 20:00:17 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201311052000.rA5K0HGW017156@svn.freebsd.org> From: Xin LI Date: Tue, 5 Nov 2013 20:00:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257719 - in stable: 8/sys/geom/eli 9/sys/geom/eli X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 20:00:18 -0000 Author: delphij Date: Tue Nov 5 20:00:17 2013 New Revision: 257719 URL: http://svnweb.freebsd.org/changeset/base/257719 Log: MFC r257539: When zero'ing out a buffer, make sure we are using right size. Without this change, in the worst but unlikely case scenario, certain administrative operations, including change of configuration, set or delete key from a GEOM ELI provider, may leave potentially sensitive information in buffer allocated from kernel memory. We believe that it is not possible to actively exploit these issues, nor does it impact the security of normal usage of GEOM ELI providers when these operations are not performed after system boot. Security: possible sensitive information disclosure Submitted by: Clement Lecigne Modified: stable/9/sys/geom/eli/g_eli_ctl.c Directory Properties: stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/8/sys/geom/eli/g_eli_ctl.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/geom/ (props changed) Modified: stable/9/sys/geom/eli/g_eli_ctl.c ============================================================================== --- stable/9/sys/geom/eli/g_eli_ctl.c Tue Nov 5 19:58:40 2013 (r257718) +++ stable/9/sys/geom/eli/g_eli_ctl.c Tue Nov 5 20:00:17 2013 (r257719) @@ -471,7 +471,7 @@ g_eli_ctl_configure(struct gctl_req *req prov, error); } bzero(&md, sizeof(md)); - bzero(sector, sizeof(sector)); + bzero(sector, pp->sectorsize); free(sector, M_ELI); } } @@ -562,7 +562,7 @@ g_eli_ctl_setkey(struct gctl_req *req, s /* Encrypt Master Key with the new key. */ error = g_eli_mkey_encrypt(md.md_ealgo, key, md.md_keylen, mkeydst); - bzero(key, sizeof(key)); + bzero(key, keysize); if (error != 0) { bzero(&md, sizeof(md)); gctl_error(req, "Cannot encrypt Master Key (error=%d).", error); @@ -575,7 +575,7 @@ g_eli_ctl_setkey(struct gctl_req *req, s bzero(&md, sizeof(md)); error = g_write_data(cp, pp->mediasize - pp->sectorsize, sector, pp->sectorsize); - bzero(sector, sizeof(sector)); + bzero(sector, pp->sectorsize); free(sector, M_ELI); if (error != 0) { gctl_error(req, "Cannot store metadata on %s (error=%d).", @@ -691,7 +691,7 @@ g_eli_ctl_delkey(struct gctl_req *req, s (void)g_io_flush(cp); } bzero(&md, sizeof(md)); - bzero(sector, sizeof(sector)); + bzero(sector, pp->sectorsize); free(sector, M_ELI); if (*all) G_ELI_DEBUG(1, "All keys removed from %s.", pp->name); From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 5 22:33:46 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 4AF2DFCA; Tue, 5 Nov 2013 22:33:46 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 37AE52C6D; Tue, 5 Nov 2013 22:33:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5MXktC071446; Tue, 5 Nov 2013 22:33:46 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5MXkPD071445; Tue, 5 Nov 2013 22:33:46 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201311052233.rA5MXkPD071445@svn.freebsd.org> From: Sergey Kandaurov Date: Tue, 5 Nov 2013 22:33:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257721 - stable/9/sys/dev/nvme X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 22:33:46 -0000 Author: pluknet Date: Tue Nov 5 22:33:45 2013 New Revision: 257721 URL: http://svnweb.freebsd.org/changeset/base/257721 Log: MFC r256169 (by jimharris): Fix the LINT build. Modified: stable/9/sys/dev/nvme/nvme_ns.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/nvme/nvme_ns.c ============================================================================== --- stable/9/sys/dev/nvme/nvme_ns.c Tue Nov 5 21:47:00 2013 (r257720) +++ stable/9/sys/dev/nvme/nvme_ns.c Tue Nov 5 22:33:45 2013 (r257721) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include From owner-svn-src-stable-9@FreeBSD.ORG Wed Nov 6 19:33:26 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 97CF4920; Wed, 6 Nov 2013 19:33:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6AF7927BA; Wed, 6 Nov 2013 19:33:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6JXQWU014144; Wed, 6 Nov 2013 19:33:26 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6JXQxI014142; Wed, 6 Nov 2013 19:33:26 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201311061933.rA6JXQxI014142@svn.freebsd.org> From: John Baldwin Date: Wed, 6 Nov 2013 19:33:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257759 - in stable/9/sys: kern sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 19:33:26 -0000 Author: jhb Date: Wed Nov 6 19:33:25 2013 New Revision: 257759 URL: http://svnweb.freebsd.org/changeset/base/257759 Log: MFC 254072: Don't emit a spurious EVFILT_PROC event with no fflags set on process exit if NOTE_EXIT is not being monitored. The rationale is that a listener should only get an event for exit() if they registered interest via NOTE_EXIT. This matches the behavior on OS X. - Don't save the exit status on process exit unless NOTE_EXIT is being monitored. - Add an internal EV_DROP flag that requests kqueue_scan() to free the knote without signalling it to userland and use this when a process exits but the fflags in the knote is zero. Modified: stable/9/sys/kern/kern_event.c stable/9/sys/sys/event.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/sys/kern/kern_event.c ============================================================================== --- stable/9/sys/kern/kern_event.c Wed Nov 6 19:18:39 2013 (r257758) +++ stable/9/sys/kern/kern_event.c Wed Nov 6 19:33:25 2013 (r257759) @@ -429,8 +429,11 @@ filt_proc(struct knote *kn, long hint) if (!(kn->kn_status & KN_DETACHED)) knlist_remove_inevent(&p->p_klist, kn); kn->kn_flags |= (EV_EOF | EV_ONESHOT); - kn->kn_data = p->p_xstat; kn->kn_ptr.p_proc = NULL; + if (kn->kn_fflags & NOTE_EXIT) + kn->kn_data = p->p_xstat; + if (kn->kn_fflags == 0) + kn->kn_flags |= EV_DROP; return (1); } @@ -1436,7 +1439,21 @@ start: KASSERT((kn->kn_status & KN_INFLUX) == 0, ("KN_INFLUX set when not suppose to be")); - if ((kn->kn_flags & EV_ONESHOT) == EV_ONESHOT) { + if ((kn->kn_flags & EV_DROP) == EV_DROP) { + kn->kn_status &= ~KN_QUEUED; + kn->kn_status |= KN_INFLUX; + kq->kq_count--; + KQ_UNLOCK(kq); + /* + * We don't need to lock the list since we've marked + * it _INFLUX. + */ + if (!(kn->kn_status & KN_DETACHED)) + kn->kn_fop->f_detach(kn); + knote_drop(kn, td); + KQ_LOCK(kq); + continue; + } else if ((kn->kn_flags & EV_ONESHOT) == EV_ONESHOT) { kn->kn_status &= ~KN_QUEUED; kn->kn_status |= KN_INFLUX; kq->kq_count--; Modified: stable/9/sys/sys/event.h ============================================================================== --- stable/9/sys/sys/event.h Wed Nov 6 19:18:39 2013 (r257758) +++ stable/9/sys/sys/event.h Wed Nov 6 19:33:25 2013 (r257759) @@ -76,6 +76,7 @@ struct kevent { #define EV_DISPATCH 0x0080 /* disable event after reporting */ #define EV_SYSFLAGS 0xF000 /* reserved by system */ +#define EV_DROP 0x1000 /* note should be dropped */ #define EV_FLAG1 0x2000 /* filter-specific flag */ /* returned values */ From owner-svn-src-stable-9@FreeBSD.ORG Wed Nov 6 19:47:23 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id C278067D; Wed, 6 Nov 2013 19:47:23 +0000 (UTC) (envelope-from glebius@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AFB2528D3; Wed, 6 Nov 2013 19:47:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6JlN3U018105; Wed, 6 Nov 2013 19:47:23 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6JlNNL018104; Wed, 6 Nov 2013 19:47:23 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311061947.rA6JlNNL018104@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 6 Nov 2013 19:47:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257762 - stable/9/sbin/ifconfig X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 19:47:23 -0000 Author: glebius Date: Wed Nov 6 19:47:23 2013 New Revision: 257762 URL: http://svnweb.freebsd.org/changeset/base/257762 Log: Merge r227738, r228574: Fill in sin_family in ioctl() arguments. Modified: stable/9/sbin/ifconfig/af_inet.c Directory Properties: stable/9/sbin/ifconfig/ (props changed) Modified: stable/9/sbin/ifconfig/af_inet.c ============================================================================== --- stable/9/sbin/ifconfig/af_inet.c Wed Nov 6 19:46:20 2013 (r257761) +++ stable/9/sbin/ifconfig/af_inet.c Wed Nov 6 19:47:23 2013 (r257762) @@ -104,8 +104,7 @@ in_getaddr(const char *s, int which) struct netent *np; sin->sin_len = sizeof(*sin); - if (which != MASK) - sin->sin_family = AF_INET; + sin->sin_family = AF_INET; if (which == ADDR) { char *p = NULL; @@ -124,6 +123,7 @@ in_getaddr(const char *s, int which) *p = '/'; errx(1, "%s: bad value (width %s)", s, errstr); } + min->sin_family = AF_INET; min->sin_len = sizeof(*min); min->sin_addr.s_addr = htonl(~((1LL << (32 - masklen)) - 1) & 0xffffffff); From owner-svn-src-stable-9@FreeBSD.ORG Wed Nov 6 20:58:04 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id E3400334; Wed, 6 Nov 2013 20:58:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D08092DDC; Wed, 6 Nov 2013 20:58:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6Kw4Eu041691; Wed, 6 Nov 2013 20:58:04 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6Kw4pr041690; Wed, 6 Nov 2013 20:58:04 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201311062058.rA6Kw4pr041690@svn.freebsd.org> From: John Baldwin Date: Wed, 6 Nov 2013 20:58:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257763 - stable/9/sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 20:58:05 -0000 Author: jhb Date: Wed Nov 6 20:58:04 2013 New Revision: 257763 URL: http://svnweb.freebsd.org/changeset/base/257763 Log: MFC 254287: Some small cleanups to the fixes in r180340: - Set NOTE_TRACKERR before running filt_proc(). If the knote did not have NOTE_FORK set in fflags when registered, then the TRACKERR event could miss being posted. - Don't pass the pid in to filt_proc() for NOTE_FORK events. The special handling for pids is done knote_fork() directly and no longer in filt_proc(). Modified: stable/9/sys/kern/kern_event.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kern/kern_event.c ============================================================================== --- stable/9/sys/kern/kern_event.c Wed Nov 6 19:47:23 2013 (r257762) +++ stable/9/sys/kern/kern_event.c Wed Nov 6 20:58:04 2013 (r257763) @@ -475,7 +475,7 @@ knote_fork(struct knlist *list, int pid) */ if ((kn->kn_sfflags & NOTE_TRACK) == 0) { kn->kn_status |= KN_HASKQLOCK; - if (kn->kn_fop->f_event(kn, NOTE_FORK | pid)) + if (kn->kn_fop->f_event(kn, NOTE_FORK)) KNOTE_ACTIVATE(kn, 1); kn->kn_status &= ~KN_HASKQLOCK; KQ_UNLOCK(kq); @@ -503,10 +503,10 @@ knote_fork(struct knlist *list, int pid) kev.data = kn->kn_id; /* parent */ kev.udata = kn->kn_kevent.udata;/* preserve udata */ error = kqueue_register(kq, &kev, NULL, 0); - if (kn->kn_fop->f_event(kn, NOTE_FORK | pid)) - KNOTE_ACTIVATE(kn, 0); if (error) kn->kn_fflags |= NOTE_TRACKERR; + if (kn->kn_fop->f_event(kn, NOTE_FORK)) + KNOTE_ACTIVATE(kn, 0); KQ_LOCK(kq); kn->kn_status &= ~KN_INFLUX; KQ_UNLOCK_FLUX(kq); From owner-svn-src-stable-9@FreeBSD.ORG Wed Nov 6 22:35:23 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id B2996424; Wed, 6 Nov 2013 22:35:23 +0000 (UTC) (envelope-from luigi@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E56D246E; Wed, 6 Nov 2013 22:35:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6MZNQe075218; Wed, 6 Nov 2013 22:35:23 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6MZNF8075217; Wed, 6 Nov 2013 22:35:23 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201311062235.rA6MZNF8075217@svn.freebsd.org> From: Luigi Rizzo Date: Wed, 6 Nov 2013 22:35:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257766 - stable/9/release/picobsd/build X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 22:35:23 -0000 Author: luigi Date: Wed Nov 6 22:35:23 2013 New Revision: 257766 URL: http://svnweb.freebsd.org/changeset/base/257766 Log: Merge from head (better handling of non-clang building of picobsd) Modified: stable/9/release/picobsd/build/picobsd Modified: stable/9/release/picobsd/build/picobsd ============================================================================== --- stable/9/release/picobsd/build/picobsd Wed Nov 6 21:42:58 2013 (r257765) +++ stable/9/release/picobsd/build/picobsd Wed Nov 6 22:35:23 2013 (r257766) @@ -7,6 +7,8 @@ # # picobsd [options] image_type [site_name] # +# CWARNFLAGS can be used to pass -Wall or similar options +# # Where image_type is a directory with the picobsd config info, # and ${image_type}/floppy.tree.${site_name} contains # optional site-specific configuration. @@ -164,7 +166,7 @@ create_includes_and_libraries2() { # opt log "create_includes_and_libraries2() for ${SRC} $1" if [ ${OSVERSION} -ge 600000 ] ; then no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITHOUT_CDDL=1" - no="$no -DWITHOUT_CLANG" + no="$no -DMALLOC_PRODUCTION" else no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R" fi @@ -435,7 +437,7 @@ do_kernel() { # OK [ "${o_do_modules}" = "yes" ] && export MODULES="" # kernel build not parallelizable yet ${BINMAKE} KERNCONF=${l_kernconf} \ - -v -f ${PICO_TREE}/build/Makefile.conf ) || \ + -f ${PICO_TREE}/build/Makefile.conf ) || \ fail $? missing_kernel } @@ -675,7 +677,7 @@ populate_mfs_tree() { a=${BUILDDIR}/crunch1.conf ( export BUILDDIR SRC MY_TREE PICO_OBJ ; ${BINMAKE} \ - -v -f ${PICO_TREE}/build/Makefile.conf ${BUILDDIR}/crunch.mk ) + -f ${PICO_TREE}/build/Makefile.conf ${BUILDDIR}/crunch.mk ) log "Libs are ${LIBS} " export SRC # used by crunch.mk # export LIBS CFLAGS @@ -691,17 +693,22 @@ populate_mfs_tree() { # rm $a # do not remove! ) || fail $? crunch - if [ -f ${dst}/stand/sshd ] ; then - log "Setting up host key for sshd:" - if [ -f ${BUILDDIR}/floppy.tree/etc/ssh_host_key.gz ] ; then - log "Using existing host key" + log "Setting up host key for sshd:" + for K in rsa1 rsa dsa ; do + if [ $K = rsa1 ] ; then + i=ssh_host_key else - log "Generating new host key" - ssh-keygen -t rsa1 -f ${BUILDDIR}/floppy.tree/etc/ssh_host_key \ - -N "" -C "root@picobsd" - gzip -9 ${BUILDDIR}/floppy.tree/etc/ssh_host_key* || true + i=ssh_host_${K}_key fi - fi + if [ -f ${BUILDDIR}/floppy.tree/etc/$i.gz ] ; then + log "Using existing host key $i" + else + log "Generating new host key $i" + ssh-keygen -t $K -f ${BUILDDIR}/floppy.tree/etc/$i \ + -N "" -C "root@picobsd" + gzip -9 ${BUILDDIR}/floppy.tree/etc/${i}* || true + fi + done log "Copy generic and site-specific MFS tree..." for MFS_TREE in ${PICO_TREE}/mfs_tree ${MY_TREE}/mfs_tree ; do @@ -877,10 +884,12 @@ fill_floppy_image() { log "Compress with kgzip and copy to floppy image" mkdir -p ${dst}/boot/kernel - # XXX update loader.conf - echo "hint.acpi.0.disabled=\"1\"" > ${dst}/boot/loader.conf - echo "console=\"comconsole\"" >> ${dst}/boot/loader.conf - cp -p /boot/loader ${dst}/boot/loader || fail $? no_space "copying bootloader" + # XXX loader.conf does not work unless we also load the .4th files + # echo "hint.acpi.0.disabled=\"1\"" > ${dst}/boot/loader.conf + # echo "console=\"comconsole\"" >> ${dst}/boot/loader.conf + local blf="loader* *.4th" # loader.rc loader.4th support.4th" + (cd /boot; cp -p loader ${dst}/boot) || fail $? no_space "copying bootloader" + cp ${MY_TREE}/floppy.tree/boot/loader.conf ${dst}/boot || true gzip -c kernel > ${dst}/boot/kernel/kernel.gz || fail $? no_space "copying kernel" # now transfer the floppy tree. If it is already in mfs, dont bother. @@ -965,11 +974,20 @@ set_build_parameters() { if [ ${OSVERSION} -ge 500035 ] ; then export MAKEOBJDIRPREFIX=${l_objtree} export TARGET_ARCH=${o_arch} TARGET=${o_arch} - export WITHOUT_CLANG_IS_CC=1 + # XXX 20131001 see if CLANG fixes the build + export WITHOUT_CLANG_IS_CC=yes + export WITH_GCC=yes + export WITH_GNUCXX=yes + export WITHOUT_CLANG=yes + export WITHOUT_ICONV=yes + # XXX why change machine_arch ? #-- export MACHINE_ARCH=`uname -m` MACHINE=`uname -m` # export CWARNFLAGS="-Wextra -Wno-sign-compare -Wno-missing-field-initializers" + # XXX BINMAKE does not really exist anymore eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\"" + [ "$BINMAKE" = "" ] && \ + eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V SUB_MAKE`\"" fi if [ "${o_init_src}" != "" ] ; then From owner-svn-src-stable-9@FreeBSD.ORG Wed Nov 6 22:36:39 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 363006B8; Wed, 6 Nov 2013 22:36:39 +0000 (UTC) (envelope-from luigi@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 20B4A2488; Wed, 6 Nov 2013 22:36:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6MadbV075446; Wed, 6 Nov 2013 22:36:39 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6Maax1075431; Wed, 6 Nov 2013 22:36:36 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201311062236.rA6Maax1075431@svn.freebsd.org> From: Luigi Rizzo Date: Wed, 6 Nov 2013 22:36:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257768 - in stable/9: sys/conf sys/dev/e1000 sys/dev/ixgbe sys/dev/netmap sys/dev/re sys/net tools/tools/netmap X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 22:36:39 -0000 Author: luigi Date: Wed Nov 6 22:36:36 2013 New Revision: 257768 URL: http://svnweb.freebsd.org/changeset/base/257768 Log: Merge from head: sync the netmap code with the one in HEAD Added: stable/9/sys/dev/netmap/netmap_mem2.h (contents, props changed) stable/9/tools/tools/netmap/vale-ctl.c (contents, props changed) Modified: stable/9/sys/conf/files stable/9/sys/dev/e1000/if_em.c stable/9/sys/dev/e1000/if_igb.c stable/9/sys/dev/e1000/if_lem.c stable/9/sys/dev/ixgbe/ixgbe.c stable/9/sys/dev/netmap/if_em_netmap.h stable/9/sys/dev/netmap/if_igb_netmap.h stable/9/sys/dev/netmap/if_lem_netmap.h stable/9/sys/dev/netmap/if_re_netmap.h stable/9/sys/dev/netmap/ixgbe_netmap.h stable/9/sys/dev/netmap/netmap.c stable/9/sys/dev/netmap/netmap_kern.h stable/9/sys/dev/netmap/netmap_mem2.c stable/9/sys/dev/re/if_re.c stable/9/sys/net/netmap.h stable/9/sys/net/netmap_user.h stable/9/tools/tools/netmap/Makefile stable/9/tools/tools/netmap/bridge.c stable/9/tools/tools/netmap/nm_util.c stable/9/tools/tools/netmap/pcap.c stable/9/tools/tools/netmap/pkt-gen.c Modified: stable/9/sys/conf/files ============================================================================== --- stable/9/sys/conf/files Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/conf/files Wed Nov 6 22:36:36 2013 (r257768) @@ -1601,6 +1601,7 @@ dev/my/if_my.c optional my dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard dev/netmap/netmap.c optional netmap +dev/netmap/netmap_mem2.c optional netmap dev/nge/if_nge.c optional nge dev/nxge/if_nxge.c optional nxge \ compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}" Modified: stable/9/sys/dev/e1000/if_em.c ============================================================================== --- stable/9/sys/dev/e1000/if_em.c Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/e1000/if_em.c Wed Nov 6 22:36:36 2013 (r257768) @@ -3835,8 +3835,7 @@ em_txeof(struct tx_ring *txr) EM_TX_LOCK_ASSERT(txr); #ifdef DEV_NETMAP - if (netmap_tx_irq(ifp, txr->me | - (NETMAP_LOCKED_ENTER | NETMAP_LOCKED_EXIT))) + if (netmap_tx_irq(ifp, txr->me)) return; #endif /* DEV_NETMAP */ @@ -4432,8 +4431,10 @@ em_rxeof(struct rx_ring *rxr, int count, EM_RX_LOCK(rxr); #ifdef DEV_NETMAP - if (netmap_rx_irq(ifp, rxr->me | NETMAP_LOCKED_ENTER, &processed)) + if (netmap_rx_irq(ifp, rxr->me, &processed)) { + EM_RX_UNLOCK(rxr); return (FALSE); + } #endif /* DEV_NETMAP */ for (i = rxr->next_to_check, processed = 0; count != 0;) { Modified: stable/9/sys/dev/e1000/if_igb.c ============================================================================== --- stable/9/sys/dev/e1000/if_igb.c Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/e1000/if_igb.c Wed Nov 6 22:36:36 2013 (r257768) @@ -3910,8 +3910,7 @@ igb_txeof(struct tx_ring *txr) IGB_TX_LOCK_ASSERT(txr); #ifdef DEV_NETMAP - if (netmap_tx_irq(ifp, txr->me | - (NETMAP_LOCKED_ENTER|NETMAP_LOCKED_EXIT))) + if (netmap_tx_irq(ifp, txr->me )) return (FALSE); #endif /* DEV_NETMAP */ if (txr->tx_avail == adapter->num_tx_desc) { @@ -4766,8 +4765,10 @@ igb_rxeof(struct igb_queue *que, int cou BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); #ifdef DEV_NETMAP - if (netmap_rx_irq(ifp, rxr->me | NETMAP_LOCKED_ENTER, &processed)) + if (netmap_rx_irq(ifp, rxr->me, &processed)) { + IGB_RX_UNLOCK(rxr); return (FALSE); + } #endif /* DEV_NETMAP */ /* Main clean loop */ Modified: stable/9/sys/dev/e1000/if_lem.c ============================================================================== --- stable/9/sys/dev/e1000/if_lem.c Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/e1000/if_lem.c Wed Nov 6 22:36:36 2013 (r257768) @@ -2985,7 +2985,7 @@ lem_txeof(struct adapter *adapter) EM_TX_LOCK_ASSERT(adapter); #ifdef DEV_NETMAP - if (netmap_tx_irq(ifp, 0 | (NETMAP_LOCKED_ENTER|NETMAP_LOCKED_EXIT))) + if (netmap_tx_irq(ifp, 0)) return; #endif /* DEV_NETMAP */ if (adapter->num_tx_desc_avail == adapter->num_tx_desc) @@ -3454,8 +3454,10 @@ lem_rxeof(struct adapter *adapter, int c BUS_DMASYNC_POSTREAD); #ifdef DEV_NETMAP - if (netmap_rx_irq(ifp, 0 | NETMAP_LOCKED_ENTER, &rx_sent)) + if (netmap_rx_irq(ifp, 0, &rx_sent)) { + EM_RX_UNLOCK(adapter); return (FALSE); + } #endif /* DEV_NETMAP */ if (!((current_desc->status) & E1000_RXD_STAT_DD)) { Modified: stable/9/sys/dev/ixgbe/ixgbe.c ============================================================================== --- stable/9/sys/dev/ixgbe/ixgbe.c Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/ixgbe/ixgbe.c Wed Nov 6 22:36:36 2013 (r257768) @@ -3620,16 +3620,11 @@ ixgbe_txeof(struct tx_ring *txr) * means the user thread should not be woken up); * - the driver ignores tx interrupts unless netmap_mitigate=0 * or the slot has the DD bit set. - * - * When the driver has separate locks, we need to - * release and re-acquire txlock to avoid deadlocks. - * XXX see if we can find a better way. */ if (!netmap_mitigate || (kring->nr_kflags < kring->nkr_num_slots && txd[kring->nr_kflags].wb.status & IXGBE_TXD_STAT_DD)) { - netmap_tx_irq(ifp, txr->me | - (NETMAP_LOCKED_ENTER|NETMAP_LOCKED_EXIT)); + netmap_tx_irq(ifp, txr->me); } return; } @@ -4421,8 +4416,10 @@ ixgbe_rxeof(struct ix_queue *que) #ifdef DEV_NETMAP /* Same as the txeof routine: wakeup clients on intr. */ - if (netmap_rx_irq(ifp, rxr->me | NETMAP_LOCKED_ENTER, &processed)) + if (netmap_rx_irq(ifp, rxr->me, &processed)) { + IXGBE_RX_UNLOCK(rxr); return (FALSE); + } #endif /* DEV_NETMAP */ for (i = rxr->next_to_check; count != 0;) { Modified: stable/9/sys/dev/netmap/if_em_netmap.h ============================================================================== --- stable/9/sys/dev/netmap/if_em_netmap.h Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/netmap/if_em_netmap.h Wed Nov 6 22:36:36 2013 (r257768) @@ -43,35 +43,6 @@ static void em_netmap_block_tasks(struct static void em_netmap_unblock_tasks(struct adapter *); -static void -em_netmap_lock_wrapper(struct ifnet *ifp, int what, u_int queueid) -{ - struct adapter *adapter = ifp->if_softc; - - ASSERT(queueid < adapter->num_queues); - switch (what) { - case NETMAP_CORE_LOCK: - EM_CORE_LOCK(adapter); - break; - case NETMAP_CORE_UNLOCK: - EM_CORE_UNLOCK(adapter); - break; - case NETMAP_TX_LOCK: - EM_TX_LOCK(&adapter->tx_rings[queueid]); - break; - case NETMAP_TX_UNLOCK: - EM_TX_UNLOCK(&adapter->tx_rings[queueid]); - break; - case NETMAP_RX_LOCK: - EM_RX_LOCK(&adapter->rx_rings[queueid]); - break; - case NETMAP_RX_UNLOCK: - EM_RX_UNLOCK(&adapter->rx_rings[queueid]); - break; - } -} - - // XXX do we need to block/unblock the tasks ? static void em_netmap_block_tasks(struct adapter *adapter) @@ -137,7 +108,7 @@ em_netmap_reg(struct ifnet *ifp, int ono ifp->if_capenable |= IFCAP_NETMAP; na->if_transmit = ifp->if_transmit; - ifp->if_transmit = netmap_start; + ifp->if_transmit = netmap_transmit; em_init_locked(adapter); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) == 0) { @@ -160,7 +131,7 @@ fail: * Reconcile kernel and user view of the transmit ring. */ static int -em_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +em_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct adapter *adapter = ifp->if_softc; struct tx_ring *txr = &adapter->tx_rings[ring_nr]; @@ -176,8 +147,6 @@ em_netmap_txsync(struct ifnet *ifp, u_in if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - EM_TX_LOCK(txr); bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map, BUS_DMASYNC_POSTREAD); @@ -202,8 +171,6 @@ em_netmap_txsync(struct ifnet *ifp, u_in u_int len = slot->len; if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) { - if (do_lock) - EM_TX_UNLOCK(txr); return netmap_ring_reinit(kring); } @@ -252,8 +219,6 @@ em_netmap_txsync(struct ifnet *ifp, u_in /* update avail to what the kernel knows */ ring->avail = kring->nr_hwavail; - if (do_lock) - EM_TX_UNLOCK(txr); return 0; } @@ -262,7 +227,7 @@ em_netmap_txsync(struct ifnet *ifp, u_in * Reconcile kernel and user view of the receive ring. */ static int -em_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +em_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct adapter *adapter = ifp->if_softc; struct rx_ring *rxr = &adapter->rx_rings[ring_nr]; @@ -270,16 +235,13 @@ em_netmap_rxsync(struct ifnet *ifp, u_in struct netmap_kring *kring = &na->rx_rings[ring_nr]; struct netmap_ring *ring = kring->ring; u_int j, l, n, lim = kring->nkr_num_slots - 1; - int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR; + int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; u_int k = ring->cur, resvd = ring->reserved; k = ring->cur; if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - EM_RX_LOCK(rxr); - /* XXX check sync modes */ bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); @@ -334,8 +296,6 @@ em_netmap_rxsync(struct ifnet *ifp, u_in void *addr = PNMB(slot, &paddr); if (addr == netmap_buffer_base) { /* bad buf */ - if (do_lock) - EM_RX_UNLOCK(rxr); return netmap_ring_reinit(kring); } @@ -364,8 +324,6 @@ em_netmap_rxsync(struct ifnet *ifp, u_in } /* tell userspace that there are new packets */ ring->avail = kring->nr_hwavail - resvd; - if (do_lock) - EM_RX_UNLOCK(rxr); return 0; } @@ -378,12 +336,11 @@ em_netmap_attach(struct adapter *adapter bzero(&na, sizeof(na)); na.ifp = adapter->ifp; - na.separate_locks = 1; + na.na_flags = NAF_BDG_MAYSLEEP; na.num_tx_desc = adapter->num_tx_desc; na.num_rx_desc = adapter->num_rx_desc; na.nm_txsync = em_netmap_txsync; na.nm_rxsync = em_netmap_rxsync; - na.nm_lock = em_netmap_lock_wrapper; na.nm_register = em_netmap_reg; netmap_attach(&na, adapter->num_queues); } Modified: stable/9/sys/dev/netmap/if_igb_netmap.h ============================================================================== --- stable/9/sys/dev/netmap/if_igb_netmap.h Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/netmap/if_igb_netmap.h Wed Nov 6 22:36:36 2013 (r257768) @@ -39,38 +39,6 @@ /* - * wrapper to export locks to the generic code - */ -static void -igb_netmap_lock_wrapper(struct ifnet *ifp, int what, u_int queueid) -{ - struct adapter *adapter = ifp->if_softc; - - ASSERT(queueid < adapter->num_queues); - switch (what) { - case NETMAP_CORE_LOCK: - IGB_CORE_LOCK(adapter); - break; - case NETMAP_CORE_UNLOCK: - IGB_CORE_UNLOCK(adapter); - break; - case NETMAP_TX_LOCK: - IGB_TX_LOCK(&adapter->tx_rings[queueid]); - break; - case NETMAP_TX_UNLOCK: - IGB_TX_UNLOCK(&adapter->tx_rings[queueid]); - break; - case NETMAP_RX_LOCK: - IGB_RX_LOCK(&adapter->rx_rings[queueid]); - break; - case NETMAP_RX_UNLOCK: - IGB_RX_UNLOCK(&adapter->rx_rings[queueid]); - break; - } -} - - -/* * register-unregister routine */ static int @@ -92,7 +60,7 @@ igb_netmap_reg(struct ifnet *ifp, int on ifp->if_capenable |= IFCAP_NETMAP; na->if_transmit = ifp->if_transmit; - ifp->if_transmit = netmap_start; + ifp->if_transmit = netmap_transmit; igb_init_locked(adapter); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) == 0) { @@ -114,7 +82,7 @@ fail: * Reconcile kernel and user view of the transmit ring. */ static int -igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct adapter *adapter = ifp->if_softc; struct tx_ring *txr = &adapter->tx_rings[ring_nr]; @@ -130,8 +98,6 @@ igb_netmap_txsync(struct ifnet *ifp, u_i if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - IGB_TX_LOCK(txr); bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map, BUS_DMASYNC_POSTREAD); @@ -153,7 +119,14 @@ igb_netmap_txsync(struct ifnet *ifp, u_i /* curr is the current slot in the nic ring */ union e1000_adv_tx_desc *curr = (union e1000_adv_tx_desc *)&txr->tx_base[l]; - struct igb_tx_buffer *txbuf = &txr->tx_buffers[l]; +#ifndef IGB_MEDIA_RESET +/* at the same time as IGB_MEDIA_RESET was defined, the + * tx buffer descriptor was renamed, so use this to revert + * back to the old name. + */ +#define igb_tx_buf igb_tx_buffer +#endif + struct igb_tx_buf *txbuf = &txr->tx_buffers[l]; int flags = ((slot->flags & NS_REPORT) || j == 0 || j == report_frequency) ? E1000_ADVTXD_DCMD_RS : 0; @@ -162,8 +135,6 @@ igb_netmap_txsync(struct ifnet *ifp, u_i u_int len = slot->len; if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) { - if (do_lock) - IGB_TX_UNLOCK(txr); return netmap_ring_reinit(kring); } @@ -223,8 +194,6 @@ igb_netmap_txsync(struct ifnet *ifp, u_i /* update avail to what the kernel knows */ ring->avail = kring->nr_hwavail; - if (do_lock) - IGB_TX_UNLOCK(txr); return 0; } @@ -233,7 +202,7 @@ igb_netmap_txsync(struct ifnet *ifp, u_i * Reconcile kernel and user view of the receive ring. */ static int -igb_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +igb_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct adapter *adapter = ifp->if_softc; struct rx_ring *rxr = &adapter->rx_rings[ring_nr]; @@ -241,16 +210,13 @@ igb_netmap_rxsync(struct ifnet *ifp, u_i struct netmap_kring *kring = &na->rx_rings[ring_nr]; struct netmap_ring *ring = kring->ring; u_int j, l, n, lim = kring->nkr_num_slots - 1; - int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR; + int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; u_int k = ring->cur, resvd = ring->reserved; k = ring->cur; if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - IGB_RX_LOCK(rxr); - /* XXX check sync modes */ bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); @@ -303,8 +269,6 @@ igb_netmap_rxsync(struct ifnet *ifp, u_i void *addr = PNMB(slot, &paddr); if (addr == netmap_buffer_base) { /* bad buf */ - if (do_lock) - IGB_RX_UNLOCK(rxr); return netmap_ring_reinit(kring); } @@ -332,8 +296,6 @@ igb_netmap_rxsync(struct ifnet *ifp, u_i } /* tell userspace that there are new packets */ ring->avail = kring->nr_hwavail - resvd; - if (do_lock) - IGB_RX_UNLOCK(rxr); return 0; } @@ -346,12 +308,11 @@ igb_netmap_attach(struct adapter *adapte bzero(&na, sizeof(na)); na.ifp = adapter->ifp; - na.separate_locks = 1; + na.na_flags = NAF_BDG_MAYSLEEP; na.num_tx_desc = adapter->num_tx_desc; na.num_rx_desc = adapter->num_rx_desc; na.nm_txsync = igb_netmap_txsync; na.nm_rxsync = igb_netmap_rxsync; - na.nm_lock = igb_netmap_lock_wrapper; na.nm_register = igb_netmap_reg; netmap_attach(&na, adapter->num_queues); } Modified: stable/9/sys/dev/netmap/if_lem_netmap.h ============================================================================== --- stable/9/sys/dev/netmap/if_lem_netmap.h Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/netmap/if_lem_netmap.h Wed Nov 6 22:36:36 2013 (r257768) @@ -39,35 +39,6 @@ #include -static void -lem_netmap_lock_wrapper(struct ifnet *ifp, int what, u_int ringid) -{ - struct adapter *adapter = ifp->if_softc; - - /* only one ring here so ignore the ringid */ - switch (what) { - case NETMAP_CORE_LOCK: - EM_CORE_LOCK(adapter); - break; - case NETMAP_CORE_UNLOCK: - EM_CORE_UNLOCK(adapter); - break; - case NETMAP_TX_LOCK: - EM_TX_LOCK(adapter); - break; - case NETMAP_TX_UNLOCK: - EM_TX_UNLOCK(adapter); - break; - case NETMAP_RX_LOCK: - EM_RX_LOCK(adapter); - break; - case NETMAP_RX_UNLOCK: - EM_RX_UNLOCK(adapter); - break; - } -} - - /* * Register/unregister */ @@ -81,6 +52,8 @@ lem_netmap_reg(struct ifnet *ifp, int on if (na == NULL) return EINVAL; + EM_CORE_LOCK(adapter); + lem_disable_intr(adapter); /* Tell the stack that the interface is no longer active */ @@ -95,7 +68,7 @@ lem_netmap_reg(struct ifnet *ifp, int on ifp->if_capenable |= IFCAP_NETMAP; na->if_transmit = ifp->if_transmit; - ifp->if_transmit = netmap_start; + ifp->if_transmit = netmap_transmit; lem_init_locked(adapter); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) == 0) { @@ -114,6 +87,8 @@ fail: taskqueue_unblock(adapter->tq); // XXX do we need this ? #endif /* !EM_LEGCY_IRQ */ + EM_CORE_UNLOCK(adapter); + return (error); } @@ -122,7 +97,7 @@ fail: * Reconcile kernel and user view of the transmit ring. */ static int -lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct adapter *adapter = ifp->if_softc; struct netmap_adapter *na = NA(ifp); @@ -133,13 +108,16 @@ lem_netmap_txsync(struct ifnet *ifp, u_i /* generate an interrupt approximately every half ring */ int report_frequency = kring->nkr_num_slots >> 1; + ND("%s: hwofs %d, hwcur %d hwavail %d lease %d cur %d avail %d", + ifp->if_xname, + kring->nkr_hwofs, kring->nr_hwcur, kring->nr_hwavail, + kring->nkr_hwlease, + ring->cur, ring->avail); /* take a copy of ring->cur now, and never read it again */ k = ring->cur; if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - EM_TX_LOCK(adapter); bus_dmamap_sync(adapter->txdma.dma_tag, adapter->txdma.dma_map, BUS_DMASYNC_POSTREAD); /* @@ -147,6 +125,8 @@ lem_netmap_txsync(struct ifnet *ifp, u_i * netmap ring, l is the corresponding index in the NIC ring. */ j = kring->nr_hwcur; + if (netmap_verbose > 255) + RD(5, "device %s send %d->%d", ifp->if_xname, j, k); if (j != k) { /* we have new packets to send */ l = netmap_idx_k2n(kring, j); for (n = 0; j != k; n++) { @@ -163,13 +143,12 @@ lem_netmap_txsync(struct ifnet *ifp, u_i u_int len = slot->len; if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) { - if (do_lock) - EM_TX_UNLOCK(adapter); return netmap_ring_reinit(kring); } + ND("slot %d NIC %d %s", j, l, nm_dump_buf(addr, len, 128, NULL)); slot->flags &= ~NS_REPORT; - if (slot->flags & NS_BUF_CHANGED) { + if (1 || slot->flags & NS_BUF_CHANGED) { /* buffer has changed, reload map */ netmap_reload_map(adapter->txtag, txbuf->map, addr); curr->buffer_addr = htole64(paddr); @@ -180,11 +159,13 @@ lem_netmap_txsync(struct ifnet *ifp, u_i htole32( adapter->txd_cmd | len | (E1000_TXD_CMD_EOP | flags) ); + ND("len %d kring %d nic %d", len, j, l); bus_dmamap_sync(adapter->txtag, txbuf->map, BUS_DMASYNC_PREWRITE); j = (j == lim) ? 0 : j + 1; l = (l == lim) ? 0 : l + 1; } + ND("sent %d packets from %d, TDT now %d", n, kring->nr_hwcur, l); kring->nr_hwcur = k; /* the saved ring->cur */ kring->nr_hwavail -= n; @@ -199,6 +180,7 @@ lem_netmap_txsync(struct ifnet *ifp, u_i /* record completed transmissions using TDH */ l = E1000_READ_REG(&adapter->hw, E1000_TDH(0)); + ND("tdh is now %d", l); if (l >= kring->nkr_num_slots) { /* XXX can it happen ? */ D("bad TDH %d", l); l -= kring->nkr_num_slots; @@ -208,6 +190,9 @@ lem_netmap_txsync(struct ifnet *ifp, u_i /* some tx completed, increment hwavail. */ if (delta < 0) delta += kring->nkr_num_slots; + if (netmap_verbose > 255) + RD(5, "%s tx recover %d bufs", + ifp->if_xname, delta); adapter->next_tx_to_clean = l; kring->nr_hwavail += delta; } @@ -215,8 +200,6 @@ lem_netmap_txsync(struct ifnet *ifp, u_i /* update avail to what the kernel knows */ ring->avail = kring->nr_hwavail; - if (do_lock) - EM_TX_UNLOCK(adapter); return 0; } @@ -225,21 +208,19 @@ lem_netmap_txsync(struct ifnet *ifp, u_i * Reconcile kernel and user view of the receive ring. */ static int -lem_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +lem_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct adapter *adapter = ifp->if_softc; struct netmap_adapter *na = NA(ifp); struct netmap_kring *kring = &na->rx_rings[ring_nr]; struct netmap_ring *ring = kring->ring; int j, l, n, lim = kring->nkr_num_slots - 1; - int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR; + int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; u_int k = ring->cur, resvd = ring->reserved; if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - EM_RX_LOCK(adapter); /* XXX check sync modes */ bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map, @@ -251,6 +232,10 @@ lem_netmap_rxsync(struct ifnet *ifp, u_i */ l = adapter->next_rx_desc_to_check; j = netmap_idx_n2k(kring, l); + ND("%s: next NIC %d kring %d (ofs %d), hwcur %d hwavail %d cur %d avail %d", + ifp->if_xname, + l, j, kring->nkr_hwofs, kring->nr_hwcur, kring->nr_hwavail, + ring->cur, ring->avail); if (netmap_no_pendintr || force_update) { uint16_t slot_flags = kring->nkr_slot_flags; @@ -266,6 +251,8 @@ lem_netmap_rxsync(struct ifnet *ifp, u_i D("bogus pkt size at %d", j); len = 0; } + ND("\n%s", nm_dump_buf(NMB(&ring->slot[j]), + len, 128, NULL)); ring->slot[j].len = len; ring->slot[j].flags = slot_flags; bus_dmamap_sync(adapter->rxtag, @@ -300,8 +287,6 @@ lem_netmap_rxsync(struct ifnet *ifp, u_i void *addr = PNMB(slot, &paddr); if (addr == netmap_buffer_base) { /* bad buf */ - if (do_lock) - EM_RX_UNLOCK(adapter); return netmap_ring_reinit(kring); } @@ -332,8 +317,6 @@ lem_netmap_rxsync(struct ifnet *ifp, u_i } /* tell userspace that there are new packets */ ring->avail = kring->nr_hwavail - resvd; - if (do_lock) - EM_RX_UNLOCK(adapter); return 0; } @@ -346,12 +329,11 @@ lem_netmap_attach(struct adapter *adapte bzero(&na, sizeof(na)); na.ifp = adapter->ifp; - na.separate_locks = 1; + na.na_flags = NAF_BDG_MAYSLEEP; na.num_tx_desc = adapter->num_tx_desc; na.num_rx_desc = adapter->num_rx_desc; na.nm_txsync = lem_netmap_txsync; na.nm_rxsync = lem_netmap_rxsync; - na.nm_lock = lem_netmap_lock_wrapper; na.nm_register = lem_netmap_reg; netmap_attach(&na, 1); } Modified: stable/9/sys/dev/netmap/if_re_netmap.h ============================================================================== --- stable/9/sys/dev/netmap/if_re_netmap.h Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/netmap/if_re_netmap.h Wed Nov 6 22:36:36 2013 (r257768) @@ -39,33 +39,6 @@ /* - * wrapper to export locks to the generic code - * We should not use the tx/rx locks - */ -static void -re_netmap_lock_wrapper(struct ifnet *ifp, int what, u_int queueid) -{ - struct rl_softc *adapter = ifp->if_softc; - - switch (what) { - case NETMAP_CORE_LOCK: - RL_LOCK(adapter); - break; - case NETMAP_CORE_UNLOCK: - RL_UNLOCK(adapter); - break; - - case NETMAP_TX_LOCK: - case NETMAP_RX_LOCK: - case NETMAP_TX_UNLOCK: - case NETMAP_RX_UNLOCK: - D("invalid lock call %d, no tx/rx locks here", what); - break; - } -} - - -/* * support for netmap register/unregisted. We are already under core lock. * only called on the first register or the last unregister. */ @@ -88,7 +61,7 @@ re_netmap_reg(struct ifnet *ifp, int ono /* save if_transmit to restore it later */ na->if_transmit = ifp->if_transmit; - ifp->if_transmit = netmap_start; + ifp->if_transmit = netmap_transmit; re_init_locked(adapter); @@ -111,7 +84,7 @@ fail: * Reconcile kernel and user view of the transmit ring. */ static int -re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct rl_softc *sc = ifp->if_softc; struct rl_txdesc *txd = sc->rl_ldata.rl_tx_desc; @@ -124,9 +97,6 @@ re_netmap_txsync(struct ifnet *ifp, u_in if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - RL_LOCK(sc); - /* Sync the TX descriptor list */ bus_dmamap_sync(sc->rl_ldata.rl_tx_list_tag, sc->rl_ldata.rl_tx_list_map, @@ -164,8 +134,6 @@ re_netmap_txsync(struct ifnet *ifp, u_in int len = slot->len; if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) { - if (do_lock) - RL_UNLOCK(sc); // XXX what about prodidx ? return netmap_ring_reinit(kring); } @@ -200,8 +168,6 @@ re_netmap_txsync(struct ifnet *ifp, u_in /* start ? */ CSR_WRITE_1(sc, sc->rl_txstart, RL_TXSTART_START); } - if (do_lock) - RL_UNLOCK(sc); return 0; } @@ -210,7 +176,7 @@ re_netmap_txsync(struct ifnet *ifp, u_in * Reconcile kernel and user view of the receive ring. */ static int -re_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +re_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct rl_softc *sc = ifp->if_softc; struct rl_rxdesc *rxd = sc->rl_ldata.rl_rx_desc; @@ -218,15 +184,13 @@ re_netmap_rxsync(struct ifnet *ifp, u_in struct netmap_kring *kring = &na->rx_rings[ring_nr]; struct netmap_ring *ring = kring->ring; int j, l, n, lim = kring->nkr_num_slots - 1; - int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR; + int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; u_int k = ring->cur, resvd = ring->reserved; k = ring->cur; if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - RL_LOCK(sc); /* XXX check sync modes */ bus_dmamap_sync(sc->rl_ldata.rl_rx_list_tag, sc->rl_ldata.rl_rx_list_map, @@ -291,8 +255,6 @@ re_netmap_rxsync(struct ifnet *ifp, u_in void *addr = PNMB(slot, &paddr); if (addr == netmap_buffer_base) { /* bad buf */ - if (do_lock) - RL_UNLOCK(sc); return netmap_ring_reinit(kring); } @@ -323,8 +285,6 @@ re_netmap_rxsync(struct ifnet *ifp, u_in } /* tell userspace that there are new packets */ ring->avail = kring->nr_hwavail - resvd; - if (do_lock) - RL_UNLOCK(sc); return 0; } @@ -411,12 +371,11 @@ re_netmap_attach(struct rl_softc *sc) bzero(&na, sizeof(na)); na.ifp = sc->rl_ifp; - na.separate_locks = 0; + na.na_flags = NAF_BDG_MAYSLEEP; na.num_tx_desc = sc->rl_ldata.rl_tx_desc_cnt; na.num_rx_desc = sc->rl_ldata.rl_rx_desc_cnt; na.nm_txsync = re_netmap_txsync; na.nm_rxsync = re_netmap_rxsync; - na.nm_lock = re_netmap_lock_wrapper; na.nm_register = re_netmap_reg; netmap_attach(&na, 1); } Modified: stable/9/sys/dev/netmap/ixgbe_netmap.h ============================================================================== --- stable/9/sys/dev/netmap/ixgbe_netmap.h Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/netmap/ixgbe_netmap.h Wed Nov 6 22:36:36 2013 (r257768) @@ -72,37 +72,6 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, ix_rx_ SYSCTL_INT(_dev_netmap, OID_AUTO, ix_rx_miss_bufs, CTLFLAG_RW, &ix_rx_miss_bufs, 0, "potentially missed rx intr bufs"); -/* - * wrapper to export locks to the generic netmap code. - */ -static void -ixgbe_netmap_lock_wrapper(struct ifnet *_a, int what, u_int queueid) -{ - struct adapter *adapter = _a->if_softc; - - ASSERT(queueid < adapter->num_queues); - switch (what) { - case NETMAP_CORE_LOCK: - IXGBE_CORE_LOCK(adapter); - break; - case NETMAP_CORE_UNLOCK: - IXGBE_CORE_UNLOCK(adapter); - break; - case NETMAP_TX_LOCK: - IXGBE_TX_LOCK(&adapter->tx_rings[queueid]); - break; - case NETMAP_TX_UNLOCK: - IXGBE_TX_UNLOCK(&adapter->tx_rings[queueid]); - break; - case NETMAP_RX_LOCK: - IXGBE_RX_LOCK(&adapter->rx_rings[queueid]); - break; - case NETMAP_RX_UNLOCK: - IXGBE_RX_UNLOCK(&adapter->rx_rings[queueid]); - break; - } -} - static void set_crcstrip(struct ixgbe_hw *hw, int onoff) @@ -155,6 +124,7 @@ ixgbe_netmap_reg(struct ifnet *ifp, int if (na == NULL) return EINVAL; /* no netmap support here */ + IXGBE_CORE_LOCK(adapter); ixgbe_disable_intr(adapter); /* Tell the stack that the interface is no longer active */ @@ -166,7 +136,7 @@ ixgbe_netmap_reg(struct ifnet *ifp, int /* save if_transmit and replace with our routine */ na->if_transmit = ifp->if_transmit; - ifp->if_transmit = netmap_start; + ifp->if_transmit = netmap_transmit; /* * reinitialize the adapter, now with netmap flag set, @@ -186,6 +156,7 @@ fail: ixgbe_init_locked(adapter); /* also enables intr */ } set_crcstrip(&adapter->hw, onoff); + IXGBE_CORE_UNLOCK(adapter); return (error); } @@ -213,12 +184,11 @@ fail: * * ring->avail is never used, only checked for bogus values. * - * do_lock is set iff the function is called from the ioctl handler. - * In this case, grab a lock around the body, and also reclaim transmitted + * I flags & FORCE_RECLAIM, reclaim transmitted * buffers irrespective of interrupt mitigation. */ static int -ixgbe_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +ixgbe_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct adapter *adapter = ifp->if_softc; struct tx_ring *txr = &adapter->tx_rings[ring_nr]; @@ -237,8 +207,6 @@ ixgbe_netmap_txsync(struct ifnet *ifp, u if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - IXGBE_TX_LOCK(txr); bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map, BUS_DMASYNC_POSTREAD); @@ -303,8 +271,6 @@ ixgbe_netmap_txsync(struct ifnet *ifp, u */ if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) { ring_reset: - if (do_lock) - IXGBE_TX_UNLOCK(txr); return netmap_ring_reinit(kring); } @@ -347,7 +313,7 @@ ring_reset: * In all cases kring->nr_kflags indicates which slot will be * checked upon a tx interrupt (nkr_num_slots means none). */ - if (do_lock) { + if (flags & NAF_FORCE_RECLAIM) { j = 1; /* forced reclaim, ignore interrupts */ kring->nr_kflags = kring->nkr_num_slots; } else if (kring->nr_hwavail > 0) { @@ -422,8 +388,6 @@ ring_reset: /* update avail to what the kernel knows */ ring->avail = kring->nr_hwavail; - if (do_lock) - IXGBE_TX_UNLOCK(txr); return 0; } @@ -442,10 +406,11 @@ ring_reset: * from nr_hwavail, make the descriptors available for the next reads, * and set kring->nr_hwcur = ring->cur and ring->avail = kring->nr_hwavail. * - * do_lock has a special meaning: please refer to txsync. + * If (flags & NAF_FORCE_READ) also check for incoming packets irrespective + * of whether or not we received an interrupt. */ static int -ixgbe_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock) +ixgbe_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags) { struct adapter *adapter = ifp->if_softc; struct rx_ring *rxr = &adapter->rx_rings[ring_nr]; @@ -453,14 +418,12 @@ ixgbe_netmap_rxsync(struct ifnet *ifp, u struct netmap_kring *kring = &na->rx_rings[ring_nr]; struct netmap_ring *ring = kring->ring; u_int j, l, n, lim = kring->nkr_num_slots - 1; - int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR; + int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; u_int k = ring->cur, resvd = ring->reserved; if (k > lim) return netmap_ring_reinit(kring); - if (do_lock) - IXGBE_RX_LOCK(rxr); /* XXX check sync modes */ bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); @@ -571,13 +534,9 @@ ixgbe_netmap_rxsync(struct ifnet *ifp, u /* tell userspace that there are new packets */ ring->avail = kring->nr_hwavail - resvd; - if (do_lock) - IXGBE_RX_UNLOCK(rxr); return 0; ring_reset: - if (do_lock) - IXGBE_RX_UNLOCK(rxr); return netmap_ring_reinit(kring); } @@ -597,12 +556,11 @@ ixgbe_netmap_attach(struct adapter *adap bzero(&na, sizeof(na)); na.ifp = adapter->ifp; - na.separate_locks = 1; /* this card has separate rx/tx locks */ + na.na_flags = NAF_BDG_MAYSLEEP; na.num_tx_desc = adapter->num_tx_desc; na.num_rx_desc = adapter->num_rx_desc; na.nm_txsync = ixgbe_netmap_txsync; na.nm_rxsync = ixgbe_netmap_rxsync; - na.nm_lock = ixgbe_netmap_lock_wrapper; na.nm_register = ixgbe_netmap_reg; netmap_attach(&na, adapter->num_queues); } Modified: stable/9/sys/dev/netmap/netmap.c ============================================================================== --- stable/9/sys/dev/netmap/netmap.c Wed Nov 6 22:35:52 2013 (r257767) +++ stable/9/sys/dev/netmap/netmap.c Wed Nov 6 22:36:36 2013 (r257768) @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#define NM_BRIDGE /* * This module supports memory mapped access to network devices, @@ -52,18 +51,84 @@ * packets on the output interface. * 6. select() or poll() can be used to wait for events on individual * transmit or receive queues (or all queues for a given interface). - */ + * -#ifdef linux -#include "bsd_glue.h" -static netdev_tx_t linux_netmap_start(struct sk_buff *skb, struct net_device *dev); -#endif /* linux */ + SYNCHRONIZATION (USER) -#ifdef __APPLE__ -#include "osx_glue.h" -#endif /* __APPLE__ */ +The netmap rings and data structures may be shared among multiple +user threads or even independent processes. +Any synchronization among those threads/processes is delegated +to the threads themselves. Only one thread at a time can be in +a system call on the same netmap ring. The OS does not enforce +this and only guarantees against system crashes in case of +invalid usage. + + LOCKING (INTERNAL) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-9@FreeBSD.ORG Thu Nov 7 19:51:21 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 510C870D; Thu, 7 Nov 2013 19:51:21 +0000 (UTC) (envelope-from gabor@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3AB3C2945; Thu, 7 Nov 2013 19:51:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7JpLpq031797; Thu, 7 Nov 2013 19:51:21 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7JpKC6031790; Thu, 7 Nov 2013 19:51:20 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201311071951.rA7JpKC6031790@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 7 Nov 2013 19:51:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257810 - in stable/9/release/doc: en_US.ISO8859-1/errata en_US.ISO8859-1/hardware en_US.ISO8859-1/installation en_US.ISO8859-1/readme en_US.ISO8859-1/relnotes share/misc share/xml X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Nov 2013 19:51:21 -0000 Author: gabor Date: Thu Nov 7 19:51:19 2013 New Revision: 257810 URL: http://svnweb.freebsd.org/changeset/base/257810 Log: MFH r257801: - Update release noted to DocBook 5.0 so that they work with the new tree Modified: stable/9/release/doc/en_US.ISO8859-1/errata/article.xml stable/9/release/doc/en_US.ISO8859-1/hardware/article.xml stable/9/release/doc/en_US.ISO8859-1/installation/article.xml stable/9/release/doc/en_US.ISO8859-1/readme/article.xml stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml stable/9/release/doc/share/misc/man2hwnotes.pl stable/9/release/doc/share/xml/catalog.xml Directory Properties: stable/9/release/ (props changed) stable/9/release/doc/ (props changed) stable/9/release/doc/en_US.ISO8859-1/hardware/ (props changed) Modified: stable/9/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- stable/9/release/doc/en_US.ISO8859-1/errata/article.xml Thu Nov 7 19:40:52 2013 (r257809) +++ stable/9/release/doc/en_US.ISO8859-1/errata/article.xml Thu Nov 7 19:51:19 2013 (r257810) @@ -1,10 +1,9 @@ - %release; ]> - +
+ &os; &release.current; Errata + -
- - &os; &release.current; Errata - - + The &os; Project - + $FreeBSD$ @@ -32,30 +30,30 @@ The &os; Documentation Project - + &tm-attrib.freebsd; &tm-attrib.intel; &tm-attrib.sparc; &tm-attrib.general; - - - This document lists errata items for &os; &release.current;, - containing significant information discovered after the release - or too late in the release cycle to be otherwise included in the - release documentation. - This information includes security advisories, as well as news - relating to the software or documentation that could affect its - operation or usability. An up-to-date version of this document - should always be consulted before installing this version of - &os;. - - This errata document for &os; &release.current; - will be maintained until the release of &os; &release.next;. - + + This document lists errata items for &os; &release.current;, + containing significant information discovered after the release + or too late in the release cycle to be otherwise included in the + release documentation. + This information includes security advisories, as well as news + relating to the software or documentation that could affect its + operation or usability. An up-to-date version of this document + should always be consulted before installing this version of + &os;. + + This errata document for &os; &release.current; + will be maintained until the release of &os; &release.next;. + + - + Introduction This errata document contains late-breaking news @@ -69,33 +67,30 @@ out of date by definition, but other copies are kept updated on the Internet and should be consulted as the current errata for this release. These other copies of the - errata are located at , plus any sites + errata are located at http://www.FreeBSD.org/releases/, plus any sites which keep up-to-date mirrors of this location. Source and binary snapshots of &os; &release.branch; also contain up-to-date copies of this document (as of the time of the snapshot). - For a list of all &os; CERT security advisories, see or . + For a list of all &os; CERT security advisories, see http://www.FreeBSD.org/security/ or ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/. - + Security Advisories Problems described in the following security advisories have been fixed in &release.current;. For more information, consult the individual advisories available from - . + http://security.FreeBSD.org/. - - - + + + Advisory @@ -106,57 +101,49 @@ - SA-12:01.openssl + SA-12:01.openssl 3 May 2012 OpenSSL multiple vulnerabilities - SA-12:02.crypt + SA-12:02.crypt 30 May 2012 Incorrect crypt() hashing - SA-12:03.bind + SA-12:03.bind 12 June 2012 Incorrect handling of zero-length RDATA fields in &man.named.8; - SA-12:04.sysret + SA-12:04.sysret 12 June 2012 Privilege escalation when returning from kernel - SA-12:05.bind + SA-12:05.bind 6 August 2012 &man.named.8; DNSSEC validation Denial of Service - SA-12:06.bind + SA-12:06.bind 22 November 2012 Multiple Denial of Service vulnerabilities with &man.named.8; - SA-12:07.hostapd + SA-12:07.hostapd 22 November 2012 Insufficient message length validation for EAP-TLS messages - SA-12:08.linux + SA-12:08.linux 22 November 2012 Linux compatibility layer input validation error @@ -165,7 +152,7 @@ - + Late-Breaking News [November 2, 2012] The current &man.mfi.4; driver has an Modified: stable/9/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- stable/9/release/doc/en_US.ISO8859-1/hardware/article.xml Thu Nov 7 19:40:52 2013 (r257809) +++ stable/9/release/doc/en_US.ISO8859-1/hardware/article.xml Thu Nov 7 19:51:19 2013 (r257810) @@ -1,17 +1,16 @@ - %release; %devauto; ]> +
+ &os; &release.current; Hardware Notes + -
- - &os; &release.current; Hardware Notes - - The &os; Documentation Project + The &os; Documentation Project $FreeBSD$ @@ -33,7 +32,7 @@ The &os; Documentation Project - + &tm-attrib.freebsd; &tm-attrib.amd; &tm-attrib.fujitsu; @@ -44,9 +43,9 @@ &tm-attrib.general; - + - + Introduction This document contains the hardware compatibility notes for @@ -56,14 +55,14 @@ along with known working instances of these devices. - + Supported Processors and System Boards This section provides some architecture-specific information about the specific processors and systems that are supported by each architecture. - + amd64 Since mid-2003 &os;/&arch.amd64; has supported the AMD64 @@ -121,8 +120,8 @@ Some &intel; &pentium; 4s and Celeron Ds using the Prescott core have EM64T support. See - the Intel - Processor Spec Finder for the definitive answer about + the Intel + Processor Spec Finder for the definitive answer about EM64T support in Intel processors. @@ -144,7 +143,7 @@ - + i386 &os;/&arch.i386; runs on a wide variety of IBM PC @@ -230,23 +229,19 @@ (DSDT) provided by each machine's BIOS. Some machines have bad or incomplete DSDTs, which prevents ACPI from functioning correctly. Replacement DSDTs for some machines can be found - at the DSDT - section of the ACPI4Linux project + at the DSDT + section of the ACPI4Linux project Web site. &os; can use these DSDTs to override the DSDT provided by the BIOS; see the &man.acpi.4; manual page for more information. - + ia64 - Currently supported processors are the &itanium; - and the &itanium; - 2. + Currently supported processors are the &itanium; + and the &itanium; + 2. Supported chipsets include: @@ -276,7 +271,7 @@ and the use of a serial console is required. - + pc98 NEC PC-9801/9821 series with almost all &i386;-compatible @@ -305,7 +300,7 @@ FC-H98 series) is not supported. - + powerpc This section describes the systems currently known to be @@ -367,15 +362,15 @@ - + sparc64 This section describes the systems currently known to be supported by &os; on the Fujitsu &sparc64; and Sun &ultrasparc; platforms. For background information on the various hardware designs see the - Sun System - Handbook. + Sun System + Handbook. SMP is supported on all systems with more than 1 processor. @@ -689,7 +684,7 @@ build. --> - + Supported Devices This section describes the devices currently known to be @@ -711,7 +706,7 @@ multiple times. - + Disk Controllers [&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;, @@ -837,8 +832,7 @@ support CD-ROM commands are supported for read-only access by the CD-ROM drivers (such as &man.cd.4;). WORM/CD-R/CD-RW writing support is provided by &man.cdrecord.1;, which is a - part of the sysutils/cdrtools port in the Ports + part of the sysutils/cdrtools port in the Ports Collection. The following CD-ROM type systems are supported at this @@ -870,7 +864,7 @@ - + Ethernet Interfaces &hwlist.ae; @@ -1009,7 +1003,7 @@ - + FDDI Interfaces [&arch.i386;, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; @@ -1018,7 +1012,7 @@ [&arch.i386;] DEC DEFEA EISA (&man.fpa.4; driver) - + ATM Interfaces [&arch.i386;, &arch.pc98;] Midway-based ATM interfaces @@ -1039,7 +1033,7 @@ (&man.patm.4; driver) - + Wireless Network Interfaces [&arch.amd64;, &arch.i386;, &arch.pc98;] Cisco/Aironet @@ -1095,7 +1089,7 @@ &hwlist.zyd; - + Miscellaneous Networks &hwlist.ce; @@ -1109,7 +1103,7 @@ &hwlist.cm; - + Serial Interfaces [&arch.amd64;, &arch.i386;] PC standard @@ -1368,7 +1362,7 @@ - + Sound Devices &hwlist.snd.ad1816; @@ -1462,7 +1456,7 @@ - + Camera and Video Capture Devices &hwlist.bktr; @@ -1470,7 +1464,7 @@ [&arch.i386;] Connectix QuickCam - + USB Devices [&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] A @@ -1489,8 +1483,7 @@ [&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] - USB Bluetooth adapters can be found in Bluetooth section. + USB Bluetooth adapters can be found in Bluetooth section. &hwlist.ohci; @@ -1559,7 +1552,7 @@ &hwlist.uvisor; - + IEEE 1394 (Firewire) Devices &hwlist.fwohci; @@ -1568,7 +1561,7 @@ Protocol 2 (SBP-2) storage devices (&man.sbp.4; driver) - + Bluetooth Devices &hwlist.ng.bt3c; @@ -1576,7 +1569,7 @@ &hwlist.ng.ubt; - + Cryptographic Accelerators &hwlist.hifn; @@ -1586,7 +1579,7 @@ &hwlist.ubsec; - + Miscellaneous [&arch.amd64;, &arch.i386;, &arch.pc98;] @@ -1612,7 +1605,7 @@ Information regarding specific video cards and compatibility with Xorg can be - found at . + found at http://www.x.org/. [&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] @@ -1667,8 +1660,7 @@ &man.moused.8; has more information on using pointing devices with &os;. Information on using pointing devices - with Xorg can be found at . + with Xorg can be found at http://www.x.org/. [&arch.amd64;, &arch.i386;] PC standard @@ -1701,8 +1693,7 @@ [&arch.i386;] Xilinx XC6200-based reconfigurable hardware - cards compatible with the HOT1 from Virtual Computers (xrpu + cards compatible with the HOT1 from Virtual Computers (xrpu driver). [&arch.pc98;] Power Management Controller of NEC PC-98 Modified: stable/9/release/doc/en_US.ISO8859-1/installation/article.xml ============================================================================== --- stable/9/release/doc/en_US.ISO8859-1/installation/article.xml Thu Nov 7 19:40:52 2013 (r257809) +++ stable/9/release/doc/en_US.ISO8859-1/installation/article.xml Thu Nov 7 19:51:19 2013 (r257810) @@ -1,15 +1,14 @@ - %release; ]> +
+ &os; &release.current; Installation Instructions + -
- - &os; &release.current; Installation Instructions - - The &os; Project + The &os; Project $FreeBSD$ @@ -19,40 +18,37 @@ The &os; Documentation Project - + &tm-attrib.freebsd; &tm-attrib.intel; &tm-attrib.sparc; &tm-attrib.general; - - - This article gives some brief instructions on installing - &os; &release.current; and upgrading the systems running earlier - releases. - + + This article gives some brief instructions on installing + &os; &release.current; and upgrading the systems running earlier + releases. + + - + Installing &os; - The Installing - &os; - chapter of the &os; - Handbook provides more in-depth information about the + The Installing + &os; + chapter of the &os; + Handbook provides more in-depth information about the installation program itself, including a guided walk-through with screenshots. - + Upgrading &os; If you are upgrading from a previous release of &os;, please - read upgrading - section in the Release Notes for notable + read upgrading + section in the Release Notes for notable incompatibilities carefully. @@ -60,8 +56,8 @@ The procedure for doing a source code based update is described in - and - . + &url.books.handbook;/synching.html and + &url.books.handbook;/makeworld.html. For SVN use the releng/9.1 branch which will be where any upcoming Security Advisories or Errata @@ -83,8 +79,7 @@ First, ensure that your current system is up to date; a change was recently made to &man.freebsd-update.8; (Errata - Notice FreeBSD-EN-12:01.freebsd-update) + Notice FreeBSD-EN-12:01.freebsd-update) which is needed in order to upgrade to &os; &release.current;. Modified: stable/9/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- stable/9/release/doc/en_US.ISO8859-1/readme/article.xml Thu Nov 7 19:40:52 2013 (r257809) +++ stable/9/release/doc/en_US.ISO8859-1/readme/article.xml Thu Nov 7 19:51:19 2013 (r257810) @@ -1,15 +1,22 @@ - %release; ]> + +
+ &os; &release.current; README + -
- - &os; &release.current; README - - The &os; Project + The &os; Project $FreeBSD$ @@ -18,24 +25,24 @@ The &os; Documentation Project - + &tm-attrib.freebsd; &tm-attrib.intel; &tm-attrib.opengroup; &tm-attrib.sparc; &tm-attrib.general; - - - This document gives a brief introduction to &os; - &release.current;. It includes some information on how to - obtain &os;, a listing of various ways to contact the &os; - Project, and pointers to some other sources of - information. - + + This document gives a brief introduction to &os; + &release.current;. It includes some information on how to + obtain &os;, a listing of various ways to contact the &os; + Project, and pointers to some other sources of + information. + + - + Introduction This distribution is a &release.type; of &os; &release.current;, the @@ -125,7 +132,7 @@ - + Obtaining &os; &os; may be obtained in a variety of ways. This section @@ -145,33 +152,29 @@ Collection, or other extra material. A list of the CDROM and DVD publishers known to the - project are listed in the Obtaining - &os; appendix to the Handbook. + project are listed in the Obtaining + &os; appendix to the Handbook. FTP You can use FTP to retrieve &os; and any or all of its - optional packages from , which is the official + optional packages from ftp://ftp.FreeBSD.org/, which is the official &os; release site, or any of its mirrors. Lists of locations that mirror &os; can be found in the - FTP - Sites section of the Handbook. + FTP + Sites section of the Handbook. Finding a close (in networking terms) mirror from which to download the distribution is highly recommended. Additional mirror sites are always welcome. Contact freebsd-admin@FreeBSD.org for more details on becoming an official mirror site. You can also find useful - information for mirror sites at the Mirroring - &os; article. + information for mirror sites at the Mirroring + &os; article. Mirrors generally contain the ISO images generally used to create a CDROM of a &os; release. They usually also contain @@ -182,7 +185,7 @@ - + Contacting the &os; Project @@ -209,14 +212,13 @@ preferable to subscribe instead to the &a.announce;. All of the mailing lists can be freely joined by anyone - wishing to do so. Visit the - &os; Mailman Info Page. This will give you more + wishing to do so. Visit the + &os; Mailman Info Page. This will give you more information on joining the various lists, accessing archives, etc. There are a number of mailing lists targeted at special interest groups not mentioned here; more information can be - obtained either from the Mailman pages or the mailing - lists section of the &os; Web site. + obtained either from the Mailman pages or the mailing + lists section of the &os; Web site. Do not send email to the lists @@ -239,9 +241,8 @@ Problem Reports (PRs) submitted in this way will be filed and their progress tracked; the &os; developers will do their best to respond to all reported bugs as soon as - possible. A list - of all active PRs is available on the &os; Web site; + possible. A list + of all active PRs is available on the &os; Web site; this list is useful to see what potential problems other users have encountered. @@ -251,22 +252,21 @@ are unable to use &man.send-pr.1; to submit a bug report, you can try to send it to the &a.bugs;. - For more information, Writing - &os; Problem Reports, available on the &os; Web + For more information, Writing + &os; Problem Reports, available on the &os; Web site, has a number of helpful hints on writing and submitting effective problem reports. - + Further Reading There are many sources of information about &os;; some are included with this distribution, while others are available on-line or in print versions. - + Release Documentation A number of other files provide more specific information @@ -320,7 +320,7 @@ other copies are kept updated on the Internet and should be consulted as the current errata for this release. These other copies of the errata are located at - (as + &url.base;/releases/ (as well as any sites which keep up-to-date mirrors of this location). @@ -331,9 +331,8 @@ As with almost all &unix; like operating systems, &os; comes with a set of on-line manual pages, accessed through the - &man.man.1; command or through the hypertext manual - pages gateway on the &os; Web site. In general, the + &man.man.1; command or through the hypertext manual + pages gateway on the &os; Web site. In general, the manual pages provide information on the different commands and APIs available to the &os; user. @@ -350,13 +349,10 @@ Two highly-useful collections of &os;-related information, maintained by the &os; Project, are the &os; Handbook and &os; FAQ (Frequently Asked - Questions document). On-line versions of the Handbook - and FAQ - are always available from the &os; Documentation - page or its mirrors. If you install the + Questions document). On-line versions of the Handbook + and FAQ + are always available from the &os; Documentation + page or its mirrors. If you install the doc distribution set, you can use a Web browser to read the Handbook and FAQ locally. In particular, note that the Handbook contains a step-by-step guide to @@ -372,8 +368,7 @@ distribution set. A listing of other books and documents about &os; can be - found in the bibliography + found in the bibliography of the &os; Handbook. Because of &os;'s strong &unix; heritage, many other articles and books written for &unix; systems are applicable as well, some of which are also listed in the @@ -381,16 +376,15 @@ - + Acknowledgments &os; represents the cumulative work of many hundreds, if not thousands, of individuals from around the world who have worked countless hours to bring about this &release.type;. For a complete list of &os; developers and contributors, please see - Contributors - to &os; on the &os; Web site or any of its + Contributors + to &os; on the &os; Web site or any of its mirrors. Special thanks also go to the many thousands of &os; users @@ -398,12 +392,3 @@ simply would not have been possible.
- - Modified: stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Nov 7 19:40:52 2013 (r257809) +++ stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Nov 7 19:51:19 2013 (r257810) @@ -1,15 +1,14 @@ - %release; ]> +
+ &os; &release.current; Release Notes + -
- - &os; &release.current; Release Notes - - The &os; Project + The &os; Project $FreeBSD$ @@ -18,7 +17,7 @@ The &os; Documentation Project - + &tm-attrib.freebsd; &tm-attrib.ibm; &tm-attrib.ieee; @@ -36,9 +35,9 @@ kernel and userland. Some brief remarks on upgrading are also presented. - + - + Introduction This document contains the release notes for &os; @@ -47,13 +46,10 @@ upgrading from previous versions of &os;. This distribution of &os; &release.current; is a - &release.type; distribution. It can be found at or any of its mirrors. More + &release.type; distribution. It can be found at &release.url; or any of its mirrors. More information on obtaining this (or other) &release.type; - distributions of &os; can be found in the Obtaining - &os; appendix to the &os; Handbook. + distributions of &os; can be found in the Obtaining + &os; appendix to the &os; Handbook. All users are encouraged to consult the release errata before installing &os;. The errata document is updated with @@ -64,7 +60,7 @@ &release.current; can be found on the &os; Web site. - + What's New This section describes the most user-visible new or changed @@ -80,19 +76,19 @@ advisories, user-visible changes, and major architectural improvements. - + Security Advisories Problems described in the following security advisories have been fixed. For more information, consult the individual advisories available from - . + http://security.FreeBSD.org/. - - - + + + Advisory @@ -103,57 +99,49 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-9@FreeBSD.ORG Thu Nov 7 20:54:52 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id BC85C680; Thu, 7 Nov 2013 20:54:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A9EDB2D5E; Thu, 7 Nov 2013 20:54:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7KsqOG053016; Thu, 7 Nov 2013 20:54:52 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7KsqN0053015; Thu, 7 Nov 2013 20:54:52 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201311072054.rA7KsqN0053015@svn.freebsd.org> From: Dimitry Andric Date: Thu, 7 Nov 2013 20:54:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257812 - stable/9/share/mk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Nov 2013 20:54:52 -0000 Author: dim Date: Thu Nov 7 20:54:52 2013 New Revision: 257812 URL: http://svnweb.freebsd.org/changeset/base/257812 Log: MFC r257658: For C++ programs, don't emit any explicit dependency to libstdc++.a or libc++.a during the early build stages (bootstrap-tools, build-tools, cross-tools), since it is not possible to know in advance which C++ library is available on the host system. Instead, just use the bootstrap compiler's built-in default. This should eventually make it possible to build stable/9 on head, or on stable/10, which ship without libstdc++ by default. Modified: stable/9/share/mk/bsd.prog.mk Directory Properties: stable/9/share/ (props changed) stable/9/share/mk/ (props changed) Modified: stable/9/share/mk/bsd.prog.mk ============================================================================== --- stable/9/share/mk/bsd.prog.mk Thu Nov 7 20:45:50 2013 (r257811) +++ stable/9/share/mk/bsd.prog.mk Thu Nov 7 20:54:52 2013 (r257812) @@ -168,7 +168,7 @@ _EXTRADEPEND: .endif .else echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE} -.if defined(PROG_CXX) +.if defined(PROG_CXX) && !defined(EARLY_BUILD) .if !empty(CXXFLAGS:M-stdlib=libc++) echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE} .else From owner-svn-src-stable-9@FreeBSD.ORG Fri Nov 8 02:24:55 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 37914686; Fri, 8 Nov 2013 02:24:55 +0000 (UTC) (envelope-from gjb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2511A2213; Fri, 8 Nov 2013 02:24:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA82OtQg069881; Fri, 8 Nov 2013 02:24:55 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA82OtfY069880; Fri, 8 Nov 2013 02:24:55 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311080224.rA82OtfY069880@svn.freebsd.org> From: Glen Barber Date: Fri, 8 Nov 2013 02:24:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257832 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 02:24:55 -0000 Author: gjb Date: Fri Nov 8 02:24:54 2013 New Revision: 257832 URL: http://svnweb.freebsd.org/changeset/base/257832 Log: Update comments in release/Makefile.inc.docports to reflect the cvs->svn conversion over a year ago. This is a direct commit to stable/9, as this file does not exist in higher branches. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/Makefile.inc.docports Modified: stable/9/release/Makefile.inc.docports ============================================================================== --- stable/9/release/Makefile.inc.docports Thu Nov 7 23:21:52 2013 (r257831) +++ stable/9/release/Makefile.inc.docports Fri Nov 8 02:24:54 2013 (r257832) @@ -1,13 +1,12 @@ # $FreeBSD$ # # List of (dependent) ports that are minimally required to be -# checked out from CVS in order to get ${DOCPORTS} built and +# checked out from SVN in order to get ${DOCPORTS} built and # installed. It should follow the dependency list in # ports/textproc/docproj/Makefile as much as feasible. # -# Note that these names are /not/ CVS module names but path -# names, so the required part of the ports infrastructure will -# be cvs co'ed accordingly. +# Note that they are / names relative to +# ${PORTSDIR}. # # This list of ports should be checked with the output of : # make all-depends-list | sed -e 's|^/usr/||' | sed -e 's|$| \\|' From owner-svn-src-stable-9@FreeBSD.ORG Fri Nov 8 02:27:11 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 67784826; Fri, 8 Nov 2013 02:27:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 554CA2239; Fri, 8 Nov 2013 02:27:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA82RB5m070250; Fri, 8 Nov 2013 02:27:11 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA82RBrI070249; Fri, 8 Nov 2013 02:27:11 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311080227.rA82RBrI070249@svn.freebsd.org> From: Glen Barber Date: Fri, 8 Nov 2013 02:27:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257833 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 02:27:11 -0000 Author: gjb Date: Fri Nov 8 02:27:10 2013 New Revision: 257833 URL: http://svnweb.freebsd.org/changeset/base/257833 Log: Fix comment. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/Makefile.inc.docports Modified: stable/9/release/Makefile.inc.docports ============================================================================== --- stable/9/release/Makefile.inc.docports Fri Nov 8 02:24:54 2013 (r257832) +++ stable/9/release/Makefile.inc.docports Fri Nov 8 02:27:10 2013 (r257833) @@ -6,7 +6,7 @@ # ports/textproc/docproj/Makefile as much as feasible. # # Note that they are / names relative to -# ${PORTSDIR}. +# ${PORTSDIR}/../ . # # This list of ports should be checked with the output of : # make all-depends-list | sed -e 's|^/usr/||' | sed -e 's|$| \\|' From owner-svn-src-stable-9@FreeBSD.ORG Fri Nov 8 02:31:38 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 40F13AAB; Fri, 8 Nov 2013 02:31:38 +0000 (UTC) (envelope-from gjb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D0F822B7; Fri, 8 Nov 2013 02:31:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA82VciY072896; Fri, 8 Nov 2013 02:31:38 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA82VcBq072895; Fri, 8 Nov 2013 02:31:38 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311080231.rA82VcBq072895@svn.freebsd.org> From: Glen Barber Date: Fri, 8 Nov 2013 02:31:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257834 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 02:31:38 -0000 Author: gjb Date: Fri Nov 8 02:31:37 2013 New Revision: 257834 URL: http://svnweb.freebsd.org/changeset/base/257834 Log: Remove evaluation of OSVERSION < 500000. I hope to never have to build a release from a stable/5 machine. While here, remove hard-coded lang/perl5.10, which is better evaluated during compile-time (especially since lang/perl5.10 does not exist in the ports/ tree). This is a direct commit to stable/9, as this file does not exist in higher branches. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/Makefile.inc.docports Modified: stable/9/release/Makefile.inc.docports ============================================================================== --- stable/9/release/Makefile.inc.docports Fri Nov 8 02:27:10 2013 (r257833) +++ stable/9/release/Makefile.inc.docports Fri Nov 8 02:31:37 2013 (r257834) @@ -71,18 +71,3 @@ MINIMALDOCPORTS+= ports/textproc/openjad .else MINIMALDOCPORTS+= ports/textproc/jade .endif - -.if ${OSVERSION} < 500000 -MINIMALDOCPORTS+= \ - ports/converters/p5-MIME-Base64 \ - ports/devel/p5-File-Spec \ - ports/devel/p5-File-Temp \ - ports/devel/p5-Test-Harness \ - ports/devel/p5-Test-Simple \ - ports/security/p5-Digest \ - ports/security/p5-Digest-MD5 \ - ports/textproc/p5-PodParser -.else -MINIMALDOCPORTS+= \ - ports/lang/perl5.10 -.endif From owner-svn-src-stable-9@FreeBSD.ORG Fri Nov 8 02:46:47 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 6A42DF76; Fri, 8 Nov 2013 02:46:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 575162370; Fri, 8 Nov 2013 02:46:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA82klMJ076852; Fri, 8 Nov 2013 02:46:47 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA82klaN076851; Fri, 8 Nov 2013 02:46:47 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311080246.rA82klaN076851@svn.freebsd.org> From: Glen Barber Date: Fri, 8 Nov 2013 02:46:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257835 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 02:46:47 -0000 Author: gjb Date: Fri Nov 8 02:46:46 2013 New Revision: 257835 URL: http://svnweb.freebsd.org/changeset/base/257835 Log: Regenerate MINIMALDOCPORTS after the doc/ toolchain update to docbook 5.0. This is a direct commit to stable/9, as this file does not exist in higher branches. (Although, I do not think that this variable is actually used now, since we check out the full doc/ tree from svn.) Sponsored by: The FreeBSD Foundation Modified: stable/9/release/Makefile.inc.docports Modified: stable/9/release/Makefile.inc.docports ============================================================================== --- stable/9/release/Makefile.inc.docports Fri Nov 8 02:31:37 2013 (r257834) +++ stable/9/release/Makefile.inc.docports Fri Nov 8 02:46:46 2013 (r257835) @@ -24,50 +24,90 @@ MINIMALDOCPORTS= \ MINIMALDOCPORTS+= \ ports/archivers/unzip \ - ports/converters/libiconv \ - ports/devel/autoconf267 \ + ports/archivers/zip \ + ports/databases/sqlite3 \ + ports/devel/apr1 \ + ports/devel/autoconf \ ports/devel/autoconf-wrapper \ + ports/devel/bison \ + ports/devel/cmake \ + ports/devel/cmake-modules \ ports/devel/gettext \ ports/devel/gmake \ - ports/devel/libtool22 \ + ports/devel/libcheck \ + ports/devel/libpthread-stubs \ + ports/devel/libtool \ ports/devel/m4 \ - ports/devel/pkg-config \ + ports/devel/p5-Locale-gettext \ + ports/devel/pkgconf \ + ports/devel/scons \ + ports/devel/subversion \ + ports/devel/xorg-macros \ + ports/dns/libidn \ ports/graphics/gd \ + ports/graphics/jasper \ + ports/graphics/jbig2dec \ ports/graphics/jbigkit \ ports/graphics/jpeg \ + ports/graphics/lcms2 \ ports/graphics/netpbm \ + ports/graphics/peps \ ports/graphics/png \ ports/graphics/scr2png \ + ports/graphics/svgalib \ ports/graphics/tiff \ ports/misc/help2man \ + ports/ports-mgmt/pkg \ ports/print/freetype2 \ - ports/print/ghostscript8 \ - ports/print/ghostscript8-nox11 \ + ports/print/ghostscript9-nox11 \ ports/print/gsfonts \ + ports/print/libpaper \ + ports/security/libgcrypt \ + ports/security/libgpg-error \ + ports/shells/bash \ + ports/textproc/docbook \ ports/textproc/docbook-410 \ + ports/textproc/docbook-420 \ + ports/textproc/docbook-430 \ + ports/textproc/docbook-440 \ + ports/textproc/docbook-450 \ + ports/textproc/docbook-500 \ + ports/textproc/docbook-sk \ ports/textproc/docbook-xml \ - ports/textproc/docbook-xsl \ + ports/textproc/docbook-xml-430 \ + ports/textproc/docbook-xml-440 \ + ports/textproc/docbook-xml-450 \ + ports/textproc/docbook-xsl-ns \ ports/textproc/docproj \ - ports/textproc/dsssl-docbook-modular \ ports/textproc/expat2 \ - ports/textproc/fixrtf \ - ports/textproc/html \ ports/textproc/html2text \ + ports/textproc/igor \ + ports/textproc/iso-schematron-xslt \ ports/textproc/iso8879 \ ports/textproc/libxml2 \ ports/textproc/libxslt \ - ports/textproc/linuxdoc \ + ports/textproc/p5-XML-Parser \ ports/textproc/scr2txt \ - ports/textproc/sdocbook-xml \ ports/textproc/xhtml \ ports/textproc/xmlcatmgr \ ports/textproc/xmlcharent \ ports/www/links1 \ - ports/www/tidy - -.if ${MACHINE_ARCH} != "i386" -MINIMALDOCPORTS+= ports/textproc/openjade \ - ports/textproc/opensp -.else -MINIMALDOCPORTS+= ports/textproc/jade -.endif + ports/www/serf \ + ports/x11-fonts/fontconfig \ + ports/x11-fonts/xf86bigfontproto \ + ports/x11-toolkits/libXt \ + ports/x11/bigreqsproto \ + ports/x11/inputproto \ + ports/x11/kbproto \ + ports/x11/libICE \ + ports/x11/libSM \ + ports/x11/libX11 \ + ports/x11/libXau \ + ports/x11/libXdmcp \ + ports/x11/libXext \ + ports/x11/libxcb \ + ports/x11/xcb-proto \ + ports/x11/xcmiscproto \ + ports/x11/xextproto \ + ports/x11/xproto \ + ports/x11/xtrans From owner-svn-src-stable-9@FreeBSD.ORG Fri Nov 8 03:00:41 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 454BD529; Fri, 8 Nov 2013 03:00:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 324C52457; Fri, 8 Nov 2013 03:00:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA830fG0082537; Fri, 8 Nov 2013 03:00:41 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA830fnd082536; Fri, 8 Nov 2013 03:00:41 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311080300.rA830fnd082536@svn.freebsd.org> From: Glen Barber Date: Fri, 8 Nov 2013 03:00:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257836 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 03:00:41 -0000 Author: gjb Date: Fri Nov 8 03:00:40 2013 New Revision: 257836 URL: http://svnweb.freebsd.org/changeset/base/257836 Log: MFC r257641: When building the textproc/docproj port, the ports-mgmt/pkg port needs /var/run/ld-elf*.so.hints, which is not automatically created. Fix reldoc build by running the ldconfig(8) startup script in the chroot directory before starting the port build phase. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/release.sh Directory Properties: stable/9/release/ (props changed) Modified: stable/9/release/release.sh ============================================================================== --- stable/9/release/release.sh Fri Nov 8 02:46:46 2013 (r257835) +++ stable/9/release/release.sh Fri Nov 8 03:00:40 2013 (r257836) @@ -182,6 +182,10 @@ mount -t devfs devfs ${CHROOTDIR}/dev trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit build_doc_ports() { + # Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints + # is created. This is needed by ports-mgmt/pkg. + chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart + ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then From owner-svn-src-stable-9@FreeBSD.ORG Fri Nov 8 03:02:43 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTP id 80CC9942; Fri, 8 Nov 2013 03:02:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6E8C524F8; Fri, 8 Nov 2013 03:02:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA832hnw084118; Fri, 8 Nov 2013 03:02:43 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA832hRI084117; Fri, 8 Nov 2013 03:02:43 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311080302.rA832hRI084117@svn.freebsd.org> From: Glen Barber Date: Fri, 8 Nov 2013 03:02:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257837 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 03:02:43 -0000 Author: gjb Date: Fri Nov 8 03:02:42 2013 New Revision: 257837 URL: http://svnweb.freebsd.org/changeset/base/257837 Log: MFC r256430: Reduce disc1.iso image size by installing the userland with the WITHOUT_PROFILE=1 option set, trimming 56MB from the image. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/Makefile Directory Properties: stable/9/release/ (props changed) Modified: stable/9/release/Makefile ============================================================================== --- stable/9/release/Makefile Fri Nov 8 03:00:40 2013 (r257836) +++ stable/9/release/Makefile Fri Nov 8 03:02:42 2013 (r257837) @@ -122,7 +122,8 @@ system: packagesystem # Install system mkdir -p release cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 + DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ + WITHOUT_PROFILE=1 # Copy distfiles mkdir -p release/usr/freebsd-dist cp *.txz MANIFEST release/usr/freebsd-dist