Re: svn commit: r242029 - head/sys/kern
On Thu, Oct 25, 2012 at 01:46:21AM +, Alfred Perlstein wrote:
Author: alfred
Date: Thu Oct 25 01:46:20 2012
New Revision: 242029
URL: http://svn.freebsd.org/changeset/base/242029
Log:
Allow autotune maxusers 384 on 64 bit machines
A default install on large memory machines with multiple 10gigE interfaces
were not being given enough mbufs to do full bandwidth TCP or NFS traffic.
To keep the value somewhat reasonable, we scale back the number of
maxuers by 1/6 past the 384 point. This gives us enough mbufs for most
of our pretty basic 10gigE line-speed tests to complete.
Modified:
head/sys/kern/subr_param.c
Modified: head/sys/kern/subr_param.c
==
--- head/sys/kern/subr_param.cThu Oct 25 01:27:01 2012
(r242028)
+++ head/sys/kern/subr_param.cThu Oct 25 01:46:20 2012
(r242029)
@@ -278,8 +278,16 @@ init_param2(long physpages)
maxusers = physpages / (2 * 1024 * 1024 / PAGE_SIZE);
if (maxusers 32)
maxusers = 32;
- if (maxusers 384)
- maxusers = 384;
+ /*
+ * Clips maxusers to 384 on machines with = 4GB RAM or 32bit.
+ * Scales it down 6x for large memory machines.
+ */
+ if (maxusers 384) {
+ if (sizeof(void *) = 4)
+ maxusers = 384;
+ else
+ maxusers = 384 + ((maxusers - 384) / 6);
+ }
This is unbelievably weird way to express the '64bit'. The
#ifdef _LP64 is enough there instead of the runtime check.
Also, are you sure that all our 64bit arches do not have KVA limitations ?
pgpKF20hTnNOJ.pgp
Description: PGP signature
svn commit: r242074 - head/etc/rc.d
Author: brian
Date: Thu Oct 25 08:37:08 2012
New Revision: 242074
URL: http://svn.freebsd.org/changeset/base/242074
Log:
Enable accept_rtadvd on interfaces running rtadvd.
Without this, rtadvd runs but never advertises a default (IPv6) route.
MFC after:1 week
Modified:
head/etc/rc.d/rtadvd
Modified: head/etc/rc.d/rtadvd
==
--- head/etc/rc.d/rtadvdThu Oct 25 05:22:25 2012(r242073)
+++ head/etc/rc.d/rtadvdThu Oct 25 08:37:08 2012(r242074)
@@ -36,17 +36,24 @@ rtadvd_precmd()
#
case ${rtadvd_interfaces} in
[Aa][Uu][Tt][Oo]|'')
+ command_args=
for i in `list_net_interfaces`; do
case $i in
lo0)continue ;;
esac
if ipv6if $i; then
- rtadvd_interfaces=${rtadvd_interfaces} ${i}
+ command_args=${command_args} ${i}
fi
done
;;
+ *)
+ command_args=${rtadvd_interfaces}
+ ;;
esac
- command_args=${rtadvd_interfaces}
+
+ for iface in ${command_args}; do
+ ifconfig ${iface} inet6 -accept_rtadv
+ done
# Enable Router Renumbering, unicast case
# (use correct src/dst addr)
___
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: r242075 - head/share/man/man9
Author: kevlo Date: Thu Oct 25 08:38:43 2012 New Revision: 242075 URL: http://svn.freebsd.org/changeset/base/242075 Log: Fix MINCLSIZE. It should be MHLEN + 1. Reviewed by: glebius Modified: head/share/man/man9/mbuf.9 Modified: head/share/man/man9/mbuf.9 == --- head/share/man/man9/mbuf.9 Thu Oct 25 08:37:08 2012(r242074) +++ head/share/man/man9/mbuf.9 Thu Oct 25 08:38:43 2012(r242075) @@ -331,10 +331,9 @@ The system defines an advisory macro .Dv MINCLSIZE , which is the smallest amount of data to put into an .Vt mbuf cluster . -It is equal to the sum of -.Dv MLEN -and -.Dv MHLEN . +It is equal to +.Dv MHLEN +plus one. It is typically preferable to store data into the data region of an .Vt mbuf , if size permits, as opposed to allocating a separate ___ 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: r242076 - head/sys/netinet
Author: glebius
Date: Thu Oct 25 09:00:57 2012
New Revision: 242076
URL: http://svn.freebsd.org/changeset/base/242076
Log:
Fix error in r241913 that had broken fragment reassembly.
Modified:
head/sys/netinet/ip_input.c
Modified: head/sys/netinet/ip_input.c
==
--- head/sys/netinet/ip_input.c Thu Oct 25 08:38:43 2012(r242075)
+++ head/sys/netinet/ip_input.c Thu Oct 25 09:00:57 2012(r242076)
@@ -904,7 +904,7 @@ found:
* Make sure that fragments have a data length
* that's a non-zero multiple of 8 bytes.
*/
- if (ntohs(ip-ip_len) == 0 || (ntohs(ip-ip_len 0x7) != 0)) {
+ if (ip-ip_len == htons(0) || (ntohs(ip-ip_len) 0x7) != 0) {
IPSTAT_INC(ips_toosmall); /* XXX */
goto dropfrag;
}
___
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: r242077 - head/sys/netinet
Author: glebius Date: Thu Oct 25 09:02:21 2012 New Revision: 242077 URL: http://svn.freebsd.org/changeset/base/242077 Log: After r241923 the updated ip_len no longer needed. Modified: head/sys/netinet/ip_input.c Modified: head/sys/netinet/ip_input.c == --- head/sys/netinet/ip_input.c Thu Oct 25 09:00:57 2012(r242076) +++ head/sys/netinet/ip_input.c Thu Oct 25 09:02:21 2012(r242077) @@ -728,7 +728,6 @@ ours: ip = mtod(m, struct ip *); /* Get the header length of the reassembled packet */ hlen = ip-ip_hl 2; - ip_len = ntohs(ip-ip_len); } #ifdef IPSEC ___ 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: r242078 - in head/sys: kern sys
Author: ed
Date: Thu Oct 25 09:05:21 2012
New Revision: 242078
URL: http://svn.freebsd.org/changeset/base/242078
Log:
Correct SIGTTIN handling.
In the old TTY layer, SIGTTIN was correctly handled like this:
while (data should be read) {
send SIGTTIN if not foreground process group
read data
}
In the new TTY layer, however, this behaviour was changed, based on a
false interpretation of the standard:
send SIGTTIN if not foreground process group
while (data should be read) {
read data
}
Correct this by pushing tty_wait_background() into the ttydisc_read_*()
functions.
Reported by: koitsu
PR: kern/173010
MFC after:2 weeks
Modified:
head/sys/kern/tty.c
head/sys/kern/tty_ttydisc.c
head/sys/sys/tty.h
Modified: head/sys/kern/tty.c
==
--- head/sys/kern/tty.c Thu Oct 25 09:02:21 2012(r242077)
+++ head/sys/kern/tty.c Thu Oct 25 09:05:21 2012(r242078)
@@ -361,7 +361,7 @@ tty_is_ctty(struct tty *tp, struct proc
return (p-p_session == tp-t_session p-p_flag P_CONTROLT);
}
-static int
+int
tty_wait_background(struct tty *tp, struct thread *td, int sig)
{
struct proc *p = td-td_proc;
@@ -433,13 +433,6 @@ ttydev_read(struct cdev *dev, struct uio
error = ttydev_enter(tp);
if (error)
goto done;
-
- error = tty_wait_background(tp, curthread, SIGTTIN);
- if (error) {
- tty_unlock(tp);
- goto done;
- }
-
error = ttydisc_read(tp, uio, ioflag);
tty_unlock(tp);
Modified: head/sys/kern/tty_ttydisc.c
==
--- head/sys/kern/tty_ttydisc.c Thu Oct 25 09:02:21 2012(r242077)
+++ head/sys/kern/tty_ttydisc.c Thu Oct 25 09:05:21 2012(r242078)
@@ -126,6 +126,10 @@ ttydisc_read_canonical(struct tty *tp, s
breakc[n] = '\0';
do {
+ error = tty_wait_background(tp, curthread, SIGTTIN);
+ if (error)
+ return (error);
+
/*
* Quite a tricky case: unlike the old TTY
* implementation, this implementation copies data back
@@ -192,6 +196,10 @@ ttydisc_read_raw_no_timer(struct tty *tp
*/
for (;;) {
+ error = tty_wait_background(tp, curthread, SIGTTIN);
+ if (error)
+ return (error);
+
error = ttyinq_read_uio(tp-t_inq, tp, uio,
uio-uio_resid, 0);
if (error)
@@ -229,6 +237,10 @@ ttydisc_read_raw_read_timer(struct tty *
timevaladd(end, now);
for (;;) {
+ error = tty_wait_background(tp, curthread, SIGTTIN);
+ if (error)
+ return (error);
+
error = ttyinq_read_uio(tp-t_inq, tp, uio,
uio-uio_resid, 0);
if (error)
@@ -278,6 +290,10 @@ ttydisc_read_raw_interbyte_timer(struct
*/
for (;;) {
+ error = tty_wait_background(tp, curthread, SIGTTIN);
+ if (error)
+ return (error);
+
error = ttyinq_read_uio(tp-t_inq, tp, uio,
uio-uio_resid, 0);
if (error)
Modified: head/sys/sys/tty.h
==
--- head/sys/sys/tty.h Thu Oct 25 09:02:21 2012(r242077)
+++ head/sys/sys/tty.h Thu Oct 25 09:05:21 2012(r242078)
@@ -180,6 +180,7 @@ voidtty_signal_sessleader(struct tty *t
void tty_signal_pgrp(struct tty *tp, int signal);
/* Waking up readers/writers. */
inttty_wait(struct tty *tp, struct cv *cv);
+inttty_wait_background(struct tty *tp, struct thread *td, int sig);
inttty_timedwait(struct tty *tp, struct cv *cv, int timo);
void tty_wakeup(struct tty *tp, int flags);
___
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: r242079 - in head: sbin/ipfw share/man/man4 sys/conf sys/net sys/netinet sys/netinet6 sys/netpfil/ipfw
Author: ae Date: Thu Oct 25 09:39:14 2012 New Revision: 242079 URL: http://svn.freebsd.org/changeset/base/242079 Log: Remove the IPFIREWALL_FORWARD kernel option and make possible to turn on the related functionality in the runtime via the sysctl variable net.pfil.forward. It is turned off by default. Sponsored by: Yandex LLC Discussed with: net@ MFC after:2 weeks Modified: head/sbin/ipfw/ipfw.8 head/share/man/man4/ipfirewall.4 head/sys/conf/NOTES head/sys/conf/options head/sys/net/pfil.c head/sys/net/pfil.h head/sys/netinet/ip_fastfwd.c head/sys/netinet/ip_input.c head/sys/netinet/ip_output.c head/sys/netinet/tcp_input.c head/sys/netinet/udp_usrreq.c head/sys/netinet6/ip6_forward.c head/sys/netinet6/ip6_input.c head/sys/netinet6/ip6_output.c head/sys/netinet6/udp6_usrreq.c head/sys/netpfil/ipfw/ip_fw2.c head/sys/netpfil/ipfw/ip_fw_pfil.c head/sys/netpfil/ipfw/ip_fw_sockopt.c Modified: head/sbin/ipfw/ipfw.8 == --- head/sbin/ipfw/ipfw.8 Thu Oct 25 09:05:21 2012(r242078) +++ head/sbin/ipfw/ipfw.8 Thu Oct 25 09:39:14 2012(r242079) @@ -1,7 +1,7 @@ .\ .\ $FreeBSD$ .\ -.Dd July 16, 2012 +.Dd October 25, 2012 .Dt IPFW 8 .Os .Sh NAME @@ -777,8 +777,11 @@ use with transparent proxy servers. .Pp To enable .Cm fwd -a custom kernel needs to be compiled with the option -.Cd options IPFIREWALL_FORWARD . +the +.Xr sysctl 8 +variable +.Va net.pfil.forward +should be set to 1. .It Cm nat Ar nat_nr | tablearg Pass packet to a nat instance Modified: head/share/man/man4/ipfirewall.4 == --- head/share/man/man4/ipfirewall.4Thu Oct 25 09:05:21 2012 (r242078) +++ head/share/man/man4/ipfirewall.4Thu Oct 25 09:39:14 2012 (r242079) @@ -1,7 +1,7 @@ .\ .\ $FreeBSD$ .\ -.Dd September 1, 2006 +.Dd October 25, 2012 .Dt IPFW 4 .Os .Sh NAME @@ -20,7 +20,6 @@ Other related kernel options which may also be useful are: .Bd -ragged -offset indent .Cd options IPFIREWALL_DEFAULT_TO_ACCEPT -.Cd options IPFIREWALL_FORWARD .Cd options IPFIREWALL_VERBOSE .Cd options IPFIREWALL_VERBOSE_LIMIT=100 .Ed @@ -71,12 +70,6 @@ from flooding system logs or causing loc This option may be set to the number of packets which will be logged on a per-entry basis before the entry is rate-limited. .Pp -Policy routing and transparent forwarding features of -.Nm -can be enabled by -.Dv IPFIREWALL_FORWARD -kernel option. -.Pp The user interface for .Nm is implemented by the Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Thu Oct 25 09:05:21 2012(r242078) +++ head/sys/conf/NOTES Thu Oct 25 09:39:14 2012(r242079) @@ -897,12 +897,6 @@ device lagg # IPDIVERT enables the divert IP sockets, used by ``ipfw divert''. It # depends on IPFIREWALL if compiled into the kernel. # -# IPFIREWALL_FORWARD enables changing of the packet destination either -# to do some sort of policy routing or transparent proxying. Used by -# ``ipfw forward''. All redirections apply to locally generated -# packets too. Because of this great care is required when -# crafting the ruleset. -# # IPFIREWALL_NAT adds support for in kernel nat in ipfw, and it requires # LIBALIAS. # @@ -923,7 +917,6 @@ options IPFIREWALL #firewall optionsIPFIREWALL_VERBOSE #enable logging to syslogd(8) optionsIPFIREWALL_VERBOSE_LIMIT=100#limit verbosity optionsIPFIREWALL_DEFAULT_TO_ACCEPT#allow everything by default -optionsIPFIREWALL_FORWARD #packet destination changes optionsIPFIREWALL_NAT #ipfw kernel nat support optionsIPDIVERT#divert sockets optionsIPFILTER#ipfilter support Modified: head/sys/conf/options == --- head/sys/conf/options Thu Oct 25 09:05:21 2012(r242078) +++ head/sys/conf/options Thu Oct 25 09:39:14 2012(r242079) @@ -398,7 +398,6 @@ IPFILTER_LOGopt_ipfilter.h IPFILTER_LOOKUPopt_ipfilter.h IPFIREWALL opt_ipfw.h IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h -IPFIREWALL_FORWARD opt_ipfw.h IPFIREWALL_NAT opt_ipfw.h IPFIREWALL_VERBOSE opt_ipfw.h IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h Modified: head/sys/net/pfil.c == --- head/sys/net/pfil.c Thu Oct 25 09:05:21 2012(r242078) +++ head/sys/net/pfil.c Thu Oct 25 09:39:14 2012(r242079) @@ -37,6 +37,7 @@ #include sys/rmlock.h #include sys/socket.h #include sys/socketvar.h +#include sys/sysctl.h #include sys/systm.h #include sys/condvar.h #include sys/lock.h
Re: svn commit: r242029 - head/sys/kern
On Wed, Oct 24, 2012 at 6:46 PM, Alfred Perlstein alf...@freebsd.org wrote:
Author: alfred
Date: Thu Oct 25 01:46:20 2012
New Revision: 242029
URL: http://svn.freebsd.org/changeset/base/242029
Log:
Allow autotune maxusers 384 on 64 bit machines
A default install on large memory machines with multiple 10gigE interfaces
were not being given enough mbufs to do full bandwidth TCP or NFS traffic.
To keep the value somewhat reasonable, we scale back the number of
maxuers by 1/6 past the 384 point. This gives us enough mbufs for most
of our pretty basic 10gigE line-speed tests to complete.
Modified:
head/sys/kern/subr_param.c
Modified: head/sys/kern/subr_param.c
==
--- head/sys/kern/subr_param.c Thu Oct 25 01:27:01 2012(r242028)
+++ head/sys/kern/subr_param.c Thu Oct 25 01:46:20 2012(r242029)
@@ -278,8 +278,16 @@ init_param2(long physpages)
maxusers = physpages / (2 * 1024 * 1024 / PAGE_SIZE);
if (maxusers 32)
maxusers = 32;
- if (maxusers 384)
- maxusers = 384;
+ /*
+* Clips maxusers to 384 on machines with = 4GB RAM or 32bit.
+* Scales it down 6x for large memory machines.
+*/
+ if (maxusers 384) {
+ if (sizeof(void *) = 4)
+ maxusers = 384;
+ else
+ maxusers = 384 + ((maxusers - 384) / 6);
Why `/ 6` (other than the fact that it makes the value presumably
a multiple of 64)? Also, shouldn't some kind of clamping be taking
place to ensure that this the end result of the calculation is a
multiple of a power of two, e.g. 16, 32, 64, etc?
And as usual, got ministat :)?
Thanks!
-Garrett
___
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: r242080 - in head/contrib/llvm/tools/clang: include/clang/Basic lib/Sema
Author: ed
Date: Thu Oct 25 10:13:58 2012
New Revision: 242080
URL: http://svn.freebsd.org/changeset/base/242080
Log:
Pull in r166498 from upstream clang trunk:
Add a new warning -Wmissing-variable-declarations, to warn about variables
defined without a previous declaration. This is similar to
-Wmissing-prototypes, but for variables instead of functions.
Modified:
head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp
head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
Modified:
head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
==
--- head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
Thu Oct 25 09:39:14 2012(r242079)
+++ head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
Thu Oct 25 10:13:58 2012(r242080)
@@ -3058,6 +3058,9 @@ def note_sentinel_here : Note
def warn_missing_prototype : Warning
no previous prototype for function %0,
InGroupDiagGroupmissing-prototypes, DefaultIgnore;
+def warn_missing_variable_declarations : Warning
+ no previous extern declaration for non-static variable %0,
+ InGroupDiagGroupmissing-variable-declarations, DefaultIgnore;
def err_redefinition : Errorredefinition of %0;
def err_definition_of_implicitly_declared_member : Error
definition of implicitly declared %select{default constructor|copy
Modified: head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp
==
--- head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp Thu Oct 25 09:39:14
2012(r242079)
+++ head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp Thu Oct 25 10:13:58
2012(r242080)
@@ -648,6 +648,8 @@ void Sema::ActOnEndOfTranslationUnit() {
diag::err_tentative_def_incomplete_type))
VD-setInvalidDecl();
+CheckCompleteVariableDeclaration(VD);
+
// Notify the consumer that we've completed a tentative definition.
if (!VD-isInvalidDecl())
Consumer.CompleteTentativeDefinition(VD);
Modified: head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
==
--- head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp Thu Oct 25 09:39:14
2012(r242079)
+++ head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp Thu Oct 25 10:13:58
2012(r242080)
@@ -6957,6 +6957,17 @@ void Sema::CheckCompleteVariableDeclarat
}
}
+ if (var-isThisDeclarationADefinition()
+ var-getLinkage() == ExternalLinkage) {
+// Find a previous declaration that's not a definition.
+VarDecl *prev = var-getPreviousDecl();
+while (prev prev-isThisDeclarationADefinition())
+ prev = prev-getPreviousDecl();
+
+if (!prev)
+ Diag(var-getLocation(), diag::warn_missing_variable_declarations)
var;
+ }
+
// All the following checks are C++ only.
if (!getLangOpts().CPlusPlus) return;
___
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: r242081 - in stable/8: sys/dev/alc sys/dev/bge sys/dev/cxgb sys/dev/cxgbe sys/dev/e1000 sys/dev/et sys/dev/jme sys/dev/pci sys/dev/re usr.sbin/pciconf
Author: gavin
Date: Thu Oct 25 10:29:15 2012
New Revision: 242081
URL: http://svn.freebsd.org/changeset/base/242081
Log:
Merge r240680 from head:
Align the PCI Express #defines with the style used for the PCI-X
#defines. This has the advantage that it makes the names more
compact, and also allows us to correct the non-uniform naming of
the PCIM_LINK_* defines, making them all consistent amongst themselves.
This is a mostly mechanical rename:
s/PCIR_EXPRESS_/PCIER_/g
s/PCIM_EXP_/PCIEM_/g
s/PCIM_LINK_/PCIEM_LINK_/g
In this MFC, #defines have been added for the old names to assist
merges and out-of-tree drivers.
Modified:
stable/8/sys/dev/alc/if_alc.c
stable/8/sys/dev/bge/if_bge.c
stable/8/sys/dev/cxgb/cxgb_main.c
stable/8/sys/dev/cxgb/cxgb_osdep.h
stable/8/sys/dev/cxgbe/osdep.h
stable/8/sys/dev/cxgbe/t4_main.c
stable/8/sys/dev/e1000/if_em.c
stable/8/sys/dev/et/if_et.c
stable/8/sys/dev/jme/if_jme.c
stable/8/sys/dev/pci/pci.c
stable/8/sys/dev/pci/pcireg.h
stable/8/sys/dev/re/if_re.c
stable/8/usr.sbin/pciconf/cap.c
stable/8/usr.sbin/pciconf/err.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/alc/ (props changed)
stable/8/sys/dev/bge/ (props changed)
stable/8/sys/dev/cxgb/ (props changed)
stable/8/sys/dev/cxgbe/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
stable/8/sys/dev/et/ (props changed)
stable/8/sys/dev/jme/ (props changed)
stable/8/sys/dev/re/ (props changed)
stable/8/sys/powerpc/ (props changed)
stable/8/usr.sbin/pciconf/ (props changed)
Modified: stable/8/sys/dev/alc/if_alc.c
==
--- stable/8/sys/dev/alc/if_alc.c Thu Oct 25 10:13:58 2012
(r242080)
+++ stable/8/sys/dev/alc/if_alc.c Thu Oct 25 10:29:15 2012
(r242081)
@@ -683,7 +683,7 @@ alc_aspm(struct alc_softc *sc, int media
if ((sc-alc_flags (ALC_FLAG_APS | ALC_FLAG_PCIE)) ==
(ALC_FLAG_APS | ALC_FLAG_PCIE))
linkcfg = CSR_READ_2(sc, sc-alc_expcap +
- PCIR_EXPRESS_LINK_CTL);
+ PCIER_LINK_CTL);
else
linkcfg = 0;
pmcfg = ~PM_CFG_SERDES_PD_EX_L1;
@@ -698,7 +698,7 @@ alc_aspm(struct alc_softc *sc, int media
if (sc-alc_ident-deviceid == DEVICEID_ATHEROS_AR8152_B
sc-alc_rev == ATHEROS_AR8152_B_V10)
linkcfg |= 0x80;
- CSR_WRITE_2(sc, sc-alc_expcap + PCIR_EXPRESS_LINK_CTL,
+ CSR_WRITE_2(sc, sc-alc_expcap + PCIER_LINK_CTL,
linkcfg);
pmcfg = ~(PM_CFG_EN_BUFS_RX_L0S | PM_CFG_SA_DLY_ENB |
PM_CFG_HOTRST);
@@ -798,10 +798,10 @@ alc_attach(device_t dev)
if (pci_find_extcap(dev, PCIY_EXPRESS, base) == 0) {
sc-alc_flags |= ALC_FLAG_PCIE;
sc-alc_expcap = base;
- burst = CSR_READ_2(sc, base + PCIR_EXPRESS_DEVICE_CTL);
+ burst = CSR_READ_2(sc, base + PCIER_DEVICE_CTL);
sc-alc_dma_rd_burst =
- (burst PCIM_EXP_CTL_MAX_READ_REQUEST) 12;
- sc-alc_dma_wr_burst = (burst PCIM_EXP_CTL_MAX_PAYLOAD) 5;
+ (burst PCIEM_CTL_MAX_READ_REQUEST) 12;
+ sc-alc_dma_wr_burst = (burst PCIEM_CTL_MAX_PAYLOAD) 5;
if (bootverbose) {
device_printf(dev, Read request size : %u bytes.\n,
alc_dma_burst[sc-alc_dma_rd_burst]);
@@ -831,9 +831,9 @@ alc_attach(device_t dev)
CSR_WRITE_4(sc, ALC_PCIE_PHYMISC2, val);
}
/* Disable ASPM L0S and L1. */
- cap = CSR_READ_2(sc, base + PCIR_EXPRESS_LINK_CAP);
- if ((cap PCIM_LINK_CAP_ASPM) != 0) {
- ctl = CSR_READ_2(sc, base + PCIR_EXPRESS_LINK_CTL);
+ cap = CSR_READ_2(sc, base + PCIER_LINK_CAP);
+ if ((cap PCIEM_LINK_CAP_ASPM) != 0) {
+ ctl = CSR_READ_2(sc, base + PCIER_LINK_CTL);
if ((ctl 0x08) != 0)
sc-alc_rcb = DMA_CFG_RCB_128;
if (bootverbose)
Modified: stable/8/sys/dev/bge/if_bge.c
==
--- stable/8/sys/dev/bge/if_bge.c Thu Oct 25 10:13:58 2012
(r242080)
+++ stable/8/sys/dev/bge/if_bge.c Thu Oct 25 10:29:15 2012
(r242081)
@@ -3650,17 +3650,17 @@ bge_reset(struct bge_softc *sc)
pci_write_config(dev, 0xC4, val | (1 15), 4);
}
devctl = pci_read_config(dev,
- sc-bge_expcap + PCIR_EXPRESS_DEVICE_CTL, 2);
+ sc-bge_expcap + PCIER_DEVICE_CTL, 2);
/* Clear
svn commit: r242082 - head
Author: ae Date: Thu Oct 25 10:35:08 2012 New Revision: 242082 URL: http://svn.freebsd.org/changeset/base/242082 Log: Note the removal of the IPFIREWALL_FORWARD kernel option. Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Thu Oct 25 10:29:15 2012(r242081) +++ head/UPDATING Thu Oct 25 10:35:08 2012(r242082) @@ -24,6 +24,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run ln -s 'abort:false,junk:false' /etc/malloc.conf.) +20121025: + The IPFIREWALL_FORWARD kernel option has been removed. Its + functionality now can be turned on using the net.pfil.forward + sysctl variable. + 20121023: The ZERO_COPY_SOCKET kernel option has been removed and split into SOCKET_SEND_COW and SOCKET_RECV_PFLIP. ___ 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: r242074 - head/etc/rc.d
On 2012-10-25 10:37, Brian Somers wrote:
...
URL: http://svn.freebsd.org/changeset/base/242074
Log:
Enable accept_rtadvd on interfaces running rtadvd.
...
+ for iface in ${command_args}; do
+ ifconfig ${iface} inet6 -accept_rtadv
+ done
The commit message says it enables accept_rtadv, the code actually
disables it. Which is correct? I assume the latter?
___
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: r242074 - head/etc/rc.d
Dimitry Andric d...@freebsd.org wrote
in 50892486.9030...@freebsd.org:
di On 2012-10-25 10:37, Brian Somers wrote:
di ...
di URL: http://svn.freebsd.org/changeset/base/242074
di
di Log:
di Enable accept_rtadvd on interfaces running rtadvd.
di ...
di + for iface in ${command_args}; do
di + ifconfig ${iface} inet6 -accept_rtadv
di + done
di
di The commit message says it enables accept_rtadv, the code actually
di disables it. Which is correct? I assume the latter?
Enabling accept_rtadv should prevent rtadvd from sending RAs on the
interface, so disabling it is a necessary step if one wants to send
RAs.
However, accept_rtadv is off by default in the current rc.d
framework. Why forcibly disabling it is needed?
-- Hiroki
pgpzfdE2ee4gI.pgp
Description: PGP signature
Re: svn commit: r242080 - in head/contrib/llvm/tools/clang: include/clang/Basic lib/Sema
Why? I can understand cherry picking revisions that fix bugs FreeBSD
users hit but why additional features?
Why cant this wait for next proper llvm/clang import?
On Thu, Oct 25, 2012 at 10:13:58AM +, Ed Schouten wrote:
Author: ed
Date: Thu Oct 25 10:13:58 2012
New Revision: 242080
URL: http://svn.freebsd.org/changeset/base/242080
Log:
Pull in r166498 from upstream clang trunk:
Add a new warning -Wmissing-variable-declarations, to warn about variables
defined without a previous declaration. This is similar to
-Wmissing-prototypes, but for variables instead of functions.
Modified:
head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp
head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
Modified:
head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
==
--- head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
Thu Oct 25 09:39:14 2012(r242079)
+++ head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
Thu Oct 25 10:13:58 2012(r242080)
@@ -3058,6 +3058,9 @@ def note_sentinel_here : Note
def warn_missing_prototype : Warning
no previous prototype for function %0,
InGroupDiagGroupmissing-prototypes, DefaultIgnore;
+def warn_missing_variable_declarations : Warning
+ no previous extern declaration for non-static variable %0,
+ InGroupDiagGroupmissing-variable-declarations, DefaultIgnore;
def err_redefinition : Errorredefinition of %0;
def err_definition_of_implicitly_declared_member : Error
definition of implicitly declared %select{default constructor|copy
Modified: head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp
==
--- head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp Thu Oct 25 09:39:14
2012(r242079)
+++ head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp Thu Oct 25 10:13:58
2012(r242080)
@@ -648,6 +648,8 @@ void Sema::ActOnEndOfTranslationUnit() {
diag::err_tentative_def_incomplete_type))
VD-setInvalidDecl();
+CheckCompleteVariableDeclaration(VD);
+
// Notify the consumer that we've completed a tentative definition.
if (!VD-isInvalidDecl())
Consumer.CompleteTentativeDefinition(VD);
Modified: head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
==
--- head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp Thu Oct 25
09:39:14 2012(r242079)
+++ head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp Thu Oct 25
10:13:58 2012(r242080)
@@ -6957,6 +6957,17 @@ void Sema::CheckCompleteVariableDeclarat
}
}
+ if (var-isThisDeclarationADefinition()
+ var-getLinkage() == ExternalLinkage) {
+// Find a previous declaration that's not a definition.
+VarDecl *prev = var-getPreviousDecl();
+while (prev prev-isThisDeclarationADefinition())
+ prev = prev-getPreviousDecl();
+
+if (!prev)
+ Diag(var-getLocation(), diag::warn_missing_variable_declarations)
var;
+ }
+
// All the following checks are C++ only.
if (!getLangOpts().CPlusPlus) return;
___
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: r242029 - head/sys/kern
On Thu, 25 Oct 2012, Konstantin Belousov wrote:
On Thu, Oct 25, 2012 at 01:46:21AM +, Alfred Perlstein wrote:
...
Modified: head/sys/kern/subr_param.c
==
--- head/sys/kern/subr_param.c Thu Oct 25 01:27:01 2012(r242028)
+++ head/sys/kern/subr_param.c Thu Oct 25 01:46:20 2012(r242029)
@@ -278,8 +278,16 @@ init_param2(long physpages)
maxusers = physpages / (2 * 1024 * 1024 / PAGE_SIZE);
if (maxusers 32)
maxusers = 32;
- if (maxusers 384)
- maxusers = 384;
+ /*
+* Clips maxusers to 384 on machines with = 4GB RAM or 32bit.
+* Scales it down 6x for large memory machines.
+*/
+ if (maxusers 384) {
+ if (sizeof(void *) = 4)
+ maxusers = 384;
+ else
+ maxusers = 384 + ((maxusers - 384) / 6);
+ }
This is unbelievably weird way to express the '64bit'. The
#ifdef _LP64 is enough there instead of the runtime check.
Such runtime checks are well optimized by compilers, giving nicer code than
ifdefs.
However, there are lots of other style bugs:
- comments writtens not in English is
- after deciphering the comments, we see that they match the code only in
the unbelievably weird ways:
(1) = 4GB RAM isn't necessarily related to the size of void *.
In fact, the size of physical memory certainly isn't related. The
size of virtual memory is more closely related. But it is the
physical memory size that is most relevant here.
(2) 32 bitness isn't necessaril related to the size of void *.
- after fixing the comments, they would just echo the code, and thus
shouldn't be made. No comments are made for the other maxusers
initializations, although it would be easy to write ones 10 times
longer than this mail to describe all the historical bogus tuning
given by maxusers.
- half a level of indentation for the maxusers lines
- excessive parentheses.
Bruce
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r242079 - in head: sbin/ipfw share/man/man4 sys/conf sys/net sys/netinet sys/netinet6 sys/netpfil/ipfw
On Thursday, October 25, 2012 5:39:15 am Andrey V. Elsukov wrote: Author: ae Date: Thu Oct 25 09:39:14 2012 New Revision: 242079 URL: http://svn.freebsd.org/changeset/base/242079 Log: Remove the IPFIREWALL_FORWARD kernel option and make possible to turn on the related functionality in the runtime via the sysctl variable net.pfil.forward. It is turned off by default. Certainly for MFC's I think it makes sense to retain the option, but make the option simply change the default from off to on. That avoids breaking existing kernel configurations. -- 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: r242013 - head/sys/net
On Wednesday, October 24, 2012 3:05:53 pm Gleb Smirnoff wrote: On Wed, Oct 24, 2012 at 02:42:33PM -0400, John Baldwin wrote: J On Wednesday, October 24, 2012 2:33:44 pm Gleb Smirnoff wrote: J Author: glebius J Date: Wed Oct 24 18:33:44 2012 J New Revision: 242013 J URL: http://svn.freebsd.org/changeset/base/242013 J J Log: JFix fallout from r240071. If destination interface lookup fails, Jwe should broadcast a packet, not try to deliver it to NULL. J JReported by: rpaulo J J I wonder if this fixes the panic someone was reporting on net@ when removing J an interface from a bridge? I failed to find it on net@ or bugs@ in a timeframe after I committed if_transmit patch to bridge. Ah, it was on current@: Subject: panic possibly on on bridge member removal It definitely had a null ifnet pointer. -- 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: r242029 - head/sys/kern
On Thursday, October 25, 2012 4:05:51 am Konstantin Belousov wrote:
On Thu, Oct 25, 2012 at 01:46:21AM +, Alfred Perlstein wrote:
Author: alfred
Date: Thu Oct 25 01:46:20 2012
New Revision: 242029
URL: http://svn.freebsd.org/changeset/base/242029
Log:
Allow autotune maxusers 384 on 64 bit machines
A default install on large memory machines with multiple 10gigE interfaces
were not being given enough mbufs to do full bandwidth TCP or NFS traffic.
To keep the value somewhat reasonable, we scale back the number of
maxuers by 1/6 past the 384 point. This gives us enough mbufs for most
of our pretty basic 10gigE line-speed tests to complete.
Modified:
head/sys/kern/subr_param.c
Modified: head/sys/kern/subr_param.c
==
--- head/sys/kern/subr_param.c Thu Oct 25 01:27:01 2012
(r242028)
+++ head/sys/kern/subr_param.c Thu Oct 25 01:46:20 2012
(r242029)
@@ -278,8 +278,16 @@ init_param2(long physpages)
maxusers = physpages / (2 * 1024 * 1024 / PAGE_SIZE);
if (maxusers 32)
maxusers = 32;
- if (maxusers 384)
- maxusers = 384;
+ /*
+* Clips maxusers to 384 on machines with = 4GB RAM or 32bit.
+* Scales it down 6x for large memory machines.
+*/
+ if (maxusers 384) {
+ if (sizeof(void *) = 4)
+ maxusers = 384;
+ else
+ maxusers = 384 + ((maxusers - 384) / 6);
+ }
This is unbelievably weird way to express the '64bit'. The
#ifdef _LP64 is enough there instead of the runtime check.
Also, are you sure that all our 64bit arches do not have KVA limitations ?
There is an active thread on current@ with a different patch that uses a KVA
constant to derive 384 instead. When we have updated tuning in the past
(e.g. adjusting the cap on maxvnodes), there was a bit of discussion rather
than a random drive by commit. I think we should probably hold off on making
changes here and figure out what the right way to fix this is in the thread on
current@ instead. Andre has already suggested divorcing mbuf tuning from
maxusers entirely for example.
--
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: r242079 - in head: sbin/ipfw share/man/man4 sys/conf sys/net sys/netinet sys/netinet6 sys/netpfil/ipfw
On 25.10.2012 17:28, John Baldwin wrote: Remove the IPFIREWALL_FORWARD kernel option and make possible to turn on the related functionality in the runtime via the sysctl variable net.pfil.forward. It is turned off by default. Certainly for MFC's I think it makes sense to retain the option, but make the option simply change the default from off to on. That avoids breaking existing kernel configurations. Yes, this is exactly what i plan to do. -- WBR, Andrey V. Elsukov signature.asc Description: OpenPGP digital signature
svn commit: r242083 - in stable/8/etc: defaults rc.d
Author: kuriyama
Date: Thu Oct 25 15:25:17 2012
New Revision: 242083
URL: http://svn.freebsd.org/changeset/base/242083
Log:
Merge r239382:
- Allow to pass extra parameters for each jails.
- To achieve above, convert jail(8) invocation to use new style
command line -c flag.
Thanks to: lstewart
Modified:
stable/8/etc/defaults/rc.conf
stable/8/etc/rc.d/jail
Directory Properties:
stable/8/etc/ (props changed)
Modified: stable/8/etc/defaults/rc.conf
==
--- stable/8/etc/defaults/rc.conf Thu Oct 25 10:35:08 2012
(r242082)
+++ stable/8/etc/defaults/rc.conf Thu Oct 25 15:25:17 2012
(r242083)
@@ -686,6 +686,7 @@ jail_sysvipc_allow=NO # Allow SystemV
#jail_example_mount_enable=NO# mount/umount jail's fs
#jail_example_fstab= # fstab(5) for mount/umount
#jail_example_flags=-l -U root # flags for jail(8)
+#jail_example_parameters=allow.raw_sockets=1 # extra parameters for this jail
##
### Define source_rc_confs, the mechanism used by /etc/rc.* ##
Modified: stable/8/etc/rc.d/jail
==
--- stable/8/etc/rc.d/jail Thu Oct 25 10:35:08 2012(r242082)
+++ stable/8/etc/rc.d/jail Thu Oct 25 15:25:17 2012(r242083)
@@ -113,6 +113,8 @@ init_variables()
[ -z ${_flags} ] _flags=-l -U root
eval _consolelog=\\${jail_${_j}_consolelog:-${jail_consolelog}}\
[ -z ${_consolelog} ] _consolelog=/var/log/jail_${_j}_console.log
+ eval _parameters=\\${jail_${_j}_parameters:-${jail_parameters}}\
+ [ -z ${_parameters} ] _parameters=
eval _fib=\\${jail_${_j}_fib:-${jail_fib}}\
# Debugging aid
@@ -191,6 +193,7 @@ init_variables()
debug $_j flags: $_flags
debug $_j consolelog: $_consolelog
+ debug $_j parameters: $_parameters
if [ -z ${_hostname} ]; then
err 3 $name: No hostname has been defined for ${_j}
@@ -482,9 +485,19 @@ jail_handle_ips_option()
esac
# Append address to list of addresses for the jail command.
- case ${_addrl} in
- ) _addrl=${_addr} ;;
- *) _addrl=${_addrl},${_addr} ;;
+ case ${_type} in
+ inet)
+ case ${_addrl} in
+ ) _addrl=${_addr} ;;
+ *) _addrl=${_addrl},${_addr} ;;
+ esac
+ ;;
+ inet6)
+ case ${_addr6l} in
+ ) _addr6l=${_addr} ;;
+ *) _addr6l=${_addr6l},${_addr} ;;
+ esac
+ ;;
esac
# Configure interface alias if requested by a given interface
@@ -567,6 +580,7 @@ jail_start()
continue;
fi
_addrl=
+ _addr6l=
jail_ips add
if [ -n ${_fib} ]; then
_setfib=setfib -F '${_fib}'
@@ -632,8 +646,8 @@ jail_start()
i=$((i + 1))
done
- eval ${_setfib} jail ${_flags} -i ${_rootdir} ${_hostname} \
- \${_addrl}\ ${_exec_start} ${_tmp_jail} 21
+ eval ${_setfib} jail -n ${_jail} ${_flags} -i -c
path=${_rootdir} host.hostname=${_hostname} \
+ ip4.addr=\${_addrl}\ ip6.addr=\${_addr6l}\
${_parameters} command=${_exec_start} ${_tmp_jail} 21
if [ $? -eq 0 ] ; then
_jail_id=$(head -1 ${_tmp_jail})
___
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: r242084 - head/sys/boot/common
Author: mav
Date: Thu Oct 25 15:45:32 2012
New Revision: 242084
URL: http://svn.freebsd.org/changeset/base/242084
Log:
Remove new-line characters from the include() errors to make it consistent
with the rest of code.
Modified:
head/sys/boot/common/interp.c
Modified: head/sys/boot/common/interp.c
==
--- head/sys/boot/common/interp.c Thu Oct 25 15:25:17 2012
(r242083)
+++ head/sys/boot/common/interp.c Thu Oct 25 15:45:32 2012
(r242084)
@@ -211,7 +211,7 @@ include(const char *filename)
#endif
if (((fd = open(filename, O_RDONLY)) == -1)) {
- sprintf(command_errbuf,can't open '%s': %s\n, filename,
strerror(errno));
+ sprintf(command_errbuf,can't open '%s': %s, filename,
strerror(errno));
return(CMD_ERROR);
}
@@ -254,7 +254,7 @@ include(const char *filename)
free(se);
}
sprintf(command_errbuf, file '%s' line %d: memory allocation
- failure - aborting\n, filename, line);
+ failure - aborting, filename, line);
return (CMD_ERROR);
}
strcpy(sp-text, cp);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r242079 - in head: sbin/ipfw share/man/man4 sys/conf sys/net sys/netinet sys/netinet6 sys/netpfil/ipfw
On 25.10.2012 11:39, Andrey V. Elsukov wrote: Author: ae Date: Thu Oct 25 09:39:14 2012 New Revision: 242079 URL: http://svn.freebsd.org/changeset/base/242079 Log: Remove the IPFIREWALL_FORWARD kernel option and make possible to turn on the related functionality in the runtime via the sysctl variable net.pfil.forward. It is turned off by default. Sponsored by:Yandex LLC Discussed with: net@ MFC after: 2 weeks I still don't agree with naming the sysctl net.pfil.forward. This type of forwarding is a property of IPv4 and IPv6 and thus should be put there. Pfil hooking can be on layer 2, 2-bridging, 3 and who knows where else in the future. Forwarding works only for IPv46. You haven't even replied to my comment on net@. Please change the sysctl location and name to its appropriate place. Also an MFC's after 2 weeks must ensure that compiling with IPFIREWALL_ FORWARD enabled the sysctl at the same time to keep kernel configs within 9-stable working. -- Andre ___ 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: r242014 - head/sys/kern
On 25.10.2012 05:49, Bruce Evans wrote: On Wed, 24 Oct 2012, Attilio Rao wrote: On Wed, Oct 24, 2012 at 8:16 PM, Andre Oppermann an...@freebsd.org wrote: ... Let's go back and see how we can do this the sanest way. These are the options I see at the moment: 1. sprinkle __aligned(CACHE_LINE_SIZE) all over the place This is wrong because it doesn't give padding. Unless it is sprinkled in struct declarations. 2. use a macro like MTX_ALIGN that can be SMP/UP aware and in the future possibly change to a different compiler dependent align attribute What is this macro supposed to do? I don't understand that from your description. 3. embed __aligned(CACHE_LINE_SIZE) into struct mtx itself so it automatically gets aligned in all cases, even when dynamically allocated. This works but I think it is overkill for structures including sleep mutexes which are the vast majority. So I wouldn't certainly be in favor of such a patch. This doesn't work either with fully dynamic (auto) allocations. Stack alignment is generally broken (limited, and pessimized for both space and time) in gcc (it works better in clang). On amd64, it is limited by the default of -mpreferred-stack-boundary=4. Since 2**4 is smaller than the cache line size and stack alignments larger than it are broken in gcc, __aligned(CACHE_LINE_SIZE) never works (except accidentally, 16/CACHE_LINE_SIZE of the time. On i386, we reduce the space/time pessimizations a little by overriding the default to -mpreferred-stack-boundary=2. 2**2 is even smaller than the cache line size. (The pessimizations are for both space and time, since time and code space is wasted for the code to keep the stack aligned, and cache space and thus also time are wasted for padding. Most functions don't benefit from more than sizeof(register_t) alignment.) I'm not aware of stack allocated mutexes anywhere in the kernel. Even if there is a case it's very special and unique. I've verified that __aligned(CACHE_LINE_SIZE) on the definition of struct mtx itself (in sys/_mutex.h) correctly aligns and pads the global .bss resident mutexes for 64B and 128B cache line sizes. Dynamic allocations via malloc() get whatever alignment malloc() gives. This is only required to be 4 or 8 or 16 or so (the maximum for a C object declared in conforming C (no __align()), but malloc() usually gives more. If it gives CACHE_LINE_SIZE, that is wasteful for most small allocations. Stand-alone mutexes are normally not malloc'ed. They're always embedded into some larger structure they protect. __builtin_alloca() is broken in gcc-3.3.3, but works in gcc-4.2.1, at least on i386. In gcc-3.3.3, it assumes that the stack is the default 16-byte aligned even if -mpreferred-stack-boundary=2 is in CFLAGS to say otherwise, and just subtracts from the stack pointer. In gcc-4.2.1, it does the necessary andl of the stack pointer, but only 16-byte alignment. It is another bug that there sre no extensions of malloc() or alloca(). Since malloc() is in the library and may give CACHE_LINE_SIZE but __builtin_alloca() is in the compiler and only gives 16, these functions are not even as compatible as they should be. I don't know of any mutexes allocated on the stack, but there are stack frames with mcontexts in them that need special alignment so they cause problems on i386. They can't just be put on the stack due to the above bugs. They are laboriously allocated using malloc(). Since they are a quite large, 1 mcontext barely fits on the kernel stack, so kib didn't like my alloca() method for allocating them. You lost me here. -- Andre ___ 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: r242079 - in head: sbin/ipfw share/man/man4 sys/conf sys/net sys/netinet sys/netinet6 sys/netpfil/ipfw
On 25.10.2012 19:54, Andre Oppermann wrote: I still don't agree with naming the sysctl net.pfil.forward. This type of forwarding is a property of IPv4 and IPv6 and thus should be put there. Pfil hooking can be on layer 2, 2-bridging, 3 and who knows where else in the future. Forwarding works only for IPv46. You haven't even replied to my comment on net@. Please change the sysctl location and name to its appropriate place. Hi Andre, There were two replies related to this subject, you did not replied to them and i thought that you became agree. So, if not, what you think about the name net.pfil.ipforward? Also an MFC's after 2 weeks must ensure that compiling with IPFIREWALL_ FORWARD enabled the sysctl at the same time to keep kernel configs within 9-stable working. Yes, it will work like that. -- WBR, Andrey V. Elsukov ___ 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: r242074 - head/etc/rc.d
On Thu, Oct 25, 2012 at 09:00:07PM +0900, Hiroki Sato wrote:
Dimitry Andric d...@freebsd.org wrote
in 50892486.9030...@freebsd.org:
di On 2012-10-25 10:37, Brian Somers wrote:
di ...
di URL: http://svn.freebsd.org/changeset/base/242074
di
di Log:
di Enable accept_rtadvd on interfaces running rtadvd.
di ...
di + for iface in ${command_args}; do
di + ifconfig ${iface} inet6 -accept_rtadv
di + done
di
di The commit message says it enables accept_rtadv, the code actually
di disables it. Which is correct? I assume the latter?
Yes, the message should have read Enable sending router advertisments.
Sorry, the exact opposite came out - the naming does my head in :-/
Enabling accept_rtadv should prevent rtadvd from sending RAs on the
interface, so disabling it is a necessary step if one wants to send
RAs.
However, accept_rtadv is off by default in the current rc.d
framework. Why forcibly disabling it is needed?
After upgrading from 8-STABLE to 9-STABLE on Monday, IPv6 routing
advertisments were broken. Disabling accept (enabling send) appeared
to be necessary to get things up and running.
As you say, net.inet6.ip6.accept_rtadv is set to zero (off, meaning
that we *can* send advertisments), so I don't now what the issue
is. Irrespective of this, I think it's useful to explicitly set
the interface to be able to send advertisments when running rtadvd
- just in case the sysctl is set to 1 elsewhere.
Doing an ifconfig interface inet6 accept_rtadv after boot doesn't
seem to disable sending advertisments, so I'm finding it difficult
to test this remotely... testing is awkward when I'm not at home
as this machine is also suffering from the can't reboot issue!!
I'll look into why the sysctl doesn't seem to behave as expected
when I get home this evening.
--
Brian Somers br...@awfulhak.org
Don't _EVER_ lose your sense of humour ! br...@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: r242085 - head/usr.sbin/pciconf
Author: jimharris
Date: Thu Oct 25 17:22:37 2012
New Revision: 242085
URL: http://svn.freebsd.org/changeset/base/242085
Log:
For PCI Express capability, if max link width is greater than zero, print
the current and max link speed.
Sponsored by: Intel
Discussed with: jhb
MFC after:1 week
Modified:
head/usr.sbin/pciconf/cap.c
Modified: head/usr.sbin/pciconf/cap.c
==
--- head/usr.sbin/pciconf/cap.c Thu Oct 25 15:45:32 2012(r242084)
+++ head/usr.sbin/pciconf/cap.c Thu Oct 25 17:22:37 2012(r242085)
@@ -363,6 +363,22 @@ cap_subvendor(int fd, struct pci_conf *p
#defineMAX_PAYLOAD(field) (128 (field))
+static const char *
+link_speed_string(uint8_t speed)
+{
+
+ switch (speed) {
+ case 1:
+ return (2.5);
+ case 2:
+ return (5.0);
+ case 3:
+ return (8.0);
+ default:
+ return (undef);
+ }
+}
+
static void
cap_express(int fd, struct pci_conf *p, uint8_t ptr)
{
@@ -418,6 +434,16 @@ cap_express(int fd, struct pci_conf *p,
flags = read_config(fd, p-pc_sel, ptr+ PCIER_LINK_STA, 2);
printf( link x%d(x%d), (flags PCIEM_LINK_STA_WIDTH) 4,
(val PCIEM_LINK_CAP_MAX_WIDTH) 4);
+ /*
+* Only print link speed info if the link's max width is
+* greater than 0.
+*/
+ if ((val PCIEM_LINK_CAP_MAX_WIDTH) != 0) {
+ printf(\n speed);
+ printf( %s(%s), (flags PCIEM_LINK_STA_WIDTH) == 0 ?
+ 0.0 : link_speed_string(flags PCIEM_LINK_STA_SPEED),
+ link_speed_string(val PCIEM_LINK_CAP_MAX_SPEED));
+ }
}
static void
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r242086 - in head: share/man/man4 sys/dev/hptiop
Author: delphij Date: Thu Oct 25 17:29:11 2012 New Revision: 242086 URL: http://svn.freebsd.org/changeset/base/242086 Log: Update hptiop(4) to version 1.8, which added support for HighPoint RocketRAID 4500 series. Many thanks to HighPoint Technologies for their continued support of FreeBSD! Submitted by: HighPoint Technologies MFC after:3 days Modified: head/share/man/man4/hptiop.4 head/sys/dev/hptiop/hptiop.c head/sys/dev/hptiop/hptiop.h Modified: head/share/man/man4/hptiop.4 == --- head/share/man/man4/hptiop.4Thu Oct 25 17:22:37 2012 (r242085) +++ head/share/man/man4/hptiop.4Thu Oct 25 17:29:11 2012 (r242086) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd August 5, 2012 +.Dd October 25, 2012 .Dt HPTIOP 4 .Os .Sh NAME @@ -58,6 +58,10 @@ driver supports the following SAS and SA .Pp .Bl -bullet -compact .It +HighPoint RocketRAID 4522 +.It +HighPoint RocketRAID 4520 +.It HighPoint RocketRAID 4322 .It HighPoint RocketRAID 4321 Modified: head/sys/dev/hptiop/hptiop.c == --- head/sys/dev/hptiop/hptiop.cThu Oct 25 17:22:37 2012 (r242085) +++ head/sys/dev/hptiop/hptiop.cThu Oct 25 17:29:11 2012 (r242086) @@ -1,6 +1,6 @@ /* * HighPoint RR3xxx/4xxx RAID Driver for FreeBSD - * Copyright (C) 2007-2008 HighPoint Technologies, Inc. All Rights Reserved. + * Copyright (C) 2007-2012 HighPoint Technologies, Inc. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -89,8 +89,8 @@ __FBSDID($FreeBSD$); #include dev/hptiop/hptiop.h -static char driver_name[] = hptiop; -static char driver_version[] = v1.3 (010208); +static const char driver_name[] = hptiop; +static const char driver_version[] = v1.8; static devclass_t hptiop_devclass; @@ -99,41 +99,62 @@ static int hptiop_send_sync_msg(struct h static void hptiop_request_callback_itl(struct hpt_iop_hba *hba, u_int32_t req); static void hptiop_request_callback_mv(struct hpt_iop_hba *hba, u_int64_t req); +static void hptiop_request_callback_mvfrey(struct hpt_iop_hba *hba, + u_int32_t req); static void hptiop_os_message_callback(struct hpt_iop_hba *hba, u_int32_t msg); static int hptiop_do_ioctl_itl(struct hpt_iop_hba *hba, struct hpt_iop_ioctl_param *pParams); static int hptiop_do_ioctl_mv(struct hpt_iop_hba *hba, struct hpt_iop_ioctl_param *pParams); +static int hptiop_do_ioctl_mvfrey(struct hpt_iop_hba *hba, + struct hpt_iop_ioctl_param *pParams); static int hptiop_rescan_bus(struct hpt_iop_hba *hba); static int hptiop_alloc_pci_res_itl(struct hpt_iop_hba *hba); static int hptiop_alloc_pci_res_mv(struct hpt_iop_hba *hba); +static int hptiop_alloc_pci_res_mvfrey(struct hpt_iop_hba *hba); static int hptiop_get_config_itl(struct hpt_iop_hba *hba, struct hpt_iop_request_get_config *config); static int hptiop_get_config_mv(struct hpt_iop_hba *hba, struct hpt_iop_request_get_config *config); +static int hptiop_get_config_mvfrey(struct hpt_iop_hba *hba, + struct hpt_iop_request_get_config *config); static int hptiop_set_config_itl(struct hpt_iop_hba *hba, struct hpt_iop_request_set_config *config); static int hptiop_set_config_mv(struct hpt_iop_hba *hba, struct hpt_iop_request_set_config *config); +static int hptiop_set_config_mvfrey(struct hpt_iop_hba *hba, + struct hpt_iop_request_set_config *config); static int hptiop_internal_memalloc_mv(struct hpt_iop_hba *hba); +static int hptiop_internal_memalloc_mvfrey(struct hpt_iop_hba *hba); +static int hptiop_internal_memfree_itl(struct hpt_iop_hba *hba); static int hptiop_internal_memfree_mv(struct hpt_iop_hba *hba); +static int hptiop_internal_memfree_mvfrey(struct hpt_iop_hba *hba); static int hptiop_post_ioctl_command_itl(struct hpt_iop_hba *hba, u_int32_t req32, struct hpt_iop_ioctl_param *pParams); static int hptiop_post_ioctl_command_mv(struct hpt_iop_hba *hba, struct hpt_iop_request_ioctl_command *req, struct hpt_iop_ioctl_param *pParams); +static int hptiop_post_ioctl_command_mvfrey(struct hpt_iop_hba *hba, + struct hpt_iop_request_ioctl_command *req, + struct hpt_iop_ioctl_param *pParams); static void hptiop_post_req_itl(struct hpt_iop_hba *hba, struct hpt_iop_srb
Re: svn commit: r242014 - head/sys/kern
On 10/25/2012 11:23, Andre Oppermann wrote: On 25.10.2012 05:49, Bruce Evans wrote: On Wed, 24 Oct 2012, Attilio Rao wrote: On Wed, Oct 24, 2012 at 8:16 PM, Andre Oppermann an...@freebsd.org wrote: ... Let's go back and see how we can do this the sanest way. These are the options I see at the moment: 1. sprinkle __aligned(CACHE_LINE_SIZE) all over the place This is wrong because it doesn't give padding. Unless it is sprinkled in struct declarations. 2. use a macro like MTX_ALIGN that can be SMP/UP aware and in the future possibly change to a different compiler dependent align attribute What is this macro supposed to do? I don't understand that from your description. 3. embed __aligned(CACHE_LINE_SIZE) into struct mtx itself so it automatically gets aligned in all cases, even when dynamically allocated. This works but I think it is overkill for structures including sleep mutexes which are the vast majority. So I wouldn't certainly be in favor of such a patch. This doesn't work either with fully dynamic (auto) allocations. Stack alignment is generally broken (limited, and pessimized for both space and time) in gcc (it works better in clang). On amd64, it is limited by the default of -mpreferred-stack-boundary=4. Since 2**4 is smaller than the cache line size and stack alignments larger than it are broken in gcc, __aligned(CACHE_LINE_SIZE) never works (except accidentally, 16/CACHE_LINE_SIZE of the time. On i386, we reduce the space/time pessimizations a little by overriding the default to -mpreferred-stack-boundary=2. 2**2 is even smaller than the cache line size. (The pessimizations are for both space and time, since time and code space is wasted for the code to keep the stack aligned, and cache space and thus also time are wasted for padding. Most functions don't benefit from more than sizeof(register_t) alignment.) I'm not aware of stack allocated mutexes anywhere in the kernel. Even if there is a case it's very special and unique. I've verified that __aligned(CACHE_LINE_SIZE) on the definition of struct mtx itself (in sys/_mutex.h) correctly aligns and pads the global .bss resident mutexes for 64B and 128B cache line sizes. Padding every mutex is going to have a non-trivial effect on the size of some dynamically allocated structures containing locks, like the vm object and the vnode. Moreover, the effect of this padding will be the greatest on address space limited systems, like i386, where the size of a vm object is only about 130 bytes. Dynamic allocations via malloc() get whatever alignment malloc() gives. This is only required to be 4 or 8 or 16 or so (the maximum for a C object declared in conforming C (no __align()), but malloc() usually gives more. If it gives CACHE_LINE_SIZE, that is wasteful for most small allocations. Stand-alone mutexes are normally not malloc'ed. They're always embedded into some larger structure they protect. __builtin_alloca() is broken in gcc-3.3.3, but works in gcc-4.2.1, at least on i386. In gcc-3.3.3, it assumes that the stack is the default 16-byte aligned even if -mpreferred-stack-boundary=2 is in CFLAGS to say otherwise, and just subtracts from the stack pointer. In gcc-4.2.1, it does the necessary andl of the stack pointer, but only 16-byte alignment. It is another bug that there sre no extensions of malloc() or alloca(). Since malloc() is in the library and may give CACHE_LINE_SIZE but __builtin_alloca() is in the compiler and only gives 16, these functions are not even as compatible as they should be. I don't know of any mutexes allocated on the stack, but there are stack frames with mcontexts in them that need special alignment so they cause problems on i386. They can't just be put on the stack due to the above bugs. They are laboriously allocated using malloc(). Since they are a quite large, 1 mcontext barely fits on the kernel stack, so kib didn't like my alloca() method for allocating them. You lost me here. ___ 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: r242087 - head/sys/dev/cxgb
Author: np
Date: Thu Oct 25 18:11:04 2012
New Revision: 242087
URL: http://svn.freebsd.org/changeset/base/242087
Log:
Initialize the response queue mutex a bit earlier to avoid a panic that
occurs if t3_sge_alloc_qset fails and then t3_free_qset attempts to
destroy an uninitialized mutex.
Submitted by: Vijay Singh vijju dot singh at gmail
MFC after:3 days
Modified:
head/sys/dev/cxgb/cxgb_sge.c
Modified: head/sys/dev/cxgb/cxgb_sge.c
==
--- head/sys/dev/cxgb/cxgb_sge.cThu Oct 25 17:29:11 2012
(r242086)
+++ head/sys/dev/cxgb/cxgb_sge.cThu Oct 25 18:11:04 2012
(r242087)
@@ -2473,6 +2473,10 @@ t3_sge_alloc_qset(adapter_t *sc, u_int i
goto err;
}
+ snprintf(q-rspq.lockbuf, RSPQ_NAME_LEN, t3 rspq lock %d:%d,
+ device_get_unit(sc-dev), irq_vec_idx);
+ MTX_INIT(q-rspq.lock, q-rspq.lockbuf, NULL, MTX_DEF);
+
for (i = 0; i ntxq; ++i) {
size_t sz = i == TXQ_CTRL ? 0 : sizeof(struct tx_sw_desc);
@@ -2590,11 +2594,7 @@ t3_sge_alloc_qset(adapter_t *sc, u_int i
goto err_unlock;
}
}
-
- snprintf(q-rspq.lockbuf, RSPQ_NAME_LEN, t3 rspq lock %d:%d,
- device_get_unit(sc-dev), irq_vec_idx);
- MTX_INIT(q-rspq.lock, q-rspq.lockbuf, NULL, MTX_DEF);
-
+
mtx_unlock_spin(sc-sge.reg_lock);
t3_update_qset_coalesce(q, p);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r242088 - head/sys/dev/filemon
Author: obrien
Date: Thu Oct 25 18:39:09 2012
New Revision: 242088
URL: http://svn.freebsd.org/changeset/base/242088
Log:
Desupport pre-FreeBSD 7.1.
Modified:
head/sys/dev/filemon/filemon.c
Modified: head/sys/dev/filemon/filemon.c
==
--- head/sys/dev/filemon/filemon.c Thu Oct 25 18:11:04 2012
(r242087)
+++ head/sys/dev/filemon/filemon.c Thu Oct 25 18:39:09 2012
(r242088)
@@ -103,47 +103,11 @@ static struct cv access_cv;
static struct thread *access_owner = NULL;
static struct thread *access_requester = NULL;
-#if __FreeBSD_version 701000
-static struct clonedevs *filemon_clones;
-static eventhandler_tageh_tag;
-#else
static struct cdev *filemon_dev;
-#endif
#include filemon_lock.c
#include filemon_wrapper.c
-#if __FreeBSD_version 701000
-static void
-filemon_clone(void *arg, struct ucred *cred, char *name, int namelen,
-struct cdev **dev)
-{
- int u = -1;
- size_t len;
-
- if (*dev != NULL)
- return;
-
- len = strlen(name);
-
- if (len != 7)
- return;
-
- if (bcmp(name,filemon, 7) != 0)
- return;
-
- /* Clone the device to the new minor number. */
- if (clone_create(filemon_clones, filemon_cdevsw, u, dev, 0) != 0)
- /* Create the /dev/filemonNN entry. */
- *dev = make_dev_cred(filemon_cdevsw, u, cred, UID_ROOT,
- GID_WHEEL, 0666, filemon%d, u);
- if (*dev != NULL) {
- dev_ref(*dev);
- (*dev)-si_flags |= SI_CHEAPCLONE;
- }
-}
-#endif
-
static void
filemon_dtr(void *data)
{
@@ -179,11 +143,7 @@ filemon_ioctl(struct cdev *dev, u_long c
int error = 0;
struct filemon *filemon;
-#if __FreeBSD_version 701000
- filemon = dev-si_drv1;
-#else
devfs_get_cdevpriv((void **) filemon);
-#endif
switch (cmd) {
/* Set the output file descriptor. */
@@ -238,11 +198,7 @@ filemon_open(struct cdev *dev, int oflag
filemon-pid = curproc-p_pid;
-#if __FreeBSD_version 701000
- dev-si_drv1 = filemon;
-#else
devfs_set_cdevpriv(filemon, filemon_dtr);
-#endif
/* Get exclusive write access. */
filemon_lock_write();
@@ -260,14 +216,6 @@ static int
filemon_close(struct cdev *dev __unused, int flag __unused, int fmt __unused,
struct thread *td __unused)
{
-#if __FreeBSD_version 701000
- filemon_dtr(dev-si_drv1);
-
- dev-si_drv1 = NULL;
-
- /* Schedule this cloned device to be destroyed. */
- destroy_dev_sched(dev);
-#endif
return (0);
}
@@ -281,16 +229,8 @@ filemon_load(void *dummy __unused)
/* Install the syscall wrappers. */
filemon_wrapper_install();
-#if __FreeBSD_version 701000
- /* Enable device cloning. */
- clone_setup(filemon_clones);
-
- /* Setup device cloning events. */
- eh_tag = EVENTHANDLER_REGISTER(dev_clone, filemon_clone, 0, 1000);
-#else
filemon_dev = make_dev(filemon_cdevsw, 0, UID_ROOT, GID_WHEEL, 0666,
filemon);
-#endif
}
static int
@@ -305,9 +245,7 @@ filemon_unload(void)
if (TAILQ_FIRST(filemons_inuse) != NULL)
error = EBUSY;
else {
-#if __FreeBSD_version = 701000
destroy_dev(filemon_dev);
-#endif
/* Deinstall the syscall wrappers. */
filemon_wrapper_deinstall();
@@ -317,19 +255,6 @@ filemon_unload(void)
filemon_unlock_write();
if (error == 0) {
-#if __FreeBSD_version 701000
- /*
-* Check if there is still an event handler callback registered.
- */
- if (eh_tag != 0) {
- /* De-register the device cloning event handler. */
- EVENTHANDLER_DEREGISTER(dev_clone, eh_tag);
- eh_tag = 0;
-
- /* Stop device cloning. */
- clone_cleanup(filemon_clones);
- }
-#endif
/* free() filemon structs free list. */
filemon_lock_write();
while ((filemon = TAILQ_FIRST(filemons_free)) != NULL) {
___
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: r242089 - head/sys/dev/ciss
Author: peter Date: Thu Oct 25 18:46:02 2012 New Revision: 242089 URL: http://svn.freebsd.org/changeset/base/242089 Log: Increase the driver-side limit on the number of logical volumes that the driver will recognize. I've tested this as far as 25 volumes. Modified: head/sys/dev/ciss/cissvar.h Modified: head/sys/dev/ciss/cissvar.h == --- head/sys/dev/ciss/cissvar.h Thu Oct 25 18:39:09 2012(r242088) +++ head/sys/dev/ciss/cissvar.h Thu Oct 25 18:46:02 2012(r242089) @@ -46,7 +46,7 @@ typedef STAILQ_HEAD(, ciss_request) cr_q /* * Maximum number of logical drives we support. */ -#define CISS_MAX_LOGICAL 15 +#define CISS_MAX_LOGICAL 63 /* * Maximum number of physical devices we support. ___ 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: r242074 - head/etc/rc.d
Brian Somers br...@freebsd.org wrote in 20121025171827.ga59...@thong.lan.awfulhak.org: br After upgrading from 8-STABLE to 9-STABLE on Monday, IPv6 routing br advertisments were broken. Disabling accept (enabling send) appeared br to be necessary to get things up and running. br br As you say, net.inet6.ip6.accept_rtadv is set to zero (off, meaning br that we *can* send advertisments), so I don't now what the issue br is. Irrespective of this, I think it's useful to explicitly set br the interface to be able to send advertisments when running rtadvd br - just in case the sysctl is set to 1 elsewhere. br br Doing an ifconfig interface inet6 accept_rtadv after boot doesn't br seem to disable sending advertisments, so I'm finding it difficult br to test this remotely... testing is awkward when I'm not at home br as this machine is also suffering from the can't reboot issue!! br br I'll look into why the sysctl doesn't seem to behave as expected br when I get home this evening. In 9.X and later the meaning of net.inet6.ip6.accept_rtadv has been changed and the flag for whether receiving RAs or not is now in a per-IF basis. 9.0R release note says the following: | The sysctl(8) variable net.inet6.ip6.accept_rtadv has been | changed. It was a system-wide configuration knob which controlled | whether the system accepts ICMPv6 Router Advertisement messages or | not. In FreeBSD 9.0-RELEASE, this knob is converted into a | per-interface inet6 accept_rtadv ifconfig(8) option. Although the | sysctl(8) variable is available still in FreeBSD 9.0-RELEASE, it | now controls whether the per-interface option is set by default or | not. The default value is 0 (not accept the RA messages). So, by default RAs can be sent on any interface even if setting net.inet6.ip6.accept_rtadv=1 manually after a boot because no accept_rtadv per-IF flag is set. I guess this was a source of the confusion. I am not sure why setting accept_rtadv flag on an interface did not prevent from sending RAs in your case. It is not an intended behavior. If it is reproducible, please let me know. The release notes explains more details of IPv6 configuration migration from 8.X to 9.X. -- Hiroki pgppyymAQDlyl.pgp Description: PGP signature
svn commit: r242090 - head/sys/rpc/rpcsec_gss
Author: rmacklem Date: Thu Oct 25 19:30:58 2012 New Revision: 242090 URL: http://svn.freebsd.org/changeset/base/242090 Log: Modify the comment to take out the names and URL. Requested by: kib MFC after:3 days Modified: head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Modified: head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c == --- head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.cThu Oct 25 18:46:02 2012 (r242089) +++ head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.cThu Oct 25 19:30:58 2012 (r242090) @@ -1025,12 +1025,9 @@ svc_rpc_gss_validate(struct svc_rpc_gss_ rpc_gss_log_status(gss_verify_mic, client-cl_mech, maj_stat, min_stat); /* -* Attila Bogar and Herbert Poeckl reported similar problems -* w.r.t. a Linux NFS client doing a krb5 NFS mount against the -* FreeBSD server. We determined this was a Linux bug: -* http://www.spinics.net/lists/linux-nfs/msg32466.html, where -* the mount failed to work because a Destroy operation with a -* bogus encrypted checksum destroyed the authenticator handle. +* A bug in some versions of the Linux client generates a +* Destroy operation with a bogus encrypted checksum. Deleting +* the credential handle for that case causes the mount to fail. * Since the checksum is bogus (gss_verify_mic() failed), it * doesn't make sense to destroy the handle and not doing so * fixes the Linux mount. ___ 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: r242091 - in head/usr.sbin/lpr: common_source filters
Author: ed
Date: Thu Oct 25 20:16:38 2012
New Revision: 242091
URL: http://svn.freebsd.org/changeset/base/242091
Log:
Let lpr build with -Wmissing-variable-declarations.
Mark variables static where possible and place the uid/euid variables in
lp.h, so that we can compile-time enforce that these variables have the
same type.
Modified:
head/usr.sbin/lpr/common_source/common.c
head/usr.sbin/lpr/common_source/displayq.c
head/usr.sbin/lpr/common_source/lp.h
head/usr.sbin/lpr/common_source/net.c
head/usr.sbin/lpr/common_source/rmjob.c
head/usr.sbin/lpr/common_source/startdaemon.c
head/usr.sbin/lpr/filters/lpf.c
Modified: head/usr.sbin/lpr/common_source/common.c
==
--- head/usr.sbin/lpr/common_source/common.cThu Oct 25 19:30:58 2012
(r242090)
+++ head/usr.sbin/lpr/common_source/common.cThu Oct 25 20:16:38 2012
(r242091)
@@ -70,8 +70,6 @@ __FBSDID($FreeBSD$);
char line[BUFSIZ];
const char *progname; /* program name */
-extern uid_t uid, euid;
-
static int compar(const void *_p1, const void *_p2);
/*
Modified: head/usr.sbin/lpr/common_source/displayq.c
==
--- head/usr.sbin/lpr/common_source/displayq.c Thu Oct 25 19:30:58 2012
(r242090)
+++ head/usr.sbin/lpr/common_source/displayq.c Thu Oct 25 20:16:38 2012
(r242091)
@@ -75,8 +75,6 @@ __FBSDID($FreeBSD$);
/*
* Stuff for handling job specifications
*/
-extern uid_t uid, euid;
-
static int col;/* column on screen */
static charcurrent[MAXNAMLEN+1]; /* current file being printed */
static charfile[MAXNAMLEN+1]; /* print file name */
Modified: head/usr.sbin/lpr/common_source/lp.h
==
--- head/usr.sbin/lpr/common_source/lp.hThu Oct 25 19:30:58 2012
(r242090)
+++ head/usr.sbin/lpr/common_source/lp.hThu Oct 25 20:16:38 2012
(r242091)
@@ -252,6 +252,9 @@ typedef enum { TR_SENDING, TR_RECVING, T
/*
* seteuid() macros.
*/
+
+extern uid_t uid, euid;
+
#define PRIV_START { \
if (seteuid(euid) != 0) err(1, seteuid failed); \
}
Modified: head/usr.sbin/lpr/common_source/net.c
==
--- head/usr.sbin/lpr/common_source/net.c Thu Oct 25 19:30:58 2012
(r242090)
+++ head/usr.sbin/lpr/common_source/net.c Thu Oct 25 20:16:38 2012
(r242091)
@@ -80,8 +80,6 @@ u_charfamily = PF_UNSPEC;
u_char family = PF_INET;
#endif
-extern uid_t uid, euid;
-
/*
* Create a TCP connection to host rhost at port rport.
* If rport == 0, then use the printer service port.
Modified: head/usr.sbin/lpr/common_source/rmjob.c
==
--- head/usr.sbin/lpr/common_source/rmjob.c Thu Oct 25 19:30:58 2012
(r242090)
+++ head/usr.sbin/lpr/common_source/rmjob.c Thu Oct 25 20:16:38 2012
(r242091)
@@ -69,8 +69,6 @@ static intall = 0;/* eliminate all fi
static int cur_daemon; /* daemon's pid */
static charcurrent[7+MAXHOSTNAMELEN]; /* active control file name */
-extern uid_t uid, euid; /* real and effective user id's */
-
static voidalarmhandler(int _signo);
static voiddo_unlink(char *_file);
static int isowner(char *_owner, char *_file, const char *_cfhost);
Modified: head/usr.sbin/lpr/common_source/startdaemon.c
==
--- head/usr.sbin/lpr/common_source/startdaemon.c Thu Oct 25 19:30:58
2012(r242090)
+++ head/usr.sbin/lpr/common_source/startdaemon.c Thu Oct 25 20:16:38
2012(r242091)
@@ -49,8 +49,6 @@ __FBSDID($FreeBSD$);
#include lp.h
#include pathnames.h
-extern uid_t uid, euid;
-
/*
* Tell the printer daemon that there are new files in the spool directory.
*/
Modified: head/usr.sbin/lpr/filters/lpf.c
==
--- head/usr.sbin/lpr/filters/lpf.c Thu Oct 25 19:30:58 2012
(r242090)
+++ head/usr.sbin/lpr/filters/lpf.c Thu Oct 25 20:16:38 2012
(r242091)
@@ -60,17 +60,17 @@ __FBSDID($FreeBSD$);
#define MAXWIDTH 132
#define MAXREP10
-char buf[MAXREP][MAXWIDTH];
-intmaxcol[MAXREP] = {-1};
-intlineno;
-intwidth = 132;/* default line length */
-intlength = 66;/* page length */
-intindent; /* indentation length */
-intnpages = 1;
-intliteral;/* print control characters */
-char *name; /* user's login name */
-char *host; /* user's machine name */
-char *acctfile; /* accounting information file */
+static charbuf[MAXREP][MAXWIDTH];
svn commit: r242092 - head/sys/fs/smbfs
Author: davide
Date: Thu Oct 25 20:23:04 2012
New Revision: 242092
URL: http://svn.freebsd.org/changeset/base/242092
Log:
- Remove the references to the deprecated zalloc kernel interface
- Use M_ZERO flag in malloc() rather than bzero()
- malloc() with M_NOWAIT can't return NULL so there's no need to check
Reviewed by: alc
Approved by: alc
Modified:
head/sys/fs/smbfs/smbfs_smb.c
head/sys/fs/smbfs/smbfs_vfsops.c
Modified: head/sys/fs/smbfs/smbfs_smb.c
==
--- head/sys/fs/smbfs/smbfs_smb.c Thu Oct 25 20:16:38 2012
(r242091)
+++ head/sys/fs/smbfs/smbfs_smb.c Thu Oct 25 20:23:04 2012
(r242092)
@@ -1165,8 +1165,6 @@ smbfs_findopenLM2(struct smbfs_fctx *ctx
ctx-f_name = malloc(SMB_MAXFNAMELEN * 2, M_SMBFSDATA,
M_WAITOK);
} else
ctx-f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, M_WAITOK);
- if (ctx-f_name == NULL)
- return ENOMEM;
ctx-f_infolevel = SMB_DIALECT(SSTOVC(ctx-f_ssp))
SMB_DIALECT_NTLM0_12 ?
SMB_INFO_STANDARD : SMB_FIND_FILE_DIRECTORY_INFO;
ctx-f_attrmask = attr;
@@ -1311,10 +1309,7 @@ smbfs_findopen(struct smbnode *dnp, cons
struct smbfs_fctx *ctx;
int error;
- ctx = malloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK);
- if (ctx == NULL)
- return ENOMEM;
- bzero(ctx, sizeof(*ctx));
+ ctx = malloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK | M_ZERO);
ctx-f_ssp = dnp-n_mount-sm_share;
ctx-f_dnp = dnp;
ctx-f_flags = SMBFS_RDD_FINDFIRST;
Modified: head/sys/fs/smbfs/smbfs_vfsops.c
==
--- head/sys/fs/smbfs/smbfs_vfsops.cThu Oct 25 20:16:38 2012
(r242091)
+++ head/sys/fs/smbfs/smbfs_vfsops.cThu Oct 25 20:23:04 2012
(r242092)
@@ -54,13 +54,6 @@ static int smbfs_debuglevel = 0;
static int smbfs_version = SMBFS_VERSION;
-#ifdef SMBFS_USEZONE
-#include vm/vm.h
-#include vm/vm_extern.h
-
-vm_zone_t smbfsmount_zone;
-#endif
-
SYSCTL_NODE(_vfs, OID_AUTO, smbfs, CTLFLAG_RW, 0, SMB/CIFS filesystem);
SYSCTL_INT(_vfs_smbfs, OID_AUTO, version, CTLFLAG_RD, smbfs_version, 0, );
SYSCTL_INT(_vfs_smbfs, OID_AUTO, debuglevel, CTLFLAG_RW, smbfs_debuglevel, 0,
);
@@ -172,18 +165,7 @@ smbfs_mount(struct mount *mp)
smb_share_unlock(ssp, 0);
mp-mnt_stat.f_iosize = SSTOVC(ssp)-vc_txmax;
-#ifdef SMBFS_USEZONE
- smp = zalloc(smbfsmount_zone);
-#else
- smp = malloc(sizeof(*smp), M_SMBFSDATA, M_WAITOK);
-#endif
-if (smp == NULL) {
- printf(could not alloc smbmount\n);
- vfs_mount_error(mp, could not alloc smbmount, v, error);
- error = ENOMEM;
- goto bad;
-}
- bzero(smp, sizeof(*smp));
+ smp = malloc(sizeof(*smp), M_SMBFSDATA, M_WAITOK | M_ZERO);
mp-mnt_data = smp;
smp-sm_hash = hashinit(desiredvnodes, M_SMBFSHASH, smp-sm_hashlen);
if (smp-sm_hash == NULL)
@@ -261,11 +243,7 @@ bad:
if (smp-sm_hash)
free(smp-sm_hash, M_SMBFSHASH);
sx_destroy(smp-sm_hashlock);
-#ifdef SMBFS_USEZONE
- zfree(smbfsmount_zone, smp);
-#else
free(smp, M_SMBFSDATA);
-#endif
}
if (ssp)
smb_share_put(ssp, scred);
@@ -311,11 +289,7 @@ smbfs_unmount(struct mount *mp, int mntf
if (smp-sm_hash)
free(smp-sm_hash, M_SMBFSHASH);
sx_destroy(smp-sm_hashlock);
-#ifdef SMBFS_USEZONE
- zfree(smbfsmount_zone, smp);
-#else
free(smp, M_SMBFSDATA);
-#endif
MNT_ILOCK(mp);
mp-mnt_flag = ~MNT_LOCAL;
MNT_IUNLOCK(mp);
@@ -383,9 +357,6 @@ smbfs_quotactl(mp, cmd, uid, arg)
int
smbfs_init(struct vfsconf *vfsp)
{
-#ifdef SMBFS_USEZONE
- smbfsmount_zone = zinit(SMBFSMOUNT, sizeof(struct smbmount), 0, 0, 1);
-#endif
smbfs_pbuf_freecnt = nswbuf / 2 + 1;
SMBVDEBUG(done.\n);
return 0;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r242079 - in head: sbin/ipfw share/man/man4 sys/conf sys/net sys/netinet sys/netinet6 sys/netpfil/ipfw
On 25.10.2012 18:25, Andrey V. Elsukov wrote: On 25.10.2012 19:54, Andre Oppermann wrote: I still don't agree with naming the sysctl net.pfil.forward. This type of forwarding is a property of IPv4 and IPv6 and thus should be put there. Pfil hooking can be on layer 2, 2-bridging, 3 and who knows where else in the future. Forwarding works only for IPv46. You haven't even replied to my comment on net@. Please change the sysctl location and name to its appropriate place. Hi Andre, There were two replies related to this subject, you did not replied to them and i thought that you became agree. I replied to your reply to mine. Other than that I didn't find anything else from you. So, if not, what you think about the name net.pfil.ipforward? net.inet.ip.pfil_forward net.inet6.ip6.pfil_forward or something like that. If you can show with your performance profiling that the sysctl isn't even necessary, you could leave it completely away and have pfil_forward enabled permanently. That would be even better for everybody. Also an MFC's after 2 weeks must ensure that compiling with IPFIREWALL_ FORWARD enabled the sysctl at the same time to keep kernel configs within 9-stable working. Yes, it will work like that. Excellent. Thank you. -- Andre ___ 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: r242093 - vendor/NetBSD/bmake/dist
Author: sjg
Date: Thu Oct 25 20:31:22 2012
New Revision: 242093
URL: http://svn.freebsd.org/changeset/base/242093
Log:
Import bmake-20121010
Relevant items from ChangeLog:
o [Makefile.in:] protect syntax that only bmake parses correctly.
o compat.c: ignore empty commands - same as jobs mode.
o make.1: document meta chars that cause use of shell
Approved by: marcelm (mentor)
Modified:
vendor/NetBSD/bmake/dist/ChangeLog
vendor/NetBSD/bmake/dist/Makefile.in
vendor/NetBSD/bmake/dist/bmake.1
vendor/NetBSD/bmake/dist/bmake.cat1
vendor/NetBSD/bmake/dist/bsd.after-import.mk
vendor/NetBSD/bmake/dist/compat.c
vendor/NetBSD/bmake/dist/make.1
Modified: vendor/NetBSD/bmake/dist/ChangeLog
==
--- vendor/NetBSD/bmake/dist/ChangeLog Thu Oct 25 20:23:04 2012
(r242092)
+++ vendor/NetBSD/bmake/dist/ChangeLog Thu Oct 25 20:31:22 2012
(r242093)
@@ -1,3 +1,27 @@
+2012-10-10 Simon J. Gerraty s...@bad.crufty.net
+
+ * Makefile.in (MAKE_VERSION): 20121010
+ o protect syntax that only bmake parses correctly.
+ o remove auto setting of FORCE_MACHINE, use configure's
+ --with-force-machine=whatever if that is desired.
+
+2012-10-08 Simon J. Gerraty s...@bad.crufty.net
+
+ * Makefile.in: do not lose history from make.1 when generating bmake.1
+
+2012-10-07 Simon J. Gerraty s...@bad.crufty.net
+
+ * Makefile.in (MAKE_VERSION): 20121007
+ Merge with NetBSD make, pick up
+ o compat.c: ignore empty commands - same as jobs mode.
+ o make.1: document meta chars that cause use of shell
+
+2012-09-11 Simon J. Gerraty s...@bad.crufty.net
+
+ * Makefile.in (MAKE_VERSION): bump version to 20120911
+ * bsd.after-import.mk: include Makefile.inc early and allow it to
+ override PROG
+
2012-08-31 Simon J. Gerraty s...@bad.crufty.net
* Makefile.in (MAKE_VERSION): bump version to 20120831
Modified: vendor/NetBSD/bmake/dist/Makefile.in
==
--- vendor/NetBSD/bmake/dist/Makefile.inThu Oct 25 20:23:04 2012
(r242092)
+++ vendor/NetBSD/bmake/dist/Makefile.inThu Oct 25 20:31:22 2012
(r242093)
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
# @(#)Makefile5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.170 2012/08/31 06:46:22 sjg Exp $
+# $Id: Makefile.in,v 1.174 2012/10/10 18:46:24 sjg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,7 +21,7 @@ srcdir= @srcdir@
CC?= @CC@
# Base version on src date
-MAKE_VERSION= 20120831
+MAKE_VERSION= 20121010
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
@@ -71,10 +71,9 @@ SUBDIR= PSD.doc
.endif
.endif
+.if defined(.PARSEDIR)
+# we cannot rely on anything but bmake to parse this correctly.
.if empty(isBSD44:M${OS})
-# XXX not sure if we still want this given that configure
-# lets us force or not the definition of MACHINE.
-CFLAGS_main.o+= -DFORCE_MACHINE=\${MACHINE}\
MANTARGET=cat
INSTALL?=${srcdir}/install-sh
.if (${MACHINE} == sun386)
@@ -85,7 +84,7 @@ SRCS+= sigcompat.c
CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
.endif
.endif
-.if defined(.PARSEDIR)
+
.if make(obj) || make(clean)
SUBDIR+= unit-tests
.endif
@@ -104,14 +103,18 @@ EXTRACT_MAN=no
MAN=${PROG}.1
.if (${PROG} != make)
-${MAN}:make.1
- @echo making ${PROG}.1
- @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' -e '/^.Sh
HISTORY/,$$d' ${srcdir}/make.1 $@
- @(echo .Sh HISTORY; \
- echo .Nm; \
+my.history: ${MAKEFILE}
+ @(echo .Nm; \
echo is derived from NetBSD; \
echo .Xr make 1 .; \
- echo It uses autoconf to facilitate portability to other platforms.)
$@
+ echo It uses autoconf to facilitate portability to other platforms.; \
+ echo .Pp) $@
+
+${MAN}:make.1 my.history
+ @echo making ${PROG}.1
+ @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
+ -e '/^.Sh HISTORY/rmy.history' \
+ -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${.CURDIR}/make.1 $@
.endif
Modified: vendor/NetBSD/bmake/dist/bmake.1
==
--- vendor/NetBSD/bmake/dist/bmake.1Thu Oct 25 20:23:04 2012
(r242092)
+++ vendor/NetBSD/bmake/dist/bmake.1Thu Oct 25 20:31:22 2012
(r242093)
@@ -1,4 +1,4 @@
-.\$NetBSD: make.1,v 1.206 2012/08/30 22:35:37 wiz Exp $
+.\$NetBSD: make.1,v 1.209 2012/10/08 15:09:48 christos Exp $
.\
.\ Copyright (c) 1990, 1993
.\The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\from: @(#)make.18.4 (Berkeley) 3/19/94
.\
-.Dd August 30, 2012
+.Dd October 8, 2012
.Dt MAKE 1
.Os
svn commit: r242094 - vendor/NetBSD/bmake/20121010
Author: sjg Date: Thu Oct 25 20:34:44 2012 New Revision: 242094 URL: http://svn.freebsd.org/changeset/base/242094 Log: Tag bmake/20121010 Approved by: marcel (mentor) Added: vendor/NetBSD/bmake/20121010/ - copied from r242093, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r242095 - stable/9/usr.sbin/ppp
Author: n_hibma
Date: Thu Oct 25 20:45:57 2012
New Revision: 242095
URL: http://svn.freebsd.org/changeset/base/242095
Log:
MFC 241496:
Some 3G modems return the wrong signature in echo packets and make it
impossible to use LQR/ECHO. They return want_magic instead.
With this change it is now possible to use
enable lqr
set lqrperiod 5
enable echo
set echoperiod 5
in your ppp.conf file.
Modified:
stable/9/usr.sbin/ppp/lqr.c
Directory Properties:
stable/9/usr.sbin/ppp/ (props changed)
Modified: stable/9/usr.sbin/ppp/lqr.c
==
--- stable/9/usr.sbin/ppp/lqr.c Thu Oct 25 20:34:44 2012(r242094)
+++ stable/9/usr.sbin/ppp/lqr.c Thu Oct 25 20:45:57 2012(r242095)
@@ -108,7 +108,8 @@ lqr_RecvEcho(struct fsm *fp, struct mbuf
* die as a result.
*/
}
-if (lqr.signature == SIGNATURE) {
+if (lqr.signature == SIGNATURE
+ || lqr.signature == lcp-want_magic) { /* some
implementations return the wrong magic */
/* careful not to update lqm.echo.seq_recv with older values */
if ((hdlc-lqm.echo.seq_recv (u_int32_t)0 - 5 lqr.sequence 5) ||
(hdlc-lqm.echo.seq_recv = (u_int32_t)0 - 5
___
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: r242096 - in head/usr.sbin/bsdconfig: . security
Author: dteske
Date: Thu Oct 25 21:04:11 2012
New Revision: 242096
URL: http://svn.freebsd.org/changeset/base/242096
Log:
When Xdialog(1) is passed a NULL argument to its `--help' option, Xdialog(1)
acts like dialog(1) in that it returns exit status 2 when the help button is
chosen.
Approved by: adri (co-mentor) (implicit)
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/security/kern_securelevel
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Thu Oct 25 20:45:57 2012
(r242095)
+++ head/usr.sbin/bsdconfig/bsdconfig Thu Oct 25 21:04:11 2012
(r242096)
@@ -189,7 +189,7 @@ dialog_menu_main()
--ok-label \\$msg_ok\ \
--cancel-label \\$msg_exit_bsdconfig\ \
--help-button \
- ${USE_XDIALOG:+--help \\$( f_include_help BSDCONFIG )\} \
+ ${USE_XDIALOG:+--help \\} \
--menu \\$prompt\ $size $menu_list\
21 $DIALOG_TERMINAL_PASSTHRU_FD
)
Modified: head/usr.sbin/bsdconfig/security/kern_securelevel
==
--- head/usr.sbin/bsdconfig/security/kern_securelevel Thu Oct 25 20:45:57
2012(r242095)
+++ head/usr.sbin/bsdconfig/security/kern_securelevel Thu Oct 25 21:04:11
2012(r242096)
@@ -76,7 +76,7 @@ dialog_menu_main()
--ok-label \\$msg_ok\\
--cancel-label \\$msg_cancel\\
--help-button \
- ${USE_XDIALOG:+--help \\$( f_include_help SECURELEVEL )\} \
+ ${USE_XDIALOG:+--help \\}\
--menu \\$prompt\ $size \
$menu_list \
21 $DIALOG_TERMINAL_PASSTHRU_FD
___
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: r242097 - head/sys/fs/smbfs
Author: davide
Date: Thu Oct 25 21:08:02 2012
New Revision: 242097
URL: http://svn.freebsd.org/changeset/base/242097
Log:
Fix build in case we have SMBVDEBUG turned on.
Reviewed by: gnn
Approved by: gnn
Sponsored by: iXsystems inc.
Modified:
head/sys/fs/smbfs/smbfs_io.c
head/sys/fs/smbfs/smbfs_vnops.c
Modified: head/sys/fs/smbfs/smbfs_io.c
==
--- head/sys/fs/smbfs/smbfs_io.cThu Oct 25 21:04:11 2012
(r242096)
+++ head/sys/fs/smbfs/smbfs_io.cThu Oct 25 21:08:02 2012
(r242097)
@@ -241,7 +241,7 @@ smbfs_writevnode(struct vnode *vp, struc
SMBERROR(vn types other than VREG unsupported !\n);
return EIO;
}
- SMBVDEBUG(ofs=%d,resid=%d\n,(int)uiop-uio_offset, uiop-uio_resid);
+ SMBVDEBUG(ofs=%d,resid=%zd\n,(int)uiop-uio_offset, uiop-uio_resid);
if (uiop-uio_offset 0)
return EINVAL;
/* if (uiop-uio_offset + uiop-uio_resid smp-nm_maxfilesize)
@@ -274,7 +274,7 @@ smbfs_writevnode(struct vnode *vp, struc
smb_makescred(scred, td, cred);
error = smb_write(smp-sm_share, np-n_fid, uiop, scred);
- SMBVDEBUG(after: ofs=%d,resid=%d\n,(int)uiop-uio_offset,
uiop-uio_resid);
+ SMBVDEBUG(after: ofs=%d,resid=%zd\n,(int)uiop-uio_offset,
uiop-uio_resid);
if (!error) {
if (uiop-uio_offset np-n_size) {
np-n_size = uiop-uio_offset;
@@ -601,7 +601,7 @@ smbfs_putpages(ap)
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_WRITE;
uio.uio_td = td;
- SMBVDEBUG(ofs=%d,resid=%d\n,(int)uio.uio_offset, uio.uio_resid);
+ SMBVDEBUG(ofs=%d,resid=%zd\n,(int)uio.uio_offset, uio.uio_resid);
smb_makescred(scred, td, cred);
error = smb_write(smp-sm_share, np-n_fid, uio, scred);
Modified: head/sys/fs/smbfs/smbfs_vnops.c
==
--- head/sys/fs/smbfs/smbfs_vnops.c Thu Oct 25 21:04:11 2012
(r242096)
+++ head/sys/fs/smbfs/smbfs_vnops.c Thu Oct 25 21:08:02 2012
(r242097)
@@ -452,7 +452,8 @@ smbfs_write(ap)
struct vnode *vp = ap-a_vp;
struct uio *uio = ap-a_uio;
- SMBVDEBUG(%d,ofs=%d,sz=%d\n,vp-v_type, (int)uio-uio_offset,
uio-uio_resid);
+ SMBVDEBUG(%d,ofs=%d,sz=%zd\n,vp-v_type, (int)uio-uio_offset,
+ uio-uio_resid);
if (vp-v_type != VREG)
return (EPERM);
return smbfs_writevnode(vp, uio, ap-a_cred,ap-a_ioflag);
___
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: r242098 - stable/8/usr.sbin/ppp
Author: n_hibma
Date: Thu Oct 25 21:08:31 2012
New Revision: 242098
URL: http://svn.freebsd.org/changeset/base/242098
Log:
MFC 241496:
Some 3G modems return the wrong signature in echo packets and make it
impossible to use LQR/ECHO. They return want_magic instead.
With this change it is now possible to use
enable lqr
set lqrperiod 5
enable echo
set echoperiod 5
in your ppp.conf file.
Modified:
stable/8/usr.sbin/ppp/lqr.c
Directory Properties:
stable/8/usr.sbin/ppp/ (props changed)
Modified: stable/8/usr.sbin/ppp/lqr.c
==
--- stable/8/usr.sbin/ppp/lqr.c Thu Oct 25 21:08:02 2012(r242097)
+++ stable/8/usr.sbin/ppp/lqr.c Thu Oct 25 21:08:31 2012(r242098)
@@ -108,7 +108,8 @@ lqr_RecvEcho(struct fsm *fp, struct mbuf
* die as a result.
*/
}
-if (lqr.signature == SIGNATURE) {
+if (lqr.signature == SIGNATURE
+ || lqr.signature == lcp-want_magic) { /* some
implementations return the wrong magic */
/* careful not to update lqm.echo.seq_recv with older values */
if ((hdlc-lqm.echo.seq_recv (u_int32_t)0 - 5 lqr.sequence 5) ||
(hdlc-lqm.echo.seq_recv = (u_int32_t)0 - 5
___
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: r242099 - svnadmin/conf
Author: gnn Date: Thu Oct 25 21:09:42 2012 New Revision: 242099 URL: http://svn.freebsd.org/changeset/base/242099 Log: Clean up the fact that davide was never added to the mentoring list. Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Thu Oct 25 21:08:31 2012(r242098) +++ svnadmin/conf/mentors Thu Oct 25 21:09:42 2012(r242099) @@ -15,6 +15,7 @@ art avg Co-mentor: marcel benl philip Co-mentor: simon bgray cognet davidcsgnn +davide gnn Co-mentor: alc eadler cperciva erimlaier Co-mentor: thompsa erwin delphij ___ 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: r242100 - stable/9/sys/dev/usb/serial
Author: n_hibma
Date: Thu Oct 25 21:22:05 2012
New Revision: 242100
URL: http://svn.freebsd.org/changeset/base/242100
Log:
MFC 241555:
Implement modem control in u3g. Tested on Option GTM382W, Huawei E220,
and Sierra Wireless MC8790V. Also implement the .ucom_poll method.
Note: It resolves ppp hanging during the PPp phase.
Modified:
stable/9/sys/dev/usb/serial/u3g.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/serial/u3g.c
==
--- stable/9/sys/dev/usb/serial/u3g.c Thu Oct 25 21:09:42 2012
(r242099)
+++ stable/9/sys/dev/usb/serial/u3g.c Thu Oct 25 21:22:05 2012
(r242100)
@@ -53,6 +53,7 @@
#include dev/usb/usb.h
#include dev/usb/usbdi.h
#include dev/usb/usbdi_util.h
+#include dev/usb/usb_cdc.h
#include usbdevs.h
#defineUSB_DEBUG_VAR u3g_debug
@@ -99,6 +100,7 @@ SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug,
enum {
U3G_BULK_WR,
U3G_BULK_RD,
+ U3G_INTR,
U3G_N_TRANSFER,
};
@@ -107,12 +109,15 @@ struct u3g_softc {
struct ucom_softc sc_ucom[U3G_MAXPORTS];
struct usb_xfer *sc_xfer[U3G_MAXPORTS][U3G_N_TRANSFER];
+ uint8_t sc_iface[U3G_MAXPORTS]; /* local status
register */
+ uint8_t sc_lsr[U3G_MAXPORTS]; /* local status
register */
+ uint8_t sc_msr[U3G_MAXPORTS]; /* u3g status register
*/
+ uint16_t sc_line[U3G_MAXPORTS]; /* line status */
+
struct usb_device *sc_udev;
struct mtx sc_mtx;
- uint8_t sc_lsr; /* local status register */
- uint8_t sc_msr; /* U3G status register */
- uint8_t sc_numports;
+ uint8_t sc_numports;
};
static device_probe_t u3g_probe;
@@ -122,12 +127,17 @@ static void u3g_free_softc(struct u3g_so
static usb_callback_t u3g_write_callback;
static usb_callback_t u3g_read_callback;
+static usb_callback_t u3g_intr_callback;
-static void u3g_free(struct ucom_softc *ucom);
+static void u3g_cfg_get_status(struct ucom_softc *, uint8_t *, uint8_t *);
+static void u3g_cfg_set_dtr(struct ucom_softc *, uint8_t);
+static void u3g_cfg_set_rts(struct ucom_softc *, uint8_t);
static void u3g_start_read(struct ucom_softc *ucom);
static void u3g_stop_read(struct ucom_softc *ucom);
static void u3g_start_write(struct ucom_softc *ucom);
static void u3g_stop_write(struct ucom_softc *ucom);
+static void u3g_poll(struct ucom_softc *ucom);
+static void u3g_free(struct ucom_softc *ucom);
static void u3g_test_autoinst(void *, struct usb_device *,
@@ -155,13 +165,26 @@ static const struct usb_config u3g_confi
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.callback = u3g_read_callback,
},
+
+ [U3G_INTR] = {
+ .type = UE_INTERRUPT,
+ .endpoint = UE_ADDR_ANY,
+ .direction = UE_DIR_IN,
+ .flags = {.pipe_bof = 1,.short_xfer_ok = 1,.no_pipe_ok = 1,},
+ .bufsize = 0, /* use wMaxPacketSize */
+ .callback = u3g_intr_callback,
+ },
};
static const struct ucom_callback u3g_callback = {
+ .ucom_cfg_get_status = u3g_cfg_get_status,
+ .ucom_cfg_set_dtr = u3g_cfg_set_dtr,
+ .ucom_cfg_set_rts = u3g_cfg_set_rts,
.ucom_start_read = u3g_start_read,
.ucom_stop_read = u3g_stop_read,
.ucom_start_write = u3g_start_write,
.ucom_stop_write = u3g_stop_write,
+ .ucom_poll = u3g_poll,
.ucom_free = u3g_free,
};
@@ -849,6 +872,15 @@ u3g_attach(device_t dev)
continue;
}
+ iface = usbd_get_iface(uaa-device, i);
+ id = usbd_get_interface_descriptor(iface);
+ sc-sc_iface[nports] = id-bInterfaceNumber;
+
+ if (bootverbose sc-sc_xfer[nports][U3G_INTR]) {
+ device_printf(dev, port %d supports modem control,
+ nports);
+ }
+
/* set stall by default */
mtx_lock(sc-sc_mtx);
usbd_xfer_set_stall(sc-sc_xfer[nports][U3G_BULK_WR]);
@@ -926,6 +958,9 @@ u3g_start_read(struct ucom_softc *ucom)
{
struct u3g_softc *sc = ucom-sc_parent;
+ /* start interrupt endpoint (if configured) */
+ usbd_transfer_start(sc-sc_xfer[ucom-sc_subunit][U3G_INTR]);
+
/* start read endpoint */
usbd_transfer_start(sc-sc_xfer[ucom-sc_subunit][U3G_BULK_RD]);
}
@@ -935,6 +970,9 @@ u3g_stop_read(struct ucom_softc *ucom)
{
struct u3g_softc *sc = ucom-sc_parent;
+ /* stop interrupt endpoint (if configured) */
+ usbd_transfer_stop(sc-sc_xfer[ucom-sc_subunit][U3G_INTR]);
+
/* stop read endpoint */
usbd_transfer_stop(sc-sc_xfer[ucom-sc_subunit][U3G_BULK_RD]);
}
@@
svn commit: r242101 - in head/usr.sbin/cron: cron crontab lib
Author: sobomax
Date: Thu Oct 25 22:54:29 2012
New Revision: 242101
URL: http://svn.freebsd.org/changeset/base/242101
Log:
Second attempt to add @every_second keyword support. Due to multiple
requests, default to the previous 60-seconds scheduling method
unless there is any @every_second entries to conserve CPU cycles and
power.
This change also improves scheduling in the default mode by running
as close to the beginning of the minnute as possible by replacing
sleep(3) with nanosleep(2). Previously, the tasks would run anywhere
within the first second of the minute and that offset drifted back
and forth each time cron(8) was engaged.
MFC after:1 month
Modified:
head/usr.sbin/cron/cron/cron.c
head/usr.sbin/cron/cron/cron.h
head/usr.sbin/cron/crontab/crontab.5
head/usr.sbin/cron/lib/entry.c
Modified: head/usr.sbin/cron/cron/cron.c
==
--- head/usr.sbin/cron/cron/cron.c Thu Oct 25 21:22:05 2012
(r242100)
+++ head/usr.sbin/cron/cron/cron.c Thu Oct 25 22:54:29 2012
(r242101)
@@ -35,9 +35,9 @@ static const char rcsid[] =
static voidusage(void),
run_reboot_jobs(cron_db *),
- cron_tick(cron_db *),
- cron_sync(void),
- cron_sleep(cron_db *),
+ cron_tick(cron_db *, int),
+ cron_sync(int),
+ cron_sleep(cron_db *, int),
cron_clean(cron_db *),
#ifdef USE_SIGCHLD
sigchld_handler(int),
@@ -45,6 +45,8 @@ staticvoidusage(void),
sighup_handler(int),
parse_args(int c, char *v[]);
+static int run_at_secres(cron_db *);
+
static time_t last_time = 0;
static int dst_enabled = 0;
struct pidfh *pfh;
@@ -98,6 +100,9 @@ main(argc, argv)
char*argv[];
{
cron_db database;
+ int runnum;
+ int secres1, secres2;
+ struct tm *tm;
ProgramName = argv[0];
@@ -147,23 +152,47 @@ main(argc, argv)
database.tail = NULL;
database.mtime = (time_t) 0;
load_database(database);
+ secres1 = secres2 = run_at_secres(database);
run_reboot_jobs(database);
- cron_sync();
+ cron_sync(secres1);
+ runnum = 0;
while (TRUE) {
# if DEBUGGING
/* if (!(DebugFlags DTEST)) */
# endif /*DEBUGGING*/
- cron_sleep(database);
+ cron_sleep(database, secres1);
- load_database(database);
+ if (secres1 == 0 || runnum % 60 == 0) {
+ load_database(database);
+ secres2 = run_at_secres(database);
+ if (secres2 != secres1) {
+ secres1 = secres2;
+ if (secres1 != 0) {
+ runnum = 0;
+ } else {
+ /*
+* Going from 1 sec to 60 sec res. If we
+* are already at minute's boundary, so
+* let it run, otherwise schedule for
the
+* next minute.
+*/
+ tm = localtime(TargetTime);
+ if (tm-tm_sec 0) {
+ cron_sync(secres2);
+ continue;
+ }
+ }
+ }
+ }
/* do this iteration
*/
- cron_tick(database);
+ cron_tick(database, secres1);
- /* sleep 1 minute
+ /* sleep 1 or 60 seconds
*/
- TargetTime += 60;
+ TargetTime += (secres1 != 0) ? 1 : 60;
+ runnum += 1;
}
}
@@ -187,29 +216,29 @@ run_reboot_jobs(db)
static void
-cron_tick(db)
- cron_db *db;
+cron_tick(cron_db *db, int secres)
{
static struct tmlasttm;
static time_t diff = 0, /* time difference in seconds from the last
offset change */
difflimit = 0; /* end point for the time zone correction */
struct tm otztm; /* time in the old time zone */
- int otzminute, otzhour, otzdom, otzmonth, otzdow;
+ int otzsecond, otzminute, otzhour, otzdom, otzmonth, otzdow;
register struct tm *tm = localtime(TargetTime);
- register intminute, hour, dom, month, dow;
+ register intsecond, minute, hour, dom, month, dow;
register user *u;
register entry *e;
/* make 0-based values out of
svn commit: r242102 - in head: contrib/bmake usr.bin/bmake
Author: sjg
Date: Thu Oct 25 23:18:05 2012
New Revision: 242102
URL: http://svn.freebsd.org/changeset/base/242102
Log:
Merge bmake-20121010
Approved by: marcel (mentor)
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/Makefile.in
head/contrib/bmake/bmake.1
head/contrib/bmake/bmake.cat1
head/contrib/bmake/bsd.after-import.mk
head/contrib/bmake/compat.c
head/contrib/bmake/make.1
head/usr.bin/bmake/Makefile
Directory Properties:
head/contrib/bmake/ (props changed)
Modified: head/contrib/bmake/ChangeLog
==
--- head/contrib/bmake/ChangeLogThu Oct 25 22:54:29 2012
(r242101)
+++ head/contrib/bmake/ChangeLogThu Oct 25 23:18:05 2012
(r242102)
@@ -1,3 +1,27 @@
+2012-10-10 Simon J. Gerraty s...@bad.crufty.net
+
+ * Makefile.in (MAKE_VERSION): 20121010
+ o protect syntax that only bmake parses correctly.
+ o remove auto setting of FORCE_MACHINE, use configure's
+ --with-force-machine=whatever if that is desired.
+
+2012-10-08 Simon J. Gerraty s...@bad.crufty.net
+
+ * Makefile.in: do not lose history from make.1 when generating bmake.1
+
+2012-10-07 Simon J. Gerraty s...@bad.crufty.net
+
+ * Makefile.in (MAKE_VERSION): 20121007
+ Merge with NetBSD make, pick up
+ o compat.c: ignore empty commands - same as jobs mode.
+ o make.1: document meta chars that cause use of shell
+
+2012-09-11 Simon J. Gerraty s...@bad.crufty.net
+
+ * Makefile.in (MAKE_VERSION): bump version to 20120911
+ * bsd.after-import.mk: include Makefile.inc early and allow it to
+ override PROG
+
2012-08-31 Simon J. Gerraty s...@bad.crufty.net
* Makefile.in (MAKE_VERSION): bump version to 20120831
Modified: head/contrib/bmake/Makefile.in
==
--- head/contrib/bmake/Makefile.in Thu Oct 25 22:54:29 2012
(r242101)
+++ head/contrib/bmake/Makefile.in Thu Oct 25 23:18:05 2012
(r242102)
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
# @(#)Makefile5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.170 2012/08/31 06:46:22 sjg Exp $
+# $Id: Makefile.in,v 1.174 2012/10/10 18:46:24 sjg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,7 +21,7 @@ srcdir= @srcdir@
CC?= @CC@
# Base version on src date
-MAKE_VERSION= 20120831
+MAKE_VERSION= 20121010
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
@@ -71,10 +71,9 @@ SUBDIR= PSD.doc
.endif
.endif
+.if defined(.PARSEDIR)
+# we cannot rely on anything but bmake to parse this correctly.
.if empty(isBSD44:M${OS})
-# XXX not sure if we still want this given that configure
-# lets us force or not the definition of MACHINE.
-CFLAGS_main.o+= -DFORCE_MACHINE=\${MACHINE}\
MANTARGET=cat
INSTALL?=${srcdir}/install-sh
.if (${MACHINE} == sun386)
@@ -85,7 +84,7 @@ SRCS+= sigcompat.c
CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
.endif
.endif
-.if defined(.PARSEDIR)
+
.if make(obj) || make(clean)
SUBDIR+= unit-tests
.endif
@@ -104,14 +103,18 @@ EXTRACT_MAN=no
MAN=${PROG}.1
.if (${PROG} != make)
-${MAN}:make.1
- @echo making ${PROG}.1
- @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' -e '/^.Sh
HISTORY/,$$d' ${srcdir}/make.1 $@
- @(echo .Sh HISTORY; \
- echo .Nm; \
+my.history: ${MAKEFILE}
+ @(echo .Nm; \
echo is derived from NetBSD; \
echo .Xr make 1 .; \
- echo It uses autoconf to facilitate portability to other platforms.)
$@
+ echo It uses autoconf to facilitate portability to other platforms.; \
+ echo .Pp) $@
+
+${MAN}:make.1 my.history
+ @echo making ${PROG}.1
+ @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
+ -e '/^.Sh HISTORY/rmy.history' \
+ -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${.CURDIR}/make.1 $@
.endif
Modified: head/contrib/bmake/bmake.1
==
--- head/contrib/bmake/bmake.1 Thu Oct 25 22:54:29 2012(r242101)
+++ head/contrib/bmake/bmake.1 Thu Oct 25 23:18:05 2012(r242102)
@@ -1,4 +1,4 @@
-.\$NetBSD: make.1,v 1.206 2012/08/30 22:35:37 wiz Exp $
+.\$NetBSD: make.1,v 1.209 2012/10/08 15:09:48 christos Exp $
.\
.\ Copyright (c) 1990, 1993
.\The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\from: @(#)make.18.4 (Berkeley) 3/19/94
.\
-.Dd August 30, 2012
+.Dd October 8, 2012
.Dt MAKE 1
.Os
.Sh NAME
@@ -2042,6 +2042,13 @@ or
To be compatible with Makefiles that do this, one can use
.Fl B
to disable this behavior.
+.Pp
+In compatibility mode, each command is run in a separate process.
+If the command contains any shell meta
svn commit: r242103 - head/sys/mips/cavium
Author: jmallett
Date: Fri Oct 26 00:04:05 2012
New Revision: 242103
URL: http://svn.freebsd.org/changeset/base/242103
Log:
Don't attach if the bootloader has not indicated that we're a PCI host. This
fixes booting on systems which are PCI targets.
Modified:
head/sys/mips/cavium/octopci.c
Modified: head/sys/mips/cavium/octopci.c
==
--- head/sys/mips/cavium/octopci.c Thu Oct 25 23:18:05 2012
(r242102)
+++ head/sys/mips/cavium/octopci.c Fri Oct 26 00:04:05 2012
(r242103)
@@ -104,7 +104,9 @@ static uint64_t octopci_cs_addr(unsigned
static void
octopci_identify(driver_t *drv, device_t parent)
{
- /* XXX Check sysinfo flag. */
+ /* Check whether we are a PCI host. */
+ if ((cvmx_sysinfo_get()-bootloader_config_flags
CVMX_BOOTINFO_CFG_FLAG_PCI_HOST) == 0)
+ return;
BUS_ADD_CHILD(parent, 0, pcib, 0);
if (octeon_has_feature(OCTEON_FEATURE_PCIE))
___
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: r242104 - in head/sys: conf contrib/octeon-sdk mips/conf
Author: jmallett
Date: Fri Oct 26 00:08:50 2012
New Revision: 242104
URL: http://svn.freebsd.org/changeset/base/242104
Log:
Add support for Radisys as a vendor of Octeon hardware. Add some preliminary
support for what their boot loader refers to as the RSYS4GBE, of which there
are two instances (Data Processing Blocks) on the Radisys ATCA-7220.
Modified:
head/sys/conf/options.mips
head/sys/contrib/octeon-sdk/cvmx-app-init.h
head/sys/contrib/octeon-sdk/cvmx-helper-board.c
head/sys/contrib/octeon-sdk/cvmx-helper.c
head/sys/mips/conf/OCTEON1
Modified: head/sys/conf/options.mips
==
--- head/sys/conf/options.mips Fri Oct 26 00:04:05 2012(r242103)
+++ head/sys/conf/options.mips Fri Oct 26 00:08:50 2012(r242104)
@@ -72,6 +72,7 @@ MAXMEMopt_global.h
# Options that control the Cavium Simple Executive.
#
OCTEON_VENDOR_LANNER opt_cvmx.h
+OCTEON_VENDOR_RADISYS opt_cvmx.h
OCTEON_BOARD_CAPK_0100ND opt_cvmx.h
#
Modified: head/sys/contrib/octeon-sdk/cvmx-app-init.h
==
--- head/sys/contrib/octeon-sdk/cvmx-app-init.h Fri Oct 26 00:04:05 2012
(r242103)
+++ head/sys/contrib/octeon-sdk/cvmx-app-init.h Fri Oct 26 00:08:50 2012
(r242104)
@@ -299,6 +299,9 @@ enum cvmx_board_types_enum {
CVMX_BOARD_TYPE_CUST_LANNER_MR320= 20002,
CVMX_BOARD_TYPE_CUST_LANNER_MR321X=20007,
#endif
+#if defined(OCTEON_VENDOR_RADISYS)
+CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE=20002,
+#endif
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 3,
@@ -423,6 +426,9 @@ static inline const char *cvmx_board_typ
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_LANNER_MR320)
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_LANNER_MR321X)
#endif
+#if defined(OCTEON_VENDOR_RADISYS)
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE)
+#endif
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
/* Module range */
Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c
==
--- head/sys/contrib/octeon-sdk/cvmx-helper-board.c Fri Oct 26 00:04:05
2012(r242103)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-board.c Fri Oct 26 00:08:50
2012(r242104)
@@ -1296,6 +1296,14 @@ int __cvmx_helper_board_interface_probe(
return 12;
break;
#endif
+#if defined(OCTEON_VENDOR_RADISYS)
+ case CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE:
+ if (interface == 0)
+ return 13;
+ if (interface == 1)
+ return 8;
+ return 0;
+#endif
}
#ifdef CVMX_BUILD_FOR_UBOOT
if (CVMX_HELPER_INTERFACE_MODE_SPI ==
cvmx_helper_interface_get_mode(interface) getenv(disable_spi))
Modified: head/sys/contrib/octeon-sdk/cvmx-helper.c
==
--- head/sys/contrib/octeon-sdk/cvmx-helper.c Fri Oct 26 00:04:05 2012
(r242103)
+++ head/sys/contrib/octeon-sdk/cvmx-helper.c Fri Oct 26 00:08:50 2012
(r242104)
@@ -146,6 +146,10 @@ int cvmx_helper_get_number_of_interfaces
case CVMX_BOARD_TYPE_CUST_LANNER_MR730:
return 1;
#endif
+#if defined(OCTEON_VENDOR_RADISYS)
+ case CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE:
+ return 2;
+#endif
default:
break;
}
Modified: head/sys/mips/conf/OCTEON1
==
--- head/sys/mips/conf/OCTEON1 Fri Oct 26 00:04:05 2012(r242103)
+++ head/sys/mips/conf/OCTEON1 Fri Oct 26 00:08:50 2012(r242104)
@@ -38,6 +38,7 @@ makeoptions DEBUG=-g#Build kernel with
# Board-specific support that cannot be auto-detected at runtime.
#options OCTEON_VENDOR_LANNER# Support for Lanner boards.
+#options OCTEON_VENDOR_RADISYS # Support for Radisys boards.
#options OCTEON_BOARD_CAPK_0100ND# Support for CAPK-0100nd.
optionsSCHED_ULE # ULE scheduler
___
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: r242105 - stable/9/sys/dev/hptmv
Author: delphij
Date: Fri Oct 26 00:28:29 2012
New Revision: 242105
URL: http://svn.freebsd.org/changeset/base/242105
Log:
MFC r240210:
It seems that what the code really meant is that when a write is completed,
do a BUS_DMASYNC_POSTWRITE over the DMA map. The way it currently is would
only do POSTREAD for read transactions.
Submitted by: Sascha Wildner
Modified:
stable/9/sys/dev/hptmv/entry.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/hptmv/entry.c
==
--- stable/9/sys/dev/hptmv/entry.c Fri Oct 26 00:08:50 2012
(r242104)
+++ stable/9/sys/dev/hptmv/entry.c Fri Oct 26 00:28:29 2012
(r242105)
@@ -3046,7 +3046,7 @@ fOsCommandDone(_VBUS_ARG PCommand pCmd)
if (pCmd-cf_data_in) {
bus_dmamap_sync(pAdapter-io_dma_parent, pmap-dma_map,
BUS_DMASYNC_POSTREAD);
}
- else if (pCmd-cf_data_in) {
+ else if (pCmd-cf_data_out) {
bus_dmamap_sync(pAdapter-io_dma_parent, pmap-dma_map,
BUS_DMASYNC_POSTWRITE);
}
___
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: r242106 - stable/8/sys/dev/hptmv
Author: delphij
Date: Fri Oct 26 00:30:44 2012
New Revision: 242106
URL: http://svn.freebsd.org/changeset/base/242106
Log:
MFC r240210:
It seems that what the code really meant is that when a write is completed,
do a BUS_DMASYNC_POSTWRITE over the DMA map. The way it currently is would
only do POSTREAD for read transactions.
Submitted by: Sascha Wildner
Modified:
stable/8/sys/dev/hptmv/entry.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/hptmv/ (props changed)
Modified: stable/8/sys/dev/hptmv/entry.c
==
--- stable/8/sys/dev/hptmv/entry.c Fri Oct 26 00:28:29 2012
(r242105)
+++ stable/8/sys/dev/hptmv/entry.c Fri Oct 26 00:30:44 2012
(r242106)
@@ -3046,7 +3046,7 @@ fOsCommandDone(_VBUS_ARG PCommand pCmd)
if (pCmd-cf_data_in) {
bus_dmamap_sync(pAdapter-io_dma_parent, pmap-dma_map,
BUS_DMASYNC_POSTREAD);
}
- else if (pCmd-cf_data_in) {
+ else if (pCmd-cf_data_out) {
bus_dmamap_sync(pAdapter-io_dma_parent, pmap-dma_map,
BUS_DMASYNC_POSTWRITE);
}
___
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: r242107 - in head/usr.sbin/bsdconfig: . security share
Author: dteske
Date: Fri Oct 26 00:31:25 2012
New Revision: 242107
URL: http://svn.freebsd.org/changeset/base/242107
Log:
Switch from using a msgbox to display help files to a textbox instead. The
problem with using a msgbox was one of truncation in the case of Xdialog(1)
and lack of screen real-estate (since the msgbox is not scrollable in X11
while a textbox is).
The textbox renders the text much better and is more appropriate for this
type of data display.
Approved by: adrian (co-mentor) (implicit)
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/security/kern_securelevel
head/usr.sbin/bsdconfig/share/common.subr
head/usr.sbin/bsdconfig/share/dialog.subr
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Fri Oct 26 00:30:44 2012
(r242106)
+++ head/usr.sbin/bsdconfig/bsdconfig Fri Oct 26 00:31:25 2012
(r242107)
@@ -37,8 +37,9 @@ f_include $BSDCFG_SHARE/strings.subr
BSDCFG_LIBE=/usr/libexec/bsdconfig
f_include_lang $BSDCFG_LIBE/include/messages.subr
-f_include_help BSDCONFIG $BSDCFG_LIBE/include/bsdconfig.hlp
-f_include_help USAGE $BSDCFG_LIBE/include/usage.hlp
+
+BSDCONFIG_HELPFILE=$BSDCFG_LIBE/include/bsdconfig.hlp
+USAGE_HELPFILE=$BSDCFG_LIBE/include/usage.hlp
FUNCTIONS
@@ -302,7 +303,7 @@ while :; do
if [ $retval -eq 2 ]; then
# The Help button was pressed
- f_show_msg %s $( f_include_help BSDCONFIG )
+ f_show_help $BSDCONFIG_HELPFILE
continue
elif [ $retval -ne 0 ]; then
f_die
@@ -314,7 +315,7 @@ while :; do
;;
1) # Usage
- f_show_msg %s $( f_include_help USAGE )
+ f_show_help $USAGE_HELPFILE
continue
;;
Modified: head/usr.sbin/bsdconfig/security/kern_securelevel
==
--- head/usr.sbin/bsdconfig/security/kern_securelevel Fri Oct 26 00:30:44
2012(r242106)
+++ head/usr.sbin/bsdconfig/security/kern_securelevel Fri Oct 26 00:31:25
2012(r242107)
@@ -36,7 +36,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
BSDCFG_LIBE=/usr/libexec/bsdconfig APP_DIR=130.security
f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
-f_include_help SECURELEVEL $BSDCFG_LIBE/$APP_DIR/include/securelevel.hlp
+
+SECURELEVEL_HELPFILE=$BSDCFG_LIBE/$APP_DIR/include/securelevel.hlp
ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX $pgm )
[ $? -eq $SUCCESS -a $ipgm ] pgm=$ipgm
@@ -119,7 +120,7 @@ while :; do
if [ $retval -eq 2 ]; then
# The Help button was pressed
- f_show_msg %s $( f_include_help SECURELEVEL )
+ f_show_help $SECURELEVEL_HELPFILE
continue
elif [ $retval -ne 0 ]; then
f_die
Modified: head/usr.sbin/bsdconfig/share/common.subr
==
--- head/usr.sbin/bsdconfig/share/common.subr Fri Oct 26 00:30:44 2012
(r242106)
+++ head/usr.sbin/bsdconfig/share/common.subr Fri Oct 26 00:31:25 2012
(r242107)
@@ -140,6 +140,37 @@ f_show_msg()
fi
}
+# f_show_help $file
+#
+# Display a language help-file. Automatically takes $LANG and $LC_ALL into
+# consideration when displaying $file (suffix .$LC_ALL or .$LANG will
+# automatically be added prior to loading the language help-file).
+#
+# If a language has been requested by setting either $LANG or $LC_ALL in the
+# environment and the language-specific help-file does not exist we will fall
+# back to $file without-suffix.
+#
+# If the language help-file does not exist, an error is displayed instead.
+#
+f_show_help()
+{
+ local file=$1
+ local lang=${LANG:-$LC_ALL}
+
+ [ -f $file.$lang ] file=$file.$lang
+
+ #
+ # Use f_dialog_textbox from dialog.subr if possible, otherwise fall
+ # back to dialog(1) (without options, making it obvious when using
+ # un-aided system dialog).
+ #
+ if f_have f_dialog_textbox; then
+ f_dialog_textbox $file
+ else
+ dialog --msgbox $( cat $file 21 ) 0 0
+ fi
+}
+
# f_include $file
#
# Include a shell subroutine file.
@@ -179,40 +210,6 @@ f_include_lang()
fi
}
-# f_include_help NAME [$file]
-#
-# When given both arguments, cache the contents of a language help-file to
-# later be retrieved by executing again with only the first argument.
-#
-# Automatically takes $LANG and $LC_ALL into consideration when reading $file
-# (suffix .$LC_ALL or .$LANG will automatically be added prior to loading
-# the language help-file).
-#
-# If a language has been requested by setting either $LANG or $LC_ALL in the
-# environment and the language-specific
svn commit: r242108 - stable/7/sys/dev/hptmv
Author: delphij
Date: Fri Oct 26 00:32:28 2012
New Revision: 242108
URL: http://svn.freebsd.org/changeset/base/242108
Log:
MFC r240210:
It seems that what the code really meant is that when a write is completed,
do a BUS_DMASYNC_POSTWRITE over the DMA map. The way it currently is would
only do POSTREAD for read transactions.
Submitted by: Sascha Wildner
Modified:
stable/7/sys/dev/hptmv/entry.c
Directory Properties:
stable/7/sys/ (props changed)
Modified: stable/7/sys/dev/hptmv/entry.c
==
--- stable/7/sys/dev/hptmv/entry.c Fri Oct 26 00:31:25 2012
(r242107)
+++ stable/7/sys/dev/hptmv/entry.c Fri Oct 26 00:32:28 2012
(r242108)
@@ -3047,7 +3047,7 @@ fOsCommandDone(_VBUS_ARG PCommand pCmd)
if (pCmd-cf_data_in) {
bus_dmamap_sync(pAdapter-io_dma_parent, pmap-dma_map,
BUS_DMASYNC_POSTREAD);
}
- else if (pCmd-cf_data_in) {
+ else if (pCmd-cf_data_out) {
bus_dmamap_sync(pAdapter-io_dma_parent, pmap-dma_map,
BUS_DMASYNC_POSTWRITE);
}
___
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: r242109 - stable/9/games/fortune/datfiles
Author: eadler Date: Fri Oct 26 00:34:27 2012 New Revision: 242109 URL: http://svn.freebsd.org/changeset/base/242109 Log: MFC r241845,r241934: Sysinstall has been removed from base. Approved by: cperciva (implicit) Modified: stable/9/games/fortune/datfiles/freebsd-tips Directory Properties: stable/9/games/fortune/ (props changed) Modified: stable/9/games/fortune/datfiles/freebsd-tips == --- stable/9/games/fortune/datfiles/freebsd-tipsFri Oct 26 00:32:28 2012(r242108) +++ stable/9/games/fortune/datfiles/freebsd-tipsFri Oct 26 00:34:27 2012(r242109) @@ -40,7 +40,7 @@ Having trouble using fetch through a fir variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. % If other operating systems have damaged your Master Boot Record, you can -reinstall it either with /usr/sbin/sysinstall or with boot0cfg(8). See +reinstall it with boot0cfg(8). See man boot0cfg for details. % If you accidentally end up inside vi, you can quit it by pressing Escape, colon ___ 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: r242110 - stable/8/games/fortune/datfiles
Author: eadler Date: Fri Oct 26 00:35:28 2012 New Revision: 242110 URL: http://svn.freebsd.org/changeset/base/242110 Log: MFC r241845,r241934: Sysinstall has been removed from base. MFC farther back to maintain consistency Approved by: cperciva (implicit) Modified: stable/8/games/fortune/datfiles/freebsd-tips Directory Properties: stable/8/games/fortune/ (props changed) Modified: stable/8/games/fortune/datfiles/freebsd-tips == --- stable/8/games/fortune/datfiles/freebsd-tipsFri Oct 26 00:34:27 2012(r242109) +++ stable/8/games/fortune/datfiles/freebsd-tipsFri Oct 26 00:35:28 2012(r242110) @@ -40,7 +40,7 @@ Having trouble using fetch through a fir variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. % If other operating systems have damaged your Master Boot Record, you can -reinstall it either with /usr/sbin/sysinstall or with boot0cfg(8). See +reinstall it with boot0cfg(8). See man boot0cfg for details. % If you accidentally end up inside vi, you can quit it by pressing Escape, colon ___ 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: r242111 - stable/7/games/fortune/datfiles
Author: eadler Date: Fri Oct 26 00:35:30 2012 New Revision: 242111 URL: http://svn.freebsd.org/changeset/base/242111 Log: MFC r241845,r241934: Sysinstall has been removed from base. MFC farther back to maintain consistency Approved by: cperciva (implicit) Modified: stable/7/games/fortune/datfiles/freebsd-tips Directory Properties: stable/7/games/fortune/ (props changed) Modified: stable/7/games/fortune/datfiles/freebsd-tips == --- stable/7/games/fortune/datfiles/freebsd-tipsFri Oct 26 00:35:28 2012(r242110) +++ stable/7/games/fortune/datfiles/freebsd-tipsFri Oct 26 00:35:30 2012(r242111) @@ -40,7 +40,7 @@ Having trouble using fetch through a fir variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. % If other operating systems have damaged your Master Boot Record, you can -reinstall it either with /usr/sbin/sysinstall or with boot0cfg(8). See +reinstall it with boot0cfg(8). See man boot0cfg for details. % If you accidentally end up inside vi, you can quit it by pressing Escape, colon ___ 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: r242112 - in stable/9: . sys/modules/3dfx sys/modules/cmx sys/modules/filemon tools/tools/sysdoc
Author: eadler
Date: Fri Oct 26 00:44:32 2012
New Revision: 242112
URL: http://svn.freebsd.org/changeset/base/242112
Log:
MFC r241828,r241891:
Finish migration of MAINTAINER entries
Approved by: cperciva (implicit)
Modified:
stable/9/MAINTAINERS (contents, props changed)
stable/9/sys/modules/3dfx/Makefile
stable/9/sys/modules/cmx/Makefile
stable/9/sys/modules/filemon/Makefile
stable/9/tools/tools/sysdoc/Makefile
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/modules/ (props changed)
stable/9/tools/tools/sysdoc/ (props changed)
Modified: stable/9/MAINTAINERS
==
--- stable/9/MAINTAINERSFri Oct 26 00:35:30 2012(r242111)
+++ stable/9/MAINTAINERSFri Oct 26 00:44:32 2012(r242112)
@@ -127,16 +127,7 @@ sysinstall randi Please contact about an
they can be co-ordinated.
sbin/routedbms Pre-commit review; notify vendor at rhyolite.com
isci(4)jimharris Pre-commit review requested.
-
-Following are the entries from the Makefiles, and a few other sources.
-Please remove stale entries from both their origin, and this file.
-
-Please also consider removing the lines from the files listed below and
-stating your preferences here instead.
-
-List below generated with:
-$ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ tab]*='
-
-sys/modules/3dfx/Makefile:MAINTAINER= cok...@freebsd.org
-sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi k...@ca2.so-net.ne.jp
-tools/tools/sysdoc/Makefile:MAINTAINER=trho...@freebsd.org
+3dfx cokane Pre-commit review preferred.
+cmxdan...@roe.ch Pre-commit review preferred.
+filemonobrien Pre-commit review preferred.
+sysdoc trhodes Pre-commit review preferred.
Modified: stable/9/sys/modules/3dfx/Makefile
==
--- stable/9/sys/modules/3dfx/Makefile Fri Oct 26 00:35:30 2012
(r242111)
+++ stable/9/sys/modules/3dfx/Makefile Fri Oct 26 00:44:32 2012
(r242112)
@@ -1,7 +1,5 @@
# $FreeBSD$
-MAINTAINER=cok...@freebsd.org
-
.PATH: $(.CURDIR)/../../dev/tdfx
KMOD= 3dfx
Modified: stable/9/sys/modules/cmx/Makefile
==
--- stable/9/sys/modules/cmx/Makefile Fri Oct 26 00:35:30 2012
(r242111)
+++ stable/9/sys/modules/cmx/Makefile Fri Oct 26 00:44:32 2012
(r242112)
@@ -1,7 +1,5 @@
# $FreeBSD$
#
-MAINTAINER=dan...@roe.ch
-
.PATH: ${.CURDIR}/../../dev/cmx
KMOD= cmx
Modified: stable/9/sys/modules/filemon/Makefile
==
--- stable/9/sys/modules/filemon/Makefile Fri Oct 26 00:35:30 2012
(r242111)
+++ stable/9/sys/modules/filemon/Makefile Fri Oct 26 00:44:32 2012
(r242112)
@@ -1,7 +1,5 @@
# $FreeBSD$
-MAINTAINER=obr...@freebsd.org
-
.PATH: ${.CURDIR}/../../dev/filemon
KMOD= filemon
Modified: stable/9/tools/tools/sysdoc/Makefile
==
--- stable/9/tools/tools/sysdoc/MakefileFri Oct 26 00:35:30 2012
(r242111)
+++ stable/9/tools/tools/sysdoc/MakefileFri Oct 26 00:44:32 2012
(r242112)
@@ -1,7 +1,5 @@
# $FreeBSD$
-MAINTAINER=trho...@freebsd.org
-
sysctl.5:
sh ${.CURDIR}/sysdoc.sh -k /boot/kernel
___
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: r242113 - in stable/8: . sys/modules/3dfx sys/modules/cmx sys/modules/filemon tools/tools/sysdoc
Author: eadler
Date: Fri Oct 26 00:44:34 2012
New Revision: 242113
URL: http://svn.freebsd.org/changeset/base/242113
Log:
MFC r241828,r241891:
Finish migration of MAINTAINER entries
Approved by: cperciva (implicit)
Modified:
stable/8/MAINTAINERS (contents, props changed)
stable/8/sys/modules/3dfx/Makefile
stable/8/sys/modules/cmx/Makefile
stable/8/sys/modules/filemon/Makefile
stable/8/tools/tools/sysdoc/Makefile
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/modules/ (props changed)
stable/8/tools/tools/sysdoc/ (props changed)
Modified: stable/8/MAINTAINERS
==
--- stable/8/MAINTAINERSFri Oct 26 00:44:32 2012(r242112)
+++ stable/8/MAINTAINERSFri Oct 26 00:44:34 2012(r242113)
@@ -125,17 +125,7 @@ usr.sbin/bluetooth emaxPre-commit revie
gnu/usr.bin/send-prbugmaster Pre-commit review requested.
ncursesrafan Heads-up appreciated, try not to break it.
isci(4)jimharris Pre-commit review requested.
-
-Following are the entries from the Makefiles, and a few other sources.
-Please remove stale entries from both their origin, and this file.
-
-Please also consider removing the lines from the files listed below and
-stating your preferences here instead.
-
-List below generated with:
-$ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ tab]*='
-
-sys/modules/3dfx/Makefile:MAINTAINER= cok...@freebsd.org
-sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi k...@ca2.so-net.ne.jp
-tools/tools/sysdoc/Makefile:MAINTAINER=trho...@freebsd.org
-usr.sbin/zic/Makefile:MAINTAINER= woll...@freebsd.org
+3dfx cokane Pre-commit review preferred.
+cmxdan...@roe.ch Pre-commit review preferred.
+filemonobrien Pre-commit review preferred.
+sysdoc trhodes Pre-commit review preferred.
Modified: stable/8/sys/modules/3dfx/Makefile
==
--- stable/8/sys/modules/3dfx/Makefile Fri Oct 26 00:44:32 2012
(r242112)
+++ stable/8/sys/modules/3dfx/Makefile Fri Oct 26 00:44:34 2012
(r242113)
@@ -1,7 +1,5 @@
# $FreeBSD$
-MAINTAINER=cok...@freebsd.org
-
.PATH: $(.CURDIR)/../../dev/tdfx
KMOD= 3dfx
Modified: stable/8/sys/modules/cmx/Makefile
==
--- stable/8/sys/modules/cmx/Makefile Fri Oct 26 00:44:32 2012
(r242112)
+++ stable/8/sys/modules/cmx/Makefile Fri Oct 26 00:44:34 2012
(r242113)
@@ -1,7 +1,5 @@
# $FreeBSD$
#
-MAINTAINER=dan...@roe.ch
-
.PATH: ${.CURDIR}/../../dev/cmx
KMOD= cmx
Modified: stable/8/sys/modules/filemon/Makefile
==
--- stable/8/sys/modules/filemon/Makefile Fri Oct 26 00:44:32 2012
(r242112)
+++ stable/8/sys/modules/filemon/Makefile Fri Oct 26 00:44:34 2012
(r242113)
@@ -1,7 +1,5 @@
# $FreeBSD$
-MAINTAINER=obr...@freebsd.org
-
.PATH: ${.CURDIR}/../../dev/filemon
KMOD= filemon
Modified: stable/8/tools/tools/sysdoc/Makefile
==
--- stable/8/tools/tools/sysdoc/MakefileFri Oct 26 00:44:32 2012
(r242112)
+++ stable/8/tools/tools/sysdoc/MakefileFri Oct 26 00:44:34 2012
(r242113)
@@ -1,7 +1,5 @@
# $FreeBSD$
-MAINTAINER=trho...@freebsd.org
-
sysctl.5:
sh ${.CURDIR}/sysdoc.sh -k /boot/kernel
___
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: r242114 - head/usr.sbin/bsdconfig/share
Author: dteske Date: Fri Oct 26 00:46:09 2012 New Revision: 242114 URL: http://svn.freebsd.org/changeset/base/242114 Log: Fix copy/paste error. Approved by: adrian (co-mentor) (implicit) Modified: head/usr.sbin/bsdconfig/share/dialog.subr Modified: head/usr.sbin/bsdconfig/share/dialog.subr == --- head/usr.sbin/bsdconfig/share/dialog.subr Fri Oct 26 00:44:34 2012 (r242113) +++ head/usr.sbin/bsdconfig/share/dialog.subr Fri Oct 26 00:46:09 2012 (r242114) @@ -1053,7 +1053,7 @@ f_dialog_textbox() --title \\$DIALOG_TITLE\ \ --backtitle \\$DIALOG_BACKTITLE\ \ --ok-label \\$msg_ok\\ - --msgbox \\$msg_text\ $size + --msgbox \\$contents\ $size fi } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r241701 - in head/usr.sbin/bsdconfig: . include share
On Oct 21, 2012, at 11:10 AM, Alexey Dokuchaev wrote: On Fri, Oct 19, 2012 at 11:36:04AM -0700, Devin Teske wrote: On Oct 19, 2012, at 10:02 AM, Alexey Dokuchaev wrote: Ah, I guess it might explain the shitty colors I see on newish FreeBSD screenshots of dialog(1). I actually prefer the colors in cdialog (more specifically, I prefer the lack-of-yellow!). I'm curious about how others feel about the use of yellow (specifically that old dialog(1)/libdialog used it a lot and new cdialog-based dialog(1)/ libdialog doesn't use it hardly at all). While you probably know my opinion at this point, I'd like to remark that our original dialog(1) colors seem like one of our distinctive features (similar to e.g. RedHat's or Debian's text-based installers) that had been around for years and are immediately recognizable. It is sad to loose them. Hmm, you make an interesting point and I think I know why the change in colors. I saw this hit my inbox recently: %begin excerpt% --- head/contrib/dialog/CHANGES Sun Oct 21 18:18:49 2012(r241817) +++ head/contrib/dialog/CHANGES Sun Oct 21 18:25:12 2012(r241818) @@ -1,9 +1,172 @@ --- $Id: CHANGES,v 1.360 2011/07/07 23:35:10 tom Exp $ +-- $Id: CHANGES,v 1.419 2012/07/06 18:18:48 tom Exp $ -- Thomas E. Dickey dic...@invisible-island.net This version of dialog was originally from a Debian snapshot. I've done this to it: %end excerpt% The dialog(1) that we're using in 9+ was originally from Debian and then tom makes a bunch of modifications (and I think our own nwhitehorn might make some more changes). I think this explains the [recent] similarity in color choices. I think you make a good point about diminished diversity. However, I'd inquire with nwhitehorn about any/all changes to the dialog(1) contrib code as it is still vendor maintained (and he's the one doing the importing these days). It is possible to change the colorings by first creating (if you don't already have one) a ~/.dialogrc by executing the below command: dialog --create-rc ~/.dialogrc followed by editing said file. So while the default look and feel has changed, it's possible to customize it to your liking. I would wholeheartedly prefer us to have original colors by default, and to Changing the default colors introduces [more] maintenance for the importer/maintainer of the contrib code. Exactly how much more maintenance, I'm unsure of. provide alternative color scheme for those how experience some difficulties with them (e.g. MacOSX users), not the other way around. Mac OS X was only one example, and I agree it should not be the sole source of reasoning here. However, I experience the same problem using XTerm natively on FreeBSD. My personal issue although has already been heard on the topic (unable to see the yellow titles, yellow hlines, or pretty much any yellow on a light background) -- so I'm inclined to not push too hard in restoring the original coloring _exactly_ as it was (read: I think we can do better). -- Devin _ The information contained in this message is proprietary and/or confidential. If you are not the intended recipient, please: (i) delete the message and all copies; (ii) do not disclose, distribute or use the message in any manner; and (iii) notify the sender immediately. In addition, please be aware that any message addressed to our domain is subject to archiving and review by persons other than the intended recipient. 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: r242115 - head/usr.sbin/bsdconfig/share
Author: dteske Date: Fri Oct 26 01:47:59 2012 New Revision: 242115 URL: http://svn.freebsd.org/changeset/base/242115 Log: Tighten-up displays that use a NULL prompt (e.g., networking and usermgmt). Approved by: adrian (co-mentor) (implicit) Modified: head/usr.sbin/bsdconfig/share/dialog.subr Modified: head/usr.sbin/bsdconfig/share/dialog.subr == --- head/usr.sbin/bsdconfig/share/dialog.subr Fri Oct 26 00:46:09 2012 (r242114) +++ head/usr.sbin/bsdconfig/share/dialog.subr Fri Oct 26 01:47:59 2012 (r242115) @@ -272,7 +272,7 @@ f_dialog_infobox_size() # # Set height based on number of rows in prompt # - height=$( echo $prompt | f_number_of_lines ) + height=$( echo -n $prompt | f_number_of_lines ) height=$(( $height + 2 )) # ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r242116 - head/sys/contrib/octeon-sdk
Author: jmallett Date: Fri Oct 26 02:09:55 2012 New Revision: 242116 URL: http://svn.freebsd.org/changeset/base/242116 Log: No MII on the RSYS4GBE (AMC-7211/ATCA-7220). Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c == --- head/sys/contrib/octeon-sdk/cvmx-helper-board.c Fri Oct 26 01:47:59 2012(r242115) +++ head/sys/contrib/octeon-sdk/cvmx-helper-board.c Fri Oct 26 02:09:55 2012(r242116) @@ -586,6 +586,11 @@ int cvmx_helper_board_get_mii_address(in return -1; } #endif +#if defined(OCTEON_VENDOR_RADISYS) + case CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE: + /* No MII. */ + return -1; +#endif } /* Some unknown board. Somebody forgot to update this function... */ ___ 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: r242117 - in head/usr.sbin/bsdconfig/networking: include share
Author: dteske
Date: Fri Oct 26 02:45:29 2012
New Revision: 242117
URL: http://svn.freebsd.org/changeset/base/242117
Log:
Resurrect and integrate stable/9/sysinstall/help/tcp.hlp
Approved by: adrian (co-mentor) (implicit)
Added:
head/usr.sbin/bsdconfig/networking/include/tcp.hlp (contents, props changed)
Modified:
head/usr.sbin/bsdconfig/networking/include/Makefile
head/usr.sbin/bsdconfig/networking/share/device.subr
Modified: head/usr.sbin/bsdconfig/networking/include/Makefile
==
--- head/usr.sbin/bsdconfig/networking/include/Makefile Fri Oct 26 02:09:55
2012(r242116)
+++ head/usr.sbin/bsdconfig/networking/include/Makefile Fri Oct 26 02:45:29
2012(r242117)
@@ -3,7 +3,7 @@
NO_OBJ=
FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking/include
-FILES= messages.subr
+FILES= messages.subr tcp.hlp
beforeinstall:
mkdir -p ${DESTDIR}${FILESDIR}
Added: head/usr.sbin/bsdconfig/networking/include/tcp.hlp
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/bsdconfig/networking/include/tcp.hlp Fri Oct 26 02:45:29
2012(r242117)
@@ -0,0 +1,33 @@
+This screen allows you to set up your general network parameters
+(hostname, domain name, DNS server, etc) as well as the settings for a
+given interface (which was selected from the menu before this screen).
+
+PLIP/SLIP users - please read through to the end of this doc!
+
+The options field is kind of special (read: a hack :-):
+
+Any valid options to ifconfig can be specified here, so if you need
+to do something special to get your interface working, then here
+is the place to do it.
+
+If you're running SLIP or PLIP, you also need to use it for specifying
+the remote end of the link (simply type the foreign IP address in).
+In the specific case where you're running PLIP with a Linux host peer
+rather than a FreeBSD one, you also must add the -link0 flag after the
+foreign address.
+
+If you're dealing with an ethernet adaptor with multiple media
+connectors (e.g. AUI, 10BT, 10B2, etc), you can use this field to
+specify which one to use. Examples of valid strings include:
+
+media 10base5/AUI - Select the AUI port.
+media 10baseT/UTP - Select the twisted pair port.
+media 10base2/BNC - Select the BNC connector.
+media 100baseTX - Select 100BaseT on a 100/10 dual adaptor.
+
+If you have a wireless interface and must specify arguments such as a
+WEP key here, you may use something like:
+
+ wepmode on wepkey 0xFEEDFACE
+
+When you're done with this form, select OK.
Modified: head/usr.sbin/bsdconfig/networking/share/device.subr
==
--- head/usr.sbin/bsdconfig/networking/share/device.subrFri Oct 26
02:09:55 2012(r242116)
+++ head/usr.sbin/bsdconfig/networking/share/device.subrFri Oct 26
02:45:29 2012(r242117)
@@ -42,6 +42,8 @@ f_include $BSDCFG_SHARE/networking/routi
BSDCFG_LIBE=/usr/libexec/bsdconfig APP_DIR=120.networking
f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
+TCP_HELPFILE=$BSDCFG_LIBE/$APP_DIR/include/tcp.hlp
+
GLOBALS
#
@@ -342,6 +344,8 @@ f_dialog_menu_netdev_edit()
--hline \\$hline\\
--ok-label \\$msg_ok\\
--cancel-label \\$msg_cancel\\
+ --help-button \
+ ${USE_XDIALOG:+--help \\}\
--menu \\$prompt\ $size \
$menu_list \
21 $DIALOG_TERMINAL_PASSTHRU_FD
@@ -351,8 +355,14 @@ f_dialog_menu_netdev_edit()
setvar DIALOG_MENU_$$ $dialog_menu
local tag=$( f_dialog_menutag )
- # Return if Cancel was chosen (-1) or ESC was pressed (255)
- [ $retval -eq $SUCCESS ] || return $retval
+ if [ $retval -eq 2 ]; then
+ # The Help button was pressed
+ f_show_help $TCP_HELPFILE
+ continue
+ elif [ $retval -ne $SUCCESS ]; then
+ # Cancel was chosen (-1) or ESC was pressed (255)
+ return $retval
+ fi
#
# Call the below ``modifier functions'' whose job it is to take
___
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: r242118 - head/usr.sbin/bsdconfig/networking/share
Author: dteske Date: Fri Oct 26 02:49:12 2012 New Revision: 242118 URL: http://svn.freebsd.org/changeset/base/242118 Log: Don't mask fwe(4) lp(4) or plip(4) devices from ifconfig(8) list. Approved by: adrian (co-mentor) (implicit) Modified: head/usr.sbin/bsdconfig/networking/share/device.subr Modified: head/usr.sbin/bsdconfig/networking/share/device.subr == --- head/usr.sbin/bsdconfig/networking/share/device.subrFri Oct 26 02:45:29 2012(r242117) +++ head/usr.sbin/bsdconfig/networking/share/device.subrFri Oct 26 02:49:12 2012(r242118) @@ -205,10 +205,7 @@ f_dialog_menu_netdev() s/lo$d//g s/ppp$d//g s/sl$d//g - s/lp$d//g - s/fwe$d//g s/faith$d//g - s/plip$d//g # Convert all colons back into spaces y/:/ / ___ 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: r242119 - head/usr.sbin/bsdconfig/networking/share
Author: dteske
Date: Fri Oct 26 02:50:14 2012
New Revision: 242119
URL: http://svn.freebsd.org/changeset/base/242119
Log:
Remove unnecessary quotation to clean things up.
Approved by: adrian (co-mentor) (implicit)
Modified:
head/usr.sbin/bsdconfig/networking/share/device.subr
Modified: head/usr.sbin/bsdconfig/networking/share/device.subr
==
--- head/usr.sbin/bsdconfig/networking/share/device.subrFri Oct 26
02:49:12 2012(r242118)
+++ head/usr.sbin/bsdconfig/networking/share/device.subrFri Oct 26
02:50:14 2012(r242119)
@@ -243,7 +243,7 @@ f_dialog_menu_netdev()
}
' )
printf '%s%s' '%s'\n \
- $ifn ${active:+*} $(f_device_desc $ifn)
+ $ifn ${active:+*} $( f_device_desc $ifn )
done
)
if [ ! $interfaces ]; then
___
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: r242120 - head/usr.sbin/cpucontrol
Author: eadler Date: Fri Oct 26 02:50:16 2012 New Revision: 242120 URL: http://svn.freebsd.org/changeset/base/242120 Log: This utility builds without NO_WCAST_ALIGN Tested with make universe No objections from: stas Approved by: cperciva MFC after:3 days Modified: head/usr.sbin/cpucontrol/Makefile Modified: head/usr.sbin/cpucontrol/Makefile == --- head/usr.sbin/cpucontrol/Makefile Fri Oct 26 02:50:14 2012 (r242119) +++ head/usr.sbin/cpucontrol/Makefile Fri Oct 26 02:50:16 2012 (r242120) @@ -4,6 +4,4 @@ PROG= cpucontrol MAN= cpucontrol.8 SRCS= cpucontrol.c intel.c amd.c via.c -NO_WCAST_ALIGN= - .include bsd.prog.mk ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r242121 - in head/sys: conf ia64/ia64 ia64/include
Author: alc
Date: Fri Oct 26 03:02:39 2012
New Revision: 242121
URL: http://svn.freebsd.org/changeset/base/242121
Log:
Port the new PV entry allocator from amd64/i386. This allocator has two
advantages. First, PV entries are roughly half the size. Second, this
allocator doesn't access the paging queues, and thus it allows for the
removal of the page queues lock from this pmap.
Replace all uses of the page queues lock by a R/W lock that is private
to this pmap.
Tested by:marcel
Modified:
head/sys/conf/options.ia64
head/sys/ia64/ia64/pmap.c
head/sys/ia64/include/pmap.h
Modified: head/sys/conf/options.ia64
==
--- head/sys/conf/options.ia64 Fri Oct 26 02:50:16 2012(r242120)
+++ head/sys/conf/options.ia64 Fri Oct 26 03:02:39 2012(r242121)
@@ -11,6 +11,8 @@ UWX_TRACE_ENABLE opt_global.h
COMPAT_FREEBSD32 opt_compat.h
+PV_STATS opt_pmap.h
+
EXCEPTION_TRACING opt_xtrace.h
VGA_ALT_SEQACCESS opt_vga.h
Modified: head/sys/ia64/ia64/pmap.c
==
--- head/sys/ia64/ia64/pmap.c Fri Oct 26 02:50:16 2012(r242120)
+++ head/sys/ia64/ia64/pmap.c Fri Oct 26 03:02:39 2012(r242121)
@@ -48,12 +48,15 @@
#include sys/cdefs.h
__FBSDID($FreeBSD$);
+#include opt_pmap.h
+
#include sys/param.h
#include sys/kernel.h
#include sys/lock.h
#include sys/mman.h
#include sys/mutex.h
#include sys/proc.h
+#include sys/rwlock.h
#include sys/smp.h
#include sys/sysctl.h
#include sys/systm.h
@@ -108,16 +111,18 @@ __FBSDID($FreeBSD$);
/* XXX move to a header. */
extern uint64_t ia64_gateway_page[];
-#ifndef PMAP_SHPGPERPROC
-#define PMAP_SHPGPERPROC 200
-#endif
-
#if !defined(DIAGNOSTIC)
#define PMAP_INLINE __inline
#else
#define PMAP_INLINE
#endif
+#ifdef PV_STATS
+#define PV_STAT(x) do { x ; } while (0)
+#else
+#define PV_STAT(x) do { } while (0)
+#endif
+
#definepmap_accessed(lpte) ((lpte)-pte PTE_ACCESSED)
#definepmap_dirty(lpte)((lpte)-pte PTE_DIRTY)
#definepmap_exec(lpte) ((lpte)-pte PTE_AR_RX)
@@ -187,10 +192,21 @@ static uint64_t *pmap_ridmap;
struct mtx pmap_ridmutex;
/*
+ * Isolate the global pv list lock from data and other locks to prevent false
+ * sharing within the cache.
+ */
+static struct {
+ struct rwlock lock;
+ charpadding[CACHE_LINE_SIZE - sizeof(struct rwlock)];
+} pvh_global __aligned(CACHE_LINE_SIZE);
+
+#definepvh_global_lock pvh_global.lock
+
+/*
* Data for the pv entry allocation mechanism
*/
-static uma_zone_t pvzone;
-static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0;
+static TAILQ_HEAD(pch, pv_chunk) pv_chunks = TAILQ_HEAD_INITIALIZER(pv_chunks);
+static int pv_entry_count;
/*
* Data for allocating PTEs for user processes.
@@ -224,8 +240,10 @@ SYSCTL_PROC(_machdep_vhpt, OID_AUTO, pop
static struct ia64_lpte *pmap_find_vhpt(vm_offset_t va);
-static PMAP_INLINE voidfree_pv_entry(pv_entry_t pv);
-static pv_entry_t get_pv_entry(pmap_t locked_pmap);
+static void free_pv_chunk(struct pv_chunk *pc);
+static void free_pv_entry(pmap_t pmap, pv_entry_t pv);
+static pv_entry_t get_pv_entry(pmap_t pmap, boolean_t try);
+static vm_page_t pmap_pv_reclaim(pmap_t locked_pmap);
static voidpmap_enter_quick_locked(pmap_t pmap, vm_offset_t va,
vm_page_t m, vm_prot_t prot);
@@ -402,9 +420,14 @@ pmap_bootstrap()
PMAP_LOCK_INIT(kernel_pmap);
for (i = 0; i IA64_VM_MINKERN_REGION; i++)
kernel_pmap-pm_rid[i] = 0;
- TAILQ_INIT(kernel_pmap-pm_pvlist);
+ TAILQ_INIT(kernel_pmap-pm_pvchunk);
PCPU_SET(md.current_pmap, kernel_pmap);
+ /*
+* Initialize the global pv list lock.
+*/
+ rw_init(pvh_global_lock, pmap pv global);
+
/* Region 5 is mapped via the VHPT. */
ia64_set_rr(IA64_RR_BASE(5), (5 8) | (PAGE_SHIFT 2) | 1);
@@ -449,7 +472,6 @@ pmap_page_init(vm_page_t m)
{
TAILQ_INIT(m-md.pv_list);
- m-md.pv_list_count = 0;
m-md.memattr = VM_MEMATTR_DEFAULT;
}
@@ -461,19 +483,6 @@ pmap_page_init(vm_page_t m)
void
pmap_init(void)
{
- int shpgperproc = PMAP_SHPGPERPROC;
-
- /*
-* Initialize the address space (zone) for the pv entries. Set a
-* high water mark so that the system can recover from excessive
-* numbers of pv entries.
-*/
- pvzone = uma_zcreate(PV ENTRY, sizeof(struct pv_entry), NULL, NULL,
- NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
- TUNABLE_INT_FETCH(vm.pmap.shpgperproc, shpgperproc);
- pv_entry_max = shpgperproc * maxproc + cnt.v_page_count;
- TUNABLE_INT_FETCH(vm.pmap.pv_entries, pv_entry_max);
- pv_entry_high_water = 9 * (pv_entry_max /
svn commit: r242123 - in head/usr.sbin/bsdconfig/usermgmt: . include
Author: dteske
Date: Fri Oct 26 03:20:04 2012
New Revision: 242123
URL: http://svn.freebsd.org/changeset/base/242123
Log:
Resurrect and integrate stable/9/usr.sbin/sysinstall/help/usermgmt.hlp
Approved by: adrian (co-mentor) (implicit)
Added:
head/usr.sbin/bsdconfig/usermgmt/include/usermgmt.hlp (contents, props
changed)
Modified:
head/usr.sbin/bsdconfig/usermgmt/include/Makefile
head/usr.sbin/bsdconfig/usermgmt/usermgmt
Modified: head/usr.sbin/bsdconfig/usermgmt/include/Makefile
==
--- head/usr.sbin/bsdconfig/usermgmt/include/Makefile Fri Oct 26 03:12:40
2012(r242122)
+++ head/usr.sbin/bsdconfig/usermgmt/include/Makefile Fri Oct 26 03:20:04
2012(r242123)
@@ -3,7 +3,7 @@
NO_OBJ=
FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt/include
-FILES= messages.subr
+FILES= messages.subr usermgmt.hlp
beforeinstall:
mkdir -p ${DESTDIR}${FILESDIR}
Added: head/usr.sbin/bsdconfig/usermgmt/include/usermgmt.hlp
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/bsdconfig/usermgmt/include/usermgmt.hlp Fri Oct 26
03:20:04 2012(r242123)
@@ -0,0 +1,76 @@
+These screens allow you to add groups and users to your system.
+
+Many of the settings get reasonable defaults if you leave them blank.
+The first time you have entered the name of the new group or user, the
+system will show you what it would chose for most of these fields.
+You are free to change them, of course.
+
+
+User groups
+===
+
+It's certainly almost generally a good idea to first create a new
+group for your users. Common names for such a group are users, or
+even simply other. Group names are used to control file access
+permissions for users that belong to the same group. Several group
+names are already used for system files.
+
+The numerical user or group IDs are often nothing you want to care for
+explicitly. If you don't fill in these fields, the system will choose
+reasonable defaults. However, these numbers (rather than the
+associated names) are what the operating system actually uses to
+distinguish users and groups -- hence they should normally be unique
+to each person or group, respectively.
+
+
+Users
+=
+
+The user's login ID is a short (up to 15 characters) alphanumeric ID
+that the user must enter when logging into the system. It's often the
+initial letters of the user's name, and commonly used in lower case.
+It's also the local mail name for this user (though it's possible to
+also set up more descriptive mail alias names later).
+
+The user's login group determines which group access rights the user
+will initially get when logging in. If an additional list of groups is
+provided which the user will become a member of, (s)he will also be
+able to access files of those groups later without providing any
+additional password etc. Except for the wheel case mentioned below,
+the additional group membership list should normally not contain the
+login group again.
+
+The user's password can also be set here, and should be chosen with
+care - 6 or more characters, intermixing punctuation and numerics, and
+*not* a word from the dictionary or related to the username is a good
+password choice.
+
+Some of the system's groups have a special meaning. In particular,
+members of group wheel are the only people who are later allowed to
+become superuser using the command su(1). So if you're going to add a
+new user who should later perform administrative tasks, don't forget
+to add him to this group! (Well, ``he'' will most likely be yourself
+in the very first place. :)
+
+Also, members of group operator will by default get permissions for
+minor administrative operations, like performing system backups, or
+shutting down the system -- without first becoming superuser! So,
+take care when adding people to this group.
+
+The ``full name'' field serves as a comment only. It is also used by
+mail front ends to determine the real name of the user, hence you
+should actually fill in the first and last name of this user. By
+convention, this field can be divided into comma-separated subfields,
+where the office location, the work phone number, and the home phone
+number follow the full name of the user.
+
+The home directory is the directory in the filesystem where the user
+is being logged into, and where his personalized setup files (``dot
+files'', since they usually begin with a `.' and are not displayed by
+the ls(1) command by default) will be looked up. It is often created
+under /usr/home/ or /home/.
+
+Finally, the shell is the user's initial command interpreter. The
+default shell is /bin/sh, some users prefer the more historic
+/bin/csh. Other, often more user-friendly and comfortable shells can
+be found in the ports and packages collection.
svn commit: r242124 - head/sys/arm/conf
Author: kientzle Date: Fri Oct 26 05:41:58 2012 New Revision: 242124 URL: http://svn.freebsd.org/changeset/base/242124 Log: Comment out the BOOTP/NFSROOT support. Transition this config file to support a production kernel mounted on an SD card. Modified: head/sys/arm/conf/PANDABOARD Modified: head/sys/arm/conf/PANDABOARD == --- head/sys/arm/conf/PANDABOARDFri Oct 26 03:20:04 2012 (r242123) +++ head/sys/arm/conf/PANDABOARDFri Oct 26 05:41:58 2012 (r242124) @@ -44,17 +44,18 @@ options FFS #Berkeley Fast Filesystem optionsSOFTUPDATES #Enable FFS soft updates support optionsUFS_ACL #Support for access control lists optionsUFS_DIRHASH #Improve performance on big directories -optionsNFSCLIENT #Network Filesystem Client device snp +optionsBREAK_TO_DEBUGGER + #options NFSCL +optionsNFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server optionsNFS_ROOT#NFS usable as /, requires NFSCLIENT -optionsBREAK_TO_DEBUGGER -optionsBOOTP_NFSROOT -optionsBOOTP_COMPAT -optionsBOOTP +#options BOOTP_NFSROOT +#options BOOTP_COMPAT +#options BOOTP optionsBOOTP_NFSV3 -optionsBOOTP_WIRED_TO=ue0 +#options BOOTP_WIRED_TO=ue0 optionsMSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) ___ 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: r242125 - head/sys/arm/ti
Author: kientzle Date: Fri Oct 26 05:48:53 2012 New Revision: 242125 URL: http://svn.freebsd.org/changeset/base/242125 Log: set the kernelname from the boot loader environment. This fixes kern.bootfile sysctl. Submitted by: Giovanni Trematerra Modified: head/sys/arm/ti/ti_machdep.c Modified: head/sys/arm/ti/ti_machdep.c == --- head/sys/arm/ti/ti_machdep.cFri Oct 26 05:41:58 2012 (r242124) +++ head/sys/arm/ti/ti_machdep.cFri Oct 26 05:48:53 2012 (r242125) @@ -306,6 +306,7 @@ initarm(struct arm_boot_params *abp) struct pv_addr dpcpu; vm_offset_t dtbp, freemempos, l2_start, lastaddr; uint32_t memsize, l2size; + char *env; void *kmdp; u_int l1pagetable; int i = 0, j = 0, err_devmap = 0; @@ -491,6 +492,10 @@ initarm(struct arm_boot_params *abp) print_kernel_section_addr(); print_kenv(); + env = getenv(kernelname); + if (env != NULL) + strlcpy(kernelname, env, sizeof(kernelname); + if (err_devmap != 0) printf(WARNING: could not fully configure devmap, error=%d\n, err_devmap); ___ 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
