svn commit: r349552 - in head/sys: amd64/amd64 arm/arm arm64/arm64 i386/i386 mips/mips riscv/riscv
Author: np
Date: Sun Jun 30 03:14:04 2019
New Revision: 349552
URL: https://svnweb.freebsd.org/changeset/base/349552
Log:
Display the approximate space needed when a minidump fails due to lack
of space.
Reviewed by: kib@
MFC after:2 weeks
Sponsored by: Chelsio Communications
Differential Revision:https://reviews.freebsd.org/D20801
Modified:
head/sys/amd64/amd64/minidump_machdep.c
head/sys/arm/arm/minidump_machdep.c
head/sys/arm64/arm64/minidump_machdep.c
head/sys/i386/i386/minidump_machdep_base.c
head/sys/mips/mips/minidump_machdep.c
head/sys/riscv/riscv/minidump_machdep.c
Modified: head/sys/amd64/amd64/minidump_machdep.c
==
--- head/sys/amd64/amd64/minidump_machdep.c Sun Jun 30 02:29:12 2019
(r349551)
+++ head/sys/amd64/amd64/minidump_machdep.c Sun Jun 30 03:14:04 2019
(r349552)
@@ -448,9 +448,10 @@ minidumpsys(struct dumperinfo *di)
}
else if (error == ECANCELED)
printf("Dump aborted\n");
- else if (error == E2BIG)
- printf("Dump failed. Partition too small.\n");
- else
+ else if (error == E2BIG) {
+ printf("Dump failed. Partition too small (about %lluMB were "
+ "needed this time).\n", (long long)dumpsize >> 20);
+ } else
printf("** DUMP FAILED (ERROR %d) **\n", error);
return (error);
}
Modified: head/sys/arm/arm/minidump_machdep.c
==
--- head/sys/arm/arm/minidump_machdep.c Sun Jun 30 02:29:12 2019
(r349551)
+++ head/sys/arm/arm/minidump_machdep.c Sun Jun 30 03:14:04 2019
(r349552)
@@ -340,9 +340,10 @@ fail:
if (error == ECANCELED)
printf("\nDump aborted\n");
- else if (error == E2BIG || error == ENOSPC)
- printf("\nDump failed. Partition too small.\n");
- else
+ else if (error == E2BIG || error == ENOSPC) {
+ printf("\nDump failed. Partition too small (about %lluMB were "
+ "needed this time).\n", (long long)dumpsize >> 20);
+ } else
printf("\n** DUMP FAILED (ERROR %d) **\n", error);
return (error);
}
Modified: head/sys/arm64/arm64/minidump_machdep.c
==
--- head/sys/arm64/arm64/minidump_machdep.c Sun Jun 30 02:29:12 2019
(r349551)
+++ head/sys/arm64/arm64/minidump_machdep.c Sun Jun 30 03:14:04 2019
(r349552)
@@ -414,9 +414,10 @@ fail:
}
else if (error == ECANCELED)
printf("Dump aborted\n");
- else if (error == E2BIG)
- printf("Dump failed. Partition too small.\n");
- else
+ else if (error == E2BIG) {
+ printf("Dump failed. Partition too small (about %lluMB were "
+ "needed this time).\n", (long long)dumpsize >> 20);
+ } else
printf("** DUMP FAILED (ERROR %d) **\n", error);
return (error);
}
Modified: head/sys/i386/i386/minidump_machdep_base.c
==
--- head/sys/i386/i386/minidump_machdep_base.c Sun Jun 30 02:29:12 2019
(r349551)
+++ head/sys/i386/i386/minidump_machdep_base.c Sun Jun 30 03:14:04 2019
(r349552)
@@ -348,9 +348,10 @@ minidumpsys(struct dumperinfo *di)
if (error == ECANCELED)
printf("\nDump aborted\n");
- else if (error == E2BIG || error == ENOSPC)
- printf("\nDump failed. Partition too small.\n");
- else
+ else if (error == E2BIG || error == ENOSPC) {
+ printf("\nDump failed. Partition too small (about %lluMB were "
+ "needed this time).\n", (long long)dumpsize >> 20);
+ } else
printf("\n** DUMP FAILED (ERROR %d) **\n", error);
return (error);
}
Modified: head/sys/mips/mips/minidump_machdep.c
==
--- head/sys/mips/mips/minidump_machdep.c Sun Jun 30 02:29:12 2019
(r349551)
+++ head/sys/mips/mips/minidump_machdep.c Sun Jun 30 03:14:04 2019
(r349552)
@@ -348,9 +348,10 @@ fail:
if (error == ECANCELED)
printf("\nDump aborted\n");
- else if (error == E2BIG || error == ENOSPC)
- printf("\nDump failed. Partition too small.\n");
- else
+ else if (error == E2BIG || error == ENOSPC) {
+ printf("\nDump failed. Partition too small (about %lluMB were "
+ "needed this time).\n", (long long)dumpsize >> 20);
+ } else
printf("\n** DUMP FAILED (ERROR %d) **\n", error);
return (error);
}
Modified: head/sys/riscv/riscv/minidump_machdep.c
===
svn commit: r349551 - in head/tools/bus_space: Python examples
Author: marcel
Date: Sun Jun 30 02:29:12 2019
New Revision: 349551
URL: https://svnweb.freebsd.org/changeset/base/349551
Log:
Add support for Python 3 and make it the default.
Python 2.7 will retire on Januari 1, 2020.
Modified:
head/tools/bus_space/Python/Makefile
head/tools/bus_space/Python/lang.c
head/tools/bus_space/examples/am79c900_diag.py
Modified: head/tools/bus_space/Python/Makefile
==
--- head/tools/bus_space/Python/MakefileSun Jun 30 02:08:13 2019
(r349550)
+++ head/tools/bus_space/Python/MakefileSun Jun 30 02:29:12 2019
(r349551)
@@ -3,7 +3,11 @@
SHLIB_NAME=bus.so
SRCS= lang.c
-CFLAGS+= -I${.CURDIR}/.. -I/usr/local/include/python2.7
-LDFLAGS+= -L/usr/local/lib -lpython2.7
+# Set PYTHON to the version to compile against.
+# E.g. "python2.7", "python3.6", etc...
+PYTHON=python3.6m
+
+CFLAGS+= -I${.CURDIR}/.. -I/usr/local/include/${PYTHON}
+LDFLAGS+= -L/usr/local/lib -l${PYTHON}
.include
Modified: head/tools/bus_space/Python/lang.c
==
--- head/tools/bus_space/Python/lang.c Sun Jun 30 02:08:13 2019
(r349550)
+++ head/tools/bus_space/Python/lang.c Sun Jun 30 02:29:12 2019
(r349551)
@@ -412,6 +412,12 @@ busdma_sync_range(PyObject *self, PyObject *args)
Py_RETURN_NONE;
}
+/*
+ * Module methods and initialization.
+ */
+
+static char bus_docstr[] = "Access to H/W bus memory and register areas.";
+
static PyMethodDef bus_methods[] = {
{ "read_1", bus_read_1, METH_VARARGS, "Read a 1-byte data item." },
{ "read_2", bus_read_2, METH_VARARGS, "Read a 2-byte data item." },
@@ -431,6 +437,9 @@ static PyMethodDef bus_methods[] = {
{ NULL, NULL, 0, NULL }
};
+static char busdma_docstr[] = "A bus- and device-independent interface"
+" to Direct Memory Access (DMA) mechanisms.";
+
static PyMethodDef busdma_methods[] = {
{ "tag_create", busdma_tag_create, METH_VARARGS,
"Create a root tag." },
@@ -470,18 +479,12 @@ static PyMethodDef busdma_methods[] = {
{ NULL, NULL, 0, NULL }
};
-PyMODINIT_FUNC
-initbus(void)
+static PyObject *
+module_initialize(PyObject *bus, PyObject *busdma)
{
- PyObject *bus, *busdma;
- bus = Py_InitModule("bus", bus_methods);
- if (bus == NULL)
- return;
- busdma = Py_InitModule("busdma", busdma_methods);
- if (busdma == NULL)
- return;
- PyModule_AddObject(bus, "dma", busdma);
+ if (bus == NULL || busdma == NULL)
+ return (NULL);
PyModule_AddObject(busdma, "MD_BUS_SPACE", Py_BuildValue("i", 0));
PyModule_AddObject(busdma, "MD_PHYS_SPACE", Py_BuildValue("i", 1));
@@ -491,4 +494,49 @@ initbus(void)
PyModule_AddObject(busdma, "SYNC_POSTREAD", Py_BuildValue("i", 2));
PyModule_AddObject(busdma, "SYNC_PREWRITE", Py_BuildValue("i", 4));
PyModule_AddObject(busdma, "SYNC_POSTWRITE", Py_BuildValue("i", 8));
+
+ PyModule_AddObject(bus, "dma", busdma);
+ return (bus);
}
+
+#if PY_MAJOR_VERSION >= 3
+
+static struct PyModuleDef bus_module = {
+ PyModuleDef_HEAD_INIT,
+ "bus",
+ bus_docstr,
+-1,
+ bus_methods,
+};
+
+static struct PyModuleDef busdma_module = {
+ PyModuleDef_HEAD_INIT,
+ "busdma",
+ busdma_docstr,
+-1,
+ busdma_methods,
+};
+
+PyMODINIT_FUNC
+PyInit_bus(void)
+{
+ PyObject *bus, *busdma;
+
+ bus = PyModule_Create(&bus_module);
+ busdma = PyModule_Create(&busdma_module);
+ return (module_initialize(bus, busdma));
+}
+
+#else /* PY_MAJOR_VERSION >= 3 */
+
+PyMODINIT_FUNC
+initbus(void)
+{
+ PyObject *bus, *busdma;
+
+ bus = Py_InitModule3("bus", bus_methods, bus_docstr);
+ busdma = Py_InitModule3("busdma", busdma_methods, busdma_docstr);
+ (void)module_initialize(bus, busdma);
+}
+
+#endif /* PY_MAJOR_VERSION >= 3 */
Modified: head/tools/bus_space/examples/am79c900_diag.py
==
--- head/tools/bus_space/examples/am79c900_diag.py Sun Jun 30 02:08:13
2019(r349550)
+++ head/tools/bus_space/examples/am79c900_diag.py Sun Jun 30 02:29:12
2019(r349551)
@@ -54,7 +54,7 @@ import time
sys.path.append('/usr/lib')
import bus
-import busdma
+from bus import dma as busdma
# ILACC initialization block definition
@@ -161,7 +161,7 @@ def ip_str(a):
def mac_is(l, r):
-for i in xrange(6):
+for i in range(6):
if l[i] != r[i]:
return False
return True
@@ -203,7 +203,7 @@ def stop():
mac = ()
bcast = ()
-for o in xrange(6):
+for o in range(6):
mac += (bus.read_1(io, o),)
bcast += (0xff,)
logging.info('ethernet address = ' + MACFMT % mac)
@@ -237,23 +237,23 @@ addr_txbufs = addr_rxbufs + bufsize * nrxbu
svn commit: r349550 - head/sys/vm
Author: dougm
Date: Sun Jun 30 02:08:13 2019
New Revision: 349550
URL: https://svnweb.freebsd.org/changeset/base/349550
Log:
Remove a call to vm_map_simplify_entry from _vm_map_clip_start.
Recent changes to vm_map_protect have made it unnecessary.
Reviewed by: alc
Approved by: kib (mentor)
Tested by: pho
Differential Revision: https://reviews.freebsd.org/D20633
Modified:
head/sys/vm/vm_map.c
Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.cSat Jun 29 18:41:40 2019(r349549)
+++ head/sys/vm/vm_map.cSun Jun 30 02:08:13 2019(r349550)
@@ -2186,7 +2186,6 @@ _vm_map_clip_start(vm_map_t map, vm_map_entry_t entry,
VM_MAP_ASSERT_LOCKED(map);
KASSERT(entry->end > start && entry->start < start,
("_vm_map_clip_start: invalid clip of entry %p", entry));
- vm_map_simplify_entry(map, entry);
/*
* Create a backing object now, if none exists, so that more individual
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r349549 - in head: contrib/less usr.bin/less
Author: delphij Date: Sat Jun 29 18:41:40 2019 New Revision: 349549 URL: https://svnweb.freebsd.org/changeset/base/349549 Log: MFV r349535: less v551. MFC after:2 weeks Relnotes: yes Modified: head/contrib/less/LICENSE head/contrib/less/NEWS head/contrib/less/README head/contrib/less/brac.c head/contrib/less/ch.c head/contrib/less/charset.c head/contrib/less/charset.h head/contrib/less/cmd.h head/contrib/less/cmdbuf.c head/contrib/less/command.c head/contrib/less/compose.uni head/contrib/less/cvt.c head/contrib/less/decode.c head/contrib/less/edit.c head/contrib/less/filename.c head/contrib/less/fmt.uni head/contrib/less/forwback.c head/contrib/less/funcs.h head/contrib/less/help.c head/contrib/less/ifile.c head/contrib/less/input.c head/contrib/less/jump.c head/contrib/less/less.h head/contrib/less/less.hlp head/contrib/less/less.nro head/contrib/less/lessecho.c head/contrib/less/lessecho.nro head/contrib/less/lesskey.c head/contrib/less/lesskey.h head/contrib/less/lesskey.nro head/contrib/less/lglob.h head/contrib/less/line.c head/contrib/less/linenum.c head/contrib/less/lsystem.c head/contrib/less/main.c head/contrib/less/mark.c head/contrib/less/mkutable head/contrib/less/optfunc.c head/contrib/less/option.c head/contrib/less/option.h head/contrib/less/opttbl.c head/contrib/less/os.c head/contrib/less/output.c head/contrib/less/pattern.c head/contrib/less/pattern.h head/contrib/less/pckeys.h head/contrib/less/position.c head/contrib/less/position.h head/contrib/less/prompt.c head/contrib/less/screen.c head/contrib/less/scrsize.c head/contrib/less/search.c head/contrib/less/signal.c head/contrib/less/tags.c head/contrib/less/ttyin.c head/contrib/less/ubin.uni head/contrib/less/version.c head/contrib/less/wide.uni head/usr.bin/less/defines.h Directory Properties: head/contrib/less/ (props changed) Modified: head/contrib/less/LICENSE == --- head/contrib/less/LICENSE Sat Jun 29 17:01:56 2019(r349548) +++ head/contrib/less/LICENSE Sat Jun 29 18:41:40 2019(r349549) @@ -2,7 +2,7 @@ Less -Copyright (C) 1984-2016 Mark Nudelman +Copyright (C) 1984-2018 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: head/contrib/less/NEWS == --- head/contrib/less/NEWS Sat Jun 29 17:01:56 2019(r349548) +++ head/contrib/less/NEWS Sat Jun 29 18:41:40 2019(r349549) @@ -11,6 +11,38 @@ == + Major changes between "less" versions 530 and 551 + +* Add --mouse option. + +* Add --wheel-lines option. + +* Add --no-histdups option. + +* Add --save-marks option. + +* Support PCRE2 regular expression library. + +* Redraw screen on SIGWINCH even if screen size doesn't change. + +* Shell-escape filenames in history so they can be used again. + +* Ring bell if user enters invalid long option name. + +* Use PCRE_UTF8 flag for pcre regular expressions when in UTF-8 mode. + +* Windows: use wide-char string to set console title. + +* Don't count lines in initial screen if using -X with -F. + +* Support mingw build system. + +* Fix bug in v command on empty file. + +* Fix bug in v command when filename contains shell metacharacters. + +== + Major changes between "less" versions 487 and 530 * Don't output terminal init sequence if using -F and file fits on one screen. Modified: head/contrib/less/README == --- head/contrib/less/READMESat Jun 29 17:01:56 2019(r349548) +++ head/contrib/less/READMESat Jun 29 18:41:40 2019(r349549) @@ -7,9 +7,9 @@ ** ** -Less, version 530 +Less, version 551 -This is the distribution of less, version 530, released 05 Dec 2017. +This is the distribution of less, version 551, released 11 Jun 2019. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or @@ -56,6 +56,7 @@ INSTALLATION (Unix systems only): finds a regular expression library automatically. Other values are: gnuUse the GNU regex library. pcre Use the PCRE library. +pcre2 Use the PCRE2 library. posix Use the POSIX-compatible regcomp. regcmp
svn commit: r349548 - head
Author: tijl
Date: Sat Jun 29 17:01:56 2019
New Revision: 349548
URL: https://svnweb.freebsd.org/changeset/base/349548
Log:
Build lib32 libl. The library is built from usr.bin/lex/lib. It would be
better to move this directory to lib/libl, but this requires more extensive
changes to Makefile.inc1. This simple fix can be MFCed quickly.
PR: 238874
Reviewed by: imp
MFC after:3 days
Modified:
head/Makefile.libcompat
Modified: head/Makefile.libcompat
==
--- head/Makefile.libcompat Sat Jun 29 16:11:09 2019(r349547)
+++ head/Makefile.libcompat Sat Jun 29 17:01:56 2019(r349548)
@@ -136,6 +136,7 @@ LIBCOMPATIMAKE+=${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=
_LC_LIBDIRS.yes= lib
_LC_LIBDIRS.yes+= gnu/lib
+_LC_LIBDIRS.yes+= usr.bin/lex/lib
_LC_LIBDIRS.${MK_CDDL:tl}+=cddl/lib
_LC_LIBDIRS.${MK_CRYPT:tl}+= secure/lib
_LC_LIBDIRS.${MK_KERBEROS:tl}+=kerberos5/lib
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r349547 - head/sys/kern
Author: markj Date: Sat Jun 29 16:11:09 2019 New Revision: 349547 URL: https://svnweb.freebsd.org/changeset/base/349547 Log: Use a consistent snapshot of the fd's rights in fget_mmap(). fget_mmap() translates rights on the descriptor to a VM protection mask. It was doing so without holding any locks on the descriptor table, so a writer could simultaneously be modifying those rights. Such a situation would be detected using a sequence counter, but not before an inconsistency could trigger assertion failures in the capability code. Fix the problem by copying the fd's rights to a structure on the stack, and perform the translation only once we know that that snapshot is consistent. Reported by: syzbot+ae359438769fda184...@syzkaller.appspotmail.com Reviewed by: brooks, mjg MFC after:1 week Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D20800 Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c == --- head/sys/kern/kern_descrip.cSat Jun 29 16:05:52 2019 (r349546) +++ head/sys/kern/kern_descrip.cSat Jun 29 16:11:09 2019 (r349547) @@ -2761,6 +2761,7 @@ fget_mmap(struct thread *td, int fd, cap_rights_t *rig if (maxprotp != NULL) *maxprotp = VM_PROT_ALL; #else + cap_rights_t fdrights; struct filedesc *fdp = td->td_proc->p_fd; seqc_t seq; @@ -2769,15 +2770,18 @@ fget_mmap(struct thread *td, int fd, cap_rights_t *rig error = _fget(td, fd, fpp, 0, rightsp, &seq); if (error != 0) return (error); - /* -* If requested, convert capability rights to access flags. -*/ if (maxprotp != NULL) - *maxprotp = cap_rights_to_vmprot(cap_rights(fdp, fd)); + fdrights = *cap_rights(fdp, fd); if (!fd_modified(fdp, fd, seq)) break; fdrop(*fpp, td); } + + /* +* If requested, convert capability rights to access flags. +*/ + if (maxprotp != NULL) + *maxprotp = cap_rights_to_vmprot(&fdrights); #endif return (error); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r349546 - head/sys/kern
Author: markj
Date: Sat Jun 29 16:05:52 2019
New Revision: 349546
URL: https://svnweb.freebsd.org/changeset/base/349546
Log:
Fix mutual exclusion in pipe_direct_write().
We use PIPE_DIRECTW as a semaphore for direct writes to a pipe, where
the reader copies data directly from pages mapped into the writer.
However, when a reader finishes such a copy, it previously cleared
PIPE_DIRECTW, allowing multiple writers to race and corrupt the state
used to track wired pages belonging to the writer.
Fix this by having the writer clear PIPE_DIRECTW and instead use the
count of unread bytes to determine whether a write is finished.
Reported by: syzbot+21811cc0a89b2a87a...@syzkaller.appspotmail.com
Reviewed by: kib, mjg
Tested by:pho
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D20784
Modified:
head/sys/kern/sys_pipe.c
Modified: head/sys/kern/sys_pipe.c
==
--- head/sys/kern/sys_pipe.cSat Jun 29 15:28:36 2019(r349545)
+++ head/sys/kern/sys_pipe.cSat Jun 29 16:05:52 2019(r349546)
@@ -724,7 +724,7 @@ pipe_read(struct file *fp, struct uio *uio, struct ucr
rpipe->pipe_map.pos += size;
rpipe->pipe_map.cnt -= size;
if (rpipe->pipe_map.cnt == 0) {
- rpipe->pipe_state &= ~(PIPE_DIRECTW|PIPE_WANTW);
+ rpipe->pipe_state &= ~PIPE_WANTW;
wakeup(rpipe);
}
#endif
@@ -855,13 +855,17 @@ pipe_build_write_buffer(struct pipe *wpipe, struct uio
}
/*
- * unmap and unwire the process buffer
+ * Unwire the process buffer.
*/
static void
pipe_destroy_write_buffer(struct pipe *wpipe)
{
PIPE_LOCK_ASSERT(wpipe, MA_OWNED);
+ KASSERT((wpipe->pipe_state & PIPE_DIRECTW) != 0,
+ ("%s: PIPE_DIRECTW not set on %p", __func__, wpipe));
+
+ wpipe->pipe_state &= ~PIPE_DIRECTW;
vm_page_unhold_pages(wpipe->pipe_map.ms, wpipe->pipe_map.npages);
wpipe->pipe_map.npages = 0;
}
@@ -880,13 +884,15 @@ pipe_clone_write_buffer(struct pipe *wpipe)
int pos;
PIPE_LOCK_ASSERT(wpipe, MA_OWNED);
+ KASSERT((wpipe->pipe_state & PIPE_DIRECTW) != 0,
+ ("%s: PIPE_DIRECTW not set on %p", __func__, wpipe));
+
size = wpipe->pipe_map.cnt;
pos = wpipe->pipe_map.pos;
wpipe->pipe_buffer.in = size;
wpipe->pipe_buffer.out = 0;
wpipe->pipe_buffer.cnt = size;
- wpipe->pipe_state &= ~PIPE_DIRECTW;
PIPE_UNLOCK(wpipe);
iov.iov_base = wpipe->pipe_buffer.buffer;
@@ -925,7 +931,7 @@ retry:
pipeunlock(wpipe);
goto error1;
}
- while (wpipe->pipe_state & PIPE_DIRECTW) {
+ if (wpipe->pipe_state & PIPE_DIRECTW) {
if (wpipe->pipe_state & PIPE_WANTR) {
wpipe->pipe_state &= ~PIPE_WANTR;
wakeup(wpipe);
@@ -968,8 +974,7 @@ retry:
goto error1;
}
- error = 0;
- while (!error && (wpipe->pipe_state & PIPE_DIRECTW)) {
+ while (wpipe->pipe_map.cnt != 0) {
if (wpipe->pipe_state & PIPE_EOF) {
pipe_destroy_write_buffer(wpipe);
pipeselwakeup(wpipe);
@@ -987,20 +992,19 @@ retry:
error = msleep(wpipe, PIPE_MTX(wpipe), PRIBIO | PCATCH,
"pipdwt", 0);
pipelock(wpipe, 0);
+ if (error != 0)
+ break;
}
if (wpipe->pipe_state & PIPE_EOF)
error = EPIPE;
- if (wpipe->pipe_state & PIPE_DIRECTW) {
- /*
-* this bit of trickery substitutes a kernel buffer for
-* the process that might be going away.
-*/
+ if (error == EINTR || error == ERESTART)
pipe_clone_write_buffer(wpipe);
- } else {
+ else
pipe_destroy_write_buffer(wpipe);
- }
pipeunlock(wpipe);
+ KASSERT((wpipe->pipe_state & PIPE_DIRECTW) == 0,
+ ("pipe %p leaked PIPE_DIRECTW", wpipe));
return (error);
error1:
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r349545 - vendor/elftoolchain/elftoolchain-r3769
Author: emaste Date: Sat Jun 29 15:28:36 2019 New Revision: 349545 URL: https://svnweb.freebsd.org/changeset/base/349545 Log: Tag ELF Tool Chain r3769 Added: vendor/elftoolchain/elftoolchain-r3769/ - copied from r349544, vendor/elftoolchain/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r349544 - in vendor/elftoolchain/dist: . addr2line common documentation/libelf-by-example elfcopy elfdump libdwarf libelf libelftc mk nm readelf test/ar/tc/add-nonexistent/out test/libe...
Author: emaste Date: Sat Jun 29 15:27:18 2019 New Revision: 349544 URL: https://svnweb.freebsd.org/changeset/base/349544 Log: Import ELF Tool Chain snapshot at r3769 From https://svn.code.sf.net/p/elftoolchain/code/ Added: vendor/elftoolchain/dist/.cirrus.yml vendor/elftoolchain/dist/libelf/os.Linux.mk (contents, props changed) vendor/elftoolchain/dist/test/ar/tc/add-nonexistent/out/archive.a (contents, props changed) vendor/elftoolchain/dist/test/libelf/tset/common/ehdr-malformed-1.yaml vendor/elftoolchain/dist/test/libelf/tset/elf_begin/entry-too-large.ar (contents, props changed) vendor/elftoolchain/dist/test/libelf/tset/elf_rand/ vendor/elftoolchain/dist/test/libelf/tset/elf_rand/Makefile (contents, props changed) vendor/elftoolchain/dist/test/libelf/tset/elf_rand/empty-file.ar (contents, props changed) vendor/elftoolchain/dist/test/libelf/tset/elf_rand/missing-file.ar (contents, props changed) vendor/elftoolchain/dist/test/libelf/tset/elf_rand/rand.m4 vendor/elftoolchain/dist/test/libtest/driver/driver.c (contents, props changed) vendor/elftoolchain/dist/test/libtest/driver/driver.h (contents, props changed) vendor/elftoolchain/dist/test/libtest/driver/driver_main.c (contents, props changed) vendor/elftoolchain/dist/test/libtest/driver/test_driver.1 (contents, props changed) vendor/elftoolchain/dist/test/libtest/lib/test_case.h (contents, props changed) Deleted: vendor/elftoolchain/dist/test/libtest/driver/test_main.c vendor/elftoolchain/dist/test/libtest/lib/test_runner.c vendor/elftoolchain/dist/test/libtest/lib/test_runner.h Modified: vendor/elftoolchain/dist/README.rst vendor/elftoolchain/dist/addr2line/addr2line.c vendor/elftoolchain/dist/common/elfdefinitions.h vendor/elftoolchain/dist/common/native-elf-format vendor/elftoolchain/dist/documentation/libelf-by-example/libelf-by-example.tex vendor/elftoolchain/dist/documentation/libelf-by-example/prog3.txt vendor/elftoolchain/dist/documentation/libelf-by-example/prog4.txt vendor/elftoolchain/dist/documentation/libelf-by-example/prog6.txt vendor/elftoolchain/dist/elfcopy/ascii.c vendor/elftoolchain/dist/elfcopy/binary.c vendor/elftoolchain/dist/elfcopy/elfcopy.h vendor/elftoolchain/dist/elfcopy/main.c vendor/elftoolchain/dist/elfcopy/sections.c vendor/elftoolchain/dist/elfdump/elfdump.c vendor/elftoolchain/dist/libdwarf/dwarf.h vendor/elftoolchain/dist/libdwarf/dwarf_dump.c vendor/elftoolchain/dist/libdwarf/libdwarf_attr.c vendor/elftoolchain/dist/libdwarf/libdwarf_reloc.c vendor/elftoolchain/dist/libelf/_libelf.h vendor/elftoolchain/dist/libelf/_libelf_config.h vendor/elftoolchain/dist/libelf/elf.3 vendor/elftoolchain/dist/libelf/elf_data.c vendor/elftoolchain/dist/libelf/elf_end.c vendor/elftoolchain/dist/libelf/elf_flagdata.3 vendor/elftoolchain/dist/libelf/elf_getdata.3 vendor/elftoolchain/dist/libelf/elf_getident.c vendor/elftoolchain/dist/libelf/elf_next.3 vendor/elftoolchain/dist/libelf/elf_next.c vendor/elftoolchain/dist/libelf/elf_open.3 vendor/elftoolchain/dist/libelf/elf_rand.c vendor/elftoolchain/dist/libelf/elf_rawfile.c vendor/elftoolchain/dist/libelf/elf_scn.c vendor/elftoolchain/dist/libelf/elf_update.3 vendor/elftoolchain/dist/libelf/elf_update.c vendor/elftoolchain/dist/libelf/gelf.3 vendor/elftoolchain/dist/libelf/gelf_cap.c vendor/elftoolchain/dist/libelf/gelf_dyn.c vendor/elftoolchain/dist/libelf/gelf_getcap.3 vendor/elftoolchain/dist/libelf/gelf_getdyn.3 vendor/elftoolchain/dist/libelf/gelf_getmove.3 vendor/elftoolchain/dist/libelf/gelf_getrel.3 vendor/elftoolchain/dist/libelf/gelf_getrela.3 vendor/elftoolchain/dist/libelf/gelf_getsym.3 vendor/elftoolchain/dist/libelf/gelf_getsyminfo.3 vendor/elftoolchain/dist/libelf/gelf_getsymshndx.3 vendor/elftoolchain/dist/libelf/gelf_move.c vendor/elftoolchain/dist/libelf/gelf_newehdr.3 vendor/elftoolchain/dist/libelf/gelf_newphdr.3 vendor/elftoolchain/dist/libelf/gelf_rel.c vendor/elftoolchain/dist/libelf/gelf_rela.c vendor/elftoolchain/dist/libelf/gelf_sym.c vendor/elftoolchain/dist/libelf/gelf_syminfo.c vendor/elftoolchain/dist/libelf/gelf_symshndx.c vendor/elftoolchain/dist/libelf/libelf_allocate.c vendor/elftoolchain/dist/libelf/libelf_ar.c vendor/elftoolchain/dist/libelf/libelf_convert.m4 vendor/elftoolchain/dist/libelf/libelf_data.c vendor/elftoolchain/dist/libelf/libelf_ehdr.c vendor/elftoolchain/dist/libelf/libelf_extended.c vendor/elftoolchain/dist/libelf/libelf_memory.c vendor/elftoolchain/dist/libelf/libelf_msize.m4 vendor/elftoolchain/dist/libelf/libelf_phdr.c vendor/elftoolchain/dist/libelf/libelf_xlate.c vendor/elftoolchain/dist/libelftc/elftc_bfd_find_target.3 vendor/elftoolchain/dist/libelftc/elftc_reloc_type_str.c vendor/elftoolchain/dist/libelftc/elftc_string_table.c vendor/elftoolchain/dist/libelftc/elftc_string_table_create.3 vendor/elftoolchain/dist/libelftc/
svn commit: r349543 - head/share/man/man9
Author: lwhsu Date: Sat Jun 29 14:55:53 2019 New Revision: 349543 URL: https://svnweb.freebsd.org/changeset/base/349543 Log: Fix VOP_PUTPAGES(9) in regards to the use of VM_PAGER_CLUSTER_OK Submitted by: Ka Ho Ng Reviewed by: mckusick MFC after:3 days Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D20695 Modified: head/share/man/man9/VOP_GETPAGES.9 Modified: head/share/man/man9/VOP_GETPAGES.9 == --- head/share/man/man9/VOP_GETPAGES.9 Sat Jun 29 13:30:05 2019 (r349542) +++ head/share/man/man9/VOP_GETPAGES.9 Sat Jun 29 14:55:53 2019 (r349543) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 7, 2017 +.Dd June 29, 2019 .Dt VOP_GETPAGES 9 .Os .Sh NAME @@ -105,7 +105,7 @@ This could occur via a call to which puts such pages onto the head of the inactive queue. If .Dv VM_PAGER_CLUSTER_OK -is set, writes may be performed asynchronously, so that related writes +is set, writes may be delayed, so that related writes can be coalesced for efficiency, e.g., using the clustering mechanism of the buffer cache. .It Fa rtvals ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r349541 - in stable/11: share/man/man4 sys/dev/atkbdc
Author: wulf
Date: Sat Jun 29 12:54:27 2019
New Revision: 349541
URL: https://svnweb.freebsd.org/changeset/base/349541
Log:
MFC r346455-r346458, r348520, r348529, r348817, r348818
r346455:
psm(4): Add support for 4 and 5 finger touches in synaptics driver
While 4-th and 5-th finger positions are not exported through PS/2
interface, total number of touches is reported by MT trackpads.
r346456:
psm(4): do not process gestures when palm is present
Ignoring of gesture processing when the palm is detected helps to reduce
some of the erratic pointer behavior.
This fixes regression introduced in r317814
Reported by: Ben LeMasurier
r346457:
psm(4): respect tap_disabled configuration with enabled Extended support
This fixes a bug where, even when hw.psm.tap_enabled=0, touchpad taps
were processed.
tap_enabled has three states: unconfigured, disabled, and enabled (-1, 0, 1).
To respect PR kern/139272, taps are ignored only when explicity disabled.
Submitted by: Ben LeMasurier (initial version)
r346458:
psm(4): give names to synaptics commands
Submitted by: Ben LeMasurier
r348520:
psm(4): Add Elantech touchpad IC type 15 found on Thinkpad L480 laptops
PR: 238291
Submitted by: Andrey Kosachenko
r348529:
psm(4): Add natural scrolling support to sysmouse protocol
This change enables natural scrolling with two finger scroll enabled
and when user is using a trackpad (mouse and trackpoint are not affected).
Depending on trackpad model it can be activated with setting of
hw.psm.synaptics.natural_scroll or hw.psm.elantech.natural_scroll sysctl
values to 1.
Evdev protocol is not affected by this change too. Tune userland client
e.g. libinput to enable natural scrolling in that case.
Submitted by: nyan_myuji.xyz
Reviewed by: wulf
Differential Revision:https://reviews.freebsd.org/D20447
r348817:
psm(4): Fix Elantech trackpoint support.
Sign bits for X and Y motion data were taken from wrong places.
PR: 238291
Reported by: Andrey Kosachenko
Tested by:Andrey Kosachenko
r348818:
psm(4): Add extra sanity checks to Elantech trackpoint packet parser.
Add strict checks for unused bit states in Elantech trackpoint packet
parser to filter out spurious events produces by some hardware which
are detected as trackpoint packets. See comment on r328191 for example.
Tested by:Andrey Kosachenko
Modified:
stable/11/share/man/man4/psm.4
stable/11/sys/dev/atkbdc/psm.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man4/psm.4
==
--- stable/11/share/man/man4/psm.4 Sat Jun 29 12:49:52 2019
(r349540)
+++ stable/11/share/man/man4/psm.4 Sat Jun 29 12:54:27 2019
(r349541)
@@ -354,8 +354,8 @@ Tap and drag gestures can be disabled by setting
to
.Em 0
at boot-time.
-Currently, this is only supported on Synaptics touchpads with Extended
-support disabled.
+Currently, this is supported on Synaptics touchpads regardless of Extended
+support state and on Elantech touchpads with Extended support enabled.
The behaviour may be changed after boot by setting
the sysctl with the same name and by restarting
.Xr moused 8
Modified: stable/11/sys/dev/atkbdc/psm.c
==
--- stable/11/sys/dev/atkbdc/psm.c Sat Jun 29 12:49:52 2019
(r349540)
+++ stable/11/sys/dev/atkbdc/psm.c Sat Jun 29 12:54:27 2019
(r349541)
@@ -178,6 +178,22 @@ typedef struct packetbuf {
#definePSM_PACKETQUEUE 128
#endif
+/*
+ * Synaptics command definitions.
+ */
+#defineSYNAPTICS_READ_IDENTITY 0x00
+#defineSYNAPTICS_READ_MODES0x01
+#defineSYNAPTICS_READ_CAPABILITIES 0x02
+#defineSYNAPTICS_READ_MODEL_ID 0x03
+#defineSYNAPTICS_READ_SERIAL_PREFIX0x06
+#defineSYNAPTICS_READ_SERIAL_SUFFIX0x07
+#defineSYNAPTICS_READ_RESOLUTIONS 0x08
+#defineSYNAPTICS_READ_EXTENDED 0x09
+#defineSYNAPTICS_READ_CAPABILITIES_CONT0x0c
+#defineSYNAPTICS_READ_MAX_COORDS 0x0d
+#defineSYNAPTICS_READ_DELUXE_LED 0x0e
+#defineSYNAPTICS_READ_MIN_COORDS 0x0f
+
typedef struct synapticsinfo {
struct sysctl_ctx_list sysctl_ctx;
struct sysctl_oid *sysctl_tree;
@@ -219,6 +235,7 @@ typedef struct synapticsinfo {
int softbutton3_x;
int max_x;
int max_y;
+ int natural_scroll;
} synapticsinfo_t;
typedef struct synapticspacket {
@@ -554,6 +571,8 @@ enum {
SYNAPTICS_SYSCTL_SOF
svn commit: r349540 - in stable/12: share/man/man4 sys/dev/atkbdc
Author: wulf
Date: Sat Jun 29 12:49:52 2019
New Revision: 349540
URL: https://svnweb.freebsd.org/changeset/base/349540
Log:
MFC r346455-r346458, r348520, r348529, r348817, r348818
r346455:
psm(4): Add support for 4 and 5 finger touches in synaptics driver
While 4-th and 5-th finger positions are not exported through PS/2
interface, total number of touches is reported by MT trackpads.
r346456:
psm(4): do not process gestures when palm is present
Ignoring of gesture processing when the palm is detected helps to reduce
some of the erratic pointer behavior.
This fixes regression introduced in r317814
Reported by: Ben LeMasurier
r346457:
psm(4): respect tap_disabled configuration with enabled Extended support
This fixes a bug where, even when hw.psm.tap_enabled=0, touchpad taps
were processed.
tap_enabled has three states: unconfigured, disabled, and enabled (-1, 0, 1).
To respect PR kern/139272, taps are ignored only when explicity disabled.
Submitted by: Ben LeMasurier (initial version)
r346458:
psm(4): give names to synaptics commands
Submitted by: Ben LeMasurier
r348520:
psm(4): Add Elantech touchpad IC type 15 found on Thinkpad L480 laptops
PR: 238291
Submitted by: Andrey Kosachenko
r348529:
psm(4): Add natural scrolling support to sysmouse protocol
This change enables natural scrolling with two finger scroll enabled
and when user is using a trackpad (mouse and trackpoint are not affected).
Depending on trackpad model it can be activated with setting of
hw.psm.synaptics.natural_scroll or hw.psm.elantech.natural_scroll sysctl
values to 1.
Evdev protocol is not affected by this change too. Tune userland client
e.g. libinput to enable natural scrolling in that case.
Submitted by: nyan_myuji.xyz
Reviewed by: wulf
Differential Revision:https://reviews.freebsd.org/D20447
r348817:
psm(4): Fix Elantech trackpoint support.
Sign bits for X and Y motion data were taken from wrong places.
PR: 238291
Reported by: Andrey Kosachenko
Tested by:Andrey Kosachenko
r348818:
psm(4): Add extra sanity checks to Elantech trackpoint packet parser.
Add strict checks for unused bit states in Elantech trackpoint packet
parser to filter out spurious events produces by some hardware which
are detected as trackpoint packets. See comment on r328191 for example.
Tested by:Andrey Kosachenko
Modified:
stable/12/share/man/man4/psm.4
stable/12/sys/dev/atkbdc/psm.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/man/man4/psm.4
==
--- stable/12/share/man/man4/psm.4 Sat Jun 29 12:19:57 2019
(r349539)
+++ stable/12/share/man/man4/psm.4 Sat Jun 29 12:49:52 2019
(r349540)
@@ -354,8 +354,8 @@ Tap and drag gestures can be disabled by setting
to
.Em 0
at boot-time.
-Currently, this is only supported on Synaptics touchpads with Extended
-support disabled.
+Currently, this is supported on Synaptics touchpads regardless of Extended
+support state and on Elantech touchpads with Extended support enabled.
The behaviour may be changed after boot by setting
the sysctl with the same name and by restarting
.Xr moused 8
Modified: stable/12/sys/dev/atkbdc/psm.c
==
--- stable/12/sys/dev/atkbdc/psm.c Sat Jun 29 12:19:57 2019
(r349539)
+++ stable/12/sys/dev/atkbdc/psm.c Sat Jun 29 12:49:52 2019
(r349540)
@@ -178,6 +178,22 @@ typedef struct packetbuf {
#definePSM_PACKETQUEUE 128
#endif
+/*
+ * Synaptics command definitions.
+ */
+#defineSYNAPTICS_READ_IDENTITY 0x00
+#defineSYNAPTICS_READ_MODES0x01
+#defineSYNAPTICS_READ_CAPABILITIES 0x02
+#defineSYNAPTICS_READ_MODEL_ID 0x03
+#defineSYNAPTICS_READ_SERIAL_PREFIX0x06
+#defineSYNAPTICS_READ_SERIAL_SUFFIX0x07
+#defineSYNAPTICS_READ_RESOLUTIONS 0x08
+#defineSYNAPTICS_READ_EXTENDED 0x09
+#defineSYNAPTICS_READ_CAPABILITIES_CONT0x0c
+#defineSYNAPTICS_READ_MAX_COORDS 0x0d
+#defineSYNAPTICS_READ_DELUXE_LED 0x0e
+#defineSYNAPTICS_READ_MIN_COORDS 0x0f
+
typedef struct synapticsinfo {
struct sysctl_ctx_list sysctl_ctx;
struct sysctl_oid *sysctl_tree;
@@ -219,6 +235,7 @@ typedef struct synapticsinfo {
int softbutton3_x;
int max_x;
int max_y;
+ int natural_scroll;
} synapticsinfo_t;
typedef struct synapticspacket {
@@ -554,6 +571,8 @@ enum {
SYNAPTICS_SYSCTL_SOF
svn commit: r349539 - head/tests/sys/netpfil/pf
Author: lwhsu
Date: Sat Jun 29 12:19:57 2019
New Revision: 349539
URL: https://svnweb.freebsd.org/changeset/base/349539
Log:
Skip sys.netpfil.pf.names.names and sys.netpfil.pf.synproxy.synproxy
temporarily because kernel panics when flushing epair queue.
PR: 238870
Sponsored by: The FreeBSD Foundation
Modified:
head/tests/sys/netpfil/pf/names.sh
head/tests/sys/netpfil/pf/synproxy.sh
Modified: head/tests/sys/netpfil/pf/names.sh
==
--- head/tests/sys/netpfil/pf/names.sh Sat Jun 29 10:58:31 2019
(r349538)
+++ head/tests/sys/netpfil/pf/names.sh Sat Jun 29 12:19:57 2019
(r349539)
@@ -11,6 +11,7 @@ names_head()
names_body()
{
+ atf_skip "Kernel panics when flushing epair queue (bug238870)"
pft_init
epair=$(vnet_mkepair)
Modified: head/tests/sys/netpfil/pf/synproxy.sh
==
--- head/tests/sys/netpfil/pf/synproxy.sh Sat Jun 29 10:58:31 2019
(r349538)
+++ head/tests/sys/netpfil/pf/synproxy.sh Sat Jun 29 12:19:57 2019
(r349539)
@@ -11,6 +11,7 @@ synproxy_head()
synproxy_body()
{
+ atf_skip "Kernel panics when flushing epair queue (bug238870)"
pft_init
epair=$(vnet_mkepair)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r349538 - head/lib/libarchive/tests
Author: lwhsu
Date: Sat Jun 29 10:58:31 2019
New Revision: 349538
URL: https://svnweb.freebsd.org/changeset/base/349538
Log:
Install missing test data file
MFC with: r349527
Sponsored by: The FreeBSD Foundation
Modified:
head/lib/libarchive/tests/Makefile
Modified: head/lib/libarchive/tests/Makefile
==
--- head/lib/libarchive/tests/Makefile Sat Jun 29 09:14:53 2019
(r349537)
+++ head/lib/libarchive/tests/Makefile Sat Jun 29 10:58:31 2019
(r349538)
@@ -512,6 +512,7 @@ ${PACKAGE}FILES+= test_read_format_rar_subblock.rar.uu
${PACKAGE}FILES+= test_read_format_rar_unicode.rar.uu
${PACKAGE}FILES+= test_read_format_rar_windows.rar.uu
${PACKAGE}FILES+= test_read_format_rar5_arm.rar.uu
+${PACKAGE}FILES+=
test_read_format_rar5_arm_filter_on_window_boundary.rar.uu
${PACKAGE}FILES+= test_read_format_rar5_blake2.rar.uu
${PACKAGE}FILES+= test_read_format_rar5_compressed.rar.uu
${PACKAGE}FILES+= test_read_format_rar5_different_window_size.rar.uu
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
