Re: svn commit: r277737 - in head: etc/pam.d tools/build/mk
Garrett Cooper n...@freebsd.org writes:
Log:
Honor MK_ACCT with etc/pam.d/atrun
The correct idiom would be
Index: etc/pam.d/Makefile
===
--- etc/pam.d/Makefile (revision 277747)
+++ etc/pam.d/Makefile (working copy)
@@ -5,6 +5,7 @@
NO_OBJ=
FILES= README \
+ ${_atrun} \
cron \
ftpd \
imap \
@@ -17,7 +18,7 @@
xdm
.if ${MK_AT} != no
-FILES+=atrun
+_atrun=atrun
.endif
FILESDIR= /etc/pam.d
DES
--
Dag-Erling Smørgrav - d...@des.no
___
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: r277749 - stable/10/usr.sbin/ctld
Author: trasz
Date: Mon Jan 26 13:21:30 2015
New Revision: 277749
URL: https://svnweb.freebsd.org/changeset/base/277749
Log:
MFC r274791:
Add missing error checking for kernel_port_{add,remove}(). Both can fail
for reasons yet unknown; don't make it increment cumulated_error as a kind
of temporary workaround.
MFC r275399:
Fix null pointer dereference.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/usr.sbin/ctld/ctld.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/ctld/ctld.c
==
--- stable/10/usr.sbin/ctld/ctld.c Mon Jan 26 13:17:20 2015
(r277748)
+++ stable/10/usr.sbin/ctld/ctld.c Mon Jan 26 13:21:30 2015
(r277749)
@@ -1680,7 +1680,16 @@ conf_apply(struct conf *oldconf, struct
cumulated_error++;
}
}
- kernel_port_remove(oldtarg);
+ error = kernel_port_remove(oldtarg);
+ if (error != 0) {
+ log_warnx(failed to remove target %s,
+ oldtarg-t_name);
+ /*
+* XXX: Uncomment after fixing the root cause.
+*
+* cumulated_error++;
+*/
+ }
continue;
}
@@ -1814,8 +1823,18 @@ conf_apply(struct conf *oldconf, struct
cumulated_error++;
}
}
- if (oldtarg == NULL)
- kernel_port_add(newtarg);
+ if (oldtarg == NULL) {
+ error = kernel_port_add(newtarg);
+ if (error != 0) {
+ log_warnx(failed to add target %s,
+ newtarg-t_name);
+ /*
+* XXX: Uncomment after fixing the root cause.
+*
+* cumulated_error++;
+*/
+ }
+ }
}
/*
___
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: r277752 - stable/10/share/man/man4
Author: trasz Date: Mon Jan 26 13:32:07 2015 New Revision: 277752 URL: https://svnweb.freebsd.org/changeset/base/277752 Log: MFC r272165 by gavin@: Add very basic outline man page for smsc(4). Added: stable/10/share/man/man4/smsc.4 - copied unchanged from r272165, head/share/man/man4/smsc.4 Modified: stable/10/share/man/man4/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/Makefile == --- stable/10/share/man/man4/Makefile Mon Jan 26 13:29:43 2015 (r277751) +++ stable/10/share/man/man4/Makefile Mon Jan 26 13:32:07 2015 (r277752) @@ -440,6 +440,7 @@ MAN=aac.4 \ smb.4 \ smbus.4 \ smp.4 \ + smsc.4 \ sn.4 \ snd_ad1816.4 \ snd_als4000.4 \ Copied: stable/10/share/man/man4/smsc.4 (from r272165, head/share/man/man4/smsc.4) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/share/man/man4/smsc.4 Mon Jan 26 13:32:07 2015 (r277752, copy of r272165, head/share/man/man4/smsc.4) @@ -0,0 +1,89 @@ +.\ Copyright (c) 2014 Gavin Atkinson +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ +.\- Redistributions of source code must retain the above copyright +.\ notice, this list of conditions and the following disclaimer. +.\- Redistributions in binary form must reproduce the above +.\ copyright notice, this list of conditions and the following +.\ disclaimer in the documentation and/or other materials provided +.\ with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +.\ AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +.\ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +.\ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +.\ COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +.\ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +.\ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +.\ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +.\ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +.\ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. +.\ +.\ $FreeBSD$ +.\ +.Dd September 26, 2014 +.Dt SMSC 4 +.Os +.Sh NAME +.Nm smsc +.Nd USB SMSC LAN9xxx Fast Ethernet driver +.Sh SYNOPSIS +To load the driver as a module at boot time, place the +following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_smsc_load=YES +.Ed +.Pp +Alternatively, to compile this driver into the kernel, place the +following lines in your kernel configuration file: +.Bd -ragged -offset indent +.Cd device uhci +.Cd device ohci +.Cd device usb +.Cd device smsc +.Ed +.Sh DESCRIPTION +The +.Nm +device driver provides support for USB Fast Ethernet adapters based +on the SMSC LAN9xxx chipsets. +.Pp +For more information on configuring this device, see +.Xr ifconfig 8 . +.Sh HARDWARE +The following devices are supported by the +.Nm +driver: +.Pp +.Bl -bullet -compact +.It +SMSC LAN9500, LAN9500A, LAN9505 and LAN9505A based Ethernet adapters +.It +SMSC LAN89530, LAN9530 and LAN9730 based Ethernet adapters +.It +SMSC LAN951x Ethernet adapters with integrated USB hub +.El +.Sh SEE ALSO +.Xr arp 4 , +.Xr intro 4 , +.Xr netintro 4 , +.Xr usb 4 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 10.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Ben Gray Aq Mt bg...@freebsd.org . ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r277754 - stable/10/share/man/man4
Author: trasz Date: Mon Jan 26 13:35:45 2015 New Revision: 277754 URL: https://svnweb.freebsd.org/changeset/base/277754 Log: MFC r272171 by pluknet@: Add smsc(4) to the list of drivers use the miibus interface. Modified: stable/10/share/man/man4/miibus.4 stable/10/share/man/man4/smsc.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/miibus.4 == --- stable/10/share/man/man4/miibus.4 Mon Jan 26 13:34:21 2015 (r277753) +++ stable/10/share/man/man4/miibus.4 Mon Jan 26 13:35:45 2015 (r277754) @@ -8,7 +8,7 @@ .\ .\ $FreeBSD$ .\ -.Dd January 15, 2011 +.Dd September 26, 2014 .Dt MIIBUS 4 .Os .Sh NAME @@ -105,6 +105,8 @@ Silicon Integrated Systems SiS190/191 Et Silicon Integrated Systems SiS 900/SiS 7016 .It Xr sk 4 SysKonnect SK-984x and SK-982x Gigabit Ethernet +.It Xr smsc 4 +SMSC LAN9xxx USB Fast Ethernet .It Xr ste 4 Sundance ST201 (D-Link DFE-550TX) .It Xr stge 4 @@ -169,6 +171,7 @@ but as a result are not well behaved new .Xr sge 4 , .Xr sis 4 , .Xr sk 4 , +.Xr smsc 4 , .Xr ste 4 , .Xr stge 4 , .Xr tl 4 , Modified: stable/10/share/man/man4/smsc.4 == --- stable/10/share/man/man4/smsc.4 Mon Jan 26 13:34:21 2015 (r277753) +++ stable/10/share/man/man4/smsc.4 Mon Jan 26 13:35:45 2015 (r277754) @@ -47,6 +47,7 @@ following lines in your kernel configura .Cd device uhci .Cd device ohci .Cd device usb +.Cd device miibus .Cd device smsc .Ed .Sh DESCRIPTION @@ -73,6 +74,7 @@ SMSC LAN951x Ethernet adapters with inte .Sh SEE ALSO .Xr arp 4 , .Xr intro 4 , +.Xr miibus 4 , .Xr netintro 4 , .Xr usb 4 , .Xr ifconfig 8 ___ 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: r277755 - stable/10/share/man/man4
Author: trasz Date: Mon Jan 26 13:37:18 2015 New Revision: 277755 URL: https://svnweb.freebsd.org/changeset/base/277755 Log: MFC r272294 by gavin@: Make clear in the ipheth(4) hardware notes that this driver is for the tethering functionality only. Add a bugs section to give a pointer to usbconfig set_config if the device isn't automatically detected. Modified: stable/10/share/man/man4/ipheth.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/ipheth.4 == --- stable/10/share/man/man4/ipheth.4 Mon Jan 26 13:35:45 2015 (r277754) +++ stable/10/share/man/man4/ipheth.4 Mon Jan 26 13:37:18 2015 (r277755) @@ -27,12 +27,12 @@ .\ .\ $FreeBSD$ .\ -.Dd September 25, 2014 +.Dd September 30, 2014 .Dt IPHETH 4 .Os .Sh NAME .Nm ipheth -.Nd USB Apple iPhone/iPad Ethernet driver +.Nd USB Apple iPhone/iPad tethered Ethernet driver .Sh SYNOPSIS To load the driver as a module at boot time, place the following line in @@ -61,6 +61,7 @@ In most cases this must be explicitly en .Pp For more information on configuring this device, see .Xr ifconfig 8 . +The device does not support different media types or options. .Sh HARDWARE The following devices are supported by the .Nm @@ -68,9 +69,9 @@ driver: .Pp .Bl -bullet -compact .It -Apple iPhone (all models) +Apple iPhone tethering (all models) .It -Apple iPad (all models) +Apple iPad tethering (all models) .El .Sh SEE ALSO .Xr arp 4 , @@ -80,6 +81,7 @@ Apple iPad (all models) .Xr urndis 4 , .Xr usb 4 , .Xr ifconfig 8 +.Xr usbconfig 8 .Sh HISTORY The .Nm @@ -91,3 +93,14 @@ The .Nm driver was written by .An Hans Petter Selasky Aq Mt hsela...@freebsd.org . +.Sh BUGS +Some devices may need to be manually configured to use an alternative +configuration with the +.Xr usbconfig 8 +utility. +A command similar to +.Dl usbconfig -u 1 -a 2 set_config 3 +may be required if the device is not recognised automatically by +.Nm +after it is connected. + ___ 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: r277753 - stable/10/share/man/man4
Author: trasz Date: Mon Jan 26 13:34:21 2015 New Revision: 277753 URL: https://svnweb.freebsd.org/changeset/base/277753 Log: MFC r272168 by gavin@: Add MLINKS for if_ipheth(4) and if_smsc(4). Modified: stable/10/share/man/man4/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/Makefile == --- stable/10/share/man/man4/Makefile Mon Jan 26 13:32:07 2015 (r277752) +++ stable/10/share/man/man4/Makefile Mon Jan 26 13:34:21 2015 (r277753) @@ -660,6 +660,7 @@ MLINKS+=ip.4 rawip.4 MLINKS+=ipfirewall.4 ipaccounting.4 \ ipfirewall.4 ipacct.4 \ ipfirewall.4 ipfw.4 +MLINKS+=ipheth.4 if_ipheth.4 MLINKS+=ipw.4 if_ipw.4 MLINKS+=iwi.4 if_iwi.4 MLINKS+=iwn.4 if_iwn.4 @@ -715,6 +716,7 @@ MLINKS+=sge.4 if_sge.4 MLINKS+=sis.4 if_sis.4 MLINKS+=sk.4 if_sk.4 MLINKS+=smp.4 SMP.4 +MLINKS+=smsc.4 if_smsc.4 MLINKS+=sn.4 if_sn.4 MLINKS+=snd_envy24.4 snd_ak452x.4 MLINKS+=snd_sbc.4 snd_sb16.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: r277748 - stable/10/usr.sbin/autofs
Author: trasz Date: Mon Jan 26 13:17:20 2015 New Revision: 277748 URL: https://svnweb.freebsd.org/changeset/base/277748 Log: MFC r275746: Fix markup. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/autofs/autounmountd.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/autofs/autounmountd.8 == --- stable/10/usr.sbin/autofs/autounmountd.8Mon Jan 26 11:49:06 2015 (r277747) +++ stable/10/usr.sbin/autofs/autounmountd.8Mon Jan 26 13:17:20 2015 (r277748) @@ -27,7 +27,7 @@ .\ .\ $FreeBSD$ .\ -.Dd April 20, 2014 +.Dd December 13, 2014 .Dt AUTOUNMOUNTD 8 .Os .Sh NAME @@ -36,8 +36,8 @@ .Sh SYNOPSIS .Nm .Op Fl d -.Op Fl r time -.Op Fl t time +.Op Fl r Ar time +.Op Fl t Ar time .Op Fl v .Sh DESCRIPTION The ___ 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: r277750 - stable/10/share/man/man4
Author: trasz
Date: Mon Jan 26 13:28:13 2015
New Revision: 277750
URL: https://svnweb.freebsd.org/changeset/base/277750
Log:
MFC r272106 by gavin@:
Add basic man page for ipheth(4).
Added:
stable/10/share/man/man4/ipheth.4
- copied unchanged from r272106, head/share/man/man4/ipheth.4
Modified:
stable/10/share/man/man4/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/man/man4/Makefile
==
--- stable/10/share/man/man4/Makefile Mon Jan 26 13:21:30 2015
(r277749)
+++ stable/10/share/man/man4/Makefile Mon Jan 26 13:28:13 2015
(r277750)
@@ -201,6 +201,7 @@ MAN=aac.4 \
ip.4 \
ip6.4 \
ipfirewall.4 \
+ ipheth.4 \
${_ipmi.4} \
ips.4 \
ipsec.4 \
Copied: stable/10/share/man/man4/ipheth.4 (from r272106,
head/share/man/man4/ipheth.4)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/share/man/man4/ipheth.4 Mon Jan 26 13:28:13 2015
(r277750, copy of r272106, head/share/man/man4/ipheth.4)
@@ -0,0 +1,93 @@
+.\ Copyright (c) 2014 Gavin Atkinson
+.\ All rights reserved.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\
+.\- Redistributions of source code must retain the above copyright
+.\ notice, this list of conditions and the following disclaimer.
+.\- Redistributions in binary form must reproduce the above
+.\ copyright notice, this list of conditions and the following
+.\ disclaimer in the documentation and/or other materials provided
+.\ with the distribution.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+.\ AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+.\ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+.\ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+.\ COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+.\ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+.\ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+.\ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\ POSSIBILITY OF SUCH DAMAGE.
+.\
+.\ $FreeBSD$
+.\
+.Dd September 25, 2014
+.Dt IPHETH 4
+.Os
+.Sh NAME
+.Nm ipheth
+.Nd USB Apple iPhone/iPad Ethernet driver
+.Sh SYNOPSIS
+To load the driver as a module at boot time, place the
+following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+if_ipheth_load=YES
+.Ed
+.Pp
+Alternatively, to compile this driver into the kernel, place the
+following lines in your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd device uhci
+.Cd device ohci
+.Cd device usb
+.Cd device ipheth
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for network access through Apple
+iPhone and iPad devices, often referred to as USB tethering.
+.Pp
+.Nm
+should work with any Apple iPhone or iPad device.
+In most cases this must be explicitly enabled on the device first.
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+.Sh HARDWARE
+The following devices are supported by the
+.Nm
+driver:
+.Pp
+.Bl -bullet -compact
+.It
+Apple iPhone (all models)
+.It
+Apple iPad (all models)
+.El
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr cdce 4 ,
+.Xr intro 4 ,
+.Xr netintro 4 ,
+.Xr urndis 4 ,
+.Xr usb 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 8.2 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Hans Petter Selasky Aq Mt hsela...@freebsd.org .
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r277756 - stable/10/share/man/man4
Author: trasz Date: Mon Jan 26 13:39:35 2015 New Revision: 277756 URL: https://svnweb.freebsd.org/changeset/base/277756 Log: MFC r274496: Fix mdoc warning by removing empty lines. Sponsored by: The FreeBSD Foundation Modified: stable/10/share/man/man4/ipheth.4 stable/10/share/man/man4/iscsi_initiator.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/ipheth.4 == --- stable/10/share/man/man4/ipheth.4 Mon Jan 26 13:37:18 2015 (r277755) +++ stable/10/share/man/man4/ipheth.4 Mon Jan 26 13:39:35 2015 (r277756) @@ -103,4 +103,3 @@ A command similar to may be required if the device is not recognised automatically by .Nm after it is connected. - Modified: stable/10/share/man/man4/iscsi_initiator.4 == --- stable/10/share/man/man4/iscsi_initiator.4 Mon Jan 26 13:37:18 2015 (r277755) +++ stable/10/share/man/man4/iscsi_initiator.4 Mon Jan 26 13:39:35 2015 (r277756) @@ -54,7 +54,6 @@ Users are advised to use instead. .Ef .Pp - The .Nm implements the kernel side of the Internet SCSI (iSCSI) network ___ 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: r277751 - stable/10/share/man/man4
Author: trasz Date: Mon Jan 26 13:29:43 2015 New Revision: 277751 URL: https://svnweb.freebsd.org/changeset/base/277751 Log: MFC r272107 by gavin@: Cross reference cdce(4), ipheth(4) and urndis(4) from each other. Modified: stable/10/share/man/man4/cdce.4 stable/10/share/man/man4/urndis.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/cdce.4 == --- stable/10/share/man/man4/cdce.4 Mon Jan 26 13:28:13 2015 (r277750) +++ stable/10/share/man/man4/cdce.4 Mon Jan 26 13:29:43 2015 (r277751) @@ -28,7 +28,7 @@ .\ $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ .\ $FreeBSD$ .\ -.Dd September 17, 2005 +.Dd September 25, 2014 .Dt CDCE 4 .Os .Sh NAME @@ -114,9 +114,10 @@ is running low on mbufs. .Sh SEE ALSO .Xr arp 4 , .Xr intro 4 , +.Xr ipheth 4 , .Xr netintro 4 , +.Xr urndis 4 , .Xr usb 4 , -.\ .Xr hostname.if 5 , .Xr ifconfig 8 .Rs .%T Universal Serial Bus Class Definitions for Communication Devices Modified: stable/10/share/man/man4/urndis.4 == --- stable/10/share/man/man4/urndis.4 Mon Jan 26 13:28:13 2015 (r277750) +++ stable/10/share/man/man4/urndis.4 Mon Jan 26 13:29:43 2015 (r277751) @@ -29,7 +29,7 @@ .\ .\ $FreeBSD$ .\ -.Dd April 21, 2014 +.Dd September 25, 2014 .Dt URNDIS 4 .Os .Sh NAME @@ -70,6 +70,8 @@ For more information on configuring this .Xr ifconfig 8 . .Sh SEE ALSO .Xr arp 4 , +.Xr cdce 4 , +.Xr ipheth 4 , .Xr netintro 4 , .Xr usb 4 , .Xr ifconfig 8 ___ 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: r277757 - stable/10/cddl/contrib/opensolaris/cmd/zpool
Author: smh
Date: Mon Jan 26 13:59:39 2015
New Revision: 277757
URL: https://svnweb.freebsd.org/changeset/base/277757
Log:
MFC r276226:
Enhancements to zpool upgrade processing
Sponsored by: Multiplay
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==
--- stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Jan 26
13:39:35 2015(r277756)
+++ stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Jan 26
13:59:39 2015(r277757)
@@ -4509,11 +4509,12 @@ zpool_do_status(int argc, char **argv)
}
typedef struct upgrade_cbdata {
- int cb_first;
- charcb_poolname[ZPOOL_MAXNAMELEN];
- int cb_argc;
- uint64_t cb_version;
- char**cb_argv;
+ boolean_t cb_first;
+ boolean_t cb_unavail;
+ charcb_poolname[ZPOOL_MAXNAMELEN];
+ int cb_argc;
+ uint64_tcb_version;
+ char**cb_argv;
} upgrade_cbdata_t;
#ifdef __FreeBSD__
@@ -4631,7 +4632,8 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
(void) fprintf(stderr, gettext(cannot upgrade '%s': pool is
- currently unavailable\n\n), zpool_get_name(zhp));
+ currently unavailable.\n\n), zpool_get_name(zhp));
+ cbp-cb_unavail = B_TRUE;
/* Allow iteration to continue. */
return (0);
}
@@ -4697,12 +4699,41 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
}
static int
+upgrade_list_unavail(zpool_handle_t *zhp, void *arg)
+{
+ upgrade_cbdata_t *cbp = arg;
+
+ if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
+ if (cbp-cb_first) {
+ (void) fprintf(stderr, gettext(The following pools
+ are unavailable and cannot be upgraded as this
+ time.\n\n));
+ (void) fprintf(stderr, gettext(POOL\n));
+ (void) fprintf(stderr, gettext(\n));
+ cbp-cb_first = B_FALSE;
+ }
+ (void) printf(gettext(%s\n), zpool_get_name(zhp));
+ cbp-cb_unavail = B_TRUE;
+ }
+ return (0);
+}
+
+static int
upgrade_list_older_cb(zpool_handle_t *zhp, void *arg)
{
upgrade_cbdata_t *cbp = arg;
nvlist_t *config;
uint64_t version;
+ if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
+ /*
+* This will have been reported by upgrade_list_unavail so
+* just allow iteration to continue.
+*/
+ cbp-cb_unavail = B_TRUE;
+ return (0);
+ }
+
config = zpool_get_config(zhp, NULL);
verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
version) == 0);
@@ -4737,10 +4768,11 @@ upgrade_list_disabled_cb(zpool_handle_t
uint64_t version;
if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
- (void) fprintf(stderr, gettext(cannot check supported
- features on '%s': pool is currently unavailable\n\n),
- zpool_get_name(zhp));
- /* Allow iteration to continue. */
+ /*
+* This will have been reported by upgrade_list_unavail so
+* just allow iteration to continue.
+*/
+ cbp-cb_unavail = B_TRUE;
return (0);
}
@@ -4797,10 +4829,17 @@ upgrade_one(zpool_handle_t *zhp, void *d
uint64_t cur_version;
int ret;
+ if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) {
+ (void) fprintf(stderr, gettext(cannot upgrade '%s': pool is
+ is currently unavailable.\n\n), zpool_get_name(zhp));
+ cbp-cb_unavail = B_TRUE;
+ return (1);
+ }
+
if (strcmp(log, zpool_get_name(zhp)) == 0) {
(void) printf(gettext('log' is now a reserved word\n
Pool 'log' must be renamed using export and import
-to upgrade.\n));
+to upgrade.\n\n));
return (1);
}
@@ -4844,7 +4883,7 @@ upgrade_one(zpool_handle_t *zhp, void *d
#endif /* __FreeBSD __*/
} else if (cur_version == SPA_VERSION) {
(void) printf(gettext(Pool '%s' already has all
- supported features enabled.\n),
+ supported features enabled.\n\n),
zpool_get_name(zhp));
}
}
@@ -5001,11 +5040,13 @@ zpool_do_upgrade(int argc, char **argv)
ret = zpool_iter(g_zfs,
svn commit: r277758 - head/sys/cam/scsi
Author: mav
Date: Mon Jan 26 15:47:08 2015
New Revision: 277758
URL: https://svnweb.freebsd.org/changeset/base/277758
Log:
Fix several potential overflows in UNMAP code.
MFC after:1 week
Modified:
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/scsi/scsi_da.c
==
--- head/sys/cam/scsi/scsi_da.c Mon Jan 26 13:59:39 2015(r277757)
+++ head/sys/cam/scsi/scsi_da.c Mon Jan 26 15:47:08 2015(r277758)
@@ -1910,18 +1910,18 @@ dadeletemaxsize(struct da_softc *softc,
sectors = (off_t)ATA_DSM_RANGE_MAX * softc-trim_max_ranges;
break;
case DA_DELETE_WS16:
- sectors = (off_t)min(softc-ws_max_blks, WS16_MAX_BLKS);
+ sectors = omin(softc-ws_max_blks, WS16_MAX_BLKS);
break;
case DA_DELETE_ZERO:
case DA_DELETE_WS10:
- sectors = (off_t)min(softc-ws_max_blks, WS10_MAX_BLKS);
+ sectors = omin(softc-ws_max_blks, WS10_MAX_BLKS);
break;
default:
return 0;
}
return (off_t)softc-params.secsize *
- min(sectors, (off_t)softc-params.sectors);
+ omin(sectors, softc-params.sectors);
}
static void
@@ -2684,7 +2684,7 @@ da_delete_trim(struct cam_periph *periph
/* Try to extend the previous range. */
if (lba == lastlba) {
- c = min(count, ATA_DSM_RANGE_MAX - lastcount);
+ c = omin(count, ATA_DSM_RANGE_MAX - lastcount);
lastcount += c;
off = (ranges - 1) * 8;
buf[off + 6] = lastcount 0xff;
@@ -2694,7 +2694,7 @@ da_delete_trim(struct cam_periph *periph
}
while (count 0) {
- c = min(count, ATA_DSM_RANGE_MAX);
+ c = omin(count, ATA_DSM_RANGE_MAX);
off = ranges * 8;
buf[off + 0] = lba 0xff;
@@ -2770,7 +2770,7 @@ da_delete_ws(struct cam_periph *periph,
%s issuing short delete %ld %ld\n,
da_delete_method_desc[softc-delete_method],
count, ws_max_blks);
- count = min(count, ws_max_blks);
+ count = omin(count, ws_max_blks);
break;
}
bp1 = bioq_first(softc-delete_queue);
___
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: r277760 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: mav
Date: Mon Jan 26 16:29:07 2015
New Revision: 277760
URL: https://svnweb.freebsd.org/changeset/base/277760
Log:
MFC r277096: Skip extra bcopy() when scrubbing vdev without redundancy.
According to profiler, this bcopy() can use about 10% of CPU time.
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
Mon Jan 26 16:26:28 2015(r277759)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
Mon Jan 26 16:29:07 2015(r277760)
@@ -441,7 +441,8 @@ vdev_mirror_io_start(zio_t *zio)
mm = vdev_mirror_map_init(zio);
if (zio-io_type == ZIO_TYPE_READ) {
- if ((zio-io_flags ZIO_FLAG_SCRUB) !mm-mm_replacing) {
+ if ((zio-io_flags ZIO_FLAG_SCRUB) !mm-mm_replacing
+ mm-mm_children 1) {
/*
* For scrubbing reads we need to allocate a read
* buffer for each child and issue reads to all
___
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: r277761 - head/sys/dev/cxgbe/tom
Author: jhb
Date: Mon Jan 26 16:29:14 2015
New Revision: 277761
URL: https://svnweb.freebsd.org/changeset/base/277761
Log:
- Update a disabled KASSERT() to use sbused() instead of accessing
the no-longer existant sb_cc sockbuf member.
- Use sbavail() instead of sbused() in t4_soreceive_ddp() to match the
usage in soreceive_stream() on which it is based.
Discussed with: glebius (2)
Modified:
head/sys/dev/cxgbe/tom/t4_ddp.c
Modified: head/sys/dev/cxgbe/tom/t4_ddp.c
==
--- head/sys/dev/cxgbe/tom/t4_ddp.c Mon Jan 26 16:29:07 2015
(r277760)
+++ head/sys/dev/cxgbe/tom/t4_ddp.c Mon Jan 26 16:29:14 2015
(r277761)
@@ -852,9 +852,9 @@ handle_ddp(struct socket *so, struct uio
SOCKBUF_LOCK_ASSERT(sb);
#if 0
- if (sb-sb_cc + sc-tt.ddp_thres uio-uio_resid) {
+ if (sbused(sb) + sc-tt.ddp_thres uio-uio_resid) {
CTR4(KTR_CXGBE, %s: sb_cc %d, threshold %d, resid %d,
- __func__, sb-sb_cc, sc-tt.ddp_thres, uio-uio_resid);
+ __func__, sbused(sb), sc-tt.ddp_thres, uio-uio_resid);
}
#endif
@@ -1081,8 +1081,8 @@ restart:
/* uio should be just as it was at entry */
KASSERT(oresid == uio-uio_resid,
- (%s: oresid = %d, uio_resid = %zd, sbused = %d,
- __func__, oresid, uio-uio_resid, sbused(sb)));
+ (%s: oresid = %d, uio_resid = %zd, sbavail = %d,
+ __func__, oresid, uio-uio_resid, sbavail(sb)));
error = handle_ddp(so, uio, flags, 0);
ddp_handled = 1;
@@ -1092,7 +1092,7 @@ restart:
/* Abort if socket has reported problems. */
if (so-so_error) {
- if (sbused(sb))
+ if (sbavail(sb))
goto deliver;
if (oresid uio-uio_resid)
goto out;
@@ -1104,32 +1104,32 @@ restart:
/* Door is closed. Deliver what is left, if any. */
if (sb-sb_state SBS_CANTRCVMORE) {
- if (sbused(sb))
+ if (sbavail(sb))
goto deliver;
else
goto out;
}
/* Socket buffer is empty and we shall not block. */
- if (sbused(sb) == 0
+ if (sbavail(sb) == 0
((so-so_state SS_NBIO) || (flags (MSG_DONTWAIT|MSG_NBIO {
error = EAGAIN;
goto out;
}
/* Socket buffer got some data that we shall deliver now. */
- if (sbused(sb) !(flags MSG_WAITALL)
+ if (sbavail(sb) 0 !(flags MSG_WAITALL)
((so-so_state SS_NBIO) ||
(flags (MSG_DONTWAIT|MSG_NBIO)) ||
-sbused(sb) = sb-sb_lowat ||
-sbused(sb) = uio-uio_resid ||
-sbused(sb) = sb-sb_hiwat) ) {
+sbavail(sb) = sb-sb_lowat ||
+sbavail(sb) = uio-uio_resid ||
+sbavail(sb) = sb-sb_hiwat) ) {
goto deliver;
}
/* On MSG_WAITALL we must wait until all data or error arrives. */
if ((flags MSG_WAITALL)
- (sbused(sb) = uio-uio_resid || sbused(sb) = sb-sb_lowat))
+ (sbavail(sb) = uio-uio_resid || sbavail(sb) = sb-sb_lowat))
goto deliver;
/*
@@ -1148,7 +1148,7 @@ restart:
deliver:
SOCKBUF_LOCK_ASSERT(so-so_rcv);
- KASSERT(sbused(sb) 0, (%s: sockbuf empty, __func__));
+ KASSERT(sbavail(sb) 0, (%s: sockbuf empty, __func__));
KASSERT(sb-sb_mb != NULL, (%s: sb_mb == NULL, __func__));
if (sb-sb_flags SB_DDP_INDICATE !ddp_handled)
@@ -1159,7 +1159,7 @@ deliver:
uio-uio_td-td_ru.ru_msgrcv++;
/* Fill uio until full or current end of socket buffer is reached. */
- len = min(uio-uio_resid, sbused(sb));
+ len = min(uio-uio_resid, sbavail(sb));
if (mp0 != NULL) {
/* Dequeue as many mbufs as possible. */
if (!(flags MSG_PEEK) len = sb-sb_mb-m_len) {
___
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: r277763 - head/sys/dev/cxgbe/tom
Author: jhb
Date: Mon Jan 26 16:32:41 2015
New Revision: 277763
URL: https://svnweb.freebsd.org/changeset/base/277763
Log:
Lock the socket buffer before jumping to the 'out' label if sblock()
fails in t4_soreceive_ddp().
Modified:
head/sys/dev/cxgbe/tom/t4_ddp.c
Modified: head/sys/dev/cxgbe/tom/t4_ddp.c
==
--- head/sys/dev/cxgbe/tom/t4_ddp.c Mon Jan 26 16:30:17 2015
(r277762)
+++ head/sys/dev/cxgbe/tom/t4_ddp.c Mon Jan 26 16:32:41 2015
(r277763)
@@ -1057,9 +1057,9 @@ t4_soreceive_ddp(struct socket *so, stru
/* Prevent other readers from entering the socket. */
error = sblock(sb, SBLOCKWAIT(flags));
+ SOCKBUF_LOCK(sb);
if (error)
goto out;
- SOCKBUF_LOCK(sb);
/* Easy one, no space to copyout anything. */
if (uio-uio_resid == 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: r277710 - head/sys/dev/pci
On 1/26/15 9:19 AM, Alexey Dokuchaev wrote: On Sun, Jan 25, 2015 at 07:53:10PM +, John Baldwin wrote: New Revision: 277710 URL: https://svnweb.freebsd.org/changeset/base/277710 Log: Pass a valid Dx state variable to PCIB_POWER_FOR_SLEEP() in pcib_resume() instead of NULL. Can this be possibly related to this message I got trying to resume a laptop running recent -current [1]: ? pcib0: failed to set ACPI power state D2 on \134_SB_.PCI0: AE_BAD_PARAMETER ./danfe [1] http://lists.freebsd.org/pipermail/freebsd-wireless/2015-January/005365.html Well, the patch came up from debugging something along those lines, but it will not fix 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: r277759 - in head/sys: dev/cxgbe kern
Author: jhb
Date: Mon Jan 26 16:26:28 2015
New Revision: 277759
URL: https://svnweb.freebsd.org/changeset/base/277759
Log:
Fix a couple of panics when detaching from a cxgbe/cxl interface that was
never brought up:
- Allow NULL to be passed to sglist_free().
- Don't try to stop an interface that was never fully initialized.
Reviewed by: np
Modified:
head/sys/dev/cxgbe/t4_main.c
head/sys/kern/subr_sglist.c
Modified: head/sys/dev/cxgbe/t4_main.c
==
--- head/sys/dev/cxgbe/t4_main.cMon Jan 26 15:47:08 2015
(r277758)
+++ head/sys/dev/cxgbe/t4_main.cMon Jan 26 16:26:28 2015
(r277759)
@@ -3292,6 +3292,12 @@ cxgbe_uninit_synchronized(struct port_in
ASSERT_SYNCHRONIZED_OP(sc);
+ if (!(pi-flags PORT_INIT_DONE)) {
+ KASSERT(!(ifp-if_drv_flags IFF_DRV_RUNNING),
+ (uninited port is running));
+ return (0);
+ }
+
/*
* Disable the VI so that all its data in either direction is discarded
* by the MPS. Leave everything else (the queues, interrupts, and 1Hz
Modified: head/sys/kern/subr_sglist.c
==
--- head/sys/kern/subr_sglist.c Mon Jan 26 15:47:08 2015(r277758)
+++ head/sys/kern/subr_sglist.c Mon Jan 26 16:26:28 2015(r277759)
@@ -216,6 +216,9 @@ void
sglist_free(struct sglist *sg)
{
+ if (sg == NULL)
+ return;
+
if (refcount_release(sg-sg_refs))
free(sg, M_SGLIST);
}
___
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: r277762 - stable/10/sys/cam
Author: mav
Date: Mon Jan 26 16:30:17 2015
New Revision: 277762
URL: https://svnweb.freebsd.org/changeset/base/277762
Log:
MFC r277385: Remove extra mtx_unlock().
Submitted by: Dmitry Luhtionov dmitryluhtio...@gmail.com
Modified:
stable/10/sys/cam/cam_xpt.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/cam_xpt.c
==
--- stable/10/sys/cam/cam_xpt.c Mon Jan 26 16:29:14 2015(r277761)
+++ stable/10/sys/cam/cam_xpt.c Mon Jan 26 16:30:17 2015(r277762)
@@ -897,7 +897,6 @@ xpt_init(void *dummy)
if ((status = xpt_create_path(path, NULL, CAM_XPT_PATH_ID,
CAM_TARGET_WILDCARD,
CAM_LUN_WILDCARD)) != CAM_REQ_CMP) {
- mtx_unlock(xsoftc.xpt_lock);
printf(xpt_init: xpt_create_path failed with status %#x,
failing attach\n, status);
return (EINVAL);
___
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: r277768 - stable/10/sys/dev/acpica
Author: jkim
Date: Mon Jan 26 19:27:30 2015
New Revision: 277768
URL: https://svnweb.freebsd.org/changeset/base/277768
Log:
MFC: r277594
Simplify retry loops.
Modified:
stable/10/sys/dev/acpica/acpi_ec.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/acpica/acpi_ec.c
==
--- stable/10/sys/dev/acpica/acpi_ec.c Mon Jan 26 19:25:35 2015
(r277767)
+++ stable/10/sys/dev/acpica/acpi_ec.c Mon Jan 26 19:27:30 2015
(r277768)
@@ -648,10 +648,8 @@ EcGpeQueryHandler(void *Context)
Status = EcCommand(sc, EC_COMMAND_QUERY);
if (ACPI_SUCCESS(Status))
break;
- if (ACPI_SUCCESS(EcCheckStatus(sc, retr_check,
+ if (ACPI_FAILURE(EcCheckStatus(sc, retr_check,
EC_EVENT_INPUT_BUFFER_EMPTY)))
- continue;
- else
break;
}
sc-ec_sci_pend = FALSE;
@@ -966,15 +964,13 @@ EcRead(struct acpi_ec_softc *sc, UINT8 A
gen_count = sc-ec_gencount;
EC_SET_DATA(sc, Address);
status = EcWaitEvent(sc, EC_EVENT_OUTPUT_BUFFER_FULL, gen_count);
- if (ACPI_FAILURE(status)) {
- if (ACPI_SUCCESS(EcCheckStatus(sc, retr_check,
- EC_EVENT_INPUT_BUFFER_EMPTY)))
- continue;
- else
- break;
+ if (ACPI_SUCCESS(status)) {
+ *Data = EC_GET_DATA(sc);
+ return (AE_OK);
}
- *Data = EC_GET_DATA(sc);
- return (AE_OK);
+ if (ACPI_FAILURE(EcCheckStatus(sc, retr_check,
+ EC_EVENT_INPUT_BUFFER_EMPTY)))
+ break;
}
device_printf(sc-ec_dev, EcRead: failed waiting to get data\n);
return (status);
___
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: r277710 - head/sys/dev/pci
On Sun, Jan 25, 2015 at 07:53:10PM +, John Baldwin wrote: New Revision: 277710 URL: https://svnweb.freebsd.org/changeset/base/277710 Log: Pass a valid Dx state variable to PCIB_POWER_FOR_SLEEP() in pcib_resume() instead of NULL. Can this be possibly related to this message I got trying to resume a laptop running recent -current [1]: ? pcib0: failed to set ACPI power state D2 on \134_SB_.PCI0: AE_BAD_PARAMETER ./danfe [1] http://lists.freebsd.org/pipermail/freebsd-wireless/2015-January/005365.html ___ 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: r277767 - stable/10/sys/dev/acpica
Author: jkim
Date: Mon Jan 26 19:25:35 2015
New Revision: 277767
URL: https://svnweb.freebsd.org/changeset/base/277767
Log:
MFC: r277579
Revert r216942. This commit was premature and caused too many complaints.
Modified:
stable/10/sys/dev/acpica/acpi_ec.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/acpica/acpi_ec.c
==
--- stable/10/sys/dev/acpica/acpi_ec.c Mon Jan 26 19:01:06 2015
(r277766)
+++ stable/10/sys/dev/acpica/acpi_ec.c Mon Jan 26 19:25:35 2015
(r277767)
@@ -623,7 +623,7 @@ EcGpeQueryHandler(void *Context)
struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context;
UINT8 Data;
ACPI_STATUSStatus;
-intretry, sci_enqueued;
+intretry;
char qxx[5];
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
@@ -644,7 +644,6 @@ EcGpeQueryHandler(void *Context)
* that may arise from running the query from causing another query
* to be queued, we clear the pending flag only after running it.
*/
-sci_enqueued = sc-ec_sci_pend;
for (retry = 0; retry 2; retry++) {
Status = EcCommand(sc, EC_COMMAND_QUERY);
if (ACPI_SUCCESS(Status))
@@ -684,14 +683,6 @@ EcGpeQueryHandler(void *Context)
device_printf(sc-ec_dev, evaluation of query method %s failed: %s\n,
qxx, AcpiFormatException(Status));
}
-
-/* Reenable runtime GPE if its execution was deferred. */
-if (sci_enqueued) {
- Status = AcpiFinishGpe(sc-ec_gpehandle, sc-ec_gpebit);
- if (ACPI_FAILURE(Status))
- device_printf(sc-ec_dev, reenabling runtime GPE failed: %s\n,
- AcpiFormatException(Status));
-}
}
/*
@@ -725,10 +716,9 @@ EcGpeHandler(ACPI_HANDLE GpeDevice, UINT
if ((EcStatus EC_EVENT_SCI) !sc-ec_sci_pend) {
CTR0(KTR_ACPI, ec gpe queueing query handler);
Status = AcpiOsExecute(OSL_GPE_HANDLER, EcGpeQueryHandler, Context);
- if (ACPI_SUCCESS(Status)) {
+ if (ACPI_SUCCESS(Status))
sc-ec_sci_pend = TRUE;
- return (0);
- } else
+ else
printf(EcGpeHandler: queuing GPE query handler failed\n);
}
return (ACPI_REENABLE_GPE);
___
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: r277770 - stable/9/sys/dev/acpica
Author: jkim
Date: Mon Jan 26 19:33:35 2015
New Revision: 20
URL: https://svnweb.freebsd.org/changeset/base/20
Log:
MFC: r277579
Revert r216942. This commit was premature and caused too many complaints.
Modified:
stable/9/sys/dev/acpica/acpi_ec.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/acpica/acpi_ec.c
==
--- stable/9/sys/dev/acpica/acpi_ec.c Mon Jan 26 19:31:14 2015
(r277769)
+++ stable/9/sys/dev/acpica/acpi_ec.c Mon Jan 26 19:33:35 2015
(r20)
@@ -623,7 +623,7 @@ EcGpeQueryHandler(void *Context)
struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context;
UINT8 Data;
ACPI_STATUSStatus;
-intretry, sci_enqueued;
+intretry;
char qxx[5];
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
@@ -644,7 +644,6 @@ EcGpeQueryHandler(void *Context)
* that may arise from running the query from causing another query
* to be queued, we clear the pending flag only after running it.
*/
-sci_enqueued = sc-ec_sci_pend;
for (retry = 0; retry 2; retry++) {
Status = EcCommand(sc, EC_COMMAND_QUERY);
if (ACPI_SUCCESS(Status))
@@ -684,14 +683,6 @@ EcGpeQueryHandler(void *Context)
device_printf(sc-ec_dev, evaluation of query method %s failed: %s\n,
qxx, AcpiFormatException(Status));
}
-
-/* Reenable runtime GPE if its execution was deferred. */
-if (sci_enqueued) {
- Status = AcpiFinishGpe(sc-ec_gpehandle, sc-ec_gpebit);
- if (ACPI_FAILURE(Status))
- device_printf(sc-ec_dev, reenabling runtime GPE failed: %s\n,
- AcpiFormatException(Status));
-}
}
/*
@@ -725,10 +716,9 @@ EcGpeHandler(ACPI_HANDLE GpeDevice, UINT
if ((EcStatus EC_EVENT_SCI) !sc-ec_sci_pend) {
CTR0(KTR_ACPI, ec gpe queueing query handler);
Status = AcpiOsExecute(OSL_GPE_HANDLER, EcGpeQueryHandler, Context);
- if (ACPI_SUCCESS(Status)) {
+ if (ACPI_SUCCESS(Status))
sc-ec_sci_pend = TRUE;
- return (0);
- } else
+ else
printf(EcGpeHandler: queuing GPE query handler failed\n);
}
return (ACPI_REENABLE_GPE);
___
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: r277769 - head/sys/modules/iscsi
Author: trasz
Date: Mon Jan 26 19:31:14 2015
New Revision: 277769
URL: https://svnweb.freebsd.org/changeset/base/277769
Log:
Remove cruft; ICL_RDMA was never actually working, and will be redone
in a completely different manner.
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/modules/iscsi/Makefile
Modified: head/sys/modules/iscsi/Makefile
==
--- head/sys/modules/iscsi/Makefile Mon Jan 26 19:27:30 2015
(r277768)
+++ head/sys/modules/iscsi/Makefile Mon Jan 26 19:31:14 2015
(r277769)
@@ -4,22 +4,12 @@
KMOD= iscsi
SRCS= iscsi.c
-.if defined(ICL_RDMA)
-SRCS+= icl_rdma.c
-.else
SRCS+= icl.c
-.endif
SRCS+= icl_proxy.c
SRCS+= opt_cam.h
SRCS+= bus_if.h
SRCS+= device_if.h
-# Those below are required for RDMA.
-SRCS+= vnode_if.h
-SRCS+= opt_inet.h
-SRCS+= opt_inet6.h
-
-CFLAGS+= -I${.CURDIR}/../../ofed/include
#CFLAGS+=-DICL_KERNEL_PROXY
.include bsd.kmod.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r277694 - head/sys/amd64/conf
Don't have a strong opinion on this because I'm not in the know lately, but was wondering: 1) if we wanted to keep NE1000/2000 support for FreeBSD in emulators? Probably not I assume? 2) Does Linux nuke these devices? why/why-not? On Jan 25, 2015, at 9:58 AM, Warner Losh wrote: On Jan 25, 2015, at 7:54 AM, Garrett Cooper yaneurab...@gmail.com wrote: On Jan 25, 2015, at 04:43, Sergey Kandaurov pluk...@freebsd.org wrote: On 25 January 2015 at 15:02, Dag-Erling Smørgrav d...@freebsd.org wrote: Author: des Date: Sun Jan 25 12:02:38 2015 New Revision: 277694 URL: https://svnweb.freebsd.org/changeset/base/277694 Log: Remove ISA NICs. Anyone still using these on amd64 can build their own kernel. Modified: head/sys/amd64/conf/GENERIC If so, what about i386? (I'd rather not pc98) What about device isa in DEFAULTS? isa is still needed in some scenarios. I just don't remember the full details offhand (something about internal buses iirc... And IPMI for starters...) isa” in this context should be read as “mainbus” not as “ISA slots”. You can’t remove it without some significant work, and even then the interface changes to long established interfaces isn’t worth the pain. Warner ___ 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: r277694 - head/sys/amd64/conf
Never mind, apologies, thought this was i386+amd64. I'm going to guess anything emulating amd64 has pci NICs in it. :) On Jan 26, 2015, at 9:21 AM, Alfred Perlstein wrote: Don't have a strong opinion on this because I'm not in the know lately, but was wondering: 1) if we wanted to keep NE1000/2000 support for FreeBSD in emulators? Probably not I assume? 2) Does Linux nuke these devices? why/why-not? On Jan 25, 2015, at 9:58 AM, Warner Losh wrote: On Jan 25, 2015, at 7:54 AM, Garrett Cooper yaneurab...@gmail.com wrote: On Jan 25, 2015, at 04:43, Sergey Kandaurov pluk...@freebsd.org wrote: On 25 January 2015 at 15:02, Dag-Erling Smørgrav d...@freebsd.org wrote: Author: des Date: Sun Jan 25 12:02:38 2015 New Revision: 277694 URL: https://svnweb.freebsd.org/changeset/base/277694 Log: Remove ISA NICs. Anyone still using these on amd64 can build their own kernel. Modified: head/sys/amd64/conf/GENERIC If so, what about i386? (I'd rather not pc98) What about device isa in DEFAULTS? isa is still needed in some scenarios. I just don't remember the full details offhand (something about internal buses iirc... And IPMI for starters...) isa” in this context should be read as “mainbus” not as “ISA slots”. You can’t remove it without some significant work, and even then the interface changes to long established interfaces isn’t worth the pain. Warner ___ 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: r277764 - in head/usr.sbin/pw: . tests
Author: bapt
Date: Mon Jan 26 16:50:42 2015
New Revision: 277764
URL: https://svnweb.freebsd.org/changeset/base/277764
Log:
Revert r277652
uid and gid are never and should never be negative. The pw(8) manpage clearly
states the -u and -g arguments are for uids/gids, hence using negative values
is
abusing a bug in former versions of pw(8)
Deleted:
head/usr.sbin/pw/tests/pw_groupshow.sh
head/usr.sbin/pw/tests/pw_usershow.sh
Modified:
head/usr.sbin/pw/pw_group.c
head/usr.sbin/pw/pw_user.c
head/usr.sbin/pw/tests/Makefile
Modified: head/usr.sbin/pw/pw_group.c
==
--- head/usr.sbin/pw/pw_group.c Mon Jan 26 16:32:41 2015(r277763)
+++ head/usr.sbin/pw/pw_group.c Mon Jan 26 16:50:42 2015(r277764)
@@ -68,11 +68,7 @@ pw_group(struct userconf * cnf, int mode
};
if (a_gid != NULL) {
- const char *teststr;
- teststr = a_gid-val;
- if (*teststr == '-')
- teststr++;
- if (strspn(teststr, 0123456789) != strlen(teststr))
+ if (strspn(a_gid-val, 0123456789) != strlen(a_gid-val))
errx(EX_USAGE, -g expects a number);
}
Modified: head/usr.sbin/pw/pw_user.c
==
--- head/usr.sbin/pw/pw_user.c Mon Jan 26 16:32:41 2015(r277763)
+++ head/usr.sbin/pw/pw_user.c Mon Jan 26 16:50:42 2015(r277764)
@@ -322,10 +322,7 @@ pw_user(struct userconf * cnf, int mode,
a_name = NULL;
}
} else {
- const char *teststr = a_uid-val;
- if (*teststr == '-')
- teststr++;
- if (strspn(teststr, 0123456789) != strlen(teststr))
+ if (strspn(a_uid-val, 0123456789) != strlen(a_uid-val))
errx(EX_USAGE, -u expects a number);
}
Modified: head/usr.sbin/pw/tests/Makefile
==
--- head/usr.sbin/pw/tests/Makefile Mon Jan 26 16:32:41 2015
(r277763)
+++ head/usr.sbin/pw/tests/Makefile Mon Jan 26 16:50:42 2015
(r277764)
@@ -9,11 +9,9 @@ ATF_TESTS_SH= pw_etcdir \
pw_lock \
pw_groupdel \
pw_groupmod \
- pw_groupshow \
pw_useradd \
pw_userdel \
- pw_usermod \
- pw_usershow
+ pw_usermod
.for tp in ${ATF_TESTS_SH}
TEST_METADATA.${tp}+= required_user=root
___
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: r277775 - in head/contrib/llvm/tools/clang: include/clang/Driver lib/Driver
Author: dim
Date: Mon Jan 26 21:19:24 2015
New Revision: 25
URL: https://svnweb.freebsd.org/changeset/base/25
Log:
Pull in r227062 from upstream clang trunk (by Renato Golin):
Allows Clang to use LLVM's fixes-x18 option
This patch allows clang to have llvm reserve the x18
platform register on AArch64. FreeBSD will use this in the kernel for
per-cpu data but has no need to reserve this register in userland so
will need this flag to reserve it.
This uses llvm r226664 to allow this register to be reserved.
Patch by Andrew Turner.
Requested by: andrew
Modified:
head/contrib/llvm/tools/clang/include/clang/Driver/Options.td
head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
Modified: head/contrib/llvm/tools/clang/include/clang/Driver/Options.td
==
--- head/contrib/llvm/tools/clang/include/clang/Driver/Options.td Mon Jan
26 21:17:14 2015(r24)
+++ head/contrib/llvm/tools/clang/include/clang/Driver/Options.td Mon Jan
26 21:19:24 2015(r25)
@@ -1141,6 +1141,9 @@ def mno_long_calls : Flag[-], mno-lo
def mgeneral_regs_only : Flag[-], mgeneral-regs-only,
Groupm_aarch64_Features_Group,
HelpTextGenerate code which only uses the general purpose registers
(AArch64 only);
+def ffixed_x18 : Flag[-], ffixed-x18, Groupm_aarch64_Features_Group,
+ HelpTextReserve the x18 register (AArch64 only);
+
def mvsx : Flag[-], mvsx, Groupm_ppc_Features_Group;
def mno_vsx : Flag[-], mno-vsx, Groupm_ppc_Features_Group;
def mfprnd : Flag[-], mfprnd, Groupm_ppc_Features_Group;
Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==
--- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Mon Jan 26 21:17:14
2015(r24)
+++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Mon Jan 26 21:19:24
2015(r25)
@@ -887,6 +887,11 @@ void Clang::AddAArch64TargetArgs(const A
if (A-getOption().matches(options::OPT_mno_global_merge))
CmdArgs.push_back(-mno-global-merge);
}
+
+ if (Args.hasArg(options::OPT_ffixed_x18)) {
+CmdArgs.push_back(-backend-option);
+CmdArgs.push_back(-aarch64-reserve-x18);
+ }
}
// Get CPU and ABI names. They are not independent
___
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: r277714 - head/sbin/ipfw
� � 26.01.2015, 23:35, Olivier Cochard-Labbé oliv...@cochard.me: On Sun, Jan 25, 2015 at 9:37 PM, John Baldwin [1]j...@freebsd.org wrote: Author: jhb Date: Sun Jan 25 20:37:32 2015 New Revision: 277714 URL: [2]https://svnweb.freebsd.org/changeset/base/277714 Log: � natd(8) will work with an unconfigured interface and effectively not do � anything until the interface is assigned an address.� This fixes � ipfw_nat to do the same by using an IP of INADDR_ANY instead of � aborting the nat setup if the requested interface is not yet configured. � Hi, I've still a problem with ipfw_nat and unconfigured interface: On my setup I'm using ipfw with NAT rules using an OpenVPN tunnel interface as source address for NATting. During the machine startup, ipfw is started before openvpn (hopefully) and its configuration mention do to NAT using tun0 IP address. Then OpenVPN start and create a tun0 and set an IP address on it. = But no unicast traffic is allowed on this tun0 interface until I restart ipfw. If I correctly understand the log of this commit: This behavior should be fixed by this commit, right ? As far as I understand, nat instance is created with an unresolved ip (0.0.0.0 propagated to libalias) and tun0 interface name. After tun0 creation and address assignment, kernel ipfw_nat ifaddr hook should take action and update libalias address to primary? IPv4 interface address. � References 1. mailto:j...@freebsd.org 2. https://svnweb.freebsd.org/changeset/base/277714 ___ 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: r277774 - head/contrib/llvm/lib/Target/AArch64
Author: dim
Date: Mon Jan 26 21:17:14 2015
New Revision: 24
URL: https://svnweb.freebsd.org/changeset/base/24
Log:
Pull in r226664 from upstream llvm trunk (by Tim Northover):
AArch64: add backend option to reserve x18 (platform register)
AAPCS64 says that it's up to the platform to specify whether x18 is
reserved, and a first step on that way is to add a flag controlling
it.
From: Andrew Turner and...@fubar.geek.nz
Requested by: andrew
Modified:
head/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
Modified: head/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
==
--- head/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.cppMon Jan
26 19:42:39 2015(r23)
+++ head/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.cppMon Jan
26 21:17:14 2015(r24)
@@ -33,6 +33,10 @@ using namespace llvm;
#define GET_REGINFO_TARGET_DESC
#include AArch64GenRegisterInfo.inc
+static cl::optbool
+ReserveX18(aarch64-reserve-x18, cl::Hidden,
+ cl::desc(Reserve X18, making it unavailable as GPR));
+
AArch64RegisterInfo::AArch64RegisterInfo(const AArch64InstrInfo *tii,
const AArch64Subtarget *sti)
: AArch64GenRegisterInfo(AArch64::LR), TII(tii), STI(sti) {}
@@ -90,7 +94,7 @@ AArch64RegisterInfo::getReservedRegs(con
Reserved.set(AArch64::W29);
}
- if (STI-isTargetDarwin()) {
+ if (STI-isTargetDarwin() || ReserveX18) {
Reserved.set(AArch64::X18); // Platform register
Reserved.set(AArch64::W18);
}
@@ -117,7 +121,7 @@ bool AArch64RegisterInfo::isReservedReg(
return true;
case AArch64::X18:
case AArch64::W18:
-return STI-isTargetDarwin();
+return STI-isTargetDarwin() || ReserveX18;
case AArch64::FP:
case AArch64::W29:
return TFI-hasFP(MF) || STI-isTargetDarwin();
@@ -379,7 +383,7 @@ unsigned AArch64RegisterInfo::getRegPres
case AArch64::GPR64commonRegClassID:
return 32 - 1 // XZR/SP
- (TFI-hasFP(MF) || STI-isTargetDarwin()) // FP
- - STI-isTargetDarwin() // X18 reserved as platform register
+ - (STI-isTargetDarwin() || ReserveX18) // X18 reserved as platform
register
- hasBasePointer(MF); // X19
case AArch64::FPR8RegClassID:
case AArch64::FPR16RegClassID:
___
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: r277776 - head/contrib/llvm/patches
Author: dim
Date: Mon Jan 26 21:24:04 2015
New Revision: 26
URL: https://svnweb.freebsd.org/changeset/base/26
Log:
Add llvm and clang patches corresponding to r24 and r25.
Added:
head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff
head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff
Added: head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diffMon Jan
26 21:24:04 2015(r26)
@@ -0,0 +1,83 @@
+Pull in r226664 from upstream llvm trunk (by Tim Northover):
+
+ AArch64: add backend option to reserve x18 (platform register)
+
+ AAPCS64 says that it's up to the platform to specify whether x18 is
+ reserved, and a first step on that way is to add a flag controlling
+ it.
+
+ From: Andrew Turner and...@fubar.geek.nz
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/24
+
+Index: lib/Target/AArch64/AArch64RegisterInfo.cpp
+===
+--- lib/Target/AArch64/AArch64RegisterInfo.cpp
lib/Target/AArch64/AArch64RegisterInfo.cpp
+@@ -33,6 +33,10 @@ using namespace llvm;
+ #define GET_REGINFO_TARGET_DESC
+ #include AArch64GenRegisterInfo.inc
+
++static cl::optbool
++ReserveX18(aarch64-reserve-x18, cl::Hidden,
++ cl::desc(Reserve X18, making it unavailable as GPR));
++
+ AArch64RegisterInfo::AArch64RegisterInfo(const AArch64InstrInfo *tii,
+ const AArch64Subtarget *sti)
+ : AArch64GenRegisterInfo(AArch64::LR), TII(tii), STI(sti) {}
+@@ -90,7 +94,7 @@ AArch64RegisterInfo::getReservedRegs(const Machine
+ Reserved.set(AArch64::W29);
+ }
+
+- if (STI-isTargetDarwin()) {
++ if (STI-isTargetDarwin() || ReserveX18) {
+ Reserved.set(AArch64::X18); // Platform register
+ Reserved.set(AArch64::W18);
+ }
+@@ -117,7 +121,7 @@ bool AArch64RegisterInfo::isReservedReg(const Mach
+ return true;
+ case AArch64::X18:
+ case AArch64::W18:
+-return STI-isTargetDarwin();
++return STI-isTargetDarwin() || ReserveX18;
+ case AArch64::FP:
+ case AArch64::W29:
+ return TFI-hasFP(MF) || STI-isTargetDarwin();
+@@ -379,7 +383,7 @@ unsigned AArch64RegisterInfo::getRegPressureLimit(
+ case AArch64::GPR64commonRegClassID:
+ return 32 - 1 // XZR/SP
+- (TFI-hasFP(MF) || STI-isTargetDarwin()) // FP
+- - STI-isTargetDarwin() // X18 reserved as platform register
++ - (STI-isTargetDarwin() || ReserveX18) // X18 reserved as
platform register
+- hasBasePointer(MF); // X19
+ case AArch64::FPR8RegClassID:
+ case AArch64::FPR16RegClassID:
+Index: test/CodeGen/AArch64/arm64-platform-reg.ll
+===
+--- test/CodeGen/AArch64/arm64-platform-reg.ll
test/CodeGen/AArch64/arm64-platform-reg.ll
+@@ -1,4 +1,5 @@
+-; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s
--check-prefix=CHECK-DARWIN
++; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s
--check-prefix=CHECK-RESERVE-X18
++; RUN: llc -mtriple=arm64-freebsd-gnu -aarch64-reserve-x18 -o - %s |
FileCheck %s --check-prefix=CHECK-RESERVE-X18
+ ; RUN: llc -mtriple=arm64-linux-gnu -o - %s | FileCheck %s
+
+ ; x18 is reserved as a platform register on Darwin but not on other
+@@ -16,11 +17,11 @@ define void @keep_live() {
+ ; CHECK: ldr x18
+ ; CHECK: str x18
+
+-; CHECK-DARWIN-NOT: ldr fp
+-; CHECK-DARWIN-NOT: ldr x18
+-; CHECK-DARWIN: Spill
+-; CHECK-DARWIN-NOT: ldr fp
+-; CHECK-DARWIN-NOT: ldr x18
+-; CHECK-DARWIN: ret
++; CHECK-RESERVE-X18-NOT: ldr fp
++; CHECK-RESERVE-X18-NOT: ldr x18
++; CHECK-RESERVE-X18: Spill
++; CHECK-RESERVE-X18-NOT: ldr fp
++; CHECK-RESERVE-X18-NOT: ldr x18
++; CHECK-RESERVE-X18: ret
+ ret void
+ }
Added: head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff Mon Jan
26 21:24:04 2015(r26)
@@ -0,0 +1,54 @@
+Pull in r227062 from upstream clang trunk (by Renato Golin):
+
+ Allows Clang to use LLVM's fixes-x18 option
+
+ This patch allows clang to have llvm reserve the x18
+ platform register on AArch64. FreeBSD will use this in the kernel for
+ per-cpu data but has no need to reserve this register in userland so
+ will need this flag to reserve it.
+
+ This uses llvm r226664 to allow this register to be reserved.
+
+ Patch by Andrew Turner.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/25
+
+Index: tools/clang/include/clang/Driver/Options.td
Re: svn commit: r277652 - in head/usr.sbin/pw: . tests
On Jan 25, 2015, at 7:31 AM, Bruce Evans b...@optusnet.com.au wrote: On Sun, 25 Jan 2015, Slawa Olhovchenkov wrote: On Sun, Jan 25, 2015 at 04:56:24PM +1100, Bruce Evans wrote: Negative ids have historical abuses in places like mountd. Which paves the way for the “accepted practice” argument and backed up by “in-the-field usage” statement(s). mountd still hard-codes -2 and -2 for the default uid and gid of an unprivileged user. It at least casts these values to uid_t and gid_t before using them. This gives the ids the non-random values of UINT32_MAX-1 if uid_t and gid_t are uint32_t. (If uid_t and gid_t were signed, then it would leave the values as negative, so invalid.) These magic values may work better than when ids were 16 bits, since there is less risk of them conflicting with a normal id. However, the non-conflict is probably a bug. FreeBSD uses the magic ids of 65534 for user nobody: group nobody. These would have been (id_t)-2 with 16-bit ids. They no longer match, so ls displays (id_t)-2 numerically. FreeBSD also has a group nogroup = 65553 that doesn't match the nfs usage. However2, in FreeBSD-1 wher ids were 16-bits, nobody was 32767 and nogroup was 32766. so they didn't match nfs for other reasons. The 2 non-groups now seem to be just a bug -- FreeBSD-1 didn't have group nobody. 4.4BSD-Lite2 has the same values as FreeBSD-1. This is not full true for ZFS case. On ZFS nobody is 2^32-2. File systems don't get to decide this. +1 (and thanks for the historical account, bruce — sincerely) However, I still want to make the argument that: a. Because we’ve supported mapping negative inputs to unsigned values in pw *for over a decade*, that… b. We should either revert or make a relnotes submission to note that we’re changing the long-standing accepted practice. Changing the accepted practice broke code internally, it would have likely broken some external code as well — and people deserve to know about said change else we should continue to support accepted practice that is decade(s) old. — Devin ___ 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: r277714 - head/sbin/ipfw
On Monday, January 26, 2015 09:34:39 PM Olivier Cochard-Labbé wrote: On Sun, Jan 25, 2015 at 9:37 PM, John Baldwin j...@freebsd.org wrote: Author: jhb Date: Sun Jan 25 20:37:32 2015 New Revision: 277714 URL: https://svnweb.freebsd.org/changeset/base/277714 Log: natd(8) will work with an unconfigured interface and effectively not do anything until the interface is assigned an address. This fixes ipfw_nat to do the same by using an IP of INADDR_ANY instead of aborting the nat setup if the requested interface is not yet configured. Hi, I've still a problem with ipfw_nat and unconfigured interface: On my setup I'm using ipfw with NAT rules using an OpenVPN tunnel interface as source address for NATting. During the machine startup, ipfw is started before openvpn (hopefully) and its configuration mention do to NAT using tun0 IP address. Then OpenVPN start and create a tun0 and set an IP address on it. = But no unicast traffic is allowed on this tun0 interface until I restart ipfw. If I correctly understand the log of this commit: This behavior should be fixed by this commit, right ? It might. What happened for me is that I was using nat over wlan0 for VM's on my laptop to reach the outside world, but wlan0 doesn't get an IP until later in the boot after it associates. As a result, wlan0 wasn't passing any IP traffic until this fix (or if I reloaded ipfw after wlan0 was configured). -- 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
Re: svn commit: r277714 - head/sbin/ipfw
On 26 Jan 2015, at 22:24, John Baldwin j...@freebsd.org wrote: On Monday, January 26, 2015 09:34:39 PM Olivier Cochard-Labbé wrote: On Sun, Jan 25, 2015 at 9:37 PM, John Baldwin j...@freebsd.org wrote: Author: jhb Date: Sun Jan 25 20:37:32 2015 New Revision: 277714 URL: https://svnweb.freebsd.org/changeset/base/277714 Log: natd(8) will work with an unconfigured interface and effectively not do anything until the interface is assigned an address. This fixes ipfw_nat to do the same by using an IP of INADDR_ANY instead of aborting the nat setup if the requested interface is not yet configured. Hi, I've still a problem with ipfw_nat and unconfigured interface: On my setup I'm using ipfw with NAT rules using an OpenVPN tunnel interface as source address for NATting. During the machine startup, ipfw is started before openvpn (hopefully) and its configuration mention do to NAT using tun0 IP address. Then OpenVPN start and create a tun0 and set an IP address on it. = But no unicast traffic is allowed on this tun0 interface until I restart ipfw. If I correctly understand the log of this commit: This behavior should be fixed by this commit, right ? It might. What happened for me is that I was using nat over wlan0 for VM's on my laptop to reach the outside world, but wlan0 doesn't get an IP until later in the boot after it associates. As a result, wlan0 wasn't passing any IP traffic until this fix (or if I reloaded ipfw after wlan0 was configured). I don’t think it does. The interface is not available until openvpn is started.You need to clone the interface during boot by adding cloned_interfaces=‘tun0’ in your /etc/rc.conf. Initialisation is then done later by openvpn. Let me know if that works for you. Nick ___ 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: r277787 - in head: contrib/sendmail/cf/m4 etc/sendmail
Author: gshapiro
Date: Tue Jan 27 04:06:47 2015
New Revision: 277787
URL: https://svnweb.freebsd.org/changeset/base/277787
Log:
Remove build specific details from sendmail.cf/submit.cf in support of
https://wiki.freebsd.org/ReproducibleBuilds
The contrib/sendmail change will be made in the upstream source for a
future sendmail release.
Reviewed by: des
MFC after:3 days
Modified:
head/contrib/sendmail/cf/m4/cfhead.m4
head/etc/sendmail/Makefile
Modified: head/contrib/sendmail/cf/m4/cfhead.m4
==
--- head/contrib/sendmail/cf/m4/cfhead.m4 Tue Jan 27 03:37:58 2015
(r277786)
+++ head/contrib/sendmail/cf/m4/cfhead.m4 Tue Jan 27 04:06:47 2015
(r277787)
@@ -20,7 +20,7 @@
ifdef(`__win32__', `dnl', `dnl
ifdef(`TEMPFILE', `dnl', `define(`TEMPFILE', maketemp(/tmp/cfXX))dnl
syscmd(sh _CF_DIR_`'sh/makeinfo.sh _CF_DIR_ TEMPFILE)dnl
-include(TEMPFILE)dnl
+ifdef(`_NO_MAKEINFO_',, `include(TEMPFILE)')dnl
syscmd(rm -f TEMPFILE)dnl')')
#
##
Modified: head/etc/sendmail/Makefile
==
--- head/etc/sendmail/Makefile Tue Jan 27 03:37:58 2015(r277786)
+++ head/etc/sendmail/Makefile Tue Jan 27 04:06:47 2015(r277787)
@@ -17,7 +17,8 @@ M4FILES!= find ${SENDMAIL_CF_DIR} -type
.mc.cf: ${M4FILES}
${RM} ${.TARGET}
- ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
+ ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ -D_NO_MAKEINFO_ \
+ ${SENDMAIL_M4_FLAGS} \
${SENDMAIL_CF_DIR}/m4/cf.m4 ${.IMPSRC} ${.TARGET}
${CHMOD} ${ROMODE} ${.TARGET}
___
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: r277788 - head/sys/dev/virtio/block
On Tue, Jan 27, 2015 at 05:34:47AM +, Bryan Venteicher wrote: Author: bryanv Date: Tue Jan 27 05:34:46 2015 New Revision: 277788 URL: https://svnweb.freebsd.org/changeset/base/277788 Log: Rework vtblk dump handling of in flight requests Previously, the driver resets the device and abandon the requests that are caught in flight when the dump was initiated. This was problematic if the system is resumed after the dump is completed. While that is probably not the typical action, it is simple to rework the driver to very likely have the device usable after the dump without making it more likely for the dump to fail. The in flight requests are simply queued for completion once the dump is finished. Requested by: markj MFC after: 1 month 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: r277789 - in stable/10/sys: netinet netinet6
Author: bryanv
Date: Tue Jan 27 06:19:30 2015
New Revision: 277789
URL: https://svnweb.freebsd.org/changeset/base/277789
Log:
MFC r272886:
Add context pointer and source address to the UDP tunnel callback
These are needed for the forthcoming vxlan implementation. The context
pointer means we do not have to use a spare pointer field in the inpcb,
and the source address is required to populate vxlan's forwarding table.
Modified:
stable/10/sys/netinet/sctputil.c
stable/10/sys/netinet/udp_usrreq.c
stable/10/sys/netinet/udp_var.h
stable/10/sys/netinet6/udp6_usrreq.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctputil.c
==
--- stable/10/sys/netinet/sctputil.cTue Jan 27 05:34:46 2015
(r277788)
+++ stable/10/sys/netinet/sctputil.cTue Jan 27 06:19:30 2015
(r277789)
@@ -6832,7 +6832,8 @@ sctp_log_trace(uint32_t subsys, const ch
#endif
static void
-sctp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *ignored)
+sctp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *ignored,
+const struct sockaddr *sa SCTP_UNUSED, void *ctx SCTP_UNUSED)
{
struct ip *iph;
@@ -6968,7 +6969,7 @@ sctp_over_udp_start(void)
}
/* Call the special UDP hook. */
if ((ret = udp_set_kernel_tunneling(SCTP_BASE_INFO(udp4_tun_socket),
- sctp_recv_udp_tunneled_packet))) {
+ sctp_recv_udp_tunneled_packet, NULL))) {
sctp_over_udp_stop();
return (ret);
}
@@ -6992,7 +6993,7 @@ sctp_over_udp_start(void)
}
/* Call the special UDP hook. */
if ((ret = udp_set_kernel_tunneling(SCTP_BASE_INFO(udp6_tun_socket),
- sctp_recv_udp_tunneled_packet))) {
+ sctp_recv_udp_tunneled_packet, NULL))) {
sctp_over_udp_stop();
return (ret);
}
Modified: stable/10/sys/netinet/udp_usrreq.c
==
--- stable/10/sys/netinet/udp_usrreq.c Tue Jan 27 05:34:46 2015
(r277788)
+++ stable/10/sys/netinet/udp_usrreq.c Tue Jan 27 06:19:30 2015
(r277789)
@@ -303,7 +303,8 @@ udp_append(struct inpcb *inp, struct ip
*/
up = intoudpcb(inp);
if (up-u_tun_func != NULL) {
- (*up-u_tun_func)(n, off, inp);
+ (*up-u_tun_func)(n, off, inp, (struct sockaddr *)udp_in,
+ up-u_tun_ctx);
return;
}
@@ -1624,7 +1625,7 @@ udp_attach(struct socket *so, int proto,
#endif /* INET */
int
-udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f)
+udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f, void *ctx)
{
struct inpcb *inp;
struct udpcb *up;
@@ -1640,6 +1641,7 @@ udp_set_kernel_tunneling(struct socket *
return (EBUSY);
}
up-u_tun_func = f;
+ up-u_tun_ctx = ctx;
INP_WUNLOCK(inp);
return (0);
}
Modified: stable/10/sys/netinet/udp_var.h
==
--- stable/10/sys/netinet/udp_var.h Tue Jan 27 05:34:46 2015
(r277788)
+++ stable/10/sys/netinet/udp_var.h Tue Jan 27 06:19:30 2015
(r277789)
@@ -55,7 +55,8 @@ struct udpiphdr {
struct inpcb;
struct mbuf;
-typedef void(*udp_tun_func_t)(struct mbuf *, int off, struct inpcb *);
+typedef void(*udp_tun_func_t)(struct mbuf *, int off, struct inpcb *,
+ const struct sockaddr *, void *);
/*
* UDP control block; one per udp.
@@ -65,6 +66,7 @@ struct udpcb {
u_int u_flags;/* Generic UDP flags. */
uint16_tu_rxcslen; /* Coverage for incoming datagrams. */
uint16_tu_txcslen; /* Coverage for outgoing datagrams. */
+ void*u_tun_ctx; /* Tunneling callback context. */
};
#defineintoudpcb(ip) ((struct udpcb *)(ip)-inp_ppcb)
@@ -176,7 +178,8 @@ voidudplite_input(struct mbuf *, int);
struct inpcb *udp_notify(struct inpcb *inp, int errno);
intudp_shutdown(struct socket *so);
-intudp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f);
+intudp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f,
+void *ctx);
#endif /* _KERNEL */
Modified: stable/10/sys/netinet6/udp6_usrreq.c
==
--- stable/10/sys/netinet6/udp6_usrreq.cTue Jan 27 05:34:46 2015
(r277788)
+++ stable/10/sys/netinet6/udp6_usrreq.cTue Jan 27 06:19:30 2015
(r277789)
@@ -148,7 +148,8 @@ udp6_append(struct inpcb *inp, struct mb
*/
up = intoudpcb(inp);
if (up-u_tun_func != NULL) {
-
svn commit: r277782 - vendor/tcpdump/dist
Author: pfg
Date: Tue Jan 27 01:39:42 2015
New Revision: 277782
URL: https://svnweb.freebsd.org/changeset/base/277782
Log:
Merge some cherry-picked fixes originating in OpenBSD
Check whether the version field is available before looking at it.
While we're at it, use ND_TCHECK(), rather than a hand-rolled check, to
check whether we have the full fixed-length portion of the IPv4 header.
commit c67afe913011138a2504ec4d3d423b48e73b12f3
Do more length checking. From OpenBSD.
commit d7516761f9c4877bcb05bb6543be3543e165249
Modified:
vendor/tcpdump/dist/print-ip.c
vendor/tcpdump/dist/print-sl.c
Modified: vendor/tcpdump/dist/print-ip.c
==
--- vendor/tcpdump/dist/print-ip.c Mon Jan 26 23:45:10 2015
(r277781)
+++ vendor/tcpdump/dist/print-ip.c Tue Jan 27 01:39:42 2015
(r277782)
@@ -529,6 +529,7 @@ ip_print(netdissect_options *ndo,
struct protoent *proto;
ipds-ip = (const struct ip *)bp;
+ ND_TCHECK(ipds-ip-ip_vhl);
if (IP_V(ipds-ip) != 4) { /* print version if != 4 */
ND_PRINT((ndo, IP%u , IP_V(ipds-ip)));
if (IP_V(ipds-ip) == 6)
@@ -537,10 +538,7 @@ ip_print(netdissect_options *ndo,
else if (!ndo-ndo_eflag)
ND_PRINT((ndo, IP ));
- if ((u_char *)(ipds-ip + 1) ndo-ndo_snapend) {
- ND_PRINT((ndo, %s, tstr));
- return;
- }
+ ND_TCHECK(*ipds-ip);
if (length sizeof (struct ip)) {
ND_PRINT((ndo, truncated-ip %u, length));
return;
@@ -669,6 +667,11 @@ ip_print(netdissect_options *ndo,
ND_PRINT((ndo, ip-proto-%d, ipds-ip-ip_p));
}
}
+ return;
+
+trunc:
+ ND_PRINT((ndo, %s, tstr));
+ return;
}
void
Modified: vendor/tcpdump/dist/print-sl.c
==
--- vendor/tcpdump/dist/print-sl.c Mon Jan 26 23:45:10 2015
(r277781)
+++ vendor/tcpdump/dist/print-sl.c Tue Jan 27 01:39:42 2015
(r277782)
@@ -62,7 +62,7 @@ sl_if_print(netdissect_options *ndo,
register u_int length = h-len;
register const struct ip *ip;
- if (caplen SLIP_HDRLEN) {
+ if (caplen SLIP_HDRLEN || length SLIP_HDRLEN) {
ND_PRINT((ndo, %s, tstr));
return (caplen);
}
___
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: r277737 - in head: etc/pam.d tools/build/mk
On Jan 26, 2015, at 4:23, Dag-Erling Smørgrav d...@des.no wrote: Garrett Cooper n...@freebsd.org writes: Log: Honor MK_ACCT with etc/pam.d/atrun The correct idiom would be I disagree for a few reasons: 1. style.Makefile(9) makes no mention of having to use an idiom over the other. 2. The likelihood of typos creeping into Makefiles is greater with the _foo= idiom. 3. It creates unnecessary local variables — especially when appending is so easy to do. 4. It’s more difficult when backporting changes to do it with the variable method — especially if context around the line modified has changed a great deal. signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r277790 - stable/10/sys/sys
Author: bryanv Date: Tue Jan 27 06:24:33 2015 New Revision: 277790 URL: https://svnweb.freebsd.org/changeset/base/277790 Log: Bump __FreeBSD_version after r277789: Changes to the UDP tunneling callback Modified: stable/10/sys/sys/param.h Modified: stable/10/sys/sys/param.h == --- stable/10/sys/sys/param.h Tue Jan 27 06:19:30 2015(r277789) +++ stable/10/sys/sys/param.h Tue Jan 27 06:24:33 2015(r277790) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1001506 /* Master, propagated to newvers */ +#define __FreeBSD_version 1001507 /* 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: r277788 - head/sys/dev/virtio/block
Author: bryanv
Date: Tue Jan 27 05:34:46 2015
New Revision: 277788
URL: https://svnweb.freebsd.org/changeset/base/277788
Log:
Rework vtblk dump handling of in flight requests
Previously, the driver resets the device and abandon the requests that
are caught in flight when the dump was initiated. This was problematic
if the system is resumed after the dump is completed.
While that is probably not the typical action, it is simple to rework
the driver to very likely have the device usable after the dump without
making it more likely for the dump to fail. The in flight requests are
simply queued for completion once the dump is finished.
Requested by: markj
MFC after:1 month
Modified:
head/sys/dev/virtio/block/virtio_blk.c
Modified: head/sys/dev/virtio/block/virtio_blk.c
==
--- head/sys/dev/virtio/block/virtio_blk.c Tue Jan 27 04:06:47 2015
(r277787)
+++ head/sys/dev/virtio/block/virtio_blk.c Tue Jan 27 05:34:46 2015
(r277788)
@@ -76,9 +76,8 @@ struct vtblk_softc {
#define VTBLK_FLAG_READONLY0x0002
#define VTBLK_FLAG_DETACH 0x0004
#define VTBLK_FLAG_SUSPEND 0x0008
-#define VTBLK_FLAG_DUMPING 0x0010
-#define VTBLK_FLAG_BARRIER 0x0020
-#define VTBLK_FLAG_WC_CONFIG 0x0040
+#define VTBLK_FLAG_BARRIER 0x0010
+#define VTBLK_FLAG_WC_CONFIG 0x0020
struct virtqueue*vtblk_vq;
struct sglist *vtblk_sglist;
@@ -95,6 +94,7 @@ struct vtblk_softc {
int vtblk_request_count;
enum vtblk_cache_modevtblk_write_cache;
+ struct bio_queue vtblk_dump_queue;
struct vtblk_request vtblk_dump_request;
};
@@ -162,7 +162,7 @@ static void vtblk_queue_completed(struct
struct bio_queue *);
static voidvtblk_done_completed(struct vtblk_softc *,
struct bio_queue *);
-static voidvtblk_drain_vq(struct vtblk_softc *, int);
+static voidvtblk_drain_vq(struct vtblk_softc *);
static voidvtblk_drain(struct vtblk_softc *);
static voidvtblk_startio(struct vtblk_softc *);
@@ -177,9 +177,10 @@ static int vtblk_quiesce(struct vtblk_so
static voidvtblk_vq_intr(void *);
static voidvtblk_stop(struct vtblk_softc *);
-static voidvtblk_dump_prepare(struct vtblk_softc *);
+static voidvtblk_dump_quiesce(struct vtblk_softc *);
static int vtblk_dump_write(struct vtblk_softc *, void *, off_t, size_t);
static int vtblk_dump_flush(struct vtblk_softc *);
+static voidvtblk_dump_complete(struct vtblk_softc *);
static voidvtblk_set_write_cache(struct vtblk_softc *, int);
static int vtblk_write_cache_enabled(struct vtblk_softc *sc,
@@ -302,6 +303,7 @@ vtblk_attach(device_t dev)
sc-vtblk_dev = dev;
VTBLK_LOCK_INIT(sc, device_get_nameunit(dev));
bioq_init(sc-vtblk_bioq);
+ TAILQ_INIT(sc-vtblk_dump_queue);
TAILQ_INIT(sc-vtblk_req_free);
TAILQ_INIT(sc-vtblk_req_ready);
@@ -506,25 +508,19 @@ vtblk_dump(void *arg, void *virtual, vm_
int error;
dp = arg;
+ error = 0;
if ((sc = dp-d_drv1) == NULL)
return (ENXIO);
VTBLK_LOCK(sc);
- if ((sc-vtblk_flags VTBLK_FLAG_DUMPING) == 0) {
- vtblk_dump_prepare(sc);
- sc-vtblk_flags |= VTBLK_FLAG_DUMPING;
- }
+ vtblk_dump_quiesce(sc);
if (length 0)
error = vtblk_dump_write(sc, virtual, offset, length);
- else if (virtual == NULL offset == 0)
- error = vtblk_dump_flush(sc);
- else {
- error = EINVAL;
- sc-vtblk_flags = ~VTBLK_FLAG_DUMPING;
- }
+ if (error || (virtual == NULL offset == 0))
+ vtblk_dump_complete(sc);
VTBLK_UNLOCK(sc);
@@ -996,7 +992,7 @@ vtblk_done_completed(struct vtblk_softc
}
static void
-vtblk_drain_vq(struct vtblk_softc *sc, int skip_done)
+vtblk_drain_vq(struct vtblk_softc *sc)
{
struct virtqueue *vq;
struct vtblk_request *req;
@@ -1006,9 +1002,7 @@ vtblk_drain_vq(struct vtblk_softc *sc, i
last = 0;
while ((req = virtqueue_drain(vq, last)) != NULL) {
- if (!skip_done)
- vtblk_bio_done(sc, req-vbr_bp, ENXIO);
-
+ vtblk_bio_done(sc, req-vbr_bp, ENXIO);
vtblk_request_enqueue(sc, req);
}
@@ -1031,7 +1025,7 @@ vtblk_drain(struct vtblk_softc *sc)
vtblk_queue_completed(sc, queue);
vtblk_done_completed(sc, queue);
- vtblk_drain_vq(sc, 0);
+ vtblk_drain_vq(sc);
}
while ((req = vtblk_request_next_ready(sc)) != NULL) {
@@ -1256,31 +1250,16 @@ vtblk_stop(struct vtblk_softc *sc)
}
static void
-vtblk_dump_prepare(struct vtblk_softc *sc)
+vtblk_dump_quiesce(struct vtblk_softc *sc)
{
-
Re: svn commit: r276423 - stable/10/share/mk
On Dec 31, 2014, at 7:54, Julio Merino j...@meroh.net wrote:
On Dec 30, 2014, at 21:46, Garrett Cooper n...@freebsd.org wrote:
Author: ngie
Date: Tue Dec 30 20:46:01 2014
New Revision: 276423
URL: https://svnweb.freebsd.org/changeset/base/276423
Log:
MFC r274077:
As an optimization (in simple, well used cases) only call cat ${.ALLSRC}
when
generating files from various sources instead of calling cat ${.ALLSRC} |
sed
Is there any visible effect to this optimization? Otherwise, the extra
complexity does not seem warranted.
Hi Julio!
There are a few things to gain from this:
1. Errors with cat’ing the files are caught when sed transformations aren’t
applied to the files.
2. Less resources are used in generating the files if sed isn’t needed:
i. Less forked processes.
ii. No pipelines need to be created.
I don’t have numbers for how much faster it is (probably negligible if done
once, potentially more noticeable if done as a micro benchmark), but I could do
this if you like.
Thank you!
signature.asc
Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r277737 - in head: etc/pam.d tools/build/mk
On Mon, Jan 26, 2015 at 06:26:54PM -0800, Garrett Cooper wrote: On Jan 26, 2015, at 4:23, Dag-Erling Smorgrav d...@des.no wrote: Garrett Cooper n...@freebsd.org writes: Log: Honor MK_ACCT with etc/pam.d/atrun The correct idiom would be I disagree for a few reasons: [...] 2. The likelihood of typos creeping into Makefiles is greater with the _foo= idiom. 3. It creates unnecessary local variables - especially when appending is so easy to do. 4. It's more difficult when backporting changes to do it with the variable method - especially if context around the line modified has changed a great deal. As someone who writes makefile daily I would agree, but there should be a reason why it was always done with _foo. One obvious one is that it shows up front all possible values, including conditional ones, which can also help not to forget something when backporting changes somewhere else. ;-) ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r277792 - head/sys/powerpc/pseries
Author: nwhitehorn
Date: Tue Jan 27 07:20:00 2015
New Revision: 277792
URL: https://svnweb.freebsd.org/changeset/base/277792
Log:
Fix bug in mapppings of multiple pages exposed by updates to the VSCSI
support in QEMU. Each page of a many page mapping was getting mapped to
the same physical address, which is not the desired behavior.
MFC after:1 week
Modified:
head/sys/powerpc/pseries/plpar_iommu.c
Modified: head/sys/powerpc/pseries/plpar_iommu.c
==
--- head/sys/powerpc/pseries/plpar_iommu.c Tue Jan 27 06:50:01 2015
(r277791)
+++ head/sys/powerpc/pseries/plpar_iommu.c Tue Jan 27 07:20:00 2015
(r277792)
@@ -191,13 +191,13 @@ phyp_iommu_map(device_t dev, bus_dma_seg
tce = trunc_page(segs[i].ds_addr);
tce |= 0x3; /* read/write */
- if (papr_supports_stuff_tce) {
- error = phyp_hcall(H_STUFF_TCE, window-map-iobn,
- alloced, tce, allocsize/PAGE_SIZE);
- } else {
- for (j = 0; j allocsize; j += PAGE_SIZE)
- error = phyp_hcall(H_PUT_TCE, window-map-iobn,
- alloced + j, tce + j);
+ for (j = 0; j allocsize; j += PAGE_SIZE) {
+ error = phyp_hcall(H_PUT_TCE, window-map-iobn,
+ alloced + j, tce + j);
+ if (error 0) {
+ panic(IOMMU mapping error: %d\n, error);
+ return (ENOMEM);
+ }
}
segs[i].ds_addr = alloced + (segs[i].ds_addr PAGE_MASK);
___
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: r277681 - in head/sys: conf modules
On Jan 25, 2015, at 9:46, Warner Losh i...@bsdimp.com wrote: The number of MK_foo opts that are intruding into the kernel module builds is starting to get out of hand. :( Especially since they are duplicative of the MODULES_OVERRIDE functionality and are very unevenly applied. I don’t really like it either to be honest, but the problem is that building MK_CUSE == no (for instance) should produce a working default set of SUBDIRs so both the kernel and userland infrastructure are compiled with the build. Telling someone to use MODULES_OVERRIDE to just remove cuse (for instance), is a user unfriendly system.. If there was a way to pick up a subset of src.opts.mk though and apply it to kern.opts.mk, I would be incredibly keen on making that change. Thank you! signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r277710 - head/sys/dev/pci
On Mon, Jan 26, 2015 at 11:06:27AM -0500, John Baldwin wrote: On 1/26/15 9:19 AM, Alexey Dokuchaev wrote: On Sun, Jan 25, 2015 at 07:53:10PM +, John Baldwin wrote: New Revision: 277710 URL: https://svnweb.freebsd.org/changeset/base/277710 Log: Pass a valid Dx state variable to PCIB_POWER_FOR_SLEEP() in pcib_resume() instead of NULL. Can this be possibly related to this message I got trying to resume a laptop running recent -current [...] ? Well, the patch came up from debugging something along those lines, but it will not fix it. OK; still nice to hear someone is seeing these as well. Shall there by any other patches that could benefit from more testing, I'd gladly help. ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r277783 - head/contrib/tcpdump
Author: pfg
Date: Tue Jan 27 01:45:47 2015
New Revision: 277783
URL: https://svnweb.freebsd.org/changeset/base/277783
Log:
MFV r277782:
Merge some cherry-picked fixes originating in OpenBSD
Check whether the version field is available before looking at it.
While we're at it, use ND_TCHECK(), rather than a hand-rolled check, to
check whether we have the full fixed-length portion of the IPv4 header.
commit c67afe913011138a2504ec4d3d423b48e73b12f3
Do more length checking. From OpenBSD.
commit d7516761f9c4877bcb05bb6543be3543e165249
Modified:
head/contrib/tcpdump/print-ip.c
head/contrib/tcpdump/print-sl.c
Directory Properties:
head/contrib/tcpdump/ (props changed)
Modified: head/contrib/tcpdump/print-ip.c
==
--- head/contrib/tcpdump/print-ip.c Tue Jan 27 01:39:42 2015
(r277782)
+++ head/contrib/tcpdump/print-ip.c Tue Jan 27 01:45:47 2015
(r277783)
@@ -537,6 +537,7 @@ ip_print(netdissect_options *ndo,
struct protoent *proto;
ipds-ip = (const struct ip *)bp;
+ ND_TCHECK(ipds-ip-ip_vhl);
if (IP_V(ipds-ip) != 4) { /* print version if != 4 */
ND_PRINT((ndo, IP%u , IP_V(ipds-ip)));
if (IP_V(ipds-ip) == 6)
@@ -545,10 +546,7 @@ ip_print(netdissect_options *ndo,
else if (!ndo-ndo_eflag)
ND_PRINT((ndo, IP ));
- if ((u_char *)(ipds-ip + 1) ndo-ndo_snapend) {
- ND_PRINT((ndo, %s, tstr));
- return;
- }
+ ND_TCHECK(*ipds-ip);
if (length sizeof (struct ip)) {
ND_PRINT((ndo, truncated-ip %u, length));
return;
@@ -677,6 +675,11 @@ ip_print(netdissect_options *ndo,
ND_PRINT((ndo, ip-proto-%d, ipds-ip-ip_p));
}
}
+ return;
+
+trunc:
+ ND_PRINT((ndo, %s, tstr));
+ return;
}
void
Modified: head/contrib/tcpdump/print-sl.c
==
--- head/contrib/tcpdump/print-sl.c Tue Jan 27 01:39:42 2015
(r277782)
+++ head/contrib/tcpdump/print-sl.c Tue Jan 27 01:45:47 2015
(r277783)
@@ -64,7 +64,7 @@ sl_if_print(netdissect_options *ndo,
register u_int length = h-len;
register const struct ip *ip;
- if (caplen SLIP_HDRLEN) {
+ if (caplen SLIP_HDRLEN || length SLIP_HDRLEN) {
ND_PRINT((ndo, %s, tstr));
return (caplen);
}
___
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: r277743 - head/sys/arm/arm
Author: kib
Date: Mon Jan 26 10:11:55 2015
New Revision: 277743
URL: https://svnweb.freebsd.org/changeset/base/277743
Log:
Ensure that _tmppt KVA is used exclusively by providing exclusive sx
lock around the mapping and uiomove(). Before r277643, it was
partially protected by Giant (but potential sleeping in fault from
uiomove() would still allow other thread to reuse the mapping).
Noted by: ian
Reviewed by: alc, ian
Sponsored by: The FreeBSD Foundation
MFC after:3 weeks
Modified:
head/sys/arm/arm/mem.c
Modified: head/sys/arm/arm/mem.c
==
--- head/sys/arm/arm/mem.c Mon Jan 26 09:53:41 2015(r277742)
+++ head/sys/arm/arm/mem.c Mon Jan 26 10:11:55 2015(r277743)
@@ -55,6 +55,7 @@ __FBSDID($FreeBSD$);
#include sys/mutex.h
#include sys/proc.h
#include sys/signalvar.h
+#include sys/sx.h
#include sys/systm.h
#include sys/uio.h
@@ -72,6 +73,9 @@ MALLOC_DEFINE(M_MEMDESC, memdesc, mem
struct mem_range_softc mem_range_softc;
+static struct sx tmppt_lock;
+SX_SYSINIT(tmppt, tmppt_lock, mem4map);
+
/* ARGSUSED */
int
memrw(struct cdev *dev, struct uio *uio, int flags)
@@ -107,6 +111,7 @@ memrw(struct cdev *dev, struct uio *uio,
}
if (!address_valid)
return (EINVAL);
+ sx_xlock(tmppt_lock);
pmap_kenter((vm_offset_t)_tmppt, v);
o = (int)uio-uio_offset PAGE_MASK;
c = (u_int)(PAGE_SIZE - ((int)iov-iov_base
PAGE_MASK));
@@ -114,6 +119,7 @@ memrw(struct cdev *dev, struct uio *uio,
c = min(c, (u_int)iov-iov_len);
error = uiomove((caddr_t)_tmppt[o], (int)c, uio);
pmap_qremove((vm_offset_t)_tmppt, 1);
+ sx_xunlock(tmppt_lock);
continue;
}
else if (dev2unit(dev) == CDEV_MINOR_KMEM) {
___
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: r277741 - in head: etc/rc.d tools/build/mk
Author: ngie
Date: Mon Jan 26 09:51:21 2015
New Revision: 277741
URL: https://svnweb.freebsd.org/changeset/base/277741
Log:
Respect MK_KERBEROS with etc/rc.d/ipropd_master and etc/rc.d/ipropd_slave
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Jan 26 09:43:08 2015(r277740)
+++ head/etc/rc.d/Makefile Mon Jan 26 09:51:21 2015(r277741)
@@ -54,8 +54,6 @@ FILES=DAEMON \
ipfw \
ipmon \
ipnat \
- ipropd_master \
- ipropd_slave \
ipsec \
${_kadmind} \
${_kdc} \
@@ -213,6 +211,8 @@ _nscd= nscd
.endif
.if ${MK_KERBEROS} != no
+FILES+=ipropd_master
+FILES+=ipropd_slave
_kadmind= kadmind
_kdc= kdc
_kfd= kfd
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 09:43:08
2015(r277740)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 09:51:21
2015(r277741)
@@ -2379,6 +2379,8 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz
.endif
.if ${MK_KERBEROS} == no
+OLD_FILES+=etc/rc.d/ipropd_master
+OLD_FILES+=etc/rc.d/ipropd_slave
OLD_FILES+=usr/bin/compile_et
OLD_FILES+=usr/bin/hxtool
OLD_FILES+=usr/bin/kadmin
___
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: r277745 - in head/sys: arm/arm boot/fdt/dts/arm
Author: br
Date: Mon Jan 26 10:31:17 2015
New Revision: 277745
URL: https://svnweb.freebsd.org/changeset/base/277745
Log:
Add a generic way for hooking PMC interrupt.
Added:
head/sys/arm/arm/pmu.c (contents, props changed)
Modified:
head/sys/boot/fdt/dts/arm/am335x.dtsi
Added: head/sys/arm/arm/pmu.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/arm/pmu.c Mon Jan 26 10:31:17 2015(r277745)
@@ -0,0 +1,157 @@
+/*-
+ * Copyright (c) 2015 Ruslan Bukin b...@bsdpad.com
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * (CTSRD), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Performance Monitoring Unit
+ */
+
+#include sys/cdefs.h
+__FBSDID($FreeBSD$);
+
+#include opt_hwpmc_hooks.h
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/bus.h
+#include sys/kernel.h
+#include sys/module.h
+#include sys/malloc.h
+#include sys/rman.h
+#include sys/timeet.h
+#include sys/timetc.h
+#include sys/pmc.h
+#include sys/pmckern.h
+
+#include dev/fdt/fdt_common.h
+#include dev/ofw/openfirm.h
+#include dev/ofw/ofw_bus.h
+#include dev/ofw/ofw_bus_subr.h
+
+#include machine/bus.h
+#include machine/fdt.h
+#include machine/cpu.h
+#include machine/intr.h
+
+struct pmu_softc {
+ struct resource *res[1];
+ device_tdev;
+ void*ih;
+};
+
+static struct ofw_compat_data compat_data[] = {
+ {arm,cortex-a17-pmu, 1},
+ {arm,cortex-a15-pmu, 1},
+ {arm,cortex-a12-pmu, 1},
+ {arm,cortex-a9-pmu, 1},
+ {arm,cortex-a8-pmu, 1},
+ {arm,cortex-a7-pmu, 1},
+ {arm,cortex-a5-pmu, 1},
+ {arm,arm11mpcore-pmu, 1},
+ {arm,arm1176-pmu, 1},
+ {arm,arm1136-pmu, 1},
+ {qcom,krait-pmu, 1},
+ {NULL, 0}
+};
+
+static struct resource_spec pmu_spec[] = {
+ { SYS_RES_IRQ, 0, RF_ACTIVE },
+ { -1, 0 }
+};
+
+static int
+pmu_intr(void *arg)
+{
+ struct trapframe *tf;
+
+ tf = arg;
+
+#ifdef HWPMC_HOOKS
+ if (pmc_intr)
+ (*pmc_intr)(PCPU_GET(cpuid), tf);
+#endif
+
+ return (FILTER_HANDLED);
+}
+
+static int
+pmu_probe(device_t dev)
+{
+
+ if (!ofw_bus_status_okay(dev))
+ return (ENXIO);
+
+ if (ofw_bus_search_compatible(dev, compat_data)-ocd_data != 0) {
+ device_set_desc(dev, Performance Monitoring Unit);
+ return (BUS_PROBE_DEFAULT);
+ }
+
+ return (ENXIO);
+}
+
+static int
+pmu_attach(device_t dev)
+{
+ struct pmu_softc *sc;
+ int err;
+
+ sc = device_get_softc(dev);
+ sc-dev = dev;
+
+ if (bus_alloc_resources(dev, pmu_spec, sc-res)) {
+ device_printf(dev, could not allocate resources\n);
+ return (ENXIO);
+ }
+
+ /* Setup interrupt handler */
+ err = bus_setup_intr(dev, sc-res[0], INTR_MPSAFE | INTR_TYPE_MISC,
+ pmu_intr, NULL, NULL, sc-ih);
+ if (err) {
+ device_printf(dev, Unable to setup interrupt handler.\n);
+ return (ENXIO);
+ }
+
+ return (0);
+}
+
+static device_method_t pmu_methods[] = {
+ DEVMETHOD(device_probe, pmu_probe),
+ DEVMETHOD(device_attach,pmu_attach),
+ { 0, 0 }
+};
+
+static driver_t pmu_driver = {
+ pmu,
+ pmu_methods,
+ sizeof(struct pmu_softc),
+};
+
+static devclass_t pmu_devclass;
+
svn commit: r277730 - in head: etc/devd etc/rc.d tools/build/mk
Author: ngie
Date: Mon Jan 26 08:04:38 2015
New Revision: 277730
URL: https://svnweb.freebsd.org/changeset/base/277730
Log:
Honor MK_ACPI in etc/devd and etc/rc.d
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/devd/Makefile
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/devd/Makefile
==
--- head/etc/devd/Makefile Mon Jan 26 07:24:18 2015(r277729)
+++ head/etc/devd/Makefile Mon Jan 26 08:04:38 2015(r277730)
@@ -2,12 +2,16 @@
.include src.opts.mk
+FILES=
+
.if ${MACHINE} == powerpc
FILES+=apple.conf
.endif
.if ${MACHINE} == amd64 || ${MACHINE} == i386
+.if ${MK_ACPI} != no
FILES+=asus.conf
+.endif
.if ${MK_HYPERV} != no
FILES+=hyperv.conf
.endif
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Jan 26 07:24:18 2015(r277729)
+++ head/etc/rc.d/Makefile Mon Jan 26 08:04:38 2015(r277730)
@@ -103,7 +103,6 @@ FILES= DAEMON \
pflog \
pfsync \
powerd \
- power_profile \
ppp \
pppoed \
pwcheck \
@@ -155,6 +154,10 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_ACPI} != no
+FILES+=power_profile
+.endif
+
.if ${MK_AUTOFS} != no
FILES+=automount
FILES+=automountd
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 07:24:18
2015(r277729)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:04:38
2015(r277730)
@@ -14,6 +14,8 @@ OLD_FILES+=usr/share/man/man8/sa.8.gz
.endif
.if ${MK_ACPI} == no
+OLD_FILES+=etc/devd/asus.conf
+OLD_FILES+=etc/rc.d/power_profile
OLD_FILES+=usr/sbin/acpiconf
OLD_FILES+=usr/sbin/acpidb
OLD_FILES+=usr/sbin/acpidump
___
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: r277735 - head/sys/amd64/amd64
Author: royger
Date: Mon Jan 26 08:42:47 2015
New Revision: 277735
URL: https://svnweb.freebsd.org/changeset/base/277735
Log:
amd64: allow base memory segment to start at address different than 0
Current code requires that the first physical memory segment starts at 0,
but this is not really needed. We only need to make sure the bootstrap code
and page tables for APs are allocated below 4GB.
This patch removes this requirement and allows booting a Dell R710 from
UEFI, where the first physical memory segment starts at 0x1.
Sponsored by: Citrix Systems RD
Reviewed by: jhb
Differential Revision: https://reviews.freebsd.org/D1417
Modified:
head/sys/amd64/amd64/machdep.c
Modified: head/sys/amd64/amd64/machdep.c
==
--- head/sys/amd64/amd64/machdep.c Mon Jan 26 08:30:24 2015
(r277734)
+++ head/sys/amd64/amd64/machdep.c Mon Jan 26 08:42:47 2015
(r277735)
@@ -1355,8 +1355,10 @@ add_physmap_entry(uint64_t base, uint64_
/*
* Find insertion point while checking for overlap. Start off by
* assuming the new entry will be added to the end.
+*
+* NB: physmap_idx points to the next free slot.
*/
- insert_idx = physmap_idx + 2;
+ insert_idx = physmap_idx;
for (i = 0; i = physmap_idx; i += 2) {
if (base physmap[i + 1]) {
if (base + length = physmap[i]) {
@@ -1394,7 +1396,7 @@ add_physmap_entry(uint64_t base, uint64_
* Move the last 'N' entries down to make room for the new
* entry if needed.
*/
- for (i = physmap_idx; i insert_idx; i -= 2) {
+ for (i = (physmap_idx - 2); i insert_idx; i -= 2) {
physmap[i] = physmap[i - 2];
physmap[i + 1] = physmap[i - 1];
}
@@ -1580,23 +1582,27 @@ getmemsize(caddr_t kmdp, u_int64_t first
int page_counter;
bzero(physmap, sizeof(physmap));
- basemem = 0;
physmap_idx = 0;
init_ops.parse_memmap(kmdp, physmap, physmap_idx);
+ physmap_idx -= 2;
/*
* Find the 'base memory' segment for SMP
*/
basemem = 0;
for (i = 0; i = physmap_idx; i += 2) {
- if (physmap[i] == 0x) {
+ if (physmap[i] = 0xA) {
basemem = physmap[i + 1] / 1024;
break;
}
}
- if (basemem == 0)
- panic(BIOS smap did not include a basemem segment!);
+ if (basemem == 0 || basemem 640) {
+ if (bootverbose)
+ printf(
+ Memory map doesn't contain a basemem segment, faking it);
+ basemem = 640;
+ }
/*
* Make hole for AP - long mode bootstrap code. The
@@ -1604,8 +1610,12 @@ getmemsize(caddr_t kmdp, u_int64_t first
* is configured to support APs and APs for the system start
* in 32bit mode (e.g. SMP bare metal).
*/
- if (init_ops.mp_bootaddress)
+ if (init_ops.mp_bootaddress) {
+ if (physmap[1] = 0x1)
+ panic(
+ Basemem segment is not suitable for AP bootstrap code!);
physmap[1] = init_ops.mp_bootaddress(physmap[1] / 1024);
+ }
/*
* Maxmem isn't the maximum memory, it's one larger than the
@@ -1657,12 +1667,14 @@ getmemsize(caddr_t kmdp, u_int64_t first
*/
physmem_start = (vm_guest VM_GUEST_NO ? 1 : 16) PAGE_SHIFT;
TUNABLE_ULONG_FETCH(hw.physmem.start, physmem_start);
- if (physmem_start PAGE_SIZE)
- physmap[0] = PAGE_SIZE;
- else if (physmem_start = physmap[1])
- physmap[0] = round_page(physmap[1] - PAGE_SIZE);
- else
- physmap[0] = round_page(physmem_start);
+ if (physmap[0] physmem_start) {
+ if (physmem_start PAGE_SIZE)
+ physmap[0] = PAGE_SIZE;
+ else if (physmem_start = physmap[1])
+ physmap[0] = round_page(physmap[1] - PAGE_SIZE);
+ else
+ physmap[0] = round_page(physmem_start);
+ }
pa_indx = 0;
da_indx = 1;
phys_avail[pa_indx++] = physmap[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: r277737 - in head: etc/pam.d tools/build/mk
Author: ngie
Date: Mon Jan 26 08:50:12 2015
New Revision: 277737
URL: https://svnweb.freebsd.org/changeset/base/277737
Log:
Honor MK_ACCT with etc/pam.d/atrun
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/pam.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/pam.d/Makefile
==
--- head/etc/pam.d/Makefile Mon Jan 26 08:46:26 2015(r277736)
+++ head/etc/pam.d/Makefile Mon Jan 26 08:50:12 2015(r277737)
@@ -1,9 +1,10 @@
# $FreeBSD$
+.include src.opts.mk
+
NO_OBJ=
FILES= README \
- atrun \
cron \
ftpd \
imap \
@@ -15,6 +16,10 @@ FILES= README \
telnetd \
xdm
+.if ${MK_AT} != no
+FILES+=atrun
+.endif
+
FILESDIR= /etc/pam.d
FILESMODE= 644
FILESMODE_README= 444
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:46:26
2015(r277736)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:50:12
2015(r277737)
@@ -62,6 +62,7 @@ OLD_FILES+=usr/share/man/man8/amd64/apmc
.endif
.if ${MK_AT} == no
+OLD_FILES+=etc/pam.d/atrun
OLD_FILES+=usr/bin/at
OLD_FILES+=usr/bin/atq
OLD_FILES+=usr/bin/atrm
___
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: r277737 - in head: etc/pam.d tools/build/mk
On Jan 26, 2015, at 0:50, Garrett Cooper n...@freebsd.org wrote: Author: ngie Date: Mon Jan 26 08:50:12 2015 New Revision: 277737 URL: https://svnweb.freebsd.org/changeset/base/277737 Log: Honor MK_ACCT with etc/pam.d/atrun MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division I meant MK_AT signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r277739 - in head: etc/rc.d tools/build/mk
Author: ngie
Date: Mon Jan 26 09:37:14 2015
New Revision: 277739
URL: https://svnweb.freebsd.org/changeset/base/277739
Log:
Honor MK_JAIL with etc/rc.d/jail
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Jan 26 09:31:48 2015(r277738)
+++ head/etc/rc.d/Makefile Mon Jan 26 09:37:14 2015(r277739)
@@ -57,7 +57,6 @@ FILES=DAEMON \
ipropd_master \
ipropd_slave \
ipsec \
- jail \
${_kadmind} \
${_kdc} \
${_kfd} \
@@ -201,6 +200,10 @@ FILES+=iscsictl
FILES+=iscsid
.endif
+.if ${MK_JAIL} != no
+FILES+=jail
+.endif
+
.if ${MK_LPR} != no
FILES+=lpd
.endif
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 09:31:48
2015(r277738)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 09:37:14
2015(r277739)
@@ -2369,6 +2369,7 @@ OLD_FILES+=usr/share/man/man8/iscsid.8.g
.endif
.if ${MK_JAIL} == no
+OLD_FILES+=etc/rc.d/jail
OLD_FILES+=usr/sbin/jail
OLD_FILES+=usr/sbin/jexec
OLD_FILES+=usr/sbin/jls
___
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: r277736 - in head: etc/rc.d tools/build/mk
Author: ngie
Date: Mon Jan 26 08:46:26 2015
New Revision: 277736
URL: https://svnweb.freebsd.org/changeset/base/277736
Log:
Honor MK_ACCT with etc/rc.d/accounting
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Jan 26 08:42:47 2015(r277735)
+++ head/etc/rc.d/Makefile Mon Jan 26 08:46:26 2015(r277736)
@@ -150,6 +150,10 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_ACCT} != no
+FILES+=accounting
+.endif
+
.if ${MK_ACPI} != no
FILES+=power_profile
.endif
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:42:47
2015(r277735)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:46:26
2015(r277736)
@@ -6,6 +6,7 @@
#
.if ${MK_ACCT} == no
+OLD_FILES+=etc/rc.d/accounting
OLD_FILES+=etc/periodic/daily/310.accounting
OLD_FILES+=usr/sbin/accton
OLD_FILES+=usr/sbin/sa
___
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: r277738 - in head: etc/defaults tools/build/mk
Author: ngie
Date: Mon Jan 26 09:31:48 2015
New Revision: 277738
URL: https://svnweb.freebsd.org/changeset/base/277738
Log:
Honor MK_BLUETOOTH with etc/defaults/bluetooth.device.conf
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/defaults/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/defaults/Makefile
==
--- head/etc/defaults/Makefile Mon Jan 26 08:50:12 2015(r277737)
+++ head/etc/defaults/Makefile Mon Jan 26 09:31:48 2015(r277738)
@@ -1,7 +1,13 @@
# $FreeBSD$
-FILES= bluetooth.device.conf devfs.rules periodic.conf rc.conf
+.include src.opts.mk
+
+FILES= devfs.rules periodic.conf rc.conf
NO_OBJ=
FILESDIR= /etc/defaults
+.if ${MK_BLUETOOTH} != no
+FILES+=bluetooth.device.conf
+.endif
+
.include bsd.prog.mk
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:50:12
2015(r277737)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 09:31:48
2015(r277738)
@@ -185,6 +185,7 @@ OLD_DIRS+=usr/share/examples/bhyve
OLD_FILES+=etc/bluetooth/hcsecd.conf
OLD_FILES+=etc/bluetooth/hosts
OLD_FILES+=etc/bluetooth/protocols
+OLD_FILES+=etc/defaults/bluetooth.device.conf
OLD_DIRS+=etc/bluetooth
OLD_FILES+=usr/bin/bthost
OLD_FILES+=usr/bin/btsockstat
___
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: r277740 - in head: etc/rc.d tools/build/mk
Author: ngie
Date: Mon Jan 26 09:43:08 2015
New Revision: 277740
URL: https://svnweb.freebsd.org/changeset/base/277740
Log:
Honor MK_WIRELESS with etc/rc.d/hostapd and etc/rc.d/wpa_supplicant
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Jan 26 09:37:14 2015(r277739)
+++ head/etc/rc.d/Makefile Mon Jan 26 09:43:08 2015(r277740)
@@ -247,6 +247,11 @@ _unbound= local_unbound
_utx= utx
.endif
+.if ${MK_WIRELESS} != no
+FILES+=hostapd
+FILES+=wpa_supplicant
+.endif
+
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 09:37:14
2015(r277739)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 09:43:08
2015(r277740)
@@ -4981,6 +4981,8 @@ OLD_FILES+=usr/share/man/man8/utx.8.gz
.if ${MK_WIRELESS} == no
OLD_FILES+=etc/regdomain.xml
+OLD_FILES+=etc/rc.d/hostapd
+OLD_FILES+=etc/rc.d/wpa_supplicant
OLD_FILES+=usr/sbin/ancontrol
OLD_FILES+=usr/sbin/hostapd
OLD_FILES+=usr/sbin/hostapd_cli
___
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: r277731 - in head: etc/rc.d tools/build/mk
Author: ngie
Date: Mon Jan 26 08:20:51 2015
New Revision: 277731
URL: https://svnweb.freebsd.org/changeset/base/277731
Log:
Honor MK_LPR with etc/rc.d/lpd
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Jan 26 08:04:38 2015(r277730)
+++ head/etc/rc.d/Makefile Mon Jan 26 08:20:51 2015(r277731)
@@ -192,6 +192,10 @@ FILES+=iscsictl
FILES+=iscsid
.endif
+.if ${MK_LPR} != no
+FILES+=lpd
+.endif
+
.if ${MK_NS_CACHING} != no
_nscd= nscd
.endif
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:04:38
2015(r277730)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:20:51
2015(r277731)
@@ -3512,6 +3512,7 @@ OLD_FILES+=usr/share/man/man8/updatedb.8
.if ${MK_LPR} == no
OLD_FILES+=etc/hosts.lpd
OLD_FILES+=etc/printcap
+OLD_FILES+=etc/rc.d/lpd
OLD_FILES+=usr/bin/lp
OLD_FILES+=usr/bin/lpq
OLD_FILES+=usr/bin/lpr
___
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: r277732 - in head: etc/rc.d tools/build/mk
Author: ngie
Date: Mon Jan 26 08:23:36 2015
New Revision: 277732
URL: https://svnweb.freebsd.org/changeset/base/277732
Log:
Honor MK_API in etc/rc.d
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Jan 26 08:20:51 2015(r277731)
+++ head/etc/rc.d/Makefile Mon Jan 26 08:23:36 2015(r277732)
@@ -12,8 +12,6 @@ FILES=DAEMON \
addswap \
adjkerntz \
amd \
- apm \
- apmd \
archdep \
atm1 \
atm2 \
@@ -158,6 +156,11 @@ FILES= DAEMON \
FILES+=power_profile
.endif
+.if ${MK_APM} != no
+FILES+=apm
+FILES+=apmd
+.endif
+
.if ${MK_AUTOFS} != no
FILES+=automount
FILES+=automountd
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:20:51
2015(r277731)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:23:36
2015(r277732)
@@ -50,6 +50,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.
.endif
.if ${MK_APM} == no
+OLD_FILES+=etc/rc.d/apm
+OLD_FILES+=etc/rc.d/apmd
OLD_FILES+=etc/apmd.conf
OLD_FILES+=usr/sbin/apm
OLD_FILES+=usr/share/examples/etc/apmd.conf
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r277734 - head/etc/rc.d
Author: ngie Date: Mon Jan 26 08:30:24 2015 New Revision: 277734 URL: https://svnweb.freebsd.org/changeset/base/277734 Log: Remove explicit inclusion of lpd from FILES X-MFC with: 277731 MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/etc/rc.d/Makefile Modified: head/etc/rc.d/Makefile == --- head/etc/rc.d/Makefile Mon Jan 26 08:28:51 2015(r277733) +++ head/etc/rc.d/Makefile Mon Jan 26 08:30:24 2015(r277734) @@ -68,7 +68,6 @@ FILES=DAEMON \ local \ localpkg \ lockd \ - lpd \ mixer \ motd \ mountcritlocal \ ___ 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: r277733 - in head: etc/rc.d tools/build/mk
Author: ngie
Date: Mon Jan 26 08:28:51 2015
New Revision: 277733
URL: https://svnweb.freebsd.org/changeset/base/277733
Log:
Honor MK_AMD with etc/rc.d/amd
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Jan 26 08:23:36 2015(r277732)
+++ head/etc/rc.d/Makefile Mon Jan 26 08:28:51 2015(r277733)
@@ -11,7 +11,6 @@ FILES=DAEMON \
accounting \
addswap \
adjkerntz \
- amd \
archdep \
atm1 \
atm2 \
@@ -156,6 +155,10 @@ FILES= DAEMON \
FILES+=power_profile
.endif
+.if ${MK_AMD} != no
+FILES+=amd
+.endif
+
.if ${MK_APM} != no
FILES+=apm
FILES+=apmd
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:23:36
2015(r277732)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:28:51
2015(r277733)
@@ -28,6 +28,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
.if ${MK_AMD} == no
OLD_FILES+=etc/amd.map
+OLD_FILES+=etc/rc.d/amd
OLD_FILES+=usr/bin/pawd
OLD_FILES+=usr/sbin/amd
OLD_FILES+=usr/sbin/amq
___
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: r277746 - stable/10/sys/fs/devfs
Author: kib
Date: Mon Jan 26 11:37:16 2015
New Revision: 277746
URL: https://svnweb.freebsd.org/changeset/base/277746
Log:
MFC r277390:
Ignore devfs directory entries for devices being destroyed.
Modified:
stable/10/sys/fs/devfs/devfs_devs.c
stable/10/sys/fs/devfs/devfs_vnops.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/fs/devfs/devfs_devs.c
==
--- stable/10/sys/fs/devfs/devfs_devs.c Mon Jan 26 10:31:17 2015
(r277745)
+++ stable/10/sys/fs/devfs/devfs_devs.c Mon Jan 26 11:37:16 2015
(r277746)
@@ -186,6 +186,16 @@ devfs_find(struct devfs_dirent *dd, cons
continue;
if (type != 0 type != de-de_dirent-d_type)
continue;
+
+ /*
+* The race with finding non-active name is not
+* completely closed by the check, but it is similar
+* to the devfs_allocv() in making it unlikely enough.
+*/
+ if (de-de_dirent-d_type == DT_CHR
+ (de-de_cdp-cdp_flags CDP_ACTIVE) == 0)
+ continue;
+
if (bcmp(name, de-de_dirent-d_name, namelen) != 0)
continue;
break;
Modified: stable/10/sys/fs/devfs/devfs_vnops.c
==
--- stable/10/sys/fs/devfs/devfs_vnops.cMon Jan 26 10:31:17 2015
(r277745)
+++ stable/10/sys/fs/devfs/devfs_vnops.cMon Jan 26 11:37:16 2015
(r277746)
@@ -1023,6 +1023,9 @@ devfs_mknod(struct vop_mknod_args *ap)
TAILQ_FOREACH(de, dd-de_dlist, de_list) {
if (cnp-cn_namelen != de-de_dirent-d_namlen)
continue;
+ if (de-de_dirent-d_type == DT_CHR
+ (de-de_cdp-cdp_flags CDP_ACTIVE) == 0)
+ continue;
if (bcmp(cnp-cn_nameptr, de-de_dirent-d_name,
de-de_dirent-d_namlen) != 0)
continue;
___
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: r277747 - in stable/10: bin/expr bin/expr/tests etc/mtree
Author: ngie
Date: Mon Jan 26 11:49:06 2015
New Revision: 277747
URL: https://svnweb.freebsd.org/changeset/base/277747
Log:
MFC r277358:
r277358 (by ngie):
Integrate contrib/netbsd-tests/bin/expr into the build/kyua as
bin/expr/tests
Sponsored by: EMC / Isilon Storage Division
Added:
stable/10/bin/expr/tests/
- copied from r277358, head/bin/expr/tests/
Modified:
stable/10/bin/expr/Makefile
stable/10/etc/mtree/BSD.tests.dist
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/bin/expr/Makefile
==
--- stable/10/bin/expr/Makefile Mon Jan 26 11:37:16 2015(r277746)
+++ stable/10/bin/expr/Makefile Mon Jan 26 11:49:06 2015(r277747)
@@ -1,9 +1,15 @@
# $FreeBSD$
+.include bsd.own.mk
+
PROG= expr
SRCS= expr.y
YFLAGS=
NO_WMISSING_VARIABLE_DECLARATIONS=
+.if ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
.include bsd.prog.mk
Modified: stable/10/etc/mtree/BSD.tests.dist
==
--- stable/10/etc/mtree/BSD.tests.dist Mon Jan 26 11:37:16 2015
(r277746)
+++ stable/10/etc/mtree/BSD.tests.dist Mon Jan 26 11:49:06 2015
(r277747)
@@ -10,6 +10,8 @@
..
date
..
+expr
+..
mv
..
pax
___
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: r277714 - head/sbin/ipfw
On Mon, Jan 26, 2015 at 10:50 PM, Nick Hibma n...@van-laarhoven.org wrote: On 26 Jan 2015, at 22:24, John Baldwin j...@freebsd.org wrote: It might. What happened for me is that I was using nat over wlan0 for VM's on my laptop to reach the outside world, but wlan0 doesn't get an IP until later in the boot after it associates. As a result, wlan0 wasn't passing any IP traffic until this fix (or if I reloaded ipfw after wlan0 was configured). With a FreeBSD 11-current 277728 I still have the ipfw_nat problem on unconfigured/unexistant interface. I don't think it does. The interface is not available until openvpn is started.You need to clone the interface during boot by adding cloned_interfaces='tun0' in your /etc/rc.conf. Initialisation is then done later by openvpn. Let me know if that works for you. I've tried with cloned_interfaces too: but same problem. Here is the status of ipfw just after a boot (ipfw loaded before tun0 IP setup): []~ ipfw show 00100 0 0 allow ip from any to any via lo0 00200 0 0 allow ip from any to any via lo1 00300 0 0 allow ip from any to any via vtnet6 00400 0 0 allow ip from any to any via wlan0 00500 172 21355 nat 1 ip from any to any in via vtnet4 00600 62 4264 nat 2 ip from any to any in via tun0 00700 0 0 check-state 00800 0 0 allow udp from 0.0.0.0 68 to 255.255.255.255 dst-port 67 out via vtnet4 00900 0 0 allow udp from any 67 to me dst-port 68 in via vtnet4 01000 0 0 allow udp from any 67 to 255.255.255.255 dst-port 68 in via vtnet4 01100 0 0 allow icmp from me to any out via vtnet4 keep-state 01200 11 756 allow udp from me to any dst-port 53 out via vtnet4 keep-state 01300 4 304 allow udp from me to any dst-port 123 out via vtnet4 keep-state 01400 172 21725 allow udp from me to any dst-port 1195 out via vtnet4 keep-state 01500 0 0 nat 1 ip from 10.6.1.0/24,10.6.2.0/24 to any out via vtnet4 01600 0 0 nat 2 udp from me to 2.2.2.2 dst-port 1812,1813 out via tun0 01700 68 4452 allow ip from any to any via tun0 65535 0 0 deny ip from any to any = All rules are present (even the nat 2 table) and seems ok. = No packet seems to be denied But my OSPF adjacency didn't came up on the tun0 interface: []~ tcpdump -pni tun0 tcpdump: verbose output suppressed, use -v or -vv for full protocol decode listening on tun0, link-type NULL (BSD loopback), capture size 262144 bytes capability mode sandbox enabled 21:25:09.555746 IP 10.0.3.2 224.0.0.5: OSPFv2, Hello, length 44 21:25:10.595286 IP 10.0.3.1 224.0.0.5: OSPFv2, Hello, length 48 ^C 2 packets captured 2 packets received by filter 0 packets dropped by kernel = tcpdump shows only some multicast traffic: It's the problem because ifpw is filtering all unicast traffic on tun0 in its current state. For solving this problem I just had to reload ipfw: []~ service ipfw restart net.inet.ip.fw.enable: 1 - 0 net.inet6.ip6.fw.enable: 1 - 0 Firewall rules loaded. = This fix the problem, unicast traffic are now allowed: []~ tcpdump -pni tun0 tcpdump: verbose output suppressed, use -v or -vv for full protocol decode listening on tun0, link-type NULL (BSD loopback), capture size 262144 bytes capability mode sandbox enabled 21:25:34.772225 IP 10.0.3.2 10.0.3.1: OSPFv2, Database Description, length 32 21:25:35.784449 IP 10.0.3.1 10.0.3.2: OSPFv2, Database Description, length 32 21:25:35.784550 IP 10.0.3.2 10.0.3.1: OSPFv2, Database Description, length 52 21:25:35.785904 IP 10.0.3.1 10.0.3.2: OSPFv2, Database Description, length 192 21:25:35.786007 IP 10.0.3.2 10.0.3.1: OSPFv2, Database Description, length 32 ___ 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: r277678 - in head: etc/rc.d sbin share/man/man4 share/mk sys/conf sys/modules/geom tools/build/mk tools/build/options
On Sun, Jan 25, 2015 at 04:52:49AM +, Garrett Cooper wrote: G Author: ngie G Date: Sun Jan 25 04:52:48 2015 G New Revision: 277678 G URL: https://svnweb.freebsd.org/changeset/base/277678 G G Log: G Add MK_CCD knob for building and installing ccd(4), ccdconfig, etc G G MFC after: 2 weeks G Sponsored by: EMC / Isilon Storage Division Does ccd(4) has any benefits over gstripe? Looks like abandonware to be retired. -- 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: r277714 - head/sbin/ipfw
On Sun, Jan 25, 2015 at 9:37 PM, John Baldwin j...@freebsd.org wrote: Author: jhb Date: Sun Jan 25 20:37:32 2015 New Revision: 277714 URL: https://svnweb.freebsd.org/changeset/base/277714 Log: natd(8) will work with an unconfigured interface and effectively not do anything until the interface is assigned an address. This fixes ipfw_nat to do the same by using an IP of INADDR_ANY instead of aborting the nat setup if the requested interface is not yet configured. Hi, I've still a problem with ipfw_nat and unconfigured interface: On my setup I'm using ipfw with NAT rules using an OpenVPN tunnel interface as source address for NATting. During the machine startup, ipfw is started before openvpn (hopefully) and its configuration mention do to NAT using tun0 IP address. Then OpenVPN start and create a tun0 and set an IP address on it. = But no unicast traffic is allowed on this tun0 interface until I restart ipfw. If I correctly understand the log of this commit: This behavior should be fixed by this commit, right ? ___ 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
