svn commit: r265740 - in stable/10: cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/contrib/opensolaris/uts/c...
Author: delphij
Date: Fri May 9 06:56:26 2014
New Revision: 265740
URL: http://svnweb.freebsd.org/changeset/base/265740
Log:
MFC r264669: MFV r264666:
4374 dn_free_ranges should use range_tree_t
illumos/illumos-gate@bf16b11e8deb633dd6c4296d46e92399d1582df4
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c
stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
stable/10/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==
--- stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.cFri May 9 05:39:57
2014(r265739)
+++ stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.cFri May 9 06:56:26
2014(r265740)
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
*/
#include stdio.h
@@ -2741,7 +2741,8 @@ dump_simulated_ddt(spa_t *spa)
dds.dds_ref_psize = zdde-zdde_ref_psize;
dds.dds_ref_dsize = zdde-zdde_ref_dsize;
- ddt_stat_add(ddh_total.ddh_stat[highbit(refcnt) - 1], dds, 0);
+ ddt_stat_add(ddh_total.ddh_stat[highbit64(refcnt) - 1],
+ dds, 0);
umem_free(zdde, sizeof (*zdde));
}
Modified: stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==
--- stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fri May
9 05:39:57 2014(r265739)
+++ stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fri May
9 06:56:26 2014(r265740)
@@ -20,6 +20,8 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
*/
#include assert.h
@@ -800,20 +802,17 @@ delay(clock_t ticks)
/*
* Find highest one bit set.
* Returns bit number + 1 of highest bit that is set, otherwise returns 0.
- * High order bit is 31 (or 63 in _LP64 kernel).
*/
int
-highbit(ulong_t i)
+highbit64(uint64_t i)
{
- register int h = 1;
+ int h = 1;
if (i == 0)
return (0);
-#ifdef _LP64
- if (i 0xul) {
+ if (i 0xULL) {
h += 32; i = 32;
}
-#endif
if (i 0x) {
h += 16; i = 16;
}
Modified:
stable/10/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==
--- stable/10/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
Fri May 9 05:39:57 2014(r265739)
+++ stable/10/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
Fri May 9 06:56:26 2014(r265740)
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
*/
/*
@@ -558,7 +558,7 @@ extern void delay(clock_t ticks);
extern uint64_t physmem;
-extern int highbit(ulong_t i);
+extern int highbit64(uint64_t i);
extern int random_get_bytes(uint8_t *ptr, size_t len);
extern int random_get_pseudo_bytes(uint8_t *ptr, size_t len);
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
svn commit: r265741 - in stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys
Author: delphij
Date: Fri May 9 07:04:12 2014
New Revision: 265741
URL: http://svnweb.freebsd.org/changeset/base/265741
Log:
MFC r264671 (MFV r264668):
4754 io issued to near-full luns even after setting noalloc threshold
4755 mg_alloc_failures is no longer needed
illumos/illumos@b6240e830b871f59c22a3918aebb3b36c872edba
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May
9 06:56:26 2014(r265740)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May
9 07:04:12 2014(r265741)
@@ -41,7 +41,7 @@ SYSCTL_NODE(_vfs_zfs, OID_AUTO, metaslab
* avoid having to load lots of space_maps in a given txg. There are,
* however, some cases where we want to avoid fast ganging and instead
* we want to do an exhaustive search of all metaslabs on this device.
- * Currently we don't allow any gang, zil, or dump device related allocations
+ * Currently we don't allow any gang, slog, or dump device related allocations
* to fast gang.
*/
#defineCAN_FASTGANG(flags) \
@@ -74,18 +74,6 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, condense_
of in-memory counterpart);
/*
- * This value defines the number of allowed allocation failures per vdev.
- * If a device reaches this threshold in a given txg then we consider skipping
- * allocations on that device. The value of zfs_mg_alloc_failures is computed
- * in zio_init() unless it has been overridden in /etc/system.
- */
-int zfs_mg_alloc_failures = 0;
-TUNABLE_INT(vfs.zfs.mg_alloc_failures, zfs_mg_alloc_failures);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, mg_alloc_failures, CTLFLAG_RWTUN,
-zfs_mg_alloc_failures, 0,
-Number of allowed allocation failures per vdev);
-
-/*
* The zfs_mg_noalloc_threshold defines which metaslab groups should
* be eligible for allocation. The value is defined as a percentage of
* a free space. Metaslab groups that have more free space than
@@ -1707,10 +1695,7 @@ metaslab_sync_done(metaslab_t *msp, uint
void
metaslab_sync_reassess(metaslab_group_t *mg)
{
- int64_t failures = mg-mg_alloc_failures;
-
metaslab_group_alloc_update(mg);
- atomic_add_64(mg-mg_alloc_failures, -failures);
/*
* Preload the next potential metaslabs
@@ -1737,7 +1722,7 @@ metaslab_distance(metaslab_t *msp, dva_t
static uint64_t
metaslab_group_alloc(metaslab_group_t *mg, uint64_t psize, uint64_t asize,
-uint64_t txg, uint64_t min_distance, dva_t *dva, int d, int flags)
+uint64_t txg, uint64_t min_distance, dva_t *dva, int d)
{
spa_t *spa = mg-mg_vd-vdev_spa;
metaslab_t *msp = NULL;
@@ -1764,10 +1749,9 @@ metaslab_group_alloc(metaslab_group_t *m
spa_dbgmsg(spa, %s: failed to meet weight
requirement: vdev %llu, txg %llu, mg %p,
msp %p, psize %llu, asize %llu,
- failures %llu, weight %llu,
- spa_name(spa), mg-mg_vd-vdev_id, txg,
- mg, msp, psize, asize,
- mg-mg_alloc_failures, msp-ms_weight);
+ weight %llu, spa_name(spa),
+ mg-mg_vd-vdev_id, txg,
+ mg, msp, psize, asize, msp-ms_weight);
mutex_exit(mg-mg_lock);
return (-1ULL);
}
@@ -1800,27 +1784,6 @@ metaslab_group_alloc(metaslab_group_t *m
mutex_enter(msp-ms_lock);
/*
-* If we've already reached the allowable number of failed
-* allocation attempts on this metaslab group then we
-* consider skipping it. We skip it only if we're allowed
-* to fast gang, the physical size is larger than
-* a gang block, and we're attempting to allocate from
-* the primary metaslab.
-*/
- if (mg-mg_alloc_failures zfs_mg_alloc_failures
- CAN_FASTGANG(flags) psize SPA_GANGBLOCKSIZE
- activation_weight == METASLAB_WEIGHT_PRIMARY) {
- spa_dbgmsg(spa, %s: skipping metaslab group:
- vdev %llu, txg %llu, mg %p, msp[%llu] %p,
- psize %llu, asize %llu, failures %llu,
- spa_name(spa), mg-mg_vd-vdev_id, txg, mg,
-
svn commit: r265742 - stable/10/usr.sbin/portsnap/portsnap
Author: delphij
Date: Fri May 9 07:07:25 2014
New Revision: 265742
URL: http://svnweb.freebsd.org/changeset/base/265742
Log:
MFC r264740:
Use case insensitive match in portsnap.
PR: bin/186510
Submitted by: olli
Modified:
stable/10/usr.sbin/portsnap/portsnap/portsnap.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/portsnap/portsnap/portsnap.sh
==
--- stable/10/usr.sbin/portsnap/portsnap/portsnap.shFri May 9 07:04:12
2014(r265741)
+++ stable/10/usr.sbin/portsnap/portsnap/portsnap.shFri May 9 07:07:25
2014(r265742)
@@ -362,7 +362,7 @@ fetch_pick_server_init() {
# $name server selection ...; we allow either format.
MLIST=_http._tcp.${SERVERNAME}
host -t srv ${MLIST} |
- sed -nE s/${MLIST} (has SRV record|server selection) //p |
+ sed -nE s/${MLIST} (has SRV record|server selection) //Ip |
cut -f 1,2,4 -d ' ' |
sed -e 's/\.$//' |
sort serverlist_full
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265744 - in stable/10: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/common/zfs sys/cddl/c...
Author: delphij Date: Fri May 9 07:12:31 2014 New Revision: 265744 URL: http://svnweb.freebsd.org/changeset/base/265744 Log: MFC r264835 (MFV r264829): 3897 zfs filesystem and snapshot limits Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8 stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c stable/10/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c stable/10/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h stable/10/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8 == --- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8Fri May 9 07:07:38 2014(r265743) +++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8Fri May 9 07:12:31 2014(r265744) @@ -24,13 +24,13 @@ .\ Copyright (c) 2012, Bryan Drewery bdrew...@freebsd.org .\ Copyright (c) 2013 by Saso Kiselkov. All rights reserved. .\ Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved. -.\ Copyright (c) 2013, Joyent, Inc. All rights reserved. +.\ Copyright (c) 2014, Joyent, Inc. All rights reserved. .\ Copyright (c) 2013, Steven Hartland s...@freebsd.org .\ Copyright (c) 2014, Xin LI delp...@freebsd.org .\ .\ $FreeBSD$ .\ -.Dd April 5, 2014 +.Dd April 23, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -542,6 +542,13 @@ if the snapshot has been marked for defe .Qq Nm Cm destroy -d command. Otherwise, the property is .Cm off . +.It Sy filesystem_count +The total number of filesystems and volumes that exist under this location in the +dataset tree. +This value is only available when a +.Sy filesystem_limit +has +been set somewhere in the tree under which the dataset resides. .It Sy logicalreferenced The amount of space that is .Qq logically @@ -600,6 +607,12 @@ The compression ratio achieved for the space of this dataset, expressed as a multiplier. See also the .Sy compressratio property. +.It Sy snapshot_count +The total number of snapshots that exist under this location in the dataset tree. +This value is only available when a +.Sy snapshot_limit +has been set somewhere +in the tree under which the dataset resides. .It Sy type The type of dataset: .Sy filesystem , volume , No or Sy snapshot . @@ -1020,6 +1033,23 @@ The .Sy mlslabel property is currently not supported on .Fx . +.It Sy filesystem_limit Ns = Ns Ar count | Cm none +Limits the number of filesystems and volumes that can exist under this point in +the dataset tree. +The limit is not enforced if the user is allowed to change +the limit. +Setting a +.Sy filesystem_limit +on a descendent of a filesystem that +already has a +.Sy filesystem_limit +does not override the ancestor's +.Sy filesystem_limit , +but rather imposes an additional limit. +This feature must be enabled to be used +.Po see +.Xr zpool-features 7 +.Pc . .It Sy mountpoint Ns = Ns Ar path | Cm none | legacy Controls the mount point used for this file system. See the .Qq Sx Mount Points @@ -1061,6 +1091,27 @@ the ancestor's quota, but rather imposes Quotas cannot be set on volumes, as the .Sy volsize property acts as an implicit quota. +.It Sy snapshot_limit Ns = Ns Ar count | Cm none +Limits the number of snapshots that can be created on a dataset and its +descendents. +Setting a +.Sy snapshot_limit +on a descendent of a dataset that already +has a +.Sy snapshot_limit +does not override the ancestor's +.Sy snapshot_limit , +but +rather imposes an additional limit. +The limit is not enforced if the user is +allowed to change the limit. +For example, this means that recursive snapshots +taken from the global zone are counted against each delegated dataset within +a jail. +This feature must be enabled to be used +.Po see +.Xr zpool-features 7 +.Pc . .It Sy userquota@ Ns Ar user Ns = Ns Ar size | Cm none Limits the amount of space consumed by the specified user. Similar to the @@ -2738,6 +2789,7 @@ protocol .It dedup Ta property .It devices Ta property .It exec Ta property +.It filesystem_limit Ta
svn commit: r265745 - in stable/10/sys/cddl/contrib/opensolaris: common/avl uts/common/sys
Author: delphij
Date: Fri May 9 07:17:29 2014
New Revision: 265745
URL: http://svnweb.freebsd.org/changeset/base/265745
Log:
MFC r264836 (MFV r264830):
4745 fix AVL code misspellings
Modified:
stable/10/sys/cddl/contrib/opensolaris/common/avl/avl.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/common/avl/avl.c
==
--- stable/10/sys/cddl/contrib/opensolaris/common/avl/avl.c Fri May 9
07:12:31 2014(r265744)
+++ stable/10/sys/cddl/contrib/opensolaris/common/avl/avl.c Fri May 9
07:17:29 2014(r265745)
@@ -37,7 +37,7 @@
* insertion and deletion relatively efficiently. Searching the tree is
* still a fast operation, roughly O(log(N)).
*
- * The key to insertion and deletion is a set of tree maniuplations called
+ * The key to insertion and deletion is a set of tree manipulations called
* rotations, which bring unbalanced subtrees back into the semi-balanced
state.
*
* This implementation of AVL trees has the following peculiarities:
@@ -45,7 +45,7 @@
* - The AVL specific data structures are physically embedded as fields
* in the using data structures. To maintain generality the code
* must constantly translate between avl_node_t * and containing
- * data structure void *s by adding/subracting the avl_offset.
+ * data structure void *s by adding/subtracting the avl_offset.
*
* - Since the AVL data is always embedded in other structures, there is
* no locking or memory allocation in the AVL routines. This must be
@@ -94,7 +94,7 @@
#include sys/avl.h
/*
- * Small arrays to translate between balance (or diff) values and child
indeces.
+ * Small arrays to translate between balance (or diff) values and child
indices.
*
* Code that deals with binary tree data structures will randomly use
* left and right children when examining a tree. C if() statements
@@ -114,7 +114,8 @@ static const int avl_balance2child[] =
*
* - If there is a left child, go to it, then to it's rightmost descendant.
*
- * - otherwise we return thru parent nodes until we've come from a right child.
+ * - otherwise we return through parent nodes until we've come from a right
+ * child.
*
* Return Value:
* NULL - if at the end of the nodes
@@ -919,7 +920,7 @@ avl_is_empty(avl_tree_t *tree)
/*
* Post-order tree walk used to visit all tree nodes and destroy the tree
- * in post order. This is used for destroying a tree w/o paying any cost
+ * in post order. This is used for destroying a tree without paying any cost
* for rebalancing it.
*
* example:
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h Fri May 9
07:12:31 2014(r265744)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h Fri May 9
07:17:29 2014(r265745)
@@ -39,7 +39,7 @@ extern C {
#include sys/avl_impl.h
/*
- * This is a generic implemenatation of AVL trees for use in the Solaris
kernel.
+ * This is a generic implementation of AVL trees for use in the Solaris kernel.
* The interfaces provide an efficient way of implementing an ordered set of
* data structures.
*
@@ -175,7 +175,7 @@ extern void avl_insert(avl_tree_t *tree,
* Insert new_data in tree in the given direction either after
* or before the data here.
*
- * This might be usefull for avl clients caching recently accessed
+ * This might be useful for avl clients caching recently accessed
* data to avoid doing avl_find() again for insertion.
*
* new_data- new data to insert
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265746 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: delphij Date: Fri May 9 07:21:32 2014 New Revision: 265746 URL: http://svnweb.freebsd.org/changeset/base/265746 Log: MFC r265458: Import George Wilson's change for Illumos #4730: 4730 metaslab group taskq should be destroyed in metaslab_group_destroy() Reviewed by: Alex Reece alex.re...@delphix.com Reviewed by: Matthew Ahrens mahr...@delphix.com Reviewed by: Sebastien Roy sebastien@delphix.com Original author: George Wilson Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c == --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May 9 07:17:29 2014(r265745) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May 9 07:21:32 2014(r265746) @@ -411,7 +411,7 @@ metaslab_group_create(metaslab_class_t * mg-mg_class = mc; mg-mg_activation_count = 0; - mg-mg_taskq = taskq_create(metaslab_group_tasksq, metaslab_load_pct, + mg-mg_taskq = taskq_create(metaslab_group_taskq, metaslab_load_pct, minclsyspri, 10, INT_MAX, TASKQ_THREADS_CPU_PCT); return (mg); @@ -429,6 +429,7 @@ metaslab_group_destroy(metaslab_group_t */ ASSERT(mg-mg_activation_count = 0); + taskq_destroy(mg-mg_taskq); avl_destroy(mg-mg_metaslab_tree); mutex_destroy(mg-mg_lock); kmem_free(mg, sizeof (metaslab_group_t)); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265747 - stable/10/lib/libmagic
Author: delphij
Date: Fri May 9 07:24:39 2014
New Revision: 265747
URL: http://svnweb.freebsd.org/changeset/base/265747
Log:
MFC r265464:
Sort .ALLSRC before concatenating files together. This makes sure that the
file are always built the same.
(Note that Header and Localstuff must appear first and in that order, the
sorting does not affect as a coincident effect).
Submitted by: sjg
Modified:
stable/10/lib/libmagic/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libmagic/Makefile
==
--- stable/10/lib/libmagic/Makefile Fri May 9 07:21:32 2014
(r265746)
+++ stable/10/lib/libmagic/Makefile Fri May 9 07:24:39 2014
(r265747)
@@ -32,7 +32,7 @@ MAGFILES= ${CONTRDIR}/Header\
${CONTRDIR}/Magdir/[a-z]*
magic: ${MAGFILES}
- cat ${.ALLSRC} ${.TARGET}
+ cat ${.ALLSRC:O} ${.TARGET}
magic.mgc: mkmagic magic
./mkmagic magic
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265748 - in stable/9/cddl/contrib/opensolaris/cmd: zdb zfs zpool
Author: delphij Date: Fri May 9 07:34:38 2014 New Revision: 265748 URL: http://svnweb.freebsd.org/changeset/base/265748 Log: MFC r263459 (MFV 263436-263438): 3947 zpool(1M) references nonexistent zfs-features(5) 4540 zpool(1M) man page doesn't describe readonly property 3948 zfs sync=default is not accepted 4611 zfs(1M) still mentions 'send -r' in synopsis 4415 zpool(1M) man page missing import -m description 4570 Document dedupditto pool property 4572 Dedup-related documentation additions for zpool and zdb. 1371 Add -D option description to zpool(1M) manpage 4571 Add documentation for -T and interval to zpool list Modified: stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8 stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Directory Properties: stable/9/cddl/contrib/opensolaris/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/zpool/ (props changed) stable/9/cddl/contrib/opensolaris/lib/libzfs/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Fri May 9 07:24:39 2014(r265747) +++ stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Fri May 9 07:34:38 2014(r265748) @@ -19,7 +19,7 @@ .\ .\ $FreeBSD$ .\ -.Dd December 31, 2013 +.Dd March 20, 2014 .Dt ZDB 8 .Os .Sh NAME @@ -127,6 +127,12 @@ compression ratio (compress), inflation If specified twice, display a histogram of deduplication statistics, showing the allocated (physically present on disk) and referenced (logically referenced in the pool) block counts and sizes by reference count. +.Pp +If specified a third time, display the statistics independently for each deduplication table. +.Pp +If specified a fourth time, dump the contents of the deduplication tables describing duplicate blocks. +.Pp +If specified a fifth time, also dump the contents of the deduplication tables describing unique blocks. .It Fl h Display pool history similar to .Cm zpool history , Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri May 9 07:24:39 2014(r265747) +++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri May 9 07:34:38 2014(r265748) @@ -30,7 +30,7 @@ .\ .\ $FreeBSD$ .\ -.Dd January 2, 2014 +.Dd March 20, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -1329,10 +1329,21 @@ features being supported, the new file s these properties. .Bl -tag -width 4n .It Sy casesensitivity Ns = Ns Cm sensitive | insensitive | mixed +Indicates whether the file name matching algorithm used by the file system +should be case-sensitive, case-insensitive, or allow a combination of both +styles of matching. The default value for the +.Sy casesensitivity +property is +.Cm sensitive . +Traditionally, UNIX and POSIX file systems have case-sensitive file names. +.Pp The +.Cm mixed +value for the .Sy casesensitivity -property is currently not supported on -.Fx . +property indicates that the +file system can support requests for both case-sensitive and case-insensitive +matching behavior. .It Sy normalization Ns = Ns Cm none | formC | formD | formKC | formKD Indicates whether the file system should perform a .Sy unicode Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri May 9 07:24:39 2014(r265747) +++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri May 9 07:34:38 2014(r265748) @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd December 31, 2013 +.Dd March 20, 2014 .Dt ZPOOL 8 .Os .Sh NAME @@ -624,6 +624,9 @@ Datasets of this pool can only be mounte .It To write to a read-only pool, a export and import of the pool is required. .El +.Pp +This property can also be referred to by its shortened column name, +.Sy rdonly . .El .Pp The following properties can be set at creation time and import time, and later @@ -682,7 +685,9 @@ property. Threshold for the number of block ditto copies. If the reference count for a deduplicated block increases above this number, a new ditto copy of this block is automatically stored. Default setting is -.Cm 0 . +.Cm 0 +which causes no ditto copies to be created for deduplicated blocks. +The miniumum legal nonzero setting is 100. .It Sy delegation Ns = Ns Cm on No | Cm off Controls whether a non-privileged user is granted access based on the dataset permissions defined on the dataset. See @@ -1152,9 +1157,10 @@ option is also required. .It Fl f Forces import, even if the
svn commit: r265749 - in stable/9/cddl/contrib/opensolaris: cmd/zpool lib/libzfs/common
Author: delphij
Date: Fri May 9 07:35:39 2014
New Revision: 265749
URL: http://svnweb.freebsd.org/changeset/base/265749
Log:
MFC r263889: MFV r263887:
3993 zpool(1M) and zfs(1M) should support -p for list and get
4700 zpool get doesn't support -H or -o options
Modified:
stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8
stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
Directory Properties:
stable/9/cddl/contrib/opensolaris/ (props changed)
stable/9/cddl/contrib/opensolaris/cmd/zpool/ (props changed)
stable/9/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==
--- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri May 9 07:34:38
2014(r265748)
+++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri May 9 07:35:39
2014(r265749)
@@ -1,5 +1,6 @@
'\ te
.\ Copyright (c) 2012, Martin Matuska m...@freebsd.org.
+.\ Copyright (c) 2013-2014, Xin Li delp...@freebsd.org.
.\ All Rights Reserved.
.\
.\ The contents of this file are subject to the terms of the
@@ -25,7 +26,7 @@
.\
.\ $FreeBSD$
.\
-.Dd March 20, 2014
+.Dd March 28, 2014
.Dt ZPOOL 8
.Os
.Sh NAME
@@ -70,6 +71,8 @@
.Ar pool ...
.Nm
.Cm get
+.Op Fl Hp
+.Op Fl o Ar field Ns Op , Ns Ar ...
.Ar all | property Ns Op , Ns Ar ...
.Ar pool ...
.Nm
@@ -120,7 +123,7 @@
.Ar device
.Nm
.Cm list
-.Op Fl H
+.Op Fl Hpv
.Op Fl o Ar property Ns Op , Ns Ar ...
.Op Fl T Cm d Ns | Ns Cm u
.Op Ar pool
@@ -1018,6 +1021,8 @@ is currently being used. This may lead t
.It Xo
.Nm
.Cm get
+.Op Fl Hp
+.Op Fl o Ar field Ns Op , Ns Ar ...
.Ar all | property Ns Op , Ns Ar ...
.Ar pool ...
.Xc
@@ -1036,6 +1041,19 @@ the following fields:
See the
.Qq Sx Properties
section for more information on the available pool properties.
+.Pp
+.It Fl H
+Scripted mode. Do not display headers, and separate fields by a single tab
+instead of arbitrary space.
+.It Fl p
+Display numbers in parsable (exact) values.
+.It Fl o Ar field
+A comma-separated list of columns to display.
+.Sy name Ns , Ns
+.Sy property Ns , Ns
+.Sy value Ns , Ns
+.Sy source
+is the default value.
.It Xo
.Nm
.Cm history
@@ -1335,7 +1353,7 @@ Treat exported or foreign devices as ina
.It Xo
.Nm
.Cm list
-.Op Fl Hv
+.Op Fl Hpv
.Op Fl o Ar property Ns Op , Ns Ar ...
.Op Fl T Cm d Ns | Ns Cm u
.Op Ar pool
@@ -1371,6 +1389,8 @@ for unixtime
.It Fl H
Scripted mode. Do not display headers, and separate fields by a single tab
instead of arbitrary space.
+.It Fl p
+Display numbers in parsable (exact) values.
.It Fl v
Show more detailed information.
.It Fl o Ar property Ns Op , Ns Ar ...
Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==
--- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cFri May 9
07:34:38 2014(r265748)
+++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cFri May 9
07:35:39 2014(r265749)
@@ -235,7 +235,7 @@ get_usage(zpool_help_t idx) {
case HELP_LABELCLEAR:
return (gettext(\tlabelclear [-f] vdev\n));
case HELP_LIST:
- return (gettext(\tlist [-Hv] [-o property[,...]]
+ return (gettext(\tlist [-Hpv] [-o property[,...]]
[-T d|u] [pool] ... [interval [count]]\n));
case HELP_OFFLINE:
return (gettext(\toffline [-t] pool device ...\n));
@@ -257,8 +257,8 @@ get_usage(zpool_help_t idx) {
return (gettext(\tupgrade [-v]\n
\tupgrade [-V version] -a | pool ...\n));
case HELP_GET:
- return (gettext(\tget \all\ | property[,...]
- pool ...\n));
+ return (gettext(\tget [-Hp] [-o \all\ | field[,...]]
+ \all\ | property[,...] pool ...\n));
case HELP_SET:
return (gettext(\tset property=value pool \n));
case HELP_SPLIT:
@@ -2755,6 +2755,7 @@ typedef struct list_cbdata {
int cb_namewidth;
boolean_t cb_scripted;
zprop_list_t*cb_proplist;
+ boolean_t cb_literal;
} list_cbdata_t;
/*
@@ -2850,7 +2851,7 @@ print_pool(zpool_handle_t *zhp, list_cbd
zpool_get_prop_int(zhp, pl-pl_prop, NULL) == 0)
propstr = -;
else if (zpool_get_prop(zhp, pl-pl_prop, property,
- sizeof (property), NULL) != 0)
+ sizeof (property), NULL, cb-cb_literal) != 0)
propstr = -;
else
svn commit: r265750 - stable/9/contrib/netcat
Author: delphij Date: Fri May 9 07:38:22 2014 New Revision: 265750 URL: http://svnweb.freebsd.org/changeset/base/265750 Log: MFC: nc(1) from OpenBSD 5.5. Modified: stable/9/contrib/netcat/FREEBSD-vendor stable/9/contrib/netcat/atomicio.c stable/9/contrib/netcat/nc.1 stable/9/contrib/netcat/netcat.c Directory Properties: stable/9/contrib/netcat/ (props changed) Modified: stable/9/contrib/netcat/FREEBSD-vendor == --- stable/9/contrib/netcat/FREEBSD-vendor Fri May 9 07:35:39 2014 (r265749) +++ stable/9/contrib/netcat/FREEBSD-vendor Fri May 9 07:38:22 2014 (r265750) @@ -1,5 +1,5 @@ # $FreeBSD$ Project: netcat (aka src/usr.bin/nc in OpenBSD) ProjectURL:http://www.openbsd.org/ -Version: 5.2 +Version: 5.3 License: BSD Modified: stable/9/contrib/netcat/atomicio.c == --- stable/9/contrib/netcat/atomicio.c Fri May 9 07:35:39 2014 (r265749) +++ stable/9/contrib/netcat/atomicio.c Fri May 9 07:38:22 2014 (r265750) @@ -1,4 +1,4 @@ -/* $OpenBSD: atomicio.c,v 1.10 2011/01/08 00:47:19 jeremy Exp $ */ +/* $OpenBSD: atomicio.c,v 1.11 2012/12/04 02:24:47 deraadt Exp $ */ /* * Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. @@ -26,8 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include sys/param.h - #include errno.h #include poll.h #include unistd.h Modified: stable/9/contrib/netcat/nc.1 == --- stable/9/contrib/netcat/nc.1Fri May 9 07:35:39 2014 (r265749) +++ stable/9/contrib/netcat/nc.1Fri May 9 07:38:22 2014 (r265750) @@ -1,4 +1,4 @@ -.\ $OpenBSD: nc.1,v 1.61 2012/07/07 15:33:02 haesbaert Exp $ +.\ $OpenBSD: nc.1,v 1.67 2014/02/26 20:56:11 claudio Exp $ .\ .\ Copyright (c) 1996 David Sacerdote .\ All rights reserved. @@ -27,7 +27,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 7, 2012 +.Dd April 11, 2014 .Dt NC 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Sh SYNOPSIS .Nm nc .Bk -words -.Op Fl 46DdEhklnrStUuvz +.Op Fl 46DdEFhklNnrStUuvz .Op Fl e Ar IPsec_policy .Op Fl I Ar length .Op Fl i Ar interval @@ -120,6 +120,21 @@ to be used using the syntax described in .Xr ipsec_set_policy 3 . This flag can be specified up to two times, as typically one policy for each direction is needed. +.It Fl F +Pass the first connected socket using +.Xr sendmsg 2 +to stdout and exit. +This is useful in conjunction with +.Fl X +to have +.Nm +perform connection setup with a proxy but then leave the rest of the +connection to another program (e.g.\ +.Xr ssh 1 +using the +.Xr ssh_config 5 +.Cm ProxyUseFdPass +option). .It Fl h Prints out .Nm @@ -155,6 +170,10 @@ options. Additionally, any timeouts specified with the .Fl w option are ignored. +.It Fl N +.Xr shutdown 2 +the network socket after EOF on the input. +Some servers require this to finish their work. .It Fl n Do not do any DNS or service lookups on any specified addresses, hostnames or ports. @@ -232,7 +251,6 @@ flag is given. Set the routing table .Pq Dq FIB to be used. -The default is 0. .It Fl v Have .Nm @@ -361,7 +379,7 @@ Using a second machine, connect to the l .Nm process, feeding it the file which is to be transferred: .Pp -.Dl $ nc host.example.com 1234 \*(Lt filename.in +.Dl $ nc -N host.example.com 1234 \*(Lt filename.in .Pp After the file has been transferred, the connection will close automatically. .Sh TALKING TO SERVERS @@ -486,10 +504,10 @@ if the proxy requires it: .Xr tcp 4 .Sh AUTHORS Original implementation by *Hobbit* -.Aq hob...@avian.org . +.Aq Mt hob...@avian.org . .br Rewritten with IPv6 support by -.An Eric Jackson Aq er...@monkey.org . +.An Eric Jackson Aq Mt er...@monkey.org . .Sh CAVEATS UDP port scans using the .Fl uz Modified: stable/9/contrib/netcat/netcat.c == --- stable/9/contrib/netcat/netcat.cFri May 9 07:35:39 2014 (r265749) +++ stable/9/contrib/netcat/netcat.cFri May 9 07:38:22 2014 (r265750) @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.109 2012/07/07 15:33:02 haesbaert Exp $ */ +/* $OpenBSD: netcat.c,v 1.117 2013/10/26 21:33:29 sthen Exp $ */ /* * Copyright (c) 2001 Eric Jackson er...@monkey.org * @@ -38,6 +38,7 @@ #include sys/socket.h #include sys/sysctl.h #include sys/time.h +#include sys/uio.h #include sys/un.h #include netinet/in.h @@ -74,9 +75,11 @@ /* Command Line Options */ intdflag; /* detached, no stdin */ +intFflag; /* fdpass sock to stdout */ unsigned int iflag;/* Interval Flag */ intkflag;
svn commit: r265751 - in stable/9: cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/contrib/opensolaris/uts/co...
Author: delphij
Date: Fri May 9 07:54:59 2014
New Revision: 265751
URL: http://svnweb.freebsd.org/changeset/base/265751
Log:
MFC r264669: MFV r264666:
4374 dn_free_ranges should use range_tree_t
Modified:
stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c
stable/9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
stable/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
Directory Properties:
stable/9/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==
--- stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri May 9 07:38:22
2014(r265750)
+++ stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri May 9 07:54:59
2014(r265751)
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
*/
#include stdio.h
@@ -2741,7 +2741,8 @@ dump_simulated_ddt(spa_t *spa)
dds.dds_ref_psize = zdde-zdde_ref_psize;
dds.dds_ref_dsize = zdde-zdde_ref_dsize;
- ddt_stat_add(ddh_total.ddh_stat[highbit(refcnt) - 1], dds, 0);
+ ddt_stat_add(ddh_total.ddh_stat[highbit64(refcnt) - 1],
+ dds, 0);
umem_free(zdde, sizeof (*zdde));
}
Modified: stable/9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==
--- stable/9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fri May
9 07:38:22 2014(r265750)
+++ stable/9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fri May
9 07:54:59 2014(r265751)
@@ -20,6 +20,8 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
*/
#include assert.h
@@ -800,20 +802,17 @@ delay(clock_t ticks)
/*
* Find highest one bit set.
* Returns bit number + 1 of highest bit that is set, otherwise returns 0.
- * High order bit is 31 (or 63 in _LP64 kernel).
*/
int
-highbit(ulong_t i)
+highbit64(uint64_t i)
{
- register int h = 1;
+ int h = 1;
if (i == 0)
return (0);
-#ifdef _LP64
- if (i 0xul) {
+ if (i 0xULL) {
h += 32; i = 32;
}
-#endif
if (i 0x) {
h += 16; i = 16;
}
Modified:
stable/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==
--- stable/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
Fri May 9 07:38:22 2014(r265750)
+++ stable/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
Fri May 9 07:54:59 2014(r265751)
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
*/
/*
@@ -566,7 +566,7 @@ extern void delay(clock_t ticks);
extern uint64_t physmem;
-extern int highbit(ulong_t i);
+extern int highbit64(uint64_t i);
extern int random_get_bytes(uint8_t *ptr, size_t len);
extern int random_get_pseudo_bytes(uint8_t *ptr, size_t len);
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
svn commit: r265752 - in stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys
Author: delphij
Date: Fri May 9 08:02:52 2014
New Revision: 265752
URL: http://svnweb.freebsd.org/changeset/base/265752
Log:
MFC r264671:
MFV r264668:
4754 io issued to near-full luns even after setting noalloc threshold
4755 mg_alloc_failures is no longer needed
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May
9 07:54:59 2014(r265751)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May
9 08:02:52 2014(r265752)
@@ -41,7 +41,7 @@ SYSCTL_NODE(_vfs_zfs, OID_AUTO, metaslab
* avoid having to load lots of space_maps in a given txg. There are,
* however, some cases where we want to avoid fast ganging and instead
* we want to do an exhaustive search of all metaslabs on this device.
- * Currently we don't allow any gang, zil, or dump device related allocations
+ * Currently we don't allow any gang, slog, or dump device related allocations
* to fast gang.
*/
#defineCAN_FASTGANG(flags) \
@@ -74,18 +74,6 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, condense_
of in-memory counterpart);
/*
- * This value defines the number of allowed allocation failures per vdev.
- * If a device reaches this threshold in a given txg then we consider skipping
- * allocations on that device. The value of zfs_mg_alloc_failures is computed
- * in zio_init() unless it has been overridden in /etc/system.
- */
-int zfs_mg_alloc_failures = 0;
-TUNABLE_INT(vfs.zfs.mg_alloc_failures, zfs_mg_alloc_failures);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, mg_alloc_failures, CTLFLAG_RWTUN,
-zfs_mg_alloc_failures, 0,
-Number of allowed allocation failures per vdev);
-
-/*
* The zfs_mg_noalloc_threshold defines which metaslab groups should
* be eligible for allocation. The value is defined as a percentage of
* a free space. Metaslab groups that have more free space than
@@ -1708,10 +1696,7 @@ metaslab_sync_done(metaslab_t *msp, uint
void
metaslab_sync_reassess(metaslab_group_t *mg)
{
- int64_t failures = mg-mg_alloc_failures;
-
metaslab_group_alloc_update(mg);
- atomic_add_64(mg-mg_alloc_failures, -failures);
/*
* Preload the next potential metaslabs
@@ -1738,7 +1723,7 @@ metaslab_distance(metaslab_t *msp, dva_t
static uint64_t
metaslab_group_alloc(metaslab_group_t *mg, uint64_t psize, uint64_t asize,
-uint64_t txg, uint64_t min_distance, dva_t *dva, int d, int flags)
+uint64_t txg, uint64_t min_distance, dva_t *dva, int d)
{
spa_t *spa = mg-mg_vd-vdev_spa;
metaslab_t *msp = NULL;
@@ -1765,10 +1750,9 @@ metaslab_group_alloc(metaslab_group_t *m
spa_dbgmsg(spa, %s: failed to meet weight
requirement: vdev %llu, txg %llu, mg %p,
msp %p, psize %llu, asize %llu,
- failures %llu, weight %llu,
- spa_name(spa), mg-mg_vd-vdev_id, txg,
- mg, msp, psize, asize,
- mg-mg_alloc_failures, msp-ms_weight);
+ weight %llu, spa_name(spa),
+ mg-mg_vd-vdev_id, txg,
+ mg, msp, psize, asize, msp-ms_weight);
mutex_exit(mg-mg_lock);
return (-1ULL);
}
@@ -1801,27 +1785,6 @@ metaslab_group_alloc(metaslab_group_t *m
mutex_enter(msp-ms_lock);
/*
-* If we've already reached the allowable number of failed
-* allocation attempts on this metaslab group then we
-* consider skipping it. We skip it only if we're allowed
-* to fast gang, the physical size is larger than
-* a gang block, and we're attempting to allocate from
-* the primary metaslab.
-*/
- if (mg-mg_alloc_failures zfs_mg_alloc_failures
- CAN_FASTGANG(flags) psize SPA_GANGBLOCKSIZE
- activation_weight == METASLAB_WEIGHT_PRIMARY) {
- spa_dbgmsg(spa, %s: skipping metaslab group:
- vdev %llu, txg %llu, mg %p, msp[%llu] %p,
- psize %llu, asize %llu, failures %llu,
- spa_name(spa), mg-mg_vd-vdev_id, txg, mg,
- msp-ms_id, msp, psize, asize,
-
svn commit: r265753 - stable/9/usr.sbin/portsnap/portsnap
Author: delphij
Date: Fri May 9 08:07:05 2014
New Revision: 265753
URL: http://svnweb.freebsd.org/changeset/base/265753
Log:
MFC r264740:
Use case insensitive match in portsnap.
PR: bin/186510
Submitted by: olli
Modified:
stable/9/usr.sbin/portsnap/portsnap/portsnap.sh
Directory Properties:
stable/9/usr.sbin/portsnap/ (props changed)
stable/9/usr.sbin/portsnap/portsnap/ (props changed)
Modified: stable/9/usr.sbin/portsnap/portsnap/portsnap.sh
==
--- stable/9/usr.sbin/portsnap/portsnap/portsnap.sh Fri May 9 08:02:52
2014(r265752)
+++ stable/9/usr.sbin/portsnap/portsnap/portsnap.sh Fri May 9 08:07:05
2014(r265753)
@@ -348,7 +348,7 @@ fetch_pick_server_init() {
# $name server selection ...; we allow either format.
MLIST=_http._tcp.${SERVERNAME}
host -t srv ${MLIST} |
- sed -nE s/${MLIST} (has SRV record|server selection) //p |
+ sed -nE s/${MLIST} (has SRV record|server selection) //Ip |
cut -f 1,2,4 -d ' ' |
sed -e 's/\.$//' |
sort serverlist_full
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265754 - in stable/9: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/common/zfs sys/cddl/co...
Author: delphij Date: Fri May 9 08:10:33 2014 New Revision: 265754 URL: http://svnweb.freebsd.org/changeset/base/265754 Log: MFC r264835: MFV r264829: 3897 zfs filesystem and snapshot limits Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c stable/9/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c stable/9/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h stable/9/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h Directory Properties: stable/9/cddl/contrib/opensolaris/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/zpool/ (props changed) stable/9/cddl/contrib/opensolaris/lib/libzfs/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri May 9 08:07:05 2014(r265753) +++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri May 9 08:10:33 2014(r265754) @@ -24,13 +24,13 @@ .\ Copyright (c) 2012, Glen Barber g...@freebsd.org .\ Copyright (c) 2013 by Saso Kiselkov. All rights reserved. .\ Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved. -.\ Copyright (c) 2013, Joyent, Inc. All rights reserved. +.\ Copyright (c) 2014, Joyent, Inc. All rights reserved. .\ Copyright (c) 2013, Steven Hartland s...@freebsd.org .\ Copyright (c) 2014, Xin LI delp...@freebsd.org .\ .\ $FreeBSD$ .\ -.Dd March 20, 2014 +.Dd April 23, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -536,6 +536,13 @@ if the snapshot has been marked for defe .Qq Nm Cm destroy -d command. Otherwise, the property is .Cm off . +.It Sy filesystem_count +The total number of filesystems and volumes that exist under this location in the +dataset tree. +This value is only available when a +.Sy filesystem_limit +has +been set somewhere in the tree under which the dataset resides. .It Sy logicalreferenced The amount of space that is .Qq logically @@ -594,6 +601,12 @@ The compression ratio achieved for the space of this dataset, expressed as a multiplier. See also the .Sy compressratio property. +.It Sy snapshot_count +The total number of snapshots that exist under this location in the dataset tree. +This value is only available when a +.Sy snapshot_limit +has been set somewhere +in the tree under which the dataset resides. .It Sy type The type of dataset: .Sy filesystem , volume , No or Sy snapshot . @@ -1014,6 +1027,23 @@ The .Sy mlslabel property is currently not supported on .Fx . +.It Sy filesystem_limit Ns = Ns Ar count | Cm none +Limits the number of filesystems and volumes that can exist under this point in +the dataset tree. +The limit is not enforced if the user is allowed to change +the limit. +Setting a +.Sy filesystem_limit +on a descendent of a filesystem that +already has a +.Sy filesystem_limit +does not override the ancestor's +.Sy filesystem_limit , +but rather imposes an additional limit. +This feature must be enabled to be used +.Po see +.Xr zpool-features 7 +.Pc . .It Sy mountpoint Ns = Ns Ar path | Cm none | legacy Controls the mount point used for this file system. See the .Qq Sx Mount Points @@ -1055,6 +1085,27 @@ the ancestor's quota, but rather imposes Quotas cannot be set on volumes, as the .Sy volsize property acts as an implicit quota. +.It Sy snapshot_limit Ns = Ns Ar count | Cm none +Limits the number of snapshots that can be created on a dataset and its +descendents. +Setting a +.Sy snapshot_limit +on a descendent of a dataset that already +has a +.Sy snapshot_limit +does not override the ancestor's +.Sy snapshot_limit , +but +rather imposes an additional limit. +The limit is not enforced if the user is +allowed to change the limit. +For example, this means that recursive snapshots +taken from the global zone are counted against each delegated dataset within +a jail. +This feature must be enabled to be used +.Po see +.Xr zpool-features 7 +.Pc . .It Sy
svn commit: r265755 - in stable/9/sys/cddl/contrib/opensolaris: common/avl uts/common/sys
Author: delphij
Date: Fri May 9 08:13:11 2014
New Revision: 265755
URL: http://svnweb.freebsd.org/changeset/base/265755
Log:
MFC r264836: MFV r264830:
4745 fix AVL code misspellings
Modified:
stable/9/sys/cddl/contrib/opensolaris/common/avl/avl.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
Directory Properties:
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/common/avl/avl.c
==
--- stable/9/sys/cddl/contrib/opensolaris/common/avl/avl.c Fri May 9
08:10:33 2014(r265754)
+++ stable/9/sys/cddl/contrib/opensolaris/common/avl/avl.c Fri May 9
08:13:11 2014(r265755)
@@ -37,7 +37,7 @@
* insertion and deletion relatively efficiently. Searching the tree is
* still a fast operation, roughly O(log(N)).
*
- * The key to insertion and deletion is a set of tree maniuplations called
+ * The key to insertion and deletion is a set of tree manipulations called
* rotations, which bring unbalanced subtrees back into the semi-balanced
state.
*
* This implementation of AVL trees has the following peculiarities:
@@ -45,7 +45,7 @@
* - The AVL specific data structures are physically embedded as fields
* in the using data structures. To maintain generality the code
* must constantly translate between avl_node_t * and containing
- * data structure void *s by adding/subracting the avl_offset.
+ * data structure void *s by adding/subtracting the avl_offset.
*
* - Since the AVL data is always embedded in other structures, there is
* no locking or memory allocation in the AVL routines. This must be
@@ -94,7 +94,7 @@
#include sys/avl.h
/*
- * Small arrays to translate between balance (or diff) values and child
indeces.
+ * Small arrays to translate between balance (or diff) values and child
indices.
*
* Code that deals with binary tree data structures will randomly use
* left and right children when examining a tree. C if() statements
@@ -114,7 +114,8 @@ static const int avl_balance2child[] =
*
* - If there is a left child, go to it, then to it's rightmost descendant.
*
- * - otherwise we return thru parent nodes until we've come from a right child.
+ * - otherwise we return through parent nodes until we've come from a right
+ * child.
*
* Return Value:
* NULL - if at the end of the nodes
@@ -919,7 +920,7 @@ avl_is_empty(avl_tree_t *tree)
/*
* Post-order tree walk used to visit all tree nodes and destroy the tree
- * in post order. This is used for destroying a tree w/o paying any cost
+ * in post order. This is used for destroying a tree without paying any cost
* for rebalancing it.
*
* example:
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h Fri May 9
08:10:33 2014(r265754)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h Fri May 9
08:13:11 2014(r265755)
@@ -39,7 +39,7 @@ extern C {
#include sys/avl_impl.h
/*
- * This is a generic implemenatation of AVL trees for use in the Solaris
kernel.
+ * This is a generic implementation of AVL trees for use in the Solaris kernel.
* The interfaces provide an efficient way of implementing an ordered set of
* data structures.
*
@@ -175,7 +175,7 @@ extern void avl_insert(avl_tree_t *tree,
* Insert new_data in tree in the given direction either after
* or before the data here.
*
- * This might be usefull for avl clients caching recently accessed
+ * This might be useful for avl clients caching recently accessed
* data to avoid doing avl_find() again for insertion.
*
* new_data- new data to insert
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265756 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: delphij Date: Fri May 9 08:15:35 2014 New Revision: 265756 URL: http://svnweb.freebsd.org/changeset/base/265756 Log: MFC r265458: Import George Wilson's change for Illumos #4730: 4730 metaslab group taskq should be destroyed in metaslab_group_destroy() Reviewed by: Alex Reece alex.re...@delphix.com Reviewed by: Matthew Ahrens mahr...@delphix.com Reviewed by: Sebastien Roy sebastien@delphix.com Original author: George Wilson Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Directory Properties: stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c == --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May 9 08:13:11 2014(r265755) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May 9 08:15:35 2014(r265756) @@ -412,7 +412,7 @@ metaslab_group_create(metaslab_class_t * mg-mg_class = mc; mg-mg_activation_count = 0; - mg-mg_taskq = taskq_create(metaslab_group_tasksq, metaslab_load_pct, + mg-mg_taskq = taskq_create(metaslab_group_taskq, metaslab_load_pct, minclsyspri, 10, INT_MAX, TASKQ_THREADS_CPU_PCT); return (mg); @@ -430,6 +430,7 @@ metaslab_group_destroy(metaslab_group_t */ ASSERT(mg-mg_activation_count = 0); + taskq_destroy(mg-mg_taskq); avl_destroy(mg-mg_metaslab_tree); mutex_destroy(mg-mg_lock); kmem_free(mg, sizeof (metaslab_group_t)); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265757 - stable/9/lib/libmagic
Author: delphij
Date: Fri May 9 08:18:57 2014
New Revision: 265757
URL: http://svnweb.freebsd.org/changeset/base/265757
Log:
MFC r265464:
Sort .ALLSRC before concatenating files together. This makes sure that the
file are always built the same.
(Note that Header and Localstuff must appear first and in that order, the
sorting does not affect as a coincident effect).
Submitted by: sjg
Modified:
stable/9/lib/libmagic/Makefile
Directory Properties:
stable/9/lib/libmagic/ (props changed)
Modified: stable/9/lib/libmagic/Makefile
==
--- stable/9/lib/libmagic/Makefile Fri May 9 08:15:35 2014
(r265756)
+++ stable/9/lib/libmagic/Makefile Fri May 9 08:18:57 2014
(r265757)
@@ -33,7 +33,7 @@ MAGFILES= ${CONTRDIR}/Header\
${CONTRDIR}/Magdir/[a-z]*
magic: ${MAGFILES}
- cat ${.ALLSRC} ${.TARGET}
+ cat ${.ALLSRC:O} ${.TARGET}
magic.mgc: mkmagic magic
./mkmagic magic
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265759 - stable/8/lib/libmagic
Author: delphij
Date: Fri May 9 08:22:02 2014
New Revision: 265759
URL: http://svnweb.freebsd.org/changeset/base/265759
Log:
MFC r265464:
Sort .ALLSRC before concatenating files together. This makes sure that the
file are always built the same.
(Note that Header and Localstuff must appear first and in that order, the
sorting does not affect as a coincident effect).
Submitted by: sjg
Modified:
stable/8/lib/libmagic/Makefile
Directory Properties:
stable/8/lib/libmagic/ (props changed)
Modified: stable/8/lib/libmagic/Makefile
==
--- stable/8/lib/libmagic/Makefile Fri May 9 08:20:47 2014
(r265758)
+++ stable/8/lib/libmagic/Makefile Fri May 9 08:22:02 2014
(r265759)
@@ -30,7 +30,7 @@ MAGFILES= ${CONTRDIR}/Header\
${CONTRDIR}/Magdir/[a-z]*
magic: ${MAGFILES}
- cat ${.ALLSRC} ${.TARGET}
+ cat ${.ALLSRC:O} ${.TARGET}
magic.mgc: mkmagic magic
./mkmagic magic
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265766 - in head/sys: boot/fdt/dts/mips dev/netfpga10g/nf10bmac
Author: bz
Date: Fri May 9 12:59:38 2014
New Revision: 265766
URL: http://svnweb.freebsd.org/changeset/base/265766
Log:
Adjust the register layout to allow for 64bit registers in the
future for nf10bmac(4). Also, add support for and enable RX interrupts.
MFC after:2 weeks
Modified:
head/sys/boot/fdt/dts/mips/beri-netfpga.dts
head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c
head/sys/dev/netfpga10g/nf10bmac/if_nf10bmacreg.h
Modified: head/sys/boot/fdt/dts/mips/beri-netfpga.dts
==
--- head/sys/boot/fdt/dts/mips/beri-netfpga.dts Fri May 9 12:13:22 2014
(r265765)
+++ head/sys/boot/fdt/dts/mips/beri-netfpga.dts Fri May 9 12:59:38 2014
(r265766)
@@ -135,13 +135,14 @@
ethernet@7f005000 {
compatible = netfpag10g,nf10bmac;
- // TX, RX, LOOP
- reg = 0x7f005010 0xc
- 0x7f005020 0xc
- 0x7f005030 0x4;
+ // LOOP, TX, RX, INTR
+ reg = 0x7f005000 0x20
+ 0x7f005020 0x30
+ 0x7f005050 0x30
+ 0x7f005100 0x10;
// RX
- #interrupts = 1;
- #interrupt-parent = beripic;
+ interrupts = 1;
+ interrupt-parent = beripic;
};
};
Modified: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
==
--- head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c Fri May 9 12:13:22
2014(r265765)
+++ head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c Fri May 9 12:59:38
2014(r265766)
@@ -92,13 +92,15 @@ static poll_handler_t nf10bmac_poll;
#defineNF10BMAC_LOCK_ASSERT(_sc) \
mtx_assert((_sc)-nf10bmac_mtx, MA_OWNED)
-#defineNF10BMAC_TX_LEN 0x08
-#defineNF10BMAC_TX_META0x04
+#defineNF10BMAC_CTRL0 0x00
#defineNF10BMAC_TX_DATA0x00
-#defineNF10BMAC_RX_LEN 0x08
-#defineNF10BMAC_RX_META0x04
+#defineNF10BMAC_TX_META0x08
+#defineNF10BMAC_TX_LEN 0x10
#defineNF10BMAC_RX_DATA0x00
-#defineNF10BMAC_CTRL0 0x00
+#defineNF10BMAC_RX_META0x08
+#defineNF10BMAC_RX_LEN 0x10
+#defineNF10BMAC_INTR_CLEAR_DIS 0x00
+#defineNF10BMAC_INTR_CTRL 0x08
#define NF10BMAC_TUSER_MAC0(1 0)
#define NF10BMAC_TUSER_CPU0(1 1)
@@ -109,11 +111,12 @@ static poll_handler_t nf10bmac_poll;
#define NF10BMAC_TUSER_MAC3(1 6)
#define NF10BMAC_TUSER_CPU3(1 7)
+#defineNF10BMAC_DATA_LEN_MASK 0x
#defineNF10BMAC_DATA_DPORT_MASK0xff00
#defineNF10BMAC_DATA_DPORT_SHIFT 24
#defineNF10BMAC_DATA_SPORT_MASK0x00ff
#defineNF10BMAC_DATA_SPORT_SHIFT 16
-#defineNF10BMAC_DATA_LAST 0x0080
+#defineNF10BMAC_DATA_LAST 0x8000
#defineNF10BMAC_DATA_STRB 0x000f
@@ -151,7 +154,7 @@ nf10bmac_read_4_be(struct resource *res,
}
#defineNF10BMAC_WRITE_CTRL_4(sc, reg, val)
\
- nf10bmac_write_4((sc)-nf10bmac_mem_res, (reg), (val), \
+ nf10bmac_write_4((sc)-nf10bmac_ctrl_res, (reg), (val), \
__func__, __LINE__)
#defineNF10BMAC_WRITE_4(sc, reg, val)
\
nf10bmac_write_4((sc)-nf10bmac_tx_mem_res, (reg), (val), \
@@ -166,6 +169,21 @@ nf10bmac_read_4_be(struct resource *res,
nf10bmac_read_4_be((sc)-nf10bmac_rx_mem_res, (reg),\
__func__, __LINE__)
+#defineNF10BMAC_WRITE_INTR_4(sc, reg, val, _f, _l)
\
+ nf10bmac_write_4((sc)-nf10bmac_intr_res, (reg), (val), \
+ (_f), (_l))
+
+#defineNF10BMAC_RX_INTR_CLEAR_DIS(sc)
\
+ NF10BMAC_WRITE_INTR_4((sc), NF10BMAC_INTR_CLEAR_DIS, 1, \
+ __func__, __LINE__)
+#defineNF10BMAC_RX_INTR_ENABLE(sc)
\
+ NF10BMAC_WRITE_INTR_4((sc), NF10BMAC_INTR_CTRL, 1, \
+ __func__, __LINE__)
+#defineNF10BMAC_RX_INTR_DISABLE(sc)
\
+ NF10BMAC_WRITE_INTR_4((sc), NF10BMAC_INTR_CTRL, 0, \
+ __func__, __LINE__)
+
+
#ifdef ENABLE_WATCHDOG
static void nf10bmac_tick(void *);
svn commit: r265767 - head/sys/dev/etherswitch/ip17x
Author: loos Date: Fri May 9 13:07:39 2014 New Revision: 265767 URL: http://svnweb.freebsd.org/changeset/base/265767 Log: Fix a bug on ip17x switch initialization which will fail as soon as you disable the debug and diagnosis options from current. We must wait 2ms after the switch reset and not 2us. Tested on RB433UAH. Modified: head/sys/dev/etherswitch/ip17x/ip175c.c head/sys/dev/etherswitch/ip17x/ip175d.c Modified: head/sys/dev/etherswitch/ip17x/ip175c.c == --- head/sys/dev/etherswitch/ip17x/ip175c.c Fri May 9 12:59:38 2014 (r265766) +++ head/sys/dev/etherswitch/ip17x/ip175c.c Fri May 9 13:07:39 2014 (r265767) @@ -63,7 +63,7 @@ ip175c_reset(struct ip17x_softc *sc) if (ip17x_writephy(sc-sc_dev, IP175C_RESET_PHY, IP175C_RESET_REG, 0x175c)) return (-1); - DELAY(2); + DELAY(2000); /* Force IP175C mode. */ data = ip17x_readphy(sc-sc_dev, IP175C_MODE_PHY, IP175C_MODE_REG); Modified: head/sys/dev/etherswitch/ip17x/ip175d.c == --- head/sys/dev/etherswitch/ip17x/ip175d.c Fri May 9 12:59:38 2014 (r265766) +++ head/sys/dev/etherswitch/ip17x/ip175d.c Fri May 9 13:07:39 2014 (r265767) @@ -62,7 +62,7 @@ ip175d_reset(struct ip17x_softc *sc) /* Reset all the switch settings. */ ip17x_writephy(sc-sc_dev, IP175D_RESET_PHY, IP175D_RESET_REG, 0x175d); - DELAY(2); + DELAY(2000); /* Disable the special tagging mode. */ ip17x_updatephy(sc-sc_dev, 21, 22, 0x3, 0x0); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265768 - stable/10/sys/kern
Author: brueffer
Date: Fri May 9 13:18:24 2014
New Revision: 265768
URL: http://svnweb.freebsd.org/changeset/base/265768
Log:
MFC: r265244
Free resources in an error case.
CID: 1018947
Found with: Coverity Prevent(tm)
Modified:
stable/10/sys/kern/kern_cpu.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_cpu.c
==
--- stable/10/sys/kern/kern_cpu.c Fri May 9 13:07:39 2014
(r265767)
+++ stable/10/sys/kern/kern_cpu.c Fri May 9 13:18:24 2014
(r265768)
@@ -1037,6 +1037,7 @@ cpufreq_unregister(device_t dev)
if (cf_dev == NULL) {
device_printf(dev,
warning: cpufreq_unregister called with no cpufreq device active\n);
+ free(devs, M_TEMP);
return (0);
}
cfcount = 0;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265770 - head/sys/dev/etherswitch/ip17x
Author: loos
Date: Fri May 9 13:21:34 2014
New Revision: 265770
URL: http://svnweb.freebsd.org/changeset/base/265770
Log:
Fix the build with debug enabled and remove a variable used only at switch
initialization, it is nonsense keep it around without futher use.
Modified:
head/sys/dev/etherswitch/ip17x/ip17x.c
head/sys/dev/etherswitch/ip17x/ip17x_var.h
Modified: head/sys/dev/etherswitch/ip17x/ip17x.c
==
--- head/sys/dev/etherswitch/ip17x/ip17x.c Fri May 9 13:21:14 2014
(r265769)
+++ head/sys/dev/etherswitch/ip17x/ip17x.c Fri May 9 13:21:34 2014
(r265770)
@@ -141,9 +141,7 @@ ip17x_attach_phys(struct ip17x_softc *sc
sc-ifp[port]-if_softc = sc;
sc-ifp[port]-if_flags |= IFF_UP | IFF_BROADCAST |
IFF_DRV_RUNNING | IFF_SIMPLEX;
- sc-ifname[port] = malloc(strlen(name)+1, M_IP17X, M_WAITOK);
- bcopy(name, sc-ifname[port], strlen(name)+1);
- if_initname(sc-ifp[port], sc-ifname[port], port);
+ if_initname(sc-ifp[port], name, port);
sc-miibus[port] = malloc(sizeof(device_t), M_IP17X,
M_WAITOK | M_ZERO);
err = mii_attach(sc-sc_dev, sc-miibus[port], sc-ifp[port],
@@ -204,8 +202,6 @@ ip17x_attach(device_t dev)
M_WAITOK | M_ZERO);
sc-pvid = malloc(sizeof(uint32_t) * sc-numports, M_IP17X,
M_WAITOK | M_ZERO);
- sc-ifname = malloc(sizeof(char *) * sc-numports, M_IP17X,
- M_WAITOK | M_ZERO);
sc-miibus = malloc(sizeof(device_t *) * sc-numports, M_IP17X,
M_WAITOK | M_ZERO);
sc-portphy = malloc(sizeof(int) * sc-numports, M_IP17X,
@@ -257,13 +253,11 @@ ip17x_detach(device_t dev)
device_delete_child(dev, (*sc-miibus[port]));
if (sc-ifp[port] != NULL)
if_free(sc-ifp[port]);
- free(sc-ifname[port], M_IP17X);
free(sc-miibus[port], M_IP17X);
}
free(sc-portphy, M_IP17X);
free(sc-miibus, M_IP17X);
- free(sc-ifname, M_IP17X);
free(sc-pvid, M_IP17X);
free(sc-ifp, M_IP17X);
@@ -490,12 +484,13 @@ ip17x_ifmedia_upd(struct ifnet *ifp)
struct ip17x_softc *sc;
struct mii_data *mii;
- DPRINTF(sc-sc_dev, %s\n, __func__);
sc = ifp-if_softc;
+ DPRINTF(sc-sc_dev, %s\n, __func__);
mii = ip17x_miiforport(sc, ifp-if_dunit);
if (mii == NULL)
return (ENXIO);
mii_mediachg(mii);
+
return (0);
}
@@ -505,9 +500,8 @@ ip17x_ifmedia_sts(struct ifnet *ifp, str
struct ip17x_softc *sc;
struct mii_data *mii;
- DPRINTF(sc-sc_dev, %s\n, __func__);
-
sc = ifp-if_softc;
+ DPRINTF(sc-sc_dev, %s\n, __func__);
mii = ip17x_miiforport(sc, ifp-if_dunit);
if (mii == NULL)
return;
Modified: head/sys/dev/etherswitch/ip17x/ip17x_var.h
==
--- head/sys/dev/etherswitch/ip17x/ip17x_var.h Fri May 9 13:21:14 2014
(r265769)
+++ head/sys/dev/etherswitch/ip17x/ip17x_var.h Fri May 9 13:21:34 2014
(r265770)
@@ -52,7 +52,6 @@ struct ip17x_softc {
int phyport[MII_NPHY];
int numports; /* number of ports */
int *portphy;
- char**ifname;
device_t**miibus;
etherswitch_info_t info;
ip17x_switch_type sc_switchtype;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265769 - stable/9/sys/kern
Author: brueffer
Date: Fri May 9 13:21:14 2014
New Revision: 265769
URL: http://svnweb.freebsd.org/changeset/base/265769
Log:
MFC: r265244
Free resources in an error case.
CID: 1018947
Found with: Coverity Prevent(tm)
Modified:
stable/9/sys/kern/kern_cpu.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/kern/kern_cpu.c
==
--- stable/9/sys/kern/kern_cpu.cFri May 9 13:18:24 2014
(r265768)
+++ stable/9/sys/kern/kern_cpu.cFri May 9 13:21:14 2014
(r265769)
@@ -1037,6 +1037,7 @@ cpufreq_unregister(device_t dev)
if (cf_dev == NULL) {
device_printf(dev,
warning: cpufreq_unregister called with no cpufreq device active\n);
+ free(devs, M_TEMP);
return (0);
}
cfcount = 0;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265772 - head/bin/sh
Author: jilles
Date: Fri May 9 13:27:30 2014
New Revision: 265772
URL: http://svnweb.freebsd.org/changeset/base/265772
Log:
sh: Add more necessary INTOFF/INTON.
Modified:
head/bin/sh/main.c
head/bin/sh/options.c
Modified: head/bin/sh/main.c
==
--- head/bin/sh/main.c Fri May 9 13:23:23 2014(r265771)
+++ head/bin/sh/main.c Fri May 9 13:27:30 2014(r265772)
@@ -140,11 +140,13 @@ main(int argc, char *argv[])
#endif
rootpid = getpid();
rootshell = 1;
+ INTOFF;
initvar();
setstackmark(smark);
setstackmark(smark2);
procargs(argc, argv);
pwd_init(iflag);
+ INTON;
if (iflag)
chkmail(1);
if (argv[0] argv[0][0] == '-') {
Modified: head/bin/sh/options.c
==
--- head/bin/sh/options.c Fri May 9 13:23:23 2014(r265771)
+++ head/bin/sh/options.c Fri May 9 13:27:30 2014(r265772)
@@ -475,7 +475,9 @@ atend:
}
else {
out1fmt(Illegal option -%c\n, c);
+ INTOFF;
(void) unsetvar(OPTARG);
+ INTON;
}
c = '?';
goto bad;
@@ -494,7 +496,9 @@ atend:
}
else {
out1fmt(No arg for -%c option\n, c);
+ INTOFF;
(void) unsetvar(OPTARG);
+ INTON;
c = '?';
}
goto bad;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265773 - in head/bin/sh: . tests/builtins
Author: jilles
Date: Fri May 9 13:32:36 2014
New Revision: 265773
URL: http://svnweb.freebsd.org/changeset/base/265773
Log:
sh: Send getopts error messages to stderr, not stdout.
Adjust a testcase for this change.
Modified:
head/bin/sh/options.c
head/bin/sh/tests/builtins/getopts1.0
Modified: head/bin/sh/options.c
==
--- head/bin/sh/options.c Fri May 9 13:27:30 2014(r265772)
+++ head/bin/sh/options.c Fri May 9 13:32:36 2014(r265773)
@@ -474,7 +474,7 @@ atend:
err |= setvarsafe(OPTARG, s, 0);
}
else {
- out1fmt(Illegal option -%c\n, c);
+ out2fmt_flush(Illegal option -%c\n, c);
INTOFF;
(void) unsetvar(OPTARG);
INTON;
@@ -495,7 +495,7 @@ atend:
c = ':';
}
else {
- out1fmt(No arg for -%c option\n, c);
+ out2fmt_flush(No arg for -%c option\n, c);
INTOFF;
(void) unsetvar(OPTARG);
INTON;
Modified: head/bin/sh/tests/builtins/getopts1.0
==
--- head/bin/sh/tests/builtins/getopts1.0 Fri May 9 13:27:30 2014
(r265772)
+++ head/bin/sh/tests/builtins/getopts1.0 Fri May 9 13:32:36 2014
(r265773)
@@ -15,7 +15,7 @@ printf -- '-2-\n'
set -- -ab
getopts ab: OPTION
echo ${OPTION}
-getopts ab: OPTION
+getopts ab: OPTION 32 21 3 3-
echo ${OPTION}
# The 'shift' is aimed at causing an error.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265774 - head/sys/mips/atheros
Author: loos
Date: Fri May 9 13:44:42 2014
New Revision: 265774
URL: http://svnweb.freebsd.org/changeset/base/265774
Log:
When a GPIO pin is set to be turned on by kernel hints (hint.gpio.X.pinon)
make sure the GPIO pin is configured as an output as this is not always the
case.
Modified:
head/sys/mips/atheros/ar71xx_gpio.c
Modified: head/sys/mips/atheros/ar71xx_gpio.c
==
--- head/sys/mips/atheros/ar71xx_gpio.c Fri May 9 13:32:36 2014
(r265773)
+++ head/sys/mips/atheros/ar71xx_gpio.c Fri May 9 13:44:42 2014
(r265774)
@@ -437,10 +437,13 @@ ar71xx_gpio_attach(device_t dev)
ar71xx_gpio_pin_configure(sc, sc-gpio_pins[i], DEFAULT_CAPS);
i++;
}
+ /* Turn on the hinted pins. */
for (i = 0; i sc-gpio_npins; i++) {
j = sc-gpio_pins[i].gp_pin;
- if ((pinon (1 j)) != 0)
+ if ((pinon (1 j)) != 0) {
+ ar71xx_gpio_pin_setflags(dev, j, GPIO_PIN_OUTPUT);
ar71xx_gpio_pin_set(dev, j, 1);
+ }
}
device_add_child(dev, gpioc, device_get_unit(dev));
device_add_child(dev, gpiobus, device_get_unit(dev));
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265775 - in head/sys: conf mips/atheros
Author: loos
Date: Fri May 9 14:02:18 2014
New Revision: 265775
URL: http://svnweb.freebsd.org/changeset/base/265775
Log:
Add support for reading RouterBoard's memory which is passed by the loader
(RouterBOOT).
Tested on RouterBoards, various and on RSPRO, TP-Link MR3x20
(for regressions).
Modified:
head/sys/conf/options.mips
head/sys/mips/atheros/ar71xx_machdep.c
Modified: head/sys/conf/options.mips
==
--- head/sys/conf/options.mips Fri May 9 13:44:42 2014(r265774)
+++ head/sys/conf/options.mips Fri May 9 14:02:18 2014(r265775)
@@ -104,6 +104,7 @@ ARGE_MDIO opt_arge.h
AR71XX_REALMEM opt_ar71xx.h
AR71XX_ENV_UBOOT opt_ar71xx.h
AR71XX_ENV_REDBOOT opt_ar71xx.h
+AR71XX_ENV_ROUTERBOOT opt_ar71xx.h
AR71XX_ATH_EEPROM opt_ar71xx.h
#
Modified: head/sys/mips/atheros/ar71xx_machdep.c
==
--- head/sys/mips/atheros/ar71xx_machdep.c Fri May 9 13:44:42 2014
(r265774)
+++ head/sys/mips/atheros/ar71xx_machdep.c Fri May 9 14:02:18 2014
(r265775)
@@ -140,6 +140,34 @@ ar71xx_redboot_get_macaddr(void)
}
}
+#ifdef AR71XX_ENV_ROUTERBOOT
+/*
+ * RouterBoot gives us the board memory in a command line argument.
+ */
+static int
+ar71xx_routerboot_get_mem(int argc, char **argv)
+{
+ int i, board_mem;
+
+ /*
+* Protect ourselves from garbage in registers.
+*/
+ if (!MIPS_IS_VALID_PTR(argv))
+ return (0);
+
+ for (i = 0; i argc; i++) {
+ if (argv[i] == NULL)
+ continue;
+ if (strncmp(argv[i], mem=, 4) == 0) {
+ if (sscanf(argv[i] + 4, %dM, board_mem) == 1)
+ return (btoc(board_mem * 1024 * 1024));
+ }
+ }
+
+ return (0);
+}
+#endif
+
void
platform_start(__register_t a0 __unused, __register_t a1 __unused,
__register_t a2 __unused, __register_t a3 __unused)
@@ -183,6 +211,14 @@ platform_start(__register_t a0 __unused,
}
}
+#ifdef AR71XX_ENV_ROUTERBOOT
+ /*
+* RouterBoot informs the board memory as a command line argument.
+*/
+ if (realmem == 0)
+ realmem = ar71xx_routerboot_get_mem(argc, argv);
+#endif
+
/*
* Just wild guess. RedBoot let us down and didn't reported
* memory size
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265776 - head/sys/netinet
Author: tuexen
Date: Fri May 9 14:15:48 2014
New Revision: 265776
URL: http://svnweb.freebsd.org/changeset/base/265776
Log:
Fix a logic bug which prevented the sending of UDP packet with 0 checksum.
This bug was introduced in r264212 and should be X-MFCed with that
revision, if UDP-Lite support if MFCed.
Modified:
head/sys/netinet/udp_usrreq.c
Modified: head/sys/netinet/udp_usrreq.c
==
--- head/sys/netinet/udp_usrreq.c Fri May 9 14:02:18 2014
(r265775)
+++ head/sys/netinet/udp_usrreq.c Fri May 9 14:15:48 2014
(r265776)
@@ -1375,7 +1375,8 @@ udp_output(struct inpcb *inp, struct mbu
faddr.s_addr = INADDR_BROADCAST;
if ((ui-ui_sum = in_cksum(m, sizeof(struct ip) + cscov)) == 0)
ui-ui_sum = 0x;
- } else if (V_udp_cksum || !cscov_partial) {
+ } else if (V_udp_cksum || pr == IPPROTO_UDPLITE) {
+ /* for UDP-Lite full checksum coverage is requested */
if (inp-inp_flags INP_ONESBCAST)
faddr.s_addr = INADDR_BROADCAST;
ui-ui_sum = in_pseudo(ui-ui_src.s_addr, faddr.s_addr,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265777 - head/sys/dev/usb/controller
Author: hselasky
Date: Fri May 9 14:23:06 2014
New Revision: 265777
URL: http://svnweb.freebsd.org/changeset/base/265777
Log:
Multiple DWC OTG host mode related fixes and improvements:
- Rework how we allocate and free USB host channels, so that we only
allocate a channel if there is a real packet going out on the USB
cable.
- Use BULK type for control data and status, due to instabilities in
the HW it appears.
- Split FIFO TX levels into one for the periodic FIFO and one for the
non-periodic FIFO.
- Use correct HFNUM mask when scheduling host transactions. The HFNUM
register does not count the full 16-bit range.
- Correct START/COMPLETION slot for TT transactions. For INTERRUPT and
ISOCHRONOUS type transactions the hardware always respects the ODDFRM
bit, which means we need to allocate multiple host channels when
processing such endpoints, to not miss any so-called complete split
opportunities.
- When doing ISOCHRONOUS OUT transfers through a TT send all data
payload in a single ALL-burst. This deacreases the likelyhood for
isochronous data underruns.
- Fixed unbalanced unlock in case of dwc_otg_init_fifo() failure.
- Increase interrupt priority.
MFC after:2 weeks
Modified:
head/sys/dev/usb/controller/dwc_otg.c
head/sys/dev/usb/controller/dwc_otg.h
head/sys/dev/usb/controller/dwc_otg_fdt.c
head/sys/dev/usb/controller/dwc_otgreg.h
Modified: head/sys/dev/usb/controller/dwc_otg.c
==
--- head/sys/dev/usb/controller/dwc_otg.c Fri May 9 14:15:48 2014
(r265776)
+++ head/sys/dev/usb/controller/dwc_otg.c Fri May 9 14:23:06 2014
(r265777)
@@ -92,6 +92,9 @@
#defineDWC_OTG_PC2SC(pc) \
DWC_OTG_BUS2SC(USB_DMATAG_TO_XROOT((pc)-tag_parent)-bus)
+#defineDWC_OTG_PC2UDEV(pc) \
+ (USB_DMATAG_TO_XROOT((pc)-tag_parent)-udev)
+
#defineDWC_OTG_MSK_GINT_ENABLED\
(GINTMSK_ENUMDONEMSK | \
GINTMSK_USBRSTMSK | \
@@ -136,8 +139,8 @@ static dwc_otg_cmd_t dwc_otg_host_data_r
static void dwc_otg_device_done(struct usb_xfer *, usb_error_t);
static void dwc_otg_do_poll(struct usb_bus *);
static void dwc_otg_standard_done(struct usb_xfer *);
-static void dwc_otg_root_intr(struct dwc_otg_softc *sc);
-static void dwc_otg_interrupt_poll(struct dwc_otg_softc *sc);
+static void dwc_otg_root_intr(struct dwc_otg_softc *);
+static void dwc_otg_interrupt_poll(struct dwc_otg_softc *);
/*
* Here is a configuration that the chip supports.
@@ -177,26 +180,33 @@ dwc_otg_init_fifo(struct dwc_otg_softc *
fifo_size = sc-sc_fifo_size;
- fifo_regs = 4 * (sc-sc_dev_ep_max + sc-sc_dev_in_ep_max);
+ /*
+* NOTE: Reserved fixed size area at end of RAM, which must
+* not be allocated to the FIFOs:
+*/
+ fifo_regs = 4 * 16;
- if (fifo_size = fifo_regs)
- fifo_size -= fifo_regs;
- else
- fifo_size = 0;
+ if (fifo_size fifo_regs) {
+ DPRINTF(Too little FIFO\n);
+ return (EINVAL);
+ }
+
+ /* subtract FIFO regs from total once */
+ fifo_size -= fifo_regs;
/* split equally for IN and OUT */
fifo_size /= 2;
- DWC_OTG_WRITE_4(sc, DOTG_GRXFSIZ, fifo_size / 4);
-
- /* align to 4-bytes */
+ /* align to 4 bytes boundary */
fifo_size = ~3;
+ /* set global receive FIFO size */
+ DWC_OTG_WRITE_4(sc, DOTG_GRXFSIZ, fifo_size / 4);
+
tx_start = fifo_size;
- if (fifo_size 0x40) {
+ if (fifo_size 64) {
DPRINTFN(-1, Not enough data space for EP0 FIFO.\n);
- USB_BUS_UNLOCK(sc-sc_bus);
return (EINVAL);
}
@@ -205,14 +215,12 @@ dwc_otg_init_fifo(struct dwc_otg_softc *
/* reset active endpoints */
sc-sc_active_rx_ep = 0;
- /* reset TX size */
- sc-sc_tx_cur_size = 0;
-
- /* reset TT info */
- memset(sc-sc_tt_info, 0, sizeof(sc-sc_tt_info));
-
+ /* split equally for periodic and non-periodic */
fifo_size /= 2;
+ /* align to 4 bytes boundary */
+ fifo_size = ~3;
+
DWC_OTG_WRITE_4(sc, DOTG_GNPTXFSIZ,
((fifo_size / 4) 16) |
(tx_start / 4));
@@ -228,7 +236,11 @@ dwc_otg_init_fifo(struct dwc_otg_softc *
((fifo_size / 4) 16) |
(tx_start / 4));
- /* store maximum TX FIFO size */
+ /* reset FIFO TX levels */
+ sc-sc_tx_cur_p_level = 0;
+ sc-sc_tx_cur_np_level = 0;
+
+ /* store maximum periodic and non-periodic FIFO TX size */
sc-sc_tx_max_size = fifo_size;
/* disable all host channel interrupts
svn commit: r265778 - head/usr.sbin/ndp
Author: melifaro
Date: Fri May 9 14:24:02 2014
New Revision: 265778
URL: http://svnweb.freebsd.org/changeset/base/265778
Log:
Fix ndp(8) -f flag parsing
PR: bin/136661
Reminded by: Vinicius Zavam
MFC after:2 weeks
Modified:
head/usr.sbin/ndp/ndp.8
head/usr.sbin/ndp/ndp.c
Modified: head/usr.sbin/ndp/ndp.8
==
--- head/usr.sbin/ndp/ndp.8 Fri May 9 14:23:06 2014(r265777)
+++ head/usr.sbin/ndp/ndp.8 Fri May 9 14:24:02 2014(r265778)
@@ -29,7 +29,7 @@
.\
.\ $FreeBSD$
.\
-.Dd Jan 10, 2013
+.Dd May 9, 2014
.Dt NDP 8
.Os
.\
@@ -136,9 +136,26 @@ seconds.
Erase all the NDP entries.
.It Fl d
Delete specified NDP entry.
-.It Fl f
-Parse the file specified by
-.Ar filename .
+.It Fl f Ar filename
+Cause the file
+.Ar filename
+to be read and multiple entries to be set in the
+.Tn NDP
+table.
+Entries
+in the file should be of the form
+.Pp
+.Bd -ragged -offset indent -compact
+.Ar hostname ether_addr
+.Op Cm temp
+.Op Cm proxy
+.Ed
+.Pp
+with argument meanings as given above.
+Leading whitespace and empty lines are ignored.
+A
+.Ql #
+character will mark the rest of the line as a comment.
.It Fl H
Harmonize consistency between the routing table and the default router
list; install the top entry of the list into the kernel routing table.
Modified: head/usr.sbin/ndp/ndp.c
==
--- head/usr.sbin/ndp/ndp.c Fri May 9 14:23:06 2014(r265777)
+++ head/usr.sbin/ndp/ndp.c Fri May 9 14:24:02 2014(r265778)
@@ -97,6 +97,7 @@
#include arpa/inet.h
+#include ctype.h
#include netdb.h
#include errno.h
#include nlist.h
@@ -126,7 +127,7 @@ char host_buf[NI_MAXHOST]; /* getnamein
char ifix_buf[IFNAMSIZ]; /* if_indextoname() */
int main(int, char **);
-int file(char *);
+static int file(char *);
void getsocket(void);
int set(int, char **);
void get(char *);
@@ -189,7 +190,8 @@ main(int argc, char **argv)
break;
case 'd':
case 'f':
- case 'i' :
+ exit(file(optarg) ? 1 : 0);
+ case 'i':
if (mode) {
usage();
/*NOTREACHED*/
@@ -312,17 +314,15 @@ main(int argc, char **argv)
/*
* Process a file to set standard ndp entries
*/
-int
+static int
file(char *name)
{
FILE *fp;
int i, retval;
- char line[100], arg[5][50], *args[5];
+ char line[100], arg[5][50], *args[5], *p;
- if ((fp = fopen(name, r)) == NULL) {
- fprintf(stderr, ndp: cannot open %s\n, name);
- exit(1);
- }
+ if ((fp = fopen(name, r)) == NULL)
+ err(1, cannot open %s, name);
args[0] = arg[0][0];
args[1] = arg[1][0];
args[2] = arg[2][0];
@@ -330,10 +330,15 @@ file(char *name)
args[4] = arg[4][0];
retval = 0;
while (fgets(line, sizeof(line), fp) != NULL) {
+ if ((p = strchr(line, '#')) != NULL)
+ *p = '\0';
+ for (p = line; isblank(*p); p++);
+ if (*p == '\n' || *p == '\0')
+ continue;
i = sscanf(line, %49s %49s %49s %49s %49s,
arg[0], arg[1], arg[2], arg[3], arg[4]);
if (i 2) {
- fprintf(stderr, ndp: bad line: %s\n, line);
+ warnx(bad line: %s, line);
retval = 1;
continue;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265779 - head/sys/dev/usb
Author: hselasky Date: Fri May 9 14:28:11 2014 New Revision: 265779 URL: http://svnweb.freebsd.org/changeset/base/265779 Log: Fix for NULL pointer. MFC after:1 week Modified: head/sys/dev/usb/usb_pf.c Modified: head/sys/dev/usb/usb_pf.c == --- head/sys/dev/usb/usb_pf.c Fri May 9 14:24:02 2014(r265778) +++ head/sys/dev/usb/usb_pf.c Fri May 9 14:28:11 2014(r265779) @@ -395,7 +395,7 @@ usbpf_xfertap(struct usb_xfer *xfer, int bus = xfer-xroot-bus; /* sanity checks */ - if (bus-ifp == NULL) + if (bus-ifp == NULL || bus-ifp-if_bpf == NULL) return; if (!bpf_peers_present(bus-ifp-if_bpf)) return; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265780 - head/sys/modules/sound/sound
Author: hselasky
Date: Fri May 9 14:35:07 2014
New Revision: 265780
URL: http://svnweb.freebsd.org/changeset/base/265780
Log:
Invert platform check.
Suggested by: imp @
MFC after:2 weeks
Modified:
head/sys/modules/sound/sound/Makefile
Modified: head/sys/modules/sound/sound/Makefile
==
--- head/sys/modules/sound/sound/Makefile Fri May 9 14:28:11 2014
(r265779)
+++ head/sys/modules/sound/sound/Makefile Fri May 9 14:35:07 2014
(r265780)
@@ -44,8 +44,8 @@ CLEANFILES+= feeder_eq_gen.h feeder_rate
EXPORT_SYMS= YES # XXX evaluate
-.if ${MACHINE_CPUARCH} == sparc64 || ${MACHINE_CPUARCH} == powerpc || \
-${MACHINE_CPUARCH} == arm || ${MACHINE_CPUARCH} == mips
+.if ${MACHINE_CPUARCH} != i386 ${MACHINE_CPUARCH} != amd64 \
+${MACHINE_CPUARCH} != ia64 ${MACHINE_CPUARCH} != pc98
# Create an empty opt_isa.h in order to keep kmod.mk from linking in an
# existing one from KERNBUILDDIR which possibly has DEV_ISA defined so
# sound.ko is always built without isadma support.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265781 - stable/10/usr.sbin/daemon
Author: jh
Date: Fri May 9 15:55:45 2014
New Revision: 265781
URL: http://svnweb.freebsd.org/changeset/base/265781
Log:
MFC r264194:
Fork a child process and wait until the process terminates when the -P
option is specified. This behavior is documented on the manual page.
PR: bin/187265
Modified:
stable/10/usr.sbin/daemon/daemon.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/daemon/daemon.c
==
--- stable/10/usr.sbin/daemon/daemon.c Fri May 9 14:35:07 2014
(r265780)
+++ stable/10/usr.sbin/daemon/daemon.c Fri May 9 15:55:45 2014
(r265781)
@@ -139,7 +139,7 @@ main(int argc, char *argv[])
* get SIGCHLD eventually.
*/
pid = -1;
- if (pidfile != NULL || restart) {
+ if (pidfile != NULL || ppidfile != NULL || restart) {
/*
* Restore default action for SIGTERM in case the
* parent process decided to ignore it.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265782 - head/usr.bin/systat
Author: melifaro
Date: Fri May 9 16:20:55 2014
New Revision: 265782
URL: http://svnweb.freebsd.org/changeset/base/265782
Log:
Allow systat(1) interactive dispay-specific commands to
be specified via command line.
Submitted by: vsevolod
MFC after:2 weeks
Modified:
head/usr.bin/systat/ifstat.c
head/usr.bin/systat/main.c
head/usr.bin/systat/systat.1
Modified: head/usr.bin/systat/ifstat.c
==
--- head/usr.bin/systat/ifstat.cFri May 9 15:55:45 2014
(r265781)
+++ head/usr.bin/systat/ifstat.cFri May 9 16:20:55 2014
(r265782)
@@ -77,7 +77,7 @@ struct if_stat {
u_long if_in_pps_peak;
u_long if_out_pps_peak;
u_int if_row; /* Index into ifmib sysctl */
- u_int if_ypos;/* 0 if not being displayed */
+ int if_ypos;/* -1 if not being displayed */
u_int display;
u_int match;
};
@@ -210,13 +210,19 @@ showifstat(void)
struct if_stat *ifp = NULL;
SLIST_FOREACH(ifp, curlist, link) {
- if (ifp-display == 0 || (ifp-match == 0) ||
- ifp-if_ypos LINES - 3 - 1)
- continue;
- PUTNAME(ifp);
- PUTRATE(col2, ifp-if_ypos);
- PUTRATE(col3, ifp-if_ypos);
- PUTTOTAL(col4, ifp-if_ypos);
+ if (ifp-if_ypos LINES - 3 ifp-if_ypos != -1)
+ if (ifp-display == 0 || ifp-match == 0) {
+ wmove(wnd, ifp-if_ypos, 0);
+ wclrtoeol(wnd);
+ wmove(wnd, ifp-if_ypos + 1, 0);
+ wclrtoeol(wnd);
+ }
+ else {
+ PUTNAME(ifp);
+ PUTRATE(col2, ifp-if_ypos);
+ PUTRATE(col3, ifp-if_ypos);
+ PUTTOTAL(col4, ifp-if_ypos);
+ }
}
return;
@@ -425,6 +431,8 @@ sort_interface_list(void)
ifp-if_ypos = y;
y += ROW_SPACING;
}
+ else
+ ifp-if_ypos = -1;
}
needsort = 0;
@@ -476,14 +484,13 @@ cmdifstat(const char *cmd, const char *a
retval = ifcmd(cmd, args);
/* ifcmd() returns 1 on success */
if (retval == 1) {
- showifstat();
- refresh();
if (needclear) {
+ showifstat();
+ refresh();
werase(wnd);
labelifstat();
needclear = 0;
}
}
-
return (retval);
}
Modified: head/usr.bin/systat/main.c
==
--- head/usr.bin/systat/main.c Fri May 9 15:55:45 2014(r265781)
+++ head/usr.bin/systat/main.c Fri May 9 16:20:55 2014(r265782)
@@ -44,6 +44,7 @@ static const char copyright[] =
#include sys/param.h
#include sys/time.h
#include sys/sysctl.h
+#include sys/queue.h
#include err.h
#include limits.h
@@ -53,6 +54,7 @@ static const char copyright[] =
#include signal.h
#include stdio.h
#include stdlib.h
+#include string.h
#include unistd.h
#include systat.h
@@ -77,12 +79,67 @@ int use_kvm = 1;
static WINDOW *wload; /* one line window for load average */
+struct cmdentry {
+ SLIST_ENTRY(cmdentry) link;
+ char*cmd; /* Command name */
+ char*argv; /* Arguments vector for a command */
+};
+SLIST_HEAD(, cmdentry) commands;
+
+static void
+parse_cmd_args (int argc, char **argv)
+{
+ int in_command = 0;
+ struct cmdentry *cmd = NULL;
+ double t;
+
+ while (argc) {
+ if (argv[0][0] == '-') {
+ if (in_command)
+ SLIST_INSERT_HEAD(commands, cmd, link);
+
+ if (memcmp(argv[0], --, 3) == 0) {
+ in_command = 0; /*-- ends a command explicitly*/
+ argc --, argv ++;
+ continue;
+ }
+ cmd = calloc(1, sizeof(struct cmdentry));
+ if (cmd == NULL)
+ errx(1, memory allocating failure);
+ cmd-cmd = strdup(argv[0][1]);
+ if (cmd-cmd == NULL)
+ errx(1, memory allocating failure);
+ in_command = 1;
+ }
+ else if (!in_command) {
+ t = strtod(argv[0], NULL) * 100.0;
+
svn commit: r265783 - head/sys/dev/usb/controller
Author: hselasky
Date: Fri May 9 16:40:41 2014
New Revision: 265783
URL: http://svnweb.freebsd.org/changeset/base/265783
Log:
Fix a regression issue:
- ACK can be received before data arrives in RX FIFO. Handle this.
- Remove obsolete comment.
- Some minor code styling.
MFC after:2 weeks
Modified:
head/sys/dev/usb/controller/dwc_otg.c
Modified: head/sys/dev/usb/controller/dwc_otg.c
==
--- head/sys/dev/usb/controller/dwc_otg.c Fri May 9 16:20:55 2014
(r265782)
+++ head/sys/dev/usb/controller/dwc_otg.c Fri May 9 16:40:41 2014
(r265783)
@@ -1240,6 +1240,10 @@ check_state:
goto complete;
}
} else if (hcint HCINT_ACK) {
+ /* wait for data - ACK arrived first */
+ if (!(hcint HCINT_SOFTWARE_ONLY))
+ goto busy;
+
if (td-ep_type == UE_ISOCHRONOUS) {
/* check if we are complete */
if ((td-remainder == 0) ||
@@ -1595,8 +1599,6 @@ dwc_otg_host_data_tx(struct dwc_otg_td *
}
}
- /* channel must be disabled before we can complete the transfer */
-
if (hcint (HCINT_ERRORS | HCINT_RETRY |
HCINT_ACK | HCINT_NYET)) {
@@ -1646,15 +1648,13 @@ check_state:
break;
case DWC_CHAN_ST_WAIT_C_ANE:
- if (hcint HCINT_NYET)
+ if (hcint HCINT_NYET) {
goto send_cpkt;
-
- if (hcint (HCINT_RETRY | HCINT_ERRORS)) {
+ } else if (hcint (HCINT_RETRY | HCINT_ERRORS)) {
td-did_nak = 1;
td-tt_scheduled = 0;
goto send_pkt;
- }
- if (hcint HCINT_ACK) {
+ } else if (hcint HCINT_ACK) {
td-offset += td-tx_bytes;
td-remainder -= td-tx_bytes;
td-toggle ^= 1;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265784 - head/sys/arm/arm
Author: ian Date: Fri May 9 19:14:34 2014 New Revision: 265784 URL: http://svnweb.freebsd.org/changeset/base/265784 Log: Call idcache_inv_all from the AP core entry code before turning on the MMU. Also, enable instruction and branch caches, which should be safe now that they're properly initialized/invalidated first. Modified: head/sys/arm/arm/cpufunc_asm_armv7.S head/sys/arm/arm/locore.S Modified: head/sys/arm/arm/cpufunc_asm_armv7.S == --- head/sys/arm/arm/cpufunc_asm_armv7.SFri May 9 16:40:41 2014 (r265783) +++ head/sys/arm/arm/cpufunc_asm_armv7.SFri May 9 19:14:34 2014 (r265784) @@ -319,6 +319,10 @@ ENTRY(armv7_auxctrl) RET END(armv7_auxctrl) +/* + * Invalidate all I+D+branch cache. Used by startup code, which counts + * on the fact that only r0-r3,ip are modified and no stack space is used. + */ ENTRY(armv7_idcache_inv_all) mov r0, #0 mcr p15, 2, r0, c0, c0, 0 @ set cache level to L1 Modified: head/sys/arm/arm/locore.S == --- head/sys/arm/arm/locore.S Fri May 9 16:40:41 2014(r265783) +++ head/sys/arm/arm/locore.S Fri May 9 19:14:34 2014(r265784) @@ -353,24 +353,24 @@ ASENTRY_NP(mpentry) orr r7, r7, #(I32_bit|F32_bit) msr cpsr_c, r7 - - adr r7, Ltag - bic r7, r7, #0xf000 - orr r7, r7, #PHYSADDR - - /* Disable MMU for a while */ + /* Disable MMU. It should be disabled already, but make sure. */ mrc p15, 0, r2, c1, c0, 0 bic r2, r2, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE |\ CPU_CONTROL_WBUF_ENABLE) bic r2, r2, #(CPU_CONTROL_IC_ENABLE) bic r2, r2, #(CPU_CONTROL_BPRD_ENABLE) mcr p15, 0, r2, c1, c0, 0 - nop nop nop + CPWAIT(r0) + +#if defined(ARM_MMU_V6) + bl armv6_idcache_inv_all /* Modifies r0 only */ +#elif defined(ARM_MMU_V7) + bl armv7_idcache_inv_all /* Modifies r0-r3, ip */ +#endif -Ltag: ldr r0, Lstartup_pagetable_secondary bic r0, r0, #0xf000 orr r0, r0, #PHYSADDR @@ -389,7 +389,10 @@ Ltag: mrc p15, 0, r0, c1, c0, 0 orr r0, r0, #CPU_CONTROL_V6_EXTPAGE orr r0, r0, #CPU_CONTROL_AF_ENABLE - orr r0, r0, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE) + orr r0, r0, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE |\ + CPU_CONTROL_WBUF_ENABLE) + orr r0, r0, #(CPU_CONTROL_IC_ENABLE) + orr r0, r0, #(CPU_CONTROL_BPRD_ENABLE) mcr p15, 0, r0, c1, c0, 0 nop nop ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265785 - in head: share/mk sys/conf
Author: imp
Date: Fri May 9 21:11:27 2014
New Revision: 265785
URL: http://svnweb.freebsd.org/changeset/base/265785
Log:
Introduce kern.opts.mk to hold all the options for kernel module
builds. Include this in the right places. Make src.opts.mk optional so
that modules can be built outside of the tree in the ports system.
PR: 189520
Added:
head/sys/conf/kern.opts.mk (contents, props changed)
Modified:
head/share/mk/src.opts.mk
head/sys/conf/kern.pre.mk
head/sys/conf/kmod.mk
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Fri May 9 19:14:34 2014(r265784)
+++ head/share/mk/src.opts.mk Fri May 9 21:11:27 2014(r265785)
@@ -24,7 +24,7 @@
#
# Makefiles should never test WITH_FOO or WITHOUT_FOO directly (although an
# exception is made for _WITHOUT_SRCONF which turns off this mechanism
-# completely).
+# completely inside bsd.*.mk files).
#
.if !target(__src.opts.mk__)
@@ -84,7 +84,6 @@ __DEFAULT_YES_OPTIONS = \
FDT \
FLOPPY \
FMTREE \
-FORMAT_EXTENSIONS \
FORTH \
FP_LIBC \
FREEBSD_UPDATE \
@@ -105,7 +104,6 @@ __DEFAULT_YES_OPTIONS = \
IPFW \
JAIL \
KDUMP \
-KERNEL_SYMBOLS \
KVM \
LDNS \
LDNS_UTILS \
Added: head/sys/conf/kern.opts.mk
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/conf/kern.opts.mk Fri May 9 21:11:27 2014(r265785)
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+# Options set in the build system that affect the kernel somehow.
+
+#
+# Define MK_* variables (which are either yes or no) for users
+# to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
+# make(1) environment.
+# These should be tested with `== no' or `!= no' in makefiles.
+# The NO_* variables should only be set by makefiles for variables
+# that haven't been converted over.
+#
+
+# These options are used by the kernel build process (kern.mk and kmod.mk)
+# They have to be listed here so we can build modules outside of the
+# src tree.
+
+__DEFAULT_YES_OPTIONS = \
+FORMAT_EXTENTIONS \
+KERNEL_SYMBOLS
+
+__DEFAULT_NO_OPTIONS = \
+
+.include ../../share/mk/bsd.mkopt.mk
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Fri May 9 19:14:34 2014(r265784)
+++ head/sys/conf/kern.pre.mk Fri May 9 21:11:27 2014(r265785)
@@ -5,6 +5,7 @@
.include src.opts.mk
.include bsd.compiler.mk
+.include kern.opts.mk
# backwards compat option for older systems.
MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc64/powerpc/}
Modified: head/sys/conf/kmod.mk
==
--- head/sys/conf/kmod.mk Fri May 9 19:14:34 2014(r265784)
+++ head/sys/conf/kmod.mk Fri May 9 21:11:27 2014(r265785)
@@ -72,9 +72,15 @@ OBJCOPY?=objcopy
.error Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND
.endif
-.include src.opts.mk
+# Note: we're really bsd.kmod.mk, so we have to allow src.opts.mk to be
+# optional. Include it if we can so we can get /etc/src.conf changes,
+# if we're in the tree. If we can't include it that's OK. kern.opts.mk
+# has all the kernel options in it, and should be included after src.opts.mk
+# so it picks everything up.
+.sinclude src.opts.mk
.include bsd.init.mk
.include bsd.compiler.mk
+.include kern.opts.mk
.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265791 - head/sys/conf
Author: imp Date: Sat May 10 00:42:43 2014 New Revision: 265791 URL: http://svnweb.freebsd.org/changeset/base/265791 Log: Fix typo in FORMAT_EXTENSIONS which breaks universe. Modified: head/sys/conf/kern.opts.mk Modified: head/sys/conf/kern.opts.mk == --- head/sys/conf/kern.opts.mk Sat May 10 00:26:40 2014(r265790) +++ head/sys/conf/kern.opts.mk Sat May 10 00:42:43 2014(r265791) @@ -16,7 +16,7 @@ # src tree. __DEFAULT_YES_OPTIONS = \ -FORMAT_EXTENTIONS \ +FORMAT_EXTENSIONS \ KERNEL_SYMBOLS __DEFAULT_NO_OPTIONS = \ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265792 - head/sys/kern
Author: adrian
Date: Sat May 10 00:53:36 2014
New Revision: 265792
URL: http://svnweb.freebsd.org/changeset/base/265792
Log:
Add in support to optionally pin the swi threads.
Under enough load, the swi's can actually be preempted and migrated
to other currently free cores. When doing RSS experiments, this lead
to the per-CPU TCP timers not lining up any more with the RX CPU said
flows were ending up on, leading to increased lock contention.
Since there was a little pushback on flipping them on by default,
I've left the default at don't pin.
The other less obvious problem here is that the default swi
is also the same as the destination swi for CPU #0. So if one
pins the swi on CPU #0, there's no default floating swi.
A nice future project would be to create a separate swi for
the default floating swi, as well as per-CPU swis that are
(optionally) pinned.
Tested:
* parallel TCP tests (2 x 1g unfortunately for now);
CPU: Intel(R) Xeon(R) CPU E5-2650
Note:
This is based on some initial investigation into RSS/TCP stack lock
contention on FreeBSD-HEAD whilst at Netflix in January 2014.
Modified:
head/sys/kern/kern_timeout.c
Modified: head/sys/kern/kern_timeout.c
==
--- head/sys/kern/kern_timeout.cSat May 10 00:42:43 2014
(r265791)
+++ head/sys/kern/kern_timeout.cSat May 10 00:53:36 2014
(r265792)
@@ -104,6 +104,14 @@ static int ncallout;
SYSCTL_INT(_kern, OID_AUTO, ncallout, CTLFLAG_RDTUN, ncallout, 0,
Number of entries in callwheel and size of timeout() preallocation);
+static int pin_default_swi = 0;
+static int pin_pcpu_swi = 0;
+
+SYSCTL_INT(_kern, OID_AUTO, pin_default_swi, CTLFLAG_RDTUN, pin_default_swi,
+0, Pin the default (non-per-cpu) swi (shared with PCPU 0 swi));
+SYSCTL_INT(_kern, OID_AUTO, pin_pcpu_swi, CTLFLAG_RDTUN, pin_pcpu_swi,
+0, Pin the per-CPU swis (except PCPU 0, which is also default);
+
/*
* TODO:
* allocate more timeout table slots when table overflows.
@@ -273,6 +281,12 @@ callout_callwheel_init(void *dummy)
callwheelmask = callwheelsize - 1;
/*
+* Fetch whether we're pinning the swi's or not.
+*/
+ TUNABLE_INT_FETCH(kern.pin_default_swi, pin_default_swi);
+ TUNABLE_INT_FETCH(kern.pin_pcpu_swi, pin_pcpu_swi);
+
+ /*
* Only cpu0 handles timeout(9) and receives a preallocation.
*
* XXX: Once all timeout(9) consumers are converted this can
@@ -355,6 +369,7 @@ start_softclock(void *dummy)
char name[MAXCOMLEN];
#ifdef SMP
int cpu;
+ struct intr_event *ie;
#endif
cc = CC_CPU(timeout_cpu);
@@ -362,6 +377,13 @@ start_softclock(void *dummy)
if (swi_add(clk_intr_event, name, softclock, cc, SWI_CLOCK,
INTR_MPSAFE, cc-cc_cookie))
panic(died while creating standard software ithreads);
+ if (pin_default_swi
+ (intr_event_bind(clk_intr_event, timeout_cpu) != 0)) {
+ printf(%s: timeout clock couldn't be pinned to cpu %d\n,
+ __func__,
+ timeout_cpu);
+ }
+
#ifdef SMP
CPU_FOREACH(cpu) {
if (cpu == timeout_cpu)
@@ -370,9 +392,16 @@ start_softclock(void *dummy)
cc-cc_callout = NULL; /* Only cpu0 handles timeout(9). */
callout_cpu_init(cc);
snprintf(name, sizeof(name), clock (%d), cpu);
- if (swi_add(NULL, name, softclock, cc, SWI_CLOCK,
+ ie = NULL;
+ if (swi_add(ie, name, softclock, cc, SWI_CLOCK,
INTR_MPSAFE, cc-cc_cookie))
panic(died while creating standard software ithreads);
+ if (pin_pcpu_swi (intr_event_bind(ie, cpu) != 0)) {
+ printf(%s: per-cpu clock couldn't be pinned to
+ cpu %d\n,
+ __func__,
+ cpu);
+ }
}
#endif
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265794 - in stable/7/sys: dev/bxe modules/bxe
Author: davidcs Date: Sat May 10 02:06:46 2014 New Revision: 265794 URL: http://svnweb.freebsd.org/changeset/base/265794 Log: MFC r265411 Modify Copyright information to reflect Qlogic Corporation's purchase of Broadcom's NetXtreme business Submitted by:David C Somayajulu (davi...@freebsd.org) QLogic Corporation Modified: stable/7/sys/dev/bxe/57710_init_values.c stable/7/sys/dev/bxe/57710_int_offsets.h stable/7/sys/dev/bxe/57711_init_values.c stable/7/sys/dev/bxe/57711_int_offsets.h stable/7/sys/dev/bxe/57712_init_values.c stable/7/sys/dev/bxe/57712_int_offsets.h stable/7/sys/dev/bxe/bxe.c stable/7/sys/dev/bxe/bxe.h stable/7/sys/dev/bxe/bxe_dcb.h stable/7/sys/dev/bxe/bxe_debug.c stable/7/sys/dev/bxe/bxe_elink.c stable/7/sys/dev/bxe/bxe_elink.h stable/7/sys/dev/bxe/bxe_stats.c stable/7/sys/dev/bxe/bxe_stats.h stable/7/sys/dev/bxe/ecore_fw_defs.h stable/7/sys/dev/bxe/ecore_hsi.h stable/7/sys/dev/bxe/ecore_init.h stable/7/sys/dev/bxe/ecore_init_ops.h stable/7/sys/dev/bxe/ecore_mfw_req.h stable/7/sys/dev/bxe/ecore_reg.h stable/7/sys/dev/bxe/ecore_sp.c stable/7/sys/dev/bxe/ecore_sp.h stable/7/sys/modules/bxe/Makefile Directory Properties: stable/7/ (props changed) stable/7/sys/ (props changed) Modified: stable/7/sys/dev/bxe/57710_init_values.c == --- stable/7/sys/dev/bxe/57710_init_values.cSat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57710_init_values.cSat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/57710_int_offsets.h == --- stable/7/sys/dev/bxe/57710_int_offsets.hSat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57710_int_offsets.hSat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/57711_init_values.c == --- stable/7/sys/dev/bxe/57711_init_values.cSat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57711_init_values.cSat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3.
svn commit: r265795 - in stable/8/sys: dev/bxe modules/bxe
Author: davidcs Date: Sat May 10 02:08:04 2014 New Revision: 265795 URL: http://svnweb.freebsd.org/changeset/base/265795 Log: MFC r265411 Modify Copyright information to reflect Qlogic Corporation's purchase of Broadcom's NetXtreme business Submitted by:David C Somayajulu (davi...@freebsd.org) QLogic Corporation Modified: stable/8/sys/dev/bxe/57710_init_values.c stable/8/sys/dev/bxe/57710_int_offsets.h stable/8/sys/dev/bxe/57711_init_values.c stable/8/sys/dev/bxe/57711_int_offsets.h stable/8/sys/dev/bxe/57712_init_values.c stable/8/sys/dev/bxe/57712_int_offsets.h stable/8/sys/dev/bxe/bxe.c stable/8/sys/dev/bxe/bxe.h stable/8/sys/dev/bxe/bxe_dcb.h stable/8/sys/dev/bxe/bxe_debug.c stable/8/sys/dev/bxe/bxe_elink.c stable/8/sys/dev/bxe/bxe_elink.h stable/8/sys/dev/bxe/bxe_stats.c stable/8/sys/dev/bxe/bxe_stats.h stable/8/sys/dev/bxe/ecore_fw_defs.h stable/8/sys/dev/bxe/ecore_hsi.h stable/8/sys/dev/bxe/ecore_init.h stable/8/sys/dev/bxe/ecore_init_ops.h stable/8/sys/dev/bxe/ecore_mfw_req.h stable/8/sys/dev/bxe/ecore_reg.h stable/8/sys/dev/bxe/ecore_sp.c stable/8/sys/dev/bxe/ecore_sp.h stable/8/sys/modules/bxe/Makefile Directory Properties: stable/8/ (props changed) stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/modules/ (props changed) Modified: stable/8/sys/dev/bxe/57710_init_values.c == --- stable/8/sys/dev/bxe/57710_init_values.cSat May 10 02:06:46 2014 (r265794) +++ stable/8/sys/dev/bxe/57710_init_values.cSat May 10 02:08:04 2014 (r265795) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/8/sys/dev/bxe/57710_int_offsets.h == --- stable/8/sys/dev/bxe/57710_int_offsets.hSat May 10 02:06:46 2014 (r265794) +++ stable/8/sys/dev/bxe/57710_int_offsets.hSat May 10 02:08:04 2014 (r265795) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/8/sys/dev/bxe/57711_init_values.c == --- stable/8/sys/dev/bxe/57711_init_values.cSat May 10 02:06:46 2014 (r265794) +++ stable/8/sys/dev/bxe/57711_init_values.cSat May 10 02:08:04 2014 (r265795) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the
svn commit: r265796 - in stable/9/sys: dev/bxe modules/bxe
Author: davidcs Date: Sat May 10 02:09:09 2014 New Revision: 265796 URL: http://svnweb.freebsd.org/changeset/base/265796 Log: MFC r265411 Modify Copyright information to reflect Qlogic Corporation's purchase of Broadcom's NetXtreme business Submitted by:David C Somayajulu (davi...@freebsd.org) QLogic Corporation Modified: stable/9/sys/dev/bxe/57710_init_values.c stable/9/sys/dev/bxe/57710_int_offsets.h stable/9/sys/dev/bxe/57711_init_values.c stable/9/sys/dev/bxe/57711_int_offsets.h stable/9/sys/dev/bxe/57712_init_values.c stable/9/sys/dev/bxe/57712_int_offsets.h stable/9/sys/dev/bxe/bxe.c stable/9/sys/dev/bxe/bxe.h stable/9/sys/dev/bxe/bxe_dcb.h stable/9/sys/dev/bxe/bxe_debug.c stable/9/sys/dev/bxe/bxe_elink.c stable/9/sys/dev/bxe/bxe_elink.h stable/9/sys/dev/bxe/bxe_stats.c stable/9/sys/dev/bxe/bxe_stats.h stable/9/sys/dev/bxe/ecore_fw_defs.h stable/9/sys/dev/bxe/ecore_hsi.h stable/9/sys/dev/bxe/ecore_init.h stable/9/sys/dev/bxe/ecore_init_ops.h stable/9/sys/dev/bxe/ecore_mfw_req.h stable/9/sys/dev/bxe/ecore_reg.h stable/9/sys/dev/bxe/ecore_sp.c stable/9/sys/dev/bxe/ecore_sp.h stable/9/sys/modules/bxe/Makefile Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/dev/bxe/57710_init_values.c == --- stable/9/sys/dev/bxe/57710_init_values.cSat May 10 02:08:04 2014 (r265795) +++ stable/9/sys/dev/bxe/57710_init_values.cSat May 10 02:09:09 2014 (r265796) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/9/sys/dev/bxe/57710_int_offsets.h == --- stable/9/sys/dev/bxe/57710_int_offsets.hSat May 10 02:08:04 2014 (r265795) +++ stable/9/sys/dev/bxe/57710_int_offsets.hSat May 10 02:09:09 2014 (r265796) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/9/sys/dev/bxe/57711_init_values.c == --- stable/9/sys/dev/bxe/57711_init_values.cSat May 10 02:08:04 2014 (r265795) +++ stable/9/sys/dev/bxe/57711_init_values.cSat May 10 02:09:09 2014 (r265796) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the
svn commit: r265797 - in stable/10/sys: dev/bxe modules/bxe
Author: davidcs Date: Sat May 10 02:10:32 2014 New Revision: 265797 URL: http://svnweb.freebsd.org/changeset/base/265797 Log: MFC r265411 Modify Copyright information to reflect Qlogic Corporation's purchase of Broadcom's NetXtreme business Submitted by:David C Somayajulu (davi...@freebsd.org) QLogic Corporation Modified: stable/10/sys/dev/bxe/57710_init_values.c stable/10/sys/dev/bxe/57710_int_offsets.h stable/10/sys/dev/bxe/57711_init_values.c stable/10/sys/dev/bxe/57711_int_offsets.h stable/10/sys/dev/bxe/57712_init_values.c stable/10/sys/dev/bxe/57712_int_offsets.h stable/10/sys/dev/bxe/bxe.c stable/10/sys/dev/bxe/bxe.h stable/10/sys/dev/bxe/bxe_dcb.h stable/10/sys/dev/bxe/bxe_debug.c stable/10/sys/dev/bxe/bxe_elink.c stable/10/sys/dev/bxe/bxe_elink.h stable/10/sys/dev/bxe/bxe_stats.c stable/10/sys/dev/bxe/bxe_stats.h stable/10/sys/dev/bxe/ecore_fw_defs.h stable/10/sys/dev/bxe/ecore_hsi.h stable/10/sys/dev/bxe/ecore_init.h stable/10/sys/dev/bxe/ecore_init_ops.h stable/10/sys/dev/bxe/ecore_mfw_req.h stable/10/sys/dev/bxe/ecore_reg.h stable/10/sys/dev/bxe/ecore_sp.c stable/10/sys/dev/bxe/ecore_sp.h stable/10/sys/modules/bxe/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/bxe/57710_init_values.c == --- stable/10/sys/dev/bxe/57710_init_values.c Sat May 10 02:09:09 2014 (r265796) +++ stable/10/sys/dev/bxe/57710_init_values.c Sat May 10 02:10:32 2014 (r265797) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/10/sys/dev/bxe/57710_int_offsets.h == --- stable/10/sys/dev/bxe/57710_int_offsets.h Sat May 10 02:09:09 2014 (r265796) +++ stable/10/sys/dev/bxe/57710_int_offsets.h Sat May 10 02:10:32 2014 (r265797) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/10/sys/dev/bxe/57711_init_values.c == --- stable/10/sys/dev/bxe/57711_init_values.c Sat May 10 02:09:09 2014 (r265796) +++ stable/10/sys/dev/bxe/57711_init_values.c Sat May 10 02:10:32 2014 (r265797) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3.
svn commit: r265798 - head/share/man/man4
Author: wblock (doc committer) Date: Sat May 10 03:24:45 2014 New Revision: 265798 URL: http://svnweb.freebsd.org/changeset/base/265798 Log: Add a man page for the new vt.4 device. Reviewed by: ray, emaste (slightly earlier version) Added: head/share/man/man4/vt.4 (contents, props changed) Added: head/share/man/man4/vt.4 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/vt.4Sat May 10 03:24:45 2014(r265798) @@ -0,0 +1,230 @@ +.\ Copyright (c) 2014 Warren Block +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\ SUCH DAMAGE. +.\ +.\ $FreeBSD$ +.\ +.Dd May 9, 2014 +.Dt VIRTUAL TERMINALS 4 +.Os +.Sh NAME +.Nm vt +.Nd virtual terminal console driver +.Sh SYNOPSIS +.Cd options VT_MAXWINDOWS=N +.Cd options VT_ALT_TO_ESC_HACK=1 +.Cd options VT_TWOBUTTON_MOUSE +.Cd options VT_FB_DEFAULT_WIDTH=X +.Cd options VT_FB_DEFAULT_HEIGHT=Y +.Cd options SC_NO_CUTPASTE +.Cd options SC_NO_SYSMOUSE +.Cd device vt +.Pp +In +.Xr loader.conf 5 : +.Cd hw.vga.textmode=1 +.Sh DESCRIPTION +The +.Nm +device provides multiple virtual terminals with an extensive feature +set: +.Bl -item -offset indent +.It +Unicode UTF-8 text with double-width characters. +.It +Large font maps in graphics mode, including support for Asian +character sets. +.It +Graphics-mode consoles. +.It +Integration with +KMS +.Pq Kernel Mode Setting +video drivers for switching between the +.Em X Window System +and virtual terminals. +.El +.Ss Virtual Terminals +Multiple virtual terminals are provided on a single computer. +Up to sixteen virtual terminals can be defined. +A single virtual terminal is connected to the screen and keyboard +at a time. +Key combinations are used to select a virtual terminal. +Alt-F1 through Alt-F12 correspond to the first twelve virtual terminals. +If more than twelve virtual terminals are created, Shift-Alt-F1 through +Shift-Alt-F4 are used to switch to the additional terminals. +.Ss Copying and Pasting Text with a Mouse +Copying and pasting text from the screen with a mouse is supported. +Press and hold down mouse button 1, usually the left button, while +moving the mouse to select text. +Selected text is highlighted with reversed foreground and background +colors. +To select more text after releasing mouse button 1, press mouse button +3, usually the right button. +To paste text that has been selected, press mouse button 2, usually the +middle button. +The text is entered as if it were typed at the keyboard. +The +.Dv VT_TWOBUTTON_MOUSE +kernel option can be used with mice that only have two buttons. +Setting this option makes the second mouse button into the +paste button. +See +.Xr moused 8 +for more information. +.Ss Scrolling Back +Output that has scrolled off the screen can be reviewed by pressing the +Scroll Lock key, then scrolling up and down with the arrow keys. +The Page Up and Page Down keys scroll up or down a full screen at a +time. +The Home and End keys jump to the beginning or end of the scrollback +buffer. +When finished reviewing, press the Scroll Lock key again to return to +normal use. +.Sh DRIVER CONFIGURATION +.Ss Kernel Configuration Options +These kernel options control the +.Nm +driver. +.Bl -tag -width MAXCONS +.It Dv VT_MAXWINDOWS=N +Set the number of virtual terminals to be created to +.Fa N . +The value defaults to 12. +.It Dv VT_ALT_TO_ESC_HACK=1 +When the Alt key is held down while pressing another key, send an ESC +sequence instead of the Alt key. +.It Dv VT_TWOBUTTON_MOUSE +If defined, swap the functions of mouse buttons 2 and 3. +In effect, this makes the right-hand mouse button perform a paste. +These
svn commit: r265803 - head/sys/dev/iwn
Author: adrian
Date: Sat May 10 05:56:10 2014
New Revision: 265803
URL: http://svnweb.freebsd.org/changeset/base/265803
Log:
Fix the required calibration flags for the Centrino 1000 NIC.
Modified:
head/sys/dev/iwn/if_iwn_chip_cfg.h
Modified: head/sys/dev/iwn/if_iwn_chip_cfg.h
==
--- head/sys/dev/iwn/if_iwn_chip_cfg.h Sat May 10 05:16:28 2014
(r265802)
+++ head/sys/dev/iwn/if_iwn_chip_cfg.h Sat May 10 05:56:10 2014
(r265803)
@@ -219,14 +219,16 @@ static const struct iwn_base_params iwn1
.regulatory_bands = iwn5000_regulatory_bands,
.enhanced_TX_power = false,
.calib_need =
- ( IWN_FLG_NEED_PHY_CALIB_DC
- | IWN_FLG_NEED_PHY_CALIB_LO
+ ( IWN_FLG_NEED_PHY_CALIB_LO
+ | IWN_FLG_NEED_PHY_CALIB_TX_IQ_PERIODIC
| IWN_FLG_NEED_PHY_CALIB_TX_IQ
- | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+ | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+ ),
.support_hostap = false,
.no_multi_vaps = true,
.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
- .bt_mode = IWN_BT_NONE,
+ /* XXX 1000 - no BT */
+ .bt_mode = IWN_BT_SIMPLE,
.plcp_err_threshold = IWN_PLCP_ERR_EXT_LONG_THRESHOLD,
};
static const struct iwn_base_params iwn_6000_base_params = {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
