svn commit: r257841 - head/sys/netsmb
Author: glebius Date: Fri Nov 8 08:44:09 2013 New Revision: 257841 URL: http://svnweb.freebsd.org/changeset/base/257841 Log: Catch up with sb_timeo type change in r255138. This fixes smbfs operation. PR: kern/182963 Submitted by: Tomoaki AOKI Modified: head/sys/netsmb/smb_trantcp.c Modified: head/sys/netsmb/smb_trantcp.c == --- head/sys/netsmb/smb_trantcp.c Fri Nov 8 05:26:30 2013 (r257840) +++ head/sys/netsmb/smb_trantcp.c Fri Nov 8 08:44:09 2013 (r257841) @@ -155,8 +155,8 @@ nb_connect_in(struct nbpcb *nbp, struct SOCKBUF_LOCK(&so->so_rcv); soupcall_set(so, SO_RCV, nb_upcall, nbp); SOCKBUF_UNLOCK(&so->so_rcv); - so->so_rcv.sb_timeo = (5 * hz); - so->so_snd.sb_timeo = (5 * hz); + so->so_rcv.sb_timeo = (5 * SBT_1S); + so->so_snd.sb_timeo = (5 * SBT_1S); error = soreserve(so, nbp->nbp_sndbuf, nbp->nbp_rcvbuf); if (error) goto bad; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257842 - in head/usr.sbin/bsdinstall: . scripts
Author: dteske
Date: Fri Nov 8 09:57:03 2013
New Revision: 257842
URL: http://svnweb.freebsd.org/changeset/base/257842
Log:
A series of changes tested together as a whole:
+ Add a `-D FILE" command-line option for overriding the path to the
bsdinstall log file (BSDINSTALL_LOG env var).
+ Document new `-D FILE' in the man page for bsdinstall.
+ If FILE in `-D FILE' begins with a +, debug output goes to stdout
(interleaved between dialog(1) invocations/output) as well as to FILE
(minus the leading + of course).
+ If BSDINSTALL_LOG cannot be written, then debugging is disabled (except in
the case of a leading + in the pathname, wherein debug will still be
printed to stdout).
+ Update source code formatting style.
+ Fix a dangling participle ("Begun ..." -> "Began ...")
+ Rewrite the docsinstall script (was necessary to abate direct dependency
on BSDINSTALL_LOG (instead, use fault-tolerant bsdconfig framework which
displays appropriate errors for package management).
NB: docsinstall is still using pkg(8) after this change.
+ Add additional debug output for dhclient/rtsol/wpa_cliscan
+ Display script errors in a textbox rather than just on stdout
+ Update many coments.
+ Add new f_show_err() API call (like f_show_msg but changes the dialog
title to "Error")(see bsdconfig's `common.subr').
+ Add new f_eval_catch() API call for executing a command via eval but not
before logging the command to debug. Several example cases documented in
API header for function in bsdconfig's `common.subr'.
+ Fix dialog auto-sizing when launched as an rvalue to a pipe for indirected
scripts (previously would default to 24x80 sizing in this case, now it can
autosize to full size even when in a pipe chain).
+ Fix bug in f_snprintf if $format argument began with "-"; printf would
misinterpret as a flag. (this is in bsdcofig's `strings.subr').
+ Add accompanying f_sprintf() and f_vsprintf() to go along with already
existing f_snprintf() and f_vsnprintf() (see bsdconfig's `strings.subr').
+ Remove some unnecessary default ZFS datasets from the automatic "zfsboot"
script. Such as: /usr/ports/distfiles /usr/ports/packages /usr/obj /var/db
/var/empty /var/mail and /var/run (these can all be created as-needed once
the system is installed).
+ Remove setuid=off for /usr/home (as discussed from last round of CFT).
+ Fix some i18n string violations in "zfsboot".
+ Bolster debugging output in "zfsboot".
+ Fix some string quoting issues in "zfsboot".
+ Fix some variable scope issues in "zfsboot".
+ Change "Create" to "Install" in "zfsboot" main menu.
+ Increase error checking in "zfsboot" (type-check arguments and such).
+ Add call to "graid destroy" killing automatic metadata (part of the series
of pedantic destructions we do when bootstrapping a new/naked disk).
+ Make judicious use of new f_eval_catch() in "zfsboot".
+ Fixup some variable names for consistency (zfsboot).
+ Fix an underride syntax parameter expansion folly (zfsboot).
+ Confirm layout if not explicitly chosen when blindly proceeding (no
longer have to touch anything on the ZFS menu if it scares you, just
choose the omnibus "Install" option at the top and you'll be prompted to
select vdev type and disks in the layout confirmation dialog).
+ Change numbered menu items to alphabetic for more efficient navigation.
+ Consolidate vdev selection and disk selection into a single stateful
menu which performs validation and allows backing out to each previous
menu as you go deeper.
+ Redesign the ``Last Chance'' dialog (still using the same colors, but
make it conform to a tolerable width and make disks appear in a block-
quote style indented region).
+ Fix a bug wherein we used the a lowercase variable name by accident
(actual variable name declared as all-uppercase) at the time of
initializing fstab(5) (not believed to cause any issues though).
+ Update the geli setup infobox for each provider being initialized
(not just at the onset -- since each ``geli init'' causes kernel messages
to push our infobox off-screen).
Reviewed by: Allan Jude
Discussed on: -current
MFC after:3 days
Modified:
head/usr.sbin/bsdinstall/bsdinstall
head/usr.sbin/bsdinstall/bsdinstall.8
head/usr.sbin/bsdinstall/scripts/auto
head/usr.sbin/bsdinstall/scripts/config
head/usr.sbin/bsdinstall/scripts/docsinstall
head/usr.sbin/bsdinstall/scripts/jail
head/usr.sbin/bsdinstall/scripts/netconfig_ipv4
head/usr.sbin/bsdinstall/scripts/netconfig_ipv6
head/usr.sbin/bsdinstall/scripts/script
head/usr.sbin/bsdinstall/scripts/wlanconfig
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdinstall/bsdinstall
==
--- head/usr.sbin/bsdinstall/bsdinstall Fri Nov 8 08:44:09 2013
(r257841)
+++ head/usr.sbin/bsdins
svn commit: r257843 - head/usr.sbin/bsdinstall/scripts
Author: dteske
Date: Fri Nov 8 10:09:34 2013
New Revision: 257843
URL: http://svnweb.freebsd.org/changeset/base/257843
Log:
Semi-revert this one file out of r257842. The ttys(5) stuff, as we
discussed on -current, was not supposed to go in but get solved in
a different way -- e.g., init(8) logic).
Discussed on: -current
Modified:
head/usr.sbin/bsdinstall/scripts/config
Modified: head/usr.sbin/bsdinstall/scripts/config
==
--- head/usr.sbin/bsdinstall/scripts/config Fri Nov 8 09:57:03 2013
(r257842)
+++ head/usr.sbin/bsdinstall/scripts/config Fri Nov 8 10:09:34 2013
(r257843)
@@ -27,81 +27,6 @@
#
# $FreeBSD$
#
- CONFIGURATION
-
-#
-# Location of ttys(5)
-#
-ETC_TTYS=/etc/ttys
-
- FUNCTIONS
-
-# ttus_set_type $serterm
-#
-# Set terminal type of `ttyu*' and entries in ttys(5) to $serterm.
-#
-ttus_set_type()
-{
- local serterm="$1" err
-
- #
- # Create new temporary file to write our ttys(5) update with new types.
- #
- local tmpfile="$( mktemp -t "pgm" )"
- [ "$tmpfile" ] || return $FAILURE
-
- #
- # Fixup permissions and ownership (mktemp(1) creates the temporary file
- # with 0600 permissions -- change the permissions and ownership to
- # match ttys(5) before we write it out and mv(1) it into place).
- #
- local mode="$( stat -f '%#Lp' "$ETC_TTYS" 2> /dev/null )"
- local owner="$( stat -f '%u:%g' "$ETC_TTYS" 2> /dev/null )"
- f_quietly chmod "${mode:-0644}" "$tmpfile"
- f_quietly chown "${owner:-root:wheel}" "$tmpfile"
-
- #
- # Operate on ttys(5), replacing only the types of `ttyu*' terminals
- # with the new type.
- #
- if ! err=$( awk -v serterm="$serterm" '
- BEGIN {
- }
- {
- # "Skip" blank-lines, lines containing only whitespace, and
- # lines containing only a comment or whitespace-then-comment.
- #
- if ( $0 ~ /^[[:space:]]*(#|$)/ ) { print; next }
-
- # "Skip" terminal types other than those supported
- #
- if ( $1 !~ /^ttyu.*$/ ) { print; next }
-
- # Change the terminal type to the new value and enable it
- #
- match($0,
- /[[:alnum:]\.\+-_]+[[:space:]]+(on|off)([[:space:]]|$).*$/)
- if ( ! RSTART ) { print; next }
- start = RSTART
- left=substr($0, 0, RSTART - 1)
- right=substr($0, start)
- match(right,
- /[[:alnum:]\.\+-_]+[[:space:]]+(on|off)([[:space:]]+|$)/)
- right=substr(right, RSTART + RLENGTH)
- printf "%s%s on %s\n", left, serterm, right
- }
- ' "$ETC_TTYS" > "$tmpfile" 2>&1 ); then
- f_show_err "%s" "$err"
- return $FAILURE
- fi
- if ! err=$( mv -f "$tmpfile" "$ETC_TTYS" 2>&1 ); then
- f_show_err "%s" "$err"
- return $FAILURE
- fi
-
- return $SUCCESS
-}
-
MAIN
cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
@@ -117,8 +42,6 @@ cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHR
# Set up other things from installed config
chroot $BSDINSTALL_CHROOT /usr/bin/newaliases
-kbdcontrol -d || ttus_set_type vt100
-
# END
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257844 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Fri Nov 8 10:14:32 2013 New Revision: 257844 URL: http://svnweb.freebsd.org/changeset/base/257844 Log: Copy the install log to the deployed /var/log directory so that we have post-mortem data on how the machine was configured/installed. Modified: head/usr.sbin/bsdinstall/scripts/config Modified: head/usr.sbin/bsdinstall/scripts/config == --- head/usr.sbin/bsdinstall/scripts/config Fri Nov 8 10:09:34 2013 (r257843) +++ head/usr.sbin/bsdinstall/scripts/config Fri Nov 8 10:14:32 2013 (r257844) @@ -39,6 +39,8 @@ rm $BSDINSTALL_TMPBOOT/loader.conf.* cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot +[ "$debugFile" ] && cp "$debugFile" $BSDINSTALL_CHROOT/var/log/ + # Set up other things from installed config chroot $BSDINSTALL_CHROOT /usr/bin/newaliases ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257845 - head/usr.sbin/bsdinstall/scripts
Author: dteske
Date: Fri Nov 8 10:19:48 2013
New Revision: 257845
URL: http://svnweb.freebsd.org/changeset/base/257845
Log:
I often forget that debugFile can begin with a + for deciding that debug
should be sent to both the file (minus the leading +) and stdout.
Modified:
head/usr.sbin/bsdinstall/scripts/config
Modified: head/usr.sbin/bsdinstall/scripts/config
==
--- head/usr.sbin/bsdinstall/scripts/config Fri Nov 8 10:14:32 2013
(r257844)
+++ head/usr.sbin/bsdinstall/scripts/config Fri Nov 8 10:19:48 2013
(r257845)
@@ -39,7 +39,7 @@ rm $BSDINSTALL_TMPBOOT/loader.conf.*
cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot
-[ "$debugFile" ] && cp "$debugFile" $BSDINSTALL_CHROOT/var/log/
+[ "${debugFile#+}" ] && cp "${debugFile#+}" $BSDINSTALL_CHROOT/var/log/
# Set up other things from installed config
chroot $BSDINSTALL_CHROOT /usr/bin/newaliases
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257846 - in head: share/man/man4 sys/netinet
Author: glebius
Date: Fri Nov 8 13:04:14 2013
New Revision: 257846
URL: http://svnweb.freebsd.org/changeset/base/257846
Log:
Make TCP_KEEP* socket options readable. At least PostgreSQL wants
to read the values.
Reported by: sobomax
Modified:
head/share/man/man4/tcp.4
head/sys/netinet/tcp_usrreq.c
Modified: head/share/man/man4/tcp.4
==
--- head/share/man/man4/tcp.4 Fri Nov 8 10:19:48 2013(r257845)
+++ head/share/man/man4/tcp.4 Fri Nov 8 13:04:14 2013(r257846)
@@ -38,7 +38,7 @@
.\" From: @(#)tcp.48.1 (Berkeley) 6/5/93
.\" $FreeBSD$
.\"
-.Dd March 7, 2012
+.Dd November 8, 2013
.Dt TCP 4
.Os
.Sh NAME
@@ -48,6 +48,7 @@
.In sys/types.h
.In sys/socket.h
.In netinet/in.h
+.In netinet/tcp.h
.Ft int
.Fn socket AF_INET SOCK_STREAM 0
.Sh DESCRIPTION
@@ -147,7 +148,7 @@ See
.Xr mod_cc 4
for details.
.It Dv TCP_KEEPINIT
-This write-only
+This
.Xr setsockopt 2
option accepts a per-socket timeout argument of
.Vt "u_int"
@@ -160,7 +161,7 @@ in the
.Sx MIB Variables
section further down.
.It Dv TCP_KEEPIDLE
-This write-only
+This
.Xr setsockopt 2
option accepts an argument of
.Vt "u_int"
@@ -176,7 +177,7 @@ in the
.Sx MIB Variables
section further down.
.It Dv TCP_KEEPINTVL
-This write-only
+This
.Xr setsockopt 2
option accepts an argument of
.Vt "u_int"
@@ -191,7 +192,7 @@ in the
.Sx MIB Variables
section further down.
.It Dv TCP_KEEPCNT
-This write-only
+This
.Xr setsockopt 2
option accepts an argument of
.Vt "u_int"
Modified: head/sys/netinet/tcp_usrreq.c
==
--- head/sys/netinet/tcp_usrreq.c Fri Nov 8 10:19:48 2013
(r257845)
+++ head/sys/netinet/tcp_usrreq.c Fri Nov 8 13:04:14 2013
(r257846)
@@ -1585,6 +1585,27 @@ unlock_and_done:
INP_WUNLOCK(inp);
error = sooptcopyout(sopt, buf, TCP_CA_NAME_MAX);
break;
+ case TCP_KEEPIDLE:
+ case TCP_KEEPINTVL:
+ case TCP_KEEPINIT:
+ case TCP_KEEPCNT:
+ switch (sopt->sopt_name) {
+ case TCP_KEEPIDLE:
+ ui = tp->t_keepidle / hz;
+ break;
+ case TCP_KEEPINTVL:
+ ui = tp->t_keepintvl / hz;
+ break;
+ case TCP_KEEPINIT:
+ ui = tp->t_keepinit / hz;
+ break;
+ case TCP_KEEPCNT:
+ ui = tp->t_keepcnt;
+ break;
+ }
+ INP_WUNLOCK(inp);
+ error = sooptcopyout(sopt, &ui, sizeof(ui));
+ break;
default:
INP_WUNLOCK(inp);
error = ENOPROTOOPT;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257847 - head/sys/dev/aacraid
Author: achim
Date: Fri Nov 8 13:23:26 2013
New Revision: 257847
URL: http://svnweb.freebsd.org/changeset/base/257847
Log:
Update aacraid to version 3.2.5.
Full MSI-X interrupt support added.
Timeout and reset handling reworked, firmware flash update test added.
Support for drives with 4KB block size added.
Changes made to avoid exposure of phys. array components by default.
Approved by: scottl (mentor), emaste (co-mentor)
Modified:
head/sys/dev/aacraid/aacraid.c
head/sys/dev/aacraid/aacraid_cam.c
head/sys/dev/aacraid/aacraid_reg.h
head/sys/dev/aacraid/aacraid_var.h
Modified: head/sys/dev/aacraid/aacraid.c
==
--- head/sys/dev/aacraid/aacraid.c Fri Nov 8 13:04:14 2013
(r257846)
+++ head/sys/dev/aacraid/aacraid.c Fri Nov 8 13:23:26 2013
(r257847)
@@ -98,8 +98,11 @@ static int aac_alloc(struct aac_softc *s
static voidaac_common_map(void *arg, bus_dma_segment_t *segs, int nseg,
int error);
static int aac_check_firmware(struct aac_softc *sc);
+static voidaac_define_int_mode(struct aac_softc *sc);
static int aac_init(struct aac_softc *sc);
+static int aac_find_pci_capability(struct aac_softc *sc, int cap);
static int aac_setup_intr(struct aac_softc *sc);
+static int aac_check_config(struct aac_softc *sc);
/* PMC SRC interface */
static int aac_src_get_fwstatus(struct aac_softc *sc);
@@ -110,7 +113,7 @@ static void aac_src_set_mailbox(struct a
u_int32_t arg0, u_int32_t arg1,
u_int32_t arg2, u_int32_t arg3);
static int aac_src_get_mailbox(struct aac_softc *sc, int mb);
-static voidaac_src_set_interrupts(struct aac_softc *sc, int enable);
+static voidaac_src_access_devreg(struct aac_softc *sc, int mode);
static int aac_src_send_command(struct aac_softc *sc, struct aac_command *cm);
static int aac_src_get_outb_queue(struct aac_softc *sc);
static void aac_src_set_outb_queue(struct aac_softc *sc, int index);
@@ -122,7 +125,7 @@ struct aac_interface aacraid_src_interfa
aac_src_clear_istatus,
aac_src_set_mailbox,
aac_src_get_mailbox,
- aac_src_set_interrupts,
+ aac_src_access_devreg,
aac_src_send_command,
aac_src_get_outb_queue,
aac_src_set_outb_queue
@@ -141,7 +144,7 @@ struct aac_interface aacraid_srcv_interf
aac_src_clear_istatus,
aac_srcv_set_mailbox,
aac_srcv_get_mailbox,
- aac_src_set_interrupts,
+ aac_src_access_devreg,
aac_src_send_command,
aac_src_get_outb_queue,
aac_src_set_outb_queue
@@ -258,6 +261,7 @@ aacraid_attach(struct aac_softc *sc)
/*
* Check that the firmware on the card is supported.
*/
+ sc->msi_enabled = FALSE;
if ((error = aac_check_firmware(sc)) != 0)
return(error);
@@ -278,6 +282,7 @@ aacraid_attach(struct aac_softc *sc)
if ((error = aac_alloc(sc)) != 0)
return(error);
if (!(sc->flags & AAC_FLAGS_SYNC_MODE)) {
+ aac_define_int_mode(sc);
if ((error = aac_init(sc)) != 0)
return(error);
}
@@ -341,7 +346,7 @@ aacraid_attach(struct aac_softc *sc)
sc->aac_state &= ~AAC_STATE_SUSPEND;
/* enable interrupts now */
- AAC_UNMASK_INTERRUPTS(sc);
+ AAC_ACCESS_DEVREG(sc, AAC_ENABLE_INTERRUPT);
#if __FreeBSD_version >= 80
mtx_lock(&sc->aac_io_lock);
@@ -442,6 +447,7 @@ aac_get_container_info(struct aac_softc
struct aac_fib *fib;
struct aac_mntinfo *mi;
struct aac_cnt_config *ccfg;
+ int rval;
if (sync_fib == NULL) {
if (aacraid_alloc_command(sc, &cm)) {
@@ -499,9 +505,10 @@ aac_get_container_info(struct aac_softc
*uid = cid;
if (mir->MntTable[0].VolType != CT_NONE &&
!(mir->MntTable[0].ContentState & AAC_FSCS_HIDDEN)) {
- if (!(sc->aac_support_opt2 & AAC_SUPPORTED_VARIABLE_BLOCK_SIZE))
- mir->MntTable[0].ObjExtension.BlockSize = 0x200;
-
+ if (!(sc->aac_support_opt2 &
AAC_SUPPORTED_VARIABLE_BLOCK_SIZE)) {
+ mir->MntTable[0].ObjExtension.BlockDevice.BlockSize =
0x200;
+ mir->MntTable[0].ObjExtension.BlockDevice.bdLgclPhysMap
= 0;
+ }
ccfg = (struct aac_cnt_config *)&fib->data[0];
bzero(ccfg, sizeof (*ccfg) - CT_PACKET_SIZE);
ccfg->Command = VM_ContainerConfig;
@@ -509,9 +516,10 @@ aac_get_container_info(struct aac_softc
ccfg->CTCommand.param[0] = cid;
if (sync_fib) {
- if (aac_sync_fib(sc, ContainerCommand, 0, fib,
- sizeof(struct aac_cnt_config) == 0) &&
-
svn commit: r257848 - in head: . share/mk
Author: jmmv
Date: Fri Nov 8 14:20:22 2013
New Revision: 257848
URL: http://svnweb.freebsd.org/changeset/base/257848
Log:
Fix buildworld when WITH_TESTS is enabled.
The addition of the TESTS knob and its enabling of the build of tests in
lib/libcrypt/tests/ broke the build. The reason is that we cannot descend
into tests/ subdirectories until all prerequisites have been built, which
in the case of tests may be "a lot of things" (libatf-c in this case).
Ensure that we do not walk tests/ directories during the bootstrapping of
the libraries as part of buildworld.
Reviewed by: freebsd-testing
Approved by: rpaulo (mentor)
Modified:
head/Makefile.inc1
head/share/mk/bsd.own.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Nov 8 13:23:26 2013(r257847)
+++ head/Makefile.inc1 Fri Nov 8 14:20:22 2013(r257848)
@@ -1602,10 +1602,12 @@ ${_lib}__PL: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
- ${MAKE} DIRPRFX=${_lib}/ obj && \
- ${MAKE} DIRPRFX=${_lib}/ depend && \
- ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
- ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+ ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+ DIRPRFX=${_lib}/ all && \
+ ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+ DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1614,10 +1616,10 @@ ${_lib}__L: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
- ${MAKE} DIRPRFX=${_lib}/ obj && \
- ${MAKE} DIRPRFX=${_lib}/ depend && \
- ${MAKE} DIRPRFX=${_lib}/ all && \
- ${MAKE} DIRPRFX=${_lib}/ install
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1627,10 +1629,12 @@ ${_lib}__L: .PHONY .MAKE
lib/libpam__L: .PHONY .MAKE
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
cd ${.CURDIR}/lib/libpam && \
- ${MAKE} DIRPRFX=lib/libpam/ obj && \
- ${MAKE} DIRPRFX=lib/libpam/ depend && \
- ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \
- ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+ ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
+ ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
+ ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+ -D_NO_LIBPAM_SO_YET all && \
+ ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+ -D_NO_LIBPAM_SO_YET install
_prereq_libs: ${_prereq_libs:S/$/__PL/}
_startup_libs: ${_startup_libs:S/$/__L/}
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkFri Nov 8 13:23:26 2013(r257847)
+++ head/share/mk/bsd.own.mkFri Nov 8 14:20:22 2013(r257848)
@@ -556,6 +556,20 @@ MK_CLANG_FULL:= no
MK_LLDB:= no
.endif
+.if defined(NO_TESTS)
+# This should be handled above along the handling of all other NO_* options.
+# However, the above is broken when WITH_*=yes are passed to make(1) as
+# command line arguments. See PR bin/183762.
+#
+# Because the TESTS option is new and it will default to yes, it's likely
+# that people will pass WITHOUT_TESTS=yes to make(1) directly and get a broken
+# build. So, just in case, it's better to explicitly handle this case here.
+#
+# TODO(jmmv): Either fix make to allow us putting this override where it
+# belongs above or fix this file to cope with the make bug.
+MK_TESTS:= no
+.endif
+
#
# Set defaults for the MK_*_SUPPORT variables.
#
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257849 - head
Author: jmmv
Date: Fri Nov 8 14:22:16 2013
New Revision: 257849
URL: http://svnweb.freebsd.org/changeset/base/257849
Log:
Add libatf-c++ to the prebuild libs.
Some tests may require C++ so we must ensure this library exists as part
of the bootstrap process or else they will fail to build. Do this by
just depending on lib/atf as part of the bootstrap libraries instead of
using lib/atf/libatf-c.
Submitted by: Garrett Cooper
Approved by: rpaulo (mentor)
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Nov 8 14:20:22 2013(r257848)
+++ head/Makefile.inc1 Fri Nov 8 14:22:16 2013(r257849)
@@ -1478,7 +1478,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \
${_kerberos5_lib_libwind} \
- ${_lib_atf_libatf_c} \
+ ${_lib_atf} \
lib/libbz2 ${_libcom_err} lib/libcrypt \
lib/libelf lib/libexpat \
${_lib_libgssapi} ${_lib_libipx} \
@@ -1493,7 +1493,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_secure_lib_libssh} ${_secure_lib_libssl}
.if ${MK_ATF} != "no"
-_lib_atf_libatf_c= lib/atf/libatf-c
+_lib_atf= lib/atf
.endif
.if ${MK_LIBTHR} != "no"
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257851 - head/tools/build/mk
Author: jmmv
Date: Fri Nov 8 14:26:52 2013
New Revision: 257851
URL: http://svnweb.freebsd.org/changeset/base/257851
Log:
Handle the removal of the test suite when WITHOUT_TESTS=yes.
Add all files from /usr/tests to the obsoleted files list when the
build of the tests is disabled via the WITHOUT_TESTS knob. Do this
automatically so that we do not have to suffer the pain of maintaining
such list by hand.
Reviewed by: freebsd-testing
Approved by: rpaulo (mentor)
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 8 14:24:47
2013(r257850)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 8 14:26:52
2013(r257851)
@@ -4105,7 +4105,10 @@ OLD_FILES+=usr/share/man/man4/atf-test-c
OLD_FILES+=usr/share/mk/atf.test.mk
# Test suite.
-# TODO(jmmv): To be filled in.
+TESTS_DIRS!=find ${DESTDIR}/usr/tests -type d | sed -e 's,^${DESTDIR}/,,'
+OLD_DIRS+=${TESTS_DIRS}
+TESTS_FILES!=find ${DESTDIR}/usr/tests \! -type d | sed -e 's,^${DESTDIR}/,,'
+OLD_FILES+=${TESTS_FILES}
.endif
#.if ${MK_TOOLCHAIN} == no
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257853 - in head: etc/mtree lib/atf lib/atf/libatf-c lib/atf/libatf-c++ lib/atf/libatf-c++/tests lib/atf/libatf-c/tests lib/atf/tests lib/atf/tests/test-programs libexec libexec/atf li...
Author: jmmv
Date: Fri Nov 8 14:33:41 2013
New Revision: 257853
URL: http://svnweb.freebsd.org/changeset/base/257853
Log:
Build and install the atf tests.
Reviewed by: freebsd-testing
Approved by: rpaulo (mentor)
Added:
head/lib/atf/libatf-c++/Makefile.inc (contents, props changed)
head/lib/atf/libatf-c++/tests/
head/lib/atf/libatf-c++/tests/Makefile (contents, props changed)
head/lib/atf/libatf-c/Makefile.inc (contents, props changed)
head/lib/atf/libatf-c/tests/
head/lib/atf/libatf-c/tests/Makefile (contents, props changed)
head/lib/atf/tests/
head/lib/atf/tests/Makefile (contents, props changed)
head/lib/atf/tests/test-programs/
head/lib/atf/tests/test-programs/Makefile (contents, props changed)
head/libexec/atf/atf-check/Makefile.inc (contents, props changed)
head/libexec/atf/atf-check/tests/
head/libexec/atf/atf-check/tests/Makefile (contents, props changed)
head/libexec/atf/tests/
head/libexec/atf/tests/Makefile (contents, props changed)
head/libexec/tests/
head/libexec/tests/Makefile (contents, props changed)
head/usr.bin/atf/atf-sh/tests/
head/usr.bin/atf/atf-sh/tests/Makefile (contents, props changed)
head/usr.bin/atf/tests/
head/usr.bin/atf/tests/Makefile (contents, props changed)
head/usr.bin/tests/
head/usr.bin/tests/Makefile (contents, props changed)
Modified:
head/etc/mtree/BSD.tests.dist
head/lib/atf/Makefile
head/lib/atf/Makefile.inc
head/lib/atf/libatf-c++/Makefile
head/lib/atf/libatf-c/Makefile
head/libexec/Makefile
head/libexec/atf/Makefile
head/libexec/atf/Makefile.inc
head/libexec/atf/atf-check/Makefile
head/usr.bin/Makefile
head/usr.bin/atf/Makefile
head/usr.bin/atf/Makefile.inc
head/usr.bin/atf/atf-sh/Makefile
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Fri Nov 8 14:29:06 2013
(r257852)
+++ head/etc/mtree/BSD.tests.dist Fri Nov 8 14:33:41 2013
(r257853)
@@ -6,7 +6,27 @@
/set type=dir uname=root gname=wheel mode=0755
.
lib
+atf
+libatf-c
+..
+libatf-c++
+..
+test-programs
+..
+..
libcrypt
..
..
+libexec
+atf
+atf-check
+..
+..
+..
+usr.bin
+atf
+atf-sh
+..
+..
+..
..
Modified: head/lib/atf/Makefile
==
--- head/lib/atf/Makefile Fri Nov 8 14:29:06 2013(r257852)
+++ head/lib/atf/Makefile Fri Nov 8 14:33:41 2013(r257853)
@@ -27,9 +27,13 @@
.include
-SUBDIR=\
- libatf-c \
- libatf-c++
+SUBDIR=libatf-c \
+ libatf-c++ \
+${_tests}
+
+.if ${MK_TESTS} != "no"
+_tests=tests
+.endif
.ORDER: ${SUBDIR}
Modified: head/lib/atf/Makefile.inc
==
--- head/lib/atf/Makefile.inc Fri Nov 8 14:29:06 2013(r257852)
+++ head/lib/atf/Makefile.inc Fri Nov 8 14:33:41 2013(r257853)
@@ -25,8 +25,6 @@
#
# $FreeBSD$
-ATF= ${.CURDIR}/../../../contrib/atf
-
_CFLAGS:= ${CFLAGS}
_CPPFLAGS:=${CPPFLAGS}
_CXXFLAGS:=${CXXFLAGS}
Modified: head/lib/atf/libatf-c++/Makefile
==
--- head/lib/atf/libatf-c++/MakefileFri Nov 8 14:29:06 2013
(r257852)
+++ head/lib/atf/libatf-c++/MakefileFri Nov 8 14:33:41 2013
(r257853)
@@ -36,6 +36,7 @@ LDADD=-latf-c
LDFLAGS+= -L${.OBJDIR}/../libatf-c
+ATF= ${.CURDIR:H:H:H}/contrib/atf
.PATH: ${ATF}
.PATH: ${ATF}/atf-c++
.PATH: ${ATF}/atf-c++/detail
@@ -73,4 +74,8 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
MAN= atf-c++-api.3
+.if ${MK_TESTS} != "no"
+SUBDIR=tests
+.endif
+
.include
Added: head/lib/atf/libatf-c++/Makefile.inc
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/atf/libatf-c++/Makefile.incFri Nov 8 14:33:41 2013
(r257853)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
Added: head/lib/atf/libatf-c++/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/atf/libatf-c++/tests/Makefile Fri Nov 8 14:33:41 2013
(r257853)
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+.include
+
+TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++
+
+ATF= ${.CURDIR:H:H:H:H}/contrib/atf
+.PATH: ${ATF}/atf-c++
+.PATH: ${ATF}/atf-c++/detail
+
+CFLAGS
svn commit: r257852 - in head: lib lib/tests tests
Author: jmmv
Date: Fri Nov 8 14:29:06 2013
New Revision: 257852
URL: http://svnweb.freebsd.org/changeset/base/257852
Log:
Install category Kyuafiles from their category directories.
Move the installation of /usr/tests/lib/Kyuafile from src/tests/lib/
to src/lib/. This is to keep the src/tests/ hierarchy unaware of the
rest of the tree, which makes things clearer in general. In particular:
1) Everything related to the construction of /usr/tests/lib/ is kept
in src/lib/. There is no need to think about different directories
and how they relate to each other. (The same applies for libexec,
usr.bin, etc. but these are not yet handled.)
2) src/tests becomes the place to keep cross-functional test programs
and nothing else, which also helps in simplifying things.
Reviewed by: freebsd-testing
Approved by: rpaulo (mentor)
Added:
head/lib/tests/
head/lib/tests/Makefile (contents, props changed)
Modified:
head/lib/Makefile
head/tests/Makefile
head/tests/README
Modified: head/lib/Makefile
==
--- head/lib/Makefile Fri Nov 8 14:26:52 2013(r257851)
+++ head/lib/Makefile Fri Nov 8 14:29:06 2013(r257852)
@@ -126,7 +126,8 @@ SUBDIR= ${SUBDIR_ORDERED} \
libyaml \
libz \
${_atf} \
- ${_clang}
+ ${_clang} \
+ ${_tests}
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
_csu=csu/${MACHINE_ARCH}-elf
@@ -251,6 +252,7 @@ _libtelnet= libtelnet
.if ${MK_TESTS} != "no"
_atf= atf
+_tests=tests
.endif
.if ${MK_UNBOUND} != "no"
Added: head/lib/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/tests/Makefile Fri Nov 8 14:29:06 2013(r257852)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include
+
+TESTSDIR= ${TESTSBASE}/lib
+
+.PATH: ${.CURDIR:H:H}/tests
+KYUAFILE= yes
+
+.include
Modified: head/tests/Makefile
==
--- head/tests/Makefile Fri Nov 8 14:26:52 2013(r257851)
+++ head/tests/Makefile Fri Nov 8 14:29:06 2013(r257852)
@@ -2,10 +2,9 @@
.include
-TESTS_SUBDIRS= lib
+SUBDIR= # still empty
TESTSDIR= ${TESTSBASE}
-
KYUAFILE= yes
.include
Modified: head/tests/README
==
--- head/tests/README Fri Nov 8 14:26:52 2013(r257851)
+++ head/tests/README Fri Nov 8 14:29:06 2013(r257852)
@@ -44,13 +44,12 @@ tree-- the top-level Kyuafile does not k
exist upfront. Instead, such Kyuafile automatically detects, at
run-time, which */Kyuafile files exist and uses those directly.
-Similarly, every category subdirectory within src/tests/ provides the
-same Kyuafile with auto-discovery features. For example: src/tests/lib/
-holds a generic Makefile to install test-suite related material but such
-directory does not know upfront which libraries within src/lib/ will
-install tests. For this reason, the Kyuafile in src/tests/lib/ has to
-also use the auto-discovery features. The same applies for any other
-category subdirectory (e.g. bin, usr.sbin, etc.).
+Similarly, every directory in src/ that wants to install a Kyuafile to
+just recurse into other subdirectories reuses this Kyuafile with
+auto-discovery features. As an example, take a look at src/lib/tests/
+whose sole purpose is to install a Kyuafile into /usr/tests/lib/.
+The goal in this specific case is for /usr/tests/lib/ to be generated
+entirely from src/lib/.
--
$FreeBSD$
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257850 - in head: . lib libexec share/doc share/man/man1 share/man/man4 share/mk tools/build/mk usr.bin
Author: jmmv
Date: Fri Nov 8 14:24:47 2013
New Revision: 257850
URL: http://svnweb.freebsd.org/changeset/base/257850
Log:
Subsume the functionality of MK_ATF into MK_TESTS.
There is no reason to keep the two knobs separate: if tests are
enabled, the ATF libraries are required; and if tests are disabled,
the ATF libraries are not necessary. Keeping the two just serves
to complicate the build.
Reviewed by: freebsd-testing
Approved by: rpaulo (mentor)
Modified:
head/Makefile.inc1
head/UPDATING
head/lib/Makefile
head/libexec/Makefile
head/share/doc/Makefile
head/share/man/man1/Makefile
head/share/man/man4/Makefile
head/share/mk/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/Makefile
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Nov 8 14:22:16 2013(r257849)
+++ head/Makefile.inc1 Fri Nov 8 14:24:47 2013(r257850)
@@ -1492,7 +1492,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
_lib_atf= lib/atf
.endif
Modified: head/UPDATING
==
--- head/UPDATING Fri Nov 8 14:22:16 2013(r257849)
+++ head/UPDATING Fri Nov 8 14:24:47 2013(r257850)
@@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20131108:
+ The WITHOUT_ATF build knob has been removed and its functionality
+ has been subsumed into the more generic WITHOUT_TESTS. If you were
+ using the former to disable the build of the ATF libraries, you
+ should change your settings to use the latter.
+
20131025:
The default version of mtree is nmtree which is obtained from
NetBSD. The output is generally the same, but may vary
Modified: head/lib/Makefile
==
--- head/lib/Makefile Fri Nov 8 14:22:16 2013(r257849)
+++ head/lib/Makefile Fri Nov 8 14:24:47 2013(r257850)
@@ -140,10 +140,6 @@ _csu=csu
# NB: keep these sorted by MK_* knobs
-.if ${MK_ATF} != "no"
-_atf= atf
-.endif
-
.if ${MK_ATM} != "no"
_libngatm= libngatm
.endif
@@ -253,6 +249,10 @@ _libsmutil=libsmutil
_libtelnet=libtelnet
.endif
+.if ${MK_TESTS} != "no"
+_atf= atf
+.endif
+
.if ${MK_UNBOUND} != "no"
_libunbound= libunbound
.endif
Modified: head/libexec/Makefile
==
--- head/libexec/Makefile Fri Nov 8 14:22:16 2013(r257849)
+++ head/libexec/Makefile Fri Nov 8 14:24:47 2013(r257850)
@@ -33,10 +33,6 @@ SUBDIR= ${_atf} \
ulog-helper \
${_ypxfr}
-.if ${MK_ATF} != "no"
-_atf= atf
-.endif
-
.if ${MK_AT} != "no"
_atrun=atrun
.endif
@@ -76,4 +72,8 @@ _smrsh= smrsh
_telnetd= telnetd
.endif
+.if ${MK_TESTS} != "no"
+_atf= atf
+.endif
+
.include
Modified: head/share/doc/Makefile
==
--- head/share/doc/Makefile Fri Nov 8 14:22:16 2013(r257849)
+++ head/share/doc/Makefile Fri Nov 8 14:24:47 2013(r257850)
@@ -9,7 +9,7 @@ SUBDIR= ${_IPv6} \
${_llvm} \
${_roffdocs}
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
_atf= atf
.endif
Modified: head/share/man/man1/Makefile
==
--- head/share/man/man1/MakefileFri Nov 8 14:22:16 2013
(r257849)
+++ head/share/man/man1/MakefileFri Nov 8 14:24:47 2013
(r257850)
@@ -5,7 +5,7 @@
MAN= builtin.1 intro.1
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
ATF= ${.CURDIR}/../../../contrib/atf
.PATH: ${ATF}/doc
MAN+= atf-test-program.1
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri Nov 8 14:22:16 2013
(r257849)
+++ head/share/man/man4/MakefileFri Nov 8 14:24:47 2013
(r257850)
@@ -829,7 +829,7 @@ _nvram2env.4= nvram2env.4
SUBDIR=man4.${MACHINE_CPUARCH}
.endif
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
ATF=${.CURDIR}/../../../contrib/atf
.PATH: ${ATF}/doc
_atf_test_case.4= atf-test-case.4
Modified: head/share/mk/Makefile
==
svn commit: r257854 - in head/sys: amd64/include arm/include i386/include ia64/include kern mips/include powerpc/include sparc64/include
Author: alc
Date: Fri Nov 8 16:25:00 2013
New Revision: 257854
URL: http://svnweb.freebsd.org/changeset/base/257854
Log:
As of r257209, all architectures have defined VM_KMEM_SIZE_SCALE. In other
words, every architecture is now auto-sizing the kmem arena. This revision
changes kmeminit() so that the definition of VM_KMEM_SIZE_SCALE becomes
mandatory and the definition of VM_KMEM_SIZE becomes optional.
Replace or eliminate all existing definitions of VM_KMEM_SIZE. With
auto-sizing enabled, VM_KMEM_SIZE effectively became an alternate spelling
for VM_KMEM_SIZE_MIN on most architectures. Use VM_KMEM_SIZE_MIN for
clarity.
Change kmeminit() so that the effect of defining VM_KMEM_SIZE is similar to
that of setting the tunable vm.kmem_size. Whereas the macros
VM_KMEM_SIZE_{MAX,MIN,SCALE} have had the same effect as the tunables
vm.kmem_size_{max,min,scale}, the effects of VM_KMEM_SIZE and vm.kmem_size
have been distinct. In particular, whereas VM_KMEM_SIZE was overridden by
VM_KMEM_SIZE_{MAX,MIN,SCALE} and vm.kmem_size_{max,min,scale}, vm.kmem_size
was not. Remedy this inconsistency. Now, VM_KMEM_SIZE can be used to set
the size of the kmem arena at compile-time without that value being
overridden by auto-sizing.
Update the nearby comments to reflect the kmem submap being replaced by the
kmem arena. Stop duplicating the auto-sizing formula in every machine-
dependent vmparam.h and place it in kmeminit() where auto-sizing takes
place.
Reviewed by: kib (an earlier version)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/amd64/include/vmparam.h
head/sys/arm/include/vmparam.h
head/sys/i386/include/vmparam.h
head/sys/ia64/include/vmparam.h
head/sys/kern/kern_malloc.c
head/sys/mips/include/vmparam.h
head/sys/powerpc/include/vmparam.h
head/sys/sparc64/include/vmparam.h
Modified: head/sys/amd64/include/vmparam.h
==
--- head/sys/amd64/include/vmparam.hFri Nov 8 14:33:41 2013
(r257853)
+++ head/sys/amd64/include/vmparam.hFri Nov 8 16:25:00 2013
(r257854)
@@ -178,23 +178,16 @@
#definePHYS_TO_DMAP(x) ((x) | DMAP_MIN_ADDRESS)
#defineDMAP_TO_PHYS(x) ((x) & ~DMAP_MIN_ADDRESS)
-/* virtual sizes (bytes) for various kernel submaps */
-#ifndef VM_KMEM_SIZE
-#defineVM_KMEM_SIZE(12 * 1024 * 1024)
-#endif
-
/*
- * How many physical pages per KVA page allocated.
- * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE),
- * VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
- * is the total KVA space allocated for kmem_map.
+ * How many physical pages per kmem arena virtual page.
*/
#ifndef VM_KMEM_SIZE_SCALE
#defineVM_KMEM_SIZE_SCALE (1)
#endif
/*
- * Ceiling on amount of kmem_map kva space.
+ * Optional ceiling (in bytes) on the size of the kmem arena: 60% of the
+ * kernel map.
*/
#ifndef VM_KMEM_SIZE_MAX
#defineVM_KMEM_SIZE_MAX((VM_MAX_KERNEL_ADDRESS - \
Modified: head/sys/arm/include/vmparam.h
==
--- head/sys/arm/include/vmparam.h Fri Nov 8 14:33:41 2013
(r257853)
+++ head/sys/arm/include/vmparam.h Fri Nov 8 16:25:00 2013
(r257854)
@@ -165,17 +165,22 @@
#defineVM_MAX_KERNEL_ADDRESS (vm_max_kernel_address)
/*
- * Virtual size (bytes) for various kernel submaps.
+ * How many physical pages per kmem arena virtual page.
*/
-#ifndef VM_KMEM_SIZE
-#define VM_KMEM_SIZE (12*1024*1024)
-#endif
#ifndef VM_KMEM_SIZE_SCALE
-#define VM_KMEM_SIZE_SCALE (3)
+#defineVM_KMEM_SIZE_SCALE (3)
+#endif
+
+/*
+ * Optional floor (in bytes) on the size of the kmem arena.
+ */
+#ifndef VM_KMEM_SIZE_MIN
+#defineVM_KMEM_SIZE_MIN(12 * 1024 * 1024)
#endif
/*
- * Ceiling on the size of the kmem submap: 40% of the kernel map.
+ * Optional ceiling (in bytes) on the size of the kmem arena: 40% of the
+ * kernel map.
*/
#ifndef VM_KMEM_SIZE_MAX
#defineVM_KMEM_SIZE_MAX((vm_max_kernel_address - \
Modified: head/sys/i386/include/vmparam.h
==
--- head/sys/i386/include/vmparam.h Fri Nov 8 14:33:41 2013
(r257853)
+++ head/sys/i386/include/vmparam.h Fri Nov 8 16:25:00 2013
(r257854)
@@ -164,24 +164,23 @@
#define VM_MAX_ADDRESS VADDR(PTDPTDI, PTDPTDI)
#define VM_MIN_ADDRESS ((vm_offset_t)0)
-/* virtual sizes (bytes) for various kernel submaps */
-#ifndef VM_KMEM_SIZE
-#define VM_KMEM_SIZE (12 * 1024 * 1024)
-#endif
-
/*
- * How many physical pages per KVA page allocated.
- * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE),
- * VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
- * is the total KVA space allocated for kmem_map.
+ * How many physical pages p
svn commit: r257855 - head/sys/contrib/dev/ath/ath_hal/ar9300
Author: ian
Date: Fri Nov 8 16:28:00 2013
New Revision: 257855
URL: http://svnweb.freebsd.org/changeset/base/257855
Log:
Remove 'inline' from ar9300_init_pll(), it's too big to inline.
Submitted by: adrian@
Modified:
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
==
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Fri Nov 8
16:25:00 2013(r257854)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Fri Nov 8
16:28:00 2013(r257855)
@@ -1332,7 +1332,7 @@ ar9300_set_operating_mode(struct ath_hal
}
/* XXX need the logic for Osprey */
-inline void
+void
ar9300_init_pll(struct ath_hal *ah, struct ieee80211_channel *chan)
{
u_int32_t pll;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257856 - in head/sys: amd64/amd64 i386/i386 x86/include
Author: kib Date: Fri Nov 8 16:32:30 2013 New Revision: 257856 URL: http://svnweb.freebsd.org/changeset/base/257856 Log: Add bits for the AMD features from CPUID function 0x8001 ECX, described in the rev. 3.0 of the Kabini BKDG, document 48751.pdf. Partially based on the patch submitted by:Dmitry Luhtionov Sponsored by: The FreeBSD Foundation MFC after:1 week Modified: head/sys/amd64/amd64/identcpu.c head/sys/i386/i386/identcpu.c head/sys/x86/include/specialreg.h Modified: head/sys/amd64/amd64/identcpu.c == --- head/sys/amd64/amd64/identcpu.c Fri Nov 8 16:28:00 2013 (r257855) +++ head/sys/amd64/amd64/identcpu.c Fri Nov 8 16:32:30 2013 (r257856) @@ -366,18 +366,18 @@ printcpuinfo(void) "\017" "\020LWP" /* Lightweight Profiling */ "\021FMA4" /* 4-operand FMA instructions */ - "\022" + "\022TCE" /* Translation Cache Extension */ "\023" "\024NodeId"/* NodeId MSR support */ "\025" "\026TBM" /* Trailing Bit Manipulation */ "\027Topology" /* Topology Extensions */ - "\030" - "\031" + "\030PCXC" /* Core perf count */ + "\031PNXC" /* NB perf count */ "\032" - "\033" - "\034" - "\035" + "\033DBE" /* Data Breakpoint extension */ + "\034PTSC" /* Performance TSC */ + "\035PL2I" /* L2I perf count */ "\036" "\037" "\040" Modified: head/sys/i386/i386/identcpu.c == --- head/sys/i386/i386/identcpu.c Fri Nov 8 16:28:00 2013 (r257855) +++ head/sys/i386/i386/identcpu.c Fri Nov 8 16:32:30 2013 (r257856) @@ -842,18 +842,18 @@ printcpuinfo(void) "\017" "\020LWP" /* Lightweight Profiling */ "\021FMA4" /* 4-operand FMA instructions */ - "\022" + "\022TCE" /* Translation Cache Extension */ "\023" "\024NodeId"/* NodeId MSR support */ "\025" "\026TBM" /* Trailing Bit Manipulation */ "\027Topology" /* Topology Extensions */ - "\030" - "\031" + "\030PCXC" /* Core perf count */ + "\031PNXC" /* NB perf count */ "\032" - "\033" - "\034" - "\035" + "\033DBE" /* Data Breakpoint extension */ + "\034PTSC" /* Performance TSC */ + "\035PL2I" /* L2I perf count */ "\036" "\037" "\040" Modified: head/sys/x86/include/specialreg.h == --- head/sys/x86/include/specialreg.h Fri Nov 8 16:28:00 2013 (r257855) +++ head/sys/x86/include/specialreg.h Fri Nov 8 16:32:30 2013 (r257856) @@ -201,9 +201,15 @@ #defineAMDID2_WDT 0x2000 #defineAMDID2_LWP 0x8000 #defineAMDID2_FMA4 0x0001 +#defineAMDID2_TCE 0x0002 #defineAMDID2_NODE_ID 0x0008 #defineAMDID2_TBM 0x0020 #defineAMDID2_TOPOLOGY 0x0040 +#defineAMDID2_PCXC 0x0080 +#defineAMDID2_PNXC 0x0100 +#defineAMDID2_DBE 0x0400 +#defineAMDID2_PTSC 0x0800 +#defineAMDID2_PTSCEL2I 0x1000 /* * CPUID instruction 1 eax info ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257857 - head/sys/arm/arm
Author: alc Date: Fri Nov 8 16:56:13 2013 New Revision: 257857 URL: http://svnweb.freebsd.org/changeset/base/257857 Log: Eliminate an unused macro. Modified: head/sys/arm/arm/pmap.c Modified: head/sys/arm/arm/pmap.c == --- head/sys/arm/arm/pmap.c Fri Nov 8 16:32:30 2013(r257856) +++ head/sys/arm/arm/pmap.c Fri Nov 8 16:56:13 2013(r257857) @@ -2393,9 +2393,6 @@ pmap_bootstrap(vm_offset_t firstaddr, st * Reserve some special page table entries/VA space for temporary * mapping of pages. */ -#define SYSMAP(c, p, v, n) \ -v = (c)va; va += ((n)*PAGE_SIZE); p = pte; pte += (n); - pmap_alloc_specials(&virtual_avail, 1, &csrcp, &csrc_pte); pmap_set_pt_cache_mode(kernel_l1pt, (vm_offset_t)csrc_pte); pmap_alloc_specials(&virtual_avail, 1, &cdstp, &cdst_pte); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257858 - head/sys/i386/i386
Author: kib Date: Fri Nov 8 16:57:55 2013 New Revision: 257858 URL: http://svnweb.freebsd.org/changeset/base/257858 Log: Fix signal delivery for the iBCS2 binaries. The iBCS2 sysvec uses current FreeBSD signal trampoline, but does not specifies sv_sigcode_base, since shared page is not mapped. This results in the zero %eip for the signal frame. Fall back to calculating %eip as offset from the psstrings when sv_sigcode_base is not initialized. Reported by: Rich Naill Sponsored by: The FreeBSD Foundation MFC after:1 week Modified: head/sys/i386/i386/machdep.c Modified: head/sys/i386/i386/machdep.c == --- head/sys/i386/i386/machdep.cFri Nov 8 16:56:13 2013 (r257857) +++ head/sys/i386/i386/machdep.cFri Nov 8 16:57:55 2013 (r257858) @@ -757,6 +757,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, regs->tf_esp = (int)sfp; regs->tf_eip = p->p_sysent->sv_sigcode_base; + if (regs->tf_eip == 0) + regs->tf_eip = p->p_sysent->sv_psstrings - szsigcode; regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257859 - head/lib/libc/iconv
Author: dim Date: Fri Nov 8 17:23:37 2013 New Revision: 257859 URL: http://svnweb.freebsd.org/changeset/base/257859 Log: Fix typo in include guard, found by clang 3.4. MFC after:3 days Modified: head/lib/libc/iconv/citrus_csmapper.h Modified: head/lib/libc/iconv/citrus_csmapper.h == --- head/lib/libc/iconv/citrus_csmapper.h Fri Nov 8 16:57:55 2013 (r257858) +++ head/lib/libc/iconv/citrus_csmapper.h Fri Nov 8 17:23:37 2013 (r257859) @@ -28,7 +28,7 @@ */ #ifndef _CITRUS_CSMAPPER_H_ -#define _CITRUS_CSMAPPER_H +#define _CITRUS_CSMAPPER_H_ #define _citrus_csmapper _citrus_mapper #define _citrus_csmapper_close _citrus_mapper_close ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257860 - head/sys/x86/iommu
Author: dim
Date: Fri Nov 8 17:27:22 2013
New Revision: 257860
URL: http://svnweb.freebsd.org/changeset/base/257860
Log:
Initialize variable in sys/x86/iommu/busdma_dmar.c, to avoid possible
uninitialized use.
Reviewed by: kib
Modified:
head/sys/x86/iommu/busdma_dmar.c
Modified: head/sys/x86/iommu/busdma_dmar.c
==
--- head/sys/x86/iommu/busdma_dmar.cFri Nov 8 17:23:37 2013
(r257859)
+++ head/sys/x86/iommu/busdma_dmar.cFri Nov 8 17:27:22 2013
(r257860)
@@ -341,6 +341,7 @@ dmar_bus_dmamap_load_something1(struct b
segs = tag->segments;
ctx = tag->ctx;
seg = *segp;
+ error = 0;
idx = 0;
while (buflen > 0) {
seg++;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257861 - head/release
Author: gjb Date: Fri Nov 8 17:27:38 2013 New Revision: 257861 URL: http://svnweb.freebsd.org/changeset/base/257861 Log: Remove generate-release.sh from head/. The release.sh (based heavily on generate-release.sh) has been used for the 9.2-RELEASE and 10.0-RELEASE cycles, so make sure there is no confusion on what is currently being used by having two similar scripts. A big "thank you" to Nathan Whitehorn, the author of the generate-release.sh script, for writing this utility. No objection: nwhitehorn MFC after:never Sponsored by: The FreeBSD Foundation Deleted: head/release/generate-release.sh ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257862 - head/sys/ofed/include/linux
Author: alfred Date: Fri Nov 8 18:20:19 2013 New Revision: 257862 URL: http://svnweb.freebsd.org/changeset/base/257862 Log: Use explicit long cast to avoid overflow in bitopts. This was causing problems with the buddy allocator inside of ofed. Submitted by: odeds Modified: head/sys/ofed/include/linux/bitops.h Modified: head/sys/ofed/include/linux/bitops.h == --- head/sys/ofed/include/linux/bitops.hFri Nov 8 17:27:38 2013 (r257861) +++ head/sys/ofed/include/linux/bitops.hFri Nov 8 18:20:19 2013 (r257862) @@ -286,14 +286,14 @@ bitmap_empty(unsigned long *addr, int si #defineNBLONG (NBBY * sizeof(long)) #defineset_bit(i, a) \ -atomic_set_long(&((volatile long *)(a))[(i)/NBLONG], 1 << (i) % NBLONG) +atomic_set_long(&((volatile long *)(a))[(i)/NBLONG], 1UL << (i) % NBLONG) #defineclear_bit(i, a) \ -atomic_clear_long(&((volatile long *)(a))[(i)/NBLONG], 1 << (i) % NBLONG) +atomic_clear_long(&((volatile long *)(a))[(i)/NBLONG], 1UL << (i) % NBLONG) #definetest_bit(i, a) \ !!(atomic_load_acq_long(&((volatile long *)(a))[(i)/NBLONG]) & \ -1 << ((i) % NBLONG)) +1UL << ((i) % NBLONG)) static inline long test_and_clear_bit(long bit, long *var) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257863 - head/sys/ofed/drivers/net/mlx4
Author: alfred
Date: Fri Nov 8 18:26:28 2013
New Revision: 257863
URL: http://svnweb.freebsd.org/changeset/base/257863
Log:
Fix for bad performance when mtu is increased.
Update the auto moderation behavior in the mlxen driver to match
the new LINUX OFED code.
Submitted by: odeds
Modified:
head/sys/ofed/drivers/net/mlx4/en_ethtool.c
head/sys/ofed/drivers/net/mlx4/en_netdev.c
head/sys/ofed/drivers/net/mlx4/mlx4_en.h
Modified: head/sys/ofed/drivers/net/mlx4/en_ethtool.c
==
--- head/sys/ofed/drivers/net/mlx4/en_ethtool.c Fri Nov 8 18:20:19 2013
(r257862)
+++ head/sys/ofed/drivers/net/mlx4/en_ethtool.c Fri Nov 8 18:26:28 2013
(r257863)
@@ -366,13 +366,13 @@ static int mlx4_en_set_coalesce(struct n
priv->rx_usecs_high = coal->rx_coalesce_usecs_high;
priv->sample_interval = coal->rate_sample_interval;
priv->adaptive_rx_coal = coal->use_adaptive_rx_coalesce;
- priv->last_moder_time = MLX4_EN_AUTO_CONF;
if (priv->adaptive_rx_coal)
return 0;
for (i = 0; i < priv->rx_ring_num; i++) {
priv->rx_cq[i].moder_cnt = priv->rx_frames;
priv->rx_cq[i].moder_time = priv->rx_usecs;
+ priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
err = mlx4_en_set_cq_moder(priv, &priv->rx_cq[i]);
if (err)
return err;
@@ -418,6 +418,7 @@ static int mlx4_en_set_ringparam(struct
u32 rx_size, tx_size;
int port_up = 0;
int err = 0;
+ int i;
if (param->rx_jumbo_pending || param->rx_mini_pending)
return -EINVAL;
@@ -456,6 +457,15 @@ static int mlx4_en_set_ringparam(struct
en_err(priv, "Failed starting port\n");
}
+ for (i = 0; i < priv->rx_ring_num; i++) {
+ priv->rx_cq[i].moder_cnt = priv->rx_frames;
+ priv->rx_cq[i].moder_time = priv->rx_usecs;
+ priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
+ err = mlx4_en_set_cq_moder(priv, &priv->rx_cq[i]);
+ if (err)
+ goto out;
+ }
+
out:
mutex_unlock(&mdev->state_lock);
return err;
Modified: head/sys/ofed/drivers/net/mlx4/en_netdev.c
==
--- head/sys/ofed/drivers/net/mlx4/en_netdev.c Fri Nov 8 18:20:19 2013
(r257862)
+++ head/sys/ofed/drivers/net/mlx4/en_netdev.c Fri Nov 8 18:26:28 2013
(r257863)
@@ -318,6 +318,9 @@ static void mlx4_en_set_default_moderati
cq = &priv->rx_cq[i];
cq->moder_cnt = priv->rx_frames;
cq->moder_time = priv->rx_usecs;
+ priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
+ priv->last_moder_packets[i] = 0;
+ priv->last_moder_bytes[i] = 0;
}
for (i = 0; i < priv->tx_ring_num; i++) {
@@ -333,11 +336,8 @@ static void mlx4_en_set_default_moderati
priv->rx_usecs_high = MLX4_EN_RX_COAL_TIME_HIGH;
priv->sample_interval = MLX4_EN_SAMPLE_INTERVAL;
priv->adaptive_rx_coal = 1;
- priv->last_moder_time = MLX4_EN_AUTO_CONF;
priv->last_moder_jiffies = 0;
- priv->last_moder_packets = 0;
priv->last_moder_tx_packets = 0;
- priv->last_moder_bytes = 0;
}
static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
@@ -349,43 +349,29 @@ static void mlx4_en_auto_moderation(stru
unsigned long avg_pkt_size;
unsigned long rx_packets;
unsigned long rx_bytes;
- unsigned long tx_packets;
- unsigned long tx_pkt_diff;
unsigned long rx_pkt_diff;
int moder_time;
- int i, err;
+ int ring, err;
if (!priv->adaptive_rx_coal || period < priv->sample_interval * HZ)
return;
-
- spin_lock(&priv->stats_lock);
- rx_packets = priv->dev->if_ipackets;
- rx_bytes = priv->dev->if_ibytes;
- tx_packets = priv->dev->if_opackets;
- spin_unlock(&priv->stats_lock);
-
- if (!priv->last_moder_jiffies || !period)
- goto out;
-
- tx_pkt_diff = ((unsigned long) (tx_packets -
- priv->last_moder_tx_packets));
- rx_pkt_diff = ((unsigned long) (rx_packets -
- priv->last_moder_packets));
- packets = max(tx_pkt_diff, rx_pkt_diff);
- rate = packets * HZ / period;
- avg_pkt_size = packets ? ((unsigned long) (rx_bytes -
-priv->last_moder_bytes)) / packets : 0;
-
- /* Apply auto-moderation only when packet rate exceeds a rate that
-* it matters */
- if (rate > MLX4_EN_RX_RATE_THRESH) {
- /* If tx and rx packet rates are not balanced, assume that
-* traffic is mainly BW bound and apply max
svn commit: r257864 - head/sys/ofed/drivers/net/mlx4
Author: alfred
Date: Fri Nov 8 18:28:48 2013
New Revision: 257864
URL: http://svnweb.freebsd.org/changeset/base/257864
Log:
Do not use a sleep lock when protecting the driver flags.
This was causing a locking issue with lagg
Submitted by: odeds
Modified:
head/sys/ofed/drivers/net/mlx4/en_netdev.c
head/sys/ofed/drivers/net/mlx4/mlx4_en.h
Modified: head/sys/ofed/drivers/net/mlx4/en_netdev.c
==
--- head/sys/ofed/drivers/net/mlx4/en_netdev.c Fri Nov 8 18:26:28 2013
(r257863)
+++ head/sys/ofed/drivers/net/mlx4/en_netdev.c Fri Nov 8 18:28:48 2013
(r257864)
@@ -919,6 +919,7 @@ void mlx4_en_destroy_netdev(struct net_d
mtx_destroy(&priv->stats_lock.m);
mtx_destroy(&priv->vlan_lock.m);
+ mtx_destroy(&priv->ioctl_lock.m);
kfree(priv);
if_free(dev);
}
@@ -1087,9 +1088,9 @@ static int mlx4_en_ioctl(struct ifnet *d
break;
case SIOCADDMULTI:
case SIOCDELMULTI:
- mutex_lock(&mdev->state_lock);
+spin_lock(&priv->ioctl_lock);
mlx4_en_set_multicast(dev);
- mutex_unlock(&mdev->state_lock);
+spin_unlock(&priv->ioctl_lock);
break;
case SIOCSIFMEDIA:
case SIOCGIFMEDIA:
@@ -1510,6 +1511,7 @@ int mlx4_en_init_netdev(struct mlx4_en_d
priv->msg_enable = MLX4_EN_MSG_LEVEL;
priv->ip_reasm = priv->mdev->profile.ip_reasm;
mtx_init(&priv->stats_lock.m, "mlx4 stats", NULL, MTX_DEF);
+ mtx_init(&priv->ioctl_lock.m, "mlx4 ioctl", NULL, MTX_DEF);
mtx_init(&priv->vlan_lock.m, "mlx4 vlan", NULL, MTX_DEF);
INIT_WORK(&priv->mcast_task, mlx4_en_do_set_multicast);
INIT_WORK(&priv->watchdog_task, mlx4_en_restart);
Modified: head/sys/ofed/drivers/net/mlx4/mlx4_en.h
==
--- head/sys/ofed/drivers/net/mlx4/mlx4_en.hFri Nov 8 18:26:28 2013
(r257863)
+++ head/sys/ofed/drivers/net/mlx4/mlx4_en.hFri Nov 8 18:28:48 2013
(r257864)
@@ -493,6 +493,7 @@ struct mlx4_en_priv {
spinlock_t vlan_lock;
struct mlx4_en_port_state port_state;
spinlock_t stats_lock;
+ spinlock_t ioctl_lock;
unsigned long last_moder_packets[MAX_RX_RINGS];
unsigned long last_moder_tx_packets;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257865 - head/sys/kern
Author: hiren Date: Fri Nov 8 20:11:15 2013 New Revision: 257865 URL: http://svnweb.freebsd.org/changeset/base/257865 Log: Fix typo in a comment. Modified: head/sys/kern/uipc_socket.c Modified: head/sys/kern/uipc_socket.c == --- head/sys/kern/uipc_socket.c Fri Nov 8 18:28:48 2013(r257864) +++ head/sys/kern/uipc_socket.c Fri Nov 8 20:11:15 2013(r257865) @@ -479,7 +479,7 @@ SYSCTL_INT(_regression, OID_AUTO, sonewc * connections, sonewconn is called. If the connection is possible (subject * to space constraints, etc.) then we allocate a new structure, propoerly * linked into the data structure of the original socket, and return this. - * Connstatus may be 0, or SO_ISCONFIRMING, or SO_ISCONNECTED. + * Connstatus may be 0, or SS_ISCONFIRMING, or SS_ISCONNECTED. * * Note: the ref count on the socket is 0 on return. */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r257633 - in head: lib/libc/capability lib/libc/gen lib/libc/sys share/man/man4
On Mon, Nov 04, 2013 at 02:10:22PM +, Pawel Jakub Dawidek wrote: > Author: pjd > Date: Mon Nov 4 14:10:22 2013 > New Revision: 257633 > URL: http://svnweb.freebsd.org/changeset/base/257633 > > Log: > - Add manual pages for capability rights (rights(4)), cap_rights_init(3) > family of functions and cap_rights_get(3) function. > - Update remaining Capsicum-related manual pages. > > Reviewed by:bdrewery > MFC after: 3 days This work was sponsored by the FreeBSD Foundation. -- Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://mobter.com pgpVKI3mr6bU3.pgp Description: PGP signature
svn commit: r257868 - head/sys/netgraph
Author: zec
Date: Fri Nov 8 22:40:33 2013
New Revision: 257868
URL: http://svnweb.freebsd.org/changeset/base/257868
Log:
Eliminate duplicated & dead code.
MFC after:3 days
Modified:
head/sys/netgraph/ng_pipe.c
Modified: head/sys/netgraph/ng_pipe.c
==
--- head/sys/netgraph/ng_pipe.c Fri Nov 8 22:29:07 2013(r257867)
+++ head/sys/netgraph/ng_pipe.c Fri Nov 8 22:40:33 2013(r257868)
@@ -705,35 +705,6 @@ ngp_rcvdata(hook_p hook, item_p item)
}
hinfo->run.qin_frames--;
hinfo->stats.in_disc_frames++;
- } else if (hinfo->run.qin_frames > hinfo->cfg.qin_size_limit) {
- struct mbuf *m1;
- int longest = 0;
-
- /* Find the longest queue */
- TAILQ_FOREACH(ngp_f1, &hinfo->fifo_head, fifo_le)
- if (ngp_f1->packets > longest) {
- longest = ngp_f1->packets;
- ngp_f = ngp_f1;
- }
-
- /* Drop a frame from the queue head/tail, depending on cfg */
- if (hinfo->cfg.drophead)
- ngp_h = TAILQ_FIRST(&ngp_f->packet_head);
- else
- ngp_h = TAILQ_LAST(&ngp_f->packet_head, p_head);
- TAILQ_REMOVE(&ngp_f->packet_head, ngp_h, ngp_link);
- m1 = ngp_h->m;
- uma_zfree(ngp_zone, ngp_h);
- hinfo->run.qin_octets -= m1->m_pkthdr.len;
- hinfo->stats.in_disc_octets += m1->m_pkthdr.len;
- m_freem(m1);
- if (--(ngp_f->packets) == 0) {
- TAILQ_REMOVE(&hinfo->fifo_head, ngp_f, fifo_le);
- uma_zfree(ngp_zone, ngp_f);
- hinfo->run.fifo_queues--;
- }
- hinfo->run.qin_frames--;
- hinfo->stats.in_disc_frames++;
}
/*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257869 - in head/sys/dev/drm2: . radeon
Author: dumbbell Date: Fri Nov 8 22:44:46 2013 New Revision: 257869 URL: http://svnweb.freebsd.org/changeset/base/257869 Log: drm: Initialize "handle" to 0 before calling drm_gem_handle_create() This is variable is being checked in drm_gem_name_create() before being set. Modified: head/sys/dev/drm2/drm_crtc.c head/sys/dev/drm2/radeon/radeon_gem.c Modified: head/sys/dev/drm2/drm_crtc.c == --- head/sys/dev/drm2/drm_crtc.cFri Nov 8 22:40:33 2013 (r257868) +++ head/sys/dev/drm2/drm_crtc.cFri Nov 8 22:44:46 2013 (r257869) @@ -2317,6 +2317,7 @@ int drm_mode_getfb(struct drm_device *de r->depth = fb->depth; r->bpp = fb->bits_per_pixel; r->pitch = fb->pitches[0]; + r->handle = 0; fb->funcs->create_handle(fb, file_priv, &r->handle); out: Modified: head/sys/dev/drm2/radeon/radeon_gem.c == --- head/sys/dev/drm2/radeon/radeon_gem.c Fri Nov 8 22:40:33 2013 (r257868) +++ head/sys/dev/drm2/radeon/radeon_gem.c Fri Nov 8 22:44:46 2013 (r257869) @@ -567,6 +567,7 @@ int radeon_mode_dumb_create(struct drm_f if (r) return -ENOMEM; + handle = 0; r = drm_gem_handle_create(file_priv, gobj, &handle); /* drop reference from allocate - handle holds it now */ drm_gem_object_unreference_unlocked(gobj); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257870 - head/sys/dev/drm2/radeon
Author: dumbbell Date: Fri Nov 8 22:47:43 2013 New Revision: 257870 URL: http://svnweb.freebsd.org/changeset/base/257870 Log: drm/radeon: Wake up userland after page flip For instance, this caused issues in KDE, such as stuttered animations (with desktop effects enabled). Modified: head/sys/dev/drm2/radeon/radeon_display.c Modified: head/sys/dev/drm2/radeon/radeon_display.c == --- head/sys/dev/drm2/radeon/radeon_display.c Fri Nov 8 22:44:46 2013 (r257869) +++ head/sys/dev/drm2/radeon/radeon_display.c Fri Nov 8 22:47:43 2013 (r257870) @@ -336,9 +336,7 @@ void radeon_crtc_handle_flip(struct rade e->event.tv_sec = now.tv_sec; e->event.tv_usec = now.tv_usec; list_add_tail(&e->base.link, &e->base.file_priv->event_list); -#ifdef DUMBBELL_WIP - wake_up_interruptible(&e->base.file_priv->event_wait); -#endif /* DUMBBELL_WIP */ + drm_event_wakeup(&e->base); } DRM_SPINUNLOCK_IRQRESTORE(&rdev->ddev->event_lock, flags); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257871 - head/usr.sbin/mfiutil
Author: joel (doc committer) Date: Fri Nov 8 23:08:01 2013 New Revision: 257871 URL: http://svnweb.freebsd.org/changeset/base/257871 Log: mdoc: remove superfluous paragraph macro. Modified: head/usr.sbin/mfiutil/mfiutil.8 Modified: head/usr.sbin/mfiutil/mfiutil.8 == --- head/usr.sbin/mfiutil/mfiutil.8 Fri Nov 8 22:47:43 2013 (r257870) +++ head/usr.sbin/mfiutil/mfiutil.8 Fri Nov 8 23:08:01 2013 (r257871) @@ -714,7 +714,6 @@ Display the second detected foreign conf .Pp Set the current rebuild rate for volumes to 40%: .Dl Nm Cm ctrlprop rebuild 40 -.Pp .Sh SEE ALSO .Xr mfi 4 .Sh HISTORY ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257872 - head/usr.sbin/bsdinstall
Author: joel (doc committer) Date: Fri Nov 8 23:11:04 2013 New Revision: 257872 URL: http://svnweb.freebsd.org/changeset/base/257872 Log: mdoc: add missing El. Modified: head/usr.sbin/bsdinstall/bsdinstall.8 Modified: head/usr.sbin/bsdinstall/bsdinstall.8 == --- head/usr.sbin/bsdinstall/bsdinstall.8 Fri Nov 8 23:08:01 2013 (r257871) +++ head/usr.sbin/bsdinstall/bsdinstall.8 Fri Nov 8 23:11:04 2013 (r257872) @@ -61,6 +61,7 @@ See .Sx ENVIRONMENT VARIABLES for more information on .Ev BSDINSTALL_LOG . +.El .Sh TARGETS Most of the following targets are only useful for scripting the installer. For interactive use, most users will be interested only in the ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257873 - head
Author: ian
Date: Sat Nov 9 00:15:36 2013
New Revision: 257873
URL: http://svnweb.freebsd.org/changeset/base/257873
Log:
This change builds kernel tools based on the same assumption as building
the kernel itself: If building for the same architecture as the build host,
the kernel build assumes that the host toolchain is capable of building the
kernel. If it's not, "make kernel-toolchain" will bootstrap a new set of
tools that will work.
With this change the same assumptions are made for building kernel tools,
and the existing host toolchain is used to do the build (notably, the build
doesn't link the tools with the legacy libraries, which may not even exist).
If ever for some reason the host toolchain isn't capable of building the
kernel tools, then doing a "make kernel-toolchain" will bootstrap newer
tools to get the job done.
So when built as part of buildworld or kernel-toolchain, the kernel tools
are built using the XMAKE (via BMAKE) commands and environment. When built
as part of building just the kernel on a same-target host, the tools are
built using the new KTMAKE commands and environment. What doesn't jump
out at you in the diffs is that the difference between BMAKE and KTMAKE
is that BMAKE contains this magic line which changes how the build is done
because it changes what files get included for .include and
other standard includes:
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
and KTMAKE doesn't, and contains this instead:
TOOLS_PREFIX=${WORLDTMP}
Hopefully this brings the "how to build aicasm with the right toolchain"
saga to a conclusion that works in all usage scenarios that have
historically been supported.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Nov 8 23:11:04 2013(r257872)
+++ head/Makefile.inc1 Sat Nov 9 00:15:36 2013(r257873)
@@ -263,6 +263,21 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-DWITHOUT_GDB
+# kernel-tools stage
+KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
+ PATH=${BPATH}:${PATH} \
+ WORLDTMP=${WORLDTMP} \
+ VERSION="${VERSION}" \
+ COMPILER_TYPE=${COMPILER_TYPE}
+KTMAKE=TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
+ ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+ DESTDIR= \
+ BOOTSTRAPPING=${OSRELDATE} \
+ SSP_CFLAGS= \
+ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ -DNO_PIC -DNO_PROFILE -DNO_SHARED \
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+
# world stage
WMAKEENV= ${CROSSENV} \
_SHLIBDIRPREFIX=${WORLDTMP} \
@@ -1020,7 +1035,7 @@ buildkernel:
@echo "--"
@echo ">>> stage 2.3: build tools"
@echo "--"
- ${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
+ ${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
.if !defined(NO_KERNELDEPEND)
@echo
@echo "--"
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257874 - in head: . lib/libc/sys
Author: pluknet Date: Sat Nov 9 00:36:09 2013 New Revision: 257874 URL: http://svnweb.freebsd.org/changeset/base/257874 Log: Fix extattr(2) MLINKS. MFC after:1 week Modified: head/ObsoleteFiles.inc head/lib/libc/sys/Makefile.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sat Nov 9 00:15:36 2013(r257873) +++ head/ObsoleteFiles.inc Sat Nov 9 00:36:09 2013(r257874) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20131109: extattr(2) mlinks fixed +OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz +OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz # 20131107: example files removed OLD_FILES+=usr/share/examples/libusb20/aux.c OLD_FILES+=usr/share/examples/libusb20/aux.h Modified: head/lib/libc/sys/Makefile.inc == --- head/lib/libc/sys/Makefile.inc Sat Nov 9 00:15:36 2013 (r257873) +++ head/lib/libc/sys/Makefile.inc Sat Nov 9 00:36:09 2013 (r257874) @@ -300,9 +300,9 @@ MLINKS+=execve.2 fexecve.2 MLINKS+=extattr_get_file.2 extattr.2 \ extattr_get_file.2 extattr_delete_fd.2 \ extattr_get_file.2 extattr_delete_file.2 \ - extattr_get_file.2 extattr_delete_list.2 \ + extattr_get_file.2 extattr_delete_link.2 \ extattr_get_file.2 extattr_get_fd.2 \ - extattr_get_file.2 extattr_get_list.2 \ + extattr_get_file.2 extattr_get_link.2 \ extattr_get_file.2 extattr_list_fd.2 \ extattr_get_file.2 extattr_list_file.2 \ extattr_get_file.2 extattr_list_link.2 \ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r257529 - in head: share/man/man4 sys/conf sys/dev/e1000 sys/dev/ixgbe sys/dev/netmap sys/dev/re sys/net tools/tools/netmap
On Fri, Nov 1, 2013 at 10:21 PM, Luigi Rizzo wrote: > > Author: luigi > Date: Fri Nov 1 21:21:14 2013 > New Revision: 257529 > URL: http://svnweb.freebsd.org/changeset/base/257529 > > Log: > update to the latest netmap snapshot. > This includes the following: > - use separate memory regions for VALE ports > - locking fixes > - some simplifications in the NIC-specific routines > - performance improvements for the VALE switch > - some new features in the pkt-gen test program > Thanks a lot's for adding the range feature to pkt-gen ! But there is a problem with this new option: The checksum is not updated when the IP addresses are updated. If we use the IP src or dst range, only the packet using the first IP addresse has a correct checksum, all other paquets checksum are wrong. As example, if I start pkt-gen with -d 2.3.3.1-2.3.3.4 -s 1.3.3.1-1.3.3.4, give me these errors : [root@bsdrp2]~# tcpdump -npi igb2 -c 100 -v tcpdump: listening on igb2, link-type EN10MB (Ethernet), capture size 65535 bytes 00:00:56.439325 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28, bad cksum 31ba (->31b9)!) 1.3.3.2.0 > 2.3.3.1.0: UDP, length 0 00:00:56.439325 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28, bad cksum 31ba (->31b5)!)1.3.3.3.0 > 2.3.3.4.0: UDP, length 0 00:00:56.439326 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28, bad cksum 31ba (->31b8)!)1.3.3.3.0 > 2.3.3.1.0: UDP, length 0 00:00:56.439327 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28, bad cksum 31ba (->31b8)!)1.3.3.2.0 > 2.3.3.2.0: UDP, length 0 00:00:56.439330 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28)1.3.3.1.0 > 2.3.3.1.0: UDP, length 0 00:00:56.439332 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28, bad cksum 31ba (->31b7)!)1.3.3.4.0 > 2.3.3.1.0: UDP, length 0 00:00:56.439332 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28, bad cksum 31ba (->31b6)!)1.3.3.4.0 > 2.3.3.2.0: UDP, length 0 00:00:56.439333 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28, bad cksum 31ba (->31b9)!)1.3.3.1.0 > 2.3.3.2.0: UDP, length 0 00:00:56.439334 IP (tos 0x10, ttl 64, id 0, offset 0, flags [DF], proto UDP (17), length 28, bad cksum 31ba (->31b8)!)1.3.3.1.0 > 2.3.3.3.0: UDP, length 0 Regards, Olivier ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257876 - head/sys/dev/xen/control
Author: gibbs
Date: Sat Nov 9 03:07:48 2013
New Revision: 257876
URL: http://svnweb.freebsd.org/changeset/base/257876
Log:
On XenServer the "halt" message is used instead of "poweroff", which
makes FreeBSD halt but not poweroff (as expected when issuing a
shutdown from the VM manager). Fix this by using the same handler
for both "halt" and "poweroff".
NB: The "halt" signal seems to be used on XenServer only. The OSS
Xen toolstack (xl) uses "poweroff" instead.
Submitted by: Roger Pau Monné
Sponsored by: Citrix Systems R&D
Reviewed by: gibbs
MFC after:2 days
Modified:
head/sys/dev/xen/control/control.c
Modified: head/sys/dev/xen/control/control.c
==
--- head/sys/dev/xen/control/control.c Sat Nov 9 00:59:31 2013
(r257875)
+++ head/sys/dev/xen/control/control.c Sat Nov 9 03:07:48 2013
(r257876)
@@ -158,7 +158,6 @@ static xctrl_shutdown_handler_t xctrl_po
static xctrl_shutdown_handler_t xctrl_reboot;
static xctrl_shutdown_handler_t xctrl_suspend;
static xctrl_shutdown_handler_t xctrl_crash;
-static xctrl_shutdown_handler_t xctrl_halt;
/*-- Private Data Structures
-*/
/** Element type for lookup table of event name to handler. */
@@ -173,7 +172,7 @@ static const struct xctrl_shutdown_reaso
{ "reboot", xctrl_reboot },
{ "suspend", xctrl_suspend },
{ "crash",xctrl_crash},
- { "halt", xctrl_halt },
+ { "halt", xctrl_poweroff },
};
struct xctrl_softc {
@@ -441,12 +440,6 @@ xctrl_crash()
panic("Xen directed crash");
}
-static void
-xctrl_halt()
-{
- shutdown_nice(RB_HALT);
-}
-
/*-- Event Reception
-*/
static void
xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int
len)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257877 - head/cddl/contrib/opensolaris/lib/libdtrace/common
Author: markj Date: Sat Nov 9 04:38:16 2013 New Revision: 257877 URL: http://svnweb.freebsd.org/changeset/base/257877 Log: Don't try to use the 32-bit drti.o unless the data model is explicitly set to ILP32. Otherwise dtrace -G will attempt to use it on amd64 if it can't determine which data model to use, which happens when -64 is omitted and no object files are provided, e.g. with # dtrace -G -n BEGIN This would result in a linker error, but now works properly. Also remove an unnecessary #ifdef. MFC after:2 weeks Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c == --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.cSat Nov 9 03:07:48 2013(r257876) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.cSat Nov 9 04:38:16 2013(r257877) @@ -1864,7 +1864,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d * Arches which default to 64-bit need to explicitly use * the 32-bit library path. */ - int use_32 = !(dtp->dt_oflags & DTRACE_O_LP64); + int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32); #else /* * Arches which are 32-bit only just use the normal @@ -1879,9 +1879,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; -#if !defined(sun) len *= 2; -#endif cmd = alloca(len); (void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257879 - head/usr.sbin/freebsd-update
Author: cperciva Date: Sat Nov 9 04:50:05 2013 New Revision: 257879 URL: http://svnweb.freebsd.org/changeset/base/257879 Log: Fix typo in r256646: We want to generate lists of directories in INDEX-OLD and INDEX-NEW and compare them, not generate the same list of directories from INDEX-OLD twice... Pointy hats to: cperciva & everybody who didn't proofread EN-13:04 enough Modified: head/usr.sbin/freebsd-update/freebsd-update.sh Modified: head/usr.sbin/freebsd-update/freebsd-update.sh == --- head/usr.sbin/freebsd-update/freebsd-update.sh Sat Nov 9 04:40:32 2013(r257878) +++ head/usr.sbin/freebsd-update/freebsd-update.sh Sat Nov 9 04:50:05 2013(r257879) @@ -2884,8 +2884,8 @@ again to finish installing updates. install_delete INDEX-OLD INDEX-NEW || return 1 # Remove old directories - grep -vE '^/boot/' $1/INDEX-OLD | - grep -E '^[^|]+\|d\|' > INDEX-OLD + grep -vE '^/boot/' $1/INDEX-NEW | + grep -E '^[^|]+\|d\|' > INDEX-NEW grep -vE '^/boot/' $1/INDEX-OLD | grep -E '^[^|]+\|d\|' > INDEX-OLD install_delete INDEX-OLD INDEX-NEW || return 1 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257880 - head/sys/dev/iwn
Author: adrian
Date: Sat Nov 9 06:30:09 2013
New Revision: 257880
URL: http://svnweb.freebsd.org/changeset/base/257880
Log:
Add some new driver definitions as part of the chip support updates:
This is a no-op for now!
* Add a new flag value for "there are no extra bits" for some random
field;
* Add a definition for the maximum number of calibration entries in
the calibration data cache in iwn_softc. It's not yet used.
* Add regulatory bands for the 2030 NIC.
Submitted by: Cedric Gross
Modified:
head/sys/dev/iwn/if_iwnreg.h
Modified: head/sys/dev/iwn/if_iwnreg.h
==
--- head/sys/dev/iwn/if_iwnreg.hSat Nov 9 04:50:05 2013
(r257879)
+++ head/sys/dev/iwn/if_iwnreg.hSat Nov 9 06:30:09 2013
(r257880)
@@ -224,6 +224,7 @@
#define IWN_GP_DRIVER_CALIB_VER6 (1 << 2)
#define IWN_GP_DRIVER_6050_1X2 (1 << 3)
#defineIWN_GP_DRIVER_REG_BIT_RADIO_IQ_INVERT (1 << 7)
+#defineIWN_GP_DRIVER_NONE 0
/* Possible flags for register IWN_UCODE_GP1_CLR. */
#define IWN_UCODE_GP1_RFKILL (1 << 1)
@@ -1104,6 +1105,12 @@ struct iwn_enhanced_sensitivity_cmd {
uint16_treserved;
} __packed;
+/*
+ * Define maximal number of calib result send to runtime firmware
+ * PS: TEMP_OFFSET count for 2 (std and v2)
+ */
+#defineIWN5000_PHY_CALIB_MAX_RESULT8
+
/* Structures for command IWN_CMD_PHY_CALIB. */
struct iwn_phy_calib {
uint8_t code;
@@ -1734,6 +1741,16 @@ static const uint32_t iwn1000_regulatory
IWN5000_EEPROM_NO_HT40,
};
+static const uint32_t iwn2030_regulatory_bands[IWN_NBANDS] = {
+ IWN5000_EEPROM_BAND1,
+ IWN5000_EEPROM_BAND2,
+ IWN5000_EEPROM_BAND3,
+ IWN5000_EEPROM_BAND4,
+ IWN5000_EEPROM_BAND5,
+ IWN6000_EEPROM_BAND6,
+ IWN5000_EEPROM_BAND7
+};
+
#define IWN_CHAN_BANDS_COUNT7
#define IWN_MAX_CHAN_PER_BAND 14
static const struct iwn_chan_band {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257881 - head/sys/net80211
Author: adrian
Date: Sat Nov 9 07:30:13 2013
New Revision: 257881
URL: http://svnweb.freebsd.org/changeset/base/257881
Log:
Fix AMRR to correctly select the initial rate.
There were two bugs:
* If the initial lowest rate didn't go through the loop at least once,
the AMRR rate index would be the highest rate in the table
(eg the rix mapping to MCS15) but rate would stay at the default
value, namely 0.
This meant that the initial rate selection would be MCS15 _but_ the
node ni_txrate value would be MCS0.
* If the node is 11n, then break out of the loop correctly. Beforehand,
my initial 11n AMRR commit would immediately exit out as it would
fail the 11n check, then it would always fall through to the non-11n
rate which would then see if it was < 36mbit (ie, "72"), which would
always match. Hence, it'd always return MCS15.
Tested:
* Intel Centrino 2230 STA (local changes), STA mode
* Intel Wifi 5100, STA
Modified:
head/sys/net80211/ieee80211_amrr.c
Modified: head/sys/net80211/ieee80211_amrr.c
==
--- head/sys/net80211/ieee80211_amrr.c Sat Nov 9 06:30:09 2013
(r257880)
+++ head/sys/net80211/ieee80211_amrr.c Sat Nov 9 07:30:13 2013
(r257881)
@@ -199,13 +199,13 @@ amrr_node_init(struct ieee80211_node *ni
amn->amn_rix--) {
/* legacy - anything < 36mbit, stop searching */
/* 11n - stop at MCS4 / MCS12 / MCS28 */
- if (amrr_node_is_11n(ni) &&
- (rs->rs_rates[amn->amn_rix] & 0x7) < 4)
+ if (amrr_node_is_11n(ni)) {
+ if ((rs->rs_rates[amn->amn_rix] & 0x7) < 4)
+ break;
+ } else if ((rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL) <=
72)
break;
- else if ((rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL) <=
72)
- break;
- rate = rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL;
}
+ rate = rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL;
/* if the rate is an 11n rate, ensure the MCS bit is set */
if (amrr_node_is_11n(ni))
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
