svn commit: r275805 - head/lib/libc/iconv
Author: kuriyama Date: Mon Dec 15 14:36:04 2014 New Revision: 275805 URL: https://svnweb.freebsd.org/changeset/base/275805 Log: Fix incorrect type of invalids argument in __iconv() prototype. Modified: head/lib/libc/iconv/iconv.3 Modified: head/lib/libc/iconv/iconv.3 == --- head/lib/libc/iconv/iconv.3 Mon Dec 15 14:25:42 2014(r275804) +++ head/lib/libc/iconv/iconv.3 Mon Dec 15 14:36:04 2014(r275805) @@ -48,7 +48,7 @@ .Ft size_t .Fn iconv iconv_t cd char ** restrict src size_t * restrict srcleft char ** restrict dst size_t * restrict dstleft .Ft size_t -.Fn __iconv iconv_t cd const char ** restrict src size_t * restrict srcleft char ** restrict dst size_t * restrict dstleft uint32_t flags size_t invalids +.Fn __iconv iconv_t cd const char ** restrict src size_t * restrict srcleft char ** restrict dst size_t * restrict dstleft uint32_t flags size_t * invalids .Sh DESCRIPTION The .Fn iconv_open ___ 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: 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: r241801 - in stable/9/etc: defaults rc.d
Author: kuriyama
Date: Sun Oct 21 10:19:07 2012
New Revision: 241801
URL: http://svn.freebsd.org/changeset/base/241801
Log:
MFC r239382:
- Allow to pass extra parameters for each jails.
- To achieve above, convert jail(8) invocation to use new style
command line -c flag.
Modified:
stable/9/etc/defaults/rc.conf
stable/9/etc/rc.d/jail
Directory Properties:
stable/9/etc/ (props changed)
Modified: stable/9/etc/defaults/rc.conf
==
--- stable/9/etc/defaults/rc.conf Sun Oct 21 09:46:02 2012
(r241800)
+++ stable/9/etc/defaults/rc.conf Sun Oct 21 10:19:07 2012
(r241801)
@@ -702,6 +702,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/9/etc/rc.d/jail
==
--- stable/9/etc/rc.d/jail Sun Oct 21 09:46:02 2012(r241800)
+++ stable/9/etc/rc.d/jail Sun Oct 21 10:19:07 2012(r241801)
@@ -115,6 +115,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
@@ -193,6 +195,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}
@@ -484,9 +487,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
@@ -576,6 +589,7 @@ jail_start()
continue;
fi
_addrl=
+ _addr6l=
jail_ips add
if [ -n ${_fib} ]; then
_setfib=setfib -F '${_fib}'
@@ -641,8 +655,8 @@ jail_start()
i=$((i + 1))
done
- eval ${_setfib} jail -n ${_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 \
/dev/null
if [ $? -eq 0 ] ; 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: r239382 - in head/etc: defaults rc.d
Author: kuriyama
Date: Sun Aug 19 08:15:32 2012
New Revision: 239382
URL: http://svn.freebsd.org/changeset/base/239382
Log:
- Allow to pass extra parameters for each jails.
- To achieve above, convert jail(8) invocation to use new style
command line -c flag.
Reviewed at: freebsd-jail@
Modified:
head/etc/defaults/rc.conf
head/etc/rc.d/jail
Modified: head/etc/defaults/rc.conf
==
--- head/etc/defaults/rc.conf Sun Aug 19 02:22:16 2012(r239381)
+++ head/etc/defaults/rc.conf Sun Aug 19 08:15:32 2012(r239382)
@@ -705,6 +705,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: head/etc/rc.d/jail
==
--- head/etc/rc.d/jail Sun Aug 19 02:22:16 2012(r239381)
+++ head/etc/rc.d/jail Sun Aug 19 08:15:32 2012(r239382)
@@ -115,6 +115,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
@@ -193,6 +195,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}
@@ -484,9 +487,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
@@ -576,6 +589,7 @@ jail_start()
continue;
fi
_addrl=
+ _addr6l=
jail_ips add
if [ -n ${_fib} ]; then
_setfib=setfib -F '${_fib}'
@@ -641,8 +655,8 @@ jail_start()
i=$((i + 1))
done
- eval ${_setfib} jail -n ${_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 \
/dev/null
if [ $? -eq 0 ] ; 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: r223340 - head/usr.sbin/ypserv
Author: kuriyama
Date: Mon Jun 20 15:22:47 2011
New Revision: 223340
URL: http://svn.freebsd.org/changeset/base/223340
Log:
Add missing argument for -h in usage.
Modified:
head/usr.sbin/ypserv/yp_main.c
Modified: head/usr.sbin/ypserv/yp_main.c
==
--- head/usr.sbin/ypserv/yp_main.c Mon Jun 20 13:52:14 2011
(r223339)
+++ head/usr.sbin/ypserv/yp_main.c Mon Jun 20 15:22:47 2011
(r223340)
@@ -216,7 +216,7 @@ reaper(int sig)
static void
usage(void)
{
- fprintf(stderr, usage: ypserv [-h] [-d] [-n] [-p path] [-P port]\n);
+ fprintf(stderr, usage: ypserv [-h addr] [-d] [-n] [-p path] [-P
port]\n);
exit(1);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r200099 - head/usr.sbin/ypserv
Author: kuriyama Date: Fri Dec 4 14:08:57 2009 New Revision: 200099 URL: http://svn.freebsd.org/changeset/base/200099 Log: - Replace magic number with YPOLDVERS macro (which may be missed in r14262). Modified: head/usr.sbin/ypserv/yp_main.c Modified: head/usr.sbin/ypserv/yp_main.c == --- head/usr.sbin/ypserv/yp_main.c Fri Dec 4 11:26:52 2009 (r200098) +++ head/usr.sbin/ypserv/yp_main.c Fri Dec 4 14:08:57 2009 (r200099) @@ -295,7 +295,7 @@ main(int argc, char *argv[]) } sock = RPC_ANYSOCK; (void) pmap_unset(YPPROG, YPVERS); - (void) pmap_unset(YPPROG, 1); + (void) pmap_unset(YPPROG, YPOLDVERS); } /* ___ 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: r200100 - head/usr.sbin/ypserv
Author: kuriyama Date: Fri Dec 4 14:12:37 2009 New Revision: 200100 URL: http://svn.freebsd.org/changeset/base/200100 Log: - In ypproc_all_2_svc(), yp_fork() is called only when !debug case. So _exit() in the bottom of this function should be called with the same case. Modified: head/usr.sbin/ypserv/yp_server.c Modified: head/usr.sbin/ypserv/yp_server.c == --- head/usr.sbin/ypserv/yp_server.cFri Dec 4 14:08:57 2009 (r200099) +++ head/usr.sbin/ypserv/yp_server.cFri Dec 4 14:12:37 2009 (r200100) @@ -563,7 +563,10 @@ ypproc_all_2_svc(ypreq_nokey *argp, stru * Proper fix for PR #10970: exit here so that we don't risk * having a child spawned from this sub-process. */ - _exit(0); + if (!debug) + _exit(0); + + return result; } ypresp_master * ___ 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: r199818 - head/usr.sbin/jail
Author: kuriyama Date: Thu Nov 26 03:26:59 2009 New Revision: 199818 URL: http://svn.freebsd.org/changeset/base/199818 Log: - New style of jail(8) usage requires -c argument to create a jail. Reviewed by: jamie Modified: head/usr.sbin/jail/jail.8 Modified: head/usr.sbin/jail/jail.8 == --- head/usr.sbin/jail/jail.8 Thu Nov 26 02:14:08 2009(r199817) +++ head/usr.sbin/jail/jail.8 Thu Nov 26 03:26:59 2009(r199818) @@ -561,7 +561,7 @@ or for running a virtual server. Start a shell in the jail: .Pp .Bd -literal -offset indent -jail path=/data/jail/192.0.2.100 host.hostname=testhostname \\ +jail -c path=/data/jail/192.0.2.100 host.hostname=testhostname \\ ip4.addr=192.0.2.100 command=/bin/sh .Ed .Pp @@ -636,7 +636,7 @@ script from within the jail. .Bd -literal -offset indent ifconfig ed0 inet alias 192.0.2.100/32 mount -t procfs proc /data/jail/192.0.2.100/proc -jail path=/data/jail/192.0.2.100 host.hostname=testhostname \\ +jail -c path=/data/jail/192.0.2.100 host.hostname=testhostname \\ ip4.addr=192.0.2.100 command=/bin/sh /etc/rc .Ed .Pp ___ 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: r199648 - in stable/8/sys: amd64/amd64 amd64/include i386/i386
Author: kuriyama
Date: Sun Nov 22 14:32:32 2009
New Revision: 199648
URL: http://svn.freebsd.org/changeset/base/199648
Log:
- MFC r199067,199215,199253
- Add hw.clflush_disable loader tunable to avoid panic (trap 9) at
map_invalidate_cache_range() even if CPU is not Intel.
- This tunable can be set to -1 (default), 0 and 1. -1 is same as
current behavior, which automatically disable CLFLUSH on Intel CPUs
without CPUID_SS (should be occured on Xen only). You can specify 1
when this panic happened on non-Intel CPUs (such as AMD's). Because
disabling CLFLUSH may reduce performance, you can try with setting 0
on Intel CPUs without SS to use CLFLUSH feature.
- Amd64 init_secondary() calls initializecpu() while curthread is
still not properly set up. r199067 added the call to
TUNABLE_INT_FETCH() to initializecpu() that results in hang because
AP are started when kernel environment is already dynamic and thus
needs to acquire mutex, that is too early in AP start sequence to
work.
Extract the code that should be executed only once, because it sets
up global variables, from initializecpu() to initializecpucache(),
and call the later only from hammer_time() executed on BSP. Now,
TUNABLE_INT_FETCH() is done only once at BSP at the early boot
stage.
Modified:
stable/8/sys/amd64/amd64/initcpu.c
stable/8/sys/amd64/amd64/machdep.c
stable/8/sys/amd64/include/md_var.h
stable/8/sys/i386/i386/initcpu.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/amd64/amd64/initcpu.c
==
--- stable/8/sys/amd64/amd64/initcpu.c Sun Nov 22 14:04:20 2009
(r199647)
+++ stable/8/sys/amd64/amd64/initcpu.c Sun Nov 22 14:32:32 2009
(r199648)
@@ -47,6 +47,12 @@ __FBSDID($FreeBSD$);
static int hw_instruction_sse;
SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD,
hw_instruction_sse, 0, SIMD/MMX2 instructions available in CPU);
+/*
+ * -1: automatic (default)
+ * 0: keep enable CLFLUSH
+ * 1: force disable CLFLUSH
+ */
+static int hw_clflush_disable = -1;
intcpu;/* Are we 386, 386sx, 486, etc? */
u_int cpu_feature;/* Feature flags */
@@ -157,6 +163,11 @@ initializecpu(void)
CPUID_TO_FAMILY(cpu_id) == 0x6
CPUID_TO_MODEL(cpu_id) = 0xf)
init_via();
+}
+
+void
+initializecpucache()
+{
/*
* CPUID with %eax = 1, %ebx returns
@@ -169,6 +180,15 @@ initializecpu(void)
* XXXKIB: (temporary) hack to work around traps generated when
* CLFLUSHing APIC registers window.
*/
- if (cpu_vendor_id == CPU_VENDOR_INTEL !(cpu_feature CPUID_SS))
+ TUNABLE_INT_FETCH(hw.clflush_disable, hw_clflush_disable);
+ if (cpu_vendor_id == CPU_VENDOR_INTEL !(cpu_feature CPUID_SS)
+ hw_clflush_disable == -1)
+ cpu_feature = ~CPUID_CLFSH;
+ /*
+* Allow to disable CLFLUSH feature manually by
+* hw.clflush_disable tunable. This may help Xen guest on some AMD
+* CPUs.
+*/
+ if (hw_clflush_disable == 1)
cpu_feature = ~CPUID_CLFSH;
}
Modified: stable/8/sys/amd64/amd64/machdep.c
==
--- stable/8/sys/amd64/amd64/machdep.c Sun Nov 22 14:04:20 2009
(r199647)
+++ stable/8/sys/amd64/amd64/machdep.c Sun Nov 22 14:32:32 2009
(r199648)
@@ -1667,6 +1667,7 @@ hammer_time(u_int64_t modulep, u_int64_t
identify_cpu(); /* Final stage of CPU initialization */
initializecpu();/* Initialize CPU registers */
+ initializecpucache();
/* make an initial tss so cpu can get interrupt stack on syscall! */
common_tss[0].tss_rsp0 = thread0.td_kstack + \
Modified: stable/8/sys/amd64/include/md_var.h
==
--- stable/8/sys/amd64/include/md_var.h Sun Nov 22 14:04:20 2009
(r199647)
+++ stable/8/sys/amd64/include/md_var.h Sun Nov 22 14:32:32 2009
(r199648)
@@ -89,6 +89,7 @@ void gs_load_fault(void) __asm(__STRING(
void dump_add_page(vm_paddr_t);
void dump_drop_page(vm_paddr_t);
void initializecpu(void);
+void initializecpucache(void);
void fillw(int /*u_short*/ pat, void *base, size_t cnt);
void fpstate_drop(struct thread *td);
intis_physical_memory(vm_paddr_t addr);
Modified: stable/8/sys/i386/i386/initcpu.c
==
---
svn commit: r199215 - in head/sys: amd64/amd64 i386/i386
Author: kuriyama
Date: Thu Nov 12 03:31:19 2009
New Revision: 199215
URL: http://svn.freebsd.org/changeset/base/199215
Log:
- Style nits.
- Remove unneeded TUNABLE_INT().
Suggested by: avg, kib
Modified:
head/sys/amd64/amd64/initcpu.c
head/sys/i386/i386/initcpu.c
Modified: head/sys/amd64/amd64/initcpu.c
==
--- head/sys/amd64/amd64/initcpu.c Thu Nov 12 01:37:25 2009
(r199214)
+++ head/sys/amd64/amd64/initcpu.c Thu Nov 12 03:31:19 2009
(r199215)
@@ -53,7 +53,6 @@ SYSCTL_INT(_hw, OID_AUTO, instruction_ss
* 1: force disable CLFLUSH
*/
static int hw_clflush_disable = -1;
-TUNABLE_INT(hw.clflush_disable, hw_clflush_disable);
intcpu;/* Are we 386, 386sx, 486, etc? */
u_int cpu_feature;/* Feature flags */
@@ -185,7 +184,6 @@ initializecpu(void)
* hw.clflush_disable tunable. This may help Xen guest on some AMD
* CPUs.
*/
- if (hw_clflush_disable == 1) {
+ if (hw_clflush_disable == 1)
cpu_feature = ~CPUID_CLFSH;
- }
}
Modified: head/sys/i386/i386/initcpu.c
==
--- head/sys/i386/i386/initcpu.cThu Nov 12 01:37:25 2009
(r199214)
+++ head/sys/i386/i386/initcpu.cThu Nov 12 03:31:19 2009
(r199215)
@@ -81,7 +81,6 @@ SYSCTL_INT(_hw, OID_AUTO, instruction_ss
* 1: force disable CLFLUSH
*/
static int hw_clflush_disable = -1;
-TUNABLE_INT(hw.clflush_disable, hw_clflush_disable);
/* Must *NOT* be BSS or locore will bzero these after setting them */
intcpu = 0;/* Are we 386, 386sx, 486, etc? */
@@ -737,9 +736,8 @@ initializecpu(void)
* hw.clflush_disable tunable. This may help Xen guest on some AMD
* CPUs.
*/
- if (hw_clflush_disable == 1) {
+ if (hw_clflush_disable == 1)
cpu_feature = ~CPUID_CLFSH;
- }
#if defined(PC98) !defined(CPU_UPGRADE_HW_CACHE)
/*
___
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: r199067 - in head/sys: amd64/amd64 i386/i386
At Mon, 9 Nov 2009 23:52:44 +0100, e...@80386.nl wrote: * Jun Kuriyama kuriy...@freebsd.org wrote: - Add hw.clflush_disable loader tunable to avoid panic (trap 9) at map_invalidate_cache_range() even if CPU is not Intel. - This tunable can be set to -1 (default), 0 and 1. -1 is same as current behavior, which automatically disable CLFLUSH on Intel CPUs without CPUID_SS (should be occured on Xen only). You can specify 1 when this panic happened on non-Intel CPUs (such as AMD's). Because disabling CLFLUSH may reduce performance, you can try with setting 0 on Intel CPUs without SS to use CLFLUSH feature. Reviewed by: kib Reported by: karl, kuriyama Related to: kern/138863 Unfortunately it seems to lock up my Intel Core 2 Duo boxes. Systems affected: - Apple MacBook3,1 - Dell SC440 Thank you for your report! (1) On MacBook, lock up occured on real hardware? Not on hypervisor? (2) On both system, is there no problem before this commit? -- Jun Kuriyama kuriy...@freebsd.org // FreeBSD Project kuriy...@s2factory.co.jp // S2 Factory, Inc. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r199067 - in head/sys: amd64/amd64 i386/i386
At Tue, 10 Nov 2009 06:59:11 +0100, e...@80386.nl wrote: (1) On MacBook, lock up occured on real hardware? Not on hypervisor? Nope. The MacBook does use Apple's Boot Camp, but I can't say whether that can be considered to be a hypervisor. What happens, is that the system just locks up after probing all the device. It doesn't mount the root device anymore. Hmm, I think Boot Camp is not hypervisor, and should be treated as real hardware. Which architecture (i386/amd64) you are using? (2) On both system, is there no problem before this commit? I bisected it and the revision before this one does boot. I'll experiment with the tunables this afternoon. I really had to get some sleep last night, so I couldn't investigate it any further. You can try with hw.clflush_disable=1 in loader.conf. If you can boot with it, I must be mistaken something (anyway its my fault). Can you show me CPUID line at boot message (of course from the kernel you can boot) like this? CPU: Dual-Core AMD Opteron(tm) Processor 2210 (1800.07-MHz K8-class CPU) Origin = AuthenticAMD Id = 0x40f12 Stepping = 2 Features=0x178bfbffFPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT Features2=0x2001SSE3,CX16 AMD Features=0xea500800SYSCALL,NX,MMX+,FFXSR,RDTSCP,LM,3DNow!+,3DNow! -- Jun Kuriyama kuriy...@freebsd.org // FreeBSD Project kuriy...@s2factory.co.jp // S2 Factory, Inc. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r191954 - in head/sys: amd64/conf arm/conf conf i386/conf ia64/conf mips/conf pc98/conf powerpc/conf sparc64/conf
Author: kuriyama Date: Sun May 10 00:00:25 2009 New Revision: 191954 URL: http://svn.freebsd.org/changeset/base/191954 Log: - Use device\t and options \t for consistency. Modified: head/sys/amd64/conf/DEFAULTS head/sys/amd64/conf/GENERIC head/sys/amd64/conf/NOTES head/sys/amd64/conf/XENHVM head/sys/arm/conf/AVILA head/sys/arm/conf/BWCT head/sys/arm/conf/CAMBRIA head/sys/arm/conf/CRB head/sys/arm/conf/DB-78XXX head/sys/arm/conf/DB-88F5XXX head/sys/arm/conf/DB-88F6XXX head/sys/arm/conf/EP80219 head/sys/arm/conf/GUMSTIX head/sys/arm/conf/HL200 head/sys/arm/conf/IQ31244 head/sys/arm/conf/KB920X head/sys/arm/conf/NSLU head/sys/arm/conf/SIMICS head/sys/arm/conf/SKYEYE head/sys/conf/NOTES head/sys/i386/conf/DEFAULTS head/sys/i386/conf/GENERIC head/sys/i386/conf/NOTES head/sys/i386/conf/PAE head/sys/i386/conf/XBOX head/sys/i386/conf/XEN head/sys/ia64/conf/DEFAULTS head/sys/ia64/conf/NOTES head/sys/mips/conf/ADM5120 head/sys/mips/conf/IDT head/sys/mips/conf/MALTA head/sys/mips/conf/QEMU head/sys/mips/conf/SENTRY5 head/sys/pc98/conf/DEFAULTS head/sys/pc98/conf/NOTES head/sys/powerpc/conf/GENERIC head/sys/powerpc/conf/MPC85XX head/sys/powerpc/conf/NOTES head/sys/sparc64/conf/GENERIC Modified: head/sys/amd64/conf/DEFAULTS == --- head/sys/amd64/conf/DEFAULTSSat May 9 20:18:20 2009 (r191953) +++ head/sys/amd64/conf/DEFAULTSSun May 10 00:00:25 2009 (r191954) @@ -21,4 +21,4 @@ options GEOM_PART_EBR optionsGEOM_PART_EBR_COMPAT optionsGEOM_PART_MBR -optionsFLOWTABLE +optionsFLOWTABLE Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Sat May 9 20:18:20 2009(r191953) +++ head/sys/amd64/conf/GENERIC Sun May 10 00:00:25 2009(r191954) @@ -68,7 +68,7 @@ options SYSVSEM # SYSV-style semaphor options_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev optionsSTOP_NMI# Stop CPUS using NMI instead of IPI -optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ options AHD_REG_PRETTY_PRINT# Print re device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#deviceispfw # Firmware for QLogic HBAs- normally a module +#deviceispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #devicencr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device wlan_amrr # AMRR transmit rate c device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -optionsAH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +optionsAH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. Modified: head/sys/amd64/conf/NOTES == --- head/sys/amd64/conf/NOTES Sat May 9 20:18:20 2009(r191953) +++ head/sys/amd64/conf/NOTES Sun May 10 00:00:25 2009(r191954) @@ -33,7 +33,7 @@ options MP_WATCHDOG # # Debugging options. # -optionsSTOP_NMI# Stop CPUS using NMI instead of IPI +optionsSTOP_NMI# Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ options DEVICE_POLLING # BPF_JITTER adds support for BPF just-in-time compiler. -optionsBPF_JITTER +optionsBPF_JITTER # @@ -153,7 +153,7 @@ device agp # # AGP debugging. # -optionsAGP_DEBUG +optionsAGP_DEBUG # @@ -288,7 +288,7 @@ device wpi device ath # Atheros pci/cardbus
