svn commit: r272397 - head/sys/arm/allwinner
Author: ganbold Date: Thu Oct 2 06:00:55 2014 New Revision: 272397 URL: https://svnweb.freebsd.org/changeset/base/272397 Log: Allow timer0 to run at full 24MHz not at 24MHz/16 by setting prescale to 1. Approved by:stas (mentor) Modified: head/sys/arm/allwinner/timer.c Modified: head/sys/arm/allwinner/timer.c == --- head/sys/arm/allwinner/timer.c Thu Oct 2 05:56:17 2014 (r272396) +++ head/sys/arm/allwinner/timer.c Thu Oct 2 06:00:55 2014 (r272397) @@ -72,7 +72,7 @@ __FBSDID($FreeBSD$); #define TIMER_ENABLE (10) #define TIMER_AUTORELOAD (11) #define TIMER_OSC24M (12) /* oscillator = 24mhz */ -#define TIMER_PRESCALAR(44) /* prescalar = 16 */ +#define TIMER_PRESCALAR(04) /* prescalar = 1 */ #define SYS_TIMER_CLKSRC 2400 /* clock source */ ___ 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: r272372 - stable/10/bin/rm
On Thu, Oct 02, 2014 at 02:56:05PM +1000, Bruce Evans wrote: On Wed, 1 Oct 2014, Glen Barber wrote: Log: MFC r268376 (imp): rm -rf can fail sometimes with an error from fts_read. Make it honor fflag to ignore fts_read errors, but stop deleting from that directory because no further progress can be made. I asked for this to be backed out in -current. It is not suitable for MFC. It fixes an immediate issue that prevents high-concurrent make(1) jobs from stomping over each other. If there is a more suitable solution, it needs to be introduced in head/ first, pending MFC for 10.1-RELEASE. In the meantime, we lack any alternate fix, and this resolves the immediate issue at hand. See old mail for more details. I saw the original email. I do not see a proposed patch. Glen pgpIs4bKfJbpR.pgp Description: PGP signature
Re: svn commit: r272372 - stable/10/bin/rm
On Wed, Oct 1, 2014 at 11:16 PM, Glen Barber g...@freebsd.org wrote: On Thu, Oct 02, 2014 at 02:56:05PM +1000, Bruce Evans wrote: On Wed, 1 Oct 2014, Glen Barber wrote: Log: MFC r268376 (imp): rm -rf can fail sometimes with an error from fts_read. Make it honor fflag to ignore fts_read errors, but stop deleting from that directory because no further progress can be made. I asked for this to be backed out in -current. It is not suitable for MFC. It fixes an immediate issue that prevents high-concurrent make(1) jobs from stomping over each other. The real problem is noted in this bug: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192490 ; the SUBDIR_PARALLEL logic is executing multiple instances of the clean/cleandir .PHONY targets. I agree with bde@ that this commit is papering over a bigger problem, but it's annoying enough and causes enough false positives that I understand why gjb@ MFCed the commit imp@ did in head. Thank you.. ___ 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: r272398 - head/usr.bin/sort
Author: bapt Date: Thu Oct 2 06:29:49 2014 New Revision: 272398 URL: https://svnweb.freebsd.org/changeset/base/272398 Log: Make sure to not skip any argument when converting from deprecated +POS1, -POS2 to -kPOS1,POS2, so that sort +0n gets translated to sort -k1,1n as it is expected PR: 193994 Submitted by: rodrigo MFC after:3 days Modified: head/usr.bin/sort/sort.c Modified: head/usr.bin/sort/sort.c == --- head/usr.bin/sort/sort.cThu Oct 2 06:00:55 2014(r272397) +++ head/usr.bin/sort/sort.cThu Oct 2 06:29:49 2014(r272398) @@ -897,7 +897,7 @@ fix_obsolete_keys(int *argc, char **argv } } } - sprintf(sopt, -k%d.%d, f1, c1); + sprintf(sopt, -k%d.%d%s, f1, c1, sopts1); argv[i] = sort_strdup(sopt); } } ___ 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: r272399 - head/sys/dev/uart
Author: ganbold
Date: Thu Oct 2 08:12:42 2014
New Revision: 272399
URL: https://svnweb.freebsd.org/changeset/base/272399
Log:
Add uart driver for Qualcomm MSM 7000/8000 series chips.
It is working on IFC6410 board which has Qualcomm Snapdragon SoC.
Approved by:stas (mentor)
Added:
head/sys/dev/uart/uart_dev_msm.c (contents, props changed)
head/sys/dev/uart/uart_dev_msm.h (contents, props changed)
Modified:
head/sys/dev/uart/uart.h
head/sys/dev/uart/uart_bus_fdt.c
Modified: head/sys/dev/uart/uart.h
==
--- head/sys/dev/uart/uart.hThu Oct 2 06:29:49 2014(r272398)
+++ head/sys/dev/uart/uart.hThu Oct 2 08:12:42 2014(r272399)
@@ -65,6 +65,7 @@ struct uart_bas {
struct uart_class;
extern struct uart_class uart_imx_class __attribute__((weak));
+extern struct uart_class uart_msm_class __attribute__((weak));
extern struct uart_class uart_ns8250_class __attribute__((weak));
extern struct uart_class uart_quicc_class __attribute__((weak));
extern struct uart_class uart_s3c2410_class __attribute__((weak));
Modified: head/sys/dev/uart/uart_bus_fdt.c
==
--- head/sys/dev/uart/uart_bus_fdt.cThu Oct 2 06:29:49 2014
(r272398)
+++ head/sys/dev/uart/uart_bus_fdt.cThu Oct 2 08:12:42 2014
(r272399)
@@ -84,6 +84,7 @@ static struct ofw_compat_data compat_dat
{fsl,imx21-uart, (uintptr_t)uart_imx_class},
{fsl,mvf600-uart, (uintptr_t)uart_vybrid_class},
{lpc,uart,(uintptr_t)uart_lpc_class},
+{qcom,uart-dm,(uintptr_t)uart_msm_class},
{ti,ns16550, (uintptr_t)uart_ti8250_class},
{ns16550, (uintptr_t)uart_ns8250_class},
{NULL, (uintptr_t)NULL},
Added: head/sys/dev/uart/uart_dev_msm.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/uart/uart_dev_msm.cThu Oct 2 08:12:42 2014
(r272399)
@@ -0,0 +1,568 @@
+/*-
+ * Copyright (c) 2014 Ganbold Tsagaankhuu ganb...@freebsd.org
+ * 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 ``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 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.
+ */
+
+/* Qualcomm MSM7K/8K uart driver */
+
+#include sys/cdefs.h
+__FBSDID($FreeBSD$);
+
+#include opt_ddb.h
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/bus.h
+#include sys/conf.h
+#include sys/kdb.h
+#include machine/bus.h
+#include machine/fdt.h
+
+#include dev/uart/uart.h
+#include dev/uart/uart_cpu.h
+#include dev/uart/uart_bus.h
+#include dev/uart/uart_dev_msm.h
+
+#include uart_if.h
+
+#defineDEF_CLK 7372800
+
+#defineGETREG(bas, reg)\
+bus_space_read_4((bas)-bst, (bas)-bsh, (reg))
+#defineSETREG(bas, reg, value) \
+bus_space_write_4((bas)-bst, (bas)-bsh, (reg), (value))
+
+static int msm_uart_param(struct uart_bas *, int, int, int, int);
+
+/*
+ * Low-level UART interface.
+ */
+static int msm_probe(struct uart_bas *bas);
+static voidmsm_init(struct uart_bas *bas, int, int, int, int);
+static voidmsm_term(struct uart_bas *bas);
+static voidmsm_putc(struct uart_bas *bas, int);
+static int msm_rxready(struct uart_bas *bas);
+static int msm_getc(struct uart_bas *bas, struct mtx *mtx);
+
+extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs;
+
+static int
+msm_uart_param(struct uart_bas *bas, int baudrate, int databits,
+int stopbits, int parity)
+{
+ int ulcon;
+
+ ulcon = 0;
+
+ switch (databits) {
+ case 5:
+ ulcon |= (UART_DM_5_BPS 4);
+ break;
+
Re: svn commit: r272391 - in head/sys: netinet netinet6
On 02.10.2014 04:25, Hiroki Sato wrote:
Author: hrs
Date: Thu Oct 2 00:25:57 2014
New Revision: 272391
URL: https://svnweb.freebsd.org/changeset/base/272391
Log:
Add an additional routing table lookup when m-m_pkthdr.fibnum is changed
at a PFIL hook in ip{,6}_output(). IPFW setfib rule did not perform
a routing table lookup when the destination address was not changed.
CR: D805
Modified:
head/sys/netinet/ip_output.c
head/sys/netinet6/ip6_output.c
I'm not very happy with this.
We already have large conditional for checking if dst has changed, how
you have added another conditional for fib..
This idea is quite weird: why should we try to check all this stuff for
every packet instead of asking pfil consumers
to provide information they already know?
We'd better discuss something like M_DSTCHANGED flag instead of doing
these hacks.
Additionally, you haven't changed ip_fastfwd part so the behavior is
now inconsistent.
Modified: head/sys/netinet/ip_output.c
==
--- head/sys/netinet/ip_output.cThu Oct 2 00:19:24 2014
(r272390)
+++ head/sys/netinet/ip_output.cThu Oct 2 00:25:57 2014
(r272391)
@@ -136,7 +136,9 @@ ip_output(struct mbuf *m, struct mbuf *o
struct rtentry *rte;/* cache for ro-ro_rt */
struct in_addr odst;
struct m_tag *fwd_tag = NULL;
+ uint32_t fibnum;
int have_ia_ref;
+ int needfiblookup;
#ifdef IPSEC
int no_route_but_check_spd = 0;
#endif
@@ -202,6 +204,7 @@ ip_output(struct mbuf *m, struct mbuf *o
* therefore we need restore gw if we're redoing lookup.
*/
gw = dst = (struct sockaddr_in *)ro-ro_dst;
+ fibnum = (inp != NULL) ? inp-inp_inc.inc_fibnum : M_GETFIB(m);
again:
ia = NULL;
have_ia_ref = 0;
@@ -283,10 +286,9 @@ again:
#ifdef RADIX_MPATH
rtalloc_mpath_fib(ro,
ntohl(ip-ip_src.s_addr ^ ip-ip_dst.s_addr),
- inp ? inp-inp_inc.inc_fibnum : M_GETFIB(m));
+ fibnum);
#else
- in_rtalloc_ign(ro, 0,
- inp ? inp-inp_inc.inc_fibnum : M_GETFIB(m));
+ in_rtalloc_ign(ro, 0, fibnum);
#endif
rte = ro-ro_rt;
}
@@ -504,6 +506,7 @@ sendit:
goto done;
ip = mtod(m, struct ip *);
+ needfiblookup = 0;
/* See if destination IP address was changed by packet filter. */
if (odst.s_addr != ip-ip_dst.s_addr) {
@@ -529,9 +532,18 @@ sendit:
} else {
if (have_ia_ref)
ifa_free(ia-ia_ifa);
- goto again; /* Redo the routing table lookup. */
+ needfiblookup = 1; /* Redo the routing table lookup. */
}
}
+ /* See if fib was changed by packet filter. */
+ if (fibnum != M_GETFIB(m)) {
+ m-m_flags |= M_SKIP_FIREWALL;
+ fibnum = M_GETFIB(m);
+ RO_RTFREE(ro);
+ needfiblookup = 1;
+ }
+ if (needfiblookup)
+ goto again;
/* See if local, if yes, send it to netisr with IP_FASTFWD_OURS. */
if (m-m_flags M_FASTFWD_OURS) {
Modified: head/sys/netinet6/ip6_output.c
==
--- head/sys/netinet6/ip6_output.c Thu Oct 2 00:19:24 2014
(r272390)
+++ head/sys/netinet6/ip6_output.c Thu Oct 2 00:25:57 2014
(r272391)
@@ -255,6 +255,8 @@ ip6_output(struct mbuf *m0, struct ip6_p
struct route_in6 *ro_pmtu = NULL;
int hdrsplit = 0;
int sw_csum, tso;
+ int needfiblookup;
+ uint32_t fibnum;
struct m_tag *fwd_tag = NULL;
ip6 = mtod(m, struct ip6_hdr *);
@@ -448,6 +450,7 @@ ip6_output(struct mbuf *m0, struct ip6_p
if (ro-ro_rt == NULL)
(void )flowtable_lookup(AF_INET6, m, (struct route *)ro);
#endif
+ fibnum = (inp != NULL) ? inp-inp_inc.inc_fibnum : M_GETFIB(m);
again:
/*
* if specified, try to fill in the traffic class field.
@@ -489,7 +492,7 @@ again:
dst_sa.sin6_addr = ip6-ip6_dst;
}
error = in6_selectroute_fib(dst_sa, opt, im6o, ro, ifp,
- rt, inp ? inp-inp_inc.inc_fibnum : M_GETFIB(m));
+ rt, fibnum);
if (error != 0) {
if (ifp != NULL)
in6_ifstat_inc(ifp, ifs6_out_discard);
@@ -649,7 +652,7 @@ again:
/* Determine path MTU. */
if ((error = ip6_getpmtu(ro_pmtu, ro, ifp, finaldst, mtu,
- alwaysfrag, inp ? inp-inp_inc.inc_fibnum : M_GETFIB(m))) != 0)
+ alwaysfrag, fibnum)) != 0)
goto bad;
svn commit: r272401 - head/sys/cam/scsi
Author: mav
Date: Thu Oct 2 09:42:11 2014
New Revision: 272401
URL: https://svnweb.freebsd.org/changeset/base/272401
Log:
Rework the logic of sequential SCSI LUN scanner.
Previous logic was not differentiating disconnected LUNs and absent targets.
That made it to stop scan if LUN 0 was not found for any reason. That made
problematic, for example, using iSCSI targets declaring SPC-2 compliance and
having no LUN 0 configured.
The new logic continues sequential LUN scan if:
-- we have more configured LUNs that need recheck;
-- this LUN is connected and its SCSI version allows more LUNs;
-- this LUN is disconnected, its SCSI version allows more LUNs and we
guess they may be connected (we haven't scanned first 8 LUNs yet or
kern.cam.cam_srch_hi sysctl is set to scan more).
Reported by: trasz
MFC after:1 month
Modified:
head/sys/cam/scsi/scsi_xpt.c
Modified: head/sys/cam/scsi/scsi_xpt.c
==
--- head/sys/cam/scsi/scsi_xpt.cThu Oct 2 08:57:11 2014
(r272400)
+++ head/sys/cam/scsi/scsi_xpt.cThu Oct 2 09:42:11 2014
(r272401)
@@ -1135,6 +1135,7 @@ out:
u_int8_t periph_qual;
path-device-flags |= CAM_DEV_INQUIRY_DATA_VALID;
+ scsi_find_quirk(path-device);
inq_buf = path-device-inq_data;
periph_qual = SID_QUAL(inq_buf);
@@ -1163,8 +1164,6 @@ out:
goto out;
}
- scsi_find_quirk(path-device);
-
scsi_devise_transport(path);
if (path-device-lun_id == 0
@@ -1213,10 +1212,13 @@ out:
: SF_RETRY_UA,
softc-saved_ccb) == ERESTART) {
goto outr;
- } else if ((done_ccb-ccb_h.status CAM_DEV_QFRZN) != 0) {
- /* Don't wedge the queue */
- xpt_release_devq(done_ccb-ccb_h.path, /*count*/1,
-/*run_queue*/TRUE);
+ } else {
+ if ((done_ccb-ccb_h.status CAM_DEV_QFRZN) != 0) {
+ /* Don't wedge the queue */
+ xpt_release_devq(done_ccb-ccb_h.path,
+ /*count*/1, /*run_queue*/TRUE);
+ }
+ path-device-flags = ~CAM_DEV_INQUIRY_DATA_VALID;
}
/*
* If we get to this point, we got an error status back
@@ -1975,7 +1977,7 @@ scsi_scan_bus(struct cam_periph *periph,
struct cam_path *path, *oldpath;
scsi_scan_bus_info *scan_info;
struct cam_et *target;
- struct cam_ed *device;
+ struct cam_ed *device, *nextdev;
int next_target;
path_id_t path_id;
target_id_t target_id;
@@ -1984,18 +1986,10 @@ scsi_scan_bus(struct cam_periph *periph,
oldpath = request_ccb-ccb_h.path;
status = cam_ccb_status(request_ccb);
- /* Reuse the same CCB to query if a device was really found */
scan_info = (scsi_scan_bus_info *)request_ccb-ccb_h.ppriv_ptr0;
- xpt_setup_ccb(request_ccb-ccb_h, request_ccb-ccb_h.path,
- request_ccb-ccb_h.pinfo.priority);
- request_ccb-ccb_h.func_code = XPT_GDEV_TYPE;
-
-
path_id = request_ccb-ccb_h.path_id;
target_id = request_ccb-ccb_h.target_id;
lun_id = request_ccb-ccb_h.target_lun;
- xpt_action(request_ccb);
-
target = request_ccb-ccb_h.path-target;
next_target = 1;
@@ -2068,56 +2062,36 @@ scsi_scan_bus(struct cam_periph *periph,
}
}
} else {
- mtx_unlock(target-luns_mtx);
- if (request_ccb-ccb_h.status != CAM_REQ_CMP) {
- int phl;
-
- /*
-* If we already probed lun 0 successfully, or
-* we have additional configured luns on this
-* target that might have gone away, go onto
-* the next lun.
-*/
- /*
-* We may touch devices that we don't
-* hold references too, so ensure they
-* don't disappear out from under us.
-* The target above is referenced by the
-* path in the request ccb.
-*/
-
svn commit: r272402 - head/sys/cam/scsi
Author: mav
Date: Thu Oct 2 10:02:38 2014
New Revision: 272402
URL: https://svnweb.freebsd.org/changeset/base/272402
Log:
Restore CAM_QUIRK_NOLUNS check, lost in previous commit.
MFC after:1 month
Modified:
head/sys/cam/scsi/scsi_xpt.c
Modified: head/sys/cam/scsi/scsi_xpt.c
==
--- head/sys/cam/scsi/scsi_xpt.cThu Oct 2 09:42:11 2014
(r272401)
+++ head/sys/cam/scsi/scsi_xpt.cThu Oct 2 10:02:38 2014
(r272402)
@@ -2074,6 +2074,9 @@ scsi_scan_bus(struct cam_periph *periph,
mtx_unlock(target-bus-eb_mtx);
if (nextdev != NULL) {
next_target = 0;
+ /* -- stop if CAM_QUIRK_NOLUNS is set. */
+ } else if (SCSI_QUIRK(device)-quirks
CAM_QUIRK_NOLUNS) {
+ next_target = 1;
/* -- this LUN is connected and its SCSI version
* allows more LUNs. */
} else if ((device-flags CAM_DEV_UNCONFIGURED) == 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: r272386 - in head: sbin/ifconfig share/man/man4 sys/net
On Wed, Oct 01, 2014 at 09:37:33PM +, Hiroki Sato wrote: H Author: hrs H Date: Wed Oct 1 21:37:32 2014 H New Revision: 272386 H URL: https://svnweb.freebsd.org/changeset/base/272386 H H Log: H Virtualize lagg(4) cloner. This change fixes a panic when tearing down H if_lagg(4) interfaces which were cloned in a vnet jail. H H Sysctl nodes which are dynamically generated for each cloned interface H (net.link.lagg.N.*) have been removed, and use_flowid and flowid_shift H ifconfig(8) parameters have been added instead. Flags and per-interface H statistics counters are displayed in ifconfig -v. Thanks a lot for this, Hiroki-san! -- Totus tuus, Glebius. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r272390 - head/sbin/ifconfig
On Thu, Oct 02, 2014 at 12:19:25AM +, Hiroki Sato wrote: H Author: hrs H Date: Thu Oct 2 00:19:24 2014 H New Revision: 272390 H URL: https://svnweb.freebsd.org/changeset/base/272390 H H Log: H Add IFCAP_HWSTATS. Actually this flag was a temporary workaround, which I hope to remove soon. There is no reason to display it to userland. -- Totus tuus, Glebius. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r272403 - head/sys/fs/autofs
Author: trasz
Date: Thu Oct 2 10:31:32 2014
New Revision: 272403
URL: https://svnweb.freebsd.org/changeset/base/272403
Log:
Make autofs timeout handling use timeout task instead of callout;
that's because the handler can sleep on sx lock.
Reviewed by: kib
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/fs/autofs/autofs.c
head/sys/fs/autofs/autofs.h
head/sys/fs/autofs/autofs_vfsops.c
head/sys/fs/autofs/autofs_vnops.c
Modified: head/sys/fs/autofs/autofs.c
==
--- head/sys/fs/autofs/autofs.c Thu Oct 2 10:02:38 2014(r272402)
+++ head/sys/fs/autofs/autofs.c Thu Oct 2 10:31:32 2014(r272403)
@@ -76,6 +76,7 @@
#include sys/sx.h
#include sys/sysctl.h
#include sys/syscallsubr.h
+#include sys/taskqueue.h
#include sys/vnode.h
#include machine/atomic.h
#include vm/uma.h
@@ -260,7 +261,7 @@ autofs_path(struct autofs_node *anp)
}
static void
-autofs_callout(void *context)
+autofs_task(void *context, int pending)
{
struct autofs_request *ar;
@@ -414,9 +415,14 @@ autofs_trigger_one(struct autofs_node *a
strlcpy(ar-ar_options,
amp-am_options, sizeof(ar-ar_options));
- callout_init(ar-ar_callout, 1);
- callout_reset(ar-ar_callout,
- autofs_timeout * hz, autofs_callout, ar);
+ TIMEOUT_TASK_INIT(taskqueue_thread, ar-ar_task, 0,
+ autofs_task, ar);
+ error = taskqueue_enqueue_timeout(taskqueue_thread,
+ ar-ar_task, autofs_timeout * hz);
+ if (error != 0) {
+ AUTOFS_WARN(taskqueue_enqueue_timeout() failed
+ with error %d, error);
+ }
refcount_init(ar-ar_refcount, 1);
TAILQ_INSERT_TAIL(autofs_softc-sc_requests, ar, ar_next);
}
@@ -451,7 +457,8 @@ autofs_trigger_one(struct autofs_node *a
* XXX: Is it safe?
*/
sx_xunlock(autofs_softc-sc_lock);
- callout_drain(ar-ar_callout);
+ taskqueue_cancel_timeout(taskqueue_thread, ar-ar_task, NULL);
+ taskqueue_drain_timeout(taskqueue_thread, ar-ar_task);
sx_xlock(autofs_softc-sc_lock);
uma_zfree(autofs_request_zone, ar);
}
Modified: head/sys/fs/autofs/autofs.h
==
--- head/sys/fs/autofs/autofs.h Thu Oct 2 10:02:38 2014(r272402)
+++ head/sys/fs/autofs/autofs.h Thu Oct 2 10:31:32 2014(r272403)
@@ -97,7 +97,7 @@ struct autofs_request {
charar_prefix[MAXPATHLEN];
charar_key[MAXPATHLEN];
charar_options[MAXPATHLEN];
- struct callout ar_callout;
+ struct timeout_task ar_task;
volatile u_int ar_refcount;
};
Modified: head/sys/fs/autofs/autofs_vfsops.c
==
--- head/sys/fs/autofs/autofs_vfsops.c Thu Oct 2 10:02:38 2014
(r272402)
+++ head/sys/fs/autofs/autofs_vfsops.c Thu Oct 2 10:31:32 2014
(r272403)
@@ -40,6 +40,7 @@
#include sys/module.h
#include sys/mount.h
#include sys/sx.h
+#include sys/taskqueue.h
#include sys/vnode.h
#include fs/autofs/autofs.h
Modified: head/sys/fs/autofs/autofs_vnops.c
==
--- head/sys/fs/autofs/autofs_vnops.c Thu Oct 2 10:02:38 2014
(r272402)
+++ head/sys/fs/autofs/autofs_vnops.c Thu Oct 2 10:31:32 2014
(r272403)
@@ -42,6 +42,7 @@ __FBSDID($FreeBSD$);
#include sys/namei.h
#include sys/signalvar.h
#include sys/systm.h
+#include sys/taskqueue.h
#include sys/vnode.h
#include machine/atomic.h
#include vm/uma.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: r272404 - head/sys/netinet6
Author: tuexen
Date: Thu Oct 2 10:32:24 2014
New Revision: 272404
URL: https://svnweb.freebsd.org/changeset/base/272404
Log:
Fix the checksum computation for UDPLite/IPv6. This requires the
usage of a function computing the checksum only over a part of the function.
Therefore introduce in6_cksum_partial() and implement in6_cksum() based
on that.
While there, ensure that the UDPLite packet contains at least enough bytes
to contain the header.
Reviewed by: kevlo
MFC after: 3 days
Modified:
head/sys/netinet6/in6.h
head/sys/netinet6/in6_cksum.c
head/sys/netinet6/udp6_usrreq.c
Modified: head/sys/netinet6/in6.h
==
--- head/sys/netinet6/in6.h Thu Oct 2 10:31:32 2014(r272403)
+++ head/sys/netinet6/in6.h Thu Oct 2 10:32:24 2014(r272404)
@@ -647,6 +647,8 @@ struct ip6_hdr;
intin6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t);
intin6_cksum(struct mbuf *, u_int8_t, u_int32_t, u_int32_t);
+intin6_cksum_partial(struct mbuf *, u_int8_t, u_int32_t, u_int32_t,
+ u_int32_t);
intin6_localaddr(struct in6_addr *);
intin6_localip(struct in6_addr *);
intin6_addrscope(const struct in6_addr *);
Modified: head/sys/netinet6/in6_cksum.c
==
--- head/sys/netinet6/in6_cksum.c Thu Oct 2 10:31:32 2014
(r272403)
+++ head/sys/netinet6/in6_cksum.c Thu Oct 2 10:32:24 2014
(r272404)
@@ -145,9 +145,11 @@ in6_cksum_pseudo(struct ip6_hdr *ip6, ui
* off is an offset where TCP/UDP/ICMP6 header starts.
* len is a total length of a transport segment.
* (e.g. TCP header + TCP payload)
+ * cov is the number of bytes to be taken into account for the checksum
*/
int
-in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
+in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off,
+u_int32_t len, u_int32_t cov)
{
struct ip6_hdr *ip6;
u_int16_t *w, scope;
@@ -215,9 +217,9 @@ in6_cksum(struct mbuf *m, u_int8_t nxt,
}
w = (u_int16_t *)(mtod(m, u_char *) + off);
mlen = m-m_len - off;
- if (len mlen)
- mlen = len;
- len -= mlen;
+ if (cov mlen)
+ mlen = cov;
+ cov -= mlen;
/*
* Force to even boundary.
*/
@@ -273,7 +275,7 @@ in6_cksum(struct mbuf *m, u_int8_t nxt,
* Lastly calculate a summary of the rest of mbufs.
*/
- for (;m len; m = m-m_next) {
+ for (;m cov; m = m-m_next) {
if (m-m_len == 0)
continue;
w = mtod(m, u_int16_t *);
@@ -290,12 +292,12 @@ in6_cksum(struct mbuf *m, u_int8_t nxt,
sum += s_util.s;
w = (u_int16_t *)((char *)w + 1);
mlen = m-m_len - 1;
- len--;
+ cov--;
} else
mlen = m-m_len;
- if (len mlen)
- mlen = len;
- len -= mlen;
+ if (cov mlen)
+ mlen = cov;
+ cov -= mlen;
/*
* Force to even boundary.
*/
@@ -343,7 +345,7 @@ in6_cksum(struct mbuf *m, u_int8_t nxt,
} else if (mlen == -1)
s_util.c[0] = *(char *)w;
}
- if (len)
+ if (cov)
panic(in6_cksum: out of data);
if (mlen == -1) {
/* The last mbuf has odd # of bytes. Follow the
@@ -355,3 +357,9 @@ in6_cksum(struct mbuf *m, u_int8_t nxt,
REDUCE;
return (~sum 0x);
}
+
+int
+in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
+{
+ return (in6_cksum_partial(m, nxt, off, len, len));
+}
Modified: head/sys/netinet6/udp6_usrreq.c
==
--- head/sys/netinet6/udp6_usrreq.c Thu Oct 2 10:31:32 2014
(r272403)
+++ head/sys/netinet6/udp6_usrreq.c Thu Oct 2 10:32:24 2014
(r272404)
@@ -227,11 +227,16 @@ udp6_input(struct mbuf **mp, int *offp,
nxt = ip6-ip6_nxt;
cscov_partial = (nxt == IPPROTO_UDPLITE) ? 1 : 0;
- if (nxt == IPPROTO_UDPLITE (ulen == 0 || ulen == plen)) {
+ if (nxt == IPPROTO_UDPLITE) {
/* Zero means checksum over the complete packet. */
if (ulen == 0)
ulen = plen;
- cscov_partial = 0;
+ if (ulen == plen)
+ cscov_partial = 0;
+ if ((ulen sizeof(struct udphdr)) || (ulen plen)) {
+ /* XXX: What is the right UDPLite MIB counter? */
+ goto badunlocked;
+ }
}
if (nxt == IPPROTO_UDP plen
Re: svn commit: r272391 - in head/sys: netinet netinet6
On Thu, Oct 02, 2014 at 12:16:15PM +0400, Alexander V. Chernikov wrote:
A On 02.10.2014 04:25, Hiroki Sato wrote:
A Author: hrs
A Date: Thu Oct 2 00:25:57 2014
A New Revision: 272391
A URL: https://svnweb.freebsd.org/changeset/base/272391
A
A Log:
A Add an additional routing table lookup when m-m_pkthdr.fibnum is
changed
A at a PFIL hook in ip{,6}_output(). IPFW setfib rule did not perform
A a routing table lookup when the destination address was not changed.
A
A CR: D805
A
A Modified:
A head/sys/netinet/ip_output.c
A head/sys/netinet6/ip6_output.c
A I'm not very happy with this.
A We already have large conditional for checking if dst has changed, how
A you have added another conditional for fib..
A This idea is quite weird: why should we try to check all this stuff for
A every packet instead of asking pfil consumers
A to provide information they already know?
A
A We'd better discuss something like M_DSTCHANGED flag instead of doing
A these hacks.
And here you suggest to abuse mbuf flags to merely carry return value of
a pfil hook :)
--
Totus tuus, Glebius.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r272403 - head/sys/fs/autofs
On Thu, Oct 02, 2014 at 10:31:32AM +, Edward Tomasz Napierala wrote: E Author: trasz E Date: Thu Oct 2 10:31:32 2014 E New Revision: 272403 E URL: https://svnweb.freebsd.org/changeset/base/272403 E E Log: E Make autofs timeout handling use timeout task instead of callout; E that's because the handler can sleep on sx lock. How long can it sleep? AFAIU, the taskqueue_thread is used by other subsystems. -- Totus tuus, Glebius. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r272405 - head/sys/fs/autofs
Author: trasz
Date: Thu Oct 2 10:37:56 2014
New Revision: 272405
URL: https://svnweb.freebsd.org/changeset/base/272405
Log:
Call uma_zfree() outside of lock, and improve comment.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/fs/autofs/autofs.c
Modified: head/sys/fs/autofs/autofs.c
==
--- head/sys/fs/autofs/autofs.c Thu Oct 2 10:32:24 2014(r272404)
+++ head/sys/fs/autofs/autofs.c Thu Oct 2 10:37:56 2014(r272405)
@@ -454,13 +454,13 @@ autofs_trigger_one(struct autofs_node *a
if (last) {
TAILQ_REMOVE(autofs_softc-sc_requests, ar, ar_next);
/*
-* XXX: Is it safe?
+* Unlock the sc_lock, so that autofs_task() can complete.
*/
sx_xunlock(autofs_softc-sc_lock);
taskqueue_cancel_timeout(taskqueue_thread, ar-ar_task, NULL);
taskqueue_drain_timeout(taskqueue_thread, ar-ar_task);
- sx_xlock(autofs_softc-sc_lock);
uma_zfree(autofs_request_zone, ar);
+ sx_xlock(autofs_softc-sc_lock);
}
/*
___
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: r272406 - head/sys/cam/scsi
Author: mav
Date: Thu Oct 2 10:39:07 2014
New Revision: 272406
URL: https://svnweb.freebsd.org/changeset/base/272406
Log:
Make disconnected LUN 0 don't remain in half-configured state if there are
no LUNs on SPC-3 target after we tried REPORT LUNS.
Modified:
head/sys/cam/scsi/scsi_xpt.c
Modified: head/sys/cam/scsi/scsi_xpt.c
==
--- head/sys/cam/scsi/scsi_xpt.cThu Oct 2 10:37:56 2014
(r272405)
+++ head/sys/cam/scsi/scsi_xpt.cThu Oct 2 10:39:07 2014
(r272406)
@@ -1194,12 +1194,6 @@ out:
SID_ANSI_REV(inq_buf) SCSI_REV_SPC2
(SCSI_QUIRK(path-device)-quirks
CAM_QUIRK_NORPTLUNS) == 0) {
- if (path-device-flags
- CAM_DEV_UNCONFIGURED) {
- path-device-flags =
- ~CAM_DEV_UNCONFIGURED;
- xpt_acquire_device(path-device);
- }
PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS);
periph-path-target-rpl_size = 16;
xpt_release_ccb(done_ccb);
@@ -1310,14 +1304,6 @@ out:
tlun, 8);
CAM_DEBUG(path, CAM_DEBUG_PROBE,
(lun 0 in position %u\n, idx));
- } else {
- /*
-* There is no lun 0 in our list.
Destroy
-* the validity of the inquiry data so
we
-* bail here and now.
-*/
- path-device-flags =
- ~CAM_DEV_INQUIRY_DATA_VALID;
}
}
/*
@@ -1330,7 +1316,8 @@ out:
probe_purge_old(path, lp, softc-flags);
lp = NULL;
}
- if (path-device-flags CAM_DEV_INQUIRY_DATA_VALID) {
+ if (path-device-flags CAM_DEV_INQUIRY_DATA_VALID
+ SID_QUAL(path-device-inq_data) == SID_QUAL_LU_CONNECTED)
{
struct scsi_inquiry_data *inq_buf;
inq_buf = path-device-inq_data;
if (INQ_DATA_TQ_ENABLED(inq_buf))
@@ -1345,6 +1332,8 @@ out:
if (lp) {
free(lp, M_CAMXPT);
}
+ PROBE_SET_ACTION(softc, PROBE_INVALID);
+ xpt_release_ccb(done_ccb);
break;
}
case PROBE_MODE_SENSE:
___
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: r272407 - in stable/10: contrib/ofed/libibverbs/examples contrib/ofed/libmlx4/src sys/conf sys/modules/mlx4 sys/modules/mlxen sys/ofed/drivers/infiniband/hw/mlx4 sys/ofed/drivers/net/ml...
Author: hselasky Date: Thu Oct 2 10:46:12 2014 New Revision: 272407 URL: https://svnweb.freebsd.org/changeset/base/272407 Log: MFC r272027: Hardware driver update from Mellanox Technologies, including: - improved performance - better stability - new features - bugfixes Supported HCAs: - ConnectX-2 - ConnectX-3 - ConnectX-3 Pro NOTE: - TSO feature needs r271946, which is not yet merged. Sponsored by: Mellanox Technologies Approved by: re, glebius Added: stable/10/sys/ofed/drivers/net/mlx4/mlx4_stats.h - copied unchanged from r272027, head/sys/ofed/drivers/net/mlx4/mlx4_stats.h stable/10/sys/ofed/drivers/net/mlx4/utils.c - copied unchanged from r272027, head/sys/ofed/drivers/net/mlx4/utils.c stable/10/sys/ofed/drivers/net/mlx4/utils.h - copied unchanged from r272027, head/sys/ofed/drivers/net/mlx4/utils.h Modified: stable/10/contrib/ofed/libibverbs/examples/asyncwatch.c stable/10/contrib/ofed/libibverbs/examples/device_list.c stable/10/contrib/ofed/libibverbs/examples/devinfo.c stable/10/contrib/ofed/libmlx4/src/mlx4-abi.h stable/10/sys/conf/files stable/10/sys/modules/mlx4/Makefile stable/10/sys/modules/mlxen/Makefile stable/10/sys/ofed/drivers/infiniband/hw/mlx4/mad.c stable/10/sys/ofed/drivers/infiniband/hw/mlx4/main.c stable/10/sys/ofed/drivers/infiniband/hw/mlx4/qp.c stable/10/sys/ofed/drivers/net/mlx4/alloc.c stable/10/sys/ofed/drivers/net/mlx4/catas.c stable/10/sys/ofed/drivers/net/mlx4/cmd.c stable/10/sys/ofed/drivers/net/mlx4/cq.c stable/10/sys/ofed/drivers/net/mlx4/en_cq.c stable/10/sys/ofed/drivers/net/mlx4/en_ethtool.c stable/10/sys/ofed/drivers/net/mlx4/en_main.c stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c stable/10/sys/ofed/drivers/net/mlx4/en_port.c stable/10/sys/ofed/drivers/net/mlx4/en_port.h stable/10/sys/ofed/drivers/net/mlx4/en_resources.c stable/10/sys/ofed/drivers/net/mlx4/en_rx.c stable/10/sys/ofed/drivers/net/mlx4/en_selftest.c stable/10/sys/ofed/drivers/net/mlx4/en_tx.c stable/10/sys/ofed/drivers/net/mlx4/eq.c stable/10/sys/ofed/drivers/net/mlx4/fw.c stable/10/sys/ofed/drivers/net/mlx4/fw.h stable/10/sys/ofed/drivers/net/mlx4/icm.c stable/10/sys/ofed/drivers/net/mlx4/icm.h stable/10/sys/ofed/drivers/net/mlx4/intf.c stable/10/sys/ofed/drivers/net/mlx4/main.c stable/10/sys/ofed/drivers/net/mlx4/mcg.c stable/10/sys/ofed/drivers/net/mlx4/mlx4.h stable/10/sys/ofed/drivers/net/mlx4/mlx4_en.h stable/10/sys/ofed/drivers/net/mlx4/mr.c stable/10/sys/ofed/drivers/net/mlx4/pd.c stable/10/sys/ofed/drivers/net/mlx4/port.c stable/10/sys/ofed/drivers/net/mlx4/profile.c stable/10/sys/ofed/drivers/net/mlx4/qp.c stable/10/sys/ofed/drivers/net/mlx4/reset.c stable/10/sys/ofed/drivers/net/mlx4/resource_tracker.c stable/10/sys/ofed/drivers/net/mlx4/sense.c stable/10/sys/ofed/drivers/net/mlx4/srq.c stable/10/sys/ofed/drivers/net/mlx4/sys_tune.c stable/10/sys/ofed/include/linux/mlx4/cmd.h stable/10/sys/ofed/include/linux/mlx4/cq.h stable/10/sys/ofed/include/linux/mlx4/device.h stable/10/sys/ofed/include/linux/mlx4/driver.h stable/10/sys/ofed/include/linux/mlx4/qp.h stable/10/sys/ofed/include/linux/mlx4/srq.h Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/ofed/libibverbs/examples/asyncwatch.c == --- stable/10/contrib/ofed/libibverbs/examples/asyncwatch.c Thu Oct 2 10:39:07 2014(r272406) +++ stable/10/contrib/ofed/libibverbs/examples/asyncwatch.c Thu Oct 2 10:46:12 2014(r272407) @@ -35,8 +35,6 @@ #endif /* HAVE_CONFIG_H */ #include stdio.h -#include endian.h -#include byteswap.h #include infiniband/verbs.h Modified: stable/10/contrib/ofed/libibverbs/examples/device_list.c == --- stable/10/contrib/ofed/libibverbs/examples/device_list.cThu Oct 2 10:39:07 2014(r272406) +++ stable/10/contrib/ofed/libibverbs/examples/device_list.cThu Oct 2 10:46:12 2014(r272407) @@ -36,9 +36,6 @@ #include stdio.h -#include endian.h -#include byteswap.h - #include infiniband/verbs.h #include infiniband/arch.h Modified: stable/10/contrib/ofed/libibverbs/examples/devinfo.c == --- stable/10/contrib/ofed/libibverbs/examples/devinfo.cThu Oct 2 10:39:07 2014(r272406) +++ stable/10/contrib/ofed/libibverbs/examples/devinfo.cThu Oct 2 10:46:12 2014(r272407) @@ -41,8 +41,6 @@ #include string.h #include getopt.h #include netinet/in.h -#include endian.h -#include byteswap.h #include infiniband/verbs.h #include infiniband/driver.h Modified: stable/10/contrib/ofed/libmlx4/src/mlx4-abi.h == ---
svn commit: r272408 - head/sys/netinet6
Author: tuexen
Date: Thu Oct 2 10:49:01 2014
New Revision: 272408
URL: https://svnweb.freebsd.org/changeset/base/272408
Log:
Check for UDP/IPv6 packets that the length in the UDP header is at least
the minimum. Make the check similar to the one for UDPLite/IPv6.
MFC after: 3 days
Modified:
head/sys/netinet6/udp6_usrreq.c
Modified: head/sys/netinet6/udp6_usrreq.c
==
--- head/sys/netinet6/udp6_usrreq.c Thu Oct 2 10:46:12 2014
(r272407)
+++ head/sys/netinet6/udp6_usrreq.c Thu Oct 2 10:49:01 2014
(r272408)
@@ -237,18 +237,9 @@ udp6_input(struct mbuf **mp, int *offp,
/* XXX: What is the right UDPLite MIB counter? */
goto badunlocked;
}
- }
- if (nxt == IPPROTO_UDP plen != ulen) {
- UDPSTAT_INC(udps_badlen);
- goto badunlocked;
- }
-
- /*
-* Checksum extended UDP header and data.
-*/
- if (uh-uh_sum == 0) {
- if (ulen plen || ulen sizeof(struct udphdr)) {
- UDPSTAT_INC(udps_nosum);
+ } else {
+ if ((ulen sizeof(struct udphdr)) || (plen != ulen)) {
+ UDPSTAT_INC(udps_badlen);
goto badunlocked;
}
}
___
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: r272409 - head/sys/cam/scsi
Author: mav
Date: Thu Oct 2 10:58:52 2014
New Revision: 272409
URL: https://svnweb.freebsd.org/changeset/base/272409
Log:
Use REPORT LUNS command for SPC-2 devices with LUN 0 disconnected.
SPC-2 tells REPORT LUNS shall be supported by devices supporting LUNs other
then LUN 0. If we see LUN 0 disconnected, guess there may be others, and
so REPORT LUNS shall be supported.
MFC after:1 month
Modified:
head/sys/cam/scsi/scsi_xpt.c
Modified: head/sys/cam/scsi/scsi_xpt.c
==
--- head/sys/cam/scsi/scsi_xpt.cThu Oct 2 10:49:01 2014
(r272408)
+++ head/sys/cam/scsi/scsi_xpt.cThu Oct 2 10:58:52 2014
(r272409)
@@ -1191,7 +1191,7 @@ out:
xpt_schedule(periph, priority);
goto out;
} else if (path-device-lun_id == 0
- SID_ANSI_REV(inq_buf) SCSI_REV_SPC2
+ SID_ANSI_REV(inq_buf) = SCSI_REV_SPC2
(SCSI_QUIRK(path-device)-quirks
CAM_QUIRK_NORPTLUNS) == 0) {
PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS);
___
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: r272410 - in head: share/man/man4 sys/dev/usb sys/dev/usb/wlan
Author: hselasky Date: Thu Oct 2 12:27:41 2014 New Revision: 272410 URL: https://svnweb.freebsd.org/changeset/base/272410 Log: Add new USB ID. PR: 194091 MFC after:3 days Modified: head/share/man/man4/urtwn.4 head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_urtwn.c Modified: head/share/man/man4/urtwn.4 == --- head/share/man/man4/urtwn.4 Thu Oct 2 10:58:52 2014(r272409) +++ head/share/man/man4/urtwn.4 Thu Oct 2 12:27:41 2014(r272410) @@ -19,7 +19,7 @@ .Os .Sh NAME .Nm urtwn -.Nd Realtek RTL8188CU/RTL8188EU/RTL8192CU USB IEEE 802.11b/g/n wireless network device +.Nd Realtek RTL8188CU/RTL8188RU/RTL8188EU/RTL8192CU USB IEEE 802.11b/g/n wireless network device .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -82,10 +82,11 @@ firmware license .Sh HARDWARE The .Nm -driver supports Realtek RTL8188CU/RTL8188EU/RTL8192CU based USB +driver supports Realtek RTL8188CU/RTL8188RU/RTL8188EU/RTL8192CU based USB IEEE 802.11b/g/n wireless network adapters, including: .Pp .Bl -tag -width Ds -offset indent -compact +.It Alfa AWUS036NHR v2 .It ASUS USB-N10 NANO .It Belkin F7D1102 Surf Wireless Micro .It D-Link DWA-125 rev D1 Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevsThu Oct 2 10:58:52 2014(r272409) +++ head/sys/dev/usb/usbdevsThu Oct 2 12:27:41 2014(r272410) @@ -3717,6 +3717,7 @@ product REALTEK RTL8191CU 0x8177 RTL8191 product REALTEK RTL8192CU 0x8178 RTL8192CU product REALTEK RTL8192CE 0x817c RTL8192CE product REALTEK RTL8188RU_10x817d RTL8188RU +product REALTEK RTL8188RU_30x817f RTL8188RU product REALTEK RTL87120x8712 RTL8712 product REALTEK RTL87130x8712 RTL8713 product REALTEK RTL8188RU_20x317f RTL8188RU Modified: head/sys/dev/usb/wlan/if_urtwn.c == --- head/sys/dev/usb/wlan/if_urtwn.cThu Oct 2 10:58:52 2014 (r272409) +++ head/sys/dev/usb/wlan/if_urtwn.cThu Oct 2 12:27:41 2014 (r272410) @@ -141,6 +141,7 @@ static const STRUCT_USB_HOST_ID urtwn_de URTWN_DEV(REALTEK, RTL8188CUS), URTWN_DEV(REALTEK, RTL8188RU_1), URTWN_DEV(REALTEK, RTL8188RU_2), + URTWN_DEV(REALTEK, RTL8188RU_3), URTWN_DEV(REALTEK, RTL8191CU), URTWN_DEV(REALTEK, RTL8192CE), URTWN_DEV(REALTEK, RTL8192CU), ___ 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: r272384 - head/usr.bin/mkimg
On 1 October 2014 17:03, Marcel Moolenaar mar...@freebsd.org wrote: Improve performance of mking(1) by keeping a list of chunks in memory, that keeps track of a particular region of the image. Nice work, thanks Marcel! I've been using brooks' NO_ROOT support along with makefs / mkimg to build and test changes by creating an image to boot in QEMU. This change provides a noticeable improvement in the cycle time. ___ 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: r272411 - head/sys/dev/sfxge
Author: gnn
Date: Thu Oct 2 15:03:51 2014
New Revision: 272411
URL: https://svnweb.freebsd.org/changeset/base/272411
Log:
Properly handle a case that should never happen (the bus_dma
callback being called with error set to non-zero).
Modified:
head/sys/dev/sfxge/sfxge_dma.c
Modified: head/sys/dev/sfxge/sfxge_dma.c
==
--- head/sys/dev/sfxge/sfxge_dma.c Thu Oct 2 12:27:41 2014
(r272410)
+++ head/sys/dev/sfxge/sfxge_dma.c Thu Oct 2 15:03:51 2014
(r272411)
@@ -164,11 +164,14 @@ sfxge_dma_alloc(struct sfxge_softc *sc,
/*
* The callback gets error information about the mapping
-* and will have set our vaddr to NULL if something went
+* and will have set esm_addr to 0 if something went
* wrong.
*/
- if (vaddr == NULL)
+ if (esmp-esm_addr == 0) {
+ bus_dmamem_free(esmp-esm_tag, esmp-esm_base, esmp-esm_map);
+ bus_dma_tag_destroy(esmp-esm_tag);
return (ENOMEM);
+ }
esmp-esm_base = vaddr;
___
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: r272414 - in head: release release/amd64 release/i386 share/man/man7
Author: gjb Date: Thu Oct 2 16:13:12 2014 New Revision: 272414 URL: https://svnweb.freebsd.org/changeset/base/272414 Log: Merge the following revisions from ^/projects/release-vmimage: r272234, r272236, r272262, r272264, r272269, r272271, r272272, r272277, r272279, r272376, r272380, r272381, r272392, r272234, r272412: r272234: Initial commit to include virtual machine images as part of the FreeBSD release builds. This adds a make(1) environment variable requirement, WITH_VMIMAGES, which triggers the virtual machine image targets when not defined to an empty value. Relevant user-driven variables include: o VMFORMATS: The virtual machine image formats to create. Valid formats are provided by running 'mkimg --formats' o VMSIZE: The size of the resulting virtual machine image. Typical compression is roughly 140Mb, regardless of the target size (10GB, 15GB, 20GB, 40GB sizes have been tested with the same result). o VMBASE: The prefix of the virtual machine disk images. The VMBASE make(1) environment variable is suffixed with each format in VMFORMATS for each individual disk image, as well as '.img' for the source UFS filesystem passed to mkimg(1). This also includes a new script, mk-vmimage.sh, based on how the VM images for 10.0-RELEASE, 9.3-RELEASE, and 10.1-RELEASE were created (mk-vmimage.sh in ^/user/gjb/thermite/). With the order in which the stages need to occur, as well as sanity-checking error cases, it makes much more sense to execute a shell script called from make(1), using env(1) to set specific parameters for the target image than it does to do this in make(1) directly. r272236: Use VMBASE in place of a hard-coded filename in the CLEANFILES list. r272262: Remove a 'set -x' that snuck in during testing. r272264: release/Makefile: Connect the virtual machine image build to the release target if WITH_VMIMAGES is set to a non-empty value. release/release.sh: Add WITH_VMIMAGES to RELEASE_RMAKEFLAGS. release/release.conf.sample: Add commented entries for tuning the release build if the WITH_VMIMAGES make(1) environment variable is set to a non-empty value. r272269: release/Makefile: Include .OBJDIR in DESTDIR in the vm-base target. release/release.sh: Provide the full path to mddev. r272271: Fix UFS label for the root filesystem. r272272: Remove comments left in accidentally while testing, so the VM /etc/fstab is actually created. r272277: Remove the UFS label from the root filesystem since it is added by mkimg(1) as a gpt label, consistent with the fstab(5) entry. r272279: Comment cleanup in panic() message when mkimg(1) does not support the requested disk image format. r272376: Separate release/scripts/mk-vmimage.sh to machine-specific scripts, making it possible to mimic the functionality for non-x86 targets. Move echo output if MAKEFLAGS is empty outside of usage(). Remove TARGET/TARGET_ARCH evaluation. r272380: Avoid using env(1) to set values passed to mk-vmimage.sh, and instead pass the values as arguments to the script, making it easier to run this by hand, without 'make release'. Add usage_vm_base() and usage_vm_image() usage helpers. r272381: After evaluating WITH_VMIMAGES is non-empty, ensure the mk-vmimage.sh script exists before running it. r272392: Add WITH_COMPRESSED_VMIMAGES variable, which when set enables xz(1) compression of the virtual machine images. This is intentionally separate to allow more fine-grained tuning over which images are compressed, especially in cases where compressing 20GB sparse images can take hours. r272412: Document the new 'vm-image' target, and associated release.conf variables. r272413: Remove two stray comments added during the initial iterations of testing, no longer needed. MFC after:5 days X-MFC-10.1: yes Tested on:r272269, r272272, r272279, r272380, r272392 Sponsored by: The FreeBSD Foundation Added: head/release/amd64/mk-vmimage.sh - copied, changed from r272376, projects/release-vmimage/release/amd64/mk-vmimage.sh head/release/i386/mk-vmimage.sh - copied, changed from r272376, projects/release-vmimage/release/i386/mk-vmimage.sh Modified: head/release/Makefile head/release/release.conf.sample head/release/release.sh head/share/man/man7/release.7 Modified: head/release/Makefile == --- head/release/Makefile Thu Oct 2 16:05:01 2014(r272413) +++ head/release/Makefile Thu Oct 2 16:13:12 2014(r272414) @@ -23,6 +23,9 @@ # WITH_DVD: if set, generate dvd1.iso #
svn commit: r272416 - head/sys/dev/vt
Author: dumbbell
Date: Thu Oct 2 16:36:37 2014
New Revision: 272416
URL: https://svnweb.freebsd.org/changeset/base/272416
Log:
vt(4): Save/restore keyboard mode LED states when switching window
Add new functions to manipulate these mode state, instead of calling
kbdd_ioctl() everyhere.
This fixes at least two bugs:
1. The state of the Scroll Lock LED and the state of scroll mode
could be out-of-sync. For instance, if one enables scroll mode on
window #1 and switches to window #2, the LED would remain on, but
the window wouldn't be in scroll mode.
Similarily, when switching between a console and an X.Org
session, the LED states could be inconsistent with the real
state.
2. When exiting from an X.Org session, the user could be unable to
type anything. The workaround was to switch to another console
window and come back.
Differential Revision:https://reviews.freebsd.org/D821
Reviewed by: ray@
Approved by: ray@
Tested by:kwm@
MFC after:3 days
Modified:
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hThu Oct 2 16:32:52 2014(r272415)
+++ head/sys/dev/vt/vt.hThu Oct 2 16:36:37 2014(r272416)
@@ -260,6 +260,7 @@ struct vt_window {
unsigned int vw_number; /* (c) Window number. */
int vw_kbdmode;/* (?) Keyboard mode. */
int vw_prev_kbdmode;/* (?) Previous mode. */
+ int vw_kbdstate; /* (?) Keyboard state. */
int vw_grabbed;/* (?) Grab count. */
char*vw_kbdsq; /* Escape sequence queue*/
unsigned int vw_flags; /* (d) Per-window flags. */
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Thu Oct 2 16:32:52 2014(r272415)
+++ head/sys/dev/vt/vt_core.c Thu Oct 2 16:36:37 2014(r272416)
@@ -298,6 +298,97 @@ vt_switch_timer(void *arg)
}
static int
+vt_save_kbd_mode(struct vt_window *vw, keyboard_t *kbd)
+{
+ int mode, ret;
+
+ mode = 0;
+ ret = kbdd_ioctl(kbd, KDGKBMODE, (caddr_t)mode);
+ if (ret == ENOIOCTL)
+ ret = ENODEV;
+ if (ret != 0)
+ return (ret);
+
+ vw-vw_kbdmode = mode;
+
+ return (0);
+}
+
+static int
+vt_update_kbd_mode(struct vt_window *vw, keyboard_t *kbd)
+{
+ int ret;
+
+ ret = kbdd_ioctl(kbd, KDSKBMODE, (caddr_t)vw-vw_kbdmode);
+ if (ret == ENOIOCTL)
+ ret = ENODEV;
+
+ return (ret);
+}
+
+static int
+vt_save_kbd_state(struct vt_window *vw, keyboard_t *kbd)
+{
+ int state, ret;
+
+ state = 0;
+ ret = kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)state);
+ if (ret == ENOIOCTL)
+ ret = ENODEV;
+ if (ret != 0)
+ return (ret);
+
+ vw-vw_kbdstate = ~LOCK_MASK;
+ vw-vw_kbdstate |= state LOCK_MASK;
+
+ return (0);
+}
+
+static int
+vt_update_kbd_state(struct vt_window *vw, keyboard_t *kbd)
+{
+ int state, ret;
+
+ state = vw-vw_kbdstate LOCK_MASK;
+ ret = kbdd_ioctl(kbd, KDSKBSTATE, (caddr_t)state);
+ if (ret == ENOIOCTL)
+ ret = ENODEV;
+
+ return (ret);
+}
+
+static int
+vt_save_kbd_leds(struct vt_window *vw, keyboard_t *kbd)
+{
+ int leds, ret;
+
+ leds = 0;
+ ret = kbdd_ioctl(kbd, KDGETLED, (caddr_t)leds);
+ if (ret == ENOIOCTL)
+ ret = ENODEV;
+ if (ret != 0)
+ return (ret);
+
+ vw-vw_kbdstate = ~LED_MASK;
+ vw-vw_kbdstate |= leds LED_MASK;
+
+ return (0);
+}
+
+static int
+vt_update_kbd_leds(struct vt_window *vw, keyboard_t *kbd)
+{
+ int leds, ret;
+
+ leds = vw-vw_kbdstate LED_MASK;
+ ret = kbdd_ioctl(kbd, KDSETLED, (caddr_t)leds);
+ if (ret == ENOIOCTL)
+ ret = ENODEV;
+
+ return (ret);
+}
+
+static int
vt_window_preswitch(struct vt_window *vw, struct vt_window *curvw)
{
@@ -409,7 +500,11 @@ vt_window_switch(struct vt_window *vw)
mtx_lock(Giant);
kbd = kbd_get_keyboard(vd-vd_keyboard);
if (kbd != NULL) {
- kbdd_ioctl(kbd, KDSKBMODE, (void *)vw-vw_kbdmode);
+ if (curvw-vw_kbdmode == K_XLATE)
+ vt_save_kbd_state(curvw, kbd);
+
+ vt_update_kbd_mode(vw, kbd);
+ vt_update_kbd_state(vw, kbd);
}
mtx_unlock(Giant);
DPRINTF(10, %s(ttyv%d) done\n, __func__, vw-vw_number);
@@ -602,7 +697,6 @@ static int
vt_processkey(keyboard_t *kbd, struct vt_device *vd, int c)
{
struct vt_window *vw = vd-vd_curwindow;
-
svn commit: r272417 - stable/10/etc/devd
Author: hselasky
Date: Thu Oct 2 16:41:43 2014
New Revision: 272417
URL: https://svnweb.freebsd.org/changeset/base/272417
Log:
MFC r272253:
Regenerate usb.conf
Approved by:re, gjb
Modified:
stable/10/etc/devd/usb.conf
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/devd/usb.conf
==
--- stable/10/etc/devd/usb.conf Thu Oct 2 16:36:37 2014(r272416)
+++ stable/10/etc/devd/usb.conf Thu Oct 2 16:41:43 2014(r272417)
@@ -65,7 +65,23 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x03f0;
- match product (0x2016|0x2116|0x2216|0x3016|0x3116);
+ match product (0x2016|0x2116|0x2216);
+ action kldload -n uipaq;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x03f0;
+ match product (0x241d|0x251d);
+ action kldload -n u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x03f0;
+ match product (0x3016|0x3116);
action kldload -n uipaq;
};
@@ -129,7 +145,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0403;
- match product
(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee
8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0x|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8);
+ match product
(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee1
8|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0x|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8);
action kldload -n uftdi;
};
@@ -1057,7 +1073,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0586;
- match product (0x3416|0x341a);
+ match product (0x3416|0x341a|0x341e);
action kldload -n if_run;
};
@@ -1097,7 +1113,7 @@ nomatch 32 {
match bus uhub[0-9]+;
svn commit: r272418 - stable/9/etc/devd
Author: hselasky
Date: Thu Oct 2 16:43:37 2014
New Revision: 272418
URL: https://svnweb.freebsd.org/changeset/base/272418
Log:
MFC r272253:
Regenerate usb.conf
Modified:
stable/9/etc/devd/usb.conf
Directory Properties:
stable/9/etc/ (props changed)
Modified: stable/9/etc/devd/usb.conf
==
--- stable/9/etc/devd/usb.conf Thu Oct 2 16:41:43 2014(r272417)
+++ stable/9/etc/devd/usb.conf Thu Oct 2 16:43:37 2014(r272418)
@@ -65,7 +65,23 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x03f0;
- match product (0x2016|0x2116|0x2216|0x3016|0x3116);
+ match product (0x2016|0x2116|0x2216);
+ action kldload -n uipaq;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x03f0;
+ match product (0x241d|0x251d);
+ action kldload -n u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
+ match vendor 0x03f0;
+ match product (0x3016|0x3116);
action kldload -n uipaq;
};
@@ -129,7 +145,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0403;
- match product
(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee
8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0x|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8);
+ match product
(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee1
8|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0x|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8);
action kldload -n uftdi;
};
@@ -1057,7 +1073,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0586;
- match product (0x3416|0x341a);
+ match product (0x3416|0x341a|0x341e);
action kldload -n if_run;
};
@@ -1097,7 +1113,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
svn commit: r272420 - stable/9/sys/dev/sound/usb
Author: hselasky
Date: Thu Oct 2 16:48:05 2014
New Revision: 272420
URL: https://svnweb.freebsd.org/changeset/base/272420
Log:
MFC r272254:
Instead of creating the full range of possible ports, try to figure
out the actual number of so-called embedded jacks which are present
when a USB MIDI device is attaching.
Modified:
stable/9/sys/dev/sound/usb/uaudio.c
stable/9/sys/dev/sound/usb/uaudioreg.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/sound/usb/uaudio.c
==
--- stable/9/sys/dev/sound/usb/uaudio.c Thu Oct 2 16:45:00 2014
(r272419)
+++ stable/9/sys/dev/sound/usb/uaudio.c Thu Oct 2 16:48:05 2014
(r272420)
@@ -238,7 +238,7 @@ struct uaudio_chan {
#defineUAUDIO_SYNC_LESS 2
};
-#defineUMIDI_CABLES_MAX 16 /* units */
+#defineUMIDI_EMB_JACK_MAX 16 /* units */
#defineUMIDI_TX_FRAMES256 /* units */
#defineUMIDI_TX_BUFFER(UMIDI_TX_FRAMES * 4)/* bytes */
@@ -269,7 +269,7 @@ struct umidi_sub_chan {
struct umidi_chan {
- struct umidi_sub_chan sub[UMIDI_CABLES_MAX];
+ struct umidi_sub_chan sub[UMIDI_EMB_JACK_MAX];
struct mtx mtx;
struct usb_xfer *xfer[UMIDI_N_TRANSFER];
@@ -281,7 +281,7 @@ struct umidi_chan {
uint8_t write_open_refcount;
uint8_t curr_cable;
- uint8_t max_cable;
+ uint8_t max_emb_jack;
uint8_t valid;
uint8_t single_command;
};
@@ -1487,6 +1487,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
union uaudio_asid asid = { NULL };
union uaudio_asf1d asf1d = { NULL };
union uaudio_sed sed = { NULL };
+ struct usb_midi_streaming_endpoint_descriptor *msid = NULL;
usb_endpoint_descriptor_audio_t *ed1 = NULL;
const struct usb_audio_control_descriptor *acdp = NULL;
struct usb_config_descriptor *cd = usbd_get_config_descriptor(udev);
@@ -1504,6 +1505,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
uint8_t bChannels;
uint8_t bBitResolution;
uint8_t audio_if = 0;
+ uint8_t midi_if = 0;
uint8_t uma_if_class;
while ((desc = usb_desc_foreach(cd, desc))) {
@@ -1539,7 +1541,8 @@ uaudio_chan_fill_info_sub(struct uaudio_
((id-bInterfaceClass == UICLASS_VENDOR)
(sc-sc_uq_au_vendor_class != 0)));
- if ((uma_if_class != 0) (id-bInterfaceSubClass ==
UISUBCLASS_AUDIOSTREAM)) {
+ if ((uma_if_class != 0)
+ (id-bInterfaceSubClass == UISUBCLASS_AUDIOSTREAM))
{
audio_if = 1;
} else {
audio_if = 0;
@@ -1551,13 +1554,16 @@ uaudio_chan_fill_info_sub(struct uaudio_
/*
* XXX could allow multiple MIDI interfaces
*/
+ midi_if = 1;
if ((sc-sc_midi_chan.valid == 0)
- usbd_get_iface(udev, curidx)) {
+ (usbd_get_iface(udev, curidx) != NULL)) {
sc-sc_midi_chan.iface_index = curidx;
sc-sc_midi_chan.iface_alt_index =
alt_index;
sc-sc_midi_chan.valid = 1;
}
+ } else {
+ midi_if = 0;
}
asid.v1 = NULL;
asf1d.v1 = NULL;
@@ -1566,14 +1572,25 @@ uaudio_chan_fill_info_sub(struct uaudio_
}
if (audio_if == 0) {
- if ((acdp == NULL)
- (desc-bDescriptorType == UDESC_CS_INTERFACE)
- (desc-bDescriptorSubtype == UDESCSUB_AC_HEADER)
- (desc-bLength = sizeof(*acdp))) {
- acdp = (void *)desc;
- audio_rev = UGETW(acdp-bcdADC);
- }
+ if (midi_if == 0) {
+ if ((acdp == NULL)
+ (desc-bDescriptorType ==
UDESC_CS_INTERFACE)
+ (desc-bDescriptorSubtype ==
UDESCSUB_AC_HEADER)
+ (desc-bLength = sizeof(*acdp))) {
+ acdp = (void *)desc;
+ audio_rev = UGETW(acdp-bcdADC);
+ }
+ } else {
+ msid = (void *)desc;
+ /* get the maximum number of embedded
svn commit: r272421 - stable/8/sys/dev/sound/usb
Author: hselasky
Date: Thu Oct 2 16:49:22 2014
New Revision: 272421
URL: https://svnweb.freebsd.org/changeset/base/272421
Log:
MFC r272254:
Instead of creating the full range of possible ports, try to figure
out the actual number of so-called embedded jacks which are present
when a USB MIDI device is attaching.
Modified:
stable/8/sys/dev/sound/usb/uaudio.c
stable/8/sys/dev/sound/usb/uaudioreg.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/sound/ (props changed)
stable/8/sys/dev/sound/usb/ (props changed)
Modified: stable/8/sys/dev/sound/usb/uaudio.c
==
--- stable/8/sys/dev/sound/usb/uaudio.c Thu Oct 2 16:48:05 2014
(r272420)
+++ stable/8/sys/dev/sound/usb/uaudio.c Thu Oct 2 16:49:22 2014
(r272421)
@@ -238,7 +238,7 @@ struct uaudio_chan {
#defineUAUDIO_SYNC_LESS 2
};
-#defineUMIDI_CABLES_MAX 16 /* units */
+#defineUMIDI_EMB_JACK_MAX 16 /* units */
#defineUMIDI_TX_FRAMES256 /* units */
#defineUMIDI_TX_BUFFER(UMIDI_TX_FRAMES * 4)/* bytes */
@@ -269,7 +269,7 @@ struct umidi_sub_chan {
struct umidi_chan {
- struct umidi_sub_chan sub[UMIDI_CABLES_MAX];
+ struct umidi_sub_chan sub[UMIDI_EMB_JACK_MAX];
struct mtx mtx;
struct usb_xfer *xfer[UMIDI_N_TRANSFER];
@@ -281,7 +281,7 @@ struct umidi_chan {
uint8_t write_open_refcount;
uint8_t curr_cable;
- uint8_t max_cable;
+ uint8_t max_emb_jack;
uint8_t valid;
uint8_t single_command;
};
@@ -1487,6 +1487,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
union uaudio_asid asid = { NULL };
union uaudio_asf1d asf1d = { NULL };
union uaudio_sed sed = { NULL };
+ struct usb_midi_streaming_endpoint_descriptor *msid = NULL;
usb_endpoint_descriptor_audio_t *ed1 = NULL;
const struct usb_audio_control_descriptor *acdp = NULL;
struct usb_config_descriptor *cd = usbd_get_config_descriptor(udev);
@@ -1504,6 +1505,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
uint8_t bChannels;
uint8_t bBitResolution;
uint8_t audio_if = 0;
+ uint8_t midi_if = 0;
uint8_t uma_if_class;
while ((desc = usb_desc_foreach(cd, desc))) {
@@ -1539,7 +1541,8 @@ uaudio_chan_fill_info_sub(struct uaudio_
((id-bInterfaceClass == UICLASS_VENDOR)
(sc-sc_uq_au_vendor_class != 0)));
- if ((uma_if_class != 0) (id-bInterfaceSubClass ==
UISUBCLASS_AUDIOSTREAM)) {
+ if ((uma_if_class != 0)
+ (id-bInterfaceSubClass == UISUBCLASS_AUDIOSTREAM))
{
audio_if = 1;
} else {
audio_if = 0;
@@ -1551,13 +1554,16 @@ uaudio_chan_fill_info_sub(struct uaudio_
/*
* XXX could allow multiple MIDI interfaces
*/
+ midi_if = 1;
if ((sc-sc_midi_chan.valid == 0)
- usbd_get_iface(udev, curidx)) {
+ (usbd_get_iface(udev, curidx) != NULL)) {
sc-sc_midi_chan.iface_index = curidx;
sc-sc_midi_chan.iface_alt_index =
alt_index;
sc-sc_midi_chan.valid = 1;
}
+ } else {
+ midi_if = 0;
}
asid.v1 = NULL;
asf1d.v1 = NULL;
@@ -1566,14 +1572,25 @@ uaudio_chan_fill_info_sub(struct uaudio_
}
if (audio_if == 0) {
- if ((acdp == NULL)
- (desc-bDescriptorType == UDESC_CS_INTERFACE)
- (desc-bDescriptorSubtype == UDESCSUB_AC_HEADER)
- (desc-bLength = sizeof(*acdp))) {
- acdp = (void *)desc;
- audio_rev = UGETW(acdp-bcdADC);
- }
+ if (midi_if == 0) {
+ if ((acdp == NULL)
+ (desc-bDescriptorType ==
UDESC_CS_INTERFACE)
+ (desc-bDescriptorSubtype ==
UDESCSUB_AC_HEADER)
+ (desc-bLength = sizeof(*acdp))) {
+ acdp = (void *)desc;
+ audio_rev = UGETW(acdp-bcdADC);
+ }
+ } else {
+ msid
svn commit: r272422 - head/sys/dev/usb/controller
Author: hselasky
Date: Thu Oct 2 16:56:00 2014
New Revision: 272422
URL: https://svnweb.freebsd.org/changeset/base/272422
Log:
Make sure we always set the maximum number of valid contexts.
MFC after:3 days
Modified:
head/sys/dev/usb/controller/xhci.c
Modified: head/sys/dev/usb/controller/xhci.c
==
--- head/sys/dev/usb/controller/xhci.c Thu Oct 2 16:49:22 2014
(r272421)
+++ head/sys/dev/usb/controller/xhci.c Thu Oct 2 16:56:00 2014
(r272422)
@@ -2271,14 +2271,17 @@ xhci_configure_mask(struct usb_device *u
/* adjust */
x--;
- /* figure out maximum */
- if (x sc-sc_hw.devs[index].context_num) {
+ /* figure out the maximum number of contexts */
+ if (x sc-sc_hw.devs[index].context_num)
sc-sc_hw.devs[index].context_num = x;
- temp = xhci_ctx_get_le32(sc, pinp-ctx_slot.dwSctx0);
- temp = ~XHCI_SCTX_0_CTX_NUM_SET(31);
- temp |= XHCI_SCTX_0_CTX_NUM_SET(x + 1);
- xhci_ctx_set_le32(sc, pinp-ctx_slot.dwSctx0, temp);
- }
+ else
+ x = sc-sc_hw.devs[index].context_num;
+
+ /* update number of contexts */
+ temp = xhci_ctx_get_le32(sc, pinp-ctx_slot.dwSctx0);
+ temp = ~XHCI_SCTX_0_CTX_NUM_SET(31);
+ temp |= XHCI_SCTX_0_CTX_NUM_SET(x + 1);
+ xhci_ctx_set_le32(sc, pinp-ctx_slot.dwSctx0, temp);
}
return (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: r272423 - stable/10/sys/dev/sound/usb
Author: hselasky
Date: Thu Oct 2 16:57:44 2014
New Revision: 272423
URL: https://svnweb.freebsd.org/changeset/base/272423
Log:
MFC r272254:
Instead of creating the full range of possible ports, try to figure
out the actual number of so-called embedded jacks which are present
when a USB MIDI device is attaching.
Approved by: re, gjb
Modified:
stable/10/sys/dev/sound/usb/uaudio.c
stable/10/sys/dev/sound/usb/uaudioreg.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sound/usb/uaudio.c
==
--- stable/10/sys/dev/sound/usb/uaudio.cThu Oct 2 16:56:00 2014
(r272422)
+++ stable/10/sys/dev/sound/usb/uaudio.cThu Oct 2 16:57:44 2014
(r272423)
@@ -238,7 +238,7 @@ struct uaudio_chan {
#defineUAUDIO_SYNC_LESS 2
};
-#defineUMIDI_CABLES_MAX 16 /* units */
+#defineUMIDI_EMB_JACK_MAX 16 /* units */
#defineUMIDI_TX_FRAMES256 /* units */
#defineUMIDI_TX_BUFFER(UMIDI_TX_FRAMES * 4)/* bytes */
@@ -269,7 +269,7 @@ struct umidi_sub_chan {
struct umidi_chan {
- struct umidi_sub_chan sub[UMIDI_CABLES_MAX];
+ struct umidi_sub_chan sub[UMIDI_EMB_JACK_MAX];
struct mtx mtx;
struct usb_xfer *xfer[UMIDI_N_TRANSFER];
@@ -281,7 +281,7 @@ struct umidi_chan {
uint8_t write_open_refcount;
uint8_t curr_cable;
- uint8_t max_cable;
+ uint8_t max_emb_jack;
uint8_t valid;
uint8_t single_command;
};
@@ -1487,6 +1487,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
union uaudio_asid asid = { NULL };
union uaudio_asf1d asf1d = { NULL };
union uaudio_sed sed = { NULL };
+ struct usb_midi_streaming_endpoint_descriptor *msid = NULL;
usb_endpoint_descriptor_audio_t *ed1 = NULL;
const struct usb_audio_control_descriptor *acdp = NULL;
struct usb_config_descriptor *cd = usbd_get_config_descriptor(udev);
@@ -1504,6 +1505,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
uint8_t bChannels;
uint8_t bBitResolution;
uint8_t audio_if = 0;
+ uint8_t midi_if = 0;
uint8_t uma_if_class;
while ((desc = usb_desc_foreach(cd, desc))) {
@@ -1539,7 +1541,8 @@ uaudio_chan_fill_info_sub(struct uaudio_
((id-bInterfaceClass == UICLASS_VENDOR)
(sc-sc_uq_au_vendor_class != 0)));
- if ((uma_if_class != 0) (id-bInterfaceSubClass ==
UISUBCLASS_AUDIOSTREAM)) {
+ if ((uma_if_class != 0)
+ (id-bInterfaceSubClass == UISUBCLASS_AUDIOSTREAM))
{
audio_if = 1;
} else {
audio_if = 0;
@@ -1551,13 +1554,16 @@ uaudio_chan_fill_info_sub(struct uaudio_
/*
* XXX could allow multiple MIDI interfaces
*/
+ midi_if = 1;
if ((sc-sc_midi_chan.valid == 0)
- usbd_get_iface(udev, curidx)) {
+ (usbd_get_iface(udev, curidx) != NULL)) {
sc-sc_midi_chan.iface_index = curidx;
sc-sc_midi_chan.iface_alt_index =
alt_index;
sc-sc_midi_chan.valid = 1;
}
+ } else {
+ midi_if = 0;
}
asid.v1 = NULL;
asf1d.v1 = NULL;
@@ -1566,14 +1572,25 @@ uaudio_chan_fill_info_sub(struct uaudio_
}
if (audio_if == 0) {
- if ((acdp == NULL)
- (desc-bDescriptorType == UDESC_CS_INTERFACE)
- (desc-bDescriptorSubtype == UDESCSUB_AC_HEADER)
- (desc-bLength = sizeof(*acdp))) {
- acdp = (void *)desc;
- audio_rev = UGETW(acdp-bcdADC);
- }
+ if (midi_if == 0) {
+ if ((acdp == NULL)
+ (desc-bDescriptorType ==
UDESC_CS_INTERFACE)
+ (desc-bDescriptorSubtype ==
UDESCSUB_AC_HEADER)
+ (desc-bLength = sizeof(*acdp))) {
+ acdp = (void *)desc;
+ audio_rev = UGETW(acdp-bcdADC);
+ }
+ } else {
+ msid = (void *)desc;
+ /* get the maximum number of embedded
svn commit: r272424 - stable/10/usr.sbin/bsdinstall/scripts
Author: allanjude (doc committer) Date: Thu Oct 2 17:19:32 2014 New Revision: 272424 URL: https://svnweb.freebsd.org/changeset/base/272424 Log: MFC r272274: Change the /var dataset in the default ZFS layout to have the ZFS property canmount=off, making /var/db/pkg part of the / dataset, so installed package files are consistent with the package database when using ZFS boot environments (beadm). PR: 193971 Reviewed by: Shawn Webb, bcr Approved by: re (gjb), jmg Relnotes: yes Sponsored by: ScaleEngine Inc. Modified: stable/10/usr.sbin/bsdinstall/scripts/zfsboot Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bsdinstall/scripts/zfsboot == --- stable/10/usr.sbin/bsdinstall/scripts/zfsboot Thu Oct 2 16:57:44 2014(r272423) +++ stable/10/usr.sbin/bsdinstall/scripts/zfsboot Thu Oct 2 17:19:32 2014(r272424) @@ -156,7 +156,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATA /usr/src # Create /var and friends - /varmountpoint=/var + /varmountpoint=/var,canmount=off /var/crash exec=off,setuid=off /var/logexec=off,setuid=off /var/mail atime=on ___ 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: r272427 - stable/8/sys/cddl/boot/zfs
Author: delphij
Date: Thu Oct 2 17:42:21 2014
New Revision: 272427
URL: https://svnweb.freebsd.org/changeset/base/272427
Log:
MFC r272389:
Diff reduction with kernel code: instruct the compiler that the data of
these types may be unaligned to their normal alignment and exercise
caution when accessing them.
PR: 194071
Modified:
stable/8/sys/cddl/boot/zfs/lz4.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/cddl/ (props changed)
Modified: stable/8/sys/cddl/boot/zfs/lz4.c
==
--- stable/8/sys/cddl/boot/zfs/lz4.cThu Oct 2 17:42:02 2014
(r272426)
+++ stable/8/sys/cddl/boot/zfs/lz4.cThu Oct 2 17:42:21 2014
(r272427)
@@ -83,6 +83,17 @@ lz4_decompress(void *s_start, void *d_st
#endif
/*
+ * Unaligned memory access is automatically enabled for common CPU,
+ * such as x86. For others CPU, the compiler will be more cautious, and
+ * insert extra code to ensure aligned access is respected. If you know
+ * your target CPU supports unaligned memory access, you may want to
+ * force this option manually to improve performance
+ */
+#if defined(__ARM_FEATURE_UNALIGNED)
+#defineLZ4_FORCE_UNALIGNED_ACCESS 1
+#endif
+
+/*
* Compiler Options
*/
#if __STDC_VERSION__ = 199901L/* C99 */
@@ -113,6 +124,10 @@ lz4_decompress(void *s_start, void *d_st
#defineS32 int32_t
#defineU64 uint64_t
+#ifndef LZ4_FORCE_UNALIGNED_ACCESS
+#pragma pack(1)
+#endif
+
typedef struct _U16_S {
U16 v;
} U16_S;
@@ -123,6 +138,10 @@ typedef struct _U64_S {
U64 v;
} U64_S;
+#ifndef LZ4_FORCE_UNALIGNED_ACCESS
+#pragma pack()
+#endif
+
#defineA64(x) (((U64_S *)(x))-v)
#defineA32(x) (((U32_S *)(x))-v)
#defineA16(x) (((U16_S *)(x))-v)
___
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: r272426 - stable/9/sys/cddl/boot/zfs
Author: delphij
Date: Thu Oct 2 17:42:02 2014
New Revision: 272426
URL: https://svnweb.freebsd.org/changeset/base/272426
Log:
MFC r272389:
Diff reduction with kernel code: instruct the compiler that the data of
these types may be unaligned to their normal alignment and exercise
caution when accessing them.
PR: 194071
Modified:
stable/9/sys/cddl/boot/zfs/lz4.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/cddl/boot/zfs/lz4.c
==
--- stable/9/sys/cddl/boot/zfs/lz4.cThu Oct 2 17:41:27 2014
(r272425)
+++ stable/9/sys/cddl/boot/zfs/lz4.cThu Oct 2 17:42:02 2014
(r272426)
@@ -83,6 +83,17 @@ lz4_decompress(void *s_start, void *d_st
#endif
/*
+ * Unaligned memory access is automatically enabled for common CPU,
+ * such as x86. For others CPU, the compiler will be more cautious, and
+ * insert extra code to ensure aligned access is respected. If you know
+ * your target CPU supports unaligned memory access, you may want to
+ * force this option manually to improve performance
+ */
+#if defined(__ARM_FEATURE_UNALIGNED)
+#defineLZ4_FORCE_UNALIGNED_ACCESS 1
+#endif
+
+/*
* Compiler Options
*/
#if __STDC_VERSION__ = 199901L/* C99 */
@@ -113,6 +124,10 @@ lz4_decompress(void *s_start, void *d_st
#defineS32 int32_t
#defineU64 uint64_t
+#ifndef LZ4_FORCE_UNALIGNED_ACCESS
+#pragma pack(1)
+#endif
+
typedef struct _U16_S {
U16 v;
} U16_S;
@@ -123,6 +138,10 @@ typedef struct _U64_S {
U64 v;
} U64_S;
+#ifndef LZ4_FORCE_UNALIGNED_ACCESS
+#pragma pack()
+#endif
+
#defineA64(x) (((U64_S *)(x))-v)
#defineA32(x) (((U32_S *)(x))-v)
#defineA16(x) (((U16_S *)(x))-v)
___
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: r272425 - stable/10/sys/cddl/boot/zfs
Author: delphij
Date: Thu Oct 2 17:41:27 2014
New Revision: 272425
URL: https://svnweb.freebsd.org/changeset/base/272425
Log:
MFC r272389:
Diff reduction with kernel code: instruct the compiler that the data of
these types may be unaligned to their normal alignment and exercise
caution when accessing them.
PR: 194071
Approved by: re (gjb)
Modified:
stable/10/sys/cddl/boot/zfs/lz4.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/boot/zfs/lz4.c
==
--- stable/10/sys/cddl/boot/zfs/lz4.c Thu Oct 2 17:19:32 2014
(r272424)
+++ stable/10/sys/cddl/boot/zfs/lz4.c Thu Oct 2 17:41:27 2014
(r272425)
@@ -83,6 +83,17 @@ lz4_decompress(void *s_start, void *d_st
#endif
/*
+ * Unaligned memory access is automatically enabled for common CPU,
+ * such as x86. For others CPU, the compiler will be more cautious, and
+ * insert extra code to ensure aligned access is respected. If you know
+ * your target CPU supports unaligned memory access, you may want to
+ * force this option manually to improve performance
+ */
+#if defined(__ARM_FEATURE_UNALIGNED)
+#defineLZ4_FORCE_UNALIGNED_ACCESS 1
+#endif
+
+/*
* Compiler Options
*/
#if __STDC_VERSION__ = 199901L/* C99 */
@@ -113,6 +124,10 @@ lz4_decompress(void *s_start, void *d_st
#defineS32 int32_t
#defineU64 uint64_t
+#ifndef LZ4_FORCE_UNALIGNED_ACCESS
+#pragma pack(1)
+#endif
+
typedef struct _U16_S {
U16 v;
} U16_S;
@@ -123,6 +138,10 @@ typedef struct _U64_S {
U64 v;
} U64_S;
+#ifndef LZ4_FORCE_UNALIGNED_ACCESS
+#pragma pack()
+#endif
+
#defineA64(x) (((U64_S *)(x))-v)
#defineA32(x) (((U32_S *)(x))-v)
#defineA16(x) (((U16_S *)(x))-v)
___
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: r272428 - stable/10/usr.sbin/mountd
Author: bdrewery
Date: Thu Oct 2 17:58:47 2014
New Revision: 272428
URL: https://svnweb.freebsd.org/changeset/base/272428
Log:
MFC r270183:
Avoid showing stale errors when nmount(2) fails.
This should not be documented in relnotes as it still fails due to a
race with unmounting, but no longer shows bogus details.
Approved by: re (gjb)
Modified:
stable/10/usr.sbin/mountd/mountd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/mountd/mountd.c
==
--- stable/10/usr.sbin/mountd/mountd.c Thu Oct 2 17:42:21 2014
(r272427)
+++ stable/10/usr.sbin/mountd/mountd.c Thu Oct 2 17:58:47 2014
(r272428)
@@ -1744,6 +1744,7 @@ get_exportlist(void)
iov[3].iov_len = strlen(fsp-f_mntonname) + 1;
iov[5].iov_base = fsp-f_mntfromname;
iov[5].iov_len = strlen(fsp-f_mntfromname) + 1;
+ errmsg[0] = '\0';
if (nmount(iov, iovlen, fsp-f_flags) 0
errno != ENOENT errno != ENOTSUP) {
@@ -2501,6 +2502,7 @@ do_mount(struct exportlist *ep, struct g
iov[3].iov_len = strlen(fsb-f_mntonname) + 1;
iov[5].iov_base = fsb-f_mntfromname; /* from */
iov[5].iov_len = strlen(fsb-f_mntfromname) + 1;
+ errmsg[0] = '\0';
while (nmount(iov, iovlen, fsb-f_flags) 0) {
if (cp)
___
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: r272429 - stable/9/usr.sbin/mountd
Author: bdrewery
Date: Thu Oct 2 18:00:16 2014
New Revision: 272429
URL: https://svnweb.freebsd.org/changeset/base/272429
Log:
MFC r270183:
Avoid showing stale errors when nmount(2) fails.
Modified:
stable/9/usr.sbin/mountd/mountd.c
Directory Properties:
stable/9/usr.sbin/mountd/ (props changed)
Modified: stable/9/usr.sbin/mountd/mountd.c
==
--- stable/9/usr.sbin/mountd/mountd.c Thu Oct 2 17:58:47 2014
(r272428)
+++ stable/9/usr.sbin/mountd/mountd.c Thu Oct 2 18:00:16 2014
(r272429)
@@ -1747,6 +1747,7 @@ get_exportlist(void)
iov[3].iov_len = strlen(fsp-f_mntonname) + 1;
iov[5].iov_base = fsp-f_mntfromname;
iov[5].iov_len = strlen(fsp-f_mntfromname) + 1;
+ errmsg[0] = '\0';
if (nmount(iov, iovlen, fsp-f_flags) 0
errno != ENOENT errno != ENOTSUP) {
@@ -2504,6 +2505,7 @@ do_mount(struct exportlist *ep, struct g
iov[3].iov_len = strlen(fsb-f_mntonname) + 1;
iov[5].iov_base = fsb-f_mntfromname; /* from */
iov[5].iov_len = strlen(fsb-f_mntfromname) + 1;
+ errmsg[0] = '\0';
while (nmount(iov, iovlen, fsb-f_flags) 0) {
if (cp)
___
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: r272430 - stable/10/etc/periodic/daily
Author: bdrewery
Date: Thu Oct 2 18:05:00 2014
New Revision: 272430
URL: https://svnweb.freebsd.org/changeset/base/272430
Log:
MFC r271321:
Don't cross mount boundaries when cleaning tmp files.
Approved by: re (gjb)
Relnotes: yes
Modified:
stable/10/etc/periodic/daily/110.clean-tmps
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/periodic/daily/110.clean-tmps
==
--- stable/10/etc/periodic/daily/110.clean-tmps Thu Oct 2 18:00:16 2014
(r272429)
+++ stable/10/etc/periodic/daily/110.clean-tmps Thu Oct 2 18:05:00 2014
(r272430)
@@ -45,8 +45,8 @@ case $daily_clean_tmps_enable in
rc=$(for dir in $daily_clean_tmps_dirs
do
[ .${dir#/} != .$dir -a -d $dir ] cd $dir {
- find -d . -type f $args -delete $print
- find -d . ! -name . -type d $dargs -delete $print
+ find -x -d . -type f $args -delete $print
+ find -x -d . ! -name . -type d $dargs -delete $print
} | sed s,^\\., $dir,
done | tee /dev/stderr | wc -l)
[ -z $print ] rc=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: r272431 - stable/9/etc/periodic/daily
Author: bdrewery
Date: Thu Oct 2 18:05:53 2014
New Revision: 272431
URL: https://svnweb.freebsd.org/changeset/base/272431
Log:
MFC r271321:
Don't cross mount boundaries when cleaning tmp files.
Relnotes: yes
Modified:
stable/9/etc/periodic/daily/110.clean-tmps
Directory Properties:
stable/9/etc/ (props changed)
Modified: stable/9/etc/periodic/daily/110.clean-tmps
==
--- stable/9/etc/periodic/daily/110.clean-tmps Thu Oct 2 18:05:00 2014
(r272430)
+++ stable/9/etc/periodic/daily/110.clean-tmps Thu Oct 2 18:05:53 2014
(r272431)
@@ -45,8 +45,8 @@ case $daily_clean_tmps_enable in
rc=$(for dir in $daily_clean_tmps_dirs
do
[ .${dir#/} != .$dir -a -d $dir ] cd $dir {
- find -d . -type f $args -delete $print
- find -d . ! -name . -type d $dargs -delete $print
+ find -x -d . -type f $args -delete $print
+ find -x -d . ! -name . -type d $dargs -delete $print
} | sed s,^\\., $dir,
done | tee /dev/stderr | wc -l)
[ -z $print ] rc=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: r272433 - stable/9/usr.sbin/newsyslog
Author: bdrewery Date: Thu Oct 2 18:09:31 2014 New Revision: 272433 URL: https://svnweb.freebsd.org/changeset/base/272433 Log: MFC r272028: Make it more explicitly clear that -t will not change filename. Modified: stable/9/usr.sbin/newsyslog/newsyslog.8 Directory Properties: stable/9/usr.sbin/newsyslog/ (props changed) Modified: stable/9/usr.sbin/newsyslog/newsyslog.8 == --- stable/9/usr.sbin/newsyslog/newsyslog.8 Thu Oct 2 18:08:30 2014 (r272432) +++ stable/9/usr.sbin/newsyslog/newsyslog.8 Thu Oct 2 18:09:31 2014 (r272433) @@ -17,7 +17,7 @@ .\ the suitability of this software for any purpose. It is .\ provided as is without express or implied warranty. .\ -.Dd May 19, 2014 +.Dd September 23, 2014 .Dt NEWSYSLOG 8 .Os .Sh NAME @@ -156,6 +156,7 @@ will create the .Dq rotated logfiles using the specified time format instead of the default sequential filenames. +The filename used will be kept until it is deleted. The time format is described in the .Xr strftime 3 manual page. ___ 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: r272434 - stable/10/sbin/savecore
Author: bdrewery
Date: Thu Oct 2 18:11:13 2014
New Revision: 272434
URL: https://svnweb.freebsd.org/changeset/base/272434
Log:
MFC r271720:
If fgets(3) fails in getbounds(), show strerror(3) if not an EOF. Also fix a
FILE* leak in getbounds().
PR: 192032
Approved by: re (gjb)
Modified:
stable/10/sbin/savecore/savecore.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sbin/savecore/savecore.c
==
--- stable/10/sbin/savecore/savecore.c Thu Oct 2 18:09:31 2014
(r272433)
+++ stable/10/sbin/savecore/savecore.c Thu Oct 2 18:11:13 2014
(r272434)
@@ -151,7 +151,10 @@ getbounds(void) {
}
if (fgets(buf, sizeof buf, fp) == NULL) {
- syslog(LOG_WARNING, unable to read from bounds, using 0);
+ if (feof(fp))
+ syslog(LOG_WARNING, bounds file is empty, using 0);
+ else
+ syslog(LOG_WARNING, bounds file: %s, strerror(errno));
fclose(fp);
return (ret);
}
@@ -160,6 +163,7 @@ getbounds(void) {
ret = (int)strtol(buf, NULL, 10);
if (ret == 0 (errno == EINVAL || errno == ERANGE))
syslog(LOG_WARNING, invalid value found in bounds, using 0);
+ fclose(fp);
return (ret);
}
___
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: r272435 - stable/9/sbin/savecore
Author: bdrewery
Date: Thu Oct 2 18:12:18 2014
New Revision: 272435
URL: https://svnweb.freebsd.org/changeset/base/272435
Log:
MFC r271720:
If fgets(3) fails in getbounds(), show strerror(3) if not an EOF. Also fix a
FILE* leak in getbounds().
PR: 192032
Modified:
stable/9/sbin/savecore/savecore.c
Directory Properties:
stable/9/sbin/savecore/ (props changed)
Modified: stable/9/sbin/savecore/savecore.c
==
--- stable/9/sbin/savecore/savecore.c Thu Oct 2 18:11:13 2014
(r272434)
+++ stable/9/sbin/savecore/savecore.c Thu Oct 2 18:12:18 2014
(r272435)
@@ -149,7 +149,10 @@ getbounds(void) {
}
if (fgets(buf, sizeof buf, fp) == NULL) {
- syslog(LOG_WARNING, unable to read from bounds, using 0);
+ if (feof(fp))
+ syslog(LOG_WARNING, bounds file is empty, using 0);
+ else
+ syslog(LOG_WARNING, bounds file: %s, strerror(errno));
fclose(fp);
return (ret);
}
@@ -158,6 +161,7 @@ getbounds(void) {
ret = (int)strtol(buf, NULL, 10);
if (ret == 0 (errno == EINVAL || errno == ERANGE))
syslog(LOG_WARNING, invalid value found in bounds, using 0);
+ fclose(fp);
return (ret);
}
___
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: r272438 - stable/10/usr.bin/at
Author: delphij
Date: Thu Oct 2 18:26:40 2014
New Revision: 272438
URL: https://svnweb.freebsd.org/changeset/base/272438
Log:
MFC r272288,272289:
When setting environment variables in the atrun script, use the
export foo=bar form instead of foo=bar; export foo since the
former allows the shell to catch variable names that are not valid
shell identifiers. This will cause /bin/sh to exit with an error
(which gets mailed to the at user) and it will not run the script.
Obtained from:OpenBSD (r1.63 millert)
Approved by: re (gjb)
Modified:
stable/10/usr.bin/at/at.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/at/at.c
==
--- stable/10/usr.bin/at/at.c Thu Oct 2 18:23:53 2014(r272437)
+++ stable/10/usr.bin/at/at.c Thu Oct 2 18:26:40 2014(r272438)
@@ -367,6 +367,7 @@ writefile(time_t runtimer, char queue)
if (export)
{
+ (void)fputs(export , fp);
fwrite(*atenv, sizeof(char), eqp-*atenv, fp);
for(ap = eqp;*ap != '\0'; ap++)
{
@@ -389,8 +390,6 @@ writefile(time_t runtimer, char queue)
fputc(*ap, fp);
}
}
- fputs(; export , fp);
- fwrite(*atenv, sizeof(char), eqp-*atenv -1, fp);
fputc('\n', fp);
}
___
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: r272439 - stable/9/usr.bin/at
Author: delphij
Date: Thu Oct 2 18:32:17 2014
New Revision: 272439
URL: https://svnweb.freebsd.org/changeset/base/272439
Log:
MFC r272288,272289:
When setting environment variables in the atrun script, use the
export foo=bar form instead of foo=bar; export foo since the
former allows the shell to catch variable names that are not valid
shell identifiers. This will cause /bin/sh to exit with an error
(which gets mailed to the at user) and it will not run the script.
Obtained from:OpenBSD (r1.63 millert)
Modified:
stable/9/usr.bin/at/at.c
Directory Properties:
stable/9/usr.bin/at/ (props changed)
Modified: stable/9/usr.bin/at/at.c
==
--- stable/9/usr.bin/at/at.cThu Oct 2 18:26:40 2014(r272438)
+++ stable/9/usr.bin/at/at.cThu Oct 2 18:32:17 2014(r272439)
@@ -369,6 +369,7 @@ writefile(time_t runtimer, char queue)
if (export)
{
+ (void)fputs(export , fp);
fwrite(*atenv, sizeof(char), eqp-*atenv, fp);
for(ap = eqp;*ap != '\0'; ap++)
{
@@ -391,8 +392,6 @@ writefile(time_t runtimer, char queue)
fputc(*ap, fp);
}
}
- fputs(; export , fp);
- fwrite(*atenv, sizeof(char), eqp-*atenv -1, fp);
fputc('\n', fp);
}
___
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: r272440 - stable/8/usr.bin/at
Author: delphij
Date: Thu Oct 2 18:32:30 2014
New Revision: 272440
URL: https://svnweb.freebsd.org/changeset/base/272440
Log:
MFC r272288,272289:
When setting environment variables in the atrun script, use the
export foo=bar form instead of foo=bar; export foo since the
former allows the shell to catch variable names that are not valid
shell identifiers. This will cause /bin/sh to exit with an error
(which gets mailed to the at user) and it will not run the script.
Obtained from:OpenBSD (r1.63 millert)
Modified:
stable/8/usr.bin/at/at.c
Directory Properties:
stable/8/usr.bin/at/ (props changed)
Modified: stable/8/usr.bin/at/at.c
==
--- stable/8/usr.bin/at/at.cThu Oct 2 18:32:17 2014(r272439)
+++ stable/8/usr.bin/at/at.cThu Oct 2 18:32:30 2014(r272440)
@@ -369,6 +369,7 @@ writefile(time_t runtimer, char queue)
if (export)
{
+ (void)fputs(export , fp);
fwrite(*atenv, sizeof(char), eqp-*atenv, fp);
for(ap = eqp;*ap != '\0'; ap++)
{
@@ -391,8 +392,6 @@ writefile(time_t runtimer, char queue)
fputc(*ap, fp);
}
}
- fputs(; export , fp);
- fwrite(*atenv, sizeof(char), eqp-*atenv -1, fp);
fputc('\n', fp);
}
___
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: r272441 - head/lib/libc/stdtime
Author: pfg Date: Thu Oct 2 18:33:58 2014 New Revision: 272441 URL: https://svnweb.freebsd.org/changeset/base/272441 Log: strptime: %s format fix. Almost never needed in real life because %s is tends to be only one format spec. 1) Return code of gmtime_r() is checked. 2) All flags are set. Submitted by: ache MFC after:3 weeks Modified: head/lib/libc/stdtime/strptime.c Modified: head/lib/libc/stdtime/strptime.c == --- head/lib/libc/stdtime/strptime.cThu Oct 2 18:32:30 2014 (r272440) +++ head/lib/libc/stdtime/strptime.cThu Oct 2 18:33:58 2014 (r272441) @@ -503,8 +503,11 @@ label: } errno = sverrno; buf = cp; - gmtime_r(t, tm); + if (gmtime_r(t, tm) == NULL) + return (NULL); *GMTp = 1; + flags |= FLAG_YDAY | FLAG_WDAY | FLAG_MONTH | + FLAG_MDAY | FLAG_YEAR; } 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
Re: svn commit: r272386 - in head: sbin/ifconfig share/man/man4 sys/net
Author: hrs Date: Wed Oct 1 21:37:32 2014 New Revision: 272386 URL: https://svnweb.freebsd.org/changeset/base/272386 Log: Virtualize lagg(4) cloner. This change fixes a panic when tearing down if_lagg(4) interfaces which were cloned in a vnet jail. Hi! I believe this change needs at least an entry in UPDATING, because an ifconfig(8) binary built before this commit fails to change laggproto on a kernel including this commit. The error is the following: # ifconfig lagg0 laggproto failover ifconfig: SIOCSLAGG: Invalid argument By quickly looking at the code, I would say that the culprit is the change in size of the struct lag_reqall. The new ra_opts field in struct lagg_reqall isn't initialized in the incompatible ifconfig(8) binary. This could be considered invalid options, leading to error = EINVAL in if_lagg.c:1301. Another non-critical regression is that this ifconfig(8) binary doesn't display the laggproto and laggport lines. I mean those lines: # ifconfig lagg0 lagg0: flags=8843UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST (...) (...) laggproto failover lagghash l2,l3,l4 laggport: wlan0 flags=0 laggport: re0 flags=5MASTER,ACTIVE Beside an UPDATING entry, how about a previously released world with this new kernel? Isn't this configuration supposed to work? -- Jean-Sébastien Pédron signature.asc Description: OpenPGP digital signature
svn commit: r272442 - head/sys/modules/ncr
Author: rpaulo Date: Thu Oct 2 18:45:00 2014 New Revision: 272442 URL: https://svnweb.freebsd.org/changeset/base/272442 Log: Remove the extra CFLAGS now that the driver has been fixed by jhb. Modified: head/sys/modules/ncr/Makefile Modified: head/sys/modules/ncr/Makefile == --- head/sys/modules/ncr/Makefile Thu Oct 2 18:33:58 2014 (r272441) +++ head/sys/modules/ncr/Makefile Thu Oct 2 18:45:00 2014 (r272442) @@ -7,5 +7,3 @@ SRCS= ncr.c SRCS+= device_if.h bus_if.h pci_if.h opt_ncr.h opt_cam.h .include bsd.kmod.mk - -CFLAGS+=-Wno-error=unused-const-variable ___ 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: r272443 - head/lib/libc/stdtime
Author: pfg Date: Thu Oct 2 18:52:29 2014 New Revision: 272443 URL: https://svnweb.freebsd.org/changeset/base/272443 Log: strptime(3): Update manpage for %U and %W. %U and %W were implemented as part of r272273 so take them out of the BUGS section and mention them in the SYNOPSIS. MFC after:1 month Modified: head/lib/libc/stdtime/strptime.3 Modified: head/lib/libc/stdtime/strptime.3 == --- head/lib/libc/stdtime/strptime.3Thu Oct 2 18:45:00 2014 (r272442) +++ head/lib/libc/stdtime/strptime.3Thu Oct 2 18:52:29 2014 (r272443) @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd June 25, 2012 +.Dd October 2, 2014 .Dt STRPTIME 3 .Os .Sh NAME @@ -79,7 +79,11 @@ and .Fa \%D , are now interpreted as beginning at 1969 per POSIX requirements. Years 69-00 are interpreted in the 20th century (1969-2000), years -01-68 in the 21st century (2001-2068). +01-68 in the 21st century (2001-2068). The +.Fa \%U +and +.Fa %W +format specifiers accept any value within the range 00 to 53. .Pp If the .Fa format @@ -161,14 +165,6 @@ and 12PM is taken as noon. .Pp The -.Fa \%U -and -.Fa %W -format specifiers accept any value within the range 00 to 53 -without validating against other values supplied (like month -or day of the year, for example). -.Pp -The .Fa %Z format specifier only accepts time zone abbreviations of the local time zone, or the value GMT. ___ 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: r272444 - in head: sys/conf sys/contrib/dev/acpica sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components/debugger sys/contrib/dev/acpica/compon...
Author: jkim Date: Thu Oct 2 19:11:18 2014 New Revision: 272444 URL: https://svnweb.freebsd.org/changeset/base/272444 Log: Merge ACPICA 20140926. Added: head/sys/contrib/dev/acpica/common/acgetline.c - copied, changed from r256655, vendor-sys/acpica/dist/source/common/acgetline.c head/sys/contrib/dev/acpica/common/ahids.c - copied, changed from r263851, vendor-sys/acpica/dist/source/common/ahids.c head/sys/contrib/dev/acpica/common/ahuuids.c - copied, changed from r271440, vendor-sys/acpica/dist/source/common/ahuuids.c head/sys/contrib/dev/acpica/common/cmfsize.c - copied, changed from r263851, vendor-sys/acpica/dist/source/common/cmfsize.c head/sys/contrib/dev/acpica/compiler/aslascii.c - copied, changed from r271440, vendor-sys/acpica/dist/source/compiler/aslascii.c head/sys/contrib/dev/acpica/compiler/aslmapenter.c - copied, changed from r272286, vendor-sys/acpica/dist/source/compiler/aslmapenter.c head/sys/contrib/dev/acpica/compiler/aslmapoutput.c - copied, changed from r272286, vendor-sys/acpica/dist/source/compiler/aslmapoutput.c head/sys/contrib/dev/acpica/compiler/aslmaputils.c - copied, changed from r272286, vendor-sys/acpica/dist/source/compiler/aslmaputils.c head/sys/contrib/dev/acpica/compiler/aslmessages.c - copied, changed from r264919, vendor-sys/acpica/dist/source/compiler/aslmessages.c head/sys/contrib/dev/acpica/compiler/aslparser.y - copied, changed from r271440, vendor-sys/acpica/dist/source/compiler/aslparser.y head/sys/contrib/dev/acpica/compiler/aslrules.y - copied unchanged from r271440, vendor-sys/acpica/dist/source/compiler/aslrules.y head/sys/contrib/dev/acpica/compiler/aslsupport.y - copied, changed from r271440, vendor-sys/acpica/dist/source/compiler/aslsupport.y head/sys/contrib/dev/acpica/compiler/asltokens.y - copied unchanged from r271440, vendor-sys/acpica/dist/source/compiler/asltokens.y head/sys/contrib/dev/acpica/compiler/asltypes.y - copied unchanged from r271440, vendor-sys/acpica/dist/source/compiler/asltypes.y head/sys/contrib/dev/acpica/components/debugger/dbtest.c - copied, changed from r260659, vendor-sys/acpica/dist/source/components/debugger/dbtest.c head/sys/contrib/dev/acpica/components/tables/tbdata.c - copied, changed from r263851, vendor-sys/acpica/dist/source/components/tables/tbdata.c head/sys/contrib/dev/acpica/components/utilities/utfileio.c - copied, changed from r267974, vendor-sys/acpica/dist/source/components/utilities/utfileio.c head/sys/contrib/dev/acpica/components/utilities/uthex.c - copied, changed from r271440, vendor-sys/acpica/dist/source/components/utilities/uthex.c head/sys/contrib/dev/acpica/components/utilities/utprint.c - copied, changed from r267974, vendor-sys/acpica/dist/source/components/utilities/utprint.c head/sys/contrib/dev/acpica/components/utilities/utuuid.c - copied, changed from r271440, vendor-sys/acpica/dist/source/components/utilities/utuuid.c head/sys/contrib/dev/acpica/include/platform/acenvex.h - copied unchanged from r267974, vendor-sys/acpica/dist/source/include/platform/acenvex.h head/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c - copied, changed from r267974, vendor-sys/acpica/dist/source/os_specific/service_layers/oslibcfs.c Deleted: head/sys/contrib/dev/acpica/compiler/aslcompiler.y Modified: head/sys/conf/files head/sys/contrib/dev/acpica/acpica_prep.sh head/sys/contrib/dev/acpica/changes.txt head/sys/contrib/dev/acpica/common/adfile.c head/sys/contrib/dev/acpica/common/adisasm.c head/sys/contrib/dev/acpica/common/adwalk.c head/sys/contrib/dev/acpica/common/ahpredef.c head/sys/contrib/dev/acpica/common/dmextern.c head/sys/contrib/dev/acpica/common/dmrestag.c head/sys/contrib/dev/acpica/common/dmtable.c head/sys/contrib/dev/acpica/common/dmtbdump.c head/sys/contrib/dev/acpica/common/dmtbinfo.c head/sys/contrib/dev/acpica/common/getopt.c head/sys/contrib/dev/acpica/compiler/aslanalyze.c head/sys/contrib/dev/acpica/compiler/aslbtypes.c head/sys/contrib/dev/acpica/compiler/aslcodegen.c head/sys/contrib/dev/acpica/compiler/aslcompile.c head/sys/contrib/dev/acpica/compiler/aslcompiler.h head/sys/contrib/dev/acpica/compiler/aslcompiler.l head/sys/contrib/dev/acpica/compiler/asldefine.h head/sys/contrib/dev/acpica/compiler/aslerror.c head/sys/contrib/dev/acpica/compiler/aslfileio.c head/sys/contrib/dev/acpica/compiler/aslfiles.c head/sys/contrib/dev/acpica/compiler/aslfold.c head/sys/contrib/dev/acpica/compiler/aslglobal.h head/sys/contrib/dev/acpica/compiler/aslhex.c head/sys/contrib/dev/acpica/compiler/asllength.c head/sys/contrib/dev/acpica/compiler/asllisting.c head/sys/contrib/dev/acpica/compiler/asllistsup.c head/sys/contrib/dev/acpica/compiler/aslload.c head/sys/contrib/dev/acpica/compiler/asllookup.c head/sys/contrib/dev/acpica/compiler/aslmain.c
Re: svn commit: r272442 - head/sys/modules/ncr
On Thursday, October 02, 2014 2:45:01 pm Rui Paulo wrote: Author: rpaulo Date: Thu Oct 2 18:45:00 2014 New Revision: 272442 URL: https://svnweb.freebsd.org/changeset/base/272442 Log: Remove the extra CFLAGS now that the driver has been fixed by jhb. Oops, sorry I missed that. Thanks for fixing it. -- John Baldwin ___ 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: r272445 - in head: etc/mtree usr.sbin/pw usr.sbin/pw/tests
Author: brd (doc committer)
Date: Thu Oct 2 19:53:37 2014
New Revision: 272445
URL: https://svnweb.freebsd.org/changeset/base/272445
Log:
- Add a test for bug 191427 where pw(8) will go into an infinite loop
Reviewed by: will
MFC after:1 month
Added:
head/usr.sbin/pw/tests/
head/usr.sbin/pw/tests/Makefile (contents, props changed)
head/usr.sbin/pw/tests/group (contents, props changed)
head/usr.sbin/pw/tests/helper_functions.shin (contents, props changed)
head/usr.sbin/pw/tests/master.passwd (contents, props changed)
head/usr.sbin/pw/tests/pw_delete.sh (contents, props changed)
Modified:
head/etc/mtree/BSD.tests.dist
head/usr.sbin/pw/Makefile
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Thu Oct 2 19:11:18 2014
(r272444)
+++ head/etc/mtree/BSD.tests.dist Thu Oct 2 19:53:37 2014
(r272445)
@@ -287,6 +287,8 @@
..
newsyslog
..
+pw
+..
sa
..
..
Modified: head/usr.sbin/pw/Makefile
==
--- head/usr.sbin/pw/Makefile Thu Oct 2 19:11:18 2014(r272444)
+++ head/usr.sbin/pw/Makefile Thu Oct 2 19:53:37 2014(r272445)
@@ -11,4 +11,10 @@ WARNS?= 2
DPADD= ${LIBCRYPT} ${LIBUTIL}
LDADD= -lcrypt -lutil
+.include src.opts.mk
+
+.if ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
.include bsd.prog.mk
Added: head/usr.sbin/pw/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/pw/tests/Makefile Thu Oct 2 19:53:37 2014
(r272445)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/usr.sbin/pw
+
+ATF_TESTS_SH= pw_delete
+
+FILES= group helper_functions.shin master.passwd
+FILESDIR= ${TESTSDIR}
+
+.include bsd.test.mk
Added: head/usr.sbin/pw/tests/group
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/pw/tests/groupThu Oct 2 19:53:37 2014
(r272445)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+#
+wheel:*:0:root
Added: head/usr.sbin/pw/tests/helper_functions.shin
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/pw/tests/helper_functions.shinThu Oct 2 19:53:37
2014(r272445)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+# Workdir to run tests in
+TESTDIR=$(atf_get_srcdir)
+
+# Populate the files pw needs to use into $HOME/etc
+populate_etc_skel() {
+ cp ${TESTDIR}/master.passwd ${HOME} || \
+ atf_fail Populating master.passwd in ${HOME}
+ cp ${TESTDIR}/group ${HOME} || atf_fail Populating group in ${HOME}
+
+ # Generate the passwd file
+ pwd_mkdb -p -d ${HOME} ${HOME}/master.passwd || \
+ atf_fail generate passwd from master.passwd
+}
Added: head/usr.sbin/pw/tests/master.passwd
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/pw/tests/master.passwdThu Oct 2 19:53:37 2014
(r272445)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+#
+root:*:0:0::0:0:Charlie :/root:/bin/csh
+toor:*:0:0::0:0:Bourne-again Superuser:/root:
Added: head/usr.sbin/pw/tests/pw_delete.sh
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/pw/tests/pw_delete.sh Thu Oct 2 19:53:37 2014
(r272445)
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+# Test that a user can be deleted when another user is part of this
+# user's default group and does not go into an infinate loop.
+# PR: 191427
+atf_test_case rmuser_seperate_group cleanup
+rmuser_seperate_group_head() {
+ atf_set timeout 30
+}
+rmuser_seperate_group_body() {
+ populate_etc_skel
+ pw -V ${HOME} useradd test || atf_fail Creating test user
+ pw -V ${HOME} groupmod test -M 'test,root' || \
+ atf_fail Modifying the group
+ pw -V ${HOME} userdel test || atf_fail delete the user
+}
+
+
+atf_init_test_cases() {
+ atf_add_test_case rmuser_seperate_group
+}
___
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: r272446 - in head: sbin/ifconfig sys/net
Author: hrs
Date: Thu Oct 2 20:01:13 2014
New Revision: 272446
URL: https://svnweb.freebsd.org/changeset/base/272446
Log:
Separate option handling from SIOC[SG]LAGG to SIOC[SG]LAGGOPTS for
backward compatibility with old ifconfig(8).
Modified:
head/sbin/ifconfig/iflagg.c
head/sys/net/if_lagg.c
head/sys/net/if_lagg.h
Modified: head/sbin/ifconfig/iflagg.c
==
--- head/sbin/ifconfig/iflagg.c Thu Oct 2 19:53:37 2014(r272445)
+++ head/sbin/ifconfig/iflagg.c Thu Oct 2 20:01:13 2014(r272446)
@@ -85,27 +85,27 @@ setlaggproto(const char *val, int d, int
static void
setlaggflowidshift(const char *val, int d, int s, const struct afswtch *afp)
{
- struct lagg_reqall ra;
+ struct lagg_reqopts ro;
- bzero(ra, sizeof(ra));
- ra.ra_opts = LAGG_OPT_FLOWIDSHIFT;
- strlcpy(ra.ra_ifname, name, sizeof(ra.ra_ifname));
- ra.ra_flowid_shift = (int)strtol(val, NULL, 10);
- if (ra.ra_flowid_shift ~LAGG_OPT_FLOWIDSHIFT_MASK)
+ bzero(ro, sizeof(ro));
+ ro.ro_opts = LAGG_OPT_FLOWIDSHIFT;
+ strlcpy(ro.ro_ifname, name, sizeof(ro.ro_ifname));
+ ro.ro_flowid_shift = (int)strtol(val, NULL, 10);
+ if (ro.ro_flowid_shift ~LAGG_OPT_FLOWIDSHIFT_MASK)
errx(1, Invalid flowid_shift option: %s, val);
- if (ioctl(s, SIOCSLAGG, ra) != 0)
- err(1, SIOCSLAGG);
+ if (ioctl(s, SIOCSLAGGOPTS, ro) != 0)
+ err(1, SIOCSLAGGOPTS);
}
static void
setlaggsetopt(const char *val, int d, int s, const struct afswtch *afp)
{
- struct lagg_reqall ra;
+ struct lagg_reqopts ro;
- bzero(ra, sizeof(ra));
- ra.ra_opts = d;
- switch (ra.ra_opts) {
+ bzero(ro, sizeof(ro));
+ ro.ro_opts = d;
+ switch (ro.ro_opts) {
case LAGG_OPT_USE_FLOWID:
case -LAGG_OPT_USE_FLOWID:
case LAGG_OPT_LACP_STRICT:
@@ -118,10 +118,10 @@ setlaggsetopt(const char *val, int d, in
default:
err(1, Invalid lagg option);
}
- strlcpy(ra.ra_ifname, name, sizeof(ra.ra_ifname));
+ strlcpy(ro.ro_ifname, name, sizeof(ro.ro_ifname));
- if (ioctl(s, SIOCSLAGG, ra) != 0)
- err(1, SIOCSLAGG);
+ if (ioctl(s, SIOCSLAGGOPTS, ro) != 0)
+ err(1, SIOCSLAGGOPTS);
}
static void
@@ -186,6 +186,7 @@ lagg_status(int s)
struct lagg_protos lpr[] = LAGG_PROTOS;
struct lagg_reqport rp, rpbuf[LAGG_MAX_PORTS];
struct lagg_reqall ra;
+ struct lagg_reqopts ro;
struct lagg_reqflags rf;
struct lacp_opreq *lp;
const char *proto = unknown;
@@ -193,6 +194,7 @@ lagg_status(int s)
bzero(rp, sizeof(rp));
bzero(ra, sizeof(ra));
+ bzero(ro, sizeof(ro));
strlcpy(rp.rp_ifname, name, sizeof(rp.rp_ifname));
strlcpy(rp.rp_portname, name, sizeof(rp.rp_portname));
@@ -204,6 +206,9 @@ lagg_status(int s)
ra.ra_size = sizeof(rpbuf);
ra.ra_port = rpbuf;
+ strlcpy(ro.ro_ifname, name, sizeof(ro.ro_ifname));
+ ioctl(s, SIOCGLAGGOPTS, ro);
+
strlcpy(rf.rf_ifname, name, sizeof(rf.rf_ifname));
if (ioctl(s, SIOCGLAGGFLAGS, rf) != 0)
rf.rf_flags = 0;
@@ -242,20 +247,20 @@ lagg_status(int s)
if (verbose) {
printf(\tlagg options:\n);
printf(\t\tuse_flowid: %d\n,
- (ra.ra_opts LAGG_OPT_USE_FLOWID) ? 1 : 0);
- printf(\t\tflowid_shift: %d\n, ra.ra_flowid_shift);
+ (ro.ro_opts LAGG_OPT_USE_FLOWID) ? 1 : 0);
+ printf(\t\tflowid_shift: %d\n, ro.ro_flowid_shift);
switch (ra.ra_proto) {
case LAGG_PROTO_LACP:
printf(\t\tlacp_strict: %d\n,
- (ra.ra_opts LAGG_OPT_LACP_STRICT) ? 1 : 0);
+ (ro.ro_opts LAGG_OPT_LACP_STRICT) ? 1 : 0);
printf(\t\tlacp_rxtest: %d\n,
- (ra.ra_opts LAGG_OPT_LACP_RXTEST) ? 1 : 0);
+ (ro.ro_opts LAGG_OPT_LACP_RXTEST) ? 1 : 0);
printf(\t\tlacp_txtest: %d\n,
- (ra.ra_opts LAGG_OPT_LACP_TXTEST) ? 1 : 0);
+ (ro.ro_opts LAGG_OPT_LACP_TXTEST) ? 1 : 0);
}
printf(\tlagg statistics:\n);
- printf(\t\tactive ports: %d\n, ra.ra_active);
- printf(\t\tflapping: %u\n, ra.ra_flapping);
+ printf(\t\tactive ports: %d\n, ro.ro_active);
+ printf(\t\tflapping: %u\n, ro.ro_flapping);
if (ra.ra_proto == LAGG_PROTO_LACP) {
Re: svn commit: r272386 - in head: sbin/ifconfig share/man/man4 sys/net
Jean-Sébastien Pédron dumbb...@freebsd.org wrote in 542d9aed.6060...@freebsd.org: du Author: hrs du Date: Wed Oct 1 21:37:32 2014 du New Revision: 272386 du URL: https://svnweb.freebsd.org/changeset/base/272386 du du Log: duVirtualize lagg(4) cloner. This change fixes a panic when tearing down duif_lagg(4) interfaces which were cloned in a vnet jail. du du Hi! du du I believe this change needs at least an entry in UPDATING, because an du ifconfig(8) binary built before this commit fails to change laggproto on du a kernel including this commit. du du The error is the following: du # ifconfig lagg0 laggproto failover du ifconfig: SIOCSLAGG: Invalid argument du du By quickly looking at the code, I would say that the culprit is the du change in size of the struct lag_reqall. The new ra_opts field in du struct lagg_reqall isn't initialized in the incompatible ifconfig(8) du binary. This could be considered invalid options, leading to error = du EINVAL in if_lagg.c:1301. du du Another non-critical regression is that this ifconfig(8) binary doesn't du display the laggproto and laggport lines. I mean those lines: du # ifconfig lagg0 du lagg0: flags=8843UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST (...) du (...) du laggproto failover lagghash l2,l3,l4 du laggport: wlan0 flags=0 du laggport: re0 flags=5MASTER,ACTIVE du du Beside an UPDATING entry, how about a previously released world with du this new kernel? Isn't this configuration supposed to work? Ah, yes, I was lazy and did not keep the compatibility. On or after r272446 an old ifconfig works with the new kernel. -- Hiroki pgpdVeP9AK6mV.pgp Description: PGP signature
svn commit: r272447 - head/sys/modules/acpi/acpi
Author: jkim Date: Thu Oct 2 20:13:52 2014 New Revision: 272447 URL: https://svnweb.freebsd.org/changeset/base/272447 Log: Remove obsolete Makefile for acpi.ko. Deleted: head/sys/modules/acpi/acpi/ ___ 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: r272448 - head/sbin/ifconfig
Author: hrs Date: Thu Oct 2 20:17:16 2014 New Revision: 272448 URL: https://svnweb.freebsd.org/changeset/base/272448 Log: Revert r272390. Pointed out by: glebius Modified: head/sbin/ifconfig/ifconfig.c Modified: head/sbin/ifconfig/ifconfig.c == --- head/sbin/ifconfig/ifconfig.c Thu Oct 2 20:13:52 2014 (r272447) +++ head/sbin/ifconfig/ifconfig.c Thu Oct 2 20:17:16 2014 (r272448) @@ -903,7 +903,7 @@ unsetifdescr(const char *val, int value, \020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING \ \10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC \ \17TOE4\20TOE6\21VLAN_HWFILTER\23VLAN_HWTSO\24LINKSTATE\25NETMAP \ -\26RXCSUM_IPV6\27TXCSUM_IPV6\30HWSTATS +\26RXCSUM_IPV6\27TXCSUM_IPV6 /* * Print the status of the interface. If an address family was ___ 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: r272390 - head/sbin/ifconfig
Gleb Smirnoff gleb...@freebsd.org wrote in 20141002103043.gf73...@freebsd.org: gl On Thu, Oct 02, 2014 at 12:19:25AM +, Hiroki Sato wrote: gl H Author: hrs gl H Date: Thu Oct 2 00:19:24 2014 gl H New Revision: 272390 gl H URL: https://svnweb.freebsd.org/changeset/base/272390 gl H gl H Log: gl H Add IFCAP_HWSTATS. gl gl Actually this flag was a temporary workaround, which I hope to gl remove soon. There is no reason to display it to userland. Ok, reverted. I misunderstood it as one used for some non-temporary purpose. -- Hiroki pgp1aPnJ_FbTq.pgp Description: PGP signature
svn commit: r272449 - head/sys/kern
Author: jhb
Date: Thu Oct 2 21:18:16 2014
New Revision: 272449
URL: https://svnweb.freebsd.org/changeset/base/272449
Log:
Require p_cansched() for changing a process' protection status via
procctl() rather than p_cansee().
Submitted by: rwatson
MFC after:3 days
Modified:
head/sys/kern/sys_process.c
Modified: head/sys/kern/sys_process.c
==
--- head/sys/kern/sys_process.c Thu Oct 2 20:17:16 2014(r272448)
+++ head/sys/kern/sys_process.c Thu Oct 2 21:18:16 2014(r272449)
@@ -1240,7 +1240,7 @@ protect_setchild(struct thread *td, stru
{
PROC_LOCK_ASSERT(p, MA_OWNED);
- if (p-p_flag P_SYSTEM || p_cansee(td, p) != 0)
+ if (p-p_flag P_SYSTEM || p_cansched(td, p) != 0)
return (0);
if (flags PPROT_SET) {
p-p_flag |= P_PROTECTED;
___
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: r272450 - in stable/10/sys: kern sys
Author: sbruno
Date: Thu Oct 2 21:19:13 2014
New Revision: 272450
URL: https://svnweb.freebsd.org/changeset/base/272450
Log:
MFC r271141: Allow multiple image activators to run on the same
execution by changing imgp-interpreted to a bitmask instead of,
functionally, a bool.
Approved by: re (gjb)
Modified:
stable/10/sys/kern/imgact_binmisc.c
stable/10/sys/kern/imgact_shell.c
stable/10/sys/sys/imgact.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/imgact_binmisc.c
==
--- stable/10/sys/kern/imgact_binmisc.c Thu Oct 2 21:18:16 2014
(r272449)
+++ stable/10/sys/kern/imgact_binmisc.c Thu Oct 2 21:19:13 2014
(r272450)
@@ -600,12 +600,12 @@ imgact_binmisc_exec(struct image_params
}
/* No interpreter nesting allowed. */
- if (imgp-interpreted) {
+ if (imgp-interpreted IMGACT_BINMISC) {
mtx_unlock(interp_list_mtx);
return (ENOEXEC);
}
- imgp-interpreted = 1;
+ imgp-interpreted |= IMGACT_BINMISC;
if (imgp-args-fname != NULL) {
fname = imgp-args-fname;
Modified: stable/10/sys/kern/imgact_shell.c
==
--- stable/10/sys/kern/imgact_shell.c Thu Oct 2 21:18:16 2014
(r272449)
+++ stable/10/sys/kern/imgact_shell.c Thu Oct 2 21:19:13 2014
(r272450)
@@ -115,10 +115,10 @@ exec_shell_imgact(imgp)
* Don't allow a shell script to be the shell for a shell
* script. :-)
*/
- if (imgp-interpreted)
+ if (imgp-interpreted IMGACT_SHELL)
return (ENOEXEC);
- imgp-interpreted = 1;
+ imgp-interpreted |= IMGACT_SHELL;
/*
* At this point we have the first page of the file mapped.
Modified: stable/10/sys/sys/imgact.h
==
--- stable/10/sys/sys/imgact.h Thu Oct 2 21:18:16 2014(r272449)
+++ stable/10/sys/sys/imgact.h Thu Oct 2 21:19:13 2014(r272450)
@@ -61,7 +61,9 @@ struct image_params {
unsigned long entry_addr; /* entry address of target executable */
unsigned long reloc_base; /* load address of image */
char vmspace_destroyed; /* flag - we've blown away original vm space */
- char interpreted; /* flag - this executable is interpreted */
+#define IMGACT_SHELL 0x1
+#define IMGACT_BINMISC 0x2
+ unsigned char interpreted; /* mask of interpreters that have run */
char opened;/* flag - we have opened executable vnode */
char *interpreter_name; /* name of the interpreter */
void *auxargs; /* ELF Auxinfo structure pointer */
___
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: r272372 - stable/10/bin/rm
On Thursday, October 02, 2014 2:16:28 am Glen Barber wrote: On Thu, Oct 02, 2014 at 02:56:05PM +1000, Bruce Evans wrote: On Wed, 1 Oct 2014, Glen Barber wrote: Log: MFC r268376 (imp): rm -rf can fail sometimes with an error from fts_read. Make it honor fflag to ignore fts_read errors, but stop deleting from that directory because no further progress can be made. I asked for this to be backed out in -current. It is not suitable for MFC. It fixes an immediate issue that prevents high-concurrent make(1) jobs from stomping over each other. If there is a more suitable solution, it needs to be introduced in head/ first, pending MFC for 10.1-RELEASE. In the meantime, we lack any alternate fix, and this resolves the immediate issue at hand. See old mail for more details. I saw the original email. I do not see a proposed patch. I think the proposed patch is to revert this and fix the broken Makefiles instead. The problem with changing rm to workaround a bug in FreeBSD's Makefiles is we are breaking rm(1) for everyone else in the world to cater to a bug in our build system. Are you happy that we are invoking the same commands in parallel for a make target? In some cases it may be ok, but there are many others where it is not (e.g. if two jobs are both compiling the same .o file, the second one might replace an object file out from under a subsequent link that starts after the first one finishes). Instead of breaking rm, you should be harassing whoever broke make (or added the SUBDIR_PARALLEL logic). Presumably you can build without -j x as a workaround. -- John Baldwin ___ 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: r272451 - head/contrib/tcpdump
Author: luigi
Date: Thu Oct 2 21:34:52 2014
New Revision: 272451
URL: https://svnweb.freebsd.org/changeset/base/272451
Log:
add CAP_EVENT for the libpcap device so we will be able to use
pcap--netmap which does poll() on the file descriptor
MFC after:2 weeks
Modified:
head/contrib/tcpdump/tcpdump.c
Modified: head/contrib/tcpdump/tcpdump.c
==
--- head/contrib/tcpdump/tcpdump.c Thu Oct 2 21:19:13 2014
(r272450)
+++ head/contrib/tcpdump/tcpdump.c Thu Oct 2 21:34:52 2014
(r272451)
@@ -1533,7 +1533,12 @@ main(int argc, char **argv)
if (RFileName == NULL VFileName == NULL) {
static const unsigned long cmds[] = { BIOCGSTATS };
- cap_rights_init(rights, CAP_IOCTL, CAP_READ);
+ /*
+* the various libpcap devices use a combination of
+* read (bpf), ioctl (bpf, netmap), poll (netmap)
+* so we add the relevant access rights.
+*/
+ cap_rights_init(rights, CAP_IOCTL, CAP_READ, CAP_EVENT);
if (cap_rights_limit(pcap_fileno(pd), rights) 0
errno != ENOSYS) {
error(unable to limit pcap descriptor);
___
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: r272452 - head/sys/dev/sfxge
Author: gnn
Date: Thu Oct 2 22:05:48 2014
New Revision: 272452
URL: https://svnweb.freebsd.org/changeset/base/272452
Log:
Fixup the setting of the baud rate.
Modified:
head/sys/dev/sfxge/sfxge_port.c
Modified: head/sys/dev/sfxge/sfxge_port.c
==
--- head/sys/dev/sfxge/sfxge_port.c Thu Oct 2 21:34:52 2014
(r272451)
+++ head/sys/dev/sfxge/sfxge_port.c Thu Oct 2 22:05:48 2014
(r272452)
@@ -220,14 +220,14 @@ sfxge_port_link_fc_handler(SYSCTL_HANDLE
#endif /* SFXGE_HAVE_PAUSE_MEDIAOPTS */
-static const u_long sfxge_link_baudrate[EFX_LINK_NMODES] = {
+static const uint64_t sfxge_link_baudrate[EFX_LINK_NMODES] = {
[EFX_LINK_10HDX]= IF_Mbps(10),
[EFX_LINK_10FDX]= IF_Mbps(10),
[EFX_LINK_100HDX] = IF_Mbps(100),
[EFX_LINK_100FDX] = IF_Mbps(100),
[EFX_LINK_1000HDX] = IF_Gbps(1),
[EFX_LINK_1000FDX] = IF_Gbps(1),
- [EFX_LINK_1FDX] = MIN(IF_Gbps(10ULL), ULONG_MAX),
+ [EFX_LINK_1FDX] = IF_Gbps(10),
};
void
___
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: r272453 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common
Author: delphij
Date: Thu Oct 2 22:16:00 2014
New Revision: 272453
URL: https://svnweb.freebsd.org/changeset/base/272453
Log:
MFC r271527: MFV r271511:
Use fnvlist_* to make code more readable.
Illumos issue:
5135 zpool_find_import_cached() can use fnvlist_*
Approved by: re (gjb)
Modified:
stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Thu Oct 2 22:05:48 2014(r272452)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Thu Oct 2 22:16:00 2014(r272453)
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
*/
@@ -1426,21 +1426,15 @@ zpool_find_import_cached(libzfs_handle_t
elem = NULL;
while ((elem = nvlist_next_nvpair(raw, elem)) != NULL) {
- verify(nvpair_value_nvlist(elem, src) == 0);
+ src = fnvpair_value_nvlist(elem);
- verify(nvlist_lookup_string(src, ZPOOL_CONFIG_POOL_NAME,
- name) == 0);
+ name = fnvlist_lookup_string(src, ZPOOL_CONFIG_POOL_NAME);
if (poolname != NULL strcmp(poolname, name) != 0)
continue;
- verify(nvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID,
- this_guid) == 0);
- if (guid != 0) {
- verify(nvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID,
- this_guid) == 0);
- if (guid != this_guid)
- continue;
- }
+ this_guid = fnvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID);
+ if (guid != 0 guid != this_guid)
+ continue;
if (pool_active(hdl, name, this_guid, active) != 0) {
nvlist_free(raw);
___
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: r272454 - head/share/man/man4
Author: gavin Date: Thu Oct 2 22:22:34 2014 New Revision: 272454 URL: https://svnweb.freebsd.org/changeset/base/272454 Log: Add HARDWARE section of urnis(4) driver to try to gain more visibility. MFC after:3 days Modified: head/share/man/man4/urndis.4 Modified: head/share/man/man4/urndis.4 == --- head/share/man/man4/urndis.4Thu Oct 2 22:16:00 2014 (r272453) +++ head/share/man/man4/urndis.4Thu Oct 2 22:22:34 2014 (r272454) @@ -29,7 +29,7 @@ .\ .\ $FreeBSD$ .\ -.Dd September 25, 2014 +.Dd October 2, 2014 .Dt URNDIS 4 .Os .Sh NAME @@ -68,6 +68,12 @@ such as those commonly found on Android It does not support different media types or options. For more information on configuring this device, see .Xr ifconfig 8 . +.Sh HARDWARE +The +.Nm +driver supports the +.Qq tethering +functionality of many Android devices. .Sh SEE ALSO .Xr arp 4 , .Xr cdce 4 , ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r272455 - head/cddl/contrib/opensolaris/cmd/dtrace
Author: markj
Date: Thu Oct 2 22:33:35 2014
New Revision: 272455
URL: https://svnweb.freebsd.org/changeset/base/272455
Log:
Have dtrace(1) handle SIGPIPE by cleaning up and exiting. Additionally,
install signal handlers when running in list mode (-l), and acknowledge
interrupts by cleaning up and exiting. This ensures that a command like
$ dtrace -l -P 'pid$target' -p target PID | less
won't cause the ptrace(2)d target process to be killed if less(1) exits
before all dtrace output is consumed.
Reported by: Anton Yuzhaninov citrin+...@citrin.ru
Differential Revision:https://reviews.freebsd.org/D880
Reviewed by: rpaulo
MFC after:1 month
Sponsored by: EMC / Isilon Storage Division
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
Modified: head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==
--- head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Thu Oct 2 22:22:34
2014(r272454)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Thu Oct 2 22:33:35
2014(r272455)
@@ -710,6 +710,9 @@ list_probe(dtrace_hdl_t *dtp, const dtra
if (g_verbose dtrace_probe_info(dtp, pdp, p) == 0)
print_probe_info(p);
+ if (g_intr != 0)
+ return (1);
+
return (0);
}
@@ -1220,11 +1223,34 @@ intr(int signo)
g_impatient = 1;
}
+static void
+installsighands(void)
+{
+ struct sigaction act, oact;
+
+ (void) sigemptyset(act.sa_mask);
+ act.sa_flags = 0;
+ act.sa_handler = intr;
+
+ if (sigaction(SIGINT, NULL, oact) == 0 oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGINT, act, NULL);
+
+ if (sigaction(SIGTERM, NULL, oact) == 0 oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGTERM, act, NULL);
+
+#if !defined(sun)
+ if (sigaction(SIGPIPE, NULL, oact) == 0 oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGPIPE, act, NULL);
+
+ if (sigaction(SIGUSR1, NULL, oact) == 0 oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGUSR1, act, NULL);
+#endif
+}
+
int
main(int argc, char *argv[])
{
dtrace_bufdesc_t buf;
- struct sigaction act, oact;
dtrace_status_t status[2];
dtrace_optval_t opt;
dtrace_cmd_t *dcp;
@@ -1776,6 +1802,8 @@ main(int argc, char *argv[])
if (g_ofile != NULL (g_ofp = fopen(g_ofile, a)) == NULL)
fatal(failed to open output file '%s', g_ofile);
+ installsighands();
+
oprintf(%5s %10s %17s %33s %s\n,
ID, PROVIDER, MODULE, FUNCTION, NAME);
@@ -1861,20 +1889,7 @@ main(int argc, char *argv[])
if (opt != DTRACEOPT_UNSET)
notice(allowing destructive actions\n);
- (void) sigemptyset(act.sa_mask);
- act.sa_flags = 0;
- act.sa_handler = intr;
-
- if (sigaction(SIGINT, NULL, oact) == 0 oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGINT, act, NULL);
-
- if (sigaction(SIGTERM, NULL, oact) == 0 oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGTERM, act, NULL);
-
-#if !defined(sun)
- if (sigaction(SIGUSR1, NULL, oact) == 0 oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGUSR1, act, NULL);
-#endif
+ installsighands();
/*
* Now that tracing is active and we are ready to consume trace data,
___
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: r272456 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: delphij Date: Thu Oct 2 22:52:05 2014 New Revision: 272456 URL: https://svnweb.freebsd.org/changeset/base/272456 Log: MFC r271528: MFV r271512: Illumos issue: 5136 fix write throttle comment in dsl_pool.c Approved by: re (gjb) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c == --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c Thu Oct 2 22:33:35 2014(r272455) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c Thu Oct 2 22:52:05 2014(r272456) @@ -116,8 +116,8 @@ int zfs_delay_min_dirty_percent = 60; /* * This controls how quickly the delay approaches infinity. - * Larger values cause it to delay less for a given amount of dirty data. - * Therefore larger values will cause there to be more dirty data for a + * Larger values cause it to delay more for a given amount of dirty data. + * Therefore larger values will cause there to be less dirty data for a * given throughput. * * For the smoothest delay, this value should be about 1 billion divided @@ -130,11 +130,6 @@ int zfs_delay_min_dirty_percent = 60; uint64_t zfs_delay_scale = 1000 * 1000 * 1000 / 2000; -/* - * XXX someday maybe turn these into #defines, and you have to tune it on a - * per-pool basis using zfs.conf. - */ - #ifdef __FreeBSD__ extern int zfs_vdev_async_write_active_max_dirty_percent; ___ 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: r272457 - head/lib/msun/src
Author: kargl
Date: Thu Oct 2 23:08:36 2014
New Revision: 272457
URL: https://svnweb.freebsd.org/changeset/base/272457
Log:
Remove whitespace and 2 blank lines.
Modified:
head/lib/msun/src/e_lgamma_r.c
Modified: head/lib/msun/src/e_lgamma_r.c
==
--- head/lib/msun/src/e_lgamma_r.c Thu Oct 2 22:52:05 2014
(r272456)
+++ head/lib/msun/src/e_lgamma_r.c Thu Oct 2 23:08:36 2014
(r272457)
@@ -14,12 +14,12 @@
__FBSDID($FreeBSD$);
/* __ieee754_lgamma_r(x, signgamp)
- * Reentrant version of the logarithm of the Gamma function
- * with user provide pointer for the sign of Gamma(x).
+ * Reentrant version of the logarithm of the Gamma function
+ * with user provide pointer for the sign of Gamma(x).
*
* Method:
* 1. Argument Reduction for 0 x = 8
- * Since gamma(1+s)=s*gamma(s), for x in [0,8], we may
+ * Since gamma(1+s)=s*gamma(s), for x in [0,8], we may
* reduce x to a number in [1.5,2.5] by
* lgamma(1+s) = log(s) + lgamma(s)
* for example,
@@ -57,20 +57,20 @@ __FBSDID($FreeBSD$);
* by
* 3 5 11
* w = w0 + w1*z + w2*z + w3*z + ... + w6*z
- * where
+ * where
* |w - f(z)| 2**-58.74
- *
+ *
* 4. For negative x, since (G is gamma function)
* -x*G(-x)*G(x) = pi/sin(pi*x),
* we have
* G(x) = pi/(sin(pi*x)*(-x)*G(-x))
* since G(-x) is positive, sign(G(x)) = sign(sin(pi*x)) for x0
- * Hence, for x0, signgam = sign(sin(pi*x)) and
+ * Hence, for x0, signgam = sign(sin(pi*x)) and
* lgamma(x) = log(|Gamma(x)|)
* = log(pi/(|x*sin(pi*x)|)) - lgamma(-x);
- * Note: one should avoid compute pi*(-x) directly in the
+ * Note: one should avoid compute pi*(-x) directly in the
* computation of sin(pi*(-x)).
- *
+ *
* 5. Special Cases
* lgamma(2+s) ~ s*(1-Euler) for tiny s
* lgamma(1) = lgamma(2) = 0
@@ -78,7 +78,6 @@ __FBSDID($FreeBSD$);
* lgamma(0) = lgamma(neg.integer) = inf and raise divide-by-zero
* lgamma(inf) = inf
* lgamma(-inf) = inf (bug for bug compatible with C99!?)
- *
*/
#include float.h
@@ -187,9 +186,9 @@ sin_pi(double x)
switch (n) {
case 0: y = __kernel_sin(pi*y,zero,0); break;
- case 1:
+ case 1:
case 2: y = __kernel_cos(pi*(0.5-y),zero); break;
- case 3:
+ case 3:
case 4: y = __kernel_sin(pi*(one-y),zero,0); break;
case 5:
case 6: y = -__kernel_cos(pi*(y-1.5),zero); break;
@@ -263,7 +262,7 @@ __ieee754_lgamma_r(double x, int *signga
p3 = t2+w*(t5+w*(t8+w*(t11+w*t14)));
p = z*p1-(tt-w*(p2+y*p3));
r += (tf + p); break;
- case 2:
+ case 2:
p1 = y*(u0+y*(u1+y*(u2+y*(u3+y*(u4+y*u5);
p2 = one+y*(v1+y*(v2+y*(v3+y*(v4+y*v5;
r += (-0.5*y + p1/p2);
@@ -291,7 +290,7 @@ __ieee754_lgamma_r(double x, int *signga
y = z*z;
w = w0+z*(w1+y*(w2+y*(w3+y*(w4+y*(w5+y*w6);
r = (x-half)*(t-one)+w;
- } else
+ } else
/* 2**58 = x = inf */
r = x*(__ieee754_log(x)-one);
if(hx0) r = nadj - r;
@@ -301,4 +300,3 @@ __ieee754_lgamma_r(double x, int *signga
#if (LDBL_MANT_DIG == 53)
__weak_reference(lgamma_r, lgammal_r);
#endif
-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r272458 - in head/contrib/netbsd-tests: . bin bin/cat bin/cp bin/dd bin/df bin/expr bin/pax bin/ps bin/sh bin/sh/dotcmd bin/sleep bin/tar crypto crypto/libcrypto crypto/libcrypto/bf cry...
Author: ngie Date: Thu Oct 2 23:26:49 2014 New Revision: 272458 URL: https://svnweb.freebsd.org/changeset/base/272458 Log: Import the NetBSD test suite from ^/vendor/NetBSD/tests/09.30.2014_20.45 , minus the vendor Makefiles Provide directions for how to bootstrap the vendor sources in FREEBSD-upgrade MFC after 2 weeks Discussed with: rpaulo Sponsored by: EMC / Isilon Storage Division Added: head/contrib/netbsd-tests/ - copied from r272347, vendor/NetBSD/tests/09.30.2014_20.45/ head/contrib/netbsd-tests/FREEBSD-upgrade - copied, changed from r272269, head/contrib/pjdfstest/FREEBSD-upgrade Deleted: head/contrib/netbsd-tests/Makefile head/contrib/netbsd-tests/Makefile.inc head/contrib/netbsd-tests/README head/contrib/netbsd-tests/bin/Makefile head/contrib/netbsd-tests/bin/cat/Makefile head/contrib/netbsd-tests/bin/cp/Makefile head/contrib/netbsd-tests/bin/dd/Makefile head/contrib/netbsd-tests/bin/df/Makefile head/contrib/netbsd-tests/bin/expr/Makefile head/contrib/netbsd-tests/bin/pax/Makefile head/contrib/netbsd-tests/bin/ps/Makefile head/contrib/netbsd-tests/bin/sh/Makefile head/contrib/netbsd-tests/bin/sh/dotcmd/Makefile head/contrib/netbsd-tests/bin/sleep/Makefile head/contrib/netbsd-tests/bin/tar/Makefile head/contrib/netbsd-tests/crypto/Makefile head/contrib/netbsd-tests/crypto/Makefile.inc head/contrib/netbsd-tests/crypto/libcrypto/Makefile head/contrib/netbsd-tests/crypto/libcrypto/Makefile.inc head/contrib/netbsd-tests/crypto/libcrypto/bf/Makefile head/contrib/netbsd-tests/crypto/libcrypto/bn/Makefile head/contrib/netbsd-tests/crypto/libcrypto/bn/Makefile.inc head/contrib/netbsd-tests/crypto/libcrypto/bn/bn/Makefile head/contrib/netbsd-tests/crypto/libcrypto/bn/div/Makefile head/contrib/netbsd-tests/crypto/libcrypto/bn/exp/Makefile head/contrib/netbsd-tests/crypto/libcrypto/cast/Makefile head/contrib/netbsd-tests/crypto/libcrypto/conf/Makefile head/contrib/netbsd-tests/crypto/libcrypto/des/Makefile head/contrib/netbsd-tests/crypto/libcrypto/dh/Makefile head/contrib/netbsd-tests/crypto/libcrypto/dsa/Makefile head/contrib/netbsd-tests/crypto/libcrypto/ec/Makefile head/contrib/netbsd-tests/crypto/libcrypto/ecdh/Makefile head/contrib/netbsd-tests/crypto/libcrypto/ecdsa/Makefile head/contrib/netbsd-tests/crypto/libcrypto/engine/Makefile head/contrib/netbsd-tests/crypto/libcrypto/evp/Makefile head/contrib/netbsd-tests/crypto/libcrypto/hmac/Makefile head/contrib/netbsd-tests/crypto/libcrypto/idea/Makefile head/contrib/netbsd-tests/crypto/libcrypto/lhash/Makefile head/contrib/netbsd-tests/crypto/libcrypto/md2/Makefile head/contrib/netbsd-tests/crypto/libcrypto/md4/Makefile head/contrib/netbsd-tests/crypto/libcrypto/md5/Makefile head/contrib/netbsd-tests/crypto/libcrypto/mdc2/Makefile head/contrib/netbsd-tests/crypto/libcrypto/rand/Makefile head/contrib/netbsd-tests/crypto/libcrypto/rc2/Makefile head/contrib/netbsd-tests/crypto/libcrypto/rc4/Makefile head/contrib/netbsd-tests/crypto/libcrypto/rc5/Makefile head/contrib/netbsd-tests/crypto/libcrypto/ripemd/Makefile head/contrib/netbsd-tests/crypto/libcrypto/rsa/Makefile head/contrib/netbsd-tests/crypto/libcrypto/sha/Makefile head/contrib/netbsd-tests/crypto/libcrypto/sha1/Makefile head/contrib/netbsd-tests/crypto/libcrypto/srp/Makefile head/contrib/netbsd-tests/crypto/libcrypto/threads/Makefile head/contrib/netbsd-tests/crypto/libcrypto/x509v3/Makefile head/contrib/netbsd-tests/crypto/opencrypto/Makefile head/contrib/netbsd-tests/crypto/opencrypto/Makefile.inc head/contrib/netbsd-tests/dev/Makefile head/contrib/netbsd-tests/dev/Makefile.inc head/contrib/netbsd-tests/dev/audio/Makefile head/contrib/netbsd-tests/dev/cgd/Makefile head/contrib/netbsd-tests/dev/dm/Makefile head/contrib/netbsd-tests/dev/md/Makefile head/contrib/netbsd-tests/dev/raidframe/Makefile head/contrib/netbsd-tests/dev/scsipi/Makefile head/contrib/netbsd-tests/dev/scsipi/libscsitest/Makefile head/contrib/netbsd-tests/dev/sysmon/Makefile head/contrib/netbsd-tests/fs/Makefile head/contrib/netbsd-tests/fs/Makefile.inc head/contrib/netbsd-tests/fs/cd9660/Makefile head/contrib/netbsd-tests/fs/common/Makefile head/contrib/netbsd-tests/fs/ffs/Makefile head/contrib/netbsd-tests/fs/fifofs/Makefile head/contrib/netbsd-tests/fs/hfs/Makefile head/contrib/netbsd-tests/fs/kernfs/Makefile head/contrib/netbsd-tests/fs/lfs/Makefile head/contrib/netbsd-tests/fs/msdosfs/Makefile head/contrib/netbsd-tests/fs/nfs/Makefile head/contrib/netbsd-tests/fs/nfs/nfsservice/Makefile head/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/Makefile.inc head/contrib/netbsd-tests/fs/nullfs/Makefile head/contrib/netbsd-tests/fs/psshfs/Makefile head/contrib/netbsd-tests/fs/ptyfs/Makefile head/contrib/netbsd-tests/fs/puffs/Makefile head/contrib/netbsd-tests/fs/puffs/h_dtfs/Makefile head/contrib/netbsd-tests/fs/tmpfs/Makefile
Re: svn commit: r272372 - stable/10/bin/rm
On Thu, 2 Oct 2014, John Baldwin wrote: On Thursday, October 02, 2014 2:16:28 am Glen Barber wrote: On Thu, Oct 02, 2014 at 02:56:05PM +1000, Bruce Evans wrote: On Wed, 1 Oct 2014, Glen Barber wrote: Log: MFC r268376 (imp): rm -rf can fail sometimes with an error from fts_read. Make it honor fflag to ignore fts_read errors, but stop deleting from that directory because no further progress can be made. I asked for this to be backed out in -current. It is not suitable for MFC. It fixes an immediate issue that prevents high-concurrent make(1) jobs from stomping over each other. If there is a more suitable solution, it needs to be introduced in head/ first, pending MFC for 10.1-RELEASE. In the meantime, we lack any alternate fix, and this resolves the immediate issue at hand. See old mail for more details. I saw the original email. I do not see a proposed patch. My mail gave hints for hundreds of patches. None of them are good enough to propose. You could at least limit the special case to the errno that fts_read() returns when it gets confused instead of ignoring all errors. I think the proposed patch is to revert this and fix the broken Makefiles instead. The problem with changing rm to workaround a bug in FreeBSD's Makefiles is we are breaking rm(1) for everyone else in the world to cater to a bug in our build system. There is still the larger problem with fts_read(). Applications like rm are specified to do a complete tree walk, with special handling for files that do not exist. If fts_read() is going to abort in the middle of a tree walk, then it is unusable for implementing applications like rm. Are you happy that we are invoking the same commands in parallel for a make target? In some cases it may be ok, but there are many others where it is not (e.g. if two jobs are both compiling the same .o file, the second one might replace an object file out from under a subsequent link that starts after the first one finishes). Instead of breaking rm, you should be harassing whoever broke make (or added the SUBDIR_PARALLEL logic). Presumably you can build without -j x as a workaround. Even multiple rm -f's for cleaning an otherwise static tree aren't safe unless rm -f works as specified. It's hard to think of a single safe example using standard utilities (except make itself, used more carefully). Bruce ___ 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: r272459 - stable/10/sys/conf
Author: gjb
Date: Fri Oct 3 00:13:10 2014
New Revision: 272459
URL: https://svnweb.freebsd.org/changeset/base/272459
Log:
Update stable/10 to -RC1 in preparation of branching releng/10.1
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/sys/conf/newvers.sh
Modified: stable/10/sys/conf/newvers.sh
==
--- stable/10/sys/conf/newvers.sh Thu Oct 2 23:26:49 2014
(r272458)
+++ stable/10/sys/conf/newvers.sh Fri Oct 3 00:13:10 2014
(r272459)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=10.1
-BRANCH=BETA3
+BRANCH=RC1
if [ X${BRANCH_OVERRIDE} != X ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
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: r272460 - svnadmin/conf
Author: gjb Date: Fri Oct 3 00:26:33 2014 New Revision: 272460 URL: https://svnweb.freebsd.org/changeset/base/272460 Log: Require explicit re approval for releng/10.1 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: svnadmin/conf/approvers Modified: svnadmin/conf/approvers == --- svnadmin/conf/approvers Fri Oct 3 00:13:10 2014(r272459) +++ svnadmin/conf/approvers Fri Oct 3 00:26:33 2014(r272460) @@ -21,6 +21,7 @@ #^stable/9/re #^stable/8/re #^stable/7/re +^releng/10.1/ re ^releng/10.0/ (security-officer|so) ^releng/9.[0-3]/ (security-officer|so) ^releng/8.[0-4]/ (security-officer|so) ___ 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: r272461 - releng/10.1
Author: gjb Date: Fri Oct 3 00:49:11 2014 New Revision: 272461 URL: https://svnweb.freebsd.org/changeset/base/272461 Log: Copy stable/10@r272459 to releng/10.1 as part of the 10.1-RELEASE process. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Added: releng/10.1/ - copied from r272459, stable/10/ ___ 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: r272462 - releng/10.1
Author: gjb Date: Fri Oct 3 00:52:20 2014 New Revision: 272462 URL: https://svnweb.freebsd.org/changeset/base/272462 Log: Clean vestigial svn:mergeinfo from stable/10 - releng/10.1 branch. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: Directory Properties: releng/10.1/ (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: r272463 - releng/10.1/sys/sys
Author: gjb Date: Fri Oct 3 00:58:34 2014 New Revision: 272463 URL: https://svnweb.freebsd.org/changeset/base/272463 Log: Bump __FreeBSD_version after releng/10.1 branch. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.1/sys/sys/param.h Modified: releng/10.1/sys/sys/param.h == --- releng/10.1/sys/sys/param.h Fri Oct 3 00:52:20 2014(r272462) +++ releng/10.1/sys/sys/param.h Fri Oct 3 00:58:34 2014(r272463) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000717 /* Master, propagated to newvers */ +#define __FreeBSD_version 1001000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ 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: r272464 - stable/10/sys/sys
Author: gjb Date: Fri Oct 3 00:58:42 2014 New Revision: 272464 URL: https://svnweb.freebsd.org/changeset/base/272464 Log: Bump __FreeBSD_version after releng/10.1 branch. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/sys/param.h Modified: stable/10/sys/sys/param.h == --- stable/10/sys/sys/param.h Fri Oct 3 00:58:34 2014(r272463) +++ stable/10/sys/sys/param.h Fri Oct 3 00:58:42 2014(r272464) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000717 /* Master, propagated to newvers */ +#define __FreeBSD_version 1001500 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ 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: r272465 - head/share/man/man4
Author: kevlo Date: Fri Oct 3 01:20:49 2014 New Revision: 272465 URL: https://svnweb.freebsd.org/changeset/base/272465 Log: Mention umoscom(4) and uslcom(4). Modified: head/share/man/man4/ucom.4 Modified: head/share/man/man4/ucom.4 == --- head/share/man/man4/ucom.4 Fri Oct 3 00:58:42 2014(r272464) +++ head/share/man/man4/ucom.4 Fri Oct 3 01:20:49 2014(r272465) @@ -81,8 +81,10 @@ multiple external ports. .Xr umcs 4 , .Xr umct 4 , .Xr umodem 4 , +.Xr umoscom 4 , .Xr uplcom 4 , .Xr usb 4 , +.Xr uslcom 4 , .Xr uvisor 4 , .Xr uvscom 4 .Sh HISTORY ___ 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: r272466 - head/share/man/man4
Author: kevlo Date: Fri Oct 3 01:39:33 2014 New Revision: 272466 URL: https://svnweb.freebsd.org/changeset/base/272466 Log: bump .Dd Reported by: gjb Modified: head/share/man/man4/ucom.4 Modified: head/share/man/man4/ucom.4 == --- head/share/man/man4/ucom.4 Fri Oct 3 01:20:49 2014(r272465) +++ head/share/man/man4/ucom.4 Fri Oct 3 01:39:33 2014(r272466) @@ -29,7 +29,7 @@ .\ .\ $FreeBSD$ .\ -.Dd March 1, 2008 +.Dd October 3, 2014 .Dt UCOM 4 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r272467 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/nfs fs/nfsserver
Author: araujo (ports committer)
Date: Fri Oct 3 02:24:41 2014
New Revision: 272467
URL: https://svnweb.freebsd.org/changeset/base/272467
Log:
Fix failures and warnings reported by newpynfs20090424 test tool.
This fix addresses only issues with the pynfs reports, none of these
issues are know to create problems for extant real clients.
Submitted by: Bart Hsiao bart.hs...@gmail.com
Reworked by: myself
Reviewed by: rmacklem
Approved by: rmacklem
Sponsored by: QNAP Systems Inc.
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
head/sys/fs/nfs/nfs_commonsubs.c
head/sys/fs/nfs/nfs_var.h
head/sys/fs/nfs/nfsproto.h
head/sys/fs/nfsserver/nfs_nfsdport.c
head/sys/fs/nfsserver/nfs_nfsdserv.c
head/sys/fs/nfsserver/nfs_nfsdstate.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 Fri Oct
3 01:39:33 2014(r272466)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri Oct
3 02:24:41 2014(r272467)
@@ -2837,6 +2837,7 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, i
#endif
vap-va_seq = zp-z_seq;
vap-va_flags = 0; /* FreeBSD: Reset chflags(2) flags. */
+ vap-va_filerev = zp-z_seq;
/*
* Add in any requested optional attributes and the create time.
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==
--- head/sys/fs/nfs/nfs_commonsubs.cFri Oct 3 01:39:33 2014
(r272466)
+++ head/sys/fs/nfs/nfs_commonsubs.cFri Oct 3 02:24:41 2014
(r272467)
@@ -820,7 +820,6 @@ nfsv4_loadattr(struct nfsrv_descript *nd
struct dqblk dqb;
uid_t savuid;
#endif
-
if (compare) {
retnotsup = 0;
error = nfsrv_getattrbits(nd, attrbits, NULL, retnotsup);
@@ -902,6 +901,12 @@ nfsv4_loadattr(struct nfsrv_descript *nd
goto nfsmout;
if (compare !(*retcmpp)) {
NFSSETSUPP_ATTRBIT(checkattrbits);
+
+ /* Some filesystem do not support NFSv4ACL */
+ if (nfsrv_useacl == 0 || nfs_supportsnfsv4acls(vp)
== 0) {
+ NFSCLRBIT_ATTRBIT(checkattrbits,
NFSATTRBIT_ACL);
+ NFSCLRBIT_ATTRBIT(checkattrbits,
NFSATTRBIT_ACLSUPPORT);
+ }
if (!NFSEQUAL_ATTRBIT(retattrbits, checkattrbits)
|| retnotsup)
*retcmpp = NFSERR_NOTSAME;
@@ -1052,7 +1057,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd
case NFSATTRBIT_ACL:
if (compare) {
if (!(*retcmpp)) {
- if (nfsrv_useacl) {
+ if (nfsrv_useacl nfs_supportsnfsv4acls(vp)) {
NFSACL_T *naclp;
naclp = acl_alloc(M_WAITOK);
@@ -1073,21 +1078,22 @@ nfsv4_loadattr(struct nfsrv_descript *nd
}
}
} else {
- if (vp != NULL aclp != NULL)
- error = nfsrv_dissectacl(nd, aclp, aceerr,
- cnt, p);
- else
- error = nfsrv_dissectacl(nd, NULL, aceerr,
- cnt, p);
- if (error)
- goto nfsmout;
+ if (vp != NULL aclp != NULL)
+ error = nfsrv_dissectacl(nd, aclp, aceerr,
+ cnt, p);
+ else
+ error = nfsrv_dissectacl(nd, NULL, aceerr,
+ cnt, p);
+ if (error)
+ goto nfsmout;
}
+
attrsum += cnt;
break;
case NFSATTRBIT_ACLSUPPORT:
NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
if (compare !(*retcmpp)) {
- if (nfsrv_useacl) {
+ if (nfsrv_useacl nfs_supportsnfsv4acls(vp)) {
if (fxdr_unsigned(u_int32_t, *tl) !=
NFSV4ACE_SUPTYPES)
*retcmpp = NFSERR_NOTSAME;
@@ -2090,6 +2096,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd
}
}
}
+
/*
* Put out the
svn commit: r272468 - head/sys/geom
Author: hrs
Date: Fri Oct 3 04:13:25 2014
New Revision: 272468
URL: https://svnweb.freebsd.org/changeset/base/272468
Log:
Fix a bug in r272297 which prevented dumpdev from setting.
!u is not equivalent to (u != 0).
Modified:
head/sys/geom/geom_dev.c
Modified: head/sys/geom/geom_dev.c
==
--- head/sys/geom/geom_dev.cFri Oct 3 02:24:41 2014(r272467)
+++ head/sys/geom/geom_dev.cFri Oct 3 04:13:25 2014(r272468)
@@ -395,7 +395,7 @@ g_dev_ioctl(struct cdev *dev, u_long cmd
error = g_io_getattr(GEOM::frontstuff, cp, i, data);
break;
case DIOCSKERNELDUMP:
- if (*(u_int *)data != 0) {
+ if (*(u_int *)data == 0) {
error = set_dumper(NULL, NULL);
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
