Re: svn commit: r258850 - in head/lib: libcapsicum libcasper
On Mon, Dec 02, 2013 at 09:34:30PM +0100, Pawel Jakub Dawidek wrote: P On Mon, Dec 02, 2013 at 05:07:22PM +, Pawel Jakub Dawidek wrote: P P Author: pjd P P Date: Mon Dec 2 17:07:22 2013 P P New Revision: 258850 P P URL: http://svnweb.freebsd.org/changeset/base/258850 P P P P Log: P P Both libcasper and libcapsicum libraries have to be installed in /lib/, P P as they are used by /sbin/casperd. P P Although time window was small, still you need to put the files into P ObsoletedFiles.inc. P P Couple of my hosts already got /usr/lib/libcasper.* installed. P P Something like this? P P http://people.freebsd.org/~pjd/patches/ObsoleteFiles.inc.patch Looks okay. -- Totus tuus, Glebius. ___ 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: r258866 - head/lib/libcasper
Author: pjd
Date: Tue Dec 3 13:26:37 2013
New Revision: 258866
URL: http://svnweb.freebsd.org/changeset/base/258866
Log:
Fix comparisons in assertions.
Reported by: Coverity
Coverity CID: 1130048
Modified:
head/lib/libcasper/libcasper.c
Modified: head/lib/libcasper/libcasper.c
==
--- head/lib/libcasper/libcasper.c Tue Dec 3 04:32:02 2013
(r258865)
+++ head/lib/libcasper/libcasper.c Tue Dec 3 13:26:37 2013
(r258866)
@@ -114,7 +114,7 @@ service_free(struct service *service)
{
struct service_connection *sconn;
- PJDLOG_ASSERT(service-s_magic = SERVICE_MAGIC);
+ PJDLOG_ASSERT(service-s_magic == SERVICE_MAGIC);
service-s_magic = 0;
while ((sconn = service_connection_first(service)) != NULL)
@@ -130,7 +130,7 @@ service_connection_add(struct service *s
struct service_connection *sconn;
int serrno;
- PJDLOG_ASSERT(service-s_magic = SERVICE_MAGIC);
+ PJDLOG_ASSERT(service-s_magic == SERVICE_MAGIC);
sconn = malloc(sizeof(*sconn));
if (sconn == NULL) {
@@ -168,7 +168,7 @@ service_connection_remove(struct service
struct service_connection *sconn)
{
- PJDLOG_ASSERT(service-s_magic = SERVICE_MAGIC);
+ PJDLOG_ASSERT(service-s_magic == SERVICE_MAGIC);
PJDLOG_ASSERT(sconn-sc_magic == SERVICE_CONNECTION_MAGIC);
TAILQ_REMOVE(service-s_connections, sconn, sc_next);
@@ -206,7 +206,7 @@ service_connection_first(struct service
{
struct service_connection *sconn;
- PJDLOG_ASSERT(service-s_magic = SERVICE_MAGIC);
+ PJDLOG_ASSERT(service-s_magic == SERVICE_MAGIC);
sconn = TAILQ_FIRST(service-s_connections);
PJDLOG_ASSERT(sconn == NULL ||
___
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: r258867 - head/sbin/casperd
Author: pjd
Date: Tue Dec 3 13:28:05 2013
New Revision: 258867
URL: http://svnweb.freebsd.org/changeset/base/258867
Log:
Initialize cookie before use.
Reported by: Coverity
Coverity CID: 1135292
Modified:
head/sbin/casperd/casperd.c
Modified: head/sbin/casperd/casperd.c
==
--- head/sbin/casperd/casperd.c Tue Dec 3 13:26:37 2013(r258866)
+++ head/sbin/casperd/casperd.c Tue Dec 3 13:28:05 2013(r258867)
@@ -206,6 +206,7 @@ casper_limit(const nvlist_t *oldlimits,
int type;
void *cookie;
+ cookie = NULL;
while ((name = nvlist_next(newlimits, type, cookie)) != NULL) {
if (type != NV_TYPE_NULL)
return (EINVAL);
___
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: r258868 - head
Author: pjd Date: Tue Dec 3 13:38:13 2013 New Revision: 258868 URL: http://svnweb.freebsd.org/changeset/base/258868 Log: Add libcapsicum and libcasper libraries that were moved from /usr/lib/ to /lib/. Reviewed by: glebius Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Tue Dec 3 13:28:05 2013(r258867) +++ head/ObsoleteFiles.inc Tue Dec 3 13:38:13 2013(r258868) @@ -38,6 +38,13 @@ # xargs -n1 | sort | uniq -d; # done +# 20131202: libcapsicum and libcasper moved to /lib/ +OLD_FILES+=usr/lib/libcapsicum.a +OLD_FILES+=usr/lib/libcapsicum.so +OLD_LIBS+=usr/lib/libcapsicum.so.0 +OLD_FILES+=usr/lib/libcasper.a +OLD_FILES+=usr/lib/libcasper.so +OLD_LIBS+=usr/lib/libcasper.so.0 # 20131109: extattr(2) mlinks fixed OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz ___ 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: r258869 - head/sys/kern
Author: jhb Date: Tue Dec 3 14:50:12 2013 New Revision: 258869 URL: http://svnweb.freebsd.org/changeset/base/258869 Log: Fix an off-by-one error in r228960. The maximum priority delta provided by SCHED_PRI_TICKS should be SCHED_PRI_RANGE - 1 so that the resulting priority value (before nice adjustment) is between SCHED_PRI_MIN and SCHED_PRI_MAX, inclusive. Submitted by: kib Reported by: pho MFC after:1 week Modified: head/sys/kern/sched_ule.c Modified: head/sys/kern/sched_ule.c == --- head/sys/kern/sched_ule.c Tue Dec 3 13:38:13 2013(r258868) +++ head/sys/kern/sched_ule.c Tue Dec 3 14:50:12 2013(r258869) @@ -1532,7 +1532,7 @@ sched_priority(struct thread *td) pri = SCHED_PRI_MIN; if (td-td_sched-ts_ticks) pri += min(SCHED_PRI_TICKS(td-td_sched), - SCHED_PRI_RANGE); + SCHED_PRI_RANGE - 1); pri += SCHED_PRI_NICE(td-td_proc-p_nice); KASSERT(pri = PRI_MIN_BATCH pri = PRI_MAX_BATCH, (sched_priority: invalid priority %d: nice %d, ___ 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: r258870 - in stable/9: lib/libc/sys sys/dev/drm2/i915 sys/kern sys/sys sys/vm usr.bin/kdump usr.bin/truss
Author: jhb Date: Tue Dec 3 16:07:56 2013 New Revision: 258870 URL: http://svnweb.freebsd.org/changeset/base/258870 Log: MFC 253471,253620,254430,254538: Change mmap() to more optimally use superpages and provide support for tweaking alignment of virtual mappings. - Add a new address space allocation method (VMFS_OPTIMAL_SPACE) for vm_map_find() that will try to alter the alignment of a mapping to match any existing superpage mappings of the object being mapped. If no suitable address range is found with the necessary alignment, vm_map_find() will fall back to using the simple first-fit strategy (VMFS_ANY_SPACE). - Change mmap() without MAP_FIXED, shmat(), shm_map(), and the GEM mapping ioctl to use VMFS_OPTIMAL_SPACE instead of VMFS_ANY_SPACE. - MAP_ALIGNED(n) requests a mapping aligned on a boundary of (1 n). Requests for n = number of bits in a pointer or less than the size of a page fail with EINVAL. This matches the API provided by NetBSD. - MAP_ALIGNED_SUPER is a special case of MAP_ALIGNED. It can be used to optimize the chances of using large pages. By default it will align the mapping on a large page boundary (the system is free to choose any large page size to align to that seems best for the mapping request). However, if the object being mapped is already using large pages, then it will align the virtual mapping to match the existing large pages in the object instead. - Internally, VMFS_ALIGNED_SPACE is now renamed to VMFS_SUPER_SPACE, and VMFS_ALIGNED_SPACE(n) is repurposed for specifying a specific alignment. MAP_ALIGNED(n) maps to using VMFS_ALIGNED_SPACE(n), while MAP_ALIGNED_SUPER maps to VMFS_SUPER_SPACE. - mmap() of a device object now uses VMFS_OPTIMAL_SPACE rather than explicitly using VMFS_SUPER_SPACE. All device objects are forced to use a specific color on creation, so VMFS_OPTIMAL_SPACE is effectively equivalent. PR: ports/184173 (exp-run) Modified: stable/9/lib/libc/sys/mmap.2 stable/9/sys/dev/drm2/i915/i915_gem.c stable/9/sys/kern/sysv_shm.c stable/9/sys/kern/uipc_shm.c stable/9/sys/sys/mman.h stable/9/sys/vm/vm_kern.c stable/9/sys/vm/vm_map.c stable/9/sys/vm/vm_map.h stable/9/sys/vm/vm_mmap.c stable/9/usr.bin/kdump/mksubr stable/9/usr.bin/truss/syscalls.c Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/sys/ (props changed) stable/9/usr.bin/kdump/ (props changed) stable/9/usr.bin/truss/ (props changed) Modified: stable/9/lib/libc/sys/mmap.2 == --- stable/9/lib/libc/sys/mmap.2Tue Dec 3 14:50:12 2013 (r258869) +++ stable/9/lib/libc/sys/mmap.2Tue Dec 3 16:07:56 2013 (r258870) @@ -28,7 +28,7 @@ .\@(#)mmap.2 8.4 (Berkeley) 5/11/95 .\ $FreeBSD$ .\ -.Dd March 18, 2012 +.Dd August 16, 2013 .Dt MMAP 2 .Os .Sh NAME @@ -97,7 +97,30 @@ Sharing, mapping type and options are sp argument by .Em or Ns 'ing the following values: -.Bl -tag -width MAP_HASSEMAPHORE +.Bl -tag -width MAP_PREFAULT_READ +.It Dv MAP_ALIGNED Ns Pq Fa n +Align the region on a requested boundary. +If a suitable region cannot be found, +.Fn mmap +will fail. +The +.Fa n +argument specifies the binary logarithm of the desired alignment. +.It Dv MAP_ALIGNED_SUPER +Align the region to maximize the potential use of large +.Pq Dq super +pages. +If a suitable region cannot be found, +.Fn mmap +will fail. +The system will choose a suitable page size based on the size of +mapping. +The page size used as well as the alignment of the region may both be +affected by properties of the file being mapped. +In particular, +the physical address of existing pages of a file may require a specific +alignment. +The region is not guaranteed to be aligned on any specific boundary. .It Dv MAP_ANON Map anonymous memory not associated with any specific file. The file descriptor used for creating @@ -274,6 +297,25 @@ Although this implementation does not im the .Fa offset argument, a portable program must only use page-aligned values. +.Pp +Large page mappings require that the pages backing an object be +aligned in matching blocks in both the virtual address space and RAM. +The system will automatically attempt to use large page mappings when +mapping an object that is already backed by large pages in RAM by +aligning the mapping request in the virtual address space to match the +alignment of the large physical pages. +The system may also use large page mappings when mapping portions of an +object that are not yet backed by pages in RAM. +The +.Dv MAP_ALIGNED_SUPER +flag is an optimization that will align the mapping request to the +size of a large page similar to +.Dv MAP_ALIGNED , +except that the system will override this
svn commit: r258871 - head/sys/cam/ctl
Author: trasz
Date: Tue Dec 3 18:04:14 2013
New Revision: 258871
URL: http://svnweb.freebsd.org/changeset/base/258871
Log:
Properly report an error instead of panicing when user tries to create
LUN backed by non-disk device, e.g. /dev/null.
Reviewed by: ken (earlier version)
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/cam/ctl/ctl_backend_block.c
Modified: head/sys/cam/ctl/ctl_backend_block.c
==
--- head/sys/cam/ctl/ctl_backend_block.cTue Dec 3 16:07:56 2013
(r258870)
+++ head/sys/cam/ctl/ctl_backend_block.cTue Dec 3 18:04:14 2013
(r258871)
@@ -1483,6 +1483,7 @@ ctl_be_block_close(struct ctl_be_block_l
case CTL_BE_BLOCK_FILE:
break;
case CTL_BE_BLOCK_NONE:
+ break;
default:
panic(Unexpected backend type.);
break;
@@ -1501,6 +1502,7 @@ ctl_be_block_close(struct ctl_be_block_l
}
break;
case CTL_BE_BLOCK_NONE:
+ break;
default:
panic(Unexpected backend type.);
break;
@@ -1587,7 +1589,7 @@ ctl_be_block_open(struct ctl_be_block_so
} else {
error = EINVAL;
snprintf(req-error_str, sizeof(req-error_str),
-%s is not a disk or file, be_lun-dev_path);
+%s is not a disk or plain file, be_lun-dev_path);
}
VOP_UNLOCK(be_lun-vn, 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: r258873 - head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD
Author: emaste
Date: Tue Dec 3 18:12:51 2013
New Revision: 258873
URL: http://svnweb.freebsd.org/changeset/base/258873
Log:
Workaround lldb issue with main module base address
On FreeBSD lldb sometimes reloads the the main module's (executable's)
symbols at the wrong address. Work around this for now by explicitly
reloading at base_address=0 when it happens.
A proper fix is needed but early testers have reported this issue so
this workaround should allow them to make further progress.
http://llvm.org/bugs/show_bug.cgi?id=17880
Modified:
head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
Modified:
head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
==
---
head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
Tue Dec 3 18:12:39 2013(r258872)
+++
head/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
Tue Dec 3 18:12:51 2013(r258873)
@@ -454,6 +454,17 @@ DynamicLoaderPOSIXDYLD::LoadAllCurrentMo
const char *module_path = I-path.c_str();
FileSpec file(module_path, false);
ModuleSP module_sp = LoadModuleAtAddress(file, I-link_addr,
I-base_addr);
+#ifdef __FreeBSD__ // llvm.org/pr17880
+if (module_sp == executable)
+{
+Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER));
+if (log)
+log-Printf(DynamicLoaderPOSIXDYLD::%s reloading main module,
ignoring rendezvous base addr % PRIx64,
+__FUNCTION__, I-base_addr);
+ModuleSP module_sp = LoadModuleAtAddress(file, I-link_addr, 0);
+}
+#endif
+
if (module_sp.get())
{
module_list.Append(module_sp);
___
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: r258875 - stable/10/lib/libc/posix1e
Author: trasz Date: Tue Dec 3 18:18:35 2013 New Revision: 258875 URL: http://svnweb.freebsd.org/changeset/base/258875 Log: MFC r258041: Mention acl_get_brand_np(3). Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/lib/libc/posix1e/acl.3 Directory Properties: stable/10/lib/libc/ (props changed) Modified: stable/10/lib/libc/posix1e/acl.3 == --- stable/10/lib/libc/posix1e/acl.3Tue Dec 3 18:15:27 2013 (r258874) +++ stable/10/lib/libc/posix1e/acl.3Tue Dec 3 18:18:35 2013 (r258875) @@ -27,7 +27,7 @@ .\ .\ $FreeBSD$ .\ -.Dd June 25, 2009 +.Dd November 12, 2013 .Dt ACL 3 .Os .Sh NAME @@ -131,6 +131,10 @@ This function is described in .Xr acl_from_text 3 , and may be used to convert a text-form ACL into working ACL state, if the ACL has POSIX.1e or NFSv4 semantics. +.It Fn acl_get_brand_np +This function is described in +.Xr acl_get_brand_np 3 +and may be used to determine whether the ACL has POSIX.1e or NFSv4 semantics. .It Fn acl_get_entry This function is described in .Xr acl_get_entry 3 , @@ -248,6 +252,7 @@ library. .Xr acl_free 3 , .Xr acl_from_text 3 , .Xr acl_get 3 , +.Xr acl_get_brand_np 3 , .Xr acl_get_entry_type_np 3 , .Xr acl_get_flagset_np 3 , .Xr acl_get_permset 3 , ___ 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: r258877 - stable/10/lib/libc/posix1e
Author: trasz Date: Tue Dec 3 18:28:18 2013 New Revision: 258877 URL: http://svnweb.freebsd.org/changeset/base/258877 Log: MFC r258042: Fix description to actually make sense. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/lib/libc/posix1e/acl_is_trivial_np.3 Directory Properties: stable/10/lib/libc/ (props changed) Modified: stable/10/lib/libc/posix1e/acl_is_trivial_np.3 == --- stable/10/lib/libc/posix1e/acl_is_trivial_np.3 Tue Dec 3 18:27:10 2013(r258876) +++ stable/10/lib/libc/posix1e/acl_is_trivial_np.3 Tue Dec 3 18:28:18 2013(r258877) @@ -27,7 +27,7 @@ .\ .\ $FreeBSD$ .\ -.Dd December 13, 2010 +.Dd November 12, 2013 .Dt ACL_STRIP_NP 3 .Os .Sh NAME @@ -56,9 +56,8 @@ ACL is trivial if it can be fully expres any access rules. For POSIX.1e ACLs, ACL is trivial if it has the three required entries, one for owner, one for owning group, and one for other. -For NFSv4 ACLs, ACL is trivial if is identical to the ACL generated by -.Fn acl_strip_np 3 -from the file mode. +For NFSv4 ACLs, ACL is trivial if it is identical to the ACL generated by +.Fn acl_strip_np 3 . Files that have non-trivial ACL have a plus sign appended after mode bits in ls -l output. .Sh RETURN VALUES ___ 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: r258880 - stable/10/lib/libc/posix1e
Author: trasz Date: Tue Dec 3 18:35:17 2013 New Revision: 258880 URL: http://svnweb.freebsd.org/changeset/base/258880 Log: MFC r258043: Fix typo. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/lib/libc/posix1e/acl.3 Directory Properties: stable/10/lib/libc/ (props changed) Modified: stable/10/lib/libc/posix1e/acl.3 == --- stable/10/lib/libc/posix1e/acl.3Tue Dec 3 18:34:52 2013 (r258879) +++ stable/10/lib/libc/posix1e/acl.3Tue Dec 3 18:35:17 2013 (r258880) @@ -206,7 +206,7 @@ This function is described in .Xr acl_set_tag_type 3 , and may be used to set the tag type of an ACL. .It Fn acl_strip_np -This function is describe din +This function is described in .Xr acl-strip_np 3 , and may be used to remove extended entries from an ACL. .It Xo ___ 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: r258879 - in head/sys/dev/cxgbe: . common
Author: np
Date: Tue Dec 3 18:34:52 2013
New Revision: 258879
URL: http://svnweb.freebsd.org/changeset/base/258879
Log:
cxgbe(4): T4_SET_SCHED_CLASS and T4_SET_SCHED_QUEUE ioctls to program
scheduling classes in the chip and to bind tx queue(s) to a scheduling
class respectively. These can be used for various kinds of tx traffic
throttling (to force selected tx queues to drain at a fixed Kbps rate,
or a % of the port's total bandwidth, or at a fixed pps rate, etc.).
Obtained from:Chelsio
Modified:
head/sys/dev/cxgbe/common/common.h
head/sys/dev/cxgbe/common/t4_hw.c
head/sys/dev/cxgbe/t4_ioctl.h
head/sys/dev/cxgbe/t4_main.c
Modified: head/sys/dev/cxgbe/common/common.h
==
--- head/sys/dev/cxgbe/common/common.h Tue Dec 3 18:31:27 2013
(r258878)
+++ head/sys/dev/cxgbe/common/common.h Tue Dec 3 18:34:52 2013
(r258879)
@@ -587,4 +587,8 @@ int t4_sge_ctxt_rd_bd(struct adapter *ad
int t4_sge_ctxt_flush(struct adapter *adap, unsigned int mbox);
int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl);
int t4_fwaddrspace_write(struct adapter *adap, unsigned int mbox, u32 addr,
u32 val);
+int t4_sched_config(struct adapter *adapter, int type, int minmaxen);
+int t4_sched_params(struct adapter *adapter, int type, int level, int mode,
+ int rateunit, int ratemode, int channel, int cl,
+ int minrate, int maxrate, int weight, int pktsize);
#endif /* __CHELSIO_COMMON_H */
Modified: head/sys/dev/cxgbe/common/t4_hw.c
==
--- head/sys/dev/cxgbe/common/t4_hw.c Tue Dec 3 18:31:27 2013
(r258878)
+++ head/sys/dev/cxgbe/common/t4_hw.c Tue Dec 3 18:34:52 2013
(r258879)
@@ -5664,3 +5664,50 @@ int __devinit t4_port_init(struct port_i
return 0;
}
+
+int t4_sched_config(struct adapter *adapter, int type, int minmaxen)
+{
+ struct fw_sched_cmd cmd;
+
+ memset(cmd, 0, sizeof(cmd));
+ cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
+ F_FW_CMD_REQUEST |
+ F_FW_CMD_WRITE);
+ cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+
+ cmd.u.config.sc = FW_SCHED_SC_CONFIG;
+ cmd.u.config.type = type;
+ cmd.u.config.minmaxen = minmaxen;
+
+ return t4_wr_mbox_meat(adapter,adapter-mbox, cmd, sizeof(cmd),
+ NULL, 1);
+}
+
+int t4_sched_params(struct adapter *adapter, int type, int level, int mode,
+ int rateunit, int ratemode, int channel, int cl,
+ int minrate, int maxrate, int weight, int pktsize)
+{
+ struct fw_sched_cmd cmd;
+
+ memset(cmd, 0, sizeof(cmd));
+ cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
+ F_FW_CMD_REQUEST |
+ F_FW_CMD_WRITE);
+ cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+
+ cmd.u.params.sc = FW_SCHED_SC_PARAMS;
+ cmd.u.params.type = type;
+ cmd.u.params.level = level;
+ cmd.u.params.mode = mode;
+ cmd.u.params.ch = channel;
+ cmd.u.params.cl = cl;
+ cmd.u.params.unit = rateunit;
+ cmd.u.params.rate = ratemode;
+ cmd.u.params.min = cpu_to_be32(minrate);
+ cmd.u.params.max = cpu_to_be32(maxrate);
+ cmd.u.params.weight = cpu_to_be16(weight);
+ cmd.u.params.pktsize = cpu_to_be16(pktsize);
+
+ return t4_wr_mbox_meat(adapter,adapter-mbox, cmd, sizeof(cmd),
+ NULL, 1);
+}
Modified: head/sys/dev/cxgbe/t4_ioctl.h
==
--- head/sys/dev/cxgbe/t4_ioctl.h Tue Dec 3 18:31:27 2013
(r258878)
+++ head/sys/dev/cxgbe/t4_ioctl.h Tue Dec 3 18:34:52 2013
(r258879)
@@ -208,6 +208,74 @@ struct t4_filter {
struct t4_filter_specification fs;
};
+/*
+ * Support for sched-class command to allow a TX Scheduling Class to be
+ * programmed with various parameters.
+ */
+struct t4_sched_params {
+ int8_t subcmd;/* sub-command */
+ int8_t type; /* packet or flow */
+ union {
+ struct {/* sub-command SCHED_CLASS_CONFIG */
+ int8_t minmax;/* minmax enable */
+ } config;
+ struct {/* sub-command SCHED_CLASS_PARAMS */
+ int8_t level; /* scheduler hierarchy level */
+ int8_t mode; /* per-class or per-flow */
+ int8_t rateunit; /* bit or packet rate */
+ int8_t ratemode; /* %port relative or kbps
+ absolute */
+ int8_t
svn commit: r258882 - in vendor/lldb/dist: include/lldb include/lldb/API include/lldb/Breakpoint include/lldb/Core include/lldb/DataFormatters include/lldb/Expression include/lldb/Host include/lldb...
Author: emaste Date: Tue Dec 3 18:51:59 2013 New Revision: 258882 URL: http://svnweb.freebsd.org/changeset/base/258882 Log: Import lldb as of SVN r196259 (git 3be86e5) (A number of files not required for the FreeBSD build have been removed.) Sponsored by: DARPA, AFRL Added: vendor/lldb/dist/include/lldb/API/SBPlatform.h vendor/lldb/dist/include/lldb/Host/Debug.h vendor/lldb/dist/include/lldb/Target/RegisterCheckpoint.h vendor/lldb/dist/include/lldb/Utility/Iterable.h vendor/lldb/dist/source/API/SBPlatform.cpp vendor/lldb/dist/source/Plugins/Process/Utility/HistoryThread.cpp vendor/lldb/dist/source/Plugins/Process/Utility/HistoryThread.h vendor/lldb/dist/source/Plugins/Process/Utility/HistoryUnwind.cpp vendor/lldb/dist/source/Plugins/Process/Utility/HistoryUnwind.h vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextHistory.cpp vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextHistory.h Modified: vendor/lldb/dist/include/lldb/API/SBDebugger.h vendor/lldb/dist/include/lldb/API/SBError.h vendor/lldb/dist/include/lldb/API/SBExpressionOptions.h vendor/lldb/dist/include/lldb/API/SBFileSpec.h vendor/lldb/dist/include/lldb/API/SBModule.h vendor/lldb/dist/include/lldb/API/SBTarget.h vendor/lldb/dist/include/lldb/API/SBThread.h vendor/lldb/dist/include/lldb/Breakpoint/Breakpoint.h vendor/lldb/dist/include/lldb/Breakpoint/BreakpointList.h vendor/lldb/dist/include/lldb/Breakpoint/BreakpointLocationList.h vendor/lldb/dist/include/lldb/Core/Address.h vendor/lldb/dist/include/lldb/Core/Debugger.h vendor/lldb/dist/include/lldb/Core/Module.h vendor/lldb/dist/include/lldb/DataFormatters/CXXFormatterFunctions.h vendor/lldb/dist/include/lldb/DataFormatters/FormatCache.h vendor/lldb/dist/include/lldb/DataFormatters/FormatClasses.h vendor/lldb/dist/include/lldb/DataFormatters/FormatManager.h vendor/lldb/dist/include/lldb/DataFormatters/FormatNavigator.h vendor/lldb/dist/include/lldb/DataFormatters/TypeCategory.h vendor/lldb/dist/include/lldb/Expression/ClangFunction.h vendor/lldb/dist/include/lldb/Expression/ClangUserExpression.h vendor/lldb/dist/include/lldb/Host/File.h vendor/lldb/dist/include/lldb/Host/FileSpec.h vendor/lldb/dist/include/lldb/Host/Host.h vendor/lldb/dist/include/lldb/Host/OptionParser.h vendor/lldb/dist/include/lldb/Interpreter/PythonDataObjects.h vendor/lldb/dist/include/lldb/Interpreter/ScriptInterpreterPython.h vendor/lldb/dist/include/lldb/Symbol/TypeList.h vendor/lldb/dist/include/lldb/Target/ABI.h vendor/lldb/dist/include/lldb/Target/LanguageRuntime.h vendor/lldb/dist/include/lldb/Target/Platform.h vendor/lldb/dist/include/lldb/Target/Process.h vendor/lldb/dist/include/lldb/Target/RegisterContext.h vendor/lldb/dist/include/lldb/Target/SystemRuntime.h vendor/lldb/dist/include/lldb/Target/Target.h vendor/lldb/dist/include/lldb/Target/Thread.h vendor/lldb/dist/include/lldb/Target/ThreadList.h vendor/lldb/dist/include/lldb/Target/ThreadPlanCallFunction.h vendor/lldb/dist/include/lldb/Target/ThreadPlanCallUserExpression.h vendor/lldb/dist/include/lldb/Utility/PythonPointer.h vendor/lldb/dist/include/lldb/lldb-enumerations.h vendor/lldb/dist/include/lldb/lldb-forward.h vendor/lldb/dist/include/lldb/lldb-private-enumerations.h vendor/lldb/dist/include/lldb/lldb-python.h vendor/lldb/dist/source/API/SBDebugger.cpp vendor/lldb/dist/source/API/SBExpressionOptions.cpp vendor/lldb/dist/source/API/SBFileSpec.cpp vendor/lldb/dist/source/API/SBModule.cpp vendor/lldb/dist/source/API/SBProcess.cpp vendor/lldb/dist/source/API/SBStream.cpp vendor/lldb/dist/source/API/SBTarget.cpp vendor/lldb/dist/source/API/SBThread.cpp vendor/lldb/dist/source/Breakpoint/Breakpoint.cpp vendor/lldb/dist/source/Breakpoint/BreakpointList.cpp vendor/lldb/dist/source/Breakpoint/BreakpointLocation.cpp vendor/lldb/dist/source/Breakpoint/BreakpointLocationList.cpp vendor/lldb/dist/source/Commands/CommandObjectExpression.cpp vendor/lldb/dist/source/Commands/CommandObjectMemory.cpp vendor/lldb/dist/source/Commands/CommandObjectPlatform.cpp vendor/lldb/dist/source/Commands/CommandObjectPlugin.cpp vendor/lldb/dist/source/Commands/CommandObjectProcess.cpp vendor/lldb/dist/source/Commands/CommandObjectTarget.cpp vendor/lldb/dist/source/Commands/CommandObjectThread.cpp vendor/lldb/dist/source/Commands/CommandObjectWatchpoint.cpp vendor/lldb/dist/source/Core/Address.cpp vendor/lldb/dist/source/Core/ConnectionFileDescriptor.cpp vendor/lldb/dist/source/Core/Debugger.cpp vendor/lldb/dist/source/Core/Mangled.cpp vendor/lldb/dist/source/Core/Module.cpp vendor/lldb/dist/source/Core/StreamFile.cpp vendor/lldb/dist/source/Core/ValueObjectSyntheticFilter.cpp vendor/lldb/dist/source/DataFormatters/CXXFormatterFunctions.cpp vendor/lldb/dist/source/DataFormatters/FormatClasses.cpp vendor/lldb/dist/source/DataFormatters/FormatManager.cpp
svn commit: r258883 - vendor/lldb/lldb-r196259
Author: emaste Date: Tue Dec 3 18:59:11 2013 New Revision: 258883 URL: http://svnweb.freebsd.org/changeset/base/258883 Log: Tag (stripped) lldb r196259 Sponsored by: DARPA, AFRL Added: vendor/lldb/lldb-r196259/ - copied from r258882, vendor/lldb/dist/ ___ 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: r258884 - in head: contrib/llvm/tools/lldb/include/lldb contrib/llvm/tools/lldb/include/lldb/API contrib/llvm/tools/lldb/include/lldb/Breakpoint contrib/llvm/tools/lldb/include/lldb/Cor...
Author: emaste Date: Tue Dec 3 19:23:54 2013 New Revision: 258884 URL: http://svnweb.freebsd.org/changeset/base/258884 Log: Update LLDB to upstream r196259 snapshot Sponsored by: DARPA, AFRL Added: head/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h - copied unchanged from r258883, vendor/lldb/dist/include/lldb/API/SBPlatform.h head/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h - copied unchanged from r258883, vendor/lldb/dist/include/lldb/Host/Debug.h head/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h - copied unchanged from r258883, vendor/lldb/dist/include/lldb/Target/RegisterCheckpoint.h head/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h - copied unchanged from r258883, vendor/lldb/dist/include/lldb/Utility/Iterable.h head/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp - copied unchanged from r258883, vendor/lldb/dist/source/API/SBPlatform.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp - copied unchanged from r258883, vendor/lldb/dist/source/Plugins/Process/Utility/HistoryThread.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h - copied unchanged from r258883, vendor/lldb/dist/source/Plugins/Process/Utility/HistoryThread.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp - copied unchanged from r258883, vendor/lldb/dist/source/Plugins/Process/Utility/HistoryUnwind.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h - copied unchanged from r258883, vendor/lldb/dist/source/Plugins/Process/Utility/HistoryUnwind.h head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp - copied unchanged from r258883, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextHistory.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h - copied unchanged from r258883, vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextHistory.h Modified: head/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h head/contrib/llvm/tools/lldb/include/lldb/API/SBError.h head/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h head/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h head/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h head/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h head/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h head/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h head/contrib/llvm/tools/lldb/include/lldb/Core/Address.h head/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h head/contrib/llvm/tools/lldb/include/lldb/Core/Module.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatNavigator.h head/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h head/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h head/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h head/contrib/llvm/tools/lldb/include/lldb/Host/File.h head/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h head/contrib/llvm/tools/lldb/include/lldb/Host/Host.h head/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h head/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h head/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h head/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h head/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h head/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h head/contrib/llvm/tools/lldb/include/lldb/Target/Process.h head/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h head/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h head/contrib/llvm/tools/lldb/include/lldb/Target/Target.h head/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h head/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h head/contrib/llvm/tools/lldb/include/lldb/Utility/PythonPointer.h head/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h head/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h head/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h
svn commit: r258885 - in stable/10/sys: compat/freebsd32 kern sys
Author: kib
Date: Tue Dec 3 19:40:32 2013
New Revision: 258885
URL: http://svnweb.freebsd.org/changeset/base/258885
Log:
MFC r258661:
Add sysctl KERN_PROC_SIGTRAMP to retrieve signal trampoline location for the
given process.
Approved by: re (gjb)
Modified:
stable/10/sys/compat/freebsd32/freebsd32.h
stable/10/sys/kern/kern_proc.c
stable/10/sys/sys/sysctl.h
stable/10/sys/sys/user.h
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/compat/freebsd32/freebsd32.h
==
--- stable/10/sys/compat/freebsd32/freebsd32.h Tue Dec 3 19:23:54 2013
(r258884)
+++ stable/10/sys/compat/freebsd32/freebsd32.h Tue Dec 3 19:40:32 2013
(r258885)
@@ -362,6 +362,12 @@ struct kinfo_proc32 {
int ki_tdflags;
};
+struct kinfo_sigtramp32 {
+ uint32_t ksigtramp_start;
+ uint32_t ksigtramp_end;
+ uint32_t ksigtramp_spare[4];
+};
+
struct kld32_file_stat_1 {
int version;/* set to sizeof(struct kld_file_stat_1) */
charname[MAXPATHLEN];
Modified: stable/10/sys/kern/kern_proc.c
==
--- stable/10/sys/kern/kern_proc.c Tue Dec 3 19:23:54 2013
(r258884)
+++ stable/10/sys/kern/kern_proc.c Tue Dec 3 19:40:32 2013
(r258885)
@@ -2632,6 +2632,60 @@ errout:
return (error);
}
+static int
+sysctl_kern_proc_sigtramp(SYSCTL_HANDLER_ARGS)
+{
+ int *name = (int *)arg1;
+ u_int namelen = arg2;
+ struct proc *p;
+ struct kinfo_sigtramp kst;
+ const struct sysentvec *sv;
+ int error;
+#ifdef COMPAT_FREEBSD32
+ struct kinfo_sigtramp32 kst32;
+#endif
+
+ if (namelen != 1)
+ return (EINVAL);
+
+ error = pget((pid_t)name[0], PGET_CANDEBUG, p);
+ if (error != 0)
+ return (error);
+ sv = p-p_sysent;
+#ifdef COMPAT_FREEBSD32
+ if ((req-flags SCTL_MASK32) != 0) {
+ bzero(kst32, sizeof(kst32));
+ if (SV_PROC_FLAG(p, SV_ILP32)) {
+ if (sv-sv_sigcode_base != 0) {
+ kst32.ksigtramp_start = sv-sv_sigcode_base;
+ kst32.ksigtramp_end = sv-sv_sigcode_base +
+ *sv-sv_szsigcode;
+ } else {
+ kst32.ksigtramp_start = sv-sv_psstrings -
+ *sv-sv_szsigcode;
+ kst32.ksigtramp_end = sv-sv_psstrings;
+ }
+ }
+ PROC_UNLOCK(p);
+ error = SYSCTL_OUT(req, kst32, sizeof(kst32));
+ return (error);
+ }
+#endif
+ bzero(kst, sizeof(kst));
+ if (sv-sv_sigcode_base != 0) {
+ kst.ksigtramp_start = (char *)sv-sv_sigcode_base;
+ kst.ksigtramp_end = (char *)sv-sv_sigcode_base +
+ *sv-sv_szsigcode;
+ } else {
+ kst.ksigtramp_start = (char *)sv-sv_psstrings -
+ *sv-sv_szsigcode;
+ kst.ksigtramp_end = (char *)sv-sv_psstrings;
+ }
+ PROC_UNLOCK(p);
+ error = SYSCTL_OUT(req, kst, sizeof(kst));
+ return (error);
+}
+
SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD, 0, Process table);
SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT|
@@ -2740,3 +2794,7 @@ static SYSCTL_NODE(_kern_proc, KERN_PROC
static SYSCTL_NODE(_kern_proc, KERN_PROC_OSREL, osrel, CTLFLAG_RW |
CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, sysctl_kern_proc_osrel,
Process binary osreldate);
+
+static SYSCTL_NODE(_kern_proc, KERN_PROC_SIGTRAMP, sigtramp, CTLFLAG_RD |
+ CTLFLAG_MPSAFE, sysctl_kern_proc_sigtramp,
+ Process signal trampoline location);
Modified: stable/10/sys/sys/sysctl.h
==
--- stable/10/sys/sys/sysctl.h Tue Dec 3 19:23:54 2013(r258884)
+++ stable/10/sys/sys/sysctl.h Tue Dec 3 19:40:32 2013(r258885)
@@ -530,6 +530,7 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a
#defineKERN_PROC_PS_STRINGS38 /* get ps_strings location */
#defineKERN_PROC_UMASK 39 /* process umask */
#defineKERN_PROC_OSREL 40 /* osreldate for process binary
*/
+#defineKERN_PROC_SIGTRAMP 41 /* signal trampoline location */
/*
* KERN_IPC identifiers
Modified: stable/10/sys/sys/user.h
==
--- stable/10/sys/sys/user.hTue Dec 3 19:23:54 2013(r258884)
+++ stable/10/sys/sys/user.hTue Dec 3 19:40:32 2013(r258885)
@@ -498,6 +498,12 @@ struct kinfo_kstack {
int _kkst_ispare[16]; /* Space for more stuff. */
};
+struct kinfo_sigtramp {
svn commit: r258886 - stable/10/sys/amd64/include
Author: kib
Date: Tue Dec 3 19:41:48 2013
New Revision: 258886
URL: http://svnweb.freebsd.org/changeset/base/258886
Log:
MFC r258660:
Fix sys/sysctl.h use for cc -m32 on amd64.
Approved by: re (gjb)
Modified:
stable/10/sys/amd64/include/pcb.h
stable/10/sys/amd64/include/segments.h
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/amd64/include/pcb.h
==
--- stable/10/sys/amd64/include/pcb.h Tue Dec 3 19:40:32 2013
(r258885)
+++ stable/10/sys/amd64/include/pcb.h Tue Dec 3 19:41:48 2013
(r258886)
@@ -43,6 +43,7 @@
#include machine/fpu.h
#include machine/segments.h
+#ifdef __amd64__
struct pcb {
register_t pcb_r15;
register_t pcb_r14;
@@ -105,6 +106,7 @@ struct pcb {
uint64_tpcb_pad[3];
};
+#endif
#ifdef _KERNEL
struct trapframe;
Modified: stable/10/sys/amd64/include/segments.h
==
--- stable/10/sys/amd64/include/segments.h Tue Dec 3 19:40:32 2013
(r258885)
+++ stable/10/sys/amd64/include/segments.h Tue Dec 3 19:41:48 2013
(r258886)
@@ -82,8 +82,8 @@ structsoft_segment_descriptor {
* region descriptors, used to load gdt/idt tables before segments yet exist.
*/
struct region_descriptor {
- unsigned long rd_limit:16; /* segment extent */
- unsigned long rd_base:64 __packed; /* base address */
+ uint64_t rd_limit:16; /* segment extent */
+ uint64_t rd_base:64 __packed; /* base address */
} __packed;
#ifdef _KERNEL
___
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: r258887 - stable/10/contrib/gdb/gdb
Author: kib
Date: Tue Dec 3 19:42:46 2013
New Revision: 258887
URL: http://svnweb.freebsd.org/changeset/base/258887
Log:
MFC r258663:
Use sysctl KERN_PROC_SIGTRAMP to retrieve the signal trampoline
location for the native amd64 ABI. This fixes unwinding over the
signal frame after trampoline was moved to the shared page.
Approved by: re (gjb)
Modified:
stable/10/contrib/gdb/gdb/amd64fbsd-nat.c
Directory Properties:
stable/10/contrib/gdb/ (props changed)
Modified: stable/10/contrib/gdb/gdb/amd64fbsd-nat.c
==
--- stable/10/contrib/gdb/gdb/amd64fbsd-nat.c Tue Dec 3 19:41:48 2013
(r258886)
+++ stable/10/contrib/gdb/gdb/amd64fbsd-nat.c Tue Dec 3 19:42:46 2013
(r258887)
@@ -29,6 +29,7 @@
#include sys/types.h
#include sys/ptrace.h
#include sys/sysctl.h
+#include sys/user.h
#include machine/reg.h
#ifdef HAVE_SYS_PROCFS_H
@@ -212,24 +213,23 @@ Please report this to bug-...@gnu.org.
SC_RBP_OFFSET = offset;
- /* FreeBSD provides a kern.ps_strings sysctl that we can use to
+ /* FreeBSD provides a kern.proc.sigtramp sysctl that we can use to
locate the sigtramp. That way we can still recognize a sigtramp
- if its location is changed in a new kernel. Of course this is
- still based on the assumption that the sigtramp is placed
- directly under the location where the program arguments and
- environment can be found. */
+ if its location is changed in a new kernel. */
{
-int mib[2];
-long ps_strings;
+int mib[4];
+struct kinfo_sigtramp kst;
size_t len;
mib[0] = CTL_KERN;
-mib[1] = KERN_PS_STRINGS;
-len = sizeof (ps_strings);
-if (sysctl (mib, 2, ps_strings, len, NULL, 0) == 0)
+mib[1] = KERN_PROC;
+mib[2] = KERN_PROC_SIGTRAMP;
+mib[3] = getpid();
+len = sizeof (kst);
+if (sysctl (mib, sizeof(mib) / sizeof(mib[0]), kst, len, NULL, 0) == 0)
{
- amd64fbsd_sigtramp_start_addr = ps_strings - 32;
- amd64fbsd_sigtramp_end_addr = ps_strings;
+ amd64fbsd_sigtramp_start_addr = kst.ksigtramp_start;
+ amd64fbsd_sigtramp_end_addr = kst.ksigtramp_end;
}
}
}
___
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: r258888 - in stable/9/sys: compat/freebsd32 kern sys
Author: kib
Date: Tue Dec 3 19:55:49 2013
New Revision: 25
URL: http://svnweb.freebsd.org/changeset/base/25
Log:
MFC r258661:
Add sysctl KERN_PROC_SIGTRAMP to retrieve signal trampoline location for the
given process.
Modified:
stable/9/sys/compat/freebsd32/freebsd32.h
stable/9/sys/kern/kern_proc.c
stable/9/sys/sys/sysctl.h
stable/9/sys/sys/user.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/sys/ (props changed)
Modified: stable/9/sys/compat/freebsd32/freebsd32.h
==
--- stable/9/sys/compat/freebsd32/freebsd32.h Tue Dec 3 19:42:46 2013
(r258887)
+++ stable/9/sys/compat/freebsd32/freebsd32.h Tue Dec 3 19:55:49 2013
(r25)
@@ -351,6 +351,12 @@ struct kinfo_proc32 {
int ki_tdflags;
};
+struct kinfo_sigtramp32 {
+ uint32_t ksigtramp_start;
+ uint32_t ksigtramp_end;
+ uint32_t ksigtramp_spare[4];
+};
+
struct kld32_file_stat_1 {
int version;/* set to sizeof(struct kld_file_stat_1) */
charname[MAXPATHLEN];
Modified: stable/9/sys/kern/kern_proc.c
==
--- stable/9/sys/kern/kern_proc.c Tue Dec 3 19:42:46 2013
(r258887)
+++ stable/9/sys/kern/kern_proc.c Tue Dec 3 19:55:49 2013
(r25)
@@ -2636,6 +2636,60 @@ errout:
return (error);
}
+static int
+sysctl_kern_proc_sigtramp(SYSCTL_HANDLER_ARGS)
+{
+ int *name = (int *)arg1;
+ u_int namelen = arg2;
+ struct proc *p;
+ struct kinfo_sigtramp kst;
+ const struct sysentvec *sv;
+ int error;
+#ifdef COMPAT_FREEBSD32
+ struct kinfo_sigtramp32 kst32;
+#endif
+
+ if (namelen != 1)
+ return (EINVAL);
+
+ error = pget((pid_t)name[0], PGET_CANDEBUG, p);
+ if (error != 0)
+ return (error);
+ sv = p-p_sysent;
+#ifdef COMPAT_FREEBSD32
+ if ((req-flags SCTL_MASK32) != 0) {
+ bzero(kst32, sizeof(kst32));
+ if (SV_PROC_FLAG(p, SV_ILP32)) {
+ if (sv-sv_sigcode_base != 0) {
+ kst32.ksigtramp_start = sv-sv_sigcode_base;
+ kst32.ksigtramp_end = sv-sv_sigcode_base +
+ *sv-sv_szsigcode;
+ } else {
+ kst32.ksigtramp_start = sv-sv_psstrings -
+ *sv-sv_szsigcode;
+ kst32.ksigtramp_end = sv-sv_psstrings;
+ }
+ }
+ PROC_UNLOCK(p);
+ error = SYSCTL_OUT(req, kst32, sizeof(kst32));
+ return (error);
+ }
+#endif
+ bzero(kst, sizeof(kst));
+ if (sv-sv_sigcode_base != 0) {
+ kst.ksigtramp_start = (char *)sv-sv_sigcode_base;
+ kst.ksigtramp_end = (char *)sv-sv_sigcode_base +
+ *sv-sv_szsigcode;
+ } else {
+ kst.ksigtramp_start = (char *)sv-sv_psstrings -
+ *sv-sv_szsigcode;
+ kst.ksigtramp_end = (char *)sv-sv_psstrings;
+ }
+ PROC_UNLOCK(p);
+ error = SYSCTL_OUT(req, kst, sizeof(kst));
+ return (error);
+}
+
SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD, 0, Process table);
SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT|
@@ -2744,3 +2798,7 @@ static SYSCTL_NODE(_kern_proc, KERN_PROC
static SYSCTL_NODE(_kern_proc, KERN_PROC_OSREL, osrel, CTLFLAG_RW |
CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, sysctl_kern_proc_osrel,
Process binary osreldate);
+
+static SYSCTL_NODE(_kern_proc, KERN_PROC_SIGTRAMP, sigtramp, CTLFLAG_RD |
+ CTLFLAG_MPSAFE, sysctl_kern_proc_sigtramp,
+ Process signal trampoline location);
Modified: stable/9/sys/sys/sysctl.h
==
--- stable/9/sys/sys/sysctl.h Tue Dec 3 19:42:46 2013(r258887)
+++ stable/9/sys/sys/sysctl.h Tue Dec 3 19:55:49 2013(r25)
@@ -566,6 +566,7 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a
#defineKERN_PROC_PS_STRINGS38 /* get ps_strings location */
#defineKERN_PROC_UMASK 39 /* process umask */
#defineKERN_PROC_OSREL 40 /* osreldate for process binary
*/
+#defineKERN_PROC_SIGTRAMP 41 /* signal trampoline location */
/*
* KERN_IPC identifiers
Modified: stable/9/sys/sys/user.h
==
--- stable/9/sys/sys/user.h Tue Dec 3 19:42:46 2013(r258887)
+++ stable/9/sys/sys/user.h Tue Dec 3 19:55:49 2013(r25)
@@ -496,6 +496,12 @@ struct kinfo_kstack {
int _kkst_ispare[16]; /* Space for more stuff. */
};
+struct kinfo_sigtramp
svn commit: r258889 - stable/9/contrib/gdb/gdb
Author: kib
Date: Tue Dec 3 20:06:58 2013
New Revision: 258889
URL: http://svnweb.freebsd.org/changeset/base/258889
Log:
MFC r258663:
Use sysctl KERN_PROC_SIGTRAMP to retrieve the signal trampoline
location for the native amd64 ABI. This fixes unwinding over the
signal frame after trampoline was moved to the shared page.
Modified:
stable/9/contrib/gdb/gdb/amd64fbsd-nat.c
Directory Properties:
stable/9/contrib/gdb/ (props changed)
Modified: stable/9/contrib/gdb/gdb/amd64fbsd-nat.c
==
--- stable/9/contrib/gdb/gdb/amd64fbsd-nat.cTue Dec 3 19:55:49 2013
(r25)
+++ stable/9/contrib/gdb/gdb/amd64fbsd-nat.cTue Dec 3 20:06:58 2013
(r258889)
@@ -29,6 +29,7 @@
#include sys/types.h
#include sys/ptrace.h
#include sys/sysctl.h
+#include sys/user.h
#include machine/reg.h
#ifdef HAVE_SYS_PROCFS_H
@@ -212,24 +213,23 @@ Please report this to bug-...@gnu.org.
SC_RBP_OFFSET = offset;
- /* FreeBSD provides a kern.ps_strings sysctl that we can use to
+ /* FreeBSD provides a kern.proc.sigtramp sysctl that we can use to
locate the sigtramp. That way we can still recognize a sigtramp
- if its location is changed in a new kernel. Of course this is
- still based on the assumption that the sigtramp is placed
- directly under the location where the program arguments and
- environment can be found. */
+ if its location is changed in a new kernel. */
{
-int mib[2];
-long ps_strings;
+int mib[4];
+struct kinfo_sigtramp kst;
size_t len;
mib[0] = CTL_KERN;
-mib[1] = KERN_PS_STRINGS;
-len = sizeof (ps_strings);
-if (sysctl (mib, 2, ps_strings, len, NULL, 0) == 0)
+mib[1] = KERN_PROC;
+mib[2] = KERN_PROC_SIGTRAMP;
+mib[3] = getpid();
+len = sizeof (kst);
+if (sysctl (mib, sizeof(mib) / sizeof(mib[0]), kst, len, NULL, 0) == 0)
{
- amd64fbsd_sigtramp_start_addr = ps_strings - 32;
- amd64fbsd_sigtramp_end_addr = ps_strings;
+ amd64fbsd_sigtramp_start_addr = kst.ksigtramp_start;
+ amd64fbsd_sigtramp_end_addr = kst.ksigtramp_end;
}
}
}
___
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
Re: svn commit: r258884 - in head: contrib/llvm/tools/lldb/include/lldb contrib/llvm/tools/lldb/include/lldb/API contrib/llvm/tools/lldb/include/lldb/Breakpoint contrib/llvm/tools/lldb/include/lldb/Co
On Tue, Dec 3, 2013 at 2:23 PM, Ed Maste ema...@freebsd.org wrote: Author: emaste Date: Tue Dec 3 19:23:54 2013 New Revision: 258884 URL: http://svnweb.freebsd.org/changeset/base/258884 Log: Update LLDB to upstream r196259 snapshot Thanks! When you update vendor sources can you please include a brief changelog? It would help to know if its worth updating or what new features to get excited about. :) -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams ___ 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: r258890 - stable/10/sys/netinet
Author: tuexen
Date: Tue Dec 3 20:55:37 2013
New Revision: 258890
URL: http://svnweb.freebsd.org/changeset/base/258890
Log:
MFC r258574:
Only initialize some mutexes for the default VNET.
In r208160, sctp_it_ctl was made a global variable, across all VNETs.
However, sctp_init() is called for every VNET that is created. This results
in the same global mutexes which are part of sctp_it_ctl being initialized.
This can result
in crashes if many jails are created.
To reproduce the problem:
(1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS,
INVARIANTS.
(2) Run this command in a loop:
jail -l -u root -c path=/ name=foo persist vnet jexec foo ifconfig
lo0 127.0.0.1/8 jail -r foo
(see
http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html )
Witness will warn about the same mutex being initialized.
Fix the problem by only initializing these mutexes in the default VNET.
MFC r258765:
In
http://svnweb.freebsd.org/changeset/base/258221
I introduced a bug which initialized global locks
whenever the SCTP stack initialized. This was fixed in
http://svnweb.freebsd.org/changeset/base/258574
by rodrigc@. He just initialized the locks for
the default vnet. This fix reverts to the old
behaviour before r258221, which explicitly makes
sure it is only called once, because this works also on
other platforms.
Approved by: re@ (gjb)
Modified:
stable/10/sys/netinet/sctp_bsd_addr.c
stable/10/sys/netinet/sctp_pcb.c
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/netinet/sctp_bsd_addr.c
==
--- stable/10/sys/netinet/sctp_bsd_addr.c Tue Dec 3 20:06:58 2013
(r258889)
+++ stable/10/sys/netinet/sctp_bsd_addr.c Tue Dec 3 20:55:37 2013
(r258890)
@@ -100,6 +100,9 @@ sctp_startup_iterator(void)
/* You only get one */
return;
}
+ /* Initialize global locks here, thus only once. */
+ SCTP_ITERATOR_LOCK_INIT();
+ SCTP_IPI_ITERATOR_WQ_INIT();
TAILQ_INIT(sctp_it_ctl.iteratorhead);
kproc_create(sctp_iterator_thread,
(void *)NULL,
Modified: stable/10/sys/netinet/sctp_pcb.c
==
--- stable/10/sys/netinet/sctp_pcb.cTue Dec 3 20:06:58 2013
(r258889)
+++ stable/10/sys/netinet/sctp_pcb.cTue Dec 3 20:55:37 2013
(r258890)
@@ -5864,8 +5864,6 @@ sctp_pcb_init()
for (i = 0; i SCTP_STACK_VTAG_HASH_SIZE; i++) {
LIST_INIT(SCTP_BASE_INFO(vtag_timewait)[i]);
}
- SCTP_ITERATOR_LOCK_INIT();
- SCTP_IPI_ITERATOR_WQ_INIT();
sctp_startup_iterator();
#if defined(__FreeBSD__) defined(SCTP_MCORE_INPUT) defined(SMP)
___
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: r258891 - head/lib/libc/sys
Author: jhb
Date: Tue Dec 3 21:00:13 2013
New Revision: 258891
URL: http://svnweb.freebsd.org/changeset/base/258891
Log:
Various updates and tweaks to the wait(2) manpage.
PR: docs/183904
Submitted by: Michael Galassi michaelgala...@gmail.com
Reviewed by: kib, wblock (earlier version)
Modified:
head/lib/libc/sys/wait.2
Modified: head/lib/libc/sys/wait.2
==
--- head/lib/libc/sys/wait.2Tue Dec 3 20:55:37 2013(r258890)
+++ head/lib/libc/sys/wait.2Tue Dec 3 21:00:13 2013(r258891)
@@ -28,7 +28,7 @@
.\ @(#)wait.2 8.2 (Berkeley) 4/19/94
.\ $FreeBSD$
.\
-.Dd September 7, 2013
+.Dd December 3, 2013
.Dt WAIT 2
.Os
.Sh NAME
@@ -62,63 +62,76 @@
.Sh DESCRIPTION
The
.Fn wait
-function suspends execution of its calling process until
+function suspends execution of its calling thread until
.Fa status
-information is available for a terminated child process,
+information is available for a child process
or a signal is received.
On return from a successful
.Fn wait
call,
the
.Fa status
-area contains termination information about the process that exited
+area contains information about the process that reported a status change
as defined below.
-The
-.Fn wait
-call is the same as
-.Fn wait4
-with a
-.Fa wpid
-value of -1,
-with an
-.Fa options
-value of zero,
-and a
-.Fa rusage
-value of zero.
.Pp
The
.Fn wait4
-system call provides a more general interface for programs
-that need to wait for certain child processes,
+and
+.Fn wait6
+system calls provide a more general interface for programs
+that need to wait for specific child processes,
that need resource utilization statistics accumulated by child processes,
or that require options.
+The other wait functions are implemented using either
+.Fn wait4
+or
+.Fn wait6 .
.Pp
-The broadest interface of all functions in this family is
+The
.Fn wait6
-which is otherwise very much like
+function is the most general function in this family and its distinct
+features are:
+.Pp
+All of the desired process statuses to be waited on must be explicitly
+specified in
+.Fa options .
+The
+.Fn wait ,
+.Fn waitpid ,
+.Fn wait3 ,
+and
.Fn wait4
-but with a few very important distinctions.
-To wait for exited processes, the option flag
+functions all implicitly wait for exited and trapped processes,
+but the
+.Fn waitid
+and
+.Fn wait6
+functions require the corresponding
.Dv WEXITED
-need to be explicitly specified.
-This allows for waiting for processes which have experienced other
-status changes without having to handle also the exit status from
-the terminated processes.
-Instead of the traditional
-.Dv rusage
-argument, a pointer to a new structure
+and
+.Dv WTRAPPED
+flags to be explicitly specified.
+This allows waiting for processes which have experienced other
+status changes without having to also handle the exit status from
+terminated processes.
+.Pp
+The
+.Fn wait6
+function accepts a
+.Fa wrusage
+argument which points to a structure defined as:
.Bd -literal
struct __wrusage {
struct rusage wru_self;
struct rusage wru_children;
};
.Ed
-can be passed.
+.Pp
This allows the calling process to collect resource usage statistics
from both its own child process as well as from its grand children.
When no resource usage statistics are needed this pointer can be
.Dv NULL .
+.Pp
The last argument
.Fa infop
must be either
@@ -126,11 +139,13 @@ must be either
or a pointer to a
.Fa siginfo_t
structure.
-When specified, the structure is filled the same as for
-.Dv SIGNCHLD
-signal, delivered at the process state change.
-.br
-The process, which state is queried, is specified by two arguments
+If
+.Pf non- Dv NULL ,
+the structure is filled with the same data as for a
+.Dv SIGCHLD
+signal delivered when the process changed state.
+.Pp
+The set of child processes to be queried is specified by the arguments
.Fa idtype
and
.Fa id .
@@ -138,8 +153,8 @@ The separate
.Fa idtype
and
.Fa id
-arguments allows to support many other types of
-IDs as well in addition to PID and PGID.
+arguments support many other types of
+identifers in addition to process IDs and process group IDs.
.Bl -bullet -offset indent
.It
If
@@ -188,50 +203,33 @@ and
wait for any child process in the same process group as the caller.
.El
.Pp
-Non-standard specifiers for the process to wait for, supported by this
+Non-standard identifier types supported by this
implementation of
.Fn waitid
and
-.Fn wait6 ,
+.Fn wait6
are:
-.Bl -bullet -offset indent
-.It
-The
-.Fa idtype
-value
-.Dv P_UID
-waits for processes which effective UID is equal to
-.Dv (uid_t)id .
-.It
-The
-.Fa idtype
-value
-.Dv P_GID
-waits for processes which effective GID is equal to
-.Dv (gid_t)id .
-.It
-The
-.Fa idtype
-value
-.Dv P_SID
-waits for processes which session ID is equal to
-.Dv id .
-In case the child process started its own new session,
svn commit: r258892 - in head: contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD contrib/llvm/tools/lldb/source/Plugins/Process/POSIX lib/clang/liblldbPluginProcessFreeBSD
Author: emaste
Date: Tue Dec 3 21:29:45 2013
New Revision: 258892
URL: http://svnweb.freebsd.org/changeset/base/258892
Log:
lldb: Threaded inferior support for FreeBSD
This is in the process of being submitted to the upstream LLDB
repository. The thread list functionality is modelled in part on
GDBRemoteCommunicationClient.
LLDB bug pr16696 and code review D2267
Sponsored by: DARPA, AFRL
Added:
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
Modified:
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h
head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp
head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h
head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
head/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h
head/lib/clang/liblldbPluginProcessFreeBSD/Makefile
Added:
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
Tue Dec 3 21:29:45 2013(r258892)
@@ -0,0 +1,69 @@
+//===-- FreeBSDThread.cpp ---*- C++
-*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===--===//
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+#include lldb/Core/State.h
+
+// Project includes
+#include FreeBSDThread.h
+#include ProcessFreeBSD.h
+#include ProcessPOSIXLog.h
+
+using namespace lldb;
+using namespace lldb_private;
+
+//--
+// Constructors and destructors.
+
+FreeBSDThread::FreeBSDThread(Process process, lldb::tid_t tid)
+: POSIXThread(process, tid)
+{
+}
+
+FreeBSDThread::~FreeBSDThread()
+{
+}
+
+//--
+// ProcessInterface protocol.
+
+void
+FreeBSDThread::WillResume(lldb::StateType resume_state)
+{
+Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_THREAD));
+if (log)
+log-Printf(tid %lu resume_state = %s, GetID(),
+lldb_private::StateAsCString(resume_state));
+ProcessSP process_sp(GetProcess());
+ProcessFreeBSD *process = static_castProcessFreeBSD *(process_sp.get());
+int signo = GetResumeSignal();
+bool signo_valid = process-GetUnixSignals().SignalIsValid(signo);
+
+switch (resume_state)
+{
+case eStateSuspended:
+case eStateStopped:
+process-m_suspend_tids.push_back(GetID());
+break;
+case eStateRunning:
+process-m_run_tids.push_back(GetID());
+if (signo_valid)
+process-m_resume_signo = signo;
+break;
+case eStateStepping:
+process-m_step_tids.push_back(GetID());
+if (signo_valid)
+process-m_resume_signo = signo;
+break;
+default:
+break;
+}
+}
Added:
head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
Tue Dec 3 21:29:45 2013(r258892)
@@ -0,0 +1,39 @@
+//===-- FreeBSDThread.h -*- C++
-*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===--===//
+
+#ifndef liblldb_FreeBSDThread_H_
+#define liblldb_FreeBSDThread_H_
+
+// Other libraries and framework includes
+#include POSIXThread.h
+
+//--
+// @class FreeBSDThread
+// @brief Abstraction of a FreeBSD thread.
+class FreeBSDThread
+: public POSIXThread
+{
+public:
+
+//--
+// Constructors and destructors
+//--
+FreeBSDThread(lldb_private::Process process, lldb::tid_t
svn commit: r258893 - head/sys/kern
Author: cperciva
Date: Tue Dec 3 21:35:25 2013
New Revision: 258893
URL: http://svnweb.freebsd.org/changeset/base/258893
Log:
Add a new sysctl / loader tunable kern.panic_reboot_wait_time which
defaults to PANIC_REBOOT_WAIT_TIME (a long-existing kernel config
setting). Use this now-variable value in place of the defined constant
to control how long the system waits after a panic before rebooting.
Modified:
head/sys/kern/kern_shutdown.c
Modified: head/sys/kern/kern_shutdown.c
==
--- head/sys/kern/kern_shutdown.c Tue Dec 3 21:29:45 2013
(r258892)
+++ head/sys/kern/kern_shutdown.c Tue Dec 3 21:35:25 2013
(r258893)
@@ -89,6 +89,11 @@ __FBSDID($FreeBSD$);
#ifndef PANIC_REBOOT_WAIT_TIME
#define PANIC_REBOOT_WAIT_TIME 15 /* default to 15 seconds */
#endif
+int panic_reboot_wait_time = PANIC_REBOOT_WAIT_TIME;
+SYSCTL_INT(_kern, OID_AUTO, panic_reboot_wait_time, CTLFLAG_RW | CTLFLAG_TUN,
+panic_reboot_wait_time, 0,
+Seconds to wait before rebooting after a panic);
+TUNABLE_INT(kern.panic_reboot_wait_time, panic_reboot_wait_time);
/*
* Note that stdarg.h and the ANSI style va_start macro is used for both
@@ -485,12 +490,12 @@ shutdown_panic(void *junk, int howto)
int loop;
if (howto RB_DUMP) {
- if (PANIC_REBOOT_WAIT_TIME != 0) {
- if (PANIC_REBOOT_WAIT_TIME != -1) {
+ if (panic_reboot_wait_time != 0) {
+ if (panic_reboot_wait_time != -1) {
printf(Automatic reboot in %d seconds -
press a key on the console to abort\n,
- PANIC_REBOOT_WAIT_TIME);
- for (loop = PANIC_REBOOT_WAIT_TIME * 10;
+ panic_reboot_wait_time);
+ for (loop = panic_reboot_wait_time * 10;
loop 0; --loop) {
DELAY(1000 * 100); /* 1/10th second */
/* Did user type a key? */
___
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
Re: svn commit: r258884 - in head: contrib/llvm/tools/lldb/include/lldb contrib/llvm/tools/lldb/include/lldb/API contrib/llvm/tools/lldb/include/lldb/Breakpoint contrib/llvm/tools/lldb/include/lldb/Co
On 3 December 2013 15:48, Eitan Adler ead...@freebsd.org wrote: On Tue, Dec 3, 2013 at 2:23 PM, Ed Maste ema...@freebsd.org wrote: Author: emaste Date: Tue Dec 3 19:23:54 2013 New Revision: 258884 URL: http://svnweb.freebsd.org/changeset/base/258884 Log: Update LLDB to upstream r196259 snapshot Thanks! When you update vendor sources can you please include a brief changelog? It would help to know if its worth updating or what new features to get excited about. :) LLDB is in sort of a technology preview state on FreeBSD at the moment, and each new snapshot brings a slew of bug fixes and improvements. At this point each snapshot is worth an update and rebuild for anyone testing. Before too long we'll be able to track LLDB releases (e.g. 3.5, 3.6) in FreeBSD just as we do with clang and llvm, and you can refer to the upstream changelogs. In this specific case the snapshot update was done as a prerequisite to the threaded inferior support, which I just committed in r258892. You can see the current state of the port at https://wiki.freebsd.org/lldb, and I'm very interested in hearing about any test results. ___ 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: r258894 - head/etc
Author: cperciva Date: Tue Dec 3 21:55:57 2013 New Revision: 258894 URL: http://svnweb.freebsd.org/changeset/base/258894 Log: The rc system aggressively caches the contents of /etc/rc.conf in order to improve boot performance; this produces arguably astonishing (non-)results if /etc/rc.conf is modified during the boot process. Since performance considerations make it infeasible to automatically detect if the cached /etc/rc.conf parameters should be invalidated, provide a mechanism for explicitly requesting that /etc/rc.conf be reloaded: Catch SIGALRM and reload /etc/rc.conf if it is received. Discussed on: freebsd-rc MFC after:3 days Modified: head/etc/rc Modified: head/etc/rc == --- head/etc/rc Tue Dec 3 21:35:25 2013(r258893) +++ head/etc/rc Tue Dec 3 21:55:57 2013(r258894) @@ -71,6 +71,11 @@ fi . /etc/rc.subr load_rc_config 'XXX' +# If we receive a SIGALRM, re-source /etc/rc.conf; this allows rc.d +# scripts to perform boot-time configuration including enabling and +# disabling rc.d scripts which appear later in the boot order. +trap _rc_conf_loaded=false; load_rc_config 'XXX' ALRM + skip=-s nostart if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then skip=$skip -s nojail ___ 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: r258895 - in vendor/lldb/dist/source: Breakpoint Symbol
Author: emaste
Date: Tue Dec 3 22:13:33 2013
New Revision: 258895
URL: http://svnweb.freebsd.org/changeset/base/258895
Log:
Import lldb as of SVN r196322 (git 49c127ae)
(A number of files not required for the FreeBSD build have been removed.)
Sponsored by: DARPA, AFRL
Modified:
vendor/lldb/dist/source/Breakpoint/BreakpointLocationList.cpp
vendor/lldb/dist/source/Symbol/UnwindPlan.cpp
Modified: vendor/lldb/dist/source/Breakpoint/BreakpointLocationList.cpp
==
--- vendor/lldb/dist/source/Breakpoint/BreakpointLocationList.cpp Tue Dec
3 21:55:57 2013(r258894)
+++ vendor/lldb/dist/source/Breakpoint/BreakpointLocationList.cpp Tue Dec
3 22:13:33 2013(r258895)
@@ -86,16 +86,13 @@ Compare (BreakpointLocationSP lhs, lldb:
BreakpointLocationSP
BreakpointLocationList::FindByID (lldb::break_id_t break_id) const
{
-BreakpointLocationSP bp_loc_sp;
Mutex::Locker locker (m_mutex);
-
-collection::const_iterator begin = m_locations.begin(), end =
m_locations.end();
-collection::const_iterator result;
-result = std::lower_bound(begin, end, break_id, Compare);
-if (result == end)
-return bp_loc_sp;
+collection::const_iterator end = m_locations.end();
+collection::const_iterator pos = std::lower_bound(m_locations.begin(),
end, break_id, Compare);
+if (pos != end (*pos)-GetID() == break_id)
+return *(pos);
else
-return *(result);
+return BreakpointLocationSP();
}
size_t
Modified: vendor/lldb/dist/source/Symbol/UnwindPlan.cpp
==
--- vendor/lldb/dist/source/Symbol/UnwindPlan.cpp Tue Dec 3 21:55:57
2013(r258894)
+++ vendor/lldb/dist/source/Symbol/UnwindPlan.cpp Tue Dec 3 22:13:33
2013(r258895)
@@ -379,7 +379,19 @@ UnwindPlan::PlanValidAtAddress (Address
{
Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND));
if (log)
-log-Printf (Testing if UnwindPlan is valid at pc 0x% PRIx64 :
No unwind rows - is invalid.);
+{
+StreamString s;
+if (addr.Dump (s, NULL, Address::DumpStyleSectionNameOffset))
+{
+log-Printf (UnwindPlan is invalid -- no unwind rows for
UnwindPlan '%s' at address %s,
+ m_source_name.GetCString(), s.GetData());
+}
+else
+{
+log-Printf (UnwindPlan is invalid -- no unwind rows for
UnwindPlan '%s',
+ m_source_name.GetCString());
+}
+}
return false;
}
@@ -389,7 +401,19 @@ UnwindPlan::PlanValidAtAddress (Address
{
Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND));
if (log)
-log-Printf (Testing if UnwindPlan is valid at pc 0x% PRIx64 :
No CFA register - is invalid.);
+{
+StreamString s;
+if (addr.Dump (s, NULL, Address::DumpStyleSectionNameOffset))
+{
+log-Printf (UnwindPlan is invalid -- no CFA register defined
in row 0 for UnwindPlan '%s' at address %s,
+ m_source_name.GetCString(), s.GetData());
+}
+else
+{
+log-Printf (UnwindPlan is invalid -- no CFA register defined
in row 0 for UnwindPlan '%s',
+ m_source_name.GetCString());
+}
+}
return false;
}
___
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: r258896 - vendor/lldb/lldb-r196322
Author: emaste Date: Tue Dec 3 22:16:33 2013 New Revision: 258896 URL: http://svnweb.freebsd.org/changeset/base/258896 Log: Tag (stripped) lldb r196322 Sponsored by: DARPA, AFRL Added: vendor/lldb/lldb-r196322/ - copied from r258895, vendor/lldb/dist/ ___ 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: r258897 - in head/contrib/llvm/tools/lldb/source: Breakpoint Symbol
Author: emaste
Date: Tue Dec 3 22:26:38 2013
New Revision: 258897
URL: http://svnweb.freebsd.org/changeset/base/258897
Log:
Update LLDB to upstream r196322 snapshot
Upstream revisions of note:
r196298 - Fix use of std::lower_bound
r196322 - Fix log message for new invalidation checks
Sponsored by: DARPA, AFRL
Modified:
head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
head/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp
Directory Properties:
head/contrib/llvm/tools/lldb/ (props changed)
Modified:
head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
==
--- head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
Tue Dec 3 22:16:33 2013(r258896)
+++ head/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
Tue Dec 3 22:26:38 2013(r258897)
@@ -86,16 +86,13 @@ Compare (BreakpointLocationSP lhs, lldb:
BreakpointLocationSP
BreakpointLocationList::FindByID (lldb::break_id_t break_id) const
{
-BreakpointLocationSP bp_loc_sp;
Mutex::Locker locker (m_mutex);
-
-collection::const_iterator begin = m_locations.begin(), end =
m_locations.end();
-collection::const_iterator result;
-result = std::lower_bound(begin, end, break_id, Compare);
-if (result == end)
-return bp_loc_sp;
+collection::const_iterator end = m_locations.end();
+collection::const_iterator pos = std::lower_bound(m_locations.begin(),
end, break_id, Compare);
+if (pos != end (*pos)-GetID() == break_id)
+return *(pos);
else
-return *(result);
+return BreakpointLocationSP();
}
size_t
Modified: head/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp
==
--- head/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp Tue Dec 3
22:16:33 2013(r258896)
+++ head/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp Tue Dec 3
22:26:38 2013(r258897)
@@ -379,7 +379,19 @@ UnwindPlan::PlanValidAtAddress (Address
{
Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND));
if (log)
-log-Printf (Testing if UnwindPlan is valid at pc 0x% PRIx64 :
No unwind rows - is invalid.);
+{
+StreamString s;
+if (addr.Dump (s, NULL, Address::DumpStyleSectionNameOffset))
+{
+log-Printf (UnwindPlan is invalid -- no unwind rows for
UnwindPlan '%s' at address %s,
+ m_source_name.GetCString(), s.GetData());
+}
+else
+{
+log-Printf (UnwindPlan is invalid -- no unwind rows for
UnwindPlan '%s',
+ m_source_name.GetCString());
+}
+}
return false;
}
@@ -389,7 +401,19 @@ UnwindPlan::PlanValidAtAddress (Address
{
Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND));
if (log)
-log-Printf (Testing if UnwindPlan is valid at pc 0x% PRIx64 :
No CFA register - is invalid.);
+{
+StreamString s;
+if (addr.Dump (s, NULL, Address::DumpStyleSectionNameOffset))
+{
+log-Printf (UnwindPlan is invalid -- no CFA register defined
in row 0 for UnwindPlan '%s' at address %s,
+ m_source_name.GetCString(), s.GetData());
+}
+else
+{
+log-Printf (UnwindPlan is invalid -- no CFA register defined
in row 0 for UnwindPlan '%s',
+ m_source_name.GetCString());
+}
+}
return false;
}
___
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: r258898 - in stable/9: share/man/man4 sys/conf sys/dev/qlxgbe sys/modules sys/modules/qlxgbe
Author: davidcs
Date: Tue Dec 3 22:31:08 2013
New Revision: 258898
URL: http://svnweb.freebsd.org/changeset/base/258898
Log:
MFC 250661,251076,251605,252580,254976,255003,258155
port dev/qlxgbe from HEAD
Added:
stable/9/share/man/man4/qlxgbe.4
- copied unchanged from r250661, head/share/man/man4/qlxgbe.4
stable/9/sys/dev/qlxgbe/
- copied from r250661, head/sys/dev/qlxgbe/
stable/9/sys/modules/qlxgbe/
- copied from r250661, head/sys/modules/qlxgbe/
Modified:
stable/9/share/man/man4/Makefile
stable/9/sys/conf/files.amd64
stable/9/sys/dev/qlxgbe/ql_hw.c
stable/9/sys/dev/qlxgbe/ql_hw.h
stable/9/sys/dev/qlxgbe/ql_ioctl.c
stable/9/sys/dev/qlxgbe/ql_isr.c
stable/9/sys/dev/qlxgbe/ql_misc.c
stable/9/sys/dev/qlxgbe/ql_os.c
stable/9/sys/modules/Makefile
Directory Properties:
stable/9/share/ (props changed)
stable/9/share/man/ (props changed)
stable/9/share/man/man4/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/share/man/man4/Makefile
==
--- stable/9/share/man/man4/MakefileTue Dec 3 22:26:38 2013
(r258897)
+++ stable/9/share/man/man4/MakefileTue Dec 3 22:31:08 2013
(r258898)
@@ -362,6 +362,7 @@ MAN=aac.4 \
pty.4 \
puc.4 \
${_qlxgb.4} \
+ ${_qlxgbe.4} \
ral.4 \
random.4 \
rc.4 \
@@ -771,9 +772,11 @@ MLINKS+=lindev.4 full.4
.if ${MACHINE_CPUARCH} == amd64
_qlxgb.4= qlxgb.4
+_qlxgbe.4= qlxgbe.4
_sfxge.4= sfxge.4
MLINKS+=qlxgb.4 if_qlxgb.4
+MLINKS+=qlxgbe.4 if_qlxgbe.4
MLINKS+=sfxge.4 if_sfxge.4
.endif
Copied: stable/9/share/man/man4/qlxgbe.4 (from r250661,
head/share/man/man4/qlxgbe.4)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/share/man/man4/qlxgbe.4Tue Dec 3 22:31:08 2013
(r258898, copy of r250661, head/share/man/man4/qlxgbe.4)
@@ -0,0 +1,91 @@
+.\-
+.\ Copyright (c) 2013 Qlogic Corportaion
+.\ 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 AUTHOR 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 AUTHOR 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 April 1, 2013
+.Dt QLXGBE 4
+.Os
+.Sh NAME
+.Nm qlxgbe
+.Nd QLogic 10 Gigabit Ethernet CNA Adapter Driver
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd device qlxgbe
+.Ed
+.Pp
+To load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+if_qlxgbe_load=YES
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver supports IPv4 checksum offload,
+TCP and UDP checksum offload for both IPv4 and IPv6,
+Large Segment Offload for both IPv4 and IPv6,
+Jumbo frames, VLAN Tag, and
+Receive Side scaling.
+For further hardware information, see
+.Pa http://www.qlogic.com/ .
+.Sh HARDWARE
+The
+.Nm
+driver supports 10 Gigabit Ethernet CNA Adapter based on the following
+chipsets:
+.Pp
+.Bl -bullet -compact
+.It
+QLogic 8300 series
+.El
+.Sh SUPPORT
+For support questions please contact your QLogic approved reseller or
+QLogic Technical Support at
+.Pa http://support.qlogic.com ,
+or by E-mail at
+.Aq supp...@qlogic.com .
+.Sh SEE ALSO
+.Xr altq 4 ,
+.Xr arp 4 ,
+.Xr netintro 4 ,
+.Xr ng_ether 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An David C Somayajulu
+at QLogic Corporation.
Modified: stable/9/sys/conf/files.amd64
svn commit: r258899 - head
Author: pjd Date: Tue Dec 3 23:16:08 2013 New Revision: 258899 URL: http://svnweb.freebsd.org/changeset/base/258899 Log: Only the shared library is installed in /lib/. Static library and symlink to shared library stays in /usr/lib/. Don't delete them. Reported by: jkim Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Tue Dec 3 22:31:08 2013(r258898) +++ head/ObsoleteFiles.inc Tue Dec 3 23:16:08 2013(r258899) @@ -39,11 +39,7 @@ # done # 20131202: libcapsicum and libcasper moved to /lib/ -OLD_FILES+=usr/lib/libcapsicum.a -OLD_FILES+=usr/lib/libcapsicum.so OLD_LIBS+=usr/lib/libcapsicum.so.0 -OLD_FILES+=usr/lib/libcasper.a -OLD_FILES+=usr/lib/libcasper.so OLD_LIBS+=usr/lib/libcasper.so.0 # 20131109: extattr(2) mlinks fixed OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz ___ 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
Re: svn commit: r257876 - head/sys/dev/xen/control
If 're' permits, could this be MFC'ed for 10.0? It isn't important
but it would be convenient. Thanks.
On Sat, Nov 09, 2013 at 03:07:49AM +, Justin T. Gibbs wrote:
Author: gibbs
Date: Sat Nov 9 03:07:48 2013
New Revision: 257876
URL: http://svnweb.freebsd.org/changeset/base/257876
Log:
On XenServer the halt message is used instead of poweroff, which
makes FreeBSD halt but not poweroff (as expected when issuing a
shutdown from the VM manager). Fix this by using the same handler
for both halt and poweroff.
NB: The halt signal seems to be used on XenServer only. The OSS
Xen toolstack (xl) uses poweroff instead.
Submitted by: Roger Pau Monné
Sponsored by: Citrix Systems RD
Reviewed by:gibbs
MFC after: 2 days
Modified:
head/sys/dev/xen/control/control.c
Modified: head/sys/dev/xen/control/control.c
==
--- head/sys/dev/xen/control/control.cSat Nov 9 00:59:31 2013
(r257875)
+++ head/sys/dev/xen/control/control.cSat Nov 9 03:07:48 2013
(r257876)
@@ -158,7 +158,6 @@ static xctrl_shutdown_handler_t xctrl_po
static xctrl_shutdown_handler_t xctrl_reboot;
static xctrl_shutdown_handler_t xctrl_suspend;
static xctrl_shutdown_handler_t xctrl_crash;
-static xctrl_shutdown_handler_t xctrl_halt;
/*-- Private Data Structures
-*/
/** Element type for lookup table of event name to handler. */
@@ -173,7 +172,7 @@ static const struct xctrl_shutdown_reaso
{ reboot, xctrl_reboot },
{ suspend, xctrl_suspend },
{ crash,xctrl_crash},
- { halt, xctrl_halt },
+ { halt, xctrl_poweroff },
};
struct xctrl_softc {
@@ -441,12 +440,6 @@ xctrl_crash()
panic(Xen directed crash);
}
-static void
-xctrl_halt()
-{
- shutdown_nice(RB_HALT);
-}
-
/*-- Event Reception
-*/
static void
xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int
len)
___
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-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
Re: svn commit: r257876 - head/sys/dev/xen/control
A request to merge is currently pending with re@.
—
Justin
On Dec 3, 2013, at 4:18 PM, Adam McDougall mcdou...@egr.msu.edu wrote:
If 're' permits, could this be MFC'ed for 10.0? It isn't important
but it would be convenient. Thanks.
On Sat, Nov 09, 2013 at 03:07:49AM +, Justin T. Gibbs wrote:
Author: gibbs
Date: Sat Nov 9 03:07:48 2013
New Revision: 257876
URL: http://svnweb.freebsd.org/changeset/base/257876
Log:
On XenServer the halt message is used instead of poweroff, which
makes FreeBSD halt but not poweroff (as expected when issuing a
shutdown from the VM manager). Fix this by using the same handler
for both halt and poweroff.
NB: The halt signal seems to be used on XenServer only. The OSS
Xen toolstack (xl) uses poweroff instead.
Submitted by: Roger Pau Monné
Sponsored by: Citrix Systems RD
Reviewed by: gibbs
MFC after: 2 days
Modified:
head/sys/dev/xen/control/control.c
Modified: head/sys/dev/xen/control/control.c
==
--- head/sys/dev/xen/control/control.c Sat Nov 9 00:59:31 2013
(r257875)
+++ head/sys/dev/xen/control/control.c Sat Nov 9 03:07:48 2013
(r257876)
@@ -158,7 +158,6 @@ static xctrl_shutdown_handler_t xctrl_po
static xctrl_shutdown_handler_t xctrl_reboot;
static xctrl_shutdown_handler_t xctrl_suspend;
static xctrl_shutdown_handler_t xctrl_crash;
-static xctrl_shutdown_handler_t xctrl_halt;
/*-- Private Data Structures
-*/
/** Element type for lookup table of event name to handler. */
@@ -173,7 +172,7 @@ static const struct xctrl_shutdown_reaso
{ reboot, xctrl_reboot },
{ suspend, xctrl_suspend },
{ crash,xctrl_crash},
-{ halt, xctrl_halt },
+{ halt, xctrl_poweroff },
};
struct xctrl_softc {
@@ -441,12 +440,6 @@ xctrl_crash()
panic(Xen directed crash);
}
-static void
-xctrl_halt()
-{
-shutdown_nice(RB_HALT);
-}
-
/*-- Event Reception
-*/
static void
xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int
len)
___
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-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: r258900 - head/sys/kern
Author: pjd
Date: Wed Dec 4 00:10:37 2013
New Revision: 258900
URL: http://svnweb.freebsd.org/changeset/base/258900
Log:
Break the loop once we know we have the SYF_CAPENABLED flag.
Modified:
head/sys/kern/makesyscalls.sh
Modified: head/sys/kern/makesyscalls.sh
==
--- head/sys/kern/makesyscalls.sh Tue Dec 3 23:16:08 2013
(r258899)
+++ head/sys/kern/makesyscalls.sh Wed Dec 4 00:10:37 2013
(r258900)
@@ -326,6 +326,7 @@ s/\$//g
for (cap in capenabled) {
if (funcname == capenabled[cap]) {
flags = SYF_CAPENABLED;
+ break;
}
}
___
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: r258902 - head/cddl/contrib/opensolaris/lib/libdtrace/common
Author: markj
Date: Wed Dec 4 01:35:04 2013
New Revision: 258902
URL: http://svnweb.freebsd.org/changeset/base/258902
Log:
The uaddr, ufunc, umod and usym functions all seem to work as expected on
FreeBSD, so stop hiding them behind a #if defined(sun).
Reported by: Prashanth Kumar pra_ud...@yahoo.co.in
Modified:
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.cWed Dec
4 00:28:44 2013(r258901)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.cWed Dec
4 01:35:04 2013(r258902)
@@ -487,22 +487,16 @@ static const dt_ident_t _dtrace_globals[
DT_VERS_1_0, dt_idops_func, void(...) },
{ typeref, DT_IDENT_FUNC, 0, DIF_SUBR_TYPEREF, DT_ATTR_STABCMN, DT_VERS_1_1,
dt_idops_func, uintptr_t *(void *, size_t, string, size_t) },
-#if defined(sun)
{ uaddr, DT_IDENT_ACTFUNC, 0, DT_ACT_UADDR, DT_ATTR_STABCMN,
DT_VERS_1_2, dt_idops_func, _usymaddr(uintptr_t) },
-#endif
{ ucaller, DT_IDENT_SCALAR, 0, DIF_VAR_UCALLER, DT_ATTR_STABCMN,
DT_VERS_1_2, dt_idops_type, uint64_t },
-#if defined(sun)
{ ufunc, DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
DT_VERS_1_2, dt_idops_func, _usymaddr(uintptr_t) },
-#endif
{ uid, DT_IDENT_SCALAR, 0, DIF_VAR_UID, DT_ATTR_STABCMN, DT_VERS_1_0,
dt_idops_type, uid_t },
-#if defined(sun)
{ umod, DT_IDENT_ACTFUNC, 0, DT_ACT_UMOD, DT_ATTR_STABCMN,
DT_VERS_1_2, dt_idops_func, _usymaddr(uintptr_t) },
-#endif
{ uregs, DT_IDENT_ARRAY, 0, DIF_VAR_UREGS, DT_ATTR_STABCMN, DT_VERS_1_0,
dt_idops_regs, NULL },
{ ustack, DT_IDENT_ACTFUNC, 0, DT_ACT_USTACK, DT_ATTR_STABCMN, DT_VERS_1_0,
@@ -510,10 +504,8 @@ static const dt_ident_t _dtrace_globals[
{ ustackdepth, DT_IDENT_SCALAR, 0, DIF_VAR_USTACKDEPTH,
DT_ATTR_STABCMN, DT_VERS_1_2,
dt_idops_type, uint32_t },
-#if defined(sun)
{ usym, DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
DT_VERS_1_2, dt_idops_func, _usymaddr(uintptr_t) },
-#endif
{ vtimestamp, DT_IDENT_SCALAR, 0, DIF_VAR_VTIMESTAMP,
DT_ATTR_STABCMN, DT_VERS_1_0,
dt_idops_type, uint64_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: r258903 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n tools/test/dtrace
Author: markj
Date: Wed Dec 4 01:40:39 2013
New Revision: 258903
URL: http://svnweb.freebsd.org/changeset/base/258903
Log:
Enable some previously-disabled DTrace tests for umod, ufunc and usym. They
expect the installed ksh binary to be named ksh, which is not the case
when it's installed on FreeBSD via the shells/ksh93 port. Allow for it to be
ksh93 as well so that the tests can actually pass.
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
head/tools/test/dtrace/Makefile
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
==
---
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
Wed Dec 4 01:35:04 2013(r258902)
+++
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
Wed Dec 4 01:40:39 2013(r258903)
@@ -64,7 +64,7 @@ child=$!
# ksh doing work. (This actually goes one step further and assumes that we
# catch some non-static function in ksh.)
#
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' /dev/null
status=$?
kill $child
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
==
---
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
Wed Dec 4 01:35:04 2013(r258902)
+++
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
Wed Dec 4 01:40:39 2013(r258903)
@@ -62,7 +62,7 @@ child=$!
#
# The only thing we can be sure of here is that ksh is doing some work.
#
-script | tee /dev/fd/2 | grep -w ksh /dev/null
+script | tee /dev/fd/2 | egrep -w 'ksh(93)?' /dev/null
status=$?
kill $child
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
==
---
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
Wed Dec 4 01:35:04 2013(r258902)
+++
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
Wed Dec 4 01:40:39 2013(r258903)
@@ -63,7 +63,7 @@ child=$!
# This test is essentially the same as that in the ufunc test; see that
# test for the rationale.
#
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' /dev/null
status=$?
kill $child
Modified: head/tools/test/dtrace/Makefile
==
--- head/tools/test/dtrace/Makefile Wed Dec 4 01:35:04 2013
(r258902)
+++ head/tools/test/dtrace/Makefile Wed Dec 4 01:40:39 2013
(r258903)
@@ -59,7 +59,6 @@ IGNORE= \
${TESTSRCDIR}/tst/common/proc/tst.discard.ksh \
${TESTSRCDIR}/tst/common/proc/tst.signal.ksh\
${TESTSRCDIR}/tst/common/proc/tst.startexit.ksh \
- ${TESTSRCDIR}/tst/common/profile-n/tst.ufuncsort.c \
${TESTSRCDIR}/tst/common/scalars/tst.misc.d \
${TESTSRCDIR}/tst/common/scalars/tst.selfarray2.d \
${TESTSRCDIR}/tst/common/sysevent/tst.post.c\
@@ -115,10 +114,6 @@ NOTWORK+= \
${TESTSRCDIR}/tst/common/profile-n/tst.func.ksh \
${TESTSRCDIR}/tst/common/profile-n/tst.mod.ksh \
${TESTSRCDIR}/tst/common/profile-n/tst.sym.ksh \
- ${TESTSRCDIR}/tst/common/profile-n/tst.ufunc.ksh\
- ${TESTSRCDIR}/tst/common/profile-n/tst.ufuncsort.ksh\
- ${TESTSRCDIR}/tst/common/profile-n/tst.umod.ksh \
- ${TESTSRCDIR}/tst/common/profile-n/tst.usym.ksh \
${TESTSRCDIR}/tst/common/safety/tst.basename.d \
${TESTSRCDIR}/tst/common/safety/tst.caller.d\
${TESTSRCDIR}/tst/common/safety/tst.cleanpath.d \
___
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: r258904 - head/sys/fs/ext2fs
Author: pfg Date: Wed Dec 4 02:27:52 2013 New Revision: 258904 URL: http://svnweb.freebsd.org/changeset/base/258904 Log: ext2fs: add two new reserved inodes. According to online documentation [1], Ext4 has two new special inodes so add the new exclude and replica inodes. Reference: [1] https://ext4.wiki.kernel.org/index.php/Ext4_Disk_Layout Reported by: Mike Ma MFC after:3 weeks Modified: head/sys/fs/ext2fs/ext2_dinode.h Modified: head/sys/fs/ext2fs/ext2_dinode.h == --- head/sys/fs/ext2fs/ext2_dinode.hWed Dec 4 01:40:39 2013 (r258903) +++ head/sys/fs/ext2fs/ext2_dinode.hWed Dec 4 02:27:52 2013 (r258904) @@ -44,6 +44,8 @@ #defineEXT2_UNDELDIRINO((ino_t)6) #defineEXT2_RESIZEINO ((ino_t)7) #defineEXT2_JOURNALINO ((ino_t)8) +#defineEXT2_EXCLUDEINO ((ino_t)9) +#defineEXT2_REPLICAINO ((ino_t)10) #defineEXT2_FIRSTINO ((ino_t)11) /* ___ 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: r258905 - head/sbin/route
Author: eadler
Date: Wed Dec 4 04:28:00 2013
New Revision: 258905
URL: http://svnweb.freebsd.org/changeset/base/258905
Log:
Turn 'n' into a local variable. This is required for additional changes.
Submitted by: Sebastian Huber sebastian.hu...@embedded-brains.de
Modified:
head/sbin/route/route.c
Modified: head/sbin/route/route.c
==
--- head/sbin/route/route.c Wed Dec 4 02:27:52 2013(r258904)
+++ head/sbin/route/route.c Wed Dec 4 04:28:00 2013(r258905)
@@ -497,7 +497,8 @@ routename(struct sockaddr *sa)
const char *cp;
static char line[NI_MAXHOST];
static char domain[MAXHOSTNAMELEN + 1];
- static int first = 1, n;
+ static int first = 1;
+ int n;
if (first) {
first = 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: r258906 - head/sbin/route
Author: eadler
Date: Wed Dec 4 04:28:49 2013
New Revision: 258906
URL: http://svnweb.freebsd.org/changeset/base/258906
Log:
Add const qualifier where appropriate
Submitted by: Sebastian Huber sebastian.hu...@embedded-brains.de
Modified:
head/sbin/route/route.c
Modified: head/sbin/route/route.c
==
--- head/sbin/route/route.c Wed Dec 4 04:28:00 2013(r258905)
+++ head/sbin/route/route.c Wed Dec 4 04:28:49 2013(r258906)
@@ -1554,7 +1554,7 @@ rtmsg(int cmd, int flags, int fib)
return (0);
}
-static const char *msgtypes[] = {
+static const char *const msgtypes[] = {
,
RTM_ADD: Add Route,
RTM_DELETE: Delete Route,
___
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: r258907 - head/sbin/route
Author: eadler
Date: Wed Dec 4 04:29:52 2013
New Revision: 258907
URL: http://svnweb.freebsd.org/changeset/base/258907
Log:
Add const qualifier where appropriate
Submitted by: Sebastian Huber sebastian.hu...@embedded-brains.de
Modified:
head/sbin/route/route.c
Modified: head/sbin/route/route.c
==
--- head/sbin/route/route.c Wed Dec 4 04:28:49 2013(r258906)
+++ head/sbin/route/route.c Wed Dec 4 04:29:52 2013(r258907)
@@ -74,7 +74,7 @@ __FBSDID($FreeBSD$);
static struct keytab {
const char *kt_cp;
int kt_i;
-} keywords[] = {
+} const keywords[] = {
#include keywords.h
{0, 0}
};
@@ -1848,7 +1848,7 @@ printb(int b, const char *str)
int
keyword(const char *cp)
{
- struct keytab *kt = keywords;
+ const struct keytab *kt = keywords;
while (kt-kt_cp != NULL strcmp(kt-kt_cp, cp) != 0)
kt++;
___
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
Re: svn commit: r258901 - head/usr.sbin/mfiutil
On Tue, Dec 3, 2013 at 7:28 PM, Sean Bruno sbr...@freebsd.org wrote: Author: sbruno Date: Wed Dec 4 00:28:44 2013 New Revision: 258901 URL: http://svnweb.freebsd.org/changeset/base/258901 Log: svn r251516 resized the buf argument a bit too much. Pass a hardcoded size of 6 to humanize_number() to resolve this. Where is the value of 6 derived from? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams ___ 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: r258908 - head/sbin/route
Author: eadler
Date: Wed Dec 4 05:06:56 2013
New Revision: 258908
URL: http://svnweb.freebsd.org/changeset/base/258908
Log:
Avoid using a static buffer in atalk_ntoa. This will help allow users to
call route(1) as a library.
Submitted by: Sebastian Huber sebastian.hu...@embedded-brains.de (older
version)
Discussed on: -hackers
Reviwed by: adri (different older version)
Modified:
head/sbin/route/route.c
Modified: head/sbin/route/route.c
==
--- head/sbin/route/route.c Wed Dec 4 04:29:52 2013(r258907)
+++ head/sbin/route/route.c Wed Dec 4 05:06:56 2013(r258908)
@@ -71,6 +71,8 @@ __FBSDID($FreeBSD$);
#include unistd.h
#include ifaddrs.h
+#define ATALK_BUF_SIZE 20
+
static struct keytab {
const char *kt_cp;
int kt_i;
@@ -92,7 +94,7 @@ static intdefaultfib;
static int numfibs;
static int atalk_aton(const char *, struct at_addr *);
-static char*atalk_ntoa(struct at_addr);
+static char*atalk_ntoa(struct at_addr, char [ATALK_BUF_SIZE]);
static voidprintb(int, const char *);
static voidflushroutes(int argc, char *argv[]);
static int flushroutes_fib(int);
@@ -495,6 +497,7 @@ routename(struct sockaddr *sa)
{
struct sockaddr_dl *sdl;
const char *cp;
+ char atalk_buf[ATALK_BUF_SIZE];
static char line[NI_MAXHOST];
static char domain[MAXHOSTNAMELEN + 1];
static int first = 1;
@@ -577,7 +580,8 @@ routename(struct sockaddr *sa)
#endif
case AF_APPLETALK:
(void)snprintf(line, sizeof(line), atalk %s,
- atalk_ntoa(((struct sockaddr_at *)(void *)sa)-sat_addr));
+ atalk_ntoa(((struct sockaddr_at *)(void *)sa)-sat_addr,
+ atalk_buf));
break;
case AF_LINK:
@@ -622,6 +626,7 @@ netname(struct sockaddr *sa)
{
struct sockaddr_dl *sdl;
static char line[MAXHOSTNAMELEN + 1];
+ char atalk_buf[ATALK_BUF_SIZE];
int n;
#ifdef INET
struct netent *np = NULL;
@@ -685,7 +690,8 @@ netname(struct sockaddr *sa)
case AF_APPLETALK:
(void)snprintf(line, sizeof(line), atalk %s,
- atalk_ntoa(((struct sockaddr_at *)(void *)sa)-sat_addr));
+ atalk_ntoa(((struct sockaddr_at *)(void *)sa)-sat_addr,
+ atalk_buf));
break;
case AF_LINK:
@@ -1858,6 +1864,7 @@ keyword(const char *cp)
static void
sodump(struct sockaddr *sa, const char *which)
{
+ char atalk_buf[ATALK_BUF_SIZE];
#ifdef INET6
char nbuf[INET6_ADDRSTRLEN];
#endif
@@ -1882,7 +1889,8 @@ sodump(struct sockaddr *sa, const char *
#endif
case AF_APPLETALK:
(void)printf(%s: atalk %s; , which,
- atalk_ntoa(((struct sockaddr_at *)(void *)sa)-sat_addr));
+ atalk_ntoa(((struct sockaddr_at *)(void *)sa)-sat_addr,
+ atalk_buf));
break;
}
(void)fflush(stdout);
@@ -1952,11 +1960,9 @@ atalk_aton(const char *text, struct at_a
}
static char *
-atalk_ntoa(struct at_addr at)
+atalk_ntoa(struct at_addr at, char buf[ATALK_BUF_SIZE])
{
- static char buf[20];
-
- (void)snprintf(buf, sizeof(buf), %u.%u, ntohs(at.s_net), at.s_node);
- buf[sizeof(buf) - 1] = '\0';
+ (void)snprintf(buf, ATALK_BUF_SIZE, %u.%u, ntohs(at.s_net),
at.s_node);
+ buf[ATALK_BUF_SIZE - 1] = '\0';
return(buf);
}
___
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
Re: svn commit: r258908 - head/sbin/route
On Wed, Dec 04, 2013 at 05:06:56AM +, Eitan Adler wrote: E Author: eadler E Date: Wed Dec 4 05:06:56 2013 E New Revision: 258908 E URL: http://svnweb.freebsd.org/changeset/base/258908 E E Log: E Avoid using a static buffer in atalk_ntoa. This will help allow users to call route(1) as a library. E E Submitted by: Sebastian Huber sebastian.hu...@embedded-brains.de (older version) E Discussed on: -hackers E Reviwed by:adri (different older version) Does this mean someone is still using atalk? -- Totus tuus, Glebius. ___ 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: r258909 - in head: sbin/mdconfig sys/dev/md sys/sys
Author: trasz
Date: Wed Dec 4 07:38:23 2013
New Revision: 258909
URL: http://svnweb.freebsd.org/changeset/base/258909
Log:
Add null backend to mdconfig(8). This does exactly what the name
suggests, and is somewhat useful for benchmarking.
MFC after:1 month
No objections from: kib
Sponsored by: The FreeBSD Foundation
Modified:
head/sbin/mdconfig/mdconfig.8
head/sbin/mdconfig/mdconfig.c
head/sys/dev/md/md.c
head/sys/sys/mdioctl.h
Modified: head/sbin/mdconfig/mdconfig.8
==
--- head/sbin/mdconfig/mdconfig.8 Wed Dec 4 05:06:56 2013
(r258908)
+++ head/sbin/mdconfig/mdconfig.8 Wed Dec 4 07:38:23 2013
(r258909)
@@ -41,7 +41,7 @@
.\
.\ $FreeBSD$
.\
-.Dd October 26, 2013
+.Dd November 30, 2013
.Dt MDCONFIG 8
.Os
.Sh NAME
@@ -122,6 +122,8 @@ Using
backing is generally preferred instead of using
.Cm malloc
backing.
+.It Cm null
+Bitsink; all writes do nothing, all reads return zeroes.
.El
.It Fl f Ar file
Filename to use for the vnode type memory disk.
Modified: head/sbin/mdconfig/mdconfig.c
==
--- head/sbin/mdconfig/mdconfig.c Wed Dec 4 05:06:56 2013
(r258908)
+++ head/sbin/mdconfig/mdconfig.c Wed Dec 4 07:38:23 2013
(r258909)
@@ -155,6 +155,9 @@ main(int argc, char **argv)
} else if (!strcmp(optarg, swap)) {
mdio.md_type = MD_SWAP;
mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT |
MD_COMPRESS;
+ } else if (!strcmp(optarg, null)) {
+ mdio.md_type = MD_NULL;
+ mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT |
MD_COMPRESS;
} else
errx(1, unknown type: %s, optarg);
break;
@@ -287,9 +290,10 @@ main(int argc, char **argv)
}
}
- if ((mdio.md_type == MD_MALLOC || mdio.md_type == MD_SWAP)
- sflag == NULL)
- errx(1, must specify -s for -t malloc or -t swap);
+ if ((mdio.md_type == MD_MALLOC || mdio.md_type == MD_SWAP ||
+ mdio.md_type == MD_NULL) sflag == NULL)
+ errx(1, must specify -s for -t malloc, -t swap,
+ or -t null);
if (mdio.md_type == MD_VNODE mdio.md_file[0] == '\0')
errx(1, must specify -f for -t vnode);
} else {
Modified: head/sys/dev/md/md.c
==
--- head/sys/dev/md/md.cWed Dec 4 05:06:56 2013(r258908)
+++ head/sys/dev/md/md.cWed Dec 4 07:38:23 2013(r258909)
@@ -908,6 +908,22 @@ mdstart_swap(struct md_s *sc, struct bio
return (rv != VM_PAGER_ERROR ? 0 : ENOSPC);
}
+static int
+mdstart_null(struct md_s *sc, struct bio *bp)
+{
+
+ switch (bp-bio_cmd) {
+ case BIO_READ:
+ bzero(bp-bio_data, bp-bio_length);
+ cpu_flush_dcache(bp-bio_data, bp-bio_length);
+ break;
+ case BIO_WRITE:
+ break;
+ }
+ bp-bio_resid = 0;
+ return (0);
+}
+
static void
md_kthread(void *arg)
{
@@ -1027,6 +1043,7 @@ mdinit(struct md_s *sc)
pp-flags |= G_PF_ACCEPT_UNMAPPED;
break;
case MD_PRELOAD:
+ case MD_NULL:
break;
}
sc-gp = gp;
@@ -1245,6 +1262,7 @@ mdresize(struct md_s *sc, struct md_ioct
switch (sc-type) {
case MD_VNODE:
+ case MD_NULL:
break;
case MD_SWAP:
if (mdio-md_mediasize = 0 ||
@@ -1339,6 +1357,19 @@ mdcreate_swap(struct md_s *sc, struct md
return (error);
}
+static int
+mdcreate_null(struct md_s *sc, struct md_ioctl *mdio, struct thread *td)
+{
+
+ /*
+* Range check. Disallow negative sizes or any size less then the
+* size of a page. Then round to a page.
+*/
+ if (sc-mediasize = 0 || (sc-mediasize % PAGE_SIZE) != 0)
+ return (EDOM);
+
+ return (0);
+}
static int
xmdctlioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct
thread *td)
@@ -1371,6 +1402,7 @@ xmdctlioctl(struct cdev *dev, u_long cmd
case MD_PRELOAD:
case MD_VNODE:
case MD_SWAP:
+ case MD_NULL:
break;
default:
return (EINVAL);
@@ -1416,6 +1448,10 @@ xmdctlioctl(struct cdev *dev, u_long cmd
sc-start = mdstart_swap;
error = mdcreate_swap(sc, mdio, td);
break;
+ case MD_NULL:
+ sc-start
svn commit: r258910 - stable/10
Author: rodrigc Date: Wed Dec 4 07:45:08 2013 New Revision: 258910 URL: http://svnweb.freebsd.org/changeset/base/258910 Log: MFC r258738 Also mention that drill(1) can be used, now that nslookup and dig are no longer in the base system. Suggested by: peter Approved by: re (gjb) Modified: stable/10/UPDATING (contents, props changed) Directory Properties: stable/10/ (props changed) Modified: stable/10/UPDATING == --- stable/10/UPDATING Wed Dec 4 07:38:23 2013(r258909) +++ stable/10/UPDATING Wed Dec 4 07:45:08 2013(r258910) @@ -58,7 +58,7 @@ older version of current is a bit fragil available in the ports tree. The dns/bind99 port is one example. With this change, nslookup(1) and dig(1) are no longer in the base - system. Users should instead use host(1) which is still + system. Users should instead use host(1) and drill(1) which are in the base system. Alternatively, nslookup and dig can be obtained by installing the dns/bind-tools port. ___ 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: r258911 - stable/10/sys/vm
Author: rodrigc
Date: Wed Dec 4 07:46:53 2013
New Revision: 258911
URL: http://svnweb.freebsd.org/changeset/base/258911
Log:
MFC r258737
In keg_dtor(), print out the keg name in the Freed UMA keg was not empty
message printed to the console. This makes it easier to track down
the source of certain memory leaks.
Suggested by: adrian
Approved by: re (gjb)
Modified:
stable/10/sys/vm/uma_core.c
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/vm/uma_core.c
==
--- stable/10/sys/vm/uma_core.c Wed Dec 4 07:45:08 2013(r258910)
+++ stable/10/sys/vm/uma_core.c Wed Dec 4 07:46:53 2013(r258911)
@@ -1571,8 +1571,9 @@ keg_dtor(void *arg, int size, void *udat
keg = (uma_keg_t)arg;
KEG_LOCK(keg);
if (keg-uk_free != 0) {
- printf(Freed UMA keg was not empty (%d items).
+ printf(Freed UMA keg (%s) was not empty (%d items).
Lost %d pages of memory.\n,
+ keg-uk_name ? keg-uk_name : ,
keg-uk_free, keg-uk_pages);
}
KEG_UNLOCK(keg);
___
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: r258912 - stable/10/sys/netpfil/ipfw
Author: rodrigc
Date: Wed Dec 4 07:50:18 2013
New Revision: 258912
URL: http://svnweb.freebsd.org/changeset/base/258912
Log:
MFC r258588
In sys/netpfil/ipfw/ip_fw_nat.c:vnet_ipfw_nat_uninit() we call
IPFW_WLOCK(chain);.
This lock gets deleted in sys/netpfil/ipfw/ip_fw2.c:vnet_ipfw_uninit().
Therefore, vnet_ipfw_nat_uninit() *must* be called before vnet_ipfw_uninit(),
but this doesn't always happen, because the VNET_SYSINIT order is the same
for both functions.
In sys/net/netpfil/ipfw/ip_fw2.c and sys/net/netpfil/ipfw/ip_fw_nat.c,
IPFW_SI_SUB_FIREWALL == IPFW_NAT_SI_SUB_FIREWALL ==
SI_SUB_PROTO_IFATTACHDOMAIN
and
IPFW_MODULE_ORDER == IPFW_NAT_MODULE_ORDER
Consequently, if VIMAGE is enabled, and jails are created and destroyed,
the system sometimes crashes, because we are trying to use a deleted lock.
To reproduce the problem:
(1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS,
INVARIANTS.
(2) Run this command in a loop:
jail -l -u root -c path=/ name=foo persist vnet jexec foo ifconfig
lo0 127.0.0.1/8 jail -r foo
(see
http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html )
Fix the problem by increasing the value of IPFW_NAT_SI_SUB_FIREWALL,
so that vnet_ipfw_nat_uninit() runs after vnet_ipfw_uninit().
Approved by: re (gjb)
Modified:
stable/10/sys/netpfil/ipfw/ip_fw_nat.c
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/netpfil/ipfw/ip_fw_nat.c
==
--- stable/10/sys/netpfil/ipfw/ip_fw_nat.c Wed Dec 4 07:46:53 2013
(r258911)
+++ stable/10/sys/netpfil/ipfw/ip_fw_nat.c Wed Dec 4 07:50:18 2013
(r258912)
@@ -674,7 +674,7 @@ static moduledata_t ipfw_nat_mod = {
};
/* Define startup order. */
-#defineIPFW_NAT_SI_SUB_FIREWALLSI_SUB_PROTO_IFATTACHDOMAIN
+#defineIPFW_NAT_SI_SUB_FIREWALL(SI_SUB_PROTO_IFATTACHDOMAIN +
1)
#defineIPFW_NAT_MODEVENT_ORDER (SI_ORDER_ANY - 255)
#defineIPFW_NAT_MODULE_ORDER (IPFW_NAT_MODEVENT_ORDER + 1)
#defineIPFW_NAT_VNET_ORDER (IPFW_NAT_MODEVENT_ORDER + 2)
___
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
Re: svn commit: r258909 - in head: sbin/mdconfig sys/dev/md sys/sys
On Wed, Dec 04, 2013 at 07:38:24AM +, Edward Tomasz Napierala wrote: Author: trasz Date: Wed Dec 4 07:38:23 2013 New Revision: 258909 URL: http://svnweb.freebsd.org/changeset/base/258909 Log: Add null backend to mdconfig(8). This does exactly what the name suggests, and is somewhat useful for benchmarking. There is already a 'geom zero' module which I believe provides equivalent functionality. -- Mateusz Guzik mjguzik gmail.com ___ 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: r258913 - stable/10/sys/net
Author: rodrigc Date: Wed Dec 4 07:55:49 2013 New Revision: 258913 URL: http://svnweb.freebsd.org/changeset/base/258913 Log: MFC 258591 In vnet_route_uninit(), free some memory that is allocated in vnet_route_init(). To reproduce the problem: (1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS, INVARIANTS. (2) Run this command in a loop: jail -l -u root -c path=/ name=foo persist vnet jexec foo ifconfig lo0 127.0.0.1/8 jail -r foo see: http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021291.html This doesn't eliminate all the Freed UMA keg was not empty warning messages on the console, but it helps. Approved by: re (gjb) Modified: stable/10/sys/net/route.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/net/route.c == --- stable/10/sys/net/route.c Wed Dec 4 07:50:18 2013(r258912) +++ stable/10/sys/net/route.c Wed Dec 4 07:55:49 2013(r258913) @@ -262,6 +262,9 @@ vnet_route_uninit(const void *unused __u dom-dom_rtdetach((void **)rnh, dom-dom_rtoffset); } } + + free(V_rt_tables, M_RTABLE); + uma_zdestroy(V_rtzone); } VNET_SYSUNINIT(vnet_route_uninit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, vnet_route_uninit, 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
