Re: svn commit: r279361 - in head: sys/kern sys/sys usr.sbin/jail
On 2/27/2015 10:28 AM, Ian Lepore wrote: > Author: ian > Date: Fri Feb 27 16:28:55 2015 > New Revision: 279361 > URL: https://svnweb.freebsd.org/changeset/base/279361 > > Log: > Allow the kern.osrelease and kern.osreldate sysctl values to be set in a > jail's creation parameters. This allows the kernel version to be reliably For package building we very much need to be able to override hw.ncpu, hw.physmem and kern.smp.cpus. Too many ports spy on those rather than using the values we pass in the environment. Java ports have this issue. We set a ulimit on the jail and Java sees there is 96GB of RAM on the system and tries to allocate a very large portion of it and fails. Hence we cannot run package builds with any sort of memory limits. Ports disrespecting the MAKE_JOBS_NUMBER we assign to them will no longer be an issue if we can spoof hw.ncpu/kern.smp.cpus as well. Bonus points for allowing these to be changed on-demand. We may setup a jail and want to change how much memory or CPUs it is allowed depending on what is going to be built next. I had been planning to look at this eventually but if someone beats me to it that would be great! -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
svn commit: r280476 - head/share/man/man4
Author: ngie Date: Tue Mar 24 22:40:16 2015 New Revision: 280476 URL: https://svnweb.freebsd.org/changeset/base/280476 Log: Bump .Dd Modified: head/share/man/man4/witness.4 Modified: head/share/man/man4/witness.4 == --- head/share/man/man4/witness.4 Tue Mar 24 22:39:49 2015 (r280475) +++ head/share/man/man4/witness.4 Tue Mar 24 22:40:16 2015 (r280476) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 6, 2015 +.Dd March 24, 2015 .Dt WITNESS 4 .Os .Sh NAME ___ 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: r280475 - head/share/man/man4
Author: ngie Date: Tue Mar 24 22:39:49 2015 New Revision: 280475 URL: https://svnweb.freebsd.org/changeset/base/280475 Log: The number of commands added when ddb(4) is enabled is 3, not 2 MFC after: 3 days Sponsored by: EMC / Isilon Storage Division Modified: head/share/man/man4/witness.4 Modified: head/share/man/man4/witness.4 == --- head/share/man/man4/witness.4 Tue Mar 24 22:39:18 2015 (r280474) +++ head/share/man/man4/witness.4 Tue Mar 24 22:39:49 2015 (r280475) @@ -127,7 +127,7 @@ can be set via .Pp The .Nm -code also provides two extra +code also provides three extra .Xr ddb 4 commands if both .Nm ___ 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: r280463 - head/sys/cam/ctl
Author: ken
Date: Tue Mar 24 21:42:28 2015
New Revision: 280463
URL: https://svnweb.freebsd.org/changeset/base/280463
Log:
Remove some #if 0'ed code that apparently confuses cscope.
Requested by: Peter Xu
MFC after:3 days
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Tue Mar 24 21:32:49 2015(r280462)
+++ head/sys/cam/ctl/ctl.c Tue Mar 24 21:42:28 2015(r280463)
@@ -12152,9 +12152,6 @@ ctl_lun_reset(struct ctl_lun *lun, union
/*
* Run through the OOA queue and abort each I/O.
*/
-#if 0
- TAILQ_FOREACH((struct ctl_io_hdr *)xio, &lun->ooa_queue, ooa_links) {
-#endif
for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL;
xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) {
xio->io_hdr.flags |= CTL_FLAG_ABORT | CTL_FLAG_ABORT_STATUS;
@@ -12335,9 +12332,6 @@ ctl_abort_task(union ctl_io *io)
* untagged command to abort, simply abort the first untagged command
* we come to. We only allow one untagged command at a time of course.
*/
-#if 0
- TAILQ_FOREACH((struct ctl_io_hdr *)xio, &lun->ooa_queue, ooa_links) {
-#endif
for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL;
xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) {
#if 0
@@ -12375,7 +12369,7 @@ ctl_abort_task(union ctl_io *io)
#if 0
if (((xio->scsiio.tag_type == CTL_TAG_UNTAGGED)
&& (io->taskio.tag_type == CTL_TAG_UNTAGGED))
-|| (xio->scsiio.tag_num == io->taskio.tag_num)) {
+|| (xio->scsiio.tag_num == io->taskio.tag_num))
#endif
/*
* XXX KDM we've got problems with FC, because it
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r280462 - vendor/lld/lld-trunk-r233088
Author: dim Date: Tue Mar 24 21:32:49 2015 New Revision: 280462 URL: https://svnweb.freebsd.org/changeset/base/280462 Log: Tag lld trunk r233088. Added: vendor/lld/lld-trunk-r233088/ - copied from r280461, vendor/lld/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: r280461 - in vendor/lld: . dist dist/cmake dist/cmake/modules dist/docs dist/docs/_static dist/docs/_templates dist/docs/llvm-theme dist/docs/llvm-theme/static dist/include dist/include...
Author: dim Date: Tue Mar 24 21:31:36 2015 New Revision: 280461 URL: https://svnweb.freebsd.org/changeset/base/280461 Log: Vendor import of lld trunk r233088: https://llvm.org/svn/llvm-project/lld/trunk@233088 Added: vendor/lld/ vendor/lld/dist/ vendor/lld/dist/.arcconfig vendor/lld/dist/.clang-format vendor/lld/dist/.gitignore vendor/lld/dist/CMakeLists.txt (contents, props changed) vendor/lld/dist/LICENSE.TXT (contents, props changed) vendor/lld/dist/Makefile (contents, props changed) vendor/lld/dist/README.md vendor/lld/dist/cmake/ vendor/lld/dist/cmake/modules/ vendor/lld/dist/cmake/modules/FindVTune.cmake vendor/lld/dist/docs/ vendor/lld/dist/docs/C++11.rst vendor/lld/dist/docs/CMakeLists.txt (contents, props changed) vendor/lld/dist/docs/Driver.rst vendor/lld/dist/docs/Makefile (contents, props changed) vendor/lld/dist/docs/README.txt (contents, props changed) vendor/lld/dist/docs/Readers.rst vendor/lld/dist/docs/_static/ vendor/lld/dist/docs/_static/favicon.ico (contents, props changed) vendor/lld/dist/docs/_templates/ vendor/lld/dist/docs/_templates/indexsidebar.html (contents, props changed) vendor/lld/dist/docs/_templates/layout.html (contents, props changed) vendor/lld/dist/docs/conf.py (contents, props changed) vendor/lld/dist/docs/design.rst vendor/lld/dist/docs/development.rst vendor/lld/dist/docs/getting_started.rst vendor/lld/dist/docs/hello.png (contents, props changed) vendor/lld/dist/docs/index.rst vendor/lld/dist/docs/llvm-theme/ vendor/lld/dist/docs/llvm-theme/layout.html (contents, props changed) vendor/lld/dist/docs/llvm-theme/static/ vendor/lld/dist/docs/llvm-theme/static/contents.png (contents, props changed) vendor/lld/dist/docs/llvm-theme/static/llvm.css (contents, props changed) vendor/lld/dist/docs/llvm-theme/static/logo.png (contents, props changed) vendor/lld/dist/docs/llvm-theme/static/navigation.png (contents, props changed) vendor/lld/dist/docs/llvm-theme/theme.conf (contents, props changed) vendor/lld/dist/docs/make.bat vendor/lld/dist/docs/open_projects.rst vendor/lld/dist/docs/sphinx_intro.rst vendor/lld/dist/docs/windows_support.rst vendor/lld/dist/include/ vendor/lld/dist/include/Makefile (contents, props changed) vendor/lld/dist/include/lld/ vendor/lld/dist/include/lld/Config/ vendor/lld/dist/include/lld/Config/Makefile (contents, props changed) vendor/lld/dist/include/lld/Config/Version.h (contents, props changed) vendor/lld/dist/include/lld/Config/Version.inc.in (contents, props changed) vendor/lld/dist/include/lld/Core/ vendor/lld/dist/include/lld/Core/AbsoluteAtom.h (contents, props changed) vendor/lld/dist/include/lld/Core/Alias.h (contents, props changed) vendor/lld/dist/include/lld/Core/ArchiveLibraryFile.h (contents, props changed) vendor/lld/dist/include/lld/Core/Atom.h (contents, props changed) vendor/lld/dist/include/lld/Core/DefinedAtom.h (contents, props changed) vendor/lld/dist/include/lld/Core/Error.h (contents, props changed) vendor/lld/dist/include/lld/Core/File.h (contents, props changed) vendor/lld/dist/include/lld/Core/Instrumentation.h (contents, props changed) vendor/lld/dist/include/lld/Core/LLVM.h (contents, props changed) vendor/lld/dist/include/lld/Core/LinkingContext.h (contents, props changed) vendor/lld/dist/include/lld/Core/Node.h (contents, props changed) vendor/lld/dist/include/lld/Core/Parallel.h (contents, props changed) vendor/lld/dist/include/lld/Core/Pass.h (contents, props changed) vendor/lld/dist/include/lld/Core/PassManager.h (contents, props changed) vendor/lld/dist/include/lld/Core/Reader.h (contents, props changed) vendor/lld/dist/include/lld/Core/Reference.h (contents, props changed) vendor/lld/dist/include/lld/Core/Resolver.h (contents, props changed) vendor/lld/dist/include/lld/Core/STDExtras.h (contents, props changed) vendor/lld/dist/include/lld/Core/SharedLibraryAtom.h (contents, props changed) vendor/lld/dist/include/lld/Core/SharedLibraryFile.h (contents, props changed) vendor/lld/dist/include/lld/Core/Simple.h (contents, props changed) vendor/lld/dist/include/lld/Core/SymbolTable.h (contents, props changed) vendor/lld/dist/include/lld/Core/TODO.txt (contents, props changed) vendor/lld/dist/include/lld/Core/UndefinedAtom.h (contents, props changed) vendor/lld/dist/include/lld/Core/Writer.h (contents, props changed) vendor/lld/dist/include/lld/Core/range.h (contents, props changed) vendor/lld/dist/include/lld/Driver/ vendor/lld/dist/include/lld/Driver/Driver.h (contents, props changed) vendor/lld/dist/include/lld/Driver/WinLinkModuleDef.h (contents, props changed) vendor/lld/dist/include/lld/Makefile (contents, props changed) vendor/lld/dist/include/lld/Passes/ vendor/lld/dist/include/lld/ReaderWriter/ vendor/lld/dist/include/lld/ReaderWriter/At
svn commit: r280459 - head/sys/netinet
Author: tuexen
Date: Tue Mar 24 21:12:45 2015
New Revision: 280459
URL: https://svnweb.freebsd.org/changeset/base/280459
Log:
Fix two bugs which resulted in a screwed up end point list:
* Use a save way to walk throught a list while manipulting it.
* Have to appropiate locks in place.
Joint work with rrs@
MFC after: 3 days
Modified:
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_usrreq.c
Modified: head/sys/netinet/sctp_pcb.c
==
--- head/sys/netinet/sctp_pcb.c Tue Mar 24 20:33:24 2015(r280458)
+++ head/sys/netinet/sctp_pcb.c Tue Mar 24 21:12:45 2015(r280459)
@@ -1867,7 +1867,7 @@ sctp_swap_inpcb_for_listen(struct sctp_i
{
/* For 1-2-1 with port reuse */
struct sctppcbhead *head;
- struct sctp_inpcb *tinp;
+ struct sctp_inpcb *tinp, *ninp;
if (sctp_is_feature_off(inp, SCTP_PCB_FLAGS_PORTREUSE)) {
/* only works with port reuse on */
@@ -1877,10 +1877,11 @@ sctp_swap_inpcb_for_listen(struct sctp_i
return (0);
}
SCTP_INP_RUNLOCK(inp);
+ SCTP_INP_INFO_WLOCK();
head =
&SCTP_BASE_INFO(sctp_ephash)[SCTP_PCBHASH_ALLADDR(inp->sctp_lport,
SCTP_BASE_INFO(hashmark))];
/* Kick out all non-listeners to the TCP hash */
- LIST_FOREACH(tinp, head, sctp_hash) {
+ LIST_FOREACH_SAFE(tinp, head, sctp_hash, ninp) {
if (tinp->sctp_lport != inp->sctp_lport) {
continue;
}
@@ -1908,6 +1909,7 @@ sctp_swap_inpcb_for_listen(struct sctp_i
LIST_INSERT_HEAD(head, inp, sctp_hash);
SCTP_INP_WUNLOCK(inp);
SCTP_INP_RLOCK(inp);
+ SCTP_INP_INFO_WUNLOCK();
return (0);
}
Modified: head/sys/netinet/sctp_usrreq.c
==
--- head/sys/netinet/sctp_usrreq.c Tue Mar 24 20:33:24 2015
(r280458)
+++ head/sys/netinet/sctp_usrreq.c Tue Mar 24 21:12:45 2015
(r280459)
@@ -6965,8 +6965,8 @@ sctp_listen(struct socket *so, int backl
#endif
SOCK_LOCK(so);
error = solisten_proto_check(so);
+ SOCK_UNLOCK(so);
if (error) {
- SOCK_UNLOCK(so);
SCTP_INP_RUNLOCK(inp);
return (error);
}
@@ -6979,28 +6979,27 @@ sctp_listen(struct socket *so, int backl
* move the guy that was listener to the TCP Pool.
*/
if (sctp_swap_inpcb_for_listen(inp)) {
- goto in_use;
+ SCTP_INP_RUNLOCK(inp);
+ SCTP_LTRACE_ERR_RET(inp, NULL, NULL,
SCTP_FROM_SCTP_USRREQ, EADDRINUSE);
+ return (EADDRINUSE);
}
}
if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
(inp->sctp_flags & SCTP_PCB_FLAGS_CONNECTED)) {
/* We are already connected AND the TCP model */
-in_use:
SCTP_INP_RUNLOCK(inp);
- SOCK_UNLOCK(so);
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ,
EADDRINUSE);
return (EADDRINUSE);
}
SCTP_INP_RUNLOCK(inp);
if (inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) {
/* We must do a bind. */
- SOCK_UNLOCK(so);
if ((error = sctp_inpcb_bind(so, NULL, NULL, p))) {
/* bind error, probably perm */
return (error);
}
- SOCK_LOCK(so);
}
+ SOCK_LOCK(so);
/* It appears for 7.0 and on, we must always call this. */
solisten_proto(so, backlog);
if (inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) {
___
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: r280458 - head/include
Author: pfg
Date: Tue Mar 24 20:33:24 2015
New Revision: 280458
URL: https://svnweb.freebsd.org/changeset/base/280458
Log:
Introduce nonnull attributes in the signal and pthread headers.
The `nonnull' attribute specifies that some function parameters should be
non-null pointers. This is very useful as it helps the compiler generate
warnings on suspicious code and can also enable some small optimizations.
In clang this is also useful for the static analyzer.
While we could go on defining this all over the tree, it only
makes sense to annotate a subset of critical functions.
Hinted by:Android's bionic libc
Differential Revision:https://reviews.freebsd.org/D2101
Modified:
head/include/pthread.h
head/include/signal.h
Modified: head/include/pthread.h
==
--- head/include/pthread.h Tue Mar 24 20:09:55 2015(r280457)
+++ head/include/pthread.h Tue Mar 24 20:33:24 2015(r280458)
@@ -144,19 +144,23 @@ struct _pthread_cleanup_info {
*/
__BEGIN_DECLS
intpthread_atfork(void (*)(void), void (*)(void), void (*)(void));
-intpthread_attr_destroy(pthread_attr_t *);
+intpthread_attr_destroy(pthread_attr_t *) __nonnull(1);
intpthread_attr_getstack(const pthread_attr_t * __restrict,
- void ** __restrict, size_t * __restrict);
-intpthread_attr_getstacksize(const pthread_attr_t *, size_t *);
+ void ** __restrict, size_t * __restrict)
+ __nonnull(1, 2, 3);
+intpthread_attr_getstacksize(const pthread_attr_t *, size_t *)
+ __nonnull(1, 2);
intpthread_attr_getguardsize(const pthread_attr_t *, size_t *);
intpthread_attr_getstackaddr(const pthread_attr_t *, void **);
-intpthread_attr_getdetachstate(const pthread_attr_t *, int *);
-intpthread_attr_init(pthread_attr_t *);
-intpthread_attr_setstacksize(pthread_attr_t *, size_t);
-intpthread_attr_setguardsize(pthread_attr_t *, size_t);
-intpthread_attr_setstack(pthread_attr_t *, void *, size_t);
+intpthread_attr_getdetachstate(const pthread_attr_t *, int *)
+ __nonnull(1, 2);
+intpthread_attr_init(pthread_attr_t *) __nonnull(1);
+intpthread_attr_setstacksize(pthread_attr_t *, size_t)
__nonnull(1);
+intpthread_attr_setguardsize(pthread_attr_t *, size_t)
__nonnull(1);
+intpthread_attr_setstack(pthread_attr_t *, void *, size_t)
+ __nonnull(1);
intpthread_attr_setstackaddr(pthread_attr_t *, void *);
-intpthread_attr_setdetachstate(pthread_attr_t *, int);
+intpthread_attr_setdetachstate(pthread_attr_t *, int) __nonnull(1);
intpthread_barrier_destroy(pthread_barrier_t *);
intpthread_barrier_init(pthread_barrier_t *,
const pthread_barrierattr_t *, unsigned);
@@ -164,7 +168,7 @@ int pthread_barrier_wait(pthread_barrie
intpthread_barrierattr_destroy(pthread_barrierattr_t *);
intpthread_barrierattr_getpshared(const pthread_barrierattr_t *,
int *);
-intpthread_barrierattr_init(pthread_barrierattr_t *);
+intpthread_barrierattr_init(pthread_barrierattr_t *) __nonnull(1);
intpthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
#definepthread_cleanup_push(cleanup_routine, cleanup_arg)
\
@@ -180,85 +184,96 @@ int pthread_barrierattr_setpshared(pthr
__pthread_cleanup_pop_imp(execute);
\
}
-intpthread_condattr_destroy(pthread_condattr_t *);
+intpthread_condattr_destroy(pthread_condattr_t *) __nonnull(1);
intpthread_condattr_getclock(const pthread_condattr_t *,
- clockid_t *);
-intpthread_condattr_getpshared(const pthread_condattr_t *, int *);
-intpthread_condattr_init(pthread_condattr_t *);
-intpthread_condattr_setclock(pthread_condattr_t *, clockid_t);
-intpthread_condattr_setpshared(pthread_condattr_t *, int);
-intpthread_cond_broadcast(pthread_cond_t *);
-intpthread_cond_destroy(pthread_cond_t *);
+ clockid_t *) __nonnull(1, 2);
+intpthread_condattr_getpshared(const pthread_condattr_t *, int *)
+ __nonnull(1, 2);
+intpthread_condattr_init(pthread_condattr_t *) __nonnull(1);
+intpthread_condattr_setclock(pthread_condattr_t *, clockid_t)
+ __nonnull(1);
+intpthread_condattr_setpshared(pthread_condattr_t *, int)
+ __nonnull(1);
+intpt
svn commit: r280457 - head/sys/vm
Author: rpaulo
Date: Tue Mar 24 20:09:55 2015
New Revision: 280457
URL: https://svnweb.freebsd.org/changeset/base/280457
Log:
Use TUNABLE_INT_FETCH for boot_pages.
vm.boot_pages is marked as a CTLFLAG_RDTUN, but it's used by the VM
before the sysctl subsystem is initialsed. We manually fetch the
variable from the environment to work around this problem.
Tested by:Keith White kwhite at uottawa.ca
MFC after:1 week
Modified:
head/sys/vm/vm_page.c
Modified: head/sys/vm/vm_page.c
==
--- head/sys/vm/vm_page.c Tue Mar 24 20:07:27 2015(r280456)
+++ head/sys/vm/vm_page.c Tue Mar 24 20:09:55 2015(r280457)
@@ -134,8 +134,9 @@ long first_page;
int vm_page_zero_count;
static int boot_pages = UMA_BOOT_PAGES;
-SYSCTL_INT(_vm, OID_AUTO, boot_pages, CTLFLAG_RDTUN, &boot_pages, 0,
- "number of pages allocated for bootstrapping the VM system");
+SYSCTL_INT(_vm, OID_AUTO, boot_pages, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+&boot_pages, 0,
+"number of pages allocated for bootstrapping the VM system");
static int pa_tryrelock_restart;
SYSCTL_INT(_vm, OID_AUTO, tryrelock_restart, CTLFLAG_RD,
@@ -349,6 +350,7 @@ vm_page_startup(vm_offset_t vaddr)
* Allocate memory for use when boot strapping the kernel memory
* allocator.
*/
+ TUNABLE_INT_FETCH("vm.boot_pages", &boot_pages);
new_end = end - (boot_pages * UMA_SLAB_SIZE);
new_end = trunc_page(new_end);
mapped = pmap_map(&vaddr, new_end, 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: r280456 - head/sys/vm
Author: rpaulo
Date: Tue Mar 24 20:07:27 2015
New Revision: 280456
URL: https://svnweb.freebsd.org/changeset/base/280456
Log:
Remove whitespace.
Modified:
head/sys/vm/vm_page.c
Modified: head/sys/vm/vm_page.c
==
--- head/sys/vm/vm_page.c Tue Mar 24 20:00:11 2015(r280455)
+++ head/sys/vm/vm_page.c Tue Mar 24 20:07:27 2015(r280456)
@@ -160,7 +160,7 @@ vm_page_init_fakepg(void *dummy)
{
fakepg_zone = uma_zcreate("fakepg", sizeof(struct vm_page), NULL, NULL,
- NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE | UMA_ZONE_VM);
+ NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE | UMA_ZONE_VM);
}
/* Make sure that u_long is at least 64 bits when PAGE_SIZE is 32K. */
@@ -443,7 +443,7 @@ vm_page_startup(vm_offset_t vaddr)
*/
for (pa = new_end; pa < phys_avail[biggestone + 1]; pa += PAGE_SIZE)
dump_add_page(pa);
-#endif
+#endif
phys_avail[biggestone + 1] = new_end;
/*
@@ -702,7 +702,7 @@ vm_page_unhold(vm_page_t mem)
* vm_page_unhold_pages:
*
* Unhold each of the pages that is referenced by the given array.
- */
+ */
void
vm_page_unhold_pages(vm_page_t *ma, int count)
{
@@ -1303,7 +1303,7 @@ vm_page_rename(vm_page_t m, vm_object_t
* zero is given for "end", then the range's upper bound is
* infinity. If the given object is backed by a vnode and it
* transitions from having one or more cached pages to none, the
- * vnode's hold count is reduced.
+ * vnode's hold count is reduced.
*/
void
vm_page_cache_free(vm_object_t object, vm_pindex_t start, vm_pindex_t end)
@@ -1455,7 +1455,7 @@ vm_page_is_cached(vm_object_t object, vm
* VM_ALLOC_NOBUSY do not exclusive busy the page
* VM_ALLOC_NODUMP do not include the page in a kernel core dump
* VM_ALLOC_NOOBJ page is not associated with an object and
- * should not be exclusive busy
+ * should not be exclusive busy
* VM_ALLOC_SBUSY shared busy the allocated page
* VM_ALLOC_WIRED wire the allocated page
* VM_ALLOC_ZERO prefer a zeroed page
@@ -1563,7 +1563,7 @@ vm_page_alloc(vm_object_t object, vm_pin
("vm_page_alloc: page %p has unexpected queue %d", m, m->queue));
KASSERT(m->wire_count == 0, ("vm_page_alloc: page %p is wired", m));
KASSERT(m->hold_count == 0, ("vm_page_alloc: page %p is held", m));
- KASSERT(!vm_page_sbusied(m),
+ KASSERT(!vm_page_sbusied(m),
("vm_page_alloc: page %p is busy", m));
KASSERT(m->dirty == 0, ("vm_page_alloc: page %p is dirty", m));
KASSERT(pmap_page_get_memattr(m) == VM_MEMATTR_DEFAULT,
@@ -1702,7 +1702,7 @@ vm_page_alloc_contig_vdrop(struct spglis
* optional allocation flags:
* VM_ALLOC_NOBUSY do not exclusive busy the page
* VM_ALLOC_NOOBJ page is not associated with an object and
- * should not be exclusive busy
+ * should not be exclusive busy
* VM_ALLOC_SBUSY shared busy the allocated page
* VM_ALLOC_WIRED wire the allocated page
* VM_ALLOC_ZERO prefer a zeroed page
@@ -2399,7 +2399,7 @@ vm_page_unwire(vm_page_t m, uint8_t queu
* This will cause them to be moved to the cache more quickly and
* if not actively re-referenced, reclaimed more quickly. If we just
* stick these pages at the end of the inactive queue, heavy filesystem
- * meta-data accesses can cause an unnecessary paging load on memory bound
+ * meta-data accesses can cause an unnecessary paging load on memory bound
* processes. This optimization causes one-time-use metadata to be
* reused more quickly.
*
@@ -2537,7 +2537,7 @@ vm_page_cache(vm_page_t m)
/*
* Remove the page from the object's collection of resident
-* pages.
+* pages.
*/
vm_radix_remove(&object->rtree, m->pindex);
TAILQ_REMOVE(&object->memq, m, listq);
@@ -2610,7 +2610,7 @@ vm_page_cache(vm_page_t m)
* it gets reused quickly. However, this can result in a silly syndrome
* due to the page recycling too quickly. Small objects will not be
* fully cached. On the other hand, if we move the page to the inactive
- * queue we wind up with a problem whereby very large objects
+ * queue we wind up with a problem whereby very large objects
* unnecessarily blow away our inactive and cache queues.
*
* The solution is to move the pages based on a fixed weighting. We
@@ -2712,7 +2712,7 @@ retrylookup:
vm_page_xbusied(m) : vm_page_busied(m);
if (sleep) {
if ((allocflags & VM_ALLOC_NOWAIT) != 0)
- return (NULL);
+ r
svn commit: r280455 - in stable/10: lib/libpmc sys/amd64/conf sys/dev/hwpmc sys/sys usr.sbin usr.sbin/pmcstudy
Author: rrs
Date: Tue Mar 24 20:00:11 2015
New Revision: 280455
URL: https://svnweb.freebsd.org/changeset/base/280455
Log:
MFC of r277177 and r279894 with the fixes for the PMC for Haswell.
Sponsored by: Netflix Inc.
Added:
stable/10/usr.sbin/pmcstudy/
- copied from r277177, head/usr.sbin/pmcstudy/
Modified:
stable/10/lib/libpmc/libpmc.c
stable/10/sys/amd64/conf/GENERIC
stable/10/sys/dev/hwpmc/hwpmc_core.c
stable/10/sys/dev/hwpmc/hwpmc_intel.c
stable/10/sys/dev/hwpmc/hwpmc_logging.c
stable/10/sys/dev/hwpmc/hwpmc_mod.c
stable/10/sys/dev/hwpmc/hwpmc_piv.c
stable/10/sys/dev/hwpmc/hwpmc_uncore.c
stable/10/sys/dev/hwpmc/hwpmc_x86.c
stable/10/sys/dev/hwpmc/pmc_events.h
stable/10/sys/sys/pmc.h
stable/10/usr.sbin/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libpmc/libpmc.c
==
--- stable/10/lib/libpmc/libpmc.c Tue Mar 24 19:25:36 2015
(r280454)
+++ stable/10/lib/libpmc/libpmc.c Tue Mar 24 20:00:11 2015
(r280455)
@@ -200,6 +200,12 @@ static const struct pmc_event_descr hasw
__PMC_EV_ALIAS_HASWELL()
};
+static const struct pmc_event_descr haswell_xeon_event_table[] =
+{
+ __PMC_EV_ALIAS_HASWELL_XEON()
+};
+
+
static const struct pmc_event_descr ivybridge_event_table[] =
{
__PMC_EV_ALIAS_IVYBRIDGE()
@@ -267,6 +273,7 @@ PMC_MDEP_TABLE(core2, IAP, PMC_CLASS_SOF
PMC_MDEP_TABLE(corei7, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC,
PMC_CLASS_UCF, PMC_CLASS_UCP);
PMC_MDEP_TABLE(nehalem_ex, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC);
PMC_MDEP_TABLE(haswell, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC,
PMC_CLASS_UCF, PMC_CLASS_UCP);
+PMC_MDEP_TABLE(haswell_xeon, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF,
PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
PMC_MDEP_TABLE(ivybridge, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC);
PMC_MDEP_TABLE(ivybridge_xeon, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF,
PMC_CLASS_TSC);
PMC_MDEP_TABLE(sandybridge, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC,
PMC_CLASS_UCF, PMC_CLASS_UCP);
@@ -312,6 +319,7 @@ PMC_CLASS_TABLE_DESC(core2, IAP, core2,
PMC_CLASS_TABLE_DESC(corei7, IAP, corei7, iap);
PMC_CLASS_TABLE_DESC(nehalem_ex, IAP, nehalem_ex, iap);
PMC_CLASS_TABLE_DESC(haswell, IAP, haswell, iap);
+PMC_CLASS_TABLE_DESC(haswell_xeon, IAP, haswell, iap);
PMC_CLASS_TABLE_DESC(ivybridge, IAP, ivybridge, iap);
PMC_CLASS_TABLE_DESC(ivybridge_xeon, IAP, ivybridge_xeon, iap);
PMC_CLASS_TABLE_DESC(sandybridge, IAP, sandybridge, iap);
@@ -626,6 +634,8 @@ static struct pmc_event_alias core2_alia
#define nehalem_ex_aliases_without_iaf core2_aliases_without_iaf
#define haswell_aliasescore2_aliases
#define haswell_aliases_without_iafcore2_aliases_without_iaf
+#define haswell_xeon_aliases core2_aliases
+#define haswell_xeon_aliases_without_iaf core2_aliases_without_iaf
#define ivybridge_aliases core2_aliases
#define ivybridge_aliases_without_iaf core2_aliases_without_iaf
#define ivybridge_xeon_aliases core2_aliases
@@ -896,7 +906,8 @@ iap_allocate_pmc(enum pmc_event pe, char
n = pmc_parse_mask(iap_rsp_mask_sb_sbx_ib, p,
&rsp);
} else
return (-1);
- } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_HASWELL) {
+ } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_HASWELL ||
+ cpu_info.pm_cputype == PMC_CPU_INTEL_HASWELL_XEON) {
if (KWPREFIXMATCH(p, IAP_KW_RSP "=")) {
n = pmc_parse_mask(iap_rsp_mask_haswell, p,
&rsp);
} else
@@ -2788,6 +2799,10 @@ pmc_event_names_of_class(enum pmc_class
ev = haswell_event_table;
count = PMC_EVENT_TABLE_SIZE(haswell);
break;
+ case PMC_CPU_INTEL_HASWELL_XEON:
+ ev = haswell_xeon_event_table;
+ count = PMC_EVENT_TABLE_SIZE(haswell_xeon);
+ break;
case PMC_CPU_INTEL_IVYBRIDGE:
ev = ivybridge_event_table;
count = PMC_EVENT_TABLE_SIZE(ivybridge);
@@ -3115,6 +3130,9 @@ pmc_init(void)
pmc_class_table[n++] = &haswelluc_class_table_descr;
PMC_MDEP_INIT_INTEL_V2(haswell);
break;
+ case PMC_CPU_INTEL_HASWELL_XEON:
+ PMC_MDEP_INIT_INTEL_V2(haswell_xeon);
+ break;
case PMC_CPU_INTEL_IVYBRIDGE:
PMC_MDEP_INIT_INTEL_V2(ivybridge);
break;
@@ -3280,6 +3298,11 @@ _pmc_name_of_event(enum pmc_event pe, en
ev = haswell_event_table;
evfence = haswell_event_table +
PMC_EVENT_TABLE_SIZE(haswell);
svn commit: r280454 - in vendor/NetBSD/xlint: . dist
Author: emaste Date: Tue Mar 24 19:25:36 2015 New Revision: 280454 URL: https://svnweb.freebsd.org/changeset/base/280454 Log: Copy initial xlint(1) import to vendor branch Added: vendor/NetBSD/xlint/ vendor/NetBSD/xlint/dist/ - copied from r12099, cvs2svn/branches/JPO/usr.bin/xlint/ ___ 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: r280453 - in head/sys/arm: broadcom/bcm2835 conf
Author: andrew Date: Tue Mar 24 19:01:42 2015 New Revision: 280453 URL: https://svnweb.freebsd.org/changeset/base/280453 Log: Move including std.bcm2835 to the RPI-B kernel config. The std.rpi file will be shared between the existing Raspberry Pi config, and the new Raspberry Pi 2 config. MFC after:1 week Modified: head/sys/arm/broadcom/bcm2835/std.rpi head/sys/arm/conf/RPI-B Modified: head/sys/arm/broadcom/bcm2835/std.rpi == --- head/sys/arm/broadcom/bcm2835/std.rpi Tue Mar 24 18:46:01 2015 (r280452) +++ head/sys/arm/broadcom/bcm2835/std.rpi Tue Mar 24 19:01:42 2015 (r280453) @@ -1,7 +1,5 @@ # $FreeBSD$ -include"../broadcom/bcm2835/std.bcm2835" - optionsKERNVIRTADDR=0xc010 makeoptionsKERNVIRTADDR=0xc010 optionsKERNPHYSADDR=0x0010 Modified: head/sys/arm/conf/RPI-B == --- head/sys/arm/conf/RPI-B Tue Mar 24 18:46:01 2015(r280452) +++ head/sys/arm/conf/RPI-B Tue Mar 24 19:01:42 2015(r280453) @@ -21,6 +21,7 @@ ident RPI-B include"../broadcom/bcm2835/std.rpi" +include"../broadcom/bcm2835/std.bcm2835" optionsHZ=100 optionsSCHED_4BSD # 4BSD scheduler ___ 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: r280452 - in head/sys: arm/broadcom/bcm2835 conf
Author: andrew Date: Tue Mar 24 18:46:01 2015 New Revision: 280452 URL: https://svnweb.freebsd.org/changeset/base/280452 Log: Add the SOC_BCM2835 and SOC_BCM2836 options for the arm kernel and add the former to std.bcm2835. These will be used to enable support for the Raspberry Pi 2. MFC after:1 week Modified: head/sys/arm/broadcom/bcm2835/std.bcm2835 head/sys/conf/options.arm Modified: head/sys/arm/broadcom/bcm2835/std.bcm2835 == --- head/sys/arm/broadcom/bcm2835/std.bcm2835 Tue Mar 24 18:09:07 2015 (r280451) +++ head/sys/arm/broadcom/bcm2835/std.bcm2835 Tue Mar 24 18:46:01 2015 (r280452) @@ -3,6 +3,7 @@ machinearm armv6 cpuCPU_ARM1176 makeoptionsCONF_CFLAGS="-mcpu=arm1176jzf-s" +optionsSOC_BCM2835 files "../broadcom/bcm2835/files.bcm2835" files "../broadcom/bcm2835/files.bcm283x" Modified: head/sys/conf/options.arm == --- head/sys/conf/options.arm Tue Mar 24 18:09:07 2015(r280451) +++ head/sys/conf/options.arm Tue Mar 24 18:46:01 2015(r280452) @@ -39,6 +39,8 @@ SOCDEV_PA opt_global.h SOCDEV_VA opt_global.h PV_STATS opt_pmap.h QEMU_WORKAROUNDS opt_global.h +SOC_BCM2835opt_global.h +SOC_BCM2836opt_global.h SOC_MV_ARMADAXPopt_global.h SOC_MV_DISCOVERY opt_global.h SOC_MV_DOVEopt_global.h ___ 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: r280451 - in head: . share/man/man4 sys/arm/mv sys/boot/forth sys/conf sys/dev/ata sys/dev/ata/chipsets sys/modules/ata/atapci/chipsets sys/modules/ata/atapci/chipsets/ataadaptec sys/mo...
Author: mav Date: Tue Mar 24 18:09:07 2015 New Revision: 280451 URL: https://svnweb.freebsd.org/changeset/base/280451 Log: Remove from legacy ata(4) driver support for hardware, supported by newer and more functional drivers ahci(4), siis(4) and mvs(4). This removes about 3400 lines of code, unused since FreeBSD 9.0 release. Deleted: head/sys/arm/mv/mv_sata.c head/sys/dev/ata/chipsets/ata-adaptec.c head/sys/dev/ata/chipsets/ata-ahci.c head/sys/modules/ata/atapci/chipsets/ataadaptec/ head/sys/modules/ata/atapci/chipsets/ataahci/ Modified: head/UPDATING head/share/man/man4/ahci.4 head/share/man/man4/ata.4 head/share/man/man4/mvs.4 head/share/man/man4/siis.4 head/sys/arm/mv/files.mv head/sys/boot/forth/loader.conf head/sys/conf/NOTES head/sys/conf/files head/sys/dev/ata/ata-all.h head/sys/dev/ata/ata-pci.h head/sys/dev/ata/chipsets/ata-acerlabs.c head/sys/dev/ata/chipsets/ata-ati.c head/sys/dev/ata/chipsets/ata-intel.c head/sys/dev/ata/chipsets/ata-jmicron.c head/sys/dev/ata/chipsets/ata-marvell.c head/sys/dev/ata/chipsets/ata-nvidia.c head/sys/dev/ata/chipsets/ata-siliconimage.c head/sys/dev/ata/chipsets/ata-via.c head/sys/modules/ata/atapci/chipsets/Makefile Modified: head/UPDATING == --- head/UPDATING Tue Mar 24 17:42:53 2015(r280450) +++ head/UPDATING Tue Mar 24 18:09:07 2015(r280451) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150324: + From legacy ata(4) driver was removed support for SATA controllers + supported by more functional drivers ahci(4), siis(4) and mvs(4). + Kernel modules ataahci and ataadaptec were removed completely, + replaced by ahci and mvs modules respectively. + 20150315: Clang, llvm and lldb have been upgraded to 3.6.0 release. Please see the 20141231 entry below for information about prerequisites and Modified: head/share/man/man4/ahci.4 == --- head/share/man/man4/ahci.4 Tue Mar 24 17:42:53 2015(r280450) +++ head/share/man/man4/ahci.4 Tue Mar 24 18:09:07 2015(r280451) @@ -143,12 +143,6 @@ device for localization and status repor Supporting AHCI controllers may transmit that information to the backplane controllers via SGPIO interface. Backplane controllers interpret received statuses in some way (IBPI standard) to report them using present indicators. -.Pp -AHCI hardware is also supported by ataahci driver from -.Xr ata 4 -subsystem. -If both drivers are loaded at the same time, this one will be -given precedence as the more functional of the two. .Sh HARDWARE The .Nm Modified: head/share/man/man4/ata.4 == --- head/share/man/man4/ata.4 Tue Mar 24 17:42:53 2015(r280450) +++ head/share/man/man4/ata.4 Tue Mar 24 18:09:07 2015(r280451) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 3, 2012 +.Dd March 23, 2015 .Dt ATA 4 .Os .Sh NAME @@ -50,8 +50,6 @@ atapci_load="YES" ataacard_load="YES" ataacerlabs_load="YES" -ataadaptec_load="YES" -ataahci_load="YES" ataamd_load="YES" ataati_load="YES" atacenatek_load="YES" @@ -76,16 +74,11 @@ atavia_load="YES" The first line is for the common hardware independent code, and is a prerequisite for the other modules. The next three lines are generic bus-specific drivers. -Of the rest, ataahci is the AHCI driver. -The others are vendor-specific PCI drivers. +The rest are vendor-specific PCI drivers. .Pp The following tunables are settable from the .Xr loader 8 : .Bl -ohang -.It Va hw.ahci.force -set to nonzero value for forcing drivers to attach to some known AHCI-capable -chips even if they are configured for legacy IDE emulation (the default is 1, -force the attach). .It Va hw.ata.ata_dma_check_80pin set to 0 to disable the 80pin cable check (the default is 1, check the cable). .It Va hint.atapci.X.msi @@ -106,13 +99,6 @@ Interface Power Management is disabled. This is the default value. .It 1 The device is allowed to initiate a PM state change; the host is passive. -.It 2 -The host initiates a PARTIAL PM state transition every time a port becomes idle. -.It 3 -host initiates SLUMBER PM state transition every time port becomes idle. -.El -.Pp -Modes 2 and 3 are only supported for AHCI. .It Va hint.ata. Ns Ar X Ns Va .dev Ns Ar X Ns Va .sata_rev limits the initial SATA revision (speed) for the specified device on the specified channel. @@ -198,8 +184,7 @@ IT8211F, IT8212F, IT8213F. .It JMicron: JMB360, JMB361, JMB363, JMB365, JMB366, JMB368. .It Mar
svn commit: r280450 - head/sys/kern
Author: hselasky
Date: Tue Mar 24 17:42:53 2015
New Revision: 280450
URL: https://svnweb.freebsd.org/changeset/base/280450
Log:
Make sure tunable sysctls are only fetched once. The existing code can
re-register sysctls when destroying sysctl contexts or when moving
sysctls from one tree to another.
Modified:
head/sys/kern/kern_sysctl.c
Modified: head/sys/kern/kern_sysctl.c
==
--- head/sys/kern/kern_sysctl.c Tue Mar 24 17:37:31 2015(r280449)
+++ head/sys/kern/kern_sysctl.c Tue Mar 24 17:42:53 2015(r280450)
@@ -353,6 +353,9 @@ sysctl_register_oid(struct sysctl_oid *o
#endif
(oidp->oid_kind & CTLFLAG_TUN) != 0 &&
(oidp->oid_kind & CTLFLAG_NOFETCH) == 0) {
+ /* only fetch value once */
+ oidp->oid_kind |= CTLFLAG_NOFETCH;
+ /* try to fetch value from kernel environment */
sysctl_load_tunable_by_oid_locked(oidp);
}
}
___
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: r280449 - stable/10/sys/sys
Author: pfg Date: Tue Mar 24 17:37:31 2015 New Revision: 280449 URL: https://svnweb.freebsd.org/changeset/base/280449 Log: MFC r280273; Permit multiple arguments for the nonnull attribute. This is very useful for non-trivial functions and doesn't affect existing uses. Modified: stable/10/sys/sys/cdefs.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/cdefs.h == --- stable/10/sys/sys/cdefs.h Tue Mar 24 17:20:20 2015(r280448) +++ stable/10/sys/sys/cdefs.h Tue Mar 24 17:37:31 2015(r280449) @@ -347,9 +347,9 @@ #endif #if __GNUC_PREREQ__(3, 3) -#define __nonnull(x) __attribute__((__nonnull__(x))) +#define __nonnull(...) __attribute__((__nonnull__(__VA_ARGS__))) #else -#define __nonnull(x) +#define __nonnull(...) #endif #if __GNUC_PREREQ__(3, 4) ___ 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: r280448 - in stable/10/sys/dev: mpr mps
Author: ken Date: Tue Mar 24 17:20:20 2015 New Revision: 280448 URL: https://svnweb.freebsd.org/changeset/base/280448 Log: MFC, r279336: r279336 | ken | 2015-02-26 15:22:06 -0700 (Thu, 26 Feb 2015) | 12 lines Add FreeBSD stable/10 version checks for the availability of the CDAI_FLAG_NONE advanced information CCB flag. Support for the flag was merged to stable/10 in r279329, and the __FreeBSD_version in stable/10 was bumped to 1001510. Check for that version in the mps(4) and mpr(4) drivers when determining whether to use the flag. Sponsored by: Spectra Logic MFC after: 3 days Modified: stable/10/sys/dev/mpr/mpr_sas.c stable/10/sys/dev/mps/mps_sas.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mpr/mpr_sas.c == --- stable/10/sys/dev/mpr/mpr_sas.c Tue Mar 24 17:12:36 2015 (r280447) +++ stable/10/sys/dev/mpr/mpr_sas.c Tue Mar 24 17:20:20 2015 (r280448) @@ -3084,7 +3084,8 @@ mprsas_async(void *callback_arg, uint32_ cdai.ccb_h.func_code = XPT_DEV_ADVINFO; cdai.ccb_h.flags = CAM_DIR_IN; cdai.buftype = CDAI_TYPE_RCAPLONG; -#if __FreeBSD_version >= 1100061 +#if (__FreeBSD_version >= 1100061) || \ +((__FreeBSD_version >= 1001510) && (__FreeBSD_version < 110)) cdai.flags = CDAI_FLAG_NONE; #else cdai.flags = 0; Modified: stable/10/sys/dev/mps/mps_sas.c == --- stable/10/sys/dev/mps/mps_sas.c Tue Mar 24 17:12:36 2015 (r280447) +++ stable/10/sys/dev/mps/mps_sas.c Tue Mar 24 17:20:20 2015 (r280448) @@ -3237,7 +3237,8 @@ mpssas_async(void *callback_arg, uint32_ cdai.ccb_h.func_code = XPT_DEV_ADVINFO; cdai.ccb_h.flags = CAM_DIR_IN; cdai.buftype = CDAI_TYPE_RCAPLONG; -#if __FreeBSD_version >= 1100061 +#if (__FreeBSD_version >= 1100061) || \ +((__FreeBSD_version >= 1001510) && (__FreeBSD_version < 110)) cdai.flags = CDAI_FLAG_NONE; #else cdai.flags = 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: r280447 - in head/sys/amd64: include vmm vmm/amd vmm/intel
Author: tychon
Date: Tue Mar 24 17:12:36 2015
New Revision: 280447
URL: https://svnweb.freebsd.org/changeset/base/280447
Log:
When fetching an instruction in non-64bit mode, consider the value of the
code segment base address.
Also if an instruction doesn't support a mod R/M (modRM) byte, don't
be concerned if the CPU is in real mode.
Reviewed by: neel
Modified:
head/sys/amd64/include/vmm.h
head/sys/amd64/vmm/amd/svm.c
head/sys/amd64/vmm/intel/vmx.c
head/sys/amd64/vmm/vmm.c
head/sys/amd64/vmm/vmm_instruction_emul.c
Modified: head/sys/amd64/include/vmm.h
==
--- head/sys/amd64/include/vmm.hTue Mar 24 16:53:16 2015
(r280446)
+++ head/sys/amd64/include/vmm.hTue Mar 24 17:12:36 2015
(r280447)
@@ -551,6 +551,7 @@ struct vm_exit {
struct {
uint64_tgpa;
uint64_tgla;
+ uint64_tcs_base;
int cs_d; /* CS.D */
struct vm_guest_paging paging;
struct vie vie;
Modified: head/sys/amd64/vmm/amd/svm.c
==
--- head/sys/amd64/vmm/amd/svm.cTue Mar 24 16:53:16 2015
(r280446)
+++ head/sys/amd64/vmm/amd/svm.cTue Mar 24 17:12:36 2015
(r280447)
@@ -799,8 +799,13 @@ svm_handle_inst_emul(struct vmcb *vmcb,
KASSERT(error == 0, ("%s: vmcb_seg(CS) error %d", __func__, error));
switch(paging->cpu_mode) {
+ case CPU_MODE_REAL:
+ vmexit->u.inst_emul.cs_base = seg.base;
+ vmexit->u.inst_emul.cs_d = 0;
case CPU_MODE_PROTECTED:
case CPU_MODE_COMPATIBILITY:
+ vmexit->u.inst_emul.cs_base = seg.base;
+
/*
* Section 4.8.1 of APM2, Default Operand Size or D bit.
*/
@@ -808,6 +813,7 @@ svm_handle_inst_emul(struct vmcb *vmcb,
1 : 0;
break;
default:
+ vmexit->u.inst_emul.cs_base = 0;
vmexit->u.inst_emul.cs_d = 0;
break;
}
Modified: head/sys/amd64/vmm/intel/vmx.c
==
--- head/sys/amd64/vmm/intel/vmx.c Tue Mar 24 16:53:16 2015
(r280446)
+++ head/sys/amd64/vmm/intel/vmx.c Tue Mar 24 17:12:36 2015
(r280447)
@@ -1784,12 +1784,18 @@ vmexit_inst_emul(struct vm_exit *vmexit,
vmexit->u.inst_emul.gla = gla;
vmx_paging_info(paging);
switch (paging->cpu_mode) {
+ case CPU_MODE_REAL:
+ vmexit->u.inst_emul.cs_base = vmcs_read(VMCS_GUEST_CS_BASE);
+ vmexit->u.inst_emul.cs_d = 0;
+ break;
case CPU_MODE_PROTECTED:
case CPU_MODE_COMPATIBILITY:
+ vmexit->u.inst_emul.cs_base = vmcs_read(VMCS_GUEST_CS_BASE);
csar = vmcs_read(VMCS_GUEST_CS_ACCESS_RIGHTS);
vmexit->u.inst_emul.cs_d = SEG_DESC_DEF32(csar);
break;
default:
+ vmexit->u.inst_emul.cs_base = 0;
vmexit->u.inst_emul.cs_d = 0;
break;
}
Modified: head/sys/amd64/vmm/vmm.c
==
--- head/sys/amd64/vmm/vmm.cTue Mar 24 16:53:16 2015(r280446)
+++ head/sys/amd64/vmm/vmm.cTue Mar 24 17:12:36 2015(r280447)
@@ -1251,7 +1251,7 @@ vm_handle_inst_emul(struct vm *vm, int v
struct vie *vie;
struct vcpu *vcpu;
struct vm_exit *vme;
- uint64_t gla, gpa;
+ uint64_t gla, gpa, cs_base;
struct vm_guest_paging *paging;
mem_region_read_t mread;
mem_region_write_t mwrite;
@@ -1263,6 +1263,7 @@ vm_handle_inst_emul(struct vm *vm, int v
gla = vme->u.inst_emul.gla;
gpa = vme->u.inst_emul.gpa;
+ cs_base = vme->u.inst_emul.cs_base;
cs_d = vme->u.inst_emul.cs_d;
vie = &vme->u.inst_emul.vie;
paging = &vme->u.inst_emul.paging;
@@ -1277,8 +1278,8 @@ vm_handle_inst_emul(struct vm *vm, int v
* maximum size instruction.
*/
length = vme->inst_length ? vme->inst_length : VIE_INST_SIZE;
- error = vmm_fetch_instruction(vm, vcpuid, paging, vme->rip,
- length, vie);
+ error = vmm_fetch_instruction(vm, vcpuid, paging, vme->rip +
+ cs_base, length, vie);
} else {
/*
* The instruction bytes have already been copied into 'vie'
Modified: head/sys/amd64/vmm/vmm_instruction_emul.c
==
--- head/sys/amd64/vmm/vmm_instruction_emul.c Tue Mar 24 16:53:16 2015
svn commit: r280446 - stable/10/sys/cam
Author: ken
Date: Tue Mar 24 16:53:16 2015
New Revision: 280446
URL: https://svnweb.freebsd.org/changeset/base/280446
Log:
MFC, r279375
r279375 | ken | 2015-02-27 14:35:36 -0700 (Fri, 27 Feb 2015) | 26 lines
Fix I/O size calculation for pass(4) driver requests and add latency
tracking.
It is important to subtract the residual from the requested
transfer size to see how much data was actually transferred. With
tape drives in particular, it is common to request more data than is
returned.
Also, add I/O latency tracking for CAM requests issued by
cam_periph_runccb().
If the caller supplies a struct devstat, and the I/O is a SCSI or
ATA I/O, we will track the elapsed time to provide I/O latency
statistics for the request.
sys/cam/scsi/cam_periph.c:
In cam_periph_runccb(), subtract the residual when reporting I/O
totals to devstat(9) for SCSI and ATA passthrough requests.
In cam_periph_runccb(), grab the I/O start time and supply
the start time to devstat_end_transaction() so that it can
calculate the elapsed I/O time.
Sponsored by: Spectra Logic
MFC after: 1 week
Sponsored by: Spectra Logic
Modified:
stable/10/sys/cam/cam_periph.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/cam_periph.c
==
--- stable/10/sys/cam/cam_periph.c Tue Mar 24 16:46:40 2015
(r280445)
+++ stable/10/sys/cam/cam_periph.c Tue Mar 24 16:53:16 2015
(r280446)
@@ -1048,8 +1048,11 @@ cam_periph_runccb(union ccb *ccb,
cam_flags camflags, u_int32_t sense_flags,
struct devstat *ds)
{
+ struct bintime *starttime;
+ struct bintime ltime;
int error;
+ starttime = NULL;
xpt_path_assert(ccb->ccb_h.path, MA_OWNED);
/*
@@ -1057,8 +1060,11 @@ cam_periph_runccb(union ccb *ccb,
* this particular type of ccb, record the transaction start.
*/
if ((ds != NULL) && (ccb->ccb_h.func_code == XPT_SCSI_IO ||
- ccb->ccb_h.func_code == XPT_ATA_IO))
- devstat_start_transaction(ds, NULL);
+ ccb->ccb_h.func_code == XPT_ATA_IO)) {
+ starttime = ccb_h.cbfcnp = cam_periph_done;
xpt_action(ccb);
@@ -1086,22 +1092,22 @@ cam_periph_runccb(union ccb *ccb,
if (ds != NULL) {
if (ccb->ccb_h.func_code == XPT_SCSI_IO) {
devstat_end_transaction(ds,
- ccb->csio.dxfer_len,
+ ccb->csio.dxfer_len - ccb->csio.resid,
ccb->csio.tag_action & 0x3,
((ccb->ccb_h.flags & CAM_DIR_MASK) ==
CAM_DIR_NONE) ? DEVSTAT_NO_DATA :
(ccb->ccb_h.flags & CAM_DIR_OUT) ?
DEVSTAT_WRITE :
- DEVSTAT_READ, NULL, NULL);
+ DEVSTAT_READ, NULL, starttime);
} else if (ccb->ccb_h.func_code == XPT_ATA_IO) {
devstat_end_transaction(ds,
- ccb->ataio.dxfer_len,
+ ccb->ataio.dxfer_len - ccb->ataio.resid,
ccb->ataio.tag_action & 0x3,
((ccb->ccb_h.flags & CAM_DIR_MASK) ==
CAM_DIR_NONE) ? DEVSTAT_NO_DATA :
(ccb->ccb_h.flags & CAM_DIR_OUT) ?
DEVSTAT_WRITE :
- DEVSTAT_READ, NULL, NULL);
+ DEVSTAT_READ, NULL, starttime);
}
}
___
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: r280444 - head/sys/netinet6
Author: glebius Date: Tue Mar 24 16:45:50 2015 New Revision: 280444 URL: https://svnweb.freebsd.org/changeset/base/280444 Log: Move ip6_sprintf() declaration from in6_var.h to in6.h. This is a simple function that works with in6_addr and it is not related to the INET6 stack implementation. Sponsored by: Nginx, Inc. Modified: head/sys/netinet6/in6.h head/sys/netinet6/in6_var.h Modified: head/sys/netinet6/in6.h == --- head/sys/netinet6/in6.h Tue Mar 24 16:37:19 2015(r280443) +++ head/sys/netinet6/in6.h Tue Mar 24 16:45:50 2015(r280444) @@ -651,6 +651,7 @@ int in6_cksum_partial(struct mbuf *, u_i intin6_localaddr(struct in6_addr *); intin6_localip(struct in6_addr *); intin6_addrscope(const struct in6_addr *); +char *ip6_sprintf(char *, const struct in6_addr *); struct in6_ifaddr *in6_ifawithifp(struct ifnet *, struct in6_addr *); extern void in6_if_up(struct ifnet *); struct sockaddr; Modified: head/sys/netinet6/in6_var.h == --- head/sys/netinet6/in6_var.h Tue Mar 24 16:37:19 2015(r280443) +++ head/sys/netinet6/in6_var.h Tue Mar 24 16:45:50 2015(r280444) @@ -811,7 +811,6 @@ struct in6_ifaddr *in6ifa_ifpforlinkloca struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, struct in6_addr *); struct in6_ifaddr *in6ifa_ifwithaddr(const struct in6_addr *, uint32_t); struct in6_ifaddr *in6ifa_llaonifp(struct ifnet *); -char *ip6_sprintf(char *, const struct in6_addr *); intin6_addr2zoneid(struct ifnet *, struct in6_addr *, u_int32_t *); intin6_matchlen(struct in6_addr *, struct in6_addr *); intin6_are_prefix_equal(struct in6_addr *, struct in6_addr *, int); ___ 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: r280445 - head/sys/kern
Author: glebius
Date: Tue Mar 24 16:46:40 2015
New Revision: 280445
URL: https://svnweb.freebsd.org/changeset/base/280445
Log:
Do not include if_var.h and in6_var.h into kern_jail.c. It is now possible
after r280444.
Sponsored by: Nginx, Inc.
Modified:
head/sys/kern/kern_jail.c
Modified: head/sys/kern/kern_jail.c
==
--- head/sys/kern/kern_jail.c Tue Mar 24 16:45:50 2015(r280444)
+++ head/sys/kern/kern_jail.c Tue Mar 24 16:46:40 2015(r280445)
@@ -62,16 +62,12 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
#ifdef DDB
#include
-#ifdef INET6
-#include
-#endif /* INET6 */
#endif /* DDB */
#include
___
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: r280443 - head/sys/kern
Author: hselasky
Date: Tue Mar 24 16:37:19 2015
New Revision: 280443
URL: https://svnweb.freebsd.org/changeset/base/280443
Log:
Correct string pointer offset for error printout.
Modified:
head/sys/kern/kern_sysctl.c
Modified: head/sys/kern/kern_sysctl.c
==
--- head/sys/kern/kern_sysctl.c Tue Mar 24 16:31:22 2015(r280442)
+++ head/sys/kern/kern_sysctl.c Tue Mar 24 16:37:19 2015(r280443)
@@ -285,7 +285,7 @@ sysctl_load_tunable_by_oid_locked(struct
error = sysctl_root_handler_locked(oidp, oidp->oid_arg1,
oidp->oid_arg2, &req);
if (error != 0)
- printf("Setting sysctl %s failed: %d\n", path, error);
+ printf("Setting sysctl %s failed: %d\n", path + rem, error);
if (penv != NULL)
freeenv(penv);
}
___
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: r280442 - head/sys/dev/sound/pcm
Author: hselasky
Date: Tue Mar 24 16:31:22 2015
New Revision: 280442
URL: https://svnweb.freebsd.org/changeset/base/280442
Log:
Make all PCM core sysctls tunable and remove redundant TUNABLE()
statements. This allows for setting all PCM core parameters in the
kernel environment through loader.conf(5) or kenv(1) which is useful
for pluggable PCM devices like USB audio devices which might be
plugged after that sysctl.conf(5) is executed.
Modified:
head/sys/dev/sound/pcm/channel.c
head/sys/dev/sound/pcm/dsp.c
head/sys/dev/sound/pcm/feeder_eq.c
head/sys/dev/sound/pcm/feeder_rate.c
head/sys/dev/sound/pcm/mixer.c
head/sys/dev/sound/pcm/sndstat.c
head/sys/dev/sound/pcm/sound.c
head/sys/dev/sound/pcm/vchan.c
Modified: head/sys/dev/sound/pcm/channel.c
==
--- head/sys/dev/sound/pcm/channel.cTue Mar 24 15:08:43 2015
(r280441)
+++ head/sys/dev/sound/pcm/channel.cTue Mar 24 16:31:22 2015
(r280442)
@@ -42,14 +42,13 @@ SND_DECLARE_FILE("$FreeBSD$");
int report_soft_formats = 1;
SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW,
- &report_soft_formats, 1, "report software-emulated formats");
+ &report_soft_formats, 0, "report software-emulated formats");
int report_soft_matrix = 1;
SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_matrix, CTLFLAG_RW,
- &report_soft_matrix, 1, "report software-emulated channel matrixing");
+ &report_soft_matrix, 0, "report software-emulated channel matrixing");
int chn_latency = CHN_LATENCY_DEFAULT;
-TUNABLE_INT("hw.snd.latency", &chn_latency);
static int
sysctl_hw_snd_latency(SYSCTL_HANDLER_ARGS)
@@ -67,12 +66,11 @@ sysctl_hw_snd_latency(SYSCTL_HANDLER_ARG
return err;
}
-SYSCTL_PROC(_hw_snd, OID_AUTO, latency, CTLTYPE_INT | CTLFLAG_RW,
+SYSCTL_PROC(_hw_snd, OID_AUTO, latency, CTLTYPE_INT | CTLFLAG_RWTUN,
0, sizeof(int), sysctl_hw_snd_latency, "I",
"buffering latency (0=low ... 10=high)");
int chn_latency_profile = CHN_LATENCY_PROFILE_DEFAULT;
-TUNABLE_INT("hw.snd.latency_profile", &chn_latency_profile);
static int
sysctl_hw_snd_latency_profile(SYSCTL_HANDLER_ARGS)
@@ -90,13 +88,12 @@ sysctl_hw_snd_latency_profile(SYSCTL_HAN
return err;
}
-SYSCTL_PROC(_hw_snd, OID_AUTO, latency_profile, CTLTYPE_INT | CTLFLAG_RW,
+SYSCTL_PROC(_hw_snd, OID_AUTO, latency_profile, CTLTYPE_INT | CTLFLAG_RWTUN,
0, sizeof(int), sysctl_hw_snd_latency_profile, "I",
"buffering latency profile (0=aggressive 1=safe)");
static int chn_timeout = CHN_TIMEOUT;
-TUNABLE_INT("hw.snd.timeout", &chn_timeout);
-#ifdef SND_DEBUG
+
static int
sysctl_hw_snd_timeout(SYSCTL_HANDLER_ARGS)
{
@@ -113,17 +110,15 @@ sysctl_hw_snd_timeout(SYSCTL_HANDLER_ARG
return err;
}
-SYSCTL_PROC(_hw_snd, OID_AUTO, timeout, CTLTYPE_INT | CTLFLAG_RW,
+SYSCTL_PROC(_hw_snd, OID_AUTO, timeout, CTLTYPE_INT | CTLFLAG_RWTUN,
0, sizeof(int), sysctl_hw_snd_timeout, "I",
"interrupt timeout (1 - 10) seconds");
-#endif
static int chn_vpc_autoreset = 1;
SYSCTL_INT(_hw_snd, OID_AUTO, vpc_autoreset, CTLFLAG_RWTUN,
&chn_vpc_autoreset, 0, "automatically reset channels volume to 0db");
static int chn_vol_0db_pcm = SND_VOL_0DB_PCM;
-TUNABLE_INT("hw.snd.vpc_0db", &chn_vol_0db_pcm);
static void
chn_vpc_proc(int reset, int db)
@@ -169,7 +164,7 @@ sysctl_hw_snd_vpc_0db(SYSCTL_HANDLER_ARG
return (0);
}
-SYSCTL_PROC(_hw_snd, OID_AUTO, vpc_0db, CTLTYPE_INT | CTLFLAG_RW,
+SYSCTL_PROC(_hw_snd, OID_AUTO, vpc_0db, CTLTYPE_INT | CTLFLAG_RWTUN,
0, sizeof(int), sysctl_hw_snd_vpc_0db, "I",
"0db relative level");
@@ -193,16 +188,13 @@ SYSCTL_PROC(_hw_snd, OID_AUTO, vpc_reset
"reset volume on all channels");
static int chn_usefrags = 0;
-TUNABLE_INT("hw.snd.usefrags", &chn_usefrags);
static int chn_syncdelay = -1;
-TUNABLE_INT("hw.snd.syncdelay", &chn_syncdelay);
-#ifdef SND_DEBUG
-SYSCTL_INT(_hw_snd, OID_AUTO, usefrags, CTLFLAG_RW,
- &chn_usefrags, 1, "prefer setfragments() over setblocksize()");
-SYSCTL_INT(_hw_snd, OID_AUTO, syncdelay, CTLFLAG_RW,
- &chn_syncdelay, 1,
+
+SYSCTL_INT(_hw_snd, OID_AUTO, usefrags, CTLFLAG_RWTUN,
+ &chn_usefrags, 0, "prefer setfragments() over setblocksize()");
+SYSCTL_INT(_hw_snd, OID_AUTO, syncdelay, CTLFLAG_RWTUN,
+ &chn_syncdelay, 0,
"append (0-1000) millisecond trailing buffer delay on each sync");
-#endif
/**
* @brief Channel sync group lock
Modified: head/sys/dev/sound/pcm/dsp.c
==
--- head/sys/dev/sound/pcm/dsp.cTue Mar 24 15:08:43 2015
(r280441)
+++ head/sys/dev/sound/pcm/dsp.cTue Mar 24 16:31:22 2015
(r280442)
@@ -44,7 +44,7 @@
SND_DECLARE_FILE("$FreeBSD$");
static int dsp_mmap_allow_prot_exec = 0;
-SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RW,
+SYSCTL_INT(_hw_sn
Re: svn commit: r280441 - head/sys/netinet
On 03/24/15 at 03:08P, Lawrence Stewart wrote: > Author: lstewart > Date: Tue Mar 24 15:08:43 2015 > New Revision: 280441 > URL: https://svnweb.freebsd.org/changeset/base/280441 > > Log: > The addition of flowid and flowtype in r280233 and r280237 respectively > forgot > to extend the IPv6 packet node format string, which causes a build failure > when > SIFTR is compiled with IPv6 support. > > Reported by:Lars Eggert My bad :-( Thanks for quickly fixing this. Hiren pgpFk6DisJxKv.pgp Description: PGP signature
svn commit: r280441 - head/sys/netinet
Author: lstewart Date: Tue Mar 24 15:08:43 2015 New Revision: 280441 URL: https://svnweb.freebsd.org/changeset/base/280441 Log: The addition of flowid and flowtype in r280233 and r280237 respectively forgot to extend the IPv6 packet node format string, which causes a build failure when SIFTR is compiled with IPv6 support. Reported by: Lars Eggert Modified: head/sys/netinet/siftr.c Modified: head/sys/netinet/siftr.c == --- head/sys/netinet/siftr.cTue Mar 24 15:05:36 2015(r280440) +++ head/sys/netinet/siftr.cTue Mar 24 15:08:43 2015(r280441) @@ -448,7 +448,7 @@ siftr_process_pkt(struct pkt_node * pkt_ MAX_LOG_MSG_LEN, "%c,0x%08x,%zd.%06ld,%x:%x:%x:%x:%x:%x:%x:%x,%u,%x:%x:%x:" "%x:%x:%x:%x:%x,%u,%ld,%ld,%ld,%ld,%ld,%u,%u,%u,%u,%u,%u," - "%u,%d,%u,%u,%u,%u,%u,%u\n", + "%u,%d,%u,%u,%u,%u,%u,%u,%u,%u\n", direction[pkt_node->direction], pkt_node->hash, pkt_node->tval.tv_sec, ___ 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: r280440 - head/sys/netinet
Author: tuexen
Date: Tue Mar 24 15:05:36 2015
New Revision: 280440
URL: https://svnweb.freebsd.org/changeset/base/280440
Log:
Fix the bug in the handling of fragmented abandoned SCTP user messages
reported in
https://code.google.com/p/sctp-refimpl/issues/detail?id=11
Thanks to Lally Singh for reporting it.
MFC after: 3 days
Modified:
head/sys/netinet/sctp_indata.c
Modified: head/sys/netinet/sctp_indata.c
==
--- head/sys/netinet/sctp_indata.c Tue Mar 24 14:51:46 2015
(r280439)
+++ head/sys/netinet/sctp_indata.c Tue Mar 24 15:05:36 2015
(r280440)
@@ -2597,12 +2597,14 @@ sctp_process_segment_range(struct sctp_t
* cumack trackers for first transmissions,
* and retransmissions.
*/
- if ((tp1->whoTo->find_pseudo_cumack == 1) && (tp1->sent
< SCTP_DATAGRAM_RESEND) &&
+ if ((tp1->sent < SCTP_DATAGRAM_RESEND) &&
+ (tp1->whoTo->find_pseudo_cumack == 1) &&
(tp1->snd_count == 1)) {
tp1->whoTo->pseudo_cumack =
tp1->rec.data.TSN_seq;
tp1->whoTo->find_pseudo_cumack = 0;
}
- if ((tp1->whoTo->find_rtx_pseudo_cumack == 1) &&
(tp1->sent < SCTP_DATAGRAM_RESEND) &&
+ if ((tp1->sent < SCTP_DATAGRAM_RESEND) &&
+ (tp1->whoTo->find_rtx_pseudo_cumack == 1) &&
(tp1->snd_count > 1)) {
tp1->whoTo->rtx_pseudo_cumack =
tp1->rec.data.TSN_seq;
tp1->whoTo->find_rtx_pseudo_cumack = 0;
@@ -3512,7 +3514,7 @@ sctp_window_probe_recovery(struct sctp_t
if ((tp1->sent >= SCTP_DATAGRAM_ACKED) || (tp1->data == NULL)) {
/* TSN's skipped we do NOT move back. */
sctp_misc_ints(SCTP_FLIGHT_LOG_DWN_WP_FWD,
- tp1->whoTo->flight_size,
+ tp1->whoTo ? tp1->whoTo->flight_size : 0,
tp1->book_size,
(uintptr_t) tp1->whoTo,
tp1->rec.data.TSN_seq);
___
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: r280439 - head/sys/netinet
Author: tuexen Date: Tue Mar 24 14:51:46 2015 New Revision: 280439 URL: https://svnweb.freebsd.org/changeset/base/280439 Log: Fix an accounting bug related to the per stream chunk counter. While there, don't refer to a net articifically. MFC after: 3 days Modified: head/sys/netinet/sctputil.c Modified: head/sys/netinet/sctputil.c == --- head/sys/netinet/sctputil.c Tue Mar 24 14:36:10 2015(r280438) +++ head/sys/netinet/sctputil.c Tue Mar 24 14:51:46 2015(r280439) @@ -4891,13 +4891,9 @@ sctp_release_pr_sctp_chunk(struct sctp_t chk->rec.data.payloadtype = sp->ppid; chk->rec.data.context = sp->context; chk->flags = sp->act_flags; - if (sp->net) - chk->whoTo = sp->net; - else - chk->whoTo = stcb->asoc.primary_destination; - atomic_add_int(&chk->whoTo->ref_count, 1); + chk->whoTo = NULL; chk->rec.data.TSN_seq = atomic_fetchadd_int(&stcb->asoc.sending_seq, 1); - stcb->asoc.pr_sctp_cnt++; + strq->chunks_on_queues++; TAILQ_INSERT_TAIL(&stcb->asoc.sent_queue, chk, sctp_next); stcb->asoc.sent_queue_cnt++; stcb->asoc.pr_sctp_cnt++; ___ 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: r280438 - in stable/10: contrib/groff/tmac lib lib/libmt rescue/rescue share/man/man4 share/mk sys/cam/scsi sys/sys usr.bin/mt
Author: ken Date: Tue Mar 24 14:36:10 2015 New Revision: 280438 URL: https://svnweb.freebsd.org/changeset/base/280438 Log: MFC sa(4) and mt(1) improvements. This includes these changes: 279219, 279229, 279261, 279534, 279570, 280230, 280231. In addition, bump __FreeBSD_version for the addition of the new mtio(4) / sa(4) ioctls. Thanks to Dan Langille, Harald Schmalzbauer and Rudolf Cejka for spending a significant amount of time and effort testing these changes. r279219 | ken | 2015-02-23 14:59:30 -0700 (Mon, 23 Feb 2015) | 282 lines Significant upgrades to sa(4) and mt(1). The primary focus of these changes is to modernize FreeBSD's tape infrastructure so that we can take advantage of some of the features of modern tape drives and allow support for LTFS. Significant changes and new features include: o sa(4) driver status and parameter information is now exported via an XML structure. This will allow for changes and improvements later on that will not break userland applications. The old MTIOCGET status ioctl remains, so applications using the existing interface will not break. o 'mt status' now reports drive-reported tape position information as well as the previously available calculated tape position information. These numbers will be different at times, because the drive-reported block numbers are relative to BOP (Beginning of Partition), but the block numbers calculated previously via sa(4) (and still provided) are relative to the last filemark. Both numbers are now provided. 'mt status' now also shows the drive INQUIRY information, serial number and any position flags (BOP, EOT, etc.) provided with the tape position information. 'mt status -v' adds information on the maximum possible I/O size, and the underlying values used to calculate it. o The extra sa(4) /dev entries (/dev/saN.[0-3]) have been removed. The extra devices were originally added as place holders for density-specific device nodes. Some OSes (NetBSD, NetApp's OnTap and Solaris) have had device nodes that, when you write to them, will automatically select a given density for particular tape drives. This is a convenient way of switching densities, but it was never implemented in FreeBSD. Only the device nodes were there, and that sometimes confused users. For modern tape devices, the density is generally not selectable (e.g. with LTO) or defaults to the highest availble density when the tape is rewritten from BOT (e.g. TS11X0). So, for most users, density selection won't be necessary. If they do need to select the density, it is easy enough to use 'mt density' to change it. o Protection information is now supported. This is either a Reed-Solomon CRC or CRC32 that is included at the end of each block read and written. On write, the tape drive verifies the CRC, and on read, the tape drive provides a CRC for the userland application to verify. o New, extensible tape driver parameter get/set interface. o Density reporting information. For drives that support it, 'mt getdensity' will show detailed information on what formats the tape drive supports, and what formats the tape drive supports. o Some mt(1) functionality moved into a new mt(3) library so that external applications can reuse the code. o The new mt(3) library includes helper routines to aid in parsing the XML output of the sa(4) driver, and build a tree of driver metadata. o Support for the MTLOAD (load a tape in the drive) and MTWEOFI (write filemark immediate) ioctls needed by IBM's LTFS implementation. o Improve device departure behavior for the sa(4) driver. The previous implementation led to hangs when the device was open. o This has been tested on the following types of drives: IBM TS1150 IBM TS1140 IBM LTO-6 IBM LTO-5 HP LTO-2 Seagate DDS-4 Quantum DLT-4000 Exabyte 8505 Sony DDS-2 contrib/groff/tmac/doc-syms, share/mk/bsd.libnames.mk, lib/Makefile, Add libmt. lib/libmt/Makefile, lib/libmt/mt.3, lib/libmt/mtlib.c, lib/libmt/mtlib.h, New mt(3) library that contains functions moved from mt(1) and new functions needed to interact with the updated sa(4) driver. This includes XML parser helper functions that application writers can use when writing code to query tape parameters. rescue/rescue/Makefile: Add -lmt to CRUNCH_LIBS. src/share/man/man4/mtio.4 Clarify this man page a bit, and since it contains
svn commit: r280437 - head/contrib/gcc/config/aarch64
Author: andrew Date: Tue Mar 24 14:22:58 2015 New Revision: 280437 URL: https://svnweb.freebsd.org/changeset/base/280437 Log: Adda minimal gcc config. This is just enough to build the bits of csu we get from gcc, and libgcc_eh. Sponsored by: The FreeBSD Foundation Added: head/contrib/gcc/config/aarch64/ head/contrib/gcc/config/aarch64/aarch64.h (contents, props changed) head/contrib/gcc/config/aarch64/freebsd.h (contents, props changed) Added: head/contrib/gcc/config/aarch64/aarch64.h == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/gcc/config/aarch64/aarch64.h Tue Mar 24 14:22:58 2015 (r280437) @@ -0,0 +1,3 @@ +/* $FreeBSD */ + +#define FIRST_PSEUDO_REGISTER 67 Added: head/contrib/gcc/config/aarch64/freebsd.h == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/gcc/config/aarch64/freebsd.h Tue Mar 24 14:22:58 2015 (r280437) @@ -0,0 +1,6 @@ +/* $FreeBSD$ */ + +#undef INIT_SECTION_ASM_OP +#undef FINI_SECTION_ASM_OP +#define INIT_ARRAY_SECTION_ASM_OP "\t.section\t.init_array,\"aw\",%init_array" +#define FINI_ARRAY_SECTION_ASM_OP "\t.section\t.fini_array,\"aw\",%fini_array" ___ 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: r280436 - head/secure/lib/libcrypto
Author: andrew
Date: Tue Mar 24 14:16:14 2015
New Revision: 280436
URL: https://svnweb.freebsd.org/changeset/base/280436
Log:
Add the openssl header for arm64. As it is based on MACHINE_CPUARCH it
is named opensslconf-aarch64.h.
Sponsored by: The FreeBSD Foundation
Added:
head/secure/lib/libcrypto/opensslconf-aarch64.h (contents, props changed)
Added: head/secure/lib/libcrypto/opensslconf-aarch64.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/secure/lib/libcrypto/opensslconf-aarch64.h Tue Mar 24 14:16:14
2015(r280436)
@@ -0,0 +1,242 @@
+/* $FreeBSD$ */
+/* opensslconf.h */
+/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* OpenSSL was configured with the following options: */
+#ifndef OPENSSL_DOING_MAKEDEPEND
+
+
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
+#ifndef OPENSSL_NO_GMP
+# define OPENSSL_NO_GMP
+#endif
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
+#ifndef OPENSSL_NO_KRB5
+# define OPENSSL_NO_KRB5
+#endif
+#ifndef OPENSSL_NO_MD2
+# define OPENSSL_NO_MD2
+#endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
+#ifndef OPENSSL_NO_SSL2
+# define OPENSSL_NO_SSL2
+#endif
+#ifndef OPENSSL_NO_STORE
+# define OPENSSL_NO_STORE
+#endif
+#ifndef OPENSSL_NO_UNIT_TEST
+# define OPENSSL_NO_UNIT_TEST
+#endif
+
+#endif /* OPENSSL_DOING_MAKEDEPEND */
+
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
+#ifndef OPENSSL_NO_ASM
+# define OPENSSL_NO_ASM
+#endif
+#ifndef OPENSSL_NO_STATIC_ENGINE
+# define OPENSSL_NO_STATIC_ENGINE
+#endif
+
+/* The OPENSSL_NO_* macros are also defined as NO_* if the application
+ asks for it. This is a transient feature that is provided for those
+ who haven't had the time to do the appropriate changes in their
+ applications. */
+#ifdef OPENSSL_ALGORITHM_DEFINES
+# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) &&
!defined(NO_EC_NISTP_64_GCC_128)
+# define NO_EC_NISTP_64_GCC_128
+# endif
+# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
+# define NO_GMP
+# endif
+# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
+# define NO_JPAKE
+# endif
+# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
+# define NO_KRB5
+# endif
+# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
+# define NO_MD2
+# endif
+# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
+# define NO_SCTP
+# endif
+# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
+# define NO_SSL2
+# endif
+# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
+# define NO_STORE
+# endif
+# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
+# define NO_UNIT_TEST
+# endif
+#endif
+
+/* crypto/opensslconf.h.in */
+
+/* Generate 80386 code? */
+#undef I386_ONLY
+
+#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
+#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+#define ENGINESDIR "/usr/lib/engines"
+#define OPENSSLDIR "/etc/ssl"
+#endif
+#endif
+
+#undef OPENSSL_UNISTD
+#define OPENSSL_UNISTD
+
+#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
+
+#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
+#define IDEA_INT unsigned int
+#endif
+
+#if defined(HEADER_MD2_H) && !defined(MD2_INT)
+#define MD2_INT unsigned int
+#endif
+
+#if defined(HEADER_RC2_H) && !defined(RC2_INT)
+/* I need to put in a mod for the alpha - eay */
+#define RC2_INT unsigned int
+#endif
+
+#if defined(HEADER_RC4_H)
+#if !defined(RC4_INT)
+/* using int types make the structure larger but make the code faster
+ * on most boxes I have tested - up to %20 faster. */
+/*
+ * I don't know what does "most" mean, but declaring "int" is a must on:
+ * - Intel P6 because partial register stalls are very expensive;
+ * - elder Alpha because it lacks byte load/store instructions;
+ */
+#define RC4_INT unsigned int
+#endif
+#if !defined(RC4_CHUNK)
+/*
+ * This enables code handling data aligned at natural CPU word
+ * boundary. See crypto/rc4/rc4_enc.c for further details.
+ */
+#undef RC4_CHUNK
+#endif
+#endif
+
+#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
+/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+ * %20 speed up (longs are 8 bytes, int's are 4). */
+#ifndef DES_LONG
+#define DES_LONG unsigned int
+#endif
+#endif
+
+#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
+#define CONFIG_HEADER_BN_H
+#undef BN_LLONG
+
+/* Should we define BN_DIV2W here? */
+
+/* Only one for the following should be defined */
+#define SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
+#undef THIRTY_TWO_BIT
+#endif
+
+#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
+#define CONFIG_HEADER_RC4_LOCL_H
+/* if this is defined data[i] is used instead of *data, this is a %20
+ * speedup on x86 */
+#define RC4_INDEX
+#endif
+
+#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
+#define C
svn commit: r280435 - head/sys/x86/iommu
Author: kib Date: Tue Mar 24 12:48:51 2015 New Revision: 280435 URL: https://svnweb.freebsd.org/changeset/base/280435 Log: When mapping an allocated entry, use the entry size, instead of the requested size. If tag restrictions caused split entry, its size is less then requsted. Hardware provided by: Michael Fuckner Sponsored by: The FreeBSD Foundation MFC after:1 week Modified: head/sys/x86/iommu/intel_gas.c Modified: head/sys/x86/iommu/intel_gas.c == --- head/sys/x86/iommu/intel_gas.c Tue Mar 24 12:46:21 2015 (r280434) +++ head/sys/x86/iommu/intel_gas.c Tue Mar 24 12:48:51 2015 (r280435) @@ -649,7 +649,7 @@ dmar_gas_map(struct dmar_ctx *ctx, const entry->flags |= eflags; DMAR_CTX_UNLOCK(ctx); - error = ctx_map_buf(ctx, entry->start, size, ma, + error = ctx_map_buf(ctx, entry->start, entry->end - entry->start, ma, ((eflags & DMAR_MAP_ENTRY_READ) != 0 ? DMAR_PTE_R : 0) | ((eflags & DMAR_MAP_ENTRY_WRITE) != 0 ? DMAR_PTE_W : 0) | ((eflags & DMAR_MAP_ENTRY_SNOOP) != 0 ? DMAR_PTE_SNP : 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: r280434 - head/sys/x86/iommu
Author: kib
Date: Tue Mar 24 12:46:21 2015
New Revision: 280434
URL: https://svnweb.freebsd.org/changeset/base/280434
Log:
Assert that the mapping loop makes progress.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/x86/iommu/intel_idpgtbl.c
Modified: head/sys/x86/iommu/intel_idpgtbl.c
==
--- head/sys/x86/iommu/intel_idpgtbl.c Tue Mar 24 11:33:34 2015
(r280433)
+++ head/sys/x86/iommu/intel_idpgtbl.c Tue Mar 24 12:46:21 2015
(r280434)
@@ -465,6 +465,7 @@ ctx_map_buf_locked(struct dmar_ctx *ctx,
KASSERT(size >= pg_sz,
("mapping loop overflow %p %jx %jx %jx", ctx,
(uintmax_t)base, (uintmax_t)size, (uintmax_t)pg_sz));
+ KASSERT(pg_sz > 0, ("pg_sz 0 lvl %d", lvl));
pte = ctx_pgtbl_map_pte(ctx, base, lvl, flags, &idx, &sf);
if (pte == NULL) {
KASSERT((flags & DMAR_PGF_WAITOK) == 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"
Re: svn commit: r280374 - head/sys/dev/sfxge
On Mon, Mar 23, 2015 at 03:44:18PM +, Andrew Rybchenko wrote: A> Author: arybchik A> Date: Mon Mar 23 15:44:17 2015 A> New Revision: 280374 A> URL: https://svnweb.freebsd.org/changeset/base/280374 A> A> Log: A> sfxge: assert either kernel or internal copy of interface flags A> A> ioctl to put interface down sets ifp->if_flags which holds the intended A> administratively defined state and calls driver callback to apply it. A> When everything is done, driver updates internal copy of A> interface flags sc->if_flags which holds the operational state. A> So, transmit from Rx path is possible when interface is intended to be A> administratively down in accordance with ifp->if_flags, but not applied A> yet and the operational state is up in accordance with sc->if_flags. A> A> Sponsored by: Solarflare Communications, Inc. A> Differential Revision: https://reviews.freebsd.org/D2075 In the future ifnet API, that is now being developed in projects/ifnet, the stack promises to change if_flags only via SIOCSIFFLAGS, so driver can and should cashe the value and later access it using internal locking. The if_flags need not be accessed at all by the driver. -- 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: r280433 - head/sys/dev/sfxge
Author: arybchik
Date: Tue Mar 24 11:33:34 2015
New Revision: 280433
URL: https://svnweb.freebsd.org/changeset/base/280433
Log:
sfxge: cleanup: fix index variable type to match upper boundary type
Sponsored by: Solarflare Communications, Inc.
Modified:
head/sys/dev/sfxge/sfxge_tx.c
Modified: head/sys/dev/sfxge/sfxge_tx.c
==
--- head/sys/dev/sfxge/sfxge_tx.c Tue Mar 24 11:25:19 2015
(r280432)
+++ head/sys/dev/sfxge/sfxge_tx.c Tue Mar 24 11:33:34 2015
(r280433)
@@ -667,7 +667,7 @@ void
sfxge_if_qflush(struct ifnet *ifp)
{
struct sfxge_softc *sc;
- int i;
+ unsigned int i;
sc = ifp->if_softc;
___
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: r280432 - head/sys/dev/sfxge
Author: arybchik Date: Tue Mar 24 11:25:19 2015 New Revision: 280432 URL: https://svnweb.freebsd.org/changeset/base/280432 Log: sfxge: cleanup: add a blank line before each #if to improve readability Sponsored by: Solarflare Communications, Inc. Modified: head/sys/dev/sfxge/sfxge.h Modified: head/sys/dev/sfxge/sfxge.h == --- head/sys/dev/sfxge/sfxge.h Tue Mar 24 11:22:12 2015(r280431) +++ head/sys/dev/sfxge/sfxge.h Tue Mar 24 11:25:19 2015(r280432) @@ -55,25 +55,32 @@ */ #defineCACHE_LINE_SIZE 128 #endif + #ifndef IFCAP_LINKSTATE #defineIFCAP_LINKSTATE 0 #endif + #ifndef IFCAP_VLAN_HWTSO #defineIFCAP_VLAN_HWTSO 0 #endif + #ifndef IFM_10G_T #defineIFM_10G_T IFM_UNKNOWN #endif + #ifndef IFM_10G_KX4 #defineIFM_10G_KX4 IFM_10G_CX4 #endif + #if (__FreeBSD_version >= 800501 && __FreeBSD_version < 90) || \ __FreeBSD_version >= 93 #defineSFXGE_HAVE_DESCRIBE_INTR #endif + #ifdef IFM_ETH_RXPAUSE #defineSFXGE_HAVE_PAUSE_MEDIAOPTS #endif + #ifndef CTLTYPE_U64 #defineCTLTYPE_U64 CTLTYPE_QUAD #endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r280431 - head/sys/modules/sfxge
Author: arybchik
Date: Tue Mar 24 11:22:12 2015
New Revision: 280431
URL: https://svnweb.freebsd.org/changeset/base/280431
Log:
sfxge: cleanup: remove trailing whitespaces
Sponsored by: Solarflare Communications, Inc.
Modified:
head/sys/modules/sfxge/Makefile
Modified: head/sys/modules/sfxge/Makefile
==
--- head/sys/modules/sfxge/Makefile Tue Mar 24 09:46:47 2015
(r280430)
+++ head/sys/modules/sfxge/Makefile Tue Mar 24 11:22:12 2015
(r280431)
@@ -14,7 +14,7 @@ SRCS+=sfxge_port.c sfxge_rx.c sfxge_tx.
SRCS+= sfxge.h sfxge_rx.h sfxge_tx.h sfxge_version.h
.PATH: ${.CURDIR}/../../dev/sfxge/common
-SRCS+= efx_ev.c efx_intr.c efx_mac.c efx_mcdi.c efx_nic.c
+SRCS+= efx_ev.c efx_intr.c efx_mac.c efx_mcdi.c efx_nic.c
SRCS+= efx_nvram.c efx_phy.c efx_port.c efx_rx.c efx_sram.c efx_tx.c
SRCS+= efx_vpd.c efx_wol.c
SRCS+= efsys.h
@@ -22,7 +22,7 @@ SRCS+=efx.h efx_impl.h efx_mcdi.h efx_r
SRCS+= efx_regs_mcdi.h efx_regs_pci.h efx_types.h
SRCS+= siena_mac.c siena_nic.c siena_nvram.c siena_phy.c
-SRCS+= siena_sram.c siena_vpd.c
+SRCS+= siena_sram.c siena_vpd.c
SRCS+= siena_flash.h siena_impl.h
DEBUG_FLAGS= -DDEBUG=1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r280430 - head/sys/dev/netmap
Author: bz Date: Tue Mar 24 09:46:47 2015 New Revision: 280430 URL: https://svnweb.freebsd.org/changeset/base/280430 Log: Make ix_crcstrip a public symbol for the moment; it probably is not the right solution but I will leave it to experts to untangle this problem to properly stop the build failures. At the moment only if_ix.c includes dev/netmap/ixgbe_netmap.h which is good as ixgbe_netmap.h defines a couple of (file) static variables--thus local to if_ix.c. static int ix_crcstrip however now also got checked from ix_txrx.c (as an extern) and should not be visible there. In fact we do see powerpc and powerpc64 build failures because of this. It is unclear to me why on other (clang built?) architectures this does not lead to a reference of an undefined symbol and similar build breakage. Modified: head/sys/dev/netmap/ixgbe_netmap.h Modified: head/sys/dev/netmap/ixgbe_netmap.h == --- head/sys/dev/netmap/ixgbe_netmap.h Tue Mar 24 09:21:53 2015 (r280429) +++ head/sys/dev/netmap/ixgbe_netmap.h Tue Mar 24 09:46:47 2015 (r280430) @@ -61,7 +61,8 @@ * count packets that might be missed due to lost interrupts. */ SYSCTL_DECL(_dev_netmap); -static int ix_rx_miss, ix_rx_miss_bufs, ix_crcstrip; +static int ix_rx_miss, ix_rx_miss_bufs; +int ix_crcstrip; SYSCTL_INT(_dev_netmap, OID_AUTO, ix_crcstrip, CTLFLAG_RW, &ix_crcstrip, 0, "strip CRC on rx frames"); SYSCTL_INT(_dev_netmap, OID_AUTO, ix_rx_miss, ___ 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: r280429 - head/sys/dev/sound/usb
Author: hselasky
Date: Tue Mar 24 09:21:53 2015
New Revision: 280429
URL: https://svnweb.freebsd.org/changeset/base/280429
Log:
Use the feedback value from the synchronization endpoint as fallback
when there is no recording channel.
MFC after:3 days
PR: 198444
Modified:
head/sys/dev/sound/usb/uaudio.c
Modified: head/sys/dev/sound/usb/uaudio.c
==
--- head/sys/dev/sound/usb/uaudio.c Tue Mar 24 08:27:01 2015
(r280428)
+++ head/sys/dev/sound/usb/uaudio.c Tue Mar 24 09:21:53 2015
(r280429)
@@ -2026,6 +2026,13 @@ uaudio_chan_play_sync_callback(struct us
DPRINTF("Comparing %d Hz :: %d Hz\n",
(int)temp, (int)sample_rate);
+ /*
+* Use feedback value as fallback when there is no
+* recording channel:
+*/
+ if (ch->priv_sc->sc_rec_chan.num_alt == 0)
+ ch->jitter_curr = temp - sample_rate;
+
ch->feedback_rate = temp;
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: r280428 - stable/9/include
Author: ngie
Date: Tue Mar 24 08:27:01 2015
New Revision: 280428
URL: https://svnweb.freebsd.org/changeset/base/280428
Log:
MFstable/10 r280427:
MFC r278204:
Sort the entries by build knob, then MACHINE_ARCH like other areas of the tree
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/include/Makefile
Directory Properties:
stable/9/ (props changed)
stable/9/include/ (props changed)
Modified: stable/9/include/Makefile
==
--- stable/9/include/Makefile Tue Mar 24 08:24:55 2015(r280427)
+++ stable/9/include/Makefile Tue Mar 24 08:27:01 2015(r280428)
@@ -58,14 +58,10 @@ LSUBDIRS= cam/ata cam/scsi \
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
-.if ${MK_USB} != "no"
-LSUBDIRS+= dev/usb
-.endif
-
LSUBSUBDIRS= dev/mpt/mpilib
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
-_dev_powermac_nvram= dev/powermac_nvram
+.if ${MK_BLUETOOTH} != "no"
+LSUBSUBDIRS+= netgraph/bluetooth/include
.endif
.if ${MK_GPIB} != "no"
@@ -85,10 +81,6 @@ INCS+= hesiod.h
INCS+= iconv.h
.endif
-.if ${MK_BLUETOOTH} != "no"
-LSUBSUBDIRS+= netgraph/bluetooth/include
-.endif
-
# XXX unconditionally needed by
#.if ${MK_IPX} != "no"
_netipx= netipx
@@ -99,6 +91,14 @@ _netncp= netncp
_fs_nwfs= fs/nwfs
.endif
+.if ${MK_USB} != "no"
+LSUBDIRS+= dev/usb
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+_dev_powermac_nvram= dev/powermac_nvram
+.endif
+
# Define SHARED to indicate whether you want symbolic links to the system
# source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is
# probably only useful for developers and should be avoided if you do not
___
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: r280427 - stable/10/include
Author: ngie
Date: Tue Mar 24 08:24:55 2015
New Revision: 280427
URL: https://svnweb.freebsd.org/changeset/base/280427
Log:
MFC r278204:
Sort the entries by build knob, then MACHINE_ARCH like other areas of the tree
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/include/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/include/Makefile
==
--- stable/10/include/Makefile Tue Mar 24 08:22:48 2015(r280426)
+++ stable/10/include/Makefile Tue Mar 24 08:24:55 2015(r280427)
@@ -58,14 +58,10 @@ LSUBDIRS= cam/ata cam/scsi \
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
-.if ${MK_USB} != "no"
-LSUBDIRS+= dev/usb
-.endif
-
LSUBSUBDIRS= dev/mpt/mpilib
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
-_dev_powermac_nvram= dev/powermac_nvram
+.if ${MK_BLUETOOTH} != "no"
+LSUBSUBDIRS+= netgraph/bluetooth/include
.endif
.if ${MK_GPIB} != "no"
@@ -81,10 +77,6 @@ INCS+= gssapi.h
INCS+= hesiod.h
.endif
-.if ${MK_BLUETOOTH} != "no"
-LSUBSUBDIRS+= netgraph/bluetooth/include
-.endif
-
# XXX unconditionally needed by
#.if ${MK_IPX} != "no"
_netipx= netipx
@@ -94,7 +86,14 @@ _netipx= netipx
.if ${MK_ICONV} == "yes"
INCS+= iconv.h
.endif
-
+
+.if ${MK_USB} != "no"
+LSUBDIRS+= dev/usb
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+_dev_powermac_nvram= dev/powermac_nvram
+.endif
# Define SHARED to indicate whether you want symbolic links to the system
# source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is
___
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: r280426 - in stable/9: etc/rc.d tools/build/mk
Author: ngie
Date: Tue Mar 24 08:22:48 2015
New Revision: 280426
URL: https://svnweb.freebsd.org/changeset/base/280426
Log:
MFstable/10 r278052,r278190,r278191,r278574,r278575,r280422:
r278052:
MFC r271892:
r271892:
Sort the optional rc.d scripts by their knobs
Sponsored by: EMC / Isilon Storage Division
r278190:
MFC r277732:
r277732:
Honor MK_API in etc/rc.d
Sponsored by: EMC / Isilon Storage Division
r278191:
MFC r277733:
r277733:
Honor MK_AMD with etc/rc.d/amd
Sponsored by: EMC / Isilon Storage Division
r278574:
MFC r277736:
r277736:
Honor MK_ACCT with etc/rc.d/accounting
Sponsored by: EMC / Isilon Storage Division
r278575:
Remove etc/rc.d/accounting from FILES
r280422:
MFC r271893,r271895,r272043,r278249,r278282,r278466:
r271893:
Don't install /etc/rc.d/rwho unless MK_RCMDS == yes
Sponsored by: EMC / Isilon Storage Division
r271895:
Don't install /etc/rc.d/ftp-proxy unless MK_PF == yes
Sponsored by: EMC / Isilon Storage Division
r272043:
Don't install /etc/rc.d/keyserv unless MK_OPENSSL == yes
Sponsored by: EMC / Isilon Storage Division
r278249:
Honor the following flags with the following rc.d scripts for services that
can
be easily decoupled from the boot process without disrupting other services
- MK_APM && MK_ACPI: powerd
- MK_BOOTPARAMD: bootparams
- MK_FTP: ftpd
- MK_INETD: inetd
- MK_LEGACY_CONSOLE: moused, syscons
- MK_MAIL: othermta
- MK_NS_CACHING: nscd
- MK_NTP: ntpd (ntpdate is required by other services and can't be easily
conditionalized -- yet..)
- MK_ROUTED: routed
- MK_SENDMAIL: sendmail
- MK_TIMED: timed
- MK_VI: virecover
Sponsored by: EMC / Isilon Storage Division
r278282:
Use FILES+= idiom instead of _inetd when referencing inetd rc.d script
This was a discrepancy between ^/projects/building-blocks and ^/head that I
didn't resolve before committing the change to ^/head
Pointyhat to: me
Reported by: jhb
Sponsored by: EMC / Isilon Storage Division
r278466:
Remove explicit routing/sendmail rc.d inclusion in FILES
Reported by: Guy Yur
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/rc.d/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==
--- stable/9/etc/rc.d/Makefile Tue Mar 24 08:21:36 2015(r280425)
+++ stable/9/etc/rc.d/Makefile Tue Mar 24 08:22:48 2015(r280426)
@@ -18,7 +18,6 @@ FILES=DAEMON \
auditdistd \
bgfsck \
${_bluetooth} \
- bootparams \
bridge \
${_bthidd} \
cleanvar \
@@ -34,8 +33,6 @@ FILES=DAEMON \
encswap \
faith \
fsck \
- ftp-proxy \
- ftpd \
gbde \
geli \
geli2 \
@@ -45,7 +42,6 @@ FILES=DAEMON \
hostid \
hostid_save \
hostname \
- inetd \
initrandom \
ip6addrctl \
ipfilter \
@@ -57,7 +53,6 @@ FILES=DAEMON \
${_ipxrouted} \
kadmind \
kerberos \
- keyserv \
kld \
kldxref \
kpasswdd \
@@ -73,7 +68,6 @@ FILES=DAEMON \
mdconfig \
mdconfig2 \
mountd \
- moused \
mroute6d \
mrouted \
msgs \
@@ -90,14 +84,11 @@ FILES= DAEMON \
nisdomain \
${_nscd} \
nsswitch \
- ntpd \
ntpdate \
${_opensm} \
- othermta \
pf \
pflog \
pfsync \
- powerd \
ppp \
pppoed \
pwcheck \
@@ -109,16 +100,13 @@ FILES=DAEMON \
rfcomm_pppd_server \
root \
route6d \
- routed \
routing \
rpcbind \
rtadvd \
rtsold \
- rwho \
savecore \
sdpd \
securelevel \
- sendmail \
serial \
sppp \
${_sshd} \
@@ -127,10 +115,8 @@ FILES= DAEMON \
static_ndp \
stf \
swap1 \
- syscons \
sysctl \
syslogd \
- timed \
tmp \
${_ubthidhci} \
ugidfw \
@@ -150,19 +136,34 @@ FILES=DAEMON \
FILES+=accounting
.endif
-.if ${MK_AMD} != "no"
-FILES+=amd
-.endif
-
.if ${MK_ACPI} != "no"
FILES+=power_profile
.endif
+.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
+FILES+=powerd
+.endif
+
+.if ${MK_AMD} != "no"
+FILES+=amd
+.endif
+
.if ${MK_APM} != "no"
FILES+=apm
FILES+=
svn commit: r280425 - stable/10/sys/x86/iommu
Author: kib
Date: Tue Mar 24 08:21:36 2015
New Revision: 280425
URL: https://svnweb.freebsd.org/changeset/base/280425
Log:
MFC r280196:
Recheck that boundary is not crossed after the move to satisfy boundary
restriction.
Modified:
stable/10/sys/x86/iommu/intel_gas.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/x86/iommu/intel_gas.c
==
--- stable/10/sys/x86/iommu/intel_gas.c Tue Mar 24 08:18:24 2015
(r280424)
+++ stable/10/sys/x86/iommu/intel_gas.c Tue Mar 24 08:21:36 2015
(r280425)
@@ -327,13 +327,15 @@ dmar_gas_match_one(struct dmar_gas_match
start = roundup2(bs, a->common->alignment);
/* DMAR_PAGE_SIZE to create gap after new entry. */
if (start + a->size + DMAR_PAGE_SIZE <= prev->end + prev->free_after &&
- start + a->size <= end) {
+ start + a->size <= end && dmar_test_boundary(start, a->size,
+ a->common->boundary)) {
a->entry->start = start;
return (true);
}
/*
-* Not enough space to align at boundary, but allowed to split.
+* Not enough space to align at the requested boundary, or
+* boundary is smaller than the size, but allowed to split.
* We already checked that start + size does not overlap end.
*
* XXXKIB. It is possible that bs is exactly at the start of
___
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: r280424 - stable/10/sys/x86/iommu
Author: kib
Date: Tue Mar 24 08:18:24 2015
New Revision: 280424
URL: https://svnweb.freebsd.org/changeset/base/280424
Log:
MFC r280195:
When inserting new entry into the address map, ensure that not only
next entry does not intersect with the tail of the new entry, but also
that previous entry is also before new entry start.
Modified:
stable/10/sys/x86/iommu/intel_gas.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/x86/iommu/intel_gas.c
==
--- stable/10/sys/x86/iommu/intel_gas.c Tue Mar 24 08:06:45 2015
(r280423)
+++ stable/10/sys/x86/iommu/intel_gas.c Tue Mar 24 08:18:24 2015
(r280424)
@@ -366,7 +366,8 @@ dmar_gas_match_insert(struct dmar_gas_ma
next = RB_NEXT(dmar_gas_entries_tree, &a->ctx->rb_root, prev);
KASSERT(next->start >= a->entry->end &&
- next->start - a->entry->start >= a->size,
+ next->start - a->entry->start >= a->size &&
+ prev->end <= a->entry->end,
("dmar_gas_match_insert hole failed %p prev (%jx, %jx) "
"free_after %jx next (%jx, %jx) entry (%jx, %jx)", a->ctx,
(uintmax_t)prev->start, (uintmax_t)prev->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: r280423 - in stable/9: etc include share/man/man4 share/man/man9 share/misc tools/build/mk
Author: ngie
Date: Tue Mar 24 08:06:45 2015
New Revision: 280423
URL: https://svnweb.freebsd.org/changeset/base/280423
Log:
MFstable/10 r280419,r280420:
r280419:
MFC r278135,r278202:
r278135 (by amdmi3):
- Remove more files when MK_USB == no
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
r278202:
Clean up more usb related files when MK_USB == no when dealing with
manpages, libraries, and binaries
Sponsored by: EMC / Isilon Storage Division
r280420:
Forced commit to note that the previous commit to this file included the
following MFC as well:
MFC 278251:
Honor the following flags for items that can be conditionalized out of the
build/install without disrupting other dependent services (see r278249, et
al):
- MK_LOCATE
- MK_MAN
- MK_NLS
- MK_OPENSSL
- MK_PKGBOOTSTRAP
- MK_SENDMAIL
Additional flags need to be handled in etc/Makefile, but it requires
refactoring the relevant scripts in etc/rc.d/*
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/Makefile
stable/9/include/Makefile
stable/9/share/man/man4/Makefile
stable/9/share/man/man9/Makefile
stable/9/share/misc/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/include/ (props changed)
stable/9/share/ (props changed)
stable/9/share/man/ (props changed)
stable/9/share/man/man4/ (props changed)
stable/9/share/man/man9/ (props changed)
stable/9/share/misc/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/Makefile
==
--- stable/9/etc/Makefile Tue Mar 24 07:43:58 2015(r280422)
+++ stable/9/etc/Makefile Tue Mar 24 08:06:45 2015(r280423)
@@ -40,7 +40,6 @@ BIN1= crontab \
rc.bsdextended \
rc.firewall \
rc.initdiskless \
- rc.sendmail \
rc.shutdown \
rc.subr \
remote \
@@ -49,7 +48,7 @@ BIN1= crontab \
shells \
sysctl.conf \
syslog.conf \
- termcap.small
+ termcap.small \
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
BIN1+= libmap32.conf
@@ -136,6 +135,10 @@ BIN1+= portsnap.conf
BIN1+= pf.os
.endif
+.if ${MK_SENDMAIL} != "no"
+BIN1+= rc.sendmail
+.endif
+
.if ${MK_TCSH} != "no"
BIN1+= csh.cshrc csh.login csh.logout
.endif
@@ -237,7 +240,9 @@ distribution:
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
+.if ${MK_PKGBOOTSTRAP} != "no"
${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
+.endif
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
@@ -302,8 +307,10 @@ distribution:
.endif
${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
${DESTDIR}/etc/dumpdates
+.if ${MK_LOCATE} != "no"
${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/db/locate.database
+.endif
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
${DESTDIR}/var/crash
cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
@@ -372,6 +379,7 @@ distrib-dirs: ${MTREES:N/*}
done; true
.endif
${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
+.if ${MK_MAN} != "no"
cd ${DESTDIR}/usr/share/man; \
for mandir in man*; do \
${INSTALL_SYMLINK} ../$$mandir \
@@ -379,23 +387,30 @@ distrib-dirs: ${MTREES:N/*}
${INSTALL_SYMLINK} ../$$mandir \
${DESTDIR}/usr/share/man/en.UTF-8/; \
done
+.if ${MK_OPENSSL} != "no"
cd ${DESTDIR}/usr/share/openssl/man; \
for mandir in man*; do \
${INSTALL_SYMLINK} ../$$mandir \
${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
done
+.endif
set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
while [ $$# -gt 0 ] ; do \
${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
- ${INSTALL_SYMLINK} "$$2" \
- "${DESTDIR}/usr/share/openssl/man/$$1"; \
+ if [ "${MK_OPENSSL}" != "no" ]; then \
+ ${INSTALL_SYMLINK} "$$2" \
+ "${DESTDIR}/usr/share/openssl/man/$$1"; \
+ fi; \
shift; shift; \
done
+.endif
+.if ${MK_NLS} != "no"
set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
while [ $$# -gt 0 ] ; do \
${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
shift; shift; \
done
+.endif
etc-examples:
cd ${.CURDIR}; ${INSTALL}
Re: svn commit: r280406 - vendor/lua/5.3.0
On Mon, Mar 23, 2015 at 05:06:03PM -0700, Adrian Chadd wrote: > [snip] > > [gets coffee and popcorn] +1. I briefly had a thought if perhaps April suddenly arrived unnoticed. ./danfe ___ 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: r280422 - in stable/10: etc/rc.d tools/build/mk
Author: ngie
Date: Tue Mar 24 07:43:58 2015
New Revision: 280422
URL: https://svnweb.freebsd.org/changeset/base/280422
Log:
MFC r271893,r271895,r272043,r278249,r278282,r278466:
r271893:
Don't install /etc/rc.d/rwho unless MK_RCMDS == yes
Sponsored by: EMC / Isilon Storage Division
r271895:
Don't install /etc/rc.d/ftp-proxy unless MK_PF == yes
Sponsored by: EMC / Isilon Storage Division
r272043:
Don't install /etc/rc.d/keyserv unless MK_OPENSSL == yes
Sponsored by: EMC / Isilon Storage Division
r278249:
Honor the following flags with the following rc.d scripts for services that
can
be easily decoupled from the boot process without disrupting other services
- MK_APM && MK_ACPI: powerd
- MK_BOOTPARAMD: bootparams
- MK_FTP: ftpd
- MK_INETD: inetd
- MK_LEGACY_CONSOLE: moused, syscons
- MK_MAIL: othermta
- MK_NS_CACHING: nscd
- MK_NTP: ntpd (ntpdate is required by other services and can't be easily
conditionalized -- yet..)
- MK_ROUTED: routed
- MK_SENDMAIL: sendmail
- MK_TIMED: timed
- MK_VI: virecover
Sponsored by: EMC / Isilon Storage Division
r278282:
Use FILES+= idiom instead of _inetd when referencing inetd rc.d script
This was a discrepancy between ^/projects/building-blocks and ^/head that I
didn't resolve before committing the change to ^/head
Pointyhat to: me
Reported by: jhb
Sponsored by: EMC / Isilon Storage Division
r278466:
Remove explicit routing/sendmail rc.d inclusion in FILES
Reported by: Guy Yur
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/etc/rc.d/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==
--- stable/10/etc/rc.d/Makefile Tue Mar 24 07:11:54 2015(r280421)
+++ stable/10/etc/rc.d/Makefile Tue Mar 24 07:43:58 2015(r280422)
@@ -18,7 +18,6 @@ FILES=DAEMON \
auditdistd \
bgfsck \
${_bluetooth} \
- bootparams \
bridge \
${_bthidd} \
cleanvar \
@@ -34,8 +33,6 @@ FILES=DAEMON \
dumpon \
faith \
fsck \
- ftp-proxy \
- ftpd \
gbde \
geli \
geli2 \
@@ -45,7 +42,6 @@ FILES=DAEMON \
hostid \
hostid_save \
hostname \
- inetd \
initrandom \
ip6addrctl \
ipfilter \
@@ -57,7 +53,6 @@ FILES=DAEMON \
${_ipxrouted} \
${_kadmind} \
${_kdc} \
- keyserv \
${_kfd} \
kld \
kldxref \
@@ -74,7 +69,6 @@ FILES=DAEMON \
mdconfig \
mdconfig2 \
mountd \
- moused \
mroute6d \
mrouted \
msgs \
@@ -90,15 +84,12 @@ FILES= DAEMON \
nisdomain \
${_nscd} \
nsswitch \
- ntpd \
ntpdate \
${_opensm} \
- othermta \
pf \
pflog \
pfsync \
postrandom \
- powerd \
ppp \
pppoed \
pwcheck \
@@ -110,16 +101,13 @@ FILES=DAEMON \
rfcomm_pppd_server \
root \
route6d \
- routed \
routing \
rpcbind \
rtadvd \
rtsold \
- rwho \
savecore \
sdpd \
securelevel \
- sendmail \
serial \
sppp \
${_sshd} \
@@ -129,10 +117,8 @@ FILES= DAEMON \
stf \
swap \
swaplate \
- syscons \
sysctl \
syslogd \
- timed \
tmp \
${_ubthidhci} \
ugidfw \
@@ -158,6 +144,10 @@ FILES+=accounting
FILES+=power_profile
.endif
+.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
+FILES+=powerd
+.endif
+
.if ${MK_AMD} != "no"
FILES+=amd
.endif
@@ -180,6 +170,10 @@ _hcsecd= hcsecd
_ubthidhci=ubthidhci
.endif
+.if ${MK_BOOTPARAMD} != "no"
+FILES+=bootparams
+.endif
+
.if ${MK_BSNMP} != "no"
FILES+=bsnmpd
.endif
@@ -188,6 +182,10 @@ FILES+=bsnmpd
FILES+=ccd
.endif
+.if ${MK_FTP} != "no"
+FILES+=ftpd
+.endif
+
.if ${MK_HAST} != "no"
FILES+=hastd
.endif
@@ -196,6 +194,10 @@ FILES+=hastd
_ipxrouted=ipxrouted
.endif
+.if ${MK_INETD} != "no"
+FILES+=inetd
+.endif
+
.if ${MK_ISCSI} != "no"
FILES+=iscsictl
FILES+=iscsid
@@ -214,22 +216,59 @@ _kfd= kfd
_kpasswdd= kpasswdd
.endif
+.if ${MK_LEGACY_CONSOLE} != "no"
+FILES+=moused
+FILES+=syscons
+.endif
+
.if ${MK_LPR} != "no"
FILES+=lpd
.endif
+.if ${MK_MAIL} != "no"
+FILES+=othermta
+.endif
+
.if ${MK_NS_CACHING} !
svn commit: r280421 - in stable/9: . etc lib lib/libpam/modules libexec share/mk tools/build/options usr.bin usr.sbin usr.sbin/ppp
Author: ngie
Date: Tue Mar 24 07:11:54 2015
New Revision: 280421
URL: https://svnweb.freebsd.org/changeset/base/280421
Log:
MFstable/10 r278569,r279505,r279506:
r278569:
MFC r278182:
r278182:
Conditionalize building radius support into libpam, ppp, etc via
MK_RADIUS_SUPPORT
Sponsored by: EMC / Isilon Storage Division
r279505:
MFC r278192:
Add the following options to enable/disable several features in the base
system
WITHOUT_BOOTPARAMD - bootparamd
WITHOUT_BOOTPD - bootpd
WITHOUT_FINGER - finger, fingerd
WITHOUT_FTP - ftp, ftpd
WITHOUT_INETD - inetd
WITHOUT_RBOOTD - rbootd
WITHOUT_TCP_WRAPPERS - tcpd, et al
WITHOUT_TFTP - tftp, tftp-server
WITHOUT_TIMED - timed
Sponsored by: EMC / Isilon Storage Division
r279506:
MFC r278193:
Add MK_FILE to control whether or not to build file(1), libmagic(3), etc
Sponsored by: EMC / Isilon Storage Division
Added:
stable/9/tools/build/options/WITHOUT_BOOTPARAMD
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_BOOTPARAMD
stable/9/tools/build/options/WITHOUT_BOOTPD
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_BOOTPD
stable/9/tools/build/options/WITHOUT_FILE
- copied unchanged from r279506, stable/10/tools/build/options/WITHOUT_FILE
stable/9/tools/build/options/WITHOUT_FINGER
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_FINGER
stable/9/tools/build/options/WITHOUT_FTP
- copied unchanged from r279505, stable/10/tools/build/options/WITHOUT_FTP
stable/9/tools/build/options/WITHOUT_INETD
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_INETD
stable/9/tools/build/options/WITHOUT_RADIUS_SUPPORT
- copied unchanged from r278569,
stable/10/tools/build/options/WITHOUT_RADIUS_SUPPORT
stable/9/tools/build/options/WITHOUT_RBOOTD
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_RBOOTD
stable/9/tools/build/options/WITHOUT_TCP_WRAPPERS
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_TCP_WRAPPERS
stable/9/tools/build/options/WITHOUT_TFTP
- copied unchanged from r279505, stable/10/tools/build/options/WITHOUT_TFTP
stable/9/tools/build/options/WITHOUT_TIMED
- copied unchanged from r279505,
stable/10/tools/build/options/WITHOUT_TIMED
Modified:
stable/9/Makefile.inc1 (contents, props changed)
stable/9/etc/Makefile
stable/9/lib/Makefile (contents, props changed)
stable/9/lib/libpam/modules/modules.inc
stable/9/libexec/Makefile
stable/9/share/mk/bsd.own.mk
stable/9/usr.bin/Makefile
stable/9/usr.sbin/Makefile (contents, props changed)
stable/9/usr.sbin/ppp/Makefile
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libpam/ (props changed)
stable/9/share/ (props changed)
stable/9/share/mk/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
stable/9/tools/build/options/ (props changed)
stable/9/usr.bin/ (props changed)
stable/9/usr.sbin/ (props changed)
stable/9/usr.sbin/ppp/ (props changed)
Modified: stable/9/Makefile.inc1
==
--- stable/9/Makefile.inc1 Tue Mar 24 06:59:41 2015(r280420)
+++ stable/9/Makefile.inc1 Tue Mar 24 07:11:54 2015(r280421)
@@ -1391,7 +1391,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
- lib/libradius lib/libsbuf lib/libtacplus \
+ ${_lib_libradius} lib/libsbuf lib/libtacplus \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
${_cddl_lib_libavl} \
${_cddl_lib_libzfs_core} \
@@ -1403,6 +1403,10 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
_lib_libthr= lib/libthr
.endif
+.if ${MK_RADIUS_SUPPORT} != "no"
+_lib_libradius=lib/libradius
+.endif
+
.if ${MK_OFED} != "no"
_ofed_lib= contrib/ofed/usr.lib/
.endif
Modified: stable/9/etc/Makefile
==
--- stable/9/etc/Makefile Tue Mar 24 06:59:41 2015(r280420)
+++ stable/9/etc/Makefile Tue Mar 24 07:11:54 2015(r280421)
@@ -17,13 +17,11 @@ BIN1= crontab \
dhclient.conf \
disktab \
fbtab \
- ftpusers \
gettytab \
group \
hosts \
hosts.allow \
hosts.equiv \
- inetd.conf \
libalias.conf \
libmap.conf \
login.access \
@@ -93,6 +91,14 @@ BIN1+= snmpd.config
BIN1+= freebsd-update.conf
.endif
+.if ${MK_FTP} != "no"
+BIN1+= ftpusers
+.endif
+
+.if ${MK_INETD} != "no"
+BIN1+= inet
svn commit: r280420 - stable/10/etc
Author: ngie
Date: Tue Mar 24 06:59:41 2015
New Revision: 280420
URL: https://svnweb.freebsd.org/changeset/base/280420
Log:
Forced commit to note that the previous commit to this file included the
following MFC as well:
MFC 278251:
Honor the following flags for items that can be conditionalized out of the
build/install without disrupting other dependent services (see r278249, et
al):
- MK_LOCATE
- MK_MAN
- MK_NLS
- MK_OPENSSL
- MK_PKGBOOTSTRAP
- MK_SENDMAIL
Additional flags need to be handled in etc/Makefile, but it requires
refactoring the relevant scripts in etc/rc.d/*
MFC after: 3 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/etc/Makefile
Modified: stable/10/etc/Makefile
==
--- stable/10/etc/Makefile Tue Mar 24 06:55:08 2015(r280419)
+++ stable/10/etc/Makefile Tue Mar 24 06:59:41 2015(r280420)
@@ -52,7 +52,7 @@ BIN1= crontab \
shells \
sysctl.conf \
syslog.conf \
- termcap.small
+ termcap.small \
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
BIN1+= libmap32.conf
___
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"
