svn commit: r258545 - head/sys/dev/usb/controller
Author: hselasky Date: Mon Nov 25 10:58:02 2013 New Revision: 258545 URL: http://svnweb.freebsd.org/changeset/base/258545 Log: Comply to the XHCI specification. Certain input context fields should always be zero. MFC after:1 week Modified: head/sys/dev/usb/controller/xhci.c Modified: head/sys/dev/usb/controller/xhci.c == --- head/sys/dev/usb/controller/xhci.c Mon Nov 25 10:49:17 2013 (r258544) +++ head/sys/dev/usb/controller/xhci.c Mon Nov 25 10:58:02 2013 (r258545) @@ -2540,7 +2540,11 @@ xhci_configure_device(struct usb_device xhci_ctx_set_le32(sc, pinp-ctx_slot.dwSctx2, temp); - temp = XHCI_SCTX_3_DEV_ADDR_SET(udev-address) | + /* +* These fields should be initialized to zero, according to +* XHCI section 6.2.2 - slot context: +*/ + temp = XHCI_SCTX_3_DEV_ADDR_SET(0) | XHCI_SCTX_3_SLOT_STATE_SET(0); xhci_ctx_set_le32(sc, pinp-ctx_slot.dwSctx3, temp); ___ 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: r258546 - head/sys/arm/rockchip
Author: ganbold (doc committer)
Date: Mon Nov 25 11:01:19 2013
New Revision: 258546
URL: http://svnweb.freebsd.org/changeset/base/258546
Log:
Add watchdog driver for rk3188.
Approved by: ray@
Added:
head/sys/arm/rockchip/rk30xx_wdog.c (contents, props changed)
head/sys/arm/rockchip/rk30xx_wdog.h (contents, props changed)
Modified:
head/sys/arm/rockchip/files.rk30xx
Modified: head/sys/arm/rockchip/files.rk30xx
==
--- head/sys/arm/rockchip/files.rk30xx Mon Nov 25 10:58:02 2013
(r258545)
+++ head/sys/arm/rockchip/files.rk30xx Mon Nov 25 11:01:19 2013
(r258546)
@@ -17,5 +17,6 @@ arm/rockchip/common.c standard
arm/rockchip/rk30xx_machdep.c standard
arm/rockchip/rk30xx_pmu.c standard
arm/rockchip/rk30xx_grf.c standard
+arm/rockchip/rk30xx_wdog.c standard
arm/rockchip/rk30xx_gpio.c optionalgpio
dev/usb/controller/dwc_otg_fdt.c optionaldwcotg
Added: head/sys/arm/rockchip/rk30xx_wdog.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/rockchip/rk30xx_wdog.c Mon Nov 25 11:01:19 2013
(r258546)
@@ -0,0 +1,198 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu ganb...@gmail.com
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include sys/cdefs.h
+__FBSDID($FreeBSD$);
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/watchdog.h
+#include sys/bus.h
+#include sys/kernel.h
+#include sys/lock.h
+#include sys/module.h
+#include sys/mutex.h
+#include sys/rman.h
+
+#include dev/fdt/fdt_common.h
+#include dev/ofw/openfirm.h
+#include dev/ofw/ofw_bus.h
+#include dev/ofw/ofw_bus_subr.h
+
+#include machine/bus.h
+#include machine/cpufunc.h
+#include machine/machdep.h
+#include machine/fdt.h
+
+#include arm/rockchip/rk30xx_wdog.h
+
+#ifndefRK30_WDT_BASE
+#defineRK30_WDT_BASE 0x2004c000
+#defineRK30_WDT_PSIZE 0x100
+#endif
+
+#defineRK30_WDT_READ(_sc, _r) bus_read_4((_sc)-res, (_r))
+#defineRK30_WDT_WRITE(_sc, _r, _v) bus_write_4((_sc)-res, (_r),
(_v))
+
+#defineWDOG_CTRL 0x00
+#defineWDOG_CTRL_EN(1 0)
+#defineWDOG_CTRL_RSP_MODE (1 1)
+#defineWDOG_CTRL_RST_PULSE (4 2)
+#defineWDOG_CTRL_RST 0xa
+#defineWDOG_TORR 0x04
+#defineWDOG_TORR_INTVL_SHIFT 0
+#defineWDOG_CCVR 0x08
+#defineWDOG_CRR0x0c
+#defineWDOG_CRR_PWD0x76
+#defineWDOG_STAT 0x10
+#defineWDOG_EOI0x14
+
+static struct rk30_wd_softc *rk30_wd_sc = NULL;
+
+struct rk30_wd_softc {
+ device_tdev;
+ struct resource *res;
+ struct mtx mtx;
+ int freq;
+};
+
+static void rk30_wd_watchdog_fn(void *private, u_int cmd, int *error);
+
+static int
+rk30_wd_probe(device_t dev)
+{
+
+ if (ofw_bus_is_compatible(dev, rockchip,rk30xx-wdt)) {
+ device_set_desc(dev, Rockchip RK30XX Watchdog);
+ return (BUS_PROBE_DEFAULT);
+ }
+
+ return (ENXIO);
+}
+
+static int
+rk30_wd_attach(device_t dev)
+{
+ struct rk30_wd_softc *sc;
+ int rid;
+ phandle_t node;
+ pcell_t cell;
+
+ if (rk30_wd_sc != NULL)
+ return (ENXIO);
+
+ sc = device_get_softc(dev);
+ sc-dev = dev;
+
+ node = ofw_bus_get_node(sc-dev);
+
svn commit: r258547 - head/sys/boot/fdt/dts
Author: ganbold (doc committer)
Date: Mon Nov 25 11:02:11 2013
New Revision: 258547
URL: http://svnweb.freebsd.org/changeset/base/258547
Log:
Add clock frequency for rk3188 watchdog.
Whilst here, replace clocks to clock-frequency.
Approved by: ray@
Modified:
head/sys/boot/fdt/dts/rk3188.dtsi
Modified: head/sys/boot/fdt/dts/rk3188.dtsi
==
--- head/sys/boot/fdt/dts/rk3188.dtsi Mon Nov 25 11:01:19 2013
(r258546)
+++ head/sys/boot/fdt/dts/rk3188.dtsi Mon Nov 25 11:02:11 2013
(r258547)
@@ -80,7 +80,7 @@
compatible = rockchip,rk3188-dw-apb-timer-osc;
reg = 0x20038000 0x20;
interrupts = 76;
- clocks = 2400;
+ clock-frequency = 2400;
status = disabled;
};
@@ -88,7 +88,7 @@
compatible = rockchip,rk30xx-timer;
reg = 0x20038020 0x20;
interrupts = 77;
- clocks = 2400;
+ clock-frequency = 2400;
status = disabled;
};
@@ -96,7 +96,7 @@
compatible = rockchip,rk30xx-timer;
reg = 0x20038060 0x20;
interrupts = 91;
- clocks = 2400;
+ clock-frequency = 2400;
status = disabled;
};
@@ -104,7 +104,7 @@
compatible = rockchip,rk30xx-timer;
reg = 0x20038080 0x20;
interrupts = 92;
- clocks = 2400;
+ clock-frequency = 2400;
status = disabled;
};
@@ -112,13 +112,14 @@
compatible = rockchip,rk30xx-timer;
reg = 0x200380a0 0x20;
interrupts = 96;
- clocks = 2400;
+ clock-frequency = 2400;
status = disabled;
};
watchdog@2004c000 {
compatible = rockchip,rk30xx-wdt;
reg = 0x2004c000 0x100;
+ clock-frequency = 6600 ;
};
gpio0: gpio@2000a000 {
@@ -233,7 +234,7 @@
interrupts = 55;
#address-cells = 1;
#size-cells = 0;
- clocks = 2400;/* TODO: verify freq */
+ clock-frequency = 2400; /* TODO: verify freq */
status = disabled;
};
@@ -243,7 +244,7 @@
interrupts = 56;
#address-cells = 1;
#size-cells = 0;
- clocks = 2400;/* TODO: verify freq */
+ clock-frequency = 2400; /* TODO: verify freq */
status = disabled;
};
};
___
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: r258548 - head/sys/arm/rockchip
Author: ganbold (doc committer)
Date: Mon Nov 25 11:02:58 2013
New Revision: 258548
URL: http://svnweb.freebsd.org/changeset/base/258548
Log:
Enable reset mechanism for rk3188.
Approved by: ray@
Modified:
head/sys/arm/rockchip/rk30xx_machdep.c
Modified: head/sys/arm/rockchip/rk30xx_machdep.c
==
--- head/sys/arm/rockchip/rk30xx_machdep.c Mon Nov 25 11:02:11 2013
(r258547)
+++ head/sys/arm/rockchip/rk30xx_machdep.c Mon Nov 25 11:02:58 2013
(r258548)
@@ -49,6 +49,8 @@ __FBSDID($FreeBSD$);
#include dev/fdt/fdt_common.h
+#include arm/rockchip/rk30xx_wdog.h
+
/* Start of address space used for bootstrap map */
#define DEVMAP_BOOTSTRAP_MAP_START 0xF000
@@ -122,6 +124,7 @@ void
cpu_reset()
{
- printf(No cpu_reset implementation!\n);
+ rk30_wd_watchdog_reset();
+ printf(Reset failed!\n);
while (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: r258549 - head/sys/dev/drm2
Author: dumbbell Date: Mon Nov 25 11:15:51 2013 New Revision: 258549 URL: http://svnweb.freebsd.org/changeset/base/258549 Log: drm: Dereference pointers given to qsort_r()'s cmp callback drm_le_cmp() (qsort_r()'s callback) receives pointers to elements in the array passed to qsort_r(), not the elements themselves. Before this fix, the use of qsort_r() shuffled the array, not sorted it, because the compare callback accessed random memory locations, not the expected elements. This bug triggered an infinite loop in KDE/xserver: 1. KDE has a kded module called randrmonitor which queries xserver for current monitors at startup and then listens to RandR notifications from xserver. 2. xserver handles the query from randrmonitor by polling the video device using the drm_mode_getconnector() ioctl. This ioctl returns a list of connectors and, for those with a connected monitor, the available modes. Each modes list is sorted by the kernel before returning. When xserver gets the connectors list, it sorts the modes lists again. In the case of this bug, when two modes are equal (in xserver's compare function PoV), their order is kept stable (ie. the kernel order is kept for those two modes). And because the list was shuffled by the kernel, the order of two equal modes was frequently changed in the final modes list in xserver. 3. xserver compares the returned connectors list with the list obtained earlier. In particular, it compares the sorted modes lists for each connector. If a property of a connector changes (eg. modes), xserver sends a RRNotify_OutputChange notification. Because of the change of order between equal modes, xserver sent a notification after each polling of the connectors. 4. randrmonitor receives a notification, triggered by its query. The notification doesn't contain the new connectors list, therefore, it asks for the new list using the same function: go back to step #2. MFC after:3 days Modified: head/sys/dev/drm2/drm_linux_list_sort.c Modified: head/sys/dev/drm2/drm_linux_list_sort.c == --- head/sys/dev/drm2/drm_linux_list_sort.c Mon Nov 25 11:02:58 2013 (r258548) +++ head/sys/dev/drm2/drm_linux_list_sort.c Mon Nov 25 11:15:51 2013 (r258549) @@ -42,8 +42,8 @@ drm_le_cmp(void *priv, const void *d1, c struct drm_list_sort_thunk *thunk; thunk = priv; - le1 = __DECONST(struct list_head *, d1); - le2 = __DECONST(struct list_head *, d2); + le1 = *(struct list_head **)d1; + le2 = *(struct list_head **)d2; return ((thunk-cmp)(thunk-priv, le1, le2)); } ___ 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: r258550 - head/usr.sbin/pkg
Author: bapt
Date: Mon Nov 25 11:31:42 2013
New Revision: 258550
URL: http://svnweb.freebsd.org/changeset/base/258550
Log:
Do not create pkg.conf, as it is not necessary anymore and packagesite is
deprecated
Reported by: glebius
MFC after:3 days
Modified:
head/usr.sbin/pkg/pkg.c
Modified: head/usr.sbin/pkg/pkg.c
==
--- head/usr.sbin/pkg/pkg.c Mon Nov 25 11:15:51 2013(r258549)
+++ head/usr.sbin/pkg/pkg.c Mon Nov 25 11:31:42 2013(r258550)
@@ -740,12 +740,9 @@ cleanup:
static int
bootstrap_pkg(bool force)
{
- FILE *config;
int fd_pkg, fd_sig;
int ret;
- char *site;
char url[MAXPATHLEN];
- char conf[MAXPATHLEN];
char tmppkg[MAXPATHLEN];
char tmpsig[MAXPATHLEN];
const char *packagesite;
@@ -754,7 +751,6 @@ bootstrap_pkg(bool force)
fd_sig = -1;
ret = -1;
- config = NULL;
if (config_string(PACKAGESITE, packagesite) != 0) {
warnx(No PACKAGESITE defined);
@@ -801,26 +797,6 @@ bootstrap_pkg(bool force)
if ((ret = extract_pkg_static(fd_pkg, pkgstatic, MAXPATHLEN)) == 0)
ret = install_pkg_static(pkgstatic, tmppkg, force);
- snprintf(conf, MAXPATHLEN, %s/etc/pkg.conf,
- getenv(LOCALBASE) ? getenv(LOCALBASE) : _LOCALBASE);
-
- if (access(conf, R_OK) == -1) {
- site = strrchr(url, '/');
- if (site == NULL)
- goto cleanup;
- site[0] = '\0';
- site = strrchr(url, '/');
- if (site == NULL)
- goto cleanup;
- site[0] = '\0';
-
- config = fopen(conf, w+);
- if (config == NULL)
- goto cleanup;
- fprintf(config, packagesite: %s\n, url);
- fclose(config);
- }
-
goto cleanup;
fetchfail:
___
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: r258448 - head/sys/geom/part
on 22/11/2013 00:02 Marcel Moolenaar said the following: Author: marcel Date: Thu Nov 21 22:02:59 2013 New Revision: 258448 URL: http://svnweb.freebsd.org/changeset/base/258448 Log: Have the GPT probe return a lower priority when the MBR is not a PMBR The purpose of the PMBR is to have the disk appear in use to GPT unaware utilities (like fdisk). However, if the PMBR has been changed by a GPT unaware utlity then we must assume that this was deliberate (as it involved removal of the special slice) and we should not treat the unmodified GPT-specific sectors as being valid. By lowering the probe priority in that case, the MBR scheme will take precedence and the kernel will end up using the MBR and not the GPT. We will still use the GPT if the kernel does not support the MBR scheme. Thank you very much for this change! Finally I can get rid of my local patch from a while ago: http://thread.gmane.org/gmane.os.freebsd.devel.geom/3776/focus=3802 Your solution is clearly superior while providing the same end result. -- Andriy Gapon ___ 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: r258551 - head/share/mk
Author: jmmv
Date: Mon Nov 25 13:28:40 2013
New Revision: 258551
URL: http://svnweb.freebsd.org/changeset/base/258551
Log:
Install plain.test.mk.
This was missed when this file was first imported. Its atf.test.mk
counterpart is already being installed and these are necessary if we
want make within the source tree (not via buildworld) to work.
Approved by: rpaulo (mentor)
Modified:
head/share/mk/Makefile
Modified: head/share/mk/Makefile
==
--- head/share/mk/Makefile Mon Nov 25 11:31:42 2013(r258550)
+++ head/share/mk/Makefile Mon Nov 25 13:28:40 2013(r258551)
@@ -45,6 +45,7 @@ FILESDIR= ${BINDIR}/mk
.if ${MK_TESTS} != no
FILES+=atf.test.mk
+FILES+=plain.test.mk
.endif
.include bsd.prog.mk
___
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: r258552 - in head/share: examples/tests/tests/plain mk
Author: jmmv
Date: Mon Nov 25 13:30:06 2013
New Revision: 258552
URL: http://svnweb.freebsd.org/changeset/base/258552
Log:
Generate plain sh test programs from a source file.
Instead of assuming that plain sh test programs exist in the source
tree in their final form and are marked as executable, generate them
from a list of sources.
By default, just assume that the source file for a program P is P.sh
but allow the caller to customize the inputs. Similarly, also allow
the caller to apply sed(1) replacements on the output. These will
both be useful in hooking existing test code from tools/regression/
into the test suite.
Approved by: rpaulo (mentor)
Added:
- copied unchanged from r258526,
head/share/examples/tests/tests/plain/cp_test
Directory Properties:
head/share/examples/tests/tests/plain/cp_test.sh (props changed)
Deleted:
head/share/examples/tests/tests/plain/cp_test
Modified:
head/share/mk/plain.test.mk
Copied: head/share/examples/tests/tests/plain/cp_test.sh (from r258526,
head/share/examples/tests/tests/plain/cp_test)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/examples/tests/tests/plain/cp_test.shMon Nov 25 13:30:06
2013(r258552, copy of r258526,
head/share/examples/tests/tests/plain/cp_test)
@@ -0,0 +1,84 @@
+# $FreeBSD$
+#
+# Copyright 2013 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google Inc. nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#
+# INTRODUCTION
+#
+# This plain test program mimics the structure and contents of its
+# ATF-based counterpart. It attempts to represent various test cases
+# in different separate functions and just calls them all from main.
+#
+# In reality, plain test programs can be much simpler. All they have
+# to do is return 0 on success and non-0 otherwise.
+#
+
+set -e
+
+# Prints an error message and exits.
+err() {
+ echo ${@} 12
+ exit 1
+}
+
+# Auxiliary function to compare two files for equality.
+verify_copy() {
+ if ! cmp -s ${1} ${2}; then
+ diff -u ${1} ${2}
+ err ${1} and ${2} differ, but they should be equal
+ fi
+}
+
+simple_test() {
+ echo 'File 1' file1
+ cp file1 file2 || err cp failed
+ verify_copy file1 file2
+}
+
+force_test() {
+ echo 'File 1' file1
+ echo 'File 2' file2
+ chmod 400 file2
+ cp -f file1 file2 || err cp failed
+ verify_copy file1 file2
+}
+
+# If you have read the cp_test.sh counterpart in the atf/ directory, you
+# may think that the sequencing of tests below and the exposed behavior
+# to the user is very similar. But you'd be wrong.
+#
+# There are two major differences with this and the ATF version. The
+# first is that the code below has no provisions to detect failures in
+# one test and continue running the other tests: the first failure
+# causes the whole test program to exit. The second is that this
+# particular main has no arguments: without ATF, all test programs may
+# expose a different command-line interface, and this is an issue for
+# consistency purposes.
+simple_test
+force_test
Modified: head/share/mk/plain.test.mk
==
--- head/share/mk/plain.test.mk Mon Nov 25 13:28:40 2013(r258551)
+++ head/share/mk/plain.test.mk Mon Nov 25 13:30:06 2013(r258552)
@@ -46,6 +46,16 @@ _TESTS+= ${PLAIN_TESTS_SH}
.for _T in ${PLAIN_TESTS_SH}
svn commit: r258553 - head/sys/dev/drm2
Author: dumbbell Date: Mon Nov 25 15:01:59 2013 New Revision: 258553 URL: http://svnweb.freebsd.org/changeset/base/258553 Log: drm: Fix build with gcc, broken with r258549 The code was easier to read without __DECONST and clang didn't report any error. I thought the cast was enough... MFC after:3 days X-MFC-With: r258549 Modified: head/sys/dev/drm2/drm_linux_list_sort.c Modified: head/sys/dev/drm2/drm_linux_list_sort.c == --- head/sys/dev/drm2/drm_linux_list_sort.c Mon Nov 25 13:30:06 2013 (r258552) +++ head/sys/dev/drm2/drm_linux_list_sort.c Mon Nov 25 15:01:59 2013 (r258553) @@ -42,8 +42,8 @@ drm_le_cmp(void *priv, const void *d1, c struct drm_list_sort_thunk *thunk; thunk = priv; - le1 = *(struct list_head **)d1; - le2 = *(struct list_head **)d2; + le1 = *(__DECONST(struct list_head **, d1)); + le2 = *(__DECONST(struct list_head **, d2)); return ((thunk-cmp)(thunk-priv, le1, le2)); } ___ 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: r258553 - head/sys/dev/drm2
On 25.11.2013 16:01, Jean-Sebastien Pedron wrote: Author: dumbbell Date: Mon Nov 25 15:01:59 2013 New Revision: 258553 URL: http://svnweb.freebsd.org/changeset/base/258553 Log: drm: Fix build with gcc, broken with r258549 The code was easier to read without __DECONST and clang didn't report any error. I thought the cast was enough... MFC after: 3 days X-MFC-With: r258549 Reported by:Michael Butler i...@protected-networks.net -- Jean-Sébastien Pédron signature.asc Description: OpenPGP digital signature
svn commit: r258554 - stable/10/sys/dev/nand
Author: gber
Date: Mon Nov 25 15:34:57 2013
New Revision: 258554
URL: http://svnweb.freebsd.org/changeset/base/258554
Log:
MFC: r258387,r258425
Split raw reading/programming into smaller chunks to avoid allocating too
big chunk of kernel memory. Validate size of data. Add error handling to
avoid calling copyout() when data has not been read correctly. Also MFC of
change r258425 which fixes problem introduced by r258387.
Reviewed by:zbb
Reported by:x90c geinbl...@gmail.com
Approved by:re
Modified:
stable/10/sys/dev/nand/nand_cdev.c
stable/10/sys/dev/nand/nand_geom.c
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/dev/nand/nand_cdev.c
==
--- stable/10/sys/dev/nand/nand_cdev.c Mon Nov 25 15:01:59 2013
(r258553)
+++ stable/10/sys/dev/nand/nand_cdev.c Mon Nov 25 15:34:57 2013
(r258554)
@@ -294,19 +294,40 @@ nand_ioctl(struct cdev *dev, u_long cmd,
struct thread *td)
{
struct nand_chip *chip;
+ struct chip_geom *cg;
struct nand_oob_rw *oob_rw = NULL;
struct nand_raw_rw *raw_rw = NULL;
device_t nandbus;
+ size_t bufsize = 0, len = 0;
+ size_t raw_size;
+ off_t off;
uint8_t *buf = NULL;
int ret = 0;
uint8_t status;
chip = (struct nand_chip *)dev-si_drv1;
+ cg = chip-chip_geom;
nandbus = device_get_parent(chip-dev);
if ((cmd == NAND_IO_RAW_READ) || (cmd == NAND_IO_RAW_PROG)) {
raw_rw = (struct nand_raw_rw *)data;
- buf = malloc(raw_rw-len, M_NAND, M_WAITOK);
+ raw_size = cg-pgs_per_blk * (cg-page_size + cg-oob_size);
+
+ /* Check if len is not bigger than chip size */
+ if (raw_rw-len raw_size)
+ return (EFBIG);
+
+ /*
+* Do not ask for too much memory, in case of large transfers
+* read/write in 16-pages chunks
+*/
+ bufsize = 16 * (cg-page_size + cg-oob_size);
+ if (raw_rw-len bufsize)
+ bufsize = raw_rw-len;
+
+ buf = malloc(bufsize, M_NAND, M_WAITOK);
+ len = raw_rw-len;
+ off = 0;
}
switch(cmd) {
case NAND_IO_ERASE:
@@ -335,19 +356,37 @@ nand_ioctl(struct cdev *dev, u_long cmd,
break;
case NAND_IO_RAW_PROG:
- ret = copyin(raw_rw-data, buf, raw_rw-len);
- if (ret)
- break;
- ret = nand_prog_pages_raw(chip, raw_rw-off, buf,
- raw_rw-len);
+ while (len 0) {
+ if (len bufsize)
+ bufsize = len;
+ ret = copyin(raw_rw-data + off, buf, bufsize);
+ if (ret)
+ break;
+ ret = nand_prog_pages_raw(chip, raw_rw-off + off, buf,
+ bufsize);
+ if (ret)
+ break;
+ len -= bufsize;
+ off += bufsize;
+ }
break;
case NAND_IO_RAW_READ:
- ret = nand_read_pages_raw(chip, raw_rw-off, buf,
- raw_rw-len);
- if (ret)
- break;
- ret = copyout(buf, raw_rw-data, raw_rw-len);
+ while (len 0) {
+ if (len bufsize)
+ bufsize = len;
+
+ ret = nand_read_pages_raw(chip, raw_rw-off + off, buf,
+ bufsize);
+ if (ret)
+ break;
+
+ ret = copyout(buf, raw_rw-data + off, bufsize);
+ if (ret)
+ break;
+ len -= bufsize;
+ off += bufsize;
+ }
break;
case NAND_IO_PAGE_STAT:
Modified: stable/10/sys/dev/nand/nand_geom.c
==
--- stable/10/sys/dev/nand/nand_geom.c Mon Nov 25 15:01:59 2013
(r258553)
+++ stable/10/sys/dev/nand/nand_geom.c Mon Nov 25 15:34:57 2013
(r258554)
@@ -193,20 +193,42 @@ nand_ioctl(struct disk *ndisk, u_long cm
struct thread *td)
{
struct nand_chip *chip;
+ struct chip_geom *cg;
struct nand_oob_rw *oob_rw = NULL;
struct nand_raw_rw *raw_rw = NULL;
device_t nandbus;
+ size_t bufsize = 0, len = 0;
+ size_t raw_size;
+ off_t off;
uint8_t *buf = NULL;
int ret = 0;
uint8_t status;
chip = (struct nand_chip *)ndisk-d_drv1;
+ cg = chip-chip_geom;
nandbus =
svn commit: r258555 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon Nov 25 15:39:50 2013
New Revision: 258555
URL: http://svnweb.freebsd.org/changeset/base/258555
Log:
MFC r258353: zfs page_busy: fix the boundaries of the cleared range
This is a fix for a regression introduced in r246293.
vm_page_clear_dirty expects the range to have DEV_BSIZE aligned boundaries,
otherwise it extends them. Thus it can happen that the whole page is
marked clean while actually having some small dirty region(s).
This commit makes the range properly aligned and ensures that only
the clean data is marked as such.
It would interesting to evaluate how much benefit clearing with DEV_BSIZE
granularity produces. Perhaps instead we should clear the whole page
when it is completely overwritten and don't bother clearing any bits
if only a portion a page is written.
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Nov
25 15:34:57 2013(r258554)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Nov
25 15:39:50 2013(r258555)
@@ -326,6 +326,20 @@ page_busy(vnode_t *vp, int64_t start, in
{
vm_object_t obj;
vm_page_t pp;
+ int64_t end;
+
+ /*
+* At present vm_page_clear_dirty extends the cleared range to DEV_BSIZE
+* aligned boundaries, if the range is not aligned. As a result a
+* DEV_BSIZE subrange with partially dirty data may get marked as clean.
+* It may happen that all DEV_BSIZE subranges are marked clean and thus
+* the whole page would be considred clean despite have some dirty data.
+* For this reason we should shrink the range to DEV_BSIZE aligned
+* boundaries before calling vm_page_clear_dirty.
+*/
+ end = rounddown2(off + nbytes, DEV_BSIZE);
+ off = roundup2(off, DEV_BSIZE);
+ nbytes = end - off;
obj = vp-v_object;
VM_OBJECT_LOCK_ASSERT(obj, MA_OWNED);
@@ -357,7 +371,8 @@ page_busy(vnode_t *vp, int64_t start, in
vm_object_pip_add(obj, 1);
vm_page_io_start(pp);
pmap_remove_write(pp);
- vm_page_clear_dirty(pp, off, nbytes);
+ if (nbytes != 0)
+ vm_page_clear_dirty(pp, off, nbytes);
}
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: r258556 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon Nov 25 15:40:20 2013
New Revision: 258556
URL: http://svnweb.freebsd.org/changeset/base/258556
Log:
MFC r258353: zfs page_busy: fix the boundaries of the cleared range
This is a fix for a regression introduced in r246293.
vm_page_clear_dirty expects the range to have DEV_BSIZE aligned
boundaries,
otherwise it extends them. Thus it can happen that the whole page is
marked clean while actually having some small dirty region(s).
This commit makes the range properly aligned and ensures that only
the clean data is marked as such.
It would interesting to evaluate how much benefit clearing with
DEV_BSIZE
granularity produces. Perhaps instead we should clear the whole page
when it is completely overwritten and don't bother clearing any bits
if only a portion a page is written.
Modified:
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/cddl/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Nov
25 15:39:50 2013(r258555)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Nov
25 15:40:20 2013(r258556)
@@ -327,6 +327,20 @@ page_busy(vnode_t *vp, int64_t start, in
{
vm_object_t obj;
vm_page_t pp;
+ int64_t end;
+
+ /*
+* At present vm_page_clear_dirty extends the cleared range to DEV_BSIZE
+* aligned boundaries, if the range is not aligned. As a result a
+* DEV_BSIZE subrange with partially dirty data may get marked as clean.
+* It may happen that all DEV_BSIZE subranges are marked clean and thus
+* the whole page would be considred clean despite have some dirty data.
+* For this reason we should shrink the range to DEV_BSIZE aligned
+* boundaries before calling vm_page_clear_dirty.
+*/
+ end = rounddown2(off + nbytes, DEV_BSIZE);
+ off = roundup2(off, DEV_BSIZE);
+ nbytes = end - off;
obj = vp-v_object;
VM_OBJECT_LOCK_ASSERT(obj, MA_OWNED);
@@ -348,7 +362,8 @@ page_busy(vnode_t *vp, int64_t start, in
vm_page_io_start(pp);
vm_page_lock_queues();
pmap_remove_write(pp);
- vm_page_clear_dirty(pp, off, nbytes);
+ if (nbytes != 0)
+ vm_page_clear_dirty(pp, off, nbytes);
vm_page_unlock_queues();
}
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: r258557 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon Nov 25 15:53:08 2013
New Revision: 258557
URL: http://svnweb.freebsd.org/changeset/base/258557
Log:
MFC r258389: MFV r258378: 4089 NULL pointer dereference in arc_read()
illumos/illumos-gate@57815f6b95a743697e148327725b7f568e75e6ea
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 15:40:20 2013(r258556)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 15:53:08 2013(r258557)
@@ -20,9 +20,9 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
*/
/*
@@ -3173,6 +3173,8 @@ top:
vdev_t *vd = NULL;
uint64_t addr = 0;
boolean_t devw = B_FALSE;
+ enum zio_compress b_compress = ZIO_COMPRESS_OFF;
+ uint64_t b_asize = 0;
if (hdr == NULL) {
/* this block is not in the cache */
@@ -3242,10 +3244,12 @@ top:
hdr-b_acb = acb;
hdr-b_flags |= ARC_IO_IN_PROGRESS;
- if (HDR_L2CACHE(hdr) hdr-b_l2hdr != NULL
+ if (hdr-b_l2hdr != NULL
(vd = hdr-b_l2hdr-b_dev-l2ad_vdev) != NULL) {
devw = hdr-b_l2hdr-b_dev-l2ad_writing;
addr = hdr-b_l2hdr-b_daddr;
+ b_compress = hdr-b_l2hdr-b_compress;
+ b_asize = hdr-b_l2hdr-b_asize;
/*
* Lock out device removal.
*/
@@ -3296,7 +3300,7 @@ top:
cb-l2rcb_bp = *bp;
cb-l2rcb_zb = *zb;
cb-l2rcb_flags = zio_flags;
- cb-l2rcb_compress = hdr-b_l2hdr-b_compress;
+ cb-l2rcb_compress = b_compress;
ASSERT(addr = VDEV_LABEL_START_SIZE
addr + size vd-vdev_psize -
@@ -3308,8 +3312,7 @@ top:
* Issue a null zio if the underlying buffer
* was squashed to zero size by compression.
*/
- if (hdr-b_l2hdr-b_compress ==
- ZIO_COMPRESS_EMPTY) {
+ if (b_compress == ZIO_COMPRESS_EMPTY) {
rzio = zio_null(pio, spa, vd,
l2arc_read_done, cb,
zio_flags | ZIO_FLAG_DONT_CACHE |
@@ -3318,8 +3321,8 @@ top:
ZIO_FLAG_DONT_RETRY);
} else {
rzio = zio_read_phys(pio, vd, addr,
- hdr-b_l2hdr-b_asize,
- buf-b_data, ZIO_CHECKSUM_OFF,
+ b_asize, buf-b_data,
+ ZIO_CHECKSUM_OFF,
l2arc_read_done, cb, priority,
zio_flags | ZIO_FLAG_DONT_CACHE |
ZIO_FLAG_CANFAIL |
@@ -3328,8 +3331,7 @@ top:
}
DTRACE_PROBE2(l2arc__read, vdev_t *, vd,
zio_t *, rzio);
- ARCSTAT_INCR(arcstat_l2_read_bytes,
- hdr-b_l2hdr-b_asize);
+ ARCSTAT_INCR(arcstat_l2_read_bytes, b_asize);
if (*arc_flags ARC_NOWAIT) {
zio_nowait(rzio);
___
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: r258558 - stable/10/contrib/libexecinfo
Author: emaste Date: Mon Nov 25 15:54:18 2013 New Revision: 258558 URL: http://svnweb.freebsd.org/changeset/base/258558 Log: MFC r258426: libexecinfo: Include terminating null in byte count Otherwise, a formatted string with a strlen equal to the remaining buffer space would have the last character omitted (because vsnprintf always null-terminates), and later the assert in backtrace_symbols_fmt would fail. Sponsored by: DARPA, AFRL Approved by: re (gjb) Modified: stable/10/contrib/libexecinfo/backtrace.c Directory Properties: stable/10/contrib/libexecinfo/ (props changed) Modified: stable/10/contrib/libexecinfo/backtrace.c == --- stable/10/contrib/libexecinfo/backtrace.c Mon Nov 25 15:53:08 2013 (r258557) +++ stable/10/contrib/libexecinfo/backtrace.c Mon Nov 25 15:54:18 2013 (r258558) @@ -89,7 +89,7 @@ rasprintf(char **buf, size_t *bufsiz, si len = vsnprintf(*buf + offs, *bufsiz - offs, fmt, ap); va_end(ap); - if (len 0 || (size_t)len *bufsiz - offs) + if (len 0 || (size_t)len + 1 *bufsiz - offs) return len; nbufsiz = MAX(*bufsiz + 512, (size_t)len + 1); } else ___ 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: r258559 - in stable/10/sys: amd64/amd64 amd64/ia32 amd64/linux32 i386/i386 i386/include i386/linux pc98/pc98 x86/include
Author: emaste
Date: Mon Nov 25 15:58:48 2013
New Revision: 258559
URL: http://svnweb.freebsd.org/changeset/base/258559
Log:
MFC r258135: x86: Allow users to change PSL_RF via ptrace(PT_SETREGS...)
Debuggers may need to change PSL_RF. Note that tf_eflags is already stored
in the signal context during signal handling and PSL_RF previously could
be modified via sigreturn, so this change should not provide any new
ability to userspace.
For background see the thread at:
http://lists.freebsd.org/pipermail/freebsd-i386/2007-September/005910.html
Reviewed by:jhb, kib
Sponsored by: DARPA, AFRL
Approved by: re (gjb)
Modified:
stable/10/sys/amd64/amd64/machdep.c
stable/10/sys/amd64/ia32/ia32_signal.c
stable/10/sys/amd64/linux32/linux32_sysvec.c
stable/10/sys/i386/i386/machdep.c
stable/10/sys/i386/include/vm86.h
stable/10/sys/i386/linux/linux_sysvec.c
stable/10/sys/pc98/pc98/machdep.c
stable/10/sys/x86/include/psl.h
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/amd64/amd64/machdep.c
==
--- stable/10/sys/amd64/amd64/machdep.c Mon Nov 25 15:54:18 2013
(r258558)
+++ stable/10/sys/amd64/amd64/machdep.c Mon Nov 25 15:58:48 2013
(r258559)
@@ -486,17 +486,7 @@ sys_sigreturn(td, uap)
/*
* Don't allow users to change privileged or reserved flags.
*/
- /*
-* XXX do allow users to change the privileged flag PSL_RF.
-* The cpu sets PSL_RF in tf_rflags for faults. Debuggers
-* should sometimes set it there too. tf_rflags is kept in
-* the signal context during signal handling and there is no
-* other place to remember it, so the PSL_RF bit may be
-* corrupted by the signal handler without us knowing.
-* Corruption of the PSL_RF bit at worst causes one more or
-* one less debugger trap, so allowing it is fairly harmless.
-*/
- if (!EFL_SECURE(rflags ~PSL_RF, regs-tf_rflags ~PSL_RF)) {
+ if (!EFL_SECURE(rflags, regs-tf_rflags)) {
uprintf(pid %d (%s): sigreturn rflags = 0x%lx\n, p-p_pid,
td-td_name, rflags);
return (EINVAL);
Modified: stable/10/sys/amd64/ia32/ia32_signal.c
==
--- stable/10/sys/amd64/ia32/ia32_signal.c Mon Nov 25 15:54:18 2013
(r258558)
+++ stable/10/sys/amd64/ia32/ia32_signal.c Mon Nov 25 15:58:48 2013
(r258559)
@@ -719,7 +719,7 @@ ofreebsd32_sigreturn(struct thread *td,
return (error);
scp = sc;
eflags = scp-sc_eflags;
- if (!EFL_SECURE(eflags ~PSL_RF, regs-tf_rflags ~PSL_RF)) {
+ if (!EFL_SECURE(eflags, regs-tf_rflags)) {
return (EINVAL);
}
if (!CS_SECURE(scp-sc_cs)) {
@@ -787,17 +787,7 @@ freebsd4_freebsd32_sigreturn(td, uap)
/*
* Don't allow users to change privileged or reserved flags.
*/
- /*
-* XXX do allow users to change the privileged flag PSL_RF.
-* The cpu sets PSL_RF in tf_eflags for faults. Debuggers
-* should sometimes set it there too. tf_eflags is kept in
-* the signal context during signal handling and there is no
-* other place to remember it, so the PSL_RF bit may be
-* corrupted by the signal handler without us knowing.
-* Corruption of the PSL_RF bit at worst causes one more or
-* one less debugger trap, so allowing it is fairly harmless.
-*/
- if (!EFL_SECURE(eflags ~PSL_RF, regs-tf_rflags ~PSL_RF)) {
+ if (!EFL_SECURE(eflags, regs-tf_rflags)) {
uprintf(pid %d (%s): freebsd4_freebsd32_sigreturn eflags =
0x%x\n,
td-td_proc-p_pid, td-td_name, eflags);
return (EINVAL);
@@ -873,17 +863,7 @@ freebsd32_sigreturn(td, uap)
/*
* Don't allow users to change privileged or reserved flags.
*/
- /*
-* XXX do allow users to change the privileged flag PSL_RF.
-* The cpu sets PSL_RF in tf_eflags for faults. Debuggers
-* should sometimes set it there too. tf_eflags is kept in
-* the signal context during signal handling and there is no
-* other place to remember it, so the PSL_RF bit may be
-* corrupted by the signal handler without us knowing.
-* Corruption of the PSL_RF bit at worst causes one more or
-* one less debugger trap, so allowing it is fairly harmless.
-*/
- if (!EFL_SECURE(eflags ~PSL_RF, regs-tf_rflags ~PSL_RF)) {
+ if (!EFL_SECURE(eflags, regs-tf_rflags)) {
uprintf(pid %d (%s): freebsd32_sigreturn eflags = 0x%x\n,
td-td_proc-p_pid, td-td_name, eflags);
return (EINVAL);
Modified:
svn commit: r258561 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon Nov 25 16:06:24 2013
New Revision: 258561
URL: http://svnweb.freebsd.org/changeset/base/258561
Log:
MFV r258377: 4088 use after free in arc_release()
illumos/illumos-gate@ccc22e130479b5bd7c0002267fee1e0602d3f772
Modified:
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/cddl/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 16:06:07 2013(r258560)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 16:06:24 2013(r258561)
@@ -3460,6 +3460,7 @@ arc_release(arc_buf_t *buf, void *tag)
if (l2hdr) {
mutex_enter(l2arc_buflist_mtx);
hdr-b_l2hdr = NULL;
+ list_remove(l2hdr-b_dev-l2ad_buflist, hdr);
}
buf_size = hdr-b_size;
@@ -3546,7 +3547,6 @@ arc_release(arc_buf_t *buf, void *tag)
if (l2hdr) {
trim_map_free(l2hdr-b_dev-l2ad_vdev, l2hdr-b_daddr,
hdr-b_size, 0);
- list_remove(l2hdr-b_dev-l2ad_buflist, hdr);
kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t));
ARCSTAT_INCR(arcstat_l2_size, -buf_size);
mutex_exit(l2arc_buflist_mtx);
___
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: r258560 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon Nov 25 16:06:07 2013
New Revision: 258560
URL: http://svnweb.freebsd.org/changeset/base/258560
Log:
MFV r258377: 4088 use after free in arc_release()
illumos/illumos-gate@ccc22e130479b5bd7c0002267fee1e0602d3f772
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 15:58:48 2013(r258559)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 16:06:07 2013(r258560)
@@ -3542,6 +3542,7 @@ arc_release(arc_buf_t *buf, void *tag)
if (l2hdr) {
mutex_enter(l2arc_buflist_mtx);
hdr-b_l2hdr = NULL;
+ list_remove(l2hdr-b_dev-l2ad_buflist, hdr);
}
buf_size = hdr-b_size;
@@ -3629,7 +3630,6 @@ arc_release(arc_buf_t *buf, void *tag)
ARCSTAT_INCR(arcstat_l2_asize, -l2hdr-b_asize);
trim_map_free(l2hdr-b_dev-l2ad_vdev, l2hdr-b_daddr,
hdr-b_size, 0);
- list_remove(l2hdr-b_dev-l2ad_buflist, hdr);
kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t));
ARCSTAT_INCR(arcstat_l2_size, -buf_size);
mutex_exit(l2arc_buflist_mtx);
___
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: r258562 - head/sys/cddl/contrib/opensolaris
Author: avg Date: Mon Nov 25 16:19:21 2013 New Revision: 258562 URL: http://svnweb.freebsd.org/changeset/base/258562 Log: MFV r258386: 4322 ZFS deadlock on dp_config_rwlock illumos/illumos-gate@c50d56f667f119d78fa3d94d6bef2c298ba556f6 This is a record-only commit as the the fix is already in FreeBSD as ir258294. Modified: Directory Properties: head/sys/cddl/contrib/opensolaris/ (props changed) ___ 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: r258563 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon Nov 25 16:31:31 2013
New Revision: 258563
URL: http://svnweb.freebsd.org/changeset/base/258563
Log:
MFC r258353: zfs page_busy: fix the boundaries of the cleared range
This is a fix for a regression introduced in r246293.
vm_page_clear_dirty expects the range to have DEV_BSIZE aligned boundaries,
otherwise it extends them. Thus it can happen that the whole page is
marked clean while actually having some small dirty region(s).
This commit makes the range properly aligned and ensures that only
the clean data is marked as such.
It would interesting to evaluate how much benefit clearing with DEV_BSIZE
granularity produces. Perhaps instead we should clear the whole page
when it is completely overwritten and don't bother clearing any bits
if only a portion a page is written.
Reviewed by: kib
Approved by: re (gjb)
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/10/sys/ (props changed)
stable/10/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Mon Nov 25 16:19:21 2013(r258562)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Mon Nov 25 16:31:31 2013(r258563)
@@ -329,6 +329,20 @@ page_busy(vnode_t *vp, int64_t start, in
{
vm_object_t obj;
vm_page_t pp;
+ int64_t end;
+
+ /*
+* At present vm_page_clear_dirty extends the cleared range to DEV_BSIZE
+* aligned boundaries, if the range is not aligned. As a result a
+* DEV_BSIZE subrange with partially dirty data may get marked as clean.
+* It may happen that all DEV_BSIZE subranges are marked clean and thus
+* the whole page would be considred clean despite have some dirty data.
+* For this reason we should shrink the range to DEV_BSIZE aligned
+* boundaries before calling vm_page_clear_dirty.
+*/
+ end = rounddown2(off + nbytes, DEV_BSIZE);
+ off = roundup2(off, DEV_BSIZE);
+ nbytes = end - off;
obj = vp-v_object;
zfs_vmobject_assert_wlocked(obj);
@@ -363,7 +377,8 @@ page_busy(vnode_t *vp, int64_t start, in
ASSERT3U(pp-valid, ==, VM_PAGE_BITS_ALL);
vm_object_pip_add(obj, 1);
pmap_remove_write(pp);
- vm_page_clear_dirty(pp, off, nbytes);
+ if (nbytes != 0)
+ vm_page_clear_dirty(pp, off, nbytes);
}
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: r258564 - head/usr.sbin/rpcbind
Author: hrs Date: Mon Nov 25 16:44:02 2013 New Revision: 258564 URL: http://svnweb.freebsd.org/changeset/base/258564 Log: Replace Sun RPC license with a 3-clause BSD license, with the explicit permission of Sun Microsystems in 2009. Modified: head/usr.sbin/rpcbind/check_bound.c head/usr.sbin/rpcbind/pmap_svc.c head/usr.sbin/rpcbind/rpcb_stat.c head/usr.sbin/rpcbind/rpcb_svc.c head/usr.sbin/rpcbind/rpcb_svc_4.c head/usr.sbin/rpcbind/rpcb_svc_com.c head/usr.sbin/rpcbind/rpcbind.c head/usr.sbin/rpcbind/rpcbind.h head/usr.sbin/rpcbind/warmstart.c Modified: head/usr.sbin/rpcbind/check_bound.c == --- head/usr.sbin/rpcbind/check_bound.c Mon Nov 25 16:31:31 2013 (r258563) +++ head/usr.sbin/rpcbind/check_bound.c Mon Nov 25 16:44:02 2013 (r258564) @@ -1,33 +1,32 @@ /* $NetBSD: check_bound.c,v 1.2 2000/06/22 08:09:26 fvdl Exp $ */ /* $FreeBSD$ */ -/* - * Sun RPC is a product of Sun Microsystems, Inc. and is provided for - * unrestricted use provided that this legend is included on all tape - * media and as a part of the software program in whole or part. Users - * may copy or modify Sun RPC without charge, but are not authorized - * to license or distribute it to anyone else except as part of a product or - * program developed by the user. - * - * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE - * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR - * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * - * Sun RPC is provided with no support and without any obligation on the - * part of Sun Microsystems, Inc. to assist in its use, correction, - * modification or enhancement. - * - * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE - * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC - * OR ANY PART THEREOF. - * - * In no event will Sun Microsystems, Inc. be liable for any lost revenue - * or profits or other special, indirect and consequential damages, even if - * Sun has been advised of the possibility of such damages. - * - * Sun Microsystems, Inc. - * 2550 Garcia Avenue - * Mountain View, California 94043 +/*- + * Copyright (c) 2009, Sun Microsystems, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * - Neither the name of Sun Microsystems, Inc. nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ /* * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc. Modified: head/usr.sbin/rpcbind/pmap_svc.c == --- head/usr.sbin/rpcbind/pmap_svc.cMon Nov 25 16:31:31 2013 (r258563) +++ head/usr.sbin/rpcbind/pmap_svc.cMon Nov 25 16:44:02 2013 (r258564) @@ -1,33 +1,32 @@ /* $NetBSD: pmap_svc.c,v 1.2 2000/10/20 11:49:40 fvdl Exp $*/ /* $FreeBSD$ */ -/* - * Sun RPC is a product of Sun Microsystems, Inc. and is provided for - * unrestricted use provided that this legend is included on all tape - * media and as a part of the software program in whole or part. Users - * may copy or modify Sun RPC without charge, but are not authorized - * to license or distribute it to anyone else except as part of a product or - * program developed by the user. - * - * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE - * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR - * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * - * Sun RPC is
svn commit: r258565 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon Nov 25 17:19:05 2013
New Revision: 258565
URL: http://svnweb.freebsd.org/changeset/base/258565
Log:
MFV r258377: 4088 use after free in arc_release()
illumos/illumos-gate@ccc22e130479b5bd7c0002267fee1e0602d3f772
Approved by: re (gjb)
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
stable/10/sys/ (props changed)
stable/10/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 16:44:02 2013(r258564)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 17:19:05 2013(r258565)
@@ -3540,6 +3540,7 @@ arc_release(arc_buf_t *buf, void *tag)
if (l2hdr) {
mutex_enter(l2arc_buflist_mtx);
hdr-b_l2hdr = NULL;
+ list_remove(l2hdr-b_dev-l2ad_buflist, hdr);
}
buf_size = hdr-b_size;
@@ -3627,7 +3628,6 @@ arc_release(arc_buf_t *buf, void *tag)
ARCSTAT_INCR(arcstat_l2_asize, -l2hdr-b_asize);
trim_map_free(l2hdr-b_dev-l2ad_vdev, l2hdr-b_daddr,
hdr-b_size, 0);
- list_remove(l2hdr-b_dev-l2ad_buflist, hdr);
kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t));
ARCSTAT_INCR(arcstat_l2_size, -buf_size);
mutex_exit(l2arc_buflist_mtx);
___
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: r258566 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon Nov 25 17:30:18 2013
New Revision: 258566
URL: http://svnweb.freebsd.org/changeset/base/258566
Log:
MFV r258378: 4089 NULL pointer dereference in arc_read()
illumos/illumos-gate@57815f6b95a743697e148327725b7f568e75e6ea
Tested by:adrian
Approved by: re (gjb)
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
stable/10/sys/ (props changed)
stable/10/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 17:19:05 2013(r258565)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov
25 17:30:18 2013(r258566)
@@ -20,9 +20,9 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
*/
/*
@@ -3173,6 +3173,8 @@ top:
vdev_t *vd = NULL;
uint64_t addr = 0;
boolean_t devw = B_FALSE;
+ enum zio_compress b_compress = ZIO_COMPRESS_OFF;
+ uint64_t b_asize = 0;
if (hdr == NULL) {
/* this block is not in the cache */
@@ -3242,10 +3244,12 @@ top:
hdr-b_acb = acb;
hdr-b_flags |= ARC_IO_IN_PROGRESS;
- if (HDR_L2CACHE(hdr) hdr-b_l2hdr != NULL
+ if (hdr-b_l2hdr != NULL
(vd = hdr-b_l2hdr-b_dev-l2ad_vdev) != NULL) {
devw = hdr-b_l2hdr-b_dev-l2ad_writing;
addr = hdr-b_l2hdr-b_daddr;
+ b_compress = hdr-b_l2hdr-b_compress;
+ b_asize = hdr-b_l2hdr-b_asize;
/*
* Lock out device removal.
*/
@@ -3296,7 +3300,7 @@ top:
cb-l2rcb_bp = *bp;
cb-l2rcb_zb = *zb;
cb-l2rcb_flags = zio_flags;
- cb-l2rcb_compress = hdr-b_l2hdr-b_compress;
+ cb-l2rcb_compress = b_compress;
ASSERT(addr = VDEV_LABEL_START_SIZE
addr + size vd-vdev_psize -
@@ -3308,8 +3312,7 @@ top:
* Issue a null zio if the underlying buffer
* was squashed to zero size by compression.
*/
- if (hdr-b_l2hdr-b_compress ==
- ZIO_COMPRESS_EMPTY) {
+ if (b_compress == ZIO_COMPRESS_EMPTY) {
rzio = zio_null(pio, spa, vd,
l2arc_read_done, cb,
zio_flags | ZIO_FLAG_DONT_CACHE |
@@ -3318,8 +3321,8 @@ top:
ZIO_FLAG_DONT_RETRY);
} else {
rzio = zio_read_phys(pio, vd, addr,
- hdr-b_l2hdr-b_asize,
- buf-b_data, ZIO_CHECKSUM_OFF,
+ b_asize, buf-b_data,
+ ZIO_CHECKSUM_OFF,
l2arc_read_done, cb, priority,
zio_flags | ZIO_FLAG_DONT_CACHE |
ZIO_FLAG_CANFAIL |
@@ -3328,8 +3331,7 @@ top:
}
DTRACE_PROBE2(l2arc__read, vdev_t *, vd,
zio_t *, rzio);
- ARCSTAT_INCR(arcstat_l2_read_bytes,
- hdr-b_l2hdr-b_asize);
+ ARCSTAT_INCR(arcstat_l2_read_bytes, b_asize);
if (*arc_flags ARC_NOWAIT) {
zio_nowait(rzio);
___
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: r258567 - in vendor/subversion/dist: . subversion/include subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_subr subversion/libsvn_wc
Author: peter Date: Mon Nov 25 17:44:04 2013 New Revision: 258567 URL: http://svnweb.freebsd.org/changeset/base/258567 Log: Import subversion-1.8.5 Modified: vendor/subversion/dist/CHANGES vendor/subversion/dist/Makefile.in vendor/subversion/dist/build-outputs.mk vendor/subversion/dist/build.conf vendor/subversion/dist/configure vendor/subversion/dist/configure.ac vendor/subversion/dist/subversion/include/svn_version.h vendor/subversion/dist/subversion/libsvn_client/externals.c vendor/subversion/dist/subversion/libsvn_fs_fs/fs_fs.c vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache-db.h vendor/subversion/dist/subversion/libsvn_subr/internal_statements.h vendor/subversion/dist/subversion/libsvn_wc/diff.h vendor/subversion/dist/subversion/libsvn_wc/diff_local.c vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h vendor/subversion/dist/subversion/libsvn_wc/wc-queries.h Modified: vendor/subversion/dist/CHANGES == --- vendor/subversion/dist/CHANGES Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/CHANGES Mon Nov 25 17:44:04 2013 (r258567) @@ -1,3 +1,33 @@ +Version 1.8.5 +(25 November 2013, from /branches/1.8.x) +http://svn.apache.org/repos/asf/subversion/tags/1.8.5 + + User-visible changes: + - Client-side bugfixes: +* fix externals that point at redirected locations (issues #4428, #4429) +* diff: fix assertion with move inside a copy (issue #) + + - Server-side bugfixes: +* mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al) +* mod_dav_svn: canonicalize paths properly (r1542071) +* mod_authz_svn: fix crash of mod_authz_svn with invalid config (r1541432) +* hotcopy: fix hotcopy losing revprop files in packed repos (issue #4448) + + - Other tool improvements and bugfixes: +* mod_dontdothat: Fix the uri parser (r1542069 et al) + + Developer-visible changes: + - General: +* fix compilation with '--enable-optimize' with clang (r1534860) +* fix copmpilation with debug build of BDB on Windows (r1501656, r1501702) +* fix '--with-openssl' option when building on Windows (r1535139) +* add test to fail when built against broken ZLib (r1537193 et al) + + - Bindings: +* swig-rb: fix tests to run without installing on OS X (r1535161) +* ctypes-python: build with compiler selected via configure (r1536537) + + Version 1.8.4 (29 October 2013, from /branches/1.8.x) http://svn.apache.org/repos/asf/subversion/tags/1.8.4 @@ -32,7 +62,7 @@ http://svn.apache.org/repos/asf/subversi * allow compiling against serf 1.3 and later on Windows (r1517123) - Bindings: -* javahl: canonicalize path for streaFileContent method (r1524869) +* javahl: canonicalize path for streamFileContent method (r1524869) Version 1.8.3 @@ -523,6 +553,36 @@ http://svn.apache.org/repos/asf/subversi * fix some reference counting bugs in swig-py bindings (r1464899, r1466524) +Version 1.7.14 +(25 Nov 2013, from /branches/1.7.x) +http://svn.apache.org/repos/asf/subversion/tags/1.7.14 + + User-visible changes: + - Client- and server-side bugfixes: +* fix assertion on urls of the form 'file://./' (r1516806) + + - Client-side bugfixes: +* upgrade: fix an assertion when used with pre-1.3 wcs (r1530849) +* ra_local: fix error with repository in Windows drive root (r1518184) +* fix crash on windows when piped command is interrupted (r1522892) +* fix externals that point at redirected locations (issues #4428, #4429) +* diff: fix incorrect calculation of changes in some cases (issue #4283) +* diff: fix errors with added/deleted targets (issues #4153, #4421) + + - Server-side bugfixes: +* mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al) +* fix OOM on concurrent requests at threaded server start (r1527103 et al) +* fsfs: limit commit time of files with deep change histories (r1536790) +* mod_dav_svn: canonicalize paths properly (r1542071) + + - Other tool improvements and bugfixes: +* mod_dontdothat: Fix the uri parser (r1542069 et al) + + Developer-visible changes: + - Bindings: +* javahl: canonicalize path for streamFileContent method (r1524869) + + Version 1.7.13 (29 Aug 2013, from /branches/1.7.x) http://svn.apache.org/repos/asf/subversion/tags/1.7.13 Modified: vendor/subversion/dist/Makefile.in == --- vendor/subversion/dist/Makefile.in Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/Makefile.in Mon Nov 25 17:44:04 2013 (r258567) @@ -108,6 +108,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ CC = @CC@ CXX = @CXX@ +CPP = @CPP@ EXEEXT = @EXEEXT@ SHELL = @SHELL@ @@ -331,7 +332,7 @@ INSTALL_EXTRA_SWIG_RB=\ # export an env variable so that the tests can
svn commit: r258568 - vendor/subversion/subversion-1.8.5
Author: peter Date: Mon Nov 25 17:45:20 2013 New Revision: 258568 URL: http://svnweb.freebsd.org/changeset/base/258568 Log: Tag subversion-1.8.5 import Added: vendor/subversion/subversion-1.8.5/ - copied from r258567, vendor/subversion/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: r258569 - in head: contrib/subversion contrib/subversion/subversion/include contrib/subversion/subversion/libsvn_client contrib/subversion/subversion/libsvn_fs_fs contrib/subversion/sub...
Author: peter Date: Mon Nov 25 17:52:16 2013 New Revision: 258569 URL: http://svnweb.freebsd.org/changeset/base/258569 Log: Import svn-1.8.5. This contains a user-visible fix for svn:externals handling (there are no svn:externals in freebsd repo), and two security fixes for modules that we don't build for the apache http server stack. Modified: head/contrib/subversion/CHANGES head/contrib/subversion/Makefile.in head/contrib/subversion/build-outputs.mk head/contrib/subversion/build.conf head/contrib/subversion/configure head/contrib/subversion/configure.ac head/contrib/subversion/subversion/include/svn_version.h head/contrib/subversion/subversion/libsvn_client/externals.c head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h head/contrib/subversion/subversion/libsvn_subr/internal_statements.h head/contrib/subversion/subversion/libsvn_wc/diff.h head/contrib/subversion/subversion/libsvn_wc/diff_local.c head/contrib/subversion/subversion/libsvn_wc/wc-checks.h head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h head/contrib/subversion/subversion/libsvn_wc/wc-queries.h head/usr.bin/svn/svn_private_config.h Directory Properties: head/contrib/subversion/ (props changed) Modified: head/contrib/subversion/CHANGES == --- head/contrib/subversion/CHANGES Mon Nov 25 17:45:20 2013 (r258568) +++ head/contrib/subversion/CHANGES Mon Nov 25 17:52:16 2013 (r258569) @@ -1,3 +1,33 @@ +Version 1.8.5 +(25 November 2013, from /branches/1.8.x) +http://svn.apache.org/repos/asf/subversion/tags/1.8.5 + + User-visible changes: + - Client-side bugfixes: +* fix externals that point at redirected locations (issues #4428, #4429) +* diff: fix assertion with move inside a copy (issue #) + + - Server-side bugfixes: +* mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al) +* mod_dav_svn: canonicalize paths properly (r1542071) +* mod_authz_svn: fix crash of mod_authz_svn with invalid config (r1541432) +* hotcopy: fix hotcopy losing revprop files in packed repos (issue #4448) + + - Other tool improvements and bugfixes: +* mod_dontdothat: Fix the uri parser (r1542069 et al) + + Developer-visible changes: + - General: +* fix compilation with '--enable-optimize' with clang (r1534860) +* fix copmpilation with debug build of BDB on Windows (r1501656, r1501702) +* fix '--with-openssl' option when building on Windows (r1535139) +* add test to fail when built against broken ZLib (r1537193 et al) + + - Bindings: +* swig-rb: fix tests to run without installing on OS X (r1535161) +* ctypes-python: build with compiler selected via configure (r1536537) + + Version 1.8.4 (29 October 2013, from /branches/1.8.x) http://svn.apache.org/repos/asf/subversion/tags/1.8.4 @@ -32,7 +62,7 @@ http://svn.apache.org/repos/asf/subversi * allow compiling against serf 1.3 and later on Windows (r1517123) - Bindings: -* javahl: canonicalize path for streaFileContent method (r1524869) +* javahl: canonicalize path for streamFileContent method (r1524869) Version 1.8.3 @@ -523,6 +553,36 @@ http://svn.apache.org/repos/asf/subversi * fix some reference counting bugs in swig-py bindings (r1464899, r1466524) +Version 1.7.14 +(25 Nov 2013, from /branches/1.7.x) +http://svn.apache.org/repos/asf/subversion/tags/1.7.14 + + User-visible changes: + - Client- and server-side bugfixes: +* fix assertion on urls of the form 'file://./' (r1516806) + + - Client-side bugfixes: +* upgrade: fix an assertion when used with pre-1.3 wcs (r1530849) +* ra_local: fix error with repository in Windows drive root (r1518184) +* fix crash on windows when piped command is interrupted (r1522892) +* fix externals that point at redirected locations (issues #4428, #4429) +* diff: fix incorrect calculation of changes in some cases (issue #4283) +* diff: fix errors with added/deleted targets (issues #4153, #4421) + + - Server-side bugfixes: +* mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al) +* fix OOM on concurrent requests at threaded server start (r1527103 et al) +* fsfs: limit commit time of files with deep change histories (r1536790) +* mod_dav_svn: canonicalize paths properly (r1542071) + + - Other tool improvements and bugfixes: +* mod_dontdothat: Fix the uri parser (r1542069 et al) + + Developer-visible changes: + - Bindings: +* javahl: canonicalize path for streamFileContent method (r1524869) + + Version 1.7.13 (29 Aug 2013, from /branches/1.7.x) http://svn.apache.org/repos/asf/subversion/tags/1.7.13 Modified: head/contrib/subversion/Makefile.in == --- head/contrib/subversion/Makefile.in Mon Nov 25 17:45:20 2013
svn commit: r258570 - in head/release/doc: de_DE.ISO8859-1/readme en_US.ISO8859-1/readme ru_RU.KOI8-R/readme zh_CN.GB2312/readme
Author: rodrigc Date: Mon Nov 25 18:11:55 2013 New Revision: 258570 URL: http://svnweb.freebsd.org/changeset/base/258570 Log: Change sysinstall.8 references to bsdinstall.8. Submitted by: skreuzer Modified: head/release/doc/de_DE.ISO8859-1/readme/article.xml head/release/doc/en_US.ISO8859-1/readme/article.xml head/release/doc/ru_RU.KOI8-R/readme/article.xml head/release/doc/zh_CN.GB2312/readme/article.xml Modified: head/release/doc/de_DE.ISO8859-1/readme/article.xml == --- head/release/doc/de_DE.ISO8859-1/readme/article.xml Mon Nov 25 17:52:16 2013(r258569) +++ head/release/doc/de_DE.ISO8859-1/readme/article.xml Mon Nov 25 18:11:55 2013(r258570) @@ -390,13 +390,13 @@ gehouml;rt, steht immer am Anfang des Textes./para /note - paraAuf den Plattformen, auf denen man.sysinstall.8; zur + paraAuf den Plattformen, auf denen man.bsdinstall.8; zur Verfuuml;gung steht (zur Zeit alpha, i386, ia64, pc98 und sparc64) finden Sie diese Dokumente wauml;hrend der Installation normalerweise unter dem Menuuml;punkt Dokumentation. Um nach der Installation des Systems dieses Menuuml; zugreifen zu kouml;nnen, muuml;ssen Sie das - Programm man.sysinstall.8; erneut aufrufen./para + Programm man.bsdinstall.8; erneut aufrufen./para note paraSie sollten auf jeden Fall die Errata zur jeweiligen Modified: head/release/doc/en_US.ISO8859-1/readme/article.xml == --- head/release/doc/en_US.ISO8859-1/readme/article.xml Mon Nov 25 17:52:16 2013(r258569) +++ head/release/doc/en_US.ISO8859-1/readme/article.xml Mon Nov 25 18:11:55 2013(r258570) @@ -324,11 +324,11 @@ /itemizedlist /para - paraOn platforms that support man.sysinstall.8; (currently + paraOn platforms that support man.bsdinstall.8; (currently arch.amd64;, arch.i386;, arch.ia64;, arch.pc98;, and arch.sparc64;), these documents are generally available via the Documentation menu during installation. Once the system is installed, you can revisit this menu by re-running the - man.sysinstall.8; utility./para + man.bsdinstall.8; utility./para note paraIt is extremely important to read the errata for any Modified: head/release/doc/ru_RU.KOI8-R/readme/article.xml == --- head/release/doc/ru_RU.KOI8-R/readme/article.xmlMon Nov 25 17:52:16 2013(r258569) +++ head/release/doc/ru_RU.KOI8-R/readme/article.xmlMon Nov 25 18:11:55 2013(r258570) @@ -347,12 +347,12 @@ /para - para�� ��, ��� man.sysinstall.8; (� + para�� ��, ��� man.bsdinstall.8; (� � � alpha, i386;, ia64, pc98, � sparc64;), ��� � �� � Documentation �� � �. ��� �� ��� � ���, �� �� � � ��� , - man.sysinstall.8;./para + man.bsdinstall.8;./para note para�� � �� ��� �� � Modified: head/release/doc/zh_CN.GB2312/readme/article.xml == --- head/release/doc/zh_CN.GB2312/readme/article.xmlMon Nov 25 17:52:16 2013(r258569) +++ head/release/doc/zh_CN.GB2312/readme/article.xmlMon Nov 25 18:11:55 2013(r258570) @@ -302,11 +302,11 @@ /itemizedlist /para - para��֧�� man.sysinstall.8; ��ƽ̨�� (Ŀǰ�� + para��֧�� man.bsdinstall.8; ��ƽ̨�� (Ŀǰ�� arch.amd64;�� arch.i386;�� arch.ia64;�� arch.pc98; �Լ� arch.sparc64;)�� ��Щ�ĵ��ڰ�װʱ��ͨ�� Documentation �˵ʡ� һ��ϵͳ�Ѿ���װͨ�� - man.sysinstall.8; �·��ʲ˵���/para + man.bsdinstall.8; �·��ʲ˵���/para note para�ڰ�װ���õκη��а�֮ǰ�Ķ��Ƿdz���Ҫ�ģ� ___ 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: r258571 - vendor/tcpdump/dist
Author: pfg
Date: Mon Nov 25 18:28:34 2013
New Revision: 258571
URL: http://svnweb.freebsd.org/changeset/base/258571
Log:
tcpdump Bring change from upstream.
commit 772d6fbcf592209aa1ab1b61714e8ae72a5b1698
Author: Dmitrij Tejblum tejb...@yandex-team.ru
Date: Sun Jun 2 13:48:44 2013 +0400
Convert some versions of EXTRACT_{16,32,64}BITS() to inline functions.
It removes the vast majority of strict-aliasing warnings from GCC.
Modified:
vendor/tcpdump/dist/extract.h
Modified: vendor/tcpdump/dist/extract.h
==
--- vendor/tcpdump/dist/extract.h Mon Nov 25 18:11:55 2013
(r258570)
+++ vendor/tcpdump/dist/extract.h Mon Nov 25 18:28:34 2013
(r258571)
@@ -51,13 +51,25 @@ typedef struct {
u_int32_t val;
} __attribute__((packed)) unaligned_u_int32_t;
-#define EXTRACT_16BITS(p) \
- ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))-val))
-#define EXTRACT_32BITS(p) \
- ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))-val))
-#define EXTRACT_64BITS(p) \
- ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) +
0)-val)) 32 | \
-((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) +
1)-val)) 0))
+static inline u_int16_t
+EXTRACT_16BITS(const void *p)
+{
+ return ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))-val));
+}
+
+static inline u_int32_t
+EXTRACT_32BITS(const void *p)
+{
+ return ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))-val));
+}
+
+static inline u_int64_t
+EXTRACT_64BITS(const void *p)
+{
+ return ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p)
+ 0)-val)) 32 | \
+ ((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 1)-val))
0));
+
+}
#else /* HAVE___ATTRIBUTE__ */
/*
@@ -88,13 +100,26 @@ typedef struct {
* The processor natively handles unaligned loads, so we can just
* cast the pointer and fetch through it.
*/
-#define EXTRACT_16BITS(p) \
- ((u_int16_t)ntohs(*(const u_int16_t *)(p)))
-#define EXTRACT_32BITS(p) \
- ((u_int32_t)ntohl(*(const u_int32_t *)(p)))
-#define EXTRACT_64BITS(p) \
- ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0))) 32 | \
-((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) 0))
+static inline u_int16_t
+EXTRACT_16BITS(const void *p)
+{
+ return ((u_int16_t)ntohs(*(const u_int16_t *)(p)));
+}
+
+static inline u_int32_t
+EXTRACT_32BITS(const void *p)
+{
+ return ((u_int32_t)ntohl(*(const u_int32_t *)(p)));
+}
+
+static inline u_int64_t
+EXTRACT_64BITS(const void *p)
+{
+ return ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0)))
32 | \
+ ((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) 0));
+
+}
+
#endif /* LBL_ALIGN */
#define EXTRACT_24BITS(p) \
___
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: r258571 - vendor/tcpdump/dist
On Mon, Nov 25, 2013 at 06:28:34PM +, Pedro F. Giffuni wrote:
Author: pfg
Date: Mon Nov 25 18:28:34 2013
New Revision: 258571
URL: http://svnweb.freebsd.org/changeset/base/258571
Log:
tcpdump Bring change from upstream.
commit 772d6fbcf592209aa1ab1b61714e8ae72a5b1698
Author: Dmitrij Tejblum tejb...@yandex-team.ru
Date: Sun Jun 2 13:48:44 2013 +0400
Convert some versions of EXTRACT_{16,32,64}BITS() to inline functions.
It removes the vast majority of strict-aliasing warnings from GCC.
Thank you.
Glen
pgpUj_LDoZRLj.pgp
Description: PGP signature
svn commit: r258572 - head/lib/libpmc
Author: rstone Date: Mon Nov 25 18:31:13 2013 New Revision: 258572 URL: http://svnweb.freebsd.org/changeset/base/258572 Log: pmc(3) does not document a dependency on sys/types.h but pmc.h requires it, so include it explicitly from pmc.h. MFC after:1 month Modified: head/lib/libpmc/pmc.h Modified: head/lib/libpmc/pmc.h == --- head/lib/libpmc/pmc.h Mon Nov 25 18:28:34 2013(r258571) +++ head/lib/libpmc/pmc.h Mon Nov 25 18:31:13 2013(r258572) @@ -30,6 +30,7 @@ #define _PMC_H_ #include sys/cdefs.h +#include sys/types.h #include sys/pmc.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: r258573 - head/contrib/tcpdump
Author: pfg
Date: Mon Nov 25 18:46:08 2013
New Revision: 258573
URL: http://svnweb.freebsd.org/changeset/base/258573
Log:
MFV: removes strict-aliasing warnings from GCC in tcpdump.
Reported by: tinderbox (gjb)
Submitted by: glebius
MFC after:2 weeks
Modified:
head/contrib/tcpdump/extract.h
Directory Properties:
head/contrib/tcpdump/ (props changed)
Modified: head/contrib/tcpdump/extract.h
==
--- head/contrib/tcpdump/extract.h Mon Nov 25 18:31:13 2013
(r258572)
+++ head/contrib/tcpdump/extract.h Mon Nov 25 18:46:08 2013
(r258573)
@@ -51,13 +51,25 @@ typedef struct {
u_int32_t val;
} __attribute__((packed)) unaligned_u_int32_t;
-#define EXTRACT_16BITS(p) \
- ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))-val))
-#define EXTRACT_32BITS(p) \
- ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))-val))
-#define EXTRACT_64BITS(p) \
- ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) +
0)-val)) 32 | \
-((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) +
1)-val)) 0))
+static inline u_int16_t
+EXTRACT_16BITS(const void *p)
+{
+ return ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))-val));
+}
+
+static inline u_int32_t
+EXTRACT_32BITS(const void *p)
+{
+ return ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))-val));
+}
+
+static inline u_int64_t
+EXTRACT_64BITS(const void *p)
+{
+ return ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p)
+ 0)-val)) 32 | \
+ ((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 1)-val))
0));
+
+}
#else /* HAVE___ATTRIBUTE__ */
/*
@@ -88,13 +100,26 @@ typedef struct {
* The processor natively handles unaligned loads, so we can just
* cast the pointer and fetch through it.
*/
-#define EXTRACT_16BITS(p) \
- ((u_int16_t)ntohs(*(const u_int16_t *)(p)))
-#define EXTRACT_32BITS(p) \
- ((u_int32_t)ntohl(*(const u_int32_t *)(p)))
-#define EXTRACT_64BITS(p) \
- ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0))) 32 | \
-((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) 0))
+static inline u_int16_t
+EXTRACT_16BITS(const void *p)
+{
+ return ((u_int16_t)ntohs(*(const u_int16_t *)(p)));
+}
+
+static inline u_int32_t
+EXTRACT_32BITS(const void *p)
+{
+ return ((u_int32_t)ntohl(*(const u_int32_t *)(p)));
+}
+
+static inline u_int64_t
+EXTRACT_64BITS(const void *p)
+{
+ return ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0)))
32 | \
+ ((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) 0));
+
+}
+
#endif /* LBL_ALIGN */
#define EXTRACT_24BITS(p) \
___
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: r258574 - head/sys/netinet
Author: rodrigc
Date: Mon Nov 25 18:49:37 2013
New Revision: 258574
URL: http://svnweb.freebsd.org/changeset/base/258574
Log:
Only initialize some mutexes for the default VNET.
In r208160, sctp_it_ctl was made a global variable, across all VNETs.
However, sctp_init() is called for every VNET that is created. This results
in the same global mutexes which are part of sctp_it_ctl being initialized.
This can result
in crashes if many jails are created.
To reproduce the problem:
(1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS,
INVARIANTS.
(2) Run this command in a loop:
jail -l -u root -c path=/ name=foo persist vnet jexec foo ifconfig
lo0 127.0.0.1/8 jail -r foo
(see
http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html )
Witness will warn about the same mutex being initialized.
Fix the problem by only initializing these mutexes in the default VNET.
Modified:
head/sys/netinet/sctp_pcb.c
Modified: head/sys/netinet/sctp_pcb.c
==
--- head/sys/netinet/sctp_pcb.c Mon Nov 25 18:46:08 2013(r258573)
+++ head/sys/netinet/sctp_pcb.c Mon Nov 25 18:49:37 2013(r258574)
@@ -5864,8 +5864,14 @@ sctp_pcb_init()
for (i = 0; i SCTP_STACK_VTAG_HASH_SIZE; i++) {
LIST_INIT(SCTP_BASE_INFO(vtag_timewait)[i]);
}
- SCTP_ITERATOR_LOCK_INIT();
- SCTP_IPI_ITERATOR_WQ_INIT();
+ /*
+* Only initialize non-VNET global mutexes for the
+* default instance.
+*/
+ if (IS_DEFAULT_VNET(curvnet)) {
+ SCTP_ITERATOR_LOCK_INIT();
+ SCTP_IPI_ITERATOR_WQ_INIT();
+ }
sctp_startup_iterator();
#if defined(__FreeBSD__) defined(SCTP_MCORE_INPUT) defined(SMP)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r258575 - stable/9/sys/sys
Author: avg Date: Mon Nov 25 18:51:25 2013 New Revision: 258575 URL: http://svnweb.freebsd.org/changeset/base/258575 Log: MFC r240834: Add rounddown2() macro similar to the roundup2() macro. MFC slacker: pjd Modified: stable/9/sys/sys/param.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/sys/sys/param.h == --- stable/9/sys/sys/param.hMon Nov 25 18:49:37 2013(r258574) +++ stable/9/sys/sys/param.hMon Nov 25 18:51:25 2013(r258575) @@ -277,6 +277,7 @@ #endif #definenitems(x) (sizeof((x)) / sizeof((x)[0])) #definerounddown(x, y) (((x)/(y))*(y)) +#definerounddown2(x, y) ((x)(~((y)-1))) /* if y is power of two */ #defineroundup(x, y) x)+((y)-1))/(y))*(y)) /* to any y */ #defineroundup2(x, y) (((x)+((y)-1))(~((y)-1))) /* if y is powers of two */ #define powerof2(x)x)-1)(x))==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: r258576 - stable/8/sys/sys
Author: avg Date: Mon Nov 25 18:51:53 2013 New Revision: 258576 URL: http://svnweb.freebsd.org/changeset/base/258576 Log: MFC r240834: Add rounddown2() macro similar to the roundup2() macro. MFC slacker: pjd Modified: stable/8/sys/sys/param.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/sys/ (props changed) Modified: stable/8/sys/sys/param.h == --- stable/8/sys/sys/param.hMon Nov 25 18:51:25 2013(r258575) +++ stable/8/sys/sys/param.hMon Nov 25 18:51:53 2013(r258576) @@ -273,6 +273,7 @@ #endif #definenitems(x) (sizeof((x)) / sizeof((x)[0])) #definerounddown(x, y) (((x)/(y))*(y)) +#definerounddown2(x, y) ((x)(~((y)-1))) /* if y is power of two */ #defineroundup(x, y) x)+((y)-1))/(y))*(y)) /* to any y */ #defineroundup2(x, y) (((x)+((y)-1))(~((y)-1))) /* if y is powers of two */ #define powerof2(x)x)-1)(x))==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: r258571 - vendor/tcpdump/dist
On 25.11.2013 13:30, Glen Barber wrote:
On Mon, Nov 25, 2013 at 06:28:34PM +, Pedro F. Giffuni wrote:
Author: pfg
Date: Mon Nov 25 18:28:34 2013
New Revision: 258571
URL: http://svnweb.freebsd.org/changeset/base/258571
Log:
tcpdump Bring change from upstream.
commit 772d6fbcf592209aa1ab1b61714e8ae72a5b1698
Author: Dmitrij Tejblum tejb...@yandex-team.ru
Date: Sun Jun 2 13:48:44 2013 +0400
Convert some versions of EXTRACT_{16,32,64}BITS() to inline functions.
It removes the vast majority of strict-aliasing warnings from GCC.
Thank you.
Glen
There are still issues though (?):
...
/usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:
In function 'main':
/usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:1210:
warning: implicit declaration of function 'cap_rights_init'
/usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:1211:
warning: implicit declaration of function 'cap_rights_limit'
/usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:1494:
warning: implicit declaration of function 'cap_ioctls_limit'
/usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:1621:
warning: implicit declaration of function 'cap_sandboxed'
*** [tcpdump.o] Error code 1
Stop in /usr/src10/usr.sbin/tcpdump.
_
Pedro.
___
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: r258571 - vendor/tcpdump/dist
On 25.11.2013 13:49, Pedro Giffuni wrote:
On 25.11.2013 13:30, Glen Barber wrote:
On Mon, Nov 25, 2013 at 06:28:34PM +, Pedro F. Giffuni wrote:
Author: pfg
Date: Mon Nov 25 18:28:34 2013
New Revision: 258571
URL: http://svnweb.freebsd.org/changeset/base/258571
Log:
tcpdump Bring change from upstream.
commit 772d6fbcf592209aa1ab1b61714e8ae72a5b1698
Author: Dmitrij Tejblum tejb...@yandex-team.ru
Date: Sun Jun 2 13:48:44 2013 +0400
Convert some versions of EXTRACT_{16,32,64}BITS() to
inline functions.
It removes the vast majority of strict-aliasing warnings
from GCC.
Thank you.
Glen
There are still issues though (?):
...
Nevermind ... that was because I was still using old headers.
Build should be fine, thanks to Glebius for the fix and to Glen
pinching arm!
Pedro.
___
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: r258578 - in head: include/rpc lib/libc/rpc sys/rpc
Author: hrs Date: Mon Nov 25 19:04:36 2013 New Revision: 258578 URL: http://svnweb.freebsd.org/changeset/base/258578 Log: Replace Sun RPC license in TI-RPC library with a 3-clause BSD license, with the explicit permission of Sun Microsystems in 2009. Modified: head/include/rpc/auth.h head/include/rpc/auth_des.h head/include/rpc/auth_kerb.h head/include/rpc/auth_unix.h head/include/rpc/clnt_soc.h head/include/rpc/des.h head/include/rpc/des_crypt.h head/include/rpc/nettype.h head/include/rpc/pmap_clnt.h head/include/rpc/pmap_prot.h head/include/rpc/pmap_rmt.h head/include/rpc/raw.h head/include/rpc/rpc.h head/include/rpc/rpc_com.h head/include/rpc/rpc_msg.h head/include/rpc/rpcb_clnt.h head/include/rpc/rpcb_prot.x head/include/rpc/rpcent.h head/include/rpc/svc.h head/include/rpc/svc_auth.h head/include/rpc/svc_dg.h head/include/rpc/svc_soc.h head/include/rpc/xdr.h head/lib/libc/rpc/DISCLAIMER head/lib/libc/rpc/auth_des.c head/lib/libc/rpc/auth_none.c head/lib/libc/rpc/auth_unix.c head/lib/libc/rpc/authdes_prot.c head/lib/libc/rpc/authunix_prot.c head/lib/libc/rpc/bindresvport.c head/lib/libc/rpc/clnt_bcast.c head/lib/libc/rpc/clnt_dg.c head/lib/libc/rpc/clnt_perror.c head/lib/libc/rpc/clnt_raw.c head/lib/libc/rpc/clnt_simple.c head/lib/libc/rpc/clnt_vc.c head/lib/libc/rpc/des_crypt.c head/lib/libc/rpc/des_soft.c head/lib/libc/rpc/getnetconfig.c head/lib/libc/rpc/getnetpath.c head/lib/libc/rpc/getpublickey.c head/lib/libc/rpc/getrpcent.c head/lib/libc/rpc/getrpcport.c head/lib/libc/rpc/key_call.c head/lib/libc/rpc/key_prot_xdr.c head/lib/libc/rpc/netname.c head/lib/libc/rpc/netnamer.c head/lib/libc/rpc/pmap_clnt.c head/lib/libc/rpc/pmap_getmaps.c head/lib/libc/rpc/pmap_getport.c head/lib/libc/rpc/pmap_prot.c head/lib/libc/rpc/pmap_prot2.c head/lib/libc/rpc/pmap_rmt.c head/lib/libc/rpc/rpc_callmsg.c head/lib/libc/rpc/rpc_com.h head/lib/libc/rpc/rpc_commondata.c head/lib/libc/rpc/rpc_dtablesize.c head/lib/libc/rpc/rpc_generic.c head/lib/libc/rpc/rpc_prot.c head/lib/libc/rpc/rpc_soc.c head/lib/libc/rpc/rpcb_prot.c head/lib/libc/rpc/rpcb_st_xdr.c head/lib/libc/rpc/rpcdname.c head/lib/libc/rpc/rtime.c head/lib/libc/rpc/svc.c head/lib/libc/rpc/svc_auth.c head/lib/libc/rpc/svc_auth_des.c head/lib/libc/rpc/svc_auth_unix.c head/lib/libc/rpc/svc_dg.c head/lib/libc/rpc/svc_generic.c head/lib/libc/rpc/svc_raw.c head/lib/libc/rpc/svc_run.c head/lib/libc/rpc/svc_simple.c head/lib/libc/rpc/svc_vc.c head/sys/rpc/auth.h head/sys/rpc/auth_none.c head/sys/rpc/auth_unix.c head/sys/rpc/authunix_prot.c head/sys/rpc/clnt_dg.c head/sys/rpc/clnt_vc.c head/sys/rpc/krpc.h head/sys/rpc/nettype.h head/sys/rpc/pmap_prot.h head/sys/rpc/rpc.h head/sys/rpc/rpc_callmsg.c head/sys/rpc/rpc_com.h head/sys/rpc/rpc_generic.c head/sys/rpc/rpc_msg.h head/sys/rpc/rpc_prot.c head/sys/rpc/rpcb_clnt.c head/sys/rpc/rpcb_prot.c head/sys/rpc/rpcb_prot.h head/sys/rpc/svc.c head/sys/rpc/svc.h head/sys/rpc/svc_auth.c head/sys/rpc/svc_auth.h head/sys/rpc/svc_auth_unix.c head/sys/rpc/svc_dg.c head/sys/rpc/svc_generic.c head/sys/rpc/svc_vc.c head/sys/rpc/types.h head/sys/rpc/xdr.h Modified: head/include/rpc/auth.h == --- head/include/rpc/auth.h Mon Nov 25 19:04:10 2013(r258577) +++ head/include/rpc/auth.h Mon Nov 25 19:04:36 2013(r258578) @@ -1,32 +1,31 @@ /* $NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl Exp $ */ -/* - * Sun RPC is a product of Sun Microsystems, Inc. and is provided for - * unrestricted use provided that this legend is included on all tape - * media and as a part of the software program in whole or part. Users - * may copy or modify Sun RPC without charge, but are not authorized - * to license or distribute it to anyone else except as part of a product or - * program developed by the user. - * - * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE - * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * - * Sun RPC is provided with no support and without any obligation on the - * part of Sun Microsystems, Inc. to assist in its use, correction, - * modification or enhancement. - * - * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE - * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC - * OR ANY PART THEREOF. - * - * In no event will Sun Microsystems, Inc. be liable for any lost revenue - * or profits or other special, indirect and consequential damages, even if - * Sun has been advised of the possibility of such damages. - * - * Sun Microsystems, Inc. - * 2550 Garcia Avenue - * Mountain View, California 94043 +/*- + * Copyright (c) 2009, Sun Microsystems, Inc. + * All rights
svn commit: r258579 - in head: lib/libvmmapi sys/amd64/include sys/amd64/vmm sys/amd64/vmm/io sys/modules/vmm usr.sbin/bhyve
Author: neel
Date: Mon Nov 25 19:04:51 2013
New Revision: 258579
URL: http://svnweb.freebsd.org/changeset/base/258579
Log:
Add HPET device emulation to bhyve.
bhyve supports a single timer block with 8 timers. The timers are all 32-bit
and capable of being operated in periodic mode. All timers support interrupt
delivery using MSI. Timers 0 and 1 also support legacy interrupt routing.
At the moment the timers are not connected to any ioapic pins but that will
be addressed in a subsequent commit.
This change is based on a patch from Tycho Nightingale
(tycho.nighting...@pluribusnetworks.com).
Added:
head/sys/amd64/vmm/io/vhpet.c (contents, props changed)
head/sys/amd64/vmm/io/vhpet.h (contents, props changed)
Modified:
head/lib/libvmmapi/vmmapi.c
head/lib/libvmmapi/vmmapi.h
head/sys/amd64/include/vmm.h
head/sys/amd64/include/vmm_dev.h
head/sys/amd64/vmm/io/vioapic.h
head/sys/amd64/vmm/vmm.c
head/sys/amd64/vmm/vmm_dev.c
head/sys/modules/vmm/Makefile
head/usr.sbin/bhyve/acpi.c
Modified: head/lib/libvmmapi/vmmapi.c
==
--- head/lib/libvmmapi/vmmapi.c Mon Nov 25 19:04:36 2013(r258578)
+++ head/lib/libvmmapi/vmmapi.c Mon Nov 25 19:04:51 2013(r258579)
@@ -825,3 +825,16 @@ vm_get_gpa_pmap(struct vmctx *ctx, uint6
return (error);
}
+
+int
+vm_get_hpet_capabilities(struct vmctx *ctx, uint32_t *capabilities)
+{
+ int error;
+ struct vm_hpet_cap cap;
+
+ bzero(cap, sizeof(struct vm_hpet_cap));
+ error = ioctl(ctx-fd, VM_GET_HPET_CAPABILITIES, cap);
+ if (capabilities != NULL)
+ *capabilities = cap.capabilities;
+ return (error);
+}
Modified: head/lib/libvmmapi/vmmapi.h
==
--- head/lib/libvmmapi/vmmapi.h Mon Nov 25 19:04:36 2013(r258578)
+++ head/lib/libvmmapi/vmmapi.h Mon Nov 25 19:04:51 2013(r258579)
@@ -96,6 +96,8 @@ const char *vm_get_stat_desc(struct vmct
intvm_get_x2apic_state(struct vmctx *ctx, int vcpu, enum x2apic_state *s);
intvm_set_x2apic_state(struct vmctx *ctx, int vcpu, enum x2apic_state s);
+intvm_get_hpet_capabilities(struct vmctx *ctx, uint32_t *capabilities);
+
/* Reset vcpu register state */
intvcpu_reset(struct vmctx *ctx, int vcpu);
Modified: head/sys/amd64/include/vmm.h
==
--- head/sys/amd64/include/vmm.hMon Nov 25 19:04:36 2013
(r258578)
+++ head/sys/amd64/include/vmm.hMon Nov 25 19:04:51 2013
(r258579)
@@ -38,6 +38,7 @@ struct vm_memory_segment;
struct seg_desc;
struct vm_exit;
struct vm_run;
+struct vhpet;
struct vioapic;
struct vlapic;
struct vmspace;
@@ -118,6 +119,7 @@ void vm_nmi_clear(struct vm *vm, int vcp
uint64_t *vm_guest_msrs(struct vm *vm, int cpu);
struct vlapic *vm_lapic(struct vm *vm, int cpu);
struct vioapic *vm_ioapic(struct vm *vm);
+struct vhpet *vm_hpet(struct vm *vm);
int vm_get_capability(struct vm *vm, int vcpu, int type, int *val);
int vm_set_capability(struct vm *vm, int vcpu, int type, int val);
int vm_get_x2apic_state(struct vm *vm, int vcpu, enum x2apic_state *state);
Modified: head/sys/amd64/include/vmm_dev.h
==
--- head/sys/amd64/include/vmm_dev.hMon Nov 25 19:04:36 2013
(r258578)
+++ head/sys/amd64/include/vmm_dev.hMon Nov 25 19:04:51 2013
(r258579)
@@ -146,6 +146,10 @@ struct vm_gpa_pte {
int ptenum;
};
+struct vm_hpet_cap {
+ uint32_tcapabilities; /* lower 32 bits of HPET capabilities */
+};
+
enum {
/* general routines */
IOCNUM_ABIVERS = 0,
@@ -186,6 +190,7 @@ enum {
/* kernel device state */
IOCNUM_SET_X2APIC_STATE = 60,
IOCNUM_GET_X2APIC_STATE = 61,
+ IOCNUM_GET_HPET_CAPABILITIES = 62,
};
#defineVM_RUN \
@@ -236,6 +241,8 @@ enum {
_IOW('v', IOCNUM_SET_X2APIC_STATE, struct vm_x2apic)
#defineVM_GET_X2APIC_STATE \
_IOWR('v', IOCNUM_GET_X2APIC_STATE, struct vm_x2apic)
+#defineVM_GET_HPET_CAPABILITIES \
+ _IOR('v', IOCNUM_GET_HPET_CAPABILITIES, struct vm_hpet_cap)
#defineVM_GET_GPA_PMAP \
_IOWR('v', IOCNUM_GET_GPA_PMAP, struct vm_gpa_pte)
#endif
Added: head/sys/amd64/vmm/io/vhpet.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/amd64/vmm/io/vhpet.c Mon Nov 25 19:04:51 2013
(r258579)
@@ -0,0 +1,774 @@
+/*-
+ * Copyright (c) 2013 Tycho Nightingale
tycho.nighting...@pluribusnetworks.com
+ * Copyright (c) 2013 Neel Natu n...@freebsd.org
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ *
svn commit: r258580 - head/sys/rpc
Author: hrs Date: Mon Nov 25 19:07:44 2013 New Revision: 258580 URL: http://svnweb.freebsd.org/changeset/base/258580 Log: Replace Sun RPC license in TI-RPC library with a 3-clause BSD license, with the explicit permission of Sun Microsystems in 2009. Modified: head/sys/rpc/rpcb_clnt.h Modified: head/sys/rpc/rpcb_clnt.h == --- head/sys/rpc/rpcb_clnt.hMon Nov 25 19:04:51 2013(r258579) +++ head/sys/rpc/rpcb_clnt.hMon Nov 25 19:07:44 2013(r258580) @@ -1,33 +1,32 @@ /* $NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $ */ /* $FreeBSD$ */ -/* - * Sun RPC is a product of Sun Microsystems, Inc. and is provided for - * unrestricted use provided that this legend is included on all tape - * media and as a part of the software program in whole or part. Users - * may copy or modify Sun RPC without charge, but are not authorized - * to license or distribute it to anyone else except as part of a product or - * program developed by the user. - * - * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE - * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR - * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * - * Sun RPC is provided with no support and without any obligation on the - * part of Sun Microsystems, Inc. to assist in its use, correction, - * modification or enhancement. - * - * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE - * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC - * OR ANY PART THEREOF. - * - * In no event will Sun Microsystems, Inc. be liable for any lost revenue - * or profits or other special, indirect and consequential damages, even if - * Sun has been advised of the possibility of such damages. +/*- + * Copyright (c) 2009, Sun Microsystems, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * - Neither the name of Sun Microsystems, Inc. nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * Sun Microsystems, Inc. - * 2550 Garcia Avenue - * Mountain View, California 94043 + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ /* * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc. ___ 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: r258581 - in head: include/rpc lib/libc/rpc sys/rpc
Author: hrs Date: Mon Nov 25 19:08:38 2013 New Revision: 258581 URL: http://svnweb.freebsd.org/changeset/base/258581 Log: Replace Sun Industry Standards Source License for Sun RPC code with a 3-clause BSD license as specified by Oracle America, Inc. in 2010. This license change was approved by Wim Coekaerts, Senior Vice President, Linux and Virtualization at Oracle Corporation. Modified: head/include/rpc/clnt.h head/lib/libc/rpc/clnt_generic.c head/lib/libc/rpc/rpcb_clnt.c head/sys/rpc/clnt.h Modified: head/include/rpc/clnt.h == --- head/include/rpc/clnt.h Mon Nov 25 19:07:44 2013(r258580) +++ head/include/rpc/clnt.h Mon Nov 25 19:08:38 2013(r258581) @@ -1,49 +1,31 @@ /* $NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $ */ -/* - * The contents of this file are subject to the Sun Standards - * License Version 1.0 the (the License;) You may not use - * this file except in compliance with the License. You may - * obtain a copy of the License at lib/libc/rpc/LICENSE - * - * Software distributed under the License is distributed on - * an AS IS basis, WITHOUT WARRANTY OF ANY KIND, either - * express or implied. See the License for the specific - * language governing rights and limitations under the License. - * - * The Original Code is Copyright 1998 by Sun Microsystems, Inc - * - * The Initial Developer of the Original Code is: Sun - * Microsystems, Inc. - * - * All Rights Reserved. - * - * Sun RPC is a product of Sun Microsystems, Inc. and is provided for - * unrestricted use provided that this legend is included on all tape - * media and as a part of the software program in whole or part. Users - * may copy or modify Sun RPC without charge, but are not authorized - * to license or distribute it to anyone else except as part of a product or - * program developed by the user. - * - * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE - * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * - * Sun RPC is provided with no support and without any obligation on the - * part of Sun Microsystems, Inc. to assist in its use, correction, - * modification or enhancement. - * - * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE - * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC - * OR ANY PART THEREOF. - * - * In no event will Sun Microsystems, Inc. be liable for any lost revenue - * or profits or other special, indirect and consequential damages, even if - * Sun has been advised of the possibility of such damages. +/*- + * Copyright (c) 2010, Oracle America, Inc. + * All rights reserved. * - * Sun Microsystems, Inc. - * 2550 Garcia Avenue - * Mountain View, California 94043 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * - Neither the name of the Oracle America, Inc. nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. * * from: @(#)clnt.h 1.31 94/04/29 SMI * from: @(#)clnt.h2.1 88/07/29 4.0 RPCSRC @@ -52,9 +34,6 @@ /* * clnt.h - Client side remote procedure call interface. - * - * Copyright (c) 1986-1991,1994-1999 by Sun Microsystems, Inc. - * All rights reserved. */ #ifndef _RPC_CLNT_H_ Modified: head/lib/libc/rpc/clnt_generic.c == --- head/lib/libc/rpc/clnt_generic.cMon Nov 25 19:07:44 2013 (r258580) +++ head/lib/libc/rpc/clnt_generic.cMon Nov 25 19:08:38 2013
svn commit: r258582 - head/lib/libc/rpc
Author: hrs Date: Mon Nov 25 19:24:15 2013 New Revision: 258582 URL: http://svnweb.freebsd.org/changeset/base/258582 Log: There is no file under SISSL after license replacement in r258581. Deleted: head/lib/libc/rpc/LICENSE ___ 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: r258584 - in stable/9/sys: dev/bxe dev/oce ofed/drivers/net/mlx4
Author: delphij
Date: Mon Nov 25 20:01:34 2013
New Revision: 258584
URL: http://svnweb.freebsd.org/changeset/base/258584
Log:
MFC r246482 (rrs) + r246581:
This fixes a out-of-order problem with several of the newer
drivers. The basic problem was that the driver was pulling
the mbuf off the drbr ring and then when sending with xmit(),
encounting a full transmit ring. Thus the lower layer xmit()
function would return an error, and the drivers would then
append the data back on to the ring. For TCP this is a
horrible scenario sure to bring on a fast-retransmit.
The fix is to use drbr_peek() to pull the data pointer but
not remove it from the ring. If it fails then we either call
the new drbr_putback or drbr_advance method. Advance moves
it forward (we do this sometimes when the xmit() function
frees the mbuf). When we succeed we always call advance.
The putback will always copy the mbuf back to the top of the
ring. Note that the putback *cannot* be used with a
drbr_dequeue() only with drbr_peek(). We most of the time,
in putback, would not need to copy it back since most likey
the mbuf is still the same, but sometimes xmit() functions
will change the mbuf via a pullup or other call. So the
optimial case for the single consumer is to always copy it
back. If we ever do a multiple_consumer (for lagg?) we
will need a test and atomic in the put back possibly a
seperate putback_mc() in the ring buf.
Reviewed by: j...@freebsd.org, j...@freebsd.org
Modified:
stable/9/sys/dev/bxe/if_bxe.c
stable/9/sys/dev/oce/oce_if.c
stable/9/sys/ofed/drivers/net/mlx4/en_tx.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/bxe/if_bxe.c
==
--- stable/9/sys/dev/bxe/if_bxe.c Mon Nov 25 19:53:46 2013
(r258583)
+++ stable/9/sys/dev/bxe/if_bxe.c Mon Nov 25 20:01:34 2013
(r258584)
@@ -9501,24 +9501,15 @@ bxe_tx_mq_start_locked(struct ifnet *ifp
BXE_FP_LOCK_ASSERT(fp);
- if (m == NULL) {
- /* No new work, check for pending frames. */
- next = drbr_dequeue(ifp, fp-br);
- } else if (drbr_needs_enqueue(ifp, fp-br)) {
- /* Both new and pending work, maintain packet order. */
+ if (m != NULL) {
rc = drbr_enqueue(ifp, fp-br, m);
if (rc != 0) {
fp-tx_soft_errors++;
goto bxe_tx_mq_start_locked_exit;
}
- next = drbr_dequeue(ifp, fp-br);
- } else
- /* New work only, nothing pending. */
- next = m;
-
+ }
/* Keep adding entries while there are frames to send. */
- while (next != NULL) {
-
+ while ((next = drbr_peek(ifp, fp-br)) != NULL) {
/* The transmit mbuf now belongs to us, keep track of it. */
fp-tx_mbuf_alloc++;
@@ -9532,23 +9523,22 @@ bxe_tx_mq_start_locked(struct ifnet *ifp
if (__predict_false(rc != 0)) {
fp-tx_encap_failures++;
/* Very Bad Frames(tm) may have been dropped. */
- if (next != NULL) {
+ if (next == NULL) {
+ drbr_advance(ifp, fp-br);
+ } else {
+ drbr_putback(ifp, fp-br, next);
/*
* Mark the TX queue as full and save
* the frame.
*/
ifp-if_drv_flags |= IFF_DRV_OACTIVE;
fp-tx_frame_deferred++;
-
- /* This may reorder frame. */
- rc = drbr_enqueue(ifp, fp-br, next);
fp-tx_mbuf_alloc--;
}
-
/* Stop looking for more work. */
break;
}
-
+ drbr_advance(ifp, fp-br);
/* The transmit frame was enqueued successfully. */
tx_count++;
@@ -9569,8 +9559,6 @@ bxe_tx_mq_start_locked(struct ifnet *ifp
ifp-if_drv_flags = ~IFF_DRV_OACTIVE;
break;
}
-
- next = drbr_dequeue(ifp, fp-br);
}
/* No TX packets were dequeued. */
Modified: stable/9/sys/dev/oce/oce_if.c
==
--- stable/9/sys/dev/oce/oce_if.c Mon Nov 25 19:53:46 2013
(r258583)
+++ stable/9/sys/dev/oce/oce_if.c Mon Nov 25 20:01:34 2013
(r258584)
@@ -1173,29 +1173,27 @@ oce_multiq_transmit(struct ifnet *ifp, s
return status;
}
- if (m == NULL)
-
svn commit: r258585 - head/share/man/man4
Author: eadler Date: Mon Nov 25 20:03:57 2013 New Revision: 258585 URL: http://svnweb.freebsd.org/changeset/base/258585 Log: Add missing cards now supported by iwn. Modified: head/share/man/man4/iwn.4 Modified: head/share/man/man4/iwn.4 == --- head/share/man/man4/iwn.4 Mon Nov 25 20:01:34 2013(r258584) +++ head/share/man/man4/iwn.4 Mon Nov 25 20:03:57 2013(r258585) @@ -87,9 +87,18 @@ driver provides support for: .It Intel Centrino Advanced-N 6230 .It Intel Centrino Advanced-N + WiMAX 6250 .It Intel Centrino Ultimate-N 6300 +.It Intel Centrino Wireless-N 100 .It Intel Centrino Wireless-N 130 .It Intel Centrino Wireless-N 1000 .It Intel Centrino Wireless-N 1030 +.It Intel Centrino Wireless-N 2200 +.It Intel Centrino Wireless-N 2230 +.It Intel Centrino Wireless-N 4965 +.It Intel Centrino Wireless-N 5100 +.It Intel Centrino Wireless-N 6150 +.It Intel Centrino Wireless-N 6200 +.It Intel Centrino Wireless-N 6250 +.It Intel Centrino Wireless-N 6250 .It Intel Centrino Wireless-N + WiMAX 6150 .It Intel Ultimate N WiFi Link 5300 .It Intel Wireless WiFi Link 4965 ___ 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: r258586 - stable/9/sys/dev/oce
Author: delphij
Date: Mon Nov 25 20:05:23 2013
New Revision: 258586
URL: http://svnweb.freebsd.org/changeset/base/258586
Log:
MFC r257007,258140:
Update driver to version 10.0.664.0.
Many thanks to Emulex for their continued support of FreeBSD.
Submitted by: Venkata Duvvuru VenkatKumar.Duvvuru Emulex Com
Modified:
stable/9/sys/dev/oce/oce_hw.c
stable/9/sys/dev/oce/oce_hw.h
stable/9/sys/dev/oce/oce_if.c
stable/9/sys/dev/oce/oce_if.h
stable/9/sys/dev/oce/oce_mbox.c
stable/9/sys/dev/oce/oce_queue.c
stable/9/sys/dev/oce/oce_sysctl.c
stable/9/sys/dev/oce/oce_util.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/oce/oce_hw.c
==
--- stable/9/sys/dev/oce/oce_hw.c Mon Nov 25 20:03:57 2013
(r258585)
+++ stable/9/sys/dev/oce/oce_hw.c Mon Nov 25 20:05:23 2013
(r258586)
@@ -38,6 +38,7 @@
/* $FreeBSD$ */
+
#include oce_if.h
static int oce_POST(POCE_SOFTC sc);
@@ -203,12 +204,16 @@ void oce_get_pci_capabilities(POCE_SOFTC
{
uint32_t val;
- if (pci_find_cap(sc-dev, PCIY_PCIX, val) == 0) {
+#if __FreeBSD_version = 100
+ #define pci_find_extcap pci_find_cap
+#endif
+
+ if (pci_find_extcap(sc-dev, PCIY_PCIX, val) == 0) {
if (val != 0)
sc-flags |= OCE_FLAGS_PCIX;
}
- if (pci_find_cap(sc-dev, PCIY_EXPRESS, val) == 0) {
+ if (pci_find_extcap(sc-dev, PCIY_EXPRESS, val) == 0) {
if (val != 0) {
uint16_t link_status =
pci_read_config(sc-dev, val + 0x12, 2);
@@ -219,12 +224,12 @@ void oce_get_pci_capabilities(POCE_SOFTC
}
}
- if (pci_find_cap(sc-dev, PCIY_MSI, val) == 0) {
+ if (pci_find_extcap(sc-dev, PCIY_MSI, val) == 0) {
if (val != 0)
sc-flags |= OCE_FLAGS_MSI_CAPABLE;
}
- if (pci_find_cap(sc-dev, PCIY_MSIX, val) == 0) {
+ if (pci_find_extcap(sc-dev, PCIY_MSIX, val) == 0) {
if (val != 0) {
val = pci_msix_count(sc-dev);
sc-flags |= OCE_FLAGS_MSIX_CAPABLE;
@@ -386,6 +391,9 @@ oce_create_nw_interface(POCE_SOFTC sc)
capab_flags = ~MBX_RX_IFACE_FLAGS_PASS_L3L4_ERR;
}
+ if (IS_SH(sc) || IS_XE201(sc))
+ capab_flags |= MBX_RX_IFACE_FLAGS_MULTICAST;
+
/* enable capabilities controlled via driver startup parameters */
if (is_rss_enabled(sc))
capab_en_flags |= MBX_RX_IFACE_FLAGS_RSS;
Modified: stable/9/sys/dev/oce/oce_hw.h
==
--- stable/9/sys/dev/oce/oce_hw.h Mon Nov 25 20:03:57 2013
(r258585)
+++ stable/9/sys/dev/oce/oce_hw.h Mon Nov 25 20:05:23 2013
(r258586)
@@ -59,6 +59,30 @@
#defineINTR_EN 0x2000
#defineIMAGE_TRANSFER_SIZE (32 * 1024) /* 32K at a
time */
+
+/* UE Status and Mask Registers ***/
+#define PCICFG_UE_STATUS_LOW0xA0
+#define PCICFG_UE_STATUS_HIGH 0xA4
+#define PCICFG_UE_STATUS_LOW_MASK 0xA8
+
+/* Lancer SLIPORT registers */
+#define SLIPORT_STATUS_OFFSET 0x404
+#define SLIPORT_CONTROL_OFFSET 0x408
+#define SLIPORT_ERROR1_OFFSET 0x40C
+#define SLIPORT_ERROR2_OFFSET 0x410
+#define PHYSDEV_CONTROL_OFFSET 0x414
+
+#define SLIPORT_STATUS_ERR_MASK 0x8000
+#define SLIPORT_STATUS_DIP_MASK 0x0200
+#define SLIPORT_STATUS_RN_MASK 0x0100
+#define SLIPORT_STATUS_RDY_MASK 0x0080
+#define SLI_PORT_CONTROL_IP_MASK0x0800
+#define PHYSDEV_CONTROL_FW_RESET_MASK 0x0002
+#define PHYSDEV_CONTROL_DD_MASK 0x0004
+#define PHYSDEV_CONTROL_INP_MASK0x4000
+
+#define SLIPORT_ERROR_NO_RESOURCE1 0x2
+#define SLIPORT_ERROR_NO_RESOURCE2 0x9
/* CSR register offsets */
#defineMPU_EP_CONTROL 0
#defineMPU_EP_SEMAPHORE_BE30xac
@@ -1553,7 +1577,8 @@ struct mbx_common_read_write_flashrom {
uint32_t flash_op_type;
uint32_t data_buffer_size;
uint32_t data_offset;
- uint8_t data_buffer[4];/* + IMAGE_TRANSFER_SIZE */
+ uint8_t data_buffer[32768];/* + IMAGE_TRANSFER_SIZE */
+ uint8_t rsvd[4];
};
struct oce_phy_info {
@@ -2079,7 +2104,8 @@ struct flash_file_hdr {
uint32_t antidote;
uint32_t num_imgs;
uint8_t build[24];
- uint8_t rsvd[32];
+ uint8_t asic_type_rev;
+ uint8_t rsvd[31];
};
struct image_hdr {
@@ -3681,4 +3707,3 @@ enum OCE_QUEUE_RX_STATS {
QUEUE_RX_BUFFER_ERRORS = 8,
QUEUE_RX_N_WORDS = 10
};
-
svn commit: r258587 - in head/lib: libc libc/iconv libc_nonshared
Author: peter
Date: Mon Nov 25 20:17:55 2013
New Revision: 258587
URL: http://svnweb.freebsd.org/changeset/base/258587
Log:
Move the iconv wrapper source from libc_nonshared to libc/iconv so that
it is all in the one place again. Rename libc/iconv/iconv.c to
bsd_iconv.c. Compile the wrappers into libc.a so that WITHOUT_DYNAMICROOT
works again.
Discussed with: kib (and partly stolen from his patch)
Added:
head/lib/libc/iconv/__iconv.c
- copied unchanged from r258569, head/lib/libc_nonshared/__iconv.c
head/lib/libc/iconv/__iconv_free_list.c
- copied unchanged from r258569,
head/lib/libc_nonshared/__iconv_free_list.c
head/lib/libc/iconv/__iconv_get_list.c
- copied unchanged from r258569, head/lib/libc_nonshared/__iconv_get_list.c
head/lib/libc/iconv/bsd_iconv.c
- copied unchanged from r258569, head/lib/libc/iconv/iconv.c
head/lib/libc/iconv/iconv_canonicalize.c
- copied unchanged from r258569,
head/lib/libc_nonshared/iconv_canonicalize.c
head/lib/libc/iconv/iconv_close.c
- copied unchanged from r258569, head/lib/libc_nonshared/iconv_close.c
head/lib/libc/iconv/iconv_open.c
- copied unchanged from r258569, head/lib/libc_nonshared/iconv_open.c
head/lib/libc/iconv/iconv_open_into.c
- copied unchanged from r258569, head/lib/libc_nonshared/iconv_open_into.c
head/lib/libc/iconv/iconv_set_relocation_prefix.c
- copied unchanged from r258569,
head/lib/libc_nonshared/iconv_set_relocation_prefix.c
head/lib/libc/iconv/iconvctl.c
- copied unchanged from r258569, head/lib/libc_nonshared/iconvctl.c
head/lib/libc/iconv/iconvlist.c
- copied unchanged from r258569, head/lib/libc_nonshared/iconvlist.c
head/lib/libc_nonshared/Makefile.iconv
- copied, changed from r258569, head/lib/libc_nonshared/Makefile
Replaced:
head/lib/libc/iconv/iconv.c
- copied unchanged from r258569, head/lib/libc_nonshared/iconv.c
Deleted:
head/lib/libc_nonshared/__iconv.c
head/lib/libc_nonshared/__iconv_free_list.c
head/lib/libc_nonshared/__iconv_get_list.c
head/lib/libc_nonshared/iconv.c
head/lib/libc_nonshared/iconv_canonicalize.c
head/lib/libc_nonshared/iconv_close.c
head/lib/libc_nonshared/iconv_open.c
head/lib/libc_nonshared/iconv_open_into.c
head/lib/libc_nonshared/iconv_set_relocation_prefix.c
head/lib/libc_nonshared/iconvctl.c
head/lib/libc_nonshared/iconvlist.c
Modified:
head/lib/libc/Makefile
head/lib/libc/iconv/Makefile.inc
head/lib/libc_nonshared/Makefile
Modified: head/lib/libc/Makefile
==
--- head/lib/libc/Makefile Mon Nov 25 20:05:23 2013(r258586)
+++ head/lib/libc/Makefile Mon Nov 25 20:17:55 2013(r258587)
@@ -50,6 +50,9 @@ LDADD+= -lgcc
LDADD+= -lssp_nonshared
.endif
+# Extras that live in either libc.a or libc_nonshared.a
+LIBC_NONSHARED_SRCS=
+
# Define (empty) variables so that make doesn't give substitution
# errors if the included makefiles don't change these:
MDSRCS=
@@ -114,6 +117,8 @@ CFLAGS+= -DNS_CACHING
CFLAGS+=-D_FREEFALL_CONFIG
.endif
+STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/}
+
VERSION_DEF=${.CURDIR}/Versions.def
SYMBOL_MAPS=${SYM_MAPS}
CFLAGS+= -DSYMBOL_VERSIONING
Modified: head/lib/libc/iconv/Makefile.inc
==
--- head/lib/libc/iconv/Makefile.incMon Nov 25 20:05:23 2013
(r258586)
+++ head/lib/libc/iconv/Makefile.incMon Nov 25 20:17:55 2013
(r258587)
@@ -14,5 +14,9 @@ SRCS+=citrus_bcs.c citrus_bcs_strtol.c
citrus_esdb.c citrus_hash.c citrus_iconv.c citrus_lookup.c \
citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \
citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \
- citrus_prop.c citrus_stdenc.c iconv.c iconv_compat.c
+ citrus_prop.c citrus_stdenc.c bsd_iconv.c iconv_compat.c
SYM_MAPS+= ${.CURDIR}/iconv/Symbol.map
+
+.if ${MK_ICONV} == yes
+.include ${.CURDIR}/../libc_nonshared/Makefile.iconv
+.endif
Copied: head/lib/libc/iconv/__iconv.c (from r258569,
head/lib/libc_nonshared/__iconv.c)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/iconv/__iconv.c Mon Nov 25 20:17:55 2013
(r258587, copy of r258569, head/lib/libc_nonshared/__iconv.c)
@@ -0,0 +1,38 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *
svn commit: r258588 - head/sys/netpfil/ipfw
Author: rodrigc
Date: Mon Nov 25 20:20:34 2013
New Revision: 258588
URL: http://svnweb.freebsd.org/changeset/base/258588
Log:
In sys/netpfil/ipfw/ip_fw_nat.c:vnet_ipfw_nat_uninit() we call
IPFW_WLOCK(chain);.
This lock gets deleted in sys/netpfil/ipfw/ip_fw2.c:vnet_ipfw_uninit().
Therefore, vnet_ipfw_nat_uninit() *must* be called before vnet_ipfw_uninit(),
but this doesn't always happen, because the VNET_SYSINIT order is the same
for both functions.
In sys/net/netpfil/ipfw/ip_fw2.c and sys/net/netpfil/ipfw/ip_fw_nat.c,
IPFW_SI_SUB_FIREWALL == IPFW_NAT_SI_SUB_FIREWALL ==
SI_SUB_PROTO_IFATTACHDOMAIN
and
IPFW_MODULE_ORDER == IPFW_NAT_MODULE_ORDER
Consequently, if VIMAGE is enabled, and jails are created and destroyed,
the system sometimes crashes, because we are trying to use a deleted lock.
To reproduce the problem:
(1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS,
INVARIANTS.
(2) Run this command in a loop:
jail -l -u root -c path=/ name=foo persist vnet jexec foo ifconfig
lo0 127.0.0.1/8 jail -r foo
(see
http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html )
Fix the problem by increasing the value of IPFW_NAT_SI_SUB_FIREWALL,
so that vnet_ipfw_nat_uninit() runs after vnet_ipfw_uninit().
Modified:
head/sys/netpfil/ipfw/ip_fw_nat.c
Modified: head/sys/netpfil/ipfw/ip_fw_nat.c
==
--- head/sys/netpfil/ipfw/ip_fw_nat.c Mon Nov 25 20:17:55 2013
(r258587)
+++ head/sys/netpfil/ipfw/ip_fw_nat.c Mon Nov 25 20:20:34 2013
(r258588)
@@ -676,7 +676,7 @@ static moduledata_t ipfw_nat_mod = {
};
/* Define startup order. */
-#defineIPFW_NAT_SI_SUB_FIREWALLSI_SUB_PROTO_IFATTACHDOMAIN
+#defineIPFW_NAT_SI_SUB_FIREWALL(SI_SUB_PROTO_IFATTACHDOMAIN +
1)
#defineIPFW_NAT_MODEVENT_ORDER (SI_ORDER_ANY - 255)
#defineIPFW_NAT_MODULE_ORDER (IPFW_NAT_MODEVENT_ORDER + 1)
#defineIPFW_NAT_VNET_ORDER (IPFW_NAT_MODEVENT_ORDER + 2)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r258589 - head/usr.sbin/bsdconfig/console
Author: dteske Date: Mon Nov 25 20:28:39 2013 New Revision: 258589 URL: http://svnweb.freebsd.org/changeset/base/258589 Log: Add missing `$' before variable name `pgm'. Unnoticed unless running parallel concurrent copies of `bsdconfig syscons_ttys'. Modified: head/usr.sbin/bsdconfig/console/ttys Modified: head/usr.sbin/bsdconfig/console/ttys == --- head/usr.sbin/bsdconfig/console/ttysMon Nov 25 20:20:34 2013 (r258588) +++ head/usr.sbin/bsdconfig/console/ttysMon Nov 25 20:28:39 2013 (r258589) @@ -113,7 +113,7 @@ ttys_set_type() # # Create new temporary file to write our ttys(5) update with new types. # - local tmpfile=$( mktemp -t pgm ) + local tmpfile=$( mktemp -t $pgm ) [ $tmpfile ] || return $FAILURE # ___ 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: r258590 - head/usr.sbin/bsdconfig/includes
Author: dteske Date: Mon Nov 25 20:29:26 2013 New Revision: 258590 URL: http://svnweb.freebsd.org/changeset/base/258590 Log: Add missing newline to printf format string. Modified: head/usr.sbin/bsdconfig/includes/includes Modified: head/usr.sbin/bsdconfig/includes/includes == --- head/usr.sbin/bsdconfig/includes/includes Mon Nov 25 20:28:39 2013 (r258589) +++ head/usr.sbin/bsdconfig/includes/includes Mon Nov 25 20:29:26 2013 (r258590) @@ -147,10 +147,10 @@ for include in $@; do # See if they've just omitted the `*.subr' suffix [ -f $include.subr -a ! -f $include ] include=$include.subr if [ ! -f $include ]; then - printf $msg_no_such_file_or_directory $0 $include + printf $msg_no_such_file_or_directory\n $0 $include exit $FAILURE elif [ ! -r $include ]; then - printf $msg_permission_denied $0 $include + printf $msg_permission_denied\n $0 $include exit $FAILURE fi show_include $include || f_die ___ 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: r258591 - head/sys/net
Author: rodrigc Date: Mon Nov 25 20:33:33 2013 New Revision: 258591 URL: http://svnweb.freebsd.org/changeset/base/258591 Log: In vnet_route_uninit(), free some memory that is allocated in vnet_route_init(). To reproduce the problem: (1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS, INVARIANTS. (2) Run this command in a loop: jail -l -u root -c path=/ name=foo persist vnet jexec foo ifconfig lo0 127.0.0.1/8 jail -r foo see: http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021291.html This doesn't eliminate all the Freed UMA keg was not empty warning messages on the console, but it helps. Modified: head/sys/net/route.c Modified: head/sys/net/route.c == --- head/sys/net/route.cMon Nov 25 20:29:26 2013(r258590) +++ head/sys/net/route.cMon Nov 25 20:33:33 2013(r258591) @@ -255,6 +255,9 @@ vnet_route_uninit(const void *unused __u dom-dom_rtdetach((void **)rnh, dom-dom_rtoffset); } } + + free(V_rt_tables, M_RTABLE); + uma_zdestroy(V_rtzone); } VNET_SYSUNINIT(vnet_route_uninit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, vnet_route_uninit, 0); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r258592 - in head/usr.sbin/bsdconfig: console/include include mouse/include networking/include startup/include usermgmt/include
Author: dteske Date: Mon Nov 25 20:37:53 2013 New Revision: 258592 URL: http://svnweb.freebsd.org/changeset/base/258592 Log: Sort messages. Modified: head/usr.sbin/bsdconfig/console/include/messages.subr head/usr.sbin/bsdconfig/include/messages.subr head/usr.sbin/bsdconfig/mouse/include/messages.subr head/usr.sbin/bsdconfig/networking/include/messages.subr head/usr.sbin/bsdconfig/startup/include/messages.subr head/usr.sbin/bsdconfig/usermgmt/include/messages.subr Modified: head/usr.sbin/bsdconfig/console/include/messages.subr == --- head/usr.sbin/bsdconfig/console/include/messages.subr Mon Nov 25 20:33:33 2013(r258591) +++ head/usr.sbin/bsdconfig/console/include/messages.subr Mon Nov 25 20:37:53 2013(r258592) @@ -51,8 +51,8 @@ msg_cancel=Cancel msg_central_european_iso=Central European ISO msg_central_european_iso_desc=Central European ISO keymap msg_choose_alternate_keyboard_map=Choose an alternate keyboard map -msg_choose_alternate_screenmap=Choose an alternate screenmap msg_choose_alternate_screen_font=Choose an alternate screen font +msg_choose_alternate_screenmap=Choose an alternate screenmap msg_choose_console_terminal_type=Choose console terminal type msg_configure_screen_saver=Configure the screen saver msg_console_menu_text=The system console driver for FreeBSD has a number of configuration\noptions which may be set according to your preference.\n\nWhen you are done setting configuration options, select Cancel. @@ -74,9 +74,9 @@ msg_enter_timeout_period=Enter time-out msg_estonian_cp850=Estonian CP850 msg_estonian_cp850_desc=Estonian Code Page 850 keymap msg_estonian_iso=Estonian ISO -msg_estonian_iso_desc=Estonian ISO keymap msg_estonian_iso_15=Estonian ISO 15 msg_estonian_iso_15_desc=Estonian ISO 8859-15 keymap +msg_estonian_iso_desc=Estonian ISO keymap msg_exit=Exit msg_exit_this_menu=Exit this menu msg_fade=Fade @@ -97,8 +97,6 @@ msg_french_iso_accent_desc=French ISO k msg_french_iso_desc=French ISO keymap msg_french_iso_macbook=French ISO/Macbook msg_french_iso_macbook_desc=French ISO keymap on macbook -msg_green=Green -msg_green_desc=\Green\ power saving mode (if supported by monitor) msg_german_cp850=German CP850 msg_german_cp850_desc=German Code Page 850 keymap msg_german_iso=German ISO @@ -109,10 +107,14 @@ msg_greek_104=Greek 104 msg_greek_104_desc=Greek ISO keymap (104 keys) msg_greek_elot=Greek ELOT msg_greek_elot_desc=Greek ISO keymap (ELOT 1000) +msg_green=Green +msg_green_desc=\Green\ power saving mode (if supported by monitor) msg_hungarian_101=Hungarian 101 msg_hungarian_101_desc=Hungarian ISO keymap (101 key) msg_hungarian_102=Hungarian 102 msg_hungarian_102_desc=Hungarian ISO keymap (102 key) +msg_ibm_1251=IBM 1251 +msg_ibm_1251_desc=Cyrillic, MS Windows encoding msg_ibm_437=IBM 437 msg_ibm_437_desc=English and others, VGA default msg_ibm_437_vga_default=IBM437 (VGA default) @@ -124,12 +126,12 @@ msg_ibm_866=IBM 866 msg_ibm_866_desc=Russian, IBM encoding (use with KOI8-R screenmap) msg_ibm_866u=IBM 866u msg_ibm_866u_desc=Ukrainian, IBM encoding (use with KOI8-U screenmap) -msg_ibm_1251=IBM 1251 -msg_ibm_1251_desc=Cyrillic, MS Windows encoding msg_icelandic=Icelandic msg_icelandic_accent=Icelandic (accent) msg_icelandic_accent_desc=Icelandic ISO keymap (accent keys) msg_icelandic_desc=Icelandic ISO keymap +msg_iso_8859_15=ISO 8859-15 +msg_iso_8859_15_desc=Europe, ISO encoding msg_iso_8859_1=ISO 8859-1 msg_iso_8859_1_desc=Western Europe, ISO encoding msg_iso_8859_1_to_ibm437=ISO 8859-1 to IBM437 @@ -144,8 +146,6 @@ msg_iso_8859_7_to_ibm437=ISO 8859-7 to msg_iso_8859_7_to_ibm437_desc=Greek ISO 8859-1 to IBM 437 screenmap msg_iso_8859_8=ISO 8859-8 msg_iso_8859_8_desc=Hebrew, ISO encoding -msg_iso_8859_15=ISO 8859-15 -msg_iso_8859_15_desc=Europe, ISO encoding msg_italian=Italian msg_italian_desc=Italian ISO keymap msg_japanese_106=Japanese 106 @@ -153,9 +153,9 @@ msg_japanese_106_desc=Japanese 106 keym msg_keymap=Keymap msg_keymap_menu_text=The system console driver for FreeBSD defaults to a standard\n\US\ keyboard map. Users may wish to choose one of the\nother keymaps below. msg_koi8_r=KOI8-R -msg_koi8_u=KOI8-U msg_koi8_r_to_ibm866=KOI8-R to IBM866 msg_koi8_r_to_ibm866_desc=Russian KOI8-R to IBM 866 screenmap +msg_koi8_u=KOI8-U msg_koi8_u_to_ibm866u=KOI8-U to IBM866u msg_koi8_u_to_ibm866u_desc=Ukrainian KOI8-U to IBM 866u screenmap msg_latin_american=Latin American @@ -224,8 +224,8 @@ msg_swiss_german_iso_accent_desc=Swiss msg_swiss_german_iso_desc=Swiss German ISO keymap msg_system_console_configuration=System Console Configuration msg_system_console_font=System Console Font -msg_system_console_keymap=System Console Keymap msg_system_console_keyboard_repeat_rate=System Console Keyboard Repeat Rate +msg_system_console_keymap=System Console Keymap msg_system_console_screen_saver=System Console
svn commit: r258593 - in stable/10/release/doc: de_DE.ISO8859-1/readme en_US.ISO8859-1/readme ru_RU.KOI8-R/readme zh_CN.GB2312/readme
Author: rodrigc Date: Mon Nov 25 20:39:09 2013 New Revision: 258593 URL: http://svnweb.freebsd.org/changeset/base/258593 Log: MFC 258570 Change sysinstall.8 references to bsdinstall.8. Submitted by: skreuzer Approved by: re (delphij) Modified: stable/10/release/doc/de_DE.ISO8859-1/readme/article.xml stable/10/release/doc/en_US.ISO8859-1/readme/article.xml stable/10/release/doc/ru_RU.KOI8-R/readme/article.xml stable/10/release/doc/zh_CN.GB2312/readme/article.xml Directory Properties: stable/10/release/ (props changed) stable/10/release/doc/ (props changed) Modified: stable/10/release/doc/de_DE.ISO8859-1/readme/article.xml == --- stable/10/release/doc/de_DE.ISO8859-1/readme/article.xmlMon Nov 25 20:37:53 2013(r258592) +++ stable/10/release/doc/de_DE.ISO8859-1/readme/article.xmlMon Nov 25 20:39:09 2013(r258593) @@ -390,13 +390,13 @@ gehouml;rt, steht immer am Anfang des Textes./para /note - paraAuf den Plattformen, auf denen man.sysinstall.8; zur + paraAuf den Plattformen, auf denen man.bsdinstall.8; zur Verfuuml;gung steht (zur Zeit alpha, i386, ia64, pc98 und sparc64) finden Sie diese Dokumente wauml;hrend der Installation normalerweise unter dem Menuuml;punkt Dokumentation. Um nach der Installation des Systems dieses Menuuml; zugreifen zu kouml;nnen, muuml;ssen Sie das - Programm man.sysinstall.8; erneut aufrufen./para + Programm man.bsdinstall.8; erneut aufrufen./para note paraSie sollten auf jeden Fall die Errata zur jeweiligen Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/readme/article.xmlMon Nov 25 20:37:53 2013(r258592) +++ stable/10/release/doc/en_US.ISO8859-1/readme/article.xmlMon Nov 25 20:39:09 2013(r258593) @@ -324,11 +324,11 @@ /itemizedlist /para - paraOn platforms that support man.sysinstall.8; (currently + paraOn platforms that support man.bsdinstall.8; (currently arch.amd64;, arch.i386;, arch.ia64;, arch.pc98;, and arch.sparc64;), these documents are generally available via the Documentation menu during installation. Once the system is installed, you can revisit this menu by re-running the - man.sysinstall.8; utility./para + man.bsdinstall.8; utility./para note paraIt is extremely important to read the errata for any Modified: stable/10/release/doc/ru_RU.KOI8-R/readme/article.xml == --- stable/10/release/doc/ru_RU.KOI8-R/readme/article.xml Mon Nov 25 20:37:53 2013(r258592) +++ stable/10/release/doc/ru_RU.KOI8-R/readme/article.xml Mon Nov 25 20:39:09 2013(r258593) @@ -347,12 +347,12 @@ /para - para�� ��, ��� man.sysinstall.8; (� + para�� ��, ��� man.bsdinstall.8; (� � � alpha, i386;, ia64, pc98, � sparc64;), ��� � �� � Documentation �� � �. ��� �� ��� � ���, �� �� � � ��� , - man.sysinstall.8;./para + man.bsdinstall.8;./para note para�� � �� ��� �� � Modified: stable/10/release/doc/zh_CN.GB2312/readme/article.xml == --- stable/10/release/doc/zh_CN.GB2312/readme/article.xml Mon Nov 25 20:37:53 2013(r258592) +++ stable/10/release/doc/zh_CN.GB2312/readme/article.xml Mon Nov 25 20:39:09 2013(r258593) @@ -302,11 +302,11 @@ /itemizedlist /para - para��֧�� man.sysinstall.8; ��ƽ̨�� (Ŀǰ�� + para��֧�� man.bsdinstall.8; ��ƽ̨�� (Ŀǰ�� arch.amd64;�� arch.i386;�� arch.ia64;�� arch.pc98; �Լ� arch.sparc64;)�� ��Щ�ĵ��ڰ�װʱ��ͨ�� Documentation �˵ʡ� һ��ϵͳ�Ѿ���װͨ�� - man.sysinstall.8; �·��ʲ˵���/para + man.bsdinstall.8; �·��ʲ˵���/para note para�ڰ�װ���õκη��а�֮ǰ�Ķ��Ƿdz���Ҫ�ģ� ___ 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: r258594 - head/lib/libnv
Author: pjd
Date: Mon Nov 25 20:45:30 2013
New Revision: 258594
URL: http://svnweb.freebsd.org/changeset/base/258594
Log:
Fix double free().
Reported by: Coverity
Coverity CID: 1130048
Modified:
head/lib/libnv/nvpair.c
Modified: head/lib/libnv/nvpair.c
==
--- head/lib/libnv/nvpair.c Mon Nov 25 20:39:09 2013(r258593)
+++ head/lib/libnv/nvpair.c Mon Nov 25 20:45:30 2013(r258594)
@@ -683,10 +683,8 @@ nvpair_unpack(int flags, const unsigned
if (ptr == NULL)
goto failed;
tmp = realloc(nvp, sizeof(*nvp) + strlen(nvp-nvp_name) + 1);
- if (tmp == NULL) {
- free(nvp);
+ if (tmp == NULL)
goto failed;
- }
nvp = tmp;
/* Update nvp_name after realloc(). */
nvp-nvp_name = (char *)(nvp + 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: r258595 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: smh
Date: Mon Nov 25 20:47:37 2013
New Revision: 258595
URL: http://svnweb.freebsd.org/changeset/base/258595
Log:
MFC r258294:
Fix ZFS deadlock when sending a snapshot which is mounted.
Approved by: re (glebius)
Sponsored by: Multiplay
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
Directory Properties:
stable/10/sys/ (props changed)
stable/10/sys/cddl/contrib/opensolaris/ (props changed)
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
Mon Nov 25 20:45:30 2013(r258594)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
Mon Nov 25 20:47:37 2013(r258595)
@@ -564,21 +564,23 @@ dsl_dataset_user_release_impl(nvlist_t *
ddura.ddura_holdfunc = dsl_dataset_hold_obj_string;
pool = spa_name(tmpdp-dp_spa);
#ifdef _KERNEL
- dsl_pool_config_enter(tmpdp, FTAG);
for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
pair = nvlist_next_nvpair(holds, pair)) {
dsl_dataset_t *ds;
+ dsl_pool_config_enter(tmpdp, FTAG);
error = dsl_dataset_hold_obj_string(tmpdp,
nvpair_name(pair), FTAG, ds);
if (error == 0) {
char name[MAXNAMELEN];
dsl_dataset_name(ds, name);
+ dsl_pool_config_exit(tmpdp, FTAG);
dsl_dataset_rele(ds, FTAG);
(void) zfs_unmount_snap(name);
+ } else {
+ dsl_pool_config_exit(tmpdp, FTAG);
}
}
- dsl_pool_config_exit(tmpdp, FTAG);
#endif
} else {
/* Non-temporary holds are specified by 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: r258597 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: pjd
Date: Mon Nov 25 21:17:14 2013
New Revision: 258597
URL: http://svnweb.freebsd.org/changeset/base/258597
Log:
When append-only, immutable or read-only flag is set don't allow for
hard links creation. This matches UFS behaviour.
Reported by: Oleg Ginzburg olev...@olevole.ru
MFC after:1 month
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Nov
25 21:12:56 2013(r258596)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Nov
25 21:17:14 2013(r258597)
@@ -4317,6 +4317,11 @@ zfs_link(vnode_t *tdvp, vnode_t *svp, ch
szp = VTOZ(svp);
ZFS_VERIFY_ZP(szp);
+ if (szp-z_pflags (ZFS_APPENDONLY | ZFS_IMMUTABLE | ZFS_READONLY)) {
+ ZFS_EXIT(zfsvfs);
+ return (SET_ERROR(EPERM));
+ }
+
/*
* We check z_zfsvfs rather than v_vfsp here, because snapshots and the
* ctldir appear to have the same v_vfsp.
___
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: r258600 - in vendor/apr-util/dist: . crypto dbd dbm include memcache misc test
Author: peter
Date: Mon Nov 25 22:15:47 2013
New Revision: 258600
URL: http://svnweb.freebsd.org/changeset/base/258600
Log:
Import apr-util 1.5.3
Deleted:
vendor/apr-util/dist/test/testssl.c
Modified:
vendor/apr-util/dist/CHANGES
vendor/apr-util/dist/apr-util.spec
vendor/apr-util/dist/configure
vendor/apr-util/dist/crypto/apr_crypto.c
vendor/apr-util/dist/dbd/apr_dbd.c
vendor/apr-util/dist/dbd/apr_dbd_odbc.c
vendor/apr-util/dist/dbm/apr_dbm.c
vendor/apr-util/dist/include/apr_buckets.h
vendor/apr-util/dist/include/apr_dbd.h
vendor/apr-util/dist/include/apr_hooks.h
vendor/apr-util/dist/include/apr_optional_hooks.h
vendor/apr-util/dist/include/apr_queue.h
vendor/apr-util/dist/include/apr_reslist.h
vendor/apr-util/dist/include/apu.hw
vendor/apr-util/dist/include/apu_version.h
vendor/apr-util/dist/libaprutil.rc
vendor/apr-util/dist/memcache/apr_memcache.c
vendor/apr-util/dist/misc/apu_dso.c
vendor/apr-util/dist/test/abts.c
vendor/apr-util/dist/test/testpass.c
Modified: vendor/apr-util/dist/CHANGES
==
--- vendor/apr-util/dist/CHANGESMon Nov 25 21:57:15 2013
(r258599)
+++ vendor/apr-util/dist/CHANGESMon Nov 25 22:15:47 2013
(r258600)
@@ -1,4 +1,23 @@
-*- coding: utf-8 -*-
+Changes with APR-util 1.5.3
+
+ *) Cygwin: Use correct file extension when loading APR DSOs. PR 55587.
+ [Carlo Bramini carlo.bramix libero.it]
+
+ *) Add experimental cmake-based build system for Windows. Refer to
+ README.cmake for more information. [Jeff Trawick, Tom Donovan]
+
+ *) Fix warnings in odbc driver on 64bit systems.
+ PR 55197 [Tom Donovan]
+
+ *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi
+ Gacogne rgacogne+asf aquaray.com]
+
+ *) Add support for Berkeley DB 6.0. [Rainer Jung]
+
+ *) Improve platform detection for bundled expat by updating
+ config.guess and config.sub. [Rainer Jung]
+
Changes with APR-util 1.5.2
*) Windows: Add command line makefiles. [Gregg Smith]
Modified: vendor/apr-util/dist/apr-util.spec
==
--- vendor/apr-util/dist/apr-util.spec Mon Nov 25 21:57:15 2013
(r258599)
+++ vendor/apr-util/dist/apr-util.spec Mon Nov 25 22:15:47 2013
(r258600)
@@ -3,7 +3,7 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
-Version: 1.5.2
+Version: 1.5.3
Release: 1
License: Apache Software License
Group: System Environment/Libraries
Modified: vendor/apr-util/dist/configure
==
--- vendor/apr-util/dist/configure Mon Nov 25 21:57:15 2013
(r258599)
+++ vendor/apr-util/dist/configure Mon Nov 25 22:15:47 2013
(r258600)
@@ -1440,7 +1440,7 @@ Optional Packages:
--with-ldap-lib=pathpath to ldap lib file
--with-ldap=library ldap library to use
--with-dbm=DBM choose the DBM type to use.
-
DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X}
+
DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X}
for some X=0,...,9
--with-gdbm=DIR enable GDBM support
--with-ndbm=PATHFind the NDBM header and library in `PATH/include'
@@ -11218,8 +11218,10 @@ fi
fi
- test ${apu_has_ldap} != 1 as_fn_error $? could not find an LDAP
library $LINENO 5
- test ${apu_has_ldap} == 1
+ if test ${apu_has_ldap} != 1; then
+as_fn_error $? could not find an LDAP library $LINENO 5
+ else
+
if test x$LDADD_ldap = x; then
test x$silent != xyes echo setting LDADD_ldap to
\$LDADD_ldap_found\
LDADD_ldap=$LDADD_ldap_found
@@ -11240,6 +11242,7 @@ fi
done
fi
+ fi
as_ac_Lib=`$as_echo ac_cv_lib_$apu_liblber_name''_ber_init | $as_tr_sh`
{ $as_echo $as_me:${as_lineno-$LINENO}: checking for ber_init in
-l$apu_liblber_name 5
$as_echo_n checking for ber_init in -l$apu_liblber_name... 6; }
@@ -11617,6 +11620,7 @@ fi
dbm_list=$dbm_list, db$db_version
db_version=`expr $db_version + 1`
done
+ dbm_list=$dbm_list, db60
# Check whether --with-dbm was given.
@@ -15708,7 +15712,7 @@ fi
as_fn_error $? Berkeley db3 not found $LINENO 5
fi
;;
- db[45][0-9])
+ db[456][0-9])
db_major=`echo $requested | sed -e 's/db//' -e 's/.$//'`
db_minor=`echo $requested | sed -e 's/db//' -e 's/.//'`
@@ -16113,7 +16117,7 @@ fi
as_fn_error $? Berkeley db$db_major not found $LINENO 5
fi
;;
- db[45])
+ db[456])
db_major=`echo $requested | sed -e 's/db//'`
# Start version search at version x.9
db_minor=9
@@ -18561,11 +18565,11 @@ fi
eval apu_use_$requested=1
apu_default_dbm=$requested
;;
-db185 | db[12345])
+
svn commit: r258601 - vendor/apr-util/apr-util-1.5.3
Author: peter Date: Mon Nov 25 22:16:27 2013 New Revision: 258601 URL: http://svnweb.freebsd.org/changeset/base/258601 Log: Tag import of svn-1.5.3 Added: vendor/apr-util/apr-util-1.5.3/ - copied from r258600, vendor/apr-util/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: r258602 - in head/contrib/apr-util: . crypto dbd dbm include memcache misc test
Author: peter
Date: Mon Nov 25 22:20:34 2013
New Revision: 258602
URL: http://svnweb.freebsd.org/changeset/base/258602
Log:
Import apr-util-1.5.3 from vendor branch (rr258600)
This is a minor bug fix release.
Deleted:
head/contrib/apr-util/test/testssl.c
Modified:
head/contrib/apr-util/CHANGES
head/contrib/apr-util/apr-util.spec
head/contrib/apr-util/configure
head/contrib/apr-util/crypto/apr_crypto.c
head/contrib/apr-util/dbd/apr_dbd.c
head/contrib/apr-util/dbd/apr_dbd_odbc.c
head/contrib/apr-util/dbm/apr_dbm.c
head/contrib/apr-util/include/apr_buckets.h
head/contrib/apr-util/include/apr_dbd.h
head/contrib/apr-util/include/apr_hooks.h
head/contrib/apr-util/include/apr_optional_hooks.h
head/contrib/apr-util/include/apr_queue.h
head/contrib/apr-util/include/apr_reslist.h
head/contrib/apr-util/include/apu.hw
head/contrib/apr-util/include/apu_version.h
head/contrib/apr-util/libaprutil.rc
head/contrib/apr-util/memcache/apr_memcache.c
head/contrib/apr-util/misc/apu_dso.c
head/contrib/apr-util/test/abts.c
head/contrib/apr-util/test/testpass.c
Directory Properties:
head/contrib/apr-util/ (props changed)
Modified: head/contrib/apr-util/CHANGES
==
--- head/contrib/apr-util/CHANGES Mon Nov 25 22:16:27 2013
(r258601)
+++ head/contrib/apr-util/CHANGES Mon Nov 25 22:20:34 2013
(r258602)
@@ -1,4 +1,23 @@
-*- coding: utf-8 -*-
+Changes with APR-util 1.5.3
+
+ *) Cygwin: Use correct file extension when loading APR DSOs. PR 55587.
+ [Carlo Bramini carlo.bramix libero.it]
+
+ *) Add experimental cmake-based build system for Windows. Refer to
+ README.cmake for more information. [Jeff Trawick, Tom Donovan]
+
+ *) Fix warnings in odbc driver on 64bit systems.
+ PR 55197 [Tom Donovan]
+
+ *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi
+ Gacogne rgacogne+asf aquaray.com]
+
+ *) Add support for Berkeley DB 6.0. [Rainer Jung]
+
+ *) Improve platform detection for bundled expat by updating
+ config.guess and config.sub. [Rainer Jung]
+
Changes with APR-util 1.5.2
*) Windows: Add command line makefiles. [Gregg Smith]
Modified: head/contrib/apr-util/apr-util.spec
==
--- head/contrib/apr-util/apr-util.spec Mon Nov 25 22:16:27 2013
(r258601)
+++ head/contrib/apr-util/apr-util.spec Mon Nov 25 22:20:34 2013
(r258602)
@@ -3,7 +3,7 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
-Version: 1.5.2
+Version: 1.5.3
Release: 1
License: Apache Software License
Group: System Environment/Libraries
Modified: head/contrib/apr-util/configure
==
--- head/contrib/apr-util/configure Mon Nov 25 22:16:27 2013
(r258601)
+++ head/contrib/apr-util/configure Mon Nov 25 22:20:34 2013
(r258602)
@@ -1440,7 +1440,7 @@ Optional Packages:
--with-ldap-lib=pathpath to ldap lib file
--with-ldap=library ldap library to use
--with-dbm=DBM choose the DBM type to use.
-
DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X}
+
DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X}
for some X=0,...,9
--with-gdbm=DIR enable GDBM support
--with-ndbm=PATHFind the NDBM header and library in `PATH/include'
@@ -11218,8 +11218,10 @@ fi
fi
- test ${apu_has_ldap} != 1 as_fn_error $? could not find an LDAP
library $LINENO 5
- test ${apu_has_ldap} == 1
+ if test ${apu_has_ldap} != 1; then
+as_fn_error $? could not find an LDAP library $LINENO 5
+ else
+
if test x$LDADD_ldap = x; then
test x$silent != xyes echo setting LDADD_ldap to
\$LDADD_ldap_found\
LDADD_ldap=$LDADD_ldap_found
@@ -11240,6 +11242,7 @@ fi
done
fi
+ fi
as_ac_Lib=`$as_echo ac_cv_lib_$apu_liblber_name''_ber_init | $as_tr_sh`
{ $as_echo $as_me:${as_lineno-$LINENO}: checking for ber_init in
-l$apu_liblber_name 5
$as_echo_n checking for ber_init in -l$apu_liblber_name... 6; }
@@ -11617,6 +11620,7 @@ fi
dbm_list=$dbm_list, db$db_version
db_version=`expr $db_version + 1`
done
+ dbm_list=$dbm_list, db60
# Check whether --with-dbm was given.
@@ -15708,7 +15712,7 @@ fi
as_fn_error $? Berkeley db3 not found $LINENO 5
fi
;;
- db[45][0-9])
+ db[456][0-9])
db_major=`echo $requested | sed -e 's/db//' -e 's/.$//'`
db_minor=`echo $requested | sed -e 's/db//' -e 's/.//'`
@@ -16113,7 +16117,7 @@ fi
as_fn_error $? Berkeley db$db_major not found $LINENO 5
fi
;;
- db[45])
+ db[456])
db_major=`echo $requested | sed -e 's/db//'`
# Start version search at version x.9
svn commit: r258605 - head/sys/netinet
Author: adrian
Date: Mon Nov 25 22:55:06 2013
New Revision: 258605
URL: http://svnweb.freebsd.org/changeset/base/258605
Log:
Convert over the TCP probes to use mtod() rather than directly
dereferencing m-m_data.
Sponsored by: Netflix, Inc.
Modified:
head/sys/netinet/tcp_input.c
head/sys/netinet/tcp_subr.c
Modified: head/sys/netinet/tcp_input.c
==
--- head/sys/netinet/tcp_input.cMon Nov 25 22:37:36 2013
(r258604)
+++ head/sys/netinet/tcp_input.cMon Nov 25 22:55:06 2013
(r258605)
@@ -1393,7 +1393,7 @@ relocked:
}
#endif
- TCP_PROBE5(receive, NULL, tp, m-m_data, tp, th);
+ TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
/*
* Segment belongs to a connection in SYN_SENT, ESTABLISHED or later
@@ -1405,7 +1405,7 @@ relocked:
return;
dropwithreset:
- TCP_PROBE5(receive, NULL, tp, m-m_data, tp, th);
+ TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
if (ti_locked == TI_WLOCKED) {
INP_INFO_WUNLOCK(V_tcbinfo);
@@ -1429,7 +1429,7 @@ dropwithreset:
dropunlock:
if (m != NULL)
- TCP_PROBE5(receive, NULL, tp, m-m_data, tp, th);
+ TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
if (ti_locked == TI_WLOCKED) {
INP_INFO_WUNLOCK(V_tcbinfo);
@@ -1928,8 +1928,8 @@ tcp_do_segment(struct mbuf *m, struct tc
goto dropwithreset;
}
if ((thflags (TH_ACK|TH_RST)) == (TH_ACK|TH_RST)) {
- TCP_PROBE5(connect_refused, NULL, tp, m-m_data, tp,
- th);
+ TCP_PROBE5(connect_refused, NULL, tp,
+ mtod(m, const char *), tp, th);
tp = tcp_drop(tp, ECONNREFUSED);
}
if (thflags TH_RST)
@@ -1982,7 +1982,7 @@ tcp_do_segment(struct mbuf *m, struct tc
} else {
tcp_state_change(tp, TCPS_ESTABLISHED);
TCP_PROBE5(connect_established, NULL, tp,
- m-m_data, tp, th);
+ mtod(m, const char *), tp, th);
cc_conn_init(tp);
tcp_timer_activate(tp, TT_KEEP,
TP_KEEPIDLE(tp));
@@ -2387,8 +2387,8 @@ tcp_do_segment(struct mbuf *m, struct tc
tp-t_flags = ~TF_NEEDFIN;
} else {
tcp_state_change(tp, TCPS_ESTABLISHED);
- TCP_PROBE5(accept_established, NULL, tp, m-m_data, tp,
- th);
+ TCP_PROBE5(accept_established, NULL, tp,
+ mtod(m, const char *), tp, th);
cc_conn_init(tp);
tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp));
}
Modified: head/sys/netinet/tcp_subr.c
==
--- head/sys/netinet/tcp_subr.c Mon Nov 25 22:37:36 2013(r258604)
+++ head/sys/netinet/tcp_subr.c Mon Nov 25 22:55:06 2013(r258605)
@@ -720,9 +720,10 @@ tcp_respond(struct tcpcb *tp, void *ipge
tcp_trace(TA_OUTPUT, 0, tp, mtod(m, void *), th, 0);
#endif
if (flags TH_RST)
- TCP_PROBE5(accept_refused, NULL, NULL, m-m_data, tp, nth);
+ TCP_PROBE5(accept_refused, NULL, NULL, mtod(m, const char *),
+ tp, nth);
- TCP_PROBE5(send, NULL, tp, m-m_data, tp, nth);
+ TCP_PROBE5(send, NULL, tp, mtod(m, const char *), tp, nth);
#ifdef INET6
if (isipv6)
(void) ip6_output(m, NULL, NULL, ipflags, NULL, NULL, inp);
___
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: r258606 - head/usr.sbin/iostat
Author: pluknet
Date: Mon Nov 25 22:55:47 2013
New Revision: 258606
URL: http://svnweb.freebsd.org/changeset/base/258606
Log:
iostat: fix extracting TTY statistics from core.
MFC after:1 week
Modified:
head/usr.sbin/iostat/iostat.c
Modified: head/usr.sbin/iostat/iostat.c
==
--- head/usr.sbin/iostat/iostat.c Mon Nov 25 22:55:06 2013
(r258605)
+++ head/usr.sbin/iostat/iostat.c Mon Nov 25 22:55:47 2013
(r258606)
@@ -117,10 +117,10 @@
#include unistd.h
struct nlist namelist[] = {
-#define X_TK_NIN 0
- { _tk_nin },
-#define X_TK_NOUT 1
- { _tk_nout },
+#define X_TTY_NIN 0
+ { _tty_nin },
+#define X_TTY_NOUT 1
+ { _tty_nout },
#define X_BOOTTIME 2
{ _boottime },
#define X_END 2
@@ -448,9 +448,9 @@ main(int argc, char **argv)
long double etime;
if (Tflag 0) {
- if ((readvar(kd, kern.tty_nin, X_TK_NIN, cur.tk_nin,
+ if ((readvar(kd, kern.tty_nin, X_TTY_NIN, cur.tk_nin,
sizeof(cur.tk_nin)) != 0)
-|| (readvar(kd, kern.tty_nout, X_TK_NOUT,
+|| (readvar(kd, kern.tty_nout, X_TTY_NOUT,
cur.tk_nout, sizeof(cur.tk_nout))!= 0)) {
Tflag = 0;
warnx(disabling TTY statistics);
___
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: r258607 - stable/10/contrib/llvm/lib/Analysis
Author: dim
Date: Mon Nov 25 22:56:46 2013
New Revision: 258607
URL: http://svnweb.freebsd.org/changeset/base/258607
Log:
MFC r258350:
Pull in r191896 from upstream llvm trunk:
CaptureTracking: Plug a loophole in the too many uses heuristic.
The heuristic was added to avoid spending too much compile time in a
specially crafted test case (PR17461, PR16474) with many uses on a
select or bitcast instruction can still trigger the slow case. Add a
check for that case.
This only affects compile time, don't have a good way to test it.
This fixes the excessive compile time spent on a specific file of the
graphics/rawtherapee port.
Reported by: mandree
Approved by: re (gjb)
Modified:
stable/10/contrib/llvm/lib/Analysis/CaptureTracking.cpp
Directory Properties:
stable/10/contrib/llvm/ (props changed)
Modified: stable/10/contrib/llvm/lib/Analysis/CaptureTracking.cpp
==
--- stable/10/contrib/llvm/lib/Analysis/CaptureTracking.cpp Mon Nov 25
22:55:47 2013(r258606)
+++ stable/10/contrib/llvm/lib/Analysis/CaptureTracking.cpp Mon Nov 25
22:56:46 2013(r258607)
@@ -146,8 +146,14 @@ void llvm::PointerMayBeCaptured(const Va
case Instruction::PHI:
case Instruction::Select:
// The original value is not captured via this if the new value isn't.
+ Count = 0;
for (Instruction::use_iterator UI = I-use_begin(), UE = I-use_end();
UI != UE; ++UI) {
+// If there are lots of uses, conservatively say that the value
+// is captured to avoid taking too much compile time.
+if (Count++ = Threshold)
+ return Tracker-tooManyUses();
+
Use *U = UI.getUse();
if (Visited.insert(U))
if (Tracker-shouldExplore(U))
___
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: r258608 - stable/9/contrib/llvm/lib/Analysis
Author: dim
Date: Mon Nov 25 22:58:12 2013
New Revision: 258608
URL: http://svnweb.freebsd.org/changeset/base/258608
Log:
MFC r258350:
Pull in r191896 from upstream llvm trunk:
CaptureTracking: Plug a loophole in the too many uses heuristic.
The heuristic was added to avoid spending too much compile time in a
specially crafted test case (PR17461, PR16474) with many uses on a
select or bitcast instruction can still trigger the slow case. Add a
check for that case.
This only affects compile time, don't have a good way to test it.
This fixes the excessive compile time spent on a specific file of the
graphics/rawtherapee port.
Reported by: mandree
Modified:
stable/9/contrib/llvm/lib/Analysis/CaptureTracking.cpp
Directory Properties:
stable/9/contrib/llvm/ (props changed)
Modified: stable/9/contrib/llvm/lib/Analysis/CaptureTracking.cpp
==
--- stable/9/contrib/llvm/lib/Analysis/CaptureTracking.cpp Mon Nov 25
22:56:46 2013(r258607)
+++ stable/9/contrib/llvm/lib/Analysis/CaptureTracking.cpp Mon Nov 25
22:58:12 2013(r258608)
@@ -146,8 +146,14 @@ void llvm::PointerMayBeCaptured(const Va
case Instruction::PHI:
case Instruction::Select:
// The original value is not captured via this if the new value isn't.
+ Count = 0;
for (Instruction::use_iterator UI = I-use_begin(), UE = I-use_end();
UI != UE; ++UI) {
+// If there are lots of uses, conservatively say that the value
+// is captured to avoid taking too much compile time.
+if (Count++ = Threshold)
+ return Tracker-tooManyUses();
+
Use *U = UI.getUse();
if (Visited.insert(U))
if (Tracker-shouldExplore(U))
___
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: r258606 - head/usr.sbin/iostat
On 26 November 2013 02:55, Sergey Kandaurov pluk...@freebsd.org wrote: Author: pluknet Date: Mon Nov 25 22:55:47 2013 New Revision: 258606 URL: http://svnweb.freebsd.org/changeset/base/258606 Log: iostat: fix extracting TTY statistics from core. This is imho still incomplete. devstat(3) abuses(?) monotonic clock to give iostat time difference for calculating live avg. statistics since system boot (1st step). For vmcore it would make sense to build it upon time_second. [Currently it uses same thing for both.] -- wbr, pluknet ___ 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: r258609 - head/usr.sbin/bhyve
Author: neel Date: Mon Nov 25 23:31:00 2013 New Revision: 258609 URL: http://svnweb.freebsd.org/changeset/base/258609 Log: Fix discrepancy between the IOAPIC ID advertised by firmware tables and the actual value read by the guest from the device. The IOAPIC ID is now set to zero in both MPtable/ACPI tables as well as in the ioapic device emulation. Pointed out by: grehan@ Modified: head/usr.sbin/bhyve/acpi.c head/usr.sbin/bhyve/mptbl.c Modified: head/usr.sbin/bhyve/acpi.c == --- head/usr.sbin/bhyve/acpi.c Mon Nov 25 22:58:12 2013(r258608) +++ head/usr.sbin/bhyve/acpi.c Mon Nov 25 23:31:00 2013(r258609) @@ -263,7 +263,7 @@ basl_fwrite_madt(FILE *fp) EFPRINTF(fp, [0001]\t\tSubtable Type : 01\n); EFPRINTF(fp, [0001]\t\tLength : 0C\n); /* iasl expects a hex value for the i/o apic id */ - EFPRINTF(fp, [0001]\t\tI/O Apic ID : %02x\n, basl_ncpu); + EFPRINTF(fp, [0001]\t\tI/O Apic ID : %02x\n, 0); EFPRINTF(fp, [0001]\t\tReserved : 00\n); EFPRINTF(fp, [0004]\t\tAddress : fec0\n); EFPRINTF(fp, [0004]\t\tInterrupt : \n); Modified: head/usr.sbin/bhyve/mptbl.c == --- head/usr.sbin/bhyve/mptbl.c Mon Nov 25 22:58:12 2013(r258608) +++ head/usr.sbin/bhyve/mptbl.c Mon Nov 25 23:31:00 2013(r258609) @@ -279,12 +279,12 @@ mptable_build(struct vmctx *ctx, int ncp mpch-entry_count += MPE_NUM_BUSES; mpei = (io_apic_entry_ptr)curraddr; - mpt_build_ioapic_entries(mpei, ncpu + 1); + mpt_build_ioapic_entries(mpei, 0); curraddr += sizeof(*mpei); mpch-entry_count++; mpie = (int_entry_ptr) curraddr; - mpt_build_ioint_entries(mpie, MPEII_MAX_IRQ, ncpu + 1); + mpt_build_ioint_entries(mpie, MPEII_MAX_IRQ, 0); curraddr += sizeof(*mpie) * MPEII_MAX_IRQ; mpch-entry_count += MPEII_MAX_IRQ; ___ 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: r258610 - head/sbin/growfs
Author: pluknet Date: Mon Nov 25 23:45:50 2013 New Revision: 258610 URL: http://svnweb.freebsd.org/changeset/base/258610 Log: Adjust introduction history. Dump .Dd for this and previous changes. Discussed with: trasz MFC after:3 days Modified: head/sbin/growfs/growfs.8 Modified: head/sbin/growfs/growfs.8 == --- head/sbin/growfs/growfs.8 Mon Nov 25 23:31:00 2013(r258609) +++ head/sbin/growfs/growfs.8 Mon Nov 25 23:45:50 2013(r258610) @@ -37,7 +37,7 @@ .\ $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $ .\ $FreeBSD$ .\ -.Dd April 30, 2012 +.Dd November 26, 2013 .Dt GROWFS 8 .Os .Sh NAME @@ -116,7 +116,7 @@ The utility first appeared in .Fx 4.4 . The ability to resize mounted filesystems was added in -.Fx 10.0 . +.Fx 9.2 . .Sh AUTHORS .An Christoph Herrmann Aq c...@freebsd.org .An Thomas-Henning von Kamptz Aq toms...@freebsd.org ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r258612 - head/sys/dev/iwi
Author: adrian
Date: Tue Nov 26 01:30:10 2013
New Revision: 258612
URL: http://svnweb.freebsd.org/changeset/base/258612
Log:
The bssid can change from underneath us, so take a reference before
we fiddle with it.
Modified:
head/sys/dev/iwi/if_iwi.c
Modified: head/sys/dev/iwi/if_iwi.c
==
--- head/sys/dev/iwi/if_iwi.c Tue Nov 26 00:23:47 2013(r258611)
+++ head/sys/dev/iwi/if_iwi.c Tue Nov 26 01:30:10 2013(r258612)
@@ -945,10 +945,13 @@ iwi_media_status(struct ifnet *ifp, stru
struct ieee80211vap *vap = ifp-if_softc;
struct ieee80211com *ic = vap-iv_ic;
struct iwi_softc *sc = ic-ic_ifp-if_softc;
+ struct ieee80211_node *ni;
/* read current transmission rate from adapter */
- vap-iv_bss-ni_txrate =
+ ni = ieee80211_ref_node(vap-iv_bss);
+ ni-ni_txrate =
iwi_cvtrate(CSR_READ_4(sc, IWI_CSR_CURRENT_TX_RATE));
+ ieee80211_free_node(ni);
ieee80211_media_status(ifp, imr);
}
@@ -1367,13 +1370,14 @@ iwi_checkforqos(struct ieee80211vap *vap
frm += frm[1] + 2;
}
- ni = vap-iv_bss;
+ ni = ieee80211_ref_node(vap-iv_bss);
ni-ni_capinfo = capinfo;
ni-ni_associd = associd 0x3fff;
if (wme != NULL)
ni-ni_flags |= IEEE80211_NODE_QOS;
else
ni-ni_flags = ~IEEE80211_NODE_QOS;
+ ieee80211_free_node(ni);
#undef SUBTYPE
}
@@ -2812,7 +2816,7 @@ iwi_auth_and_assoc(struct iwi_softc *sc,
{
struct ieee80211com *ic = vap-iv_ic;
struct ifnet *ifp = vap-iv_ifp;
- struct ieee80211_node *ni = vap-iv_bss;
+ struct ieee80211_node *ni;
struct iwi_configuration config;
struct iwi_associate *assoc = sc-assoc;
struct iwi_rateset rs;
@@ -2822,6 +2826,8 @@ iwi_auth_and_assoc(struct iwi_softc *sc,
IWI_LOCK_ASSERT(sc);
+ ni = ieee80211_ref_node(vap-iv_bss);
+
if (sc-flags IWI_FLAG_ASSOCIATED) {
DPRINTF((Already associated\n));
return (-1);
@@ -2980,6 +2986,7 @@ iwi_auth_and_assoc(struct iwi_softc *sc,
le16toh(assoc-intval)));
error = iwi_cmd(sc, IWI_CMD_ASSOCIATE, assoc, sizeof *assoc);
done:
+ ieee80211_free_node(ni);
if (error)
IWI_STATE_END(sc, IWI_FW_ASSOCIATING);
___
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: r258613 - head/sys/kern
Author: adrian
Date: Tue Nov 26 02:02:05 2013
New Revision: 258613
URL: http://svnweb.freebsd.org/changeset/base/258613
Log:
Refactor out the sendfile copyout in order to make vn_sendfile()
callable from the kernel.
Right now vn_sendfile() can't be called from anything other than
a syscall handler _and_ return the number of bytes queued.
This simply moves the copyout() to do_sendfile() so that any kernel
code can initiate vn_sendfile() outside of a syscall context.
Tested:
* tiny little sendfile program spitting things out a tcp socket
Sponsored by: Netflix, Inc.
Modified:
head/sys/kern/uipc_syscalls.c
Modified: head/sys/kern/uipc_syscalls.c
==
--- head/sys/kern/uipc_syscalls.c Tue Nov 26 01:30:10 2013
(r258612)
+++ head/sys/kern/uipc_syscalls.c Tue Nov 26 02:02:05 2013
(r258613)
@@ -1908,6 +1908,7 @@ do_sendfile(struct thread *td, struct se
struct file *fp;
cap_rights_t rights;
int error;
+ off_t sbytes;
/*
* File offset must be positive. If it goes beyond EOF
@@ -1947,9 +1948,11 @@ do_sendfile(struct thread *td, struct se
}
error = fo_sendfile(fp, uap-s, hdr_uio, trl_uio, uap-offset,
- uap-nbytes, uap-sbytes, uap-flags, compat ? SFK_COMPAT : 0, td);
+ uap-nbytes, sbytes, uap-flags, compat ? SFK_COMPAT : 0, td);
fdrop(fp, td);
-
+ if (uap-sbytes != NULL) {
+ copyout(sbytes, uap-sbytes, sizeof(off_t));
+ }
out:
free(hdr_uio, M_IOV);
free(trl_uio, M_IOV);
@@ -2546,7 +2549,7 @@ out:
td-td_retval[0] = 0;
}
if (sent != NULL) {
- copyout(sbytes, sent, sizeof(off_t));
+ (*sent) = sbytes;
}
if (obj != NULL)
vm_object_deallocate(obj);
___
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: r258614 - head/usr.sbin/bhyve
Author: grehan
Date: Tue Nov 26 03:00:54 2013
New Revision: 258614
URL: http://svnweb.freebsd.org/changeset/base/258614
Log:
The Data Byte Count (DBC) field of a Physical Region Descriptor
Table is 22 bits, with the bit 31 being the interrupt-on-completion
bit.
OpenBSD and UEFI set this bit, resulting in large block i/o lengths
being sent to bhyve and coredumping the process. Fix by masking off
the relevant 22 bits when using the DBC field as a length.
Reviewed by: Zhixiang Yu
Discussed with: Tycho Nightingale
(tycho.nighting...@pluribusnetworks.com)
MFC after:10.0
Modified:
head/usr.sbin/bhyve/pci_ahci.c
Modified: head/usr.sbin/bhyve/pci_ahci.c
==
--- head/usr.sbin/bhyve/pci_ahci.c Tue Nov 26 02:02:05 2013
(r258613)
+++ head/usr.sbin/bhyve/pci_ahci.c Tue Nov 26 03:00:54 2013
(r258614)
@@ -165,6 +165,7 @@ struct ahci_cmd_hdr {
struct ahci_prdt_entry {
uint64_t dba;
uint32_t reserved;
+#defineDBCMASK 0x3f
uint32_t dbc;
};
@@ -461,10 +462,13 @@ ahci_handle_dma(struct ahci_port *p, int
* Build up the iovec based on the prdt
*/
for (i = 0; i iovcnt; i++) {
+ uint32_t dbcsz;
+
+ dbcsz = (prdt-dbc DBCMASK) + 1;
breq-br_iov[i].iov_base = paddr_guest2host(ahci_ctx(sc),
- prdt-dba, prdt-dbc + 1);
- breq-br_iov[i].iov_len = prdt-dbc + 1;
- aior-done += (prdt-dbc + 1);
+ prdt-dba, dbcsz);
+ breq-br_iov[i].iov_len = dbcsz;
+ aior-done += dbcsz;
prdt++;
}
if (readop)
@@ -513,11 +517,14 @@ write_prdt(struct ahci_port *p, int slot
from = buf;
prdt = (struct ahci_prdt_entry *)(cfis + 0x80);
for (i = 0; i hdr-prdtl len; i++) {
- uint8_t *ptr = paddr_guest2host(ahci_ctx(p-pr_sc),
- prdt-dba, prdt-dbc + 1);
- memcpy(ptr, from, prdt-dbc + 1);
- len -= (prdt-dbc + 1);
- from += (prdt-dbc + 1);
+ uint8_t *ptr;
+ uint32_t dbcsz;
+
+ dbcsz = (prdt-dbc DBCMASK) + 1;
+ ptr = paddr_guest2host(ahci_ctx(p-pr_sc), prdt-dba, dbcsz);
+ memcpy(ptr, from, dbcsz);
+ len -= dbcsz;
+ from += dbcsz;
prdt++;
}
hdr-prdbc = size - len;
@@ -908,10 +915,13 @@ atapi_read(struct ahci_port *p, int slot
* Build up the iovec based on the prdt
*/
for (i = 0; i iovcnt; i++) {
+ uint32_t dbcsz;
+
+ dbcsz = (prdt-dbc DBCMASK) + 1;
breq-br_iov[i].iov_base = paddr_guest2host(ahci_ctx(sc),
- prdt-dba, prdt-dbc + 1);
- breq-br_iov[i].iov_len = prdt-dbc + 1;
- aior-done += (prdt-dbc + 1);
+ prdt-dba, dbcsz);
+ breq-br_iov[i].iov_len = dbcsz;
+ aior-done += dbcsz;
prdt++;
}
err = blockif_read(p-bctx, breq);
___
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: r258615 - head/sys/powerpc/pseries
Author: andreast
Date: Tue Nov 26 05:26:10 2013
New Revision: 258615
URL: http://svnweb.freebsd.org/changeset/base/258615
Log:
Take care to handle the full 16 byte buffer in the get/put routines. Also,
skip the VTERM header once when receiving data from the hypervisor call when
we have a HVTERMPROT connection.
MFC after:1 week
Modified:
head/sys/powerpc/pseries/phyp_console.c
Modified: head/sys/powerpc/pseries/phyp_console.c
==
--- head/sys/powerpc/pseries/phyp_console.c Tue Nov 26 03:00:54 2013
(r258614)
+++ head/sys/powerpc/pseries/phyp_console.c Tue Nov 26 05:26:10 2013
(r258615)
@@ -286,6 +286,7 @@ static int
uart_phyp_get(struct uart_phyp_softc *sc, void *buffer, size_t bufsize)
{
int err;
+ int hdr = 0;
uart_lock(sc-sc_mtx);
if (sc-inbuflen == 0) {
@@ -296,6 +297,7 @@ uart_phyp_get(struct uart_phyp_softc *sc
uart_unlock(sc-sc_mtx);
return (-1);
}
+ hdr = 1;
}
if (sc-inbuflen == 0) {
@@ -305,6 +307,14 @@ uart_phyp_get(struct uart_phyp_softc *sc
if (bufsize sc-inbuflen)
bufsize = sc-inbuflen;
+
+ if ((sc-protocol == HVTERMPROT) (hdr == 1)) {
+ sc-inbuflen = sc-inbuflen - 4;
+ /* The VTERM protocol has a 4 byte header, skip it here. */
+ memmove(sc-phyp_inbuf.str[0], sc-phyp_inbuf.str[4],
+ sc-inbuflen);
+ }
+
memcpy(buffer, sc-phyp_inbuf.str, bufsize);
sc-inbuflen -= bufsize;
if (sc-inbuflen 0)
@@ -320,32 +330,40 @@ uart_phyp_put(struct uart_phyp_softc *sc
{
uint16_t seqno;
uint64_t len = 0;
+ int err;
+
union {
- uint64_t u64;
- char bytes[8];
+ uint64_t u64[2];
+ char bytes[16];
} cbuf;
uart_lock(sc-sc_mtx);
switch (sc-protocol) {
case HVTERM1:
- if (bufsize 8)
- bufsize = 8;
+ if (bufsize 16)
+ bufsize = 16;
memcpy(cbuf, buffer, bufsize);
len = bufsize;
break;
case HVTERMPROT:
- if (bufsize 4)
- bufsize = 4;
+ if (bufsize 12)
+ bufsize = 12;
seqno = sc-outseqno++;
cbuf.bytes[0] = VS_DATA_PACKET_HEADER;
- cbuf.bytes[1] = 4 + bufsize; /* total length */
+ cbuf.bytes[1] = 4 + bufsize; /* total length, max 16 bytes */
cbuf.bytes[2] = (seqno 8) 0xff;
cbuf.bytes[3] = seqno 0xff;
memcpy(cbuf.bytes[4], buffer, bufsize);
len = 4 + bufsize;
break;
}
- phyp_hcall(H_PUT_TERM_CHAR, sc-vtermid, len, cbuf.u64, 0);
+
+ do {
+ err = phyp_hcall(H_PUT_TERM_CHAR, sc-vtermid, len, cbuf.u64[0],
+ cbuf.u64[1]);
+ DELAY(100);
+ } while (err == H_BUSY);
+
uart_unlock(sc-sc_mtx);
return (bufsize);
___
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: r258613 - head/sys/kern
On Tue, Nov 26, 2013 at 02:02:05AM +, Adrian Chadd wrote:
Author: adrian
Date: Tue Nov 26 02:02:05 2013
New Revision: 258613
URL: http://svnweb.freebsd.org/changeset/base/258613
Log:
Refactor out the sendfile copyout in order to make vn_sendfile()
callable from the kernel.
Right now vn_sendfile() can't be called from anything other than
a syscall handler _and_ return the number of bytes queued.
This simply moves the copyout() to do_sendfile() so that any kernel
code can initiate vn_sendfile() outside of a syscall context.
Tested:
* tiny little sendfile program spitting things out a tcp socket
Sponsored by: Netflix, Inc.
Modified:
head/sys/kern/uipc_syscalls.c
Modified: head/sys/kern/uipc_syscalls.c
==
--- head/sys/kern/uipc_syscalls.c Tue Nov 26 01:30:10 2013
(r258612)
+++ head/sys/kern/uipc_syscalls.c Tue Nov 26 02:02:05 2013
(r258613)
@@ -1908,6 +1908,7 @@ do_sendfile(struct thread *td, struct se
struct file *fp;
cap_rights_t rights;
int error;
+ off_t sbytes;
/*
* File offset must be positive. If it goes beyond EOF
@@ -1947,9 +1948,11 @@ do_sendfile(struct thread *td, struct se
}
error = fo_sendfile(fp, uap-s, hdr_uio, trl_uio, uap-offset,
- uap-nbytes, uap-sbytes, uap-flags, compat ? SFK_COMPAT : 0, td);
+ uap-nbytes, sbytes, uap-flags, compat ? SFK_COMPAT : 0, td);
fdrop(fp, td);
-
+ if (uap-sbytes != NULL) {
+ copyout(sbytes, uap-sbytes, sizeof(off_t));
+ }
out:
free(hdr_uio, M_IOV);
free(trl_uio, M_IOV);
@@ -2546,7 +2549,7 @@ out:
td-td_retval[0] = 0;
}
if (sent != NULL) {
- copyout(sbytes, sent, sizeof(off_t));
+ (*sent) = sbytes;
}
if (obj != NULL)
vm_object_deallocate(obj);
This breaks compat32 sendfile(2).
pgpwUyXmOj2Ib.pgp
Description: PGP signature
svn commit: r258617 - head/share/man/man4
Author: lwhsu (ports committer) Date: Tue Nov 26 07:51:38 2013 New Revision: 258617 URL: http://svnweb.freebsd.org/changeset/base/258617 Log: Also note to add xhci(4) to kernel configuration to utilize USB 3.0 Approved by: markj Modified: head/share/man/man4/axge.4 Modified: head/share/man/man4/axge.4 == --- head/share/man/man4/axge.4 Tue Nov 26 07:36:41 2013(r258616) +++ head/share/man/man4/axge.4 Tue Nov 26 07:51:38 2013(r258617) @@ -30,7 +30,7 @@ .\ .\ $FreeBSD$ .\ -.Dd November 12, 2013 +.Dd November 22, 2013 .Dt AXGE 4 .Os .Sh NAME @@ -41,6 +41,7 @@ To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent +.Cd device xhci .Cd device ehci .Cd device uhci .Cd device ohci ___ 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: r258618 - head/share/man/man4
Author: lwhsu (ports committer) Date: Tue Nov 26 07:52:40 2013 New Revision: 258618 URL: http://svnweb.freebsd.org/changeset/base/258618 Log: Mention axge(4) Approved by: kevlo Modified: head/share/man/man4/usb.4 Modified: head/share/man/man4/usb.4 == --- head/share/man/man4/usb.4 Tue Nov 26 07:51:38 2013(r258617) +++ head/share/man/man4/usb.4 Tue Nov 26 07:52:40 2013(r258618) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd May 20, 2009 +.Dd November 26, 2013 .Dt USB 4 .Os .Sh NAME @@ -147,6 +147,7 @@ specifications can be found at: .Xr usbdi 4 , .Xr aue 4 , .Xr axe 4 , +.Xr axge 4 , .Xr cue 4 , .Xr ehci 4 , .Xr kue 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
