svn commit: r284996 - head/release
Author: gjb
Date: Wed Jul 1 08:48:49 2015
New Revision: 284996
URL: https://svnweb.freebsd.org/changeset/base/284996
Log:
Fix the gcloud port/package name.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.gce
Modified: head/release/Makefile.gce
==
--- head/release/Makefile.gce Wed Jul 1 08:06:15 2015(r284995)
+++ head/release/Makefile.gce Wed Jul 1 08:48:49 2015(r284996)
@@ -36,13 +36,13 @@ gce-check-depends:
. endif
.endfor
.if !exists(/usr/local/bin/gcutil)
-. if !exists(${PORTSDIR}/net/google-cloud-api/Makefile)
+. if !exists(${PORTSDIR}/net/google-cloud-sdk/Makefile)
. if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
. endif
- env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-api
+ env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
. else
- make -C ${PORTSDIR}/net/google-cloud-api BATCH=1 all install clean
+ make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
. endif
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r284997 - head/lib/libgpio
Author: brueffer Date: Wed Jul 1 09:25:23 2015 New Revision: 284997 URL: https://svnweb.freebsd.org/changeset/base/284997 Log: Make the example code actually work. PR: 199440 Submitted by: wait...@waitman.net Reviewed by: loos MFC after:1 week Modified: head/lib/libgpio/gpio.3 Modified: head/lib/libgpio/gpio.3 == --- head/lib/libgpio/gpio.3 Wed Jul 1 08:48:49 2015(r284996) +++ head/lib/libgpio/gpio.3 Wed Jul 1 09:25:23 2015(r284997) @@ -35,6 +35,7 @@ .Sh LIBRARY .Lb libgpio .Sh SYNOPSIS +.In sys/types.h .In libgpio.h .Ft "gpio_handle_t" .Fn gpio_open "unsigned int unit" @@ -161,13 +162,14 @@ are wrappers around The following example shows how to configure pin 16 as output and then drive it high: .Bd -literal +#include #include #include gpio_handle_t handle; handle = gpio_open(0); -if (handle == GPIO_HANDLE_INVALID) +if (handle == GPIO_INVALID_HANDLE) err(1, "gpio_open failed"); gpio_pin_output(handle, 16); gpio_pin_high(handle, 16); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r284829 - in head/release/doc: en_US.ISO8859-1/relnotes share/xml
On 25/06/2015 21:44, Glen Barber wrote: > Author: gjb > Date: Thu Jun 25 18:44:31 2015 > New Revision: 284829 > URL: https://svnweb.freebsd.org/changeset/base/284829 > > Log: > Document r284297, lockstat(1) improvements. > Add ClusterHQ to sponsors.ent. Glen, thank you very much. A couple of small suggestions / corrections below: > Sponsored by: The FreeBSD Foundation > > Modified: > head/release/doc/en_US.ISO8859-1/relnotes/article.xml > head/release/doc/share/xml/sponsor.ent > > Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml > == > --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 > 18:44:29 2015(r284828) > +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 > 18:44:31 2015(r284829) > @@ -345,6 +345,32 @@ > would cause final results to be sent to &man.stderr.4; when > receiving the SIGINFO signal has been > fixed. > + > + + sponsor="&clusterhq;">The &man.lockstat.1; utility has been > + updated with several improvements: > + > + > + > + Spin locks are now reported as the amount of time > + spinning, instead of loop iterations. > + > + > + > + Reader locks are now recognized as adaptive and can > + spin on &os;. Reader locks are now recognized as adaptive that can spin [contesting threads can both block/sleep and spin on the adaptive locks depending on a state of a current lock holder -- avg]. > + > + > + > + Lock aquisition events for successful reader try-lock > + events are now reported. > + > + > + > + Spin-and-block events that occur before lock > + acquisition are now reported. > + Spin and block events [two different kinds of events -- avg] are now reported before lock acquisition events [temporal order -- avg]. > + > > > > > Modified: head/release/doc/share/xml/sponsor.ent > == > --- head/release/doc/share/xml/sponsor.entThu Jun 25 18:44:29 2015 > (r284828) > +++ head/release/doc/share/xml/sponsor.entThu Jun 25 18:44:31 2015 > (r284829) > @@ -15,6 +15,8 @@ > > > > + > + > > > > -- Andriy Gapon ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r284829 - in head/release/doc: en_US.ISO8859-1/relnotes share/xml
Hi Andriy, On Wed, Jul 01, 2015 at 01:03:11PM +0300, Andriy Gapon wrote: > On 25/06/2015 21:44, Glen Barber wrote: > > Author: gjb > > Date: Thu Jun 25 18:44:31 2015 > > New Revision: 284829 > > URL: https://svnweb.freebsd.org/changeset/base/284829 > > > > Log: > > Document r284297, lockstat(1) improvements. > > Add ClusterHQ to sponsors.ent. > > Glen, > > thank you very much. > A couple of small suggestions / corrections below: > > > Sponsored by: The FreeBSD Foundation > > > > Modified: > > head/release/doc/en_US.ISO8859-1/relnotes/article.xml > > head/release/doc/share/xml/sponsor.ent > > > > Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml > > == > > --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 > > 18:44:29 2015(r284828) > > +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 > > 18:44:31 2015(r284829) > > @@ -345,6 +345,32 @@ > > would cause final results to be sent to &man.stderr.4; when > > receiving the SIGINFO signal has been > > fixed. > > + > > + > + sponsor="&clusterhq;">The &man.lockstat.1; utility has been > > + updated with several improvements: > > + > > + > > + > > + Spin locks are now reported as the amount of time > > + spinning, instead of loop iterations. > > + > > + > > + > > + Reader locks are now recognized as adaptive and can > > + spin on &os;. > > Reader locks are now recognized as adaptive that can spin [contesting threads > can both block/sleep and spin on the adaptive locks depending on a state of a > current lock holder -- avg]. > Thank you for reviewing the text. For my own clarification, the text within brackets should be included as correction/clarification, or is it just for further clarification for the context? Thanks. Glen > > + > > + > > + > > + Lock aquisition events for successful reader try-lock > > + events are now reported. > > + > > + > > + > > + Spin-and-block events that occur before lock > > + acquisition are now reported. > > + > > Spin and block events [two different kinds of events -- avg] are now reported > before lock acquisition events [temporal order -- avg]. > > > + > > > > > > > > > > Modified: head/release/doc/share/xml/sponsor.ent > > == > > --- head/release/doc/share/xml/sponsor.ent Thu Jun 25 18:44:29 2015 > > (r284828) > > +++ head/release/doc/share/xml/sponsor.ent Thu Jun 25 18:44:31 2015 > > (r284829) > > @@ -15,6 +15,8 @@ > > > > > > > > + > > + > > > > > > > > > > > -- > Andriy Gapon > pgpGW3e_GhNvH.pgp Description: PGP signature
svn commit: r285000 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Wed Jul 1 10:33:19 2015 New Revision: 285000 URL: https://svnweb.freebsd.org/changeset/base/285000 Log: Refine the lockstat(1) entry based on corrections and clarifications received during review. Submitted by: avg Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Jul 1 10:17:17 2015(r284999) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Jul 1 10:33:19 2015(r285000) @@ -353,7 +353,7 @@ - Reader locks are now recognized as adaptive and can + Reader locks are now recognized as adaptive that can spin on &os;. @@ -363,8 +363,8 @@ - Spin-and-block events that occur before lock - acquisition are now reported. + Spin and block events are now reported before lock + acquisition events. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285003 - head/lib/libproc
Author: br
Date: Wed Jul 1 13:59:26 2015
New Revision: 285003
URL: https://svnweb.freebsd.org/changeset/base/285003
Log:
Make libproc compilable on AArch64.
Modified:
head/lib/libproc/proc_bkpt.c
head/lib/libproc/proc_regs.c
Modified: head/lib/libproc/proc_bkpt.c
==
--- head/lib/libproc/proc_bkpt.cWed Jul 1 11:28:42 2015
(r285002)
+++ head/lib/libproc/proc_bkpt.cWed Jul 1 13:59:26 2015
(r285003)
@@ -42,18 +42,24 @@ __FBSDID("$FreeBSD$");
#include
#include "_libproc.h"
-#if defined(__i386__) || defined(__amd64__)
-#define BREAKPOINT_INSTR 0xcc/* int 0x3 */
+#if defined(__aarch64__)
+#defineAARCH64_BRK 0xd420
+#defineAARCH64_BRK_IMM16_SHIFT 5
+#defineAARCH64_BRK_IMM16_VAL (0xd << AARCH64_BRK_IMM16_SHIFT)
+#defineBREAKPOINT_INSTR(AARCH64_BRK | AARCH64_BRK_IMM16_VAL)
+#defineBREAKPOINT_INSTR_SZ 4
+#elif defined(__amd64__) || defined(__i386__)
+#defineBREAKPOINT_INSTR0xcc/* int 0x3 */
#defineBREAKPOINT_INSTR_SZ 1
+#elif defined(__arm__)
+#defineBREAKPOINT_INSTR0xe7ff /* bkpt */
+#defineBREAKPOINT_INSTR_SZ 4
#elif defined(__mips__)
-#define BREAKPOINT_INSTR 0xd /* break */
+#defineBREAKPOINT_INSTR0xd /* break */
#defineBREAKPOINT_INSTR_SZ 4
#elif defined(__powerpc__)
-#define BREAKPOINT_INSTR 0x7fe8 /* trap */
-#define BREAKPOINT_INSTR_SZ 4
-#elif defined(__arm__)
-#define BREAKPOINT_INSTR 0xe7ff /* bkpt */
-#define BREAKPOINT_INSTR_SZ4
+#defineBREAKPOINT_INSTR0x7fe8 /* trap */
+#defineBREAKPOINT_INSTR_SZ 4
#else
#error "Add support for your architecture"
#endif
Modified: head/lib/libproc/proc_regs.c
==
--- head/lib/libproc/proc_regs.cWed Jul 1 11:28:42 2015
(r285002)
+++ head/lib/libproc/proc_regs.cWed Jul 1 13:59:26 2015
(r285003)
@@ -54,7 +54,9 @@ proc_regget(struct proc_handle *phdl, pr
return (-1);
switch (reg) {
case REG_PC:
-#if defined(__amd64__)
+#if defined(__aarch64__)
+ *regvalue = regs.elr;
+#elif defined(__amd64__)
*regvalue = regs.r_rip;
#elif defined(__arm__)
*regvalue = regs.r_pc;
@@ -67,7 +69,9 @@ proc_regget(struct proc_handle *phdl, pr
#endif
break;
case REG_SP:
-#if defined(__amd64__)
+#if defined(__aarch64__)
+ *regvalue = regs.sp;
+#elif defined(__amd64__)
*regvalue = regs.r_rsp;
#elif defined(__arm__)
*regvalue = regs.r_sp;
@@ -101,7 +105,9 @@ proc_regset(struct proc_handle *phdl, pr
return (-1);
switch (reg) {
case REG_PC:
-#if defined(__amd64__)
+#if defined(__aarch64__)
+ regs.elr = regvalue;
+#elif defined(__amd64__)
regs.r_rip = regvalue;
#elif defined(__arm__)
regs.r_pc = regvalue;
@@ -114,7 +120,9 @@ proc_regset(struct proc_handle *phdl, pr
#endif
break;
case REG_SP:
-#if defined(__amd64__)
+#if defined(__aarch64__)
+ regs.sp = regvalue;
+#elif defined(__amd64__)
regs.r_rsp = regvalue;
#elif defined(__arm__)
regs.r_sp = regvalue;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285004 - head/sys/cddl/dev/fbt
Author: br
Date: Wed Jul 1 14:09:59 2015
New Revision: 285004
URL: https://svnweb.freebsd.org/changeset/base/285004
Log:
Add a central location for exclusion checks. We check
here if function is excluded from FBT instrumentation.
Reviewed by: andrew, emaste, markj
Differential Revision:https://reviews.freebsd.org/D2899
Modified:
head/sys/cddl/dev/fbt/fbt.c
head/sys/cddl/dev/fbt/fbt.h
Modified: head/sys/cddl/dev/fbt/fbt.c
==
--- head/sys/cddl/dev/fbt/fbt.c Wed Jul 1 13:59:26 2015(r285003)
+++ head/sys/cddl/dev/fbt/fbt.c Wed Jul 1 14:09:59 2015(r285004)
@@ -111,6 +111,37 @@ static struct cdev *fbt_cdev;
static int fbt_probetab_size;
static int fbt_verbose = 0;
+int
+fbt_excluded(const char *name)
+{
+
+ if (strncmp(name, "dtrace_", 7) == 0 &&
+ strncmp(name, "dtrace_safe_", 12) != 0) {
+ /*
+* Anything beginning with "dtrace_" may be called
+* from probe context unless it explicitly indicates
+* that it won't be called from probe context by
+* using the prefix "dtrace_safe_".
+*/
+ return (1);
+ }
+
+ /* Exclude some internal functions */
+ if (name[0] == '_' && name[1] == '_')
+ return (1);
+
+ /*
+* When DTrace is built into the kernel we need to exclude
+* the FBT functions from instrumentation.
+*/
+#ifndef _KLD_MODULE
+ if (strncmp(name, "fbt_", 4) == 0)
+ return (1);
+#endif
+
+ return (0);
+}
+
static void
fbt_doubletrap(void)
{
Modified: head/sys/cddl/dev/fbt/fbt.h
==
--- head/sys/cddl/dev/fbt/fbt.h Wed Jul 1 13:59:26 2015(r285003)
+++ head/sys/cddl/dev/fbt/fbt.h Wed Jul 1 14:09:59 2015(r285004)
@@ -58,6 +58,7 @@ int fbt_invop(uintptr_t, uintptr_t *, ui
void fbt_patch_tracepoint(fbt_probe_t *, fbt_patchval_t);
intfbt_provide_module_function(struct linker_file *, int,
struct linker_symval *, void *);
+intfbt_excluded(const char *name);
extern dtrace_provider_id_tfbt_id;
extern fbt_probe_t **fbt_probetab;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285005 - head/release
Author: gjb
Date: Wed Jul 1 14:51:26 2015
New Revision: 285005
URL: https://svnweb.freebsd.org/changeset/base/285005
Log:
Remove the HH-MM suffix from the build date suffix.
It was useful when working out several kinks when
testing automated image uploading when retrying was
necessary, but now it is making things much too messy.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.azure
head/release/Makefile.ec2
head/release/Makefile.gce
head/release/Makefile.vagrant
Modified: head/release/Makefile.azure
==
--- head/release/Makefile.azure Wed Jul 1 14:09:59 2015(r285004)
+++ head/release/Makefile.azure Wed Jul 1 14:51:26 2015(r285005)
@@ -17,7 +17,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZU
.endif
.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
-SNAPSHOT_DATE!=date +-%Y-%m-%d-%H-%M
+SNAPSHOT_DATE!=date +-%Y-%m-%d
.endif
AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd
Modified: head/release/Makefile.ec2
==
--- head/release/Makefile.ec2 Wed Jul 1 14:09:59 2015(r285004)
+++ head/release/Makefile.ec2 Wed Jul 1 14:51:26 2015(r285005)
@@ -6,7 +6,7 @@
#
.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} ==
"PRERELEASE"
-AMINAMESUFFIX!=date +-%Y-%m-%d-%H-%M
+AMINAMESUFFIX!=date +-%Y-%m-%d
.endif
.if defined(EC2PUBLIC)
PUBLISH= --public
Modified: head/release/Makefile.gce
==
--- head/release/Makefile.gce Wed Jul 1 14:09:59 2015(r285004)
+++ head/release/Makefile.gce Wed Jul 1 14:51:26 2015(r285005)
@@ -19,7 +19,7 @@ CLEANFILES+= ${GCE_UPLOAD_TGTS}
GCE_BUCKET?=
.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
-SNAPSHOT_DATE!=date +-%Y-%m-%d-%H-%M
+SNAPSHOT_DATE!=date +-%Y-%m-%d
.endif
# Really? Uppercase characters are not allowed? Sigh...
Modified: head/release/Makefile.vagrant
==
--- head/release/Makefile.vagrant Wed Jul 1 14:09:59 2015
(r285004)
+++ head/release/Makefile.vagrant Wed Jul 1 14:51:26 2015
(r285005)
@@ -18,7 +18,7 @@ ATLAS${VAR}:= ${VAGRANT${VAR}}
.endif
.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
-SNAPSHOT_DATE!=date +-%Y-%m-%d-%H-%M
+SNAPSHOT_DATE!=date +-%Y-%m-%d
.endif
VAGRANT_VERSION?= ${REVISION}-${BRANCH}${SNAPSHOT_DATE}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285006 - head/sys/dev/nand
Author: brueffer Date: Wed Jul 1 14:54:13 2015 New Revision: 285006 URL: https://svnweb.freebsd.org/changeset/base/285006 Log: Use the correct le*dec function to decode a 16bit type. PR: 194228 Submitted by: David Horwitt MFC after:2 weeks Modified: head/sys/dev/nand/nand_generic.c Modified: head/sys/dev/nand/nand_generic.c == --- head/sys/dev/nand/nand_generic.cWed Jul 1 14:51:26 2015 (r285005) +++ head/sys/dev/nand/nand_generic.cWed Jul 1 14:54:13 2015 (r285006) @@ -392,7 +392,7 @@ onfi_read_parameter(struct nand_chip *ch chip_params->blocks_per_lun = le32dec(¶ms.blocks_per_lun); chip_params->pages_per_block = le32dec(¶ms.pages_per_block); chip_params->bytes_per_page = le32dec(¶ms.bytes_per_page); - chip_params->spare_bytes_per_page = le32dec(¶ms.spare_bytes_per_page); + chip_params->spare_bytes_per_page = le16dec(¶ms.spare_bytes_per_page); chip_params->t_bers = le16dec(¶ms.t_bers); chip_params->t_prog = le16dec(¶ms.t_prog); chip_params->t_r = le16dec(¶ms.t_r); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285009 - in head: . cddl/contrib/opensolaris/lib/libdtrace/aarch64 cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib cddl/lib/libdtrace cddl/usr.sbin lib sys/arm64/arm64 sys/cddl/...
Author: br
Date: Wed Jul 1 15:51:11 2015
New Revision: 285009
URL: https://svnweb.freebsd.org/changeset/base/285009
Log:
First cut of DTrace for AArch64.
Reviewed by: andrew, emaste
Sponsored by: ARM Limited
Differential Revision:https://reviews.freebsd.org/D2738
Added:
head/cddl/contrib/opensolaris/lib/libdtrace/aarch64/
head/cddl/contrib/opensolaris/lib/libdtrace/aarch64/dt_isadep.c (contents,
props changed)
head/sys/cddl/contrib/opensolaris/uts/aarch64/
head/sys/cddl/contrib/opensolaris/uts/aarch64/dtrace/
head/sys/cddl/contrib/opensolaris/uts/aarch64/dtrace/fasttrap_isa.c
(contents, props changed)
head/sys/cddl/contrib/opensolaris/uts/aarch64/sys/
head/sys/cddl/contrib/opensolaris/uts/aarch64/sys/fasttrap_isa.h (contents,
props changed)
head/sys/cddl/dev/dtrace/aarch64/
head/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S (contents, props changed)
head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c (contents, props changed)
head/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c (contents, props changed)
head/sys/cddl/dev/dtrace/aarch64/regset.h (contents, props changed)
head/sys/cddl/dev/fbt/aarch64/
head/sys/cddl/dev/fbt/aarch64/fbt_isa.c (contents, props changed)
head/sys/cddl/dev/fbt/aarch64/fbt_isa.h (contents, props changed)
Modified:
head/Makefile.inc1
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
head/cddl/lib/Makefile
head/cddl/lib/libdtrace/Makefile
head/cddl/usr.sbin/Makefile
head/lib/Makefile
head/sys/arm64/arm64/exception.S
head/sys/arm64/arm64/trap.c
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
head/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
head/sys/cddl/dev/lockstat/lockstat.c
head/sys/cddl/dev/profile/profile.c
head/sys/conf/files.arm64
head/sys/modules/dtrace/Makefile
head/sys/modules/dtrace/dtraceall/dtraceall.c
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Wed Jul 1 15:04:54 2015(r285008)
+++ head/Makefile.inc1 Wed Jul 1 15:51:11 2015(r285009)
@@ -1766,9 +1766,9 @@ cddl/lib/libctf__L: lib/libz__L
.endif
# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built
# on select architectures though (see cddl/lib/Makefile)
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
- ${MACHINE_CPUARCH} == "arm"
+.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
+ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
_prebuild_libs+= lib/libproc lib/librtld_db
.endif
Added: head/cddl/contrib/opensolaris/lib/libdtrace/aarch64/dt_isadep.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/aarch64/dt_isadep.c Wed Jul
1 15:51:11 2015(r285009)
@@ -0,0 +1,139 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ * Copyright 2014 Howard Su
+ * Copyright 2015 George V. Neville-Neil
+ * Copyright 2015 Ruslan Bukin
+ */
+
+#pragma ident "%Z%%M% %I% %E% SMI"
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#if !defined(sun)
+#include
+#endif
+
+/*ARGSUSED*/
+int
+dt_pid_create_entry_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp,
+fasttrap_probe_spec_t *ftp, const GElf_Sym *symp)
+{
+
+ ftp->ftps_type = DTFTP_ENTRY;
+ ftp->ftps_pc = (uintptr_t)symp->st_value;
+ ftp->ftps_size = (size_t)symp->st_size;
+ ftp->ftps_noffs = 1;
+ ftp->ftps_offs[0] = 0;
+
+ if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+ dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+ strerror(errno));
+ return (dt_set_errno(dtp, errno));
+ }
+
+ return (1);
+}
+
+int
+
svn commit: r285010 - head
Author: brueffer Date: Wed Jul 1 15:54:13 2015 New Revision: 285010 URL: https://svnweb.freebsd.org/changeset/base/285010 Log: Add one more file missed in the BIND-removal entries. PR: 196515 Submitted by: Trond Endrestol MFC after:1 week Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Wed Jul 1 15:51:11 2015(r285009) +++ head/ObsoleteFiles.inc Wed Jul 1 15:54:13 2015(r285010) @@ -1020,6 +1020,7 @@ OLD_FILES+=usr/include/lwres/net.h OLD_FILES+=usr/include/lwres/netdb.h OLD_FILES+=usr/include/lwres/platform.h OLD_FILES+=usr/include/lwres/result.h +OLD_FILES+=usr/include/lwres/string.h OLD_FILES+=usr/include/lwres/version.h OLD_FILES+=usr/lib/liblwres.a OLD_FILES+=usr/lib/liblwres.so ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285011 - head/sys/amd64/amd64
Author: kib
Date: Wed Jul 1 16:37:03 2015
New Revision: 285011
URL: https://svnweb.freebsd.org/changeset/base/285011
Log:
Disallow a debugger on 64bit system to set fs/gs bases of the 32bit
process beyond the end of the process address space. Such setting is
not dangerous to the kernel integrity, but it causes confusing
application misbehaviour.
Sponsored by: The FreeBSD Foundation
MFC after:12 days
Modified:
head/sys/amd64/amd64/ptrace_machdep.c
Modified: head/sys/amd64/amd64/ptrace_machdep.c
==
--- head/sys/amd64/amd64/ptrace_machdep.c Wed Jul 1 15:54:13 2015
(r285010)
+++ head/sys/amd64/amd64/ptrace_machdep.c Wed Jul 1 16:37:03 2015
(r285011)
@@ -231,7 +231,7 @@ cpu_ptrace(struct thread *td, int req, v
error = copyin(addr, &rv, sizeof(rv));
if (error != 0)
break;
- if (rv >= VM_MAXUSER_ADDRESS) {
+ if (rv >= td->td_proc->p_sysent->sv_maxuser) {
error = EINVAL;
break;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285012 - head/lib/libgpio
Author: brueffer Date: Wed Jul 1 16:50:01 2015 New Revision: 285012 URL: https://svnweb.freebsd.org/changeset/base/285012 Log: Bump .Dd for the example code update. Submitted by: loos Modified: head/lib/libgpio/gpio.3 Modified: head/lib/libgpio/gpio.3 == --- head/lib/libgpio/gpio.3 Wed Jul 1 16:37:03 2015(r285011) +++ head/lib/libgpio/gpio.3 Wed Jul 1 16:50:01 2015(r285012) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 8, 2015 +.Dd July 1, 2015 .Dt GPIO 3 .Os .Sh NAME ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285014 - head/sys/arm64/arm64
Author: andrew
Date: Wed Jul 1 17:27:44 2015
New Revision: 285014
URL: https://svnweb.freebsd.org/changeset/base/285014
Log:
Fix the logic for when to restore the VFP registers. It should restore
them when a different thread last used them, or when the thread was last
run on a different cpu.
Obtained from:ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/arm64/arm64/vfp.c
Modified: head/sys/arm64/arm64/vfp.c
==
--- head/sys/arm64/arm64/vfp.c Wed Jul 1 17:19:51 2015(r285013)
+++ head/sys/arm64/arm64/vfp.c Wed Jul 1 17:27:44 2015(r285014)
@@ -95,6 +95,9 @@ vfp_save_state(struct thread *td)
*/
cpacr = READ_SPECIALREG(cpacr_el1);
if ((cpacr & CPACR_FPEN_MASK) == CPACR_FPEN_TRAP_NONE) {
+ KASSERT(PCPU_GET(fpcurthread) == td,
+ ("Storing an invalid VFP state"));
+
vfp_state = td->td_pcb->pcb_vfp;
__asm __volatile(
"mrs%0, fpcr\n"
@@ -142,7 +145,12 @@ vfp_restore_state(void)
vfp_enable();
- if (PCPU_GET(fpcurthread) != curthread && cpu != curpcb->pcb_vfpcpu) {
+ /*
+* If the previous thread on this cpu to use the VFP was not the
+* current threas, or the current thread last used it on a different
+* cpu we need to restore the old state.
+*/
+ if (PCPU_GET(fpcurthread) != curthread || cpu != curpcb->pcb_vfpcpu) {
vfp_state = curthread->td_pcb->pcb_vfp;
fpcr = curthread->td_pcb->pcb_fpcr;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r285012 - head/lib/libgpio
On Wed, Jul 1, 2015 at 1:50 PM, Christian Brueffer wrote: > Author: brueffer > Date: Wed Jul 1 16:50:01 2015 > New Revision: 285012 > URL: https://svnweb.freebsd.org/changeset/base/285012 > > Log: > Bump .Dd for the example code update. > > Submitted by: loos Thank you Chris! Luiz > > Modified: > head/lib/libgpio/gpio.3 > > Modified: head/lib/libgpio/gpio.3 > == > --- head/lib/libgpio/gpio.3 Wed Jul 1 16:37:03 2015(r285011) > +++ head/lib/libgpio/gpio.3 Wed Jul 1 16:50:01 2015(r285012) > @@ -25,7 +25,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd March 8, 2015 > +.Dd July 1, 2015 > .Dt GPIO 3 > .Os > .Sh NAME > ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r284959 - in head: . share/man/man4 share/man/man9 sys/conf sys/dev/glxsb sys/dev/hifn sys/dev/random sys/dev/rndtest sys/dev/safe sys/dev/syscons sys/dev/ubsec sys/dev/virtio/random s
Mark Murray wrote: > * src/sys/dev/random/random_adaptors.c src/sys/dev/random/random_adaptors.h > - Remove; plugability is no longer used. Compile-time algorithm > selection is the way to go. Errr we use that and need it. Please put it back. Whether we agree with NIST's ideas about how randomness should be handled or not, we need to to be able to comply and we do not want to burn their desired arrangement into our kernels. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285017 - head/sys/arm/allwinner
Author: loos
Date: Wed Jul 1 23:27:01 2015
New Revision: 285017
URL: https://svnweb.freebsd.org/changeset/base/285017
Log:
Add DMA support for Allwinner MMC controller.
DMA handles all data transfers up to 128K or 16 segments and fallback to
pio mode when DMA requirements are not met.
The read performance has improved greatly while the write performance also
showed some improvement but seems limited by the card type and quality.
Submitted by: Pratik Singhal
Sponsored by: Google Summer of Code 2015
Tested on:A10 (cubieboard) and A20 (cubieboard 2 and banana pi)
Modified:
head/sys/arm/allwinner/a10_mmc.c
head/sys/arm/allwinner/a10_mmc.h
Modified: head/sys/arm/allwinner/a10_mmc.c
==
--- head/sys/arm/allwinner/a10_mmc.cWed Jul 1 21:21:14 2015
(r285016)
+++ head/sys/arm/allwinner/a10_mmc.cWed Jul 1 23:27:01 2015
(r285017)
@@ -54,6 +54,13 @@ __FBSDID("$FreeBSD$");
#defineA10_MMC_MEMRES 0
#defineA10_MMC_IRQRES 1
#defineA10_MMC_RESSZ 2
+#defineA10_MMC_DMA_SEGS16
+#defineA10_MMC_DMA_MAX_SIZE0x2000
+#defineA10_MMC_DMA_FTRGLEVEL 0x20070008
+
+static int a10_mmc_pio_mode = 0;
+
+TUNABLE_INT("hw.a10.mmc.pio_mode", &a10_mmc_pio_mode);
struct a10_mmc_softc {
bus_space_handle_t a10_bsh;
@@ -71,6 +78,16 @@ struct a10_mmc_softc {
uint32_ta10_intr;
uint32_ta10_intr_wait;
void * a10_intrhand;
+
+ /* Fields required for DMA access. */
+ bus_addr_t a10_dma_desc_phys;
+ bus_dmamap_ta10_dma_map;
+ bus_dma_tag_t a10_dma_tag;
+ void * a10_dma_desc;
+ bus_dmamap_ta10_dma_buf_map;
+ bus_dma_tag_t a10_dma_buf_tag;
+ int a10_dma_inuse;
+ int a10_dma_map_err;
};
static struct resource_spec a10_mmc_res_spec[] = {
@@ -82,6 +99,7 @@ static struct resource_spec a10_mmc_res_
static int a10_mmc_probe(device_t);
static int a10_mmc_attach(device_t);
static int a10_mmc_detach(device_t);
+static int a10_mmc_setup_dma(struct a10_mmc_softc *);
static int a10_mmc_reset(struct a10_mmc_softc *);
static void a10_mmc_intr(void *);
static int a10_mmc_update_clock(struct a10_mmc_softc *);
@@ -166,6 +184,14 @@ a10_mmc_attach(device_t dev)
goto fail;
}
+ if (a10_mmc_pio_mode == 0 && a10_mmc_setup_dma(sc) != 0) {
+ device_printf(sc->a10_dev, "Couldn't setup DMA!\n");
+ a10_mmc_pio_mode = 1;
+ }
+ if (bootverbose)
+ device_printf(sc->a10_dev, "DMA status: %s\n",
+ a10_mmc_pio_mode ? "disabled" : "enabled");
+
sc->a10_host.f_min = 40;
sc->a10_host.f_max = 5200;
sc->a10_host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340;
@@ -201,6 +227,140 @@ a10_mmc_detach(device_t dev)
return (EBUSY);
}
+static void
+a10_dma_desc_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int err)
+{
+ struct a10_mmc_softc *sc;
+
+ sc = (struct a10_mmc_softc *)arg;
+ if (err) {
+ sc->a10_dma_map_err = err;
+ return;
+ }
+ sc->a10_dma_desc_phys = segs[0].ds_addr;
+}
+
+static int
+a10_mmc_setup_dma(struct a10_mmc_softc *sc)
+{
+ int dma_desc_size, error;
+
+ /* Allocate the DMA descriptor memory. */
+ dma_desc_size = sizeof(struct a10_mmc_dma_desc) * A10_MMC_DMA_SEGS;
+ error = bus_dma_tag_create(bus_get_dma_tag(sc->a10_dev), 1, 0,
+ BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
+ dma_desc_size, 1, dma_desc_size, 0, NULL, NULL, &sc->a10_dma_tag);
+ if (error)
+ return (error);
+ error = bus_dmamem_alloc(sc->a10_dma_tag, &sc->a10_dma_desc,
+ BUS_DMA_WAITOK | BUS_DMA_ZERO, &sc->a10_dma_map);
+ if (error)
+ return (error);
+
+ error = bus_dmamap_load(sc->a10_dma_tag, sc->a10_dma_map,
+ sc->a10_dma_desc, dma_desc_size, a10_dma_desc_cb, sc, 0);
+ if (error)
+ return (error);
+ if (sc->a10_dma_map_err)
+ return (sc->a10_dma_map_err);
+
+ /* Create the DMA map for data transfers. */
+ error = bus_dma_tag_create(bus_get_dma_tag(sc->a10_dev), 1, 0,
+ BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
+ A10_MMC_DMA_MAX_SIZE * A10_MMC_DMA_SEGS, A10_MMC_DMA_SEGS,
+ A10_MMC_DMA_MAX_SIZE, BUS_DMA_ALLOCNOW, NULL, NULL,
+ &sc->a10_dma_buf_tag);
+ if (error)
+ return (error);
+ error = bus_dmamap_create(sc->a10_dma_buf_tag, 0,
+ &sc->a10_dma_buf_map);
+ if (error)
+ return (error);
+
+ return (0);
+}
+
+static void
+a10_dma_cb(void *
svn commit: r285018 - head/release/tools
Author: gjb
Date: Thu Jul 2 02:13:20 2015
New Revision: 285018
URL: https://svnweb.freebsd.org/changeset/base/285018
Log:
Implement an evil workaround that prevents UFS/MSDOS labels from being
written to disk with newfs(8) and newfs_msdosfs(8).
When iterating through snapshot builds in serial, it is possible for
a build failure to leave stale md(4) devices behind, in some cases, they
could have a UFS or MSDOS filesystem label assigned.
If the md(4) is not destroyed (or not able to be destroyed, as has
happened recently due to my own fault), the filesystem label that
already exists can interfere with a new md(4) device that is targeted to
have the same label.
This behavior, although admittedly a logic error in the wrapper build
scripts, has caused intermittent reports (in particular with the armv6
builds) of missing UFS/MSDOSFS labels, causing the image to fallback to
the mountroot prompt. This appears to only happen when the backing
md(4) device is destroyed before the calling umount(8) on the target
mount, after which the UFS/MSDOSFS label persists.
The workaround is this: If EVERYTHINGISFINE is set to non-empty value,
check for an existing ufs/rootfs and msdosfs/MSDOSBOOT filesystem label
in arm_create_disk(), and rm(1) them if they exist.
The EVERYTHINGISFINE variable is chosen because it is used in exactly
one other place - release/Makefile.mirrors - and there are big scary
warnings at the top of that file as well that it should *not* be used
under normal circumstances. This should not destroy a build machine
that also uses '/dev/ufs/rootfs' as the UFS label, and I have verified
in extensive local testing that the destroyed label is recreated when
the md(4) is unmounted/mounted, but this really should not be enabled
by anyone.
Having said all that, I absolutely *do* plan MFC this to stable/10 for
the 10.2-RELEASE cycle, as so far, I have only observed this behavior
on stable/10, but this is a temporary solution until I can unravel all
of the failure paths to properly trap them.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/arm.subr
Modified: head/release/tools/arm.subr
==
--- head/release/tools/arm.subr Wed Jul 1 23:27:01 2015(r285017)
+++ head/release/tools/arm.subr Thu Jul 2 02:13:20 2015(r285018)
@@ -63,6 +63,18 @@ umount_loop() {
}
arm_create_disk() {
+ # XXX: This is potentially dangerous, but works around an issue
+ # properly labeling md(4) devices when the label already
+ # exists.
+ # EVERYTHINGISFINE should *never* be set for non-RE use.
+ # Trust me. I'm an engineer.
+ if [ ! -z "${EVERYTHINGISFINE}" ]; then
+ for _label in ufs/rootfs msdosfs/MSDOSBOOT; do
+ if [ -e "${CHROOTDIR}/dev/${_label}" ]; then
+ rm ${CHROOTDIR}/dev/${_label}
+ fi
+ done
+ fi
# Create the target raw file and temporary work directory.
chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev}
chroot ${CHROOTDIR} gpart add -t '!12' -a 63 -s ${FAT_SIZE} ${mddev}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r285019 - head/release/tools
Author: gjb
Date: Thu Jul 2 02:33:58 2015
New Revision: 285019
URL: https://svnweb.freebsd.org/changeset/base/285019
Log:
Fix the path to the UFS/MSDOSFS filesystem labels, since they
cannot possibly exist within the chroot(8) before the target
filesystem actually exists.
MFC after:3 days
X-MFC-With: r285018
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/arm.subr
Modified: head/release/tools/arm.subr
==
--- head/release/tools/arm.subr Thu Jul 2 02:13:20 2015(r285018)
+++ head/release/tools/arm.subr Thu Jul 2 02:33:58 2015(r285019)
@@ -70,8 +70,8 @@ arm_create_disk() {
# Trust me. I'm an engineer.
if [ ! -z "${EVERYTHINGISFINE}" ]; then
for _label in ufs/rootfs msdosfs/MSDOSBOOT; do
- if [ -e "${CHROOTDIR}/dev/${_label}" ]; then
- rm ${CHROOTDIR}/dev/${_label}
+ if [ -e "/dev/${_label}" ]; then
+ rm /dev/${_label}
fi
done
fi
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r284959 - in head: . share/man/man4 share/man/man9 sys/conf sys/dev/glxsb sys/dev/hifn sys/dev/random sys/dev/rndtest sys/dev/safe sys/dev/syscons sys/dev/ubsec sys/dev/virtio/random s
> On 2 Jul 2015, at 00:07, Simon J. Gerraty wrote: > > Mark Murray wrote: >> * src/sys/dev/random/random_adaptors.c src/sys/dev/random/random_adaptors.h >> - Remove; plugability is no longer used. Compile-time algorithm >>selection is the way to go. > > Errr we use that and need it. > Please put it back. Do you really need full the plugability (including run-time selection of algorithm), or do you just need to have KLD modules back? I intend to do the latter, but in a different way. The adaptor code and run-time section was a locking liability. > Whether we agree with NIST's ideas about how randomness should be > handled or not, we need to to be able to comply and we do not want to > burn their desired arrangement into our kernels. Sound like you just need to be able to select a single KLD at boot time? M -- Mark R V Murray ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
