Re: svn commit: r223029 - head/usr.sbin/makefs/ffs
On Mon, 13 Jun 2011, Dimitry Andric wrote: Log: Apparently makefs needs a few more system headers to compile during buildworld. This expands the bug. Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c head/usr.sbin/makefs/ffs/ffs_subr.c Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c == --- head/usr.sbin/makefs/ffs/ffs_bswap.cMon Jun 13 00:55:29 2011 (r223028) +++ head/usr.sbin/makefs/ffs/ffs_bswap.cMon Jun 13 01:04:00 2011 (r223029) @@ -35,6 +35,8 @@ __FBSDID($FreeBSD$); #include sys/param.h #include sys/queue.h +#include sys/lock.h +#include sys/lockmgr.h #if defined(_KERNEL) #include sys/systm.h #endif Kernel variables like sn_lock should not be exported to userland. And even when they are, the full kernel API for accessing them should not by included by userland (or in kernel headers). The system provides headers sys/_lock.h and sys/_lockmgr.h to help avoid exposing the full API. These bugs are in many networking headers, but should not be added in new code. The networking headers are so convuluted and broken that many of them have to expose the full API. This should be even easier to avoid adding in new code. Bruce ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r223037 - stable/8/sys/kern
Author: davidxu
Date: Mon Jun 13 06:32:56 2011
New Revision: 223037
URL: http://svn.freebsd.org/changeset/base/223037
Log:
MFC r222802:
Use p4prio_to_tsprio to calculate TS priority instead of using
p4prio_to_rtpprio which is for RT priority.
Modified:
stable/8/sys/kern/ksched.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)
Modified: stable/8/sys/kern/ksched.c
==
--- stable/8/sys/kern/ksched.c Mon Jun 13 05:34:08 2011(r223036)
+++ stable/8/sys/kern/ksched.c Mon Jun 13 06:32:56 2011(r223037)
@@ -202,7 +202,7 @@ ksched_setscheduler(struct ksched *ksche
if (param-sched_priority = 0
param-sched_priority = (PRI_MAX_TIMESHARE -
PRI_MIN_TIMESHARE)) {
rtp.type = RTP_PRIO_NORMAL;
- rtp.prio = p4prio_to_rtpprio(param-sched_priority);
+ rtp.prio = p4prio_to_tsprio(param-sched_priority);
rtp_to_pri(rtp, td);
} else
e = EINVAL;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r223029 - head/usr.sbin/makefs/ffs
On Mon, Jun 13, 2011 at 01:04:00AM +, Dimitry Andric wrote: Author: dim Date: Mon Jun 13 01:04:00 2011 New Revision: 223029 URL: http://svn.freebsd.org/changeset/base/223029 Log: Apparently makefs needs a few more system headers to compile during buildworld. Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c head/usr.sbin/makefs/ffs/ffs_subr.c Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c == --- head/usr.sbin/makefs/ffs/ffs_bswap.c Mon Jun 13 00:55:29 2011 (r223028) +++ head/usr.sbin/makefs/ffs/ffs_bswap.c Mon Jun 13 01:04:00 2011 (r223029) @@ -35,6 +35,8 @@ __FBSDID($FreeBSD$); #include sys/param.h #include sys/queue.h +#include sys/lock.h +#include sys/lockmgr.h #if defined(_KERNEL) #include sys/systm.h #endif Modified: head/usr.sbin/makefs/ffs/ffs_subr.c == --- head/usr.sbin/makefs/ffs/ffs_subr.c Mon Jun 13 00:55:29 2011 (r223028) +++ head/usr.sbin/makefs/ffs/ffs_subr.c Mon Jun 13 01:04:00 2011 (r223029) @@ -35,6 +35,9 @@ __FBSDID($FreeBSD$); #include sys/param.h +#include sys/queue.h +#include sys/lock.h +#include sys/lockmgr.h #include ufs/ufs/dinode.h #include ufs/ffs/fs.h I suspect it is easier and less controversial to put the structure under #ifdef _KERNEL braces instead. pgp0cy3EPbh0T.pgp Description: PGP signature
svn commit: r223044 - head/sys/sparc64/conf
Author: marius Date: Mon Jun 13 12:45:19 2011 New Revision: 223044 URL: http://svn.freebsd.org/changeset/base/223044 Log: - Merge r222980 from x86: add sound(4) and common device drivers. - Fix whitespace. Modified: head/sys/sparc64/conf/GENERIC Modified: head/sys/sparc64/conf/GENERIC == --- head/sys/sparc64/conf/GENERIC Mon Jun 13 12:23:45 2011 (r223043) +++ head/sys/sparc64/conf/GENERIC Mon Jun 13 12:45:19 2011 (r223044) @@ -61,13 +61,13 @@ options PRINTF_BUFR_SIZE=128# Prevent optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing optionsMAC # TrustedBSD MAC Framework -optionsINCLUDE_CONFIG_FILE # Include this file in kernel +optionsINCLUDE_CONFIG_FILE # Include this file in kernel # Debugging for use in -current optionsKDB # Enable kernel debugger support. optionsDDB # Support DDB. optionsGDB # Support remote GDB. -optionsDEADLKRES # Enable the deadlock resolver +optionsDEADLKRES # Enable the deadlock resolver optionsINVARIANTS # Enable calls of extra sanity checking optionsINVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS optionsWITNESS # Enable checks to detect deadlocks and cycles @@ -266,3 +266,10 @@ device fwe # Ethernet over FireWire (n device fwip# IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver device dcons_crom # Configuration ROM for dcons + +# Sound support +device sound # Generic sound driver (required) +device snd_audiocs # Crystal Semiconductor CS4231 +device snd_es137x # Ensoniq AudioPCI ES137x +device snd_t4dwave # Acer Labs M5451 +device snd_uaudio # USB Audio ___ 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: r223046 - head/sys/pc98/conf
Author: nyan Date: Mon Jun 13 13:24:33 2011 New Revision: 223046 URL: http://svn.freebsd.org/changeset/base/223046 Log: - Reduce diffs against i386. - Add snd_uaudio. Modified: head/sys/pc98/conf/GENERIC Modified: head/sys/pc98/conf/GENERIC == --- head/sys/pc98/conf/GENERIC Mon Jun 13 13:21:12 2011(r223045) +++ head/sys/pc98/conf/GENERIC Mon Jun 13 13:24:33 2011(r223046) @@ -139,12 +139,6 @@ device sc # Add suspend/resume support for the i8254. #devicepmtimer -# Audio support -#devicesound # Generic sound driver -#devicesnd_mss # Microsoft Sound System -#devicesnd_sb16 # Sound Blaster 16 -#devicesnd_sbc # Sound Blaster - # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support device cbb # cardbus (yenta) bridge @@ -288,3 +282,10 @@ device bpf # Berkeley packet filter #devicefirewire# FireWire bus code #devicesbp # SCSI over FireWire (Requires scbus and da) #devicefwe # Ethernet over FireWire (non-standard!) + +# Sound support +#devicesound # Generic sound driver (required) +#devicesnd_mss # Microsoft Sound System +#devicesnd_sb16 # Sound Blaster 16 +#devicesnd_sbc # Sound Blaster +#devicesnd_uaudio # USB Audio ___ 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: r223049 - head/sys/netinet
Author: jhb Date: Mon Jun 13 15:38:31 2011 New Revision: 223049 URL: http://svn.freebsd.org/changeset/base/223049 Log: Advance the advertised window (rcv_adv) to the currently received data (rcv_nxt) if we advertising a zero window. This can be true when ACK'ing a window probe whose one byte payload was accepted rather than dropped because the socket's receive buffer was not completely full, but the remaining space was smaller than the window scale. This ensures that window probe ACKs satisfy the assumption made in r221346 and closes a window where rcv_nxt could be greater than rcv_adv. Tested by:trasz, pho, trociny Reviewed by: silby MFC after:1 week Modified: head/sys/netinet/tcp_output.c Modified: head/sys/netinet/tcp_output.c == --- head/sys/netinet/tcp_output.c Mon Jun 13 13:40:12 2011 (r223048) +++ head/sys/netinet/tcp_output.c Mon Jun 13 15:38:31 2011 (r223049) @@ -1331,7 +1331,7 @@ out: * then remember the size of the advertised window. * Any pending ACK has now been sent. */ - if (recwin 0 SEQ_GT(tp-rcv_nxt + recwin, tp-rcv_adv)) + if (recwin = 0 SEQ_GT(tp-rcv_nxt + recwin, tp-rcv_adv)) tp-rcv_adv = tp-rcv_nxt + recwin; tp-last_ack_sent = tp-rcv_nxt; tp-t_flags = ~(TF_ACKNOW | TF_DELACK); ___ 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: r223050 - stable/8/sys/kern
Author: jh
Date: Mon Jun 13 15:53:56 2011
New Revision: 223050
URL: http://svn.freebsd.org/changeset/base/223050
Log:
MFC r219925:
Recognize ro, rdonly, norw, rw and noro as equal options in
vfs_equalopts(). This allows vfs_sanitizeopts() to filter redundant
occurrences of these options. It was possible that for example both ro
and rw options became active concurrently.
PR: kern/133614
MFC r220040:
Fix some style issues in r219925.
Modified:
stable/8/sys/kern/vfs_mount.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)
Modified: stable/8/sys/kern/vfs_mount.c
==
--- stable/8/sys/kern/vfs_mount.c Mon Jun 13 15:38:31 2011
(r223049)
+++ stable/8/sys/kern/vfs_mount.c Mon Jun 13 15:53:56 2011
(r223050)
@@ -192,6 +192,25 @@ vfs_deleteopt(struct vfsoptlist *opts, c
}
}
+static int
+vfs_isopt_ro(const char *opt)
+{
+
+ if (strcmp(opt, ro) == 0 || strcmp(opt, rdonly) == 0 ||
+ strcmp(opt, norw) == 0)
+ return (1);
+ return (0);
+}
+
+static int
+vfs_isopt_rw(const char *opt)
+{
+
+ if (strcmp(opt, rw) == 0 || strcmp(opt, noro) == 0)
+ return (1);
+ return (0);
+}
+
/*
* Check if options are equal (with or without the no prefix).
*/
@@ -220,6 +239,10 @@ vfs_equalopts(const char *opt1, const ch
if (strncmp(opt2, no, 2) == 0 strcmp(opt1, opt2 + 2) == 0)
return (1);
}
+ /* ro / rdonly / norw / rw / noro */
+ if ((vfs_isopt_ro(opt1) || vfs_isopt_rw(opt1))
+ (vfs_isopt_ro(opt2) || vfs_isopt_rw(opt2)))
+ return (1);
return (0);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r223051 - stable/7/cddl/compat/opensolaris/misc
Author: jh
Date: Mon Jun 13 15:59:21 2011
New Revision: 223051
URL: http://svn.freebsd.org/changeset/base/223051
Log:
MFC r221390: Don't pass empty mount options to nmount(2).
Modified:
stable/7/cddl/compat/opensolaris/misc/zmount.c
Directory Properties:
stable/7/cddl/compat/opensolaris/ (props changed)
Modified: stable/7/cddl/compat/opensolaris/misc/zmount.c
==
--- stable/7/cddl/compat/opensolaris/misc/zmount.c Mon Jun 13 15:53:56
2011(r223050)
+++ stable/7/cddl/compat/opensolaris/misc/zmount.c Mon Jun 13 15:59:21
2011(r223051)
@@ -95,8 +95,10 @@ zmount(const char *spec, const char *dir
build_iovec(iov, iovlen, fspath, __DECONST(char *, dir),
(size_t)-1);
build_iovec(iov, iovlen, from, __DECONST(char *, spec), (size_t)-1);
- for (p = optstr; p != NULL; strsep(p, ,/ ))
- build_iovec(iov, iovlen, p, NULL, (size_t)-1);
+ for (p = optstr; p != NULL; strsep(p, ,/ )) {
+ if (*p != '\0')
+ build_iovec(iov, iovlen, p, NULL, (size_t)-1);
+ }
rv = nmount(iov, iovlen, 0);
free(optstr);
return (rv);
___
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: r223052 - in head: sys/ufs/ffs usr.sbin/makefs/ffs
Author: dim
Date: Mon Jun 13 16:05:41 2011
New Revision: 223052
URL: http://svn.freebsd.org/changeset/base/223052
Log:
Use alternative, less messy solution to avoid breakage after r223020:
put the snapdata structure between #ifdef _KERNEL guards.
Suggested by: kib
Modified:
head/sys/ufs/ffs/ffs_extern.h
head/usr.sbin/makefs/ffs/ffs_bswap.c
head/usr.sbin/makefs/ffs/ffs_subr.c
Modified: head/sys/ufs/ffs/ffs_extern.h
==
--- head/sys/ufs/ffs/ffs_extern.h Mon Jun 13 15:59:21 2011
(r223051)
+++ head/sys/ufs/ffs/ffs_extern.h Mon Jun 13 16:05:41 2011
(r223052)
@@ -166,6 +166,7 @@ voidsoftdep_freework(struct workhead *)
intffs_rdonly(struct inode *);
+#ifdef _KERNEL
TAILQ_HEAD(snaphead, inode);
struct snapdata {
@@ -175,5 +176,6 @@ struct snapdata {
daddr_t *sn_blklist;
struct lock sn_lock;
};
+#endif /* _KERNEL */
#endif /* !_UFS_FFS_EXTERN_H */
Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c
==
--- head/usr.sbin/makefs/ffs/ffs_bswap.cMon Jun 13 15:59:21 2011
(r223051)
+++ head/usr.sbin/makefs/ffs/ffs_bswap.cMon Jun 13 16:05:41 2011
(r223052)
@@ -34,9 +34,6 @@
__FBSDID($FreeBSD$);
#include sys/param.h
-#include sys/queue.h
-#include sys/lock.h
-#include sys/lockmgr.h
#if defined(_KERNEL)
#include sys/systm.h
#endif
Modified: head/usr.sbin/makefs/ffs/ffs_subr.c
==
--- head/usr.sbin/makefs/ffs/ffs_subr.c Mon Jun 13 15:59:21 2011
(r223051)
+++ head/usr.sbin/makefs/ffs/ffs_subr.c Mon Jun 13 16:05:41 2011
(r223052)
@@ -35,9 +35,6 @@
__FBSDID($FreeBSD$);
#include sys/param.h
-#include sys/queue.h
-#include sys/lock.h
-#include sys/lockmgr.h
#include ufs/ufs/dinode.h
#include ufs/ffs/fs.h
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r223054 - in stable/8/sys: fs/nfsclient fs/nwfs fs/smbfs nfsclient vm
Author: kib
Date: Mon Jun 13 19:33:13 2011
New Revision: 223054
URL: http://svn.freebsd.org/changeset/base/223054
Log:
MFC r222586:
Fix an infinite loop in vm_object_page_clean() when the
filesystem returns permanent errors for some page writes.
To accomodate the stable/8 locking requirements, vm page queue lock
is taken around the loop in vnode_pager_undirty_pages() which modifies
m-dirty field.
Reviewed by: alc
Modified:
stable/8/sys/fs/nfsclient/nfs_clbio.c
stable/8/sys/fs/nwfs/nwfs_io.c
stable/8/sys/fs/smbfs/smbfs_io.c
stable/8/sys/nfsclient/nfs_bio.c
stable/8/sys/vm/vm_object.c
stable/8/sys/vm/vnode_pager.c
stable/8/sys/vm/vnode_pager.h
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)
Modified: stable/8/sys/fs/nfsclient/nfs_clbio.c
==
--- stable/8/sys/fs/nfsclient/nfs_clbio.c Mon Jun 13 18:27:09 2011
(r223053)
+++ stable/8/sys/fs/nfsclient/nfs_clbio.c Mon Jun 13 19:33:13 2011
(r223054)
@@ -298,7 +298,7 @@ ncl_putpages(struct vop_putpages_args *a
}
for (i = 0; i npages; i++)
- rtvals[i] = VM_PAGER_AGAIN;
+ rtvals[i] = VM_PAGER_ERROR;
/*
* When putting pages, do not extend file past EOF.
@@ -341,16 +341,9 @@ ncl_putpages(struct vop_putpages_args *a
pmap_qremove(kva, npages);
relpbuf(bp, ncl_pbuf_freecnt);
- if (!error) {
- int nwritten = round_page(count - uio.uio_resid) / PAGE_SIZE;
- for (i = 0; i nwritten; i++) {
- rtvals[i] = VM_PAGER_OK;
- vm_page_undirty(pages[i]);
- }
- if (must_commit) {
- ncl_clearcommit(vp-v_mount);
- }
- }
+ vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid);
+ if (must_commit)
+ ncl_clearcommit(vp-v_mount);
return rtvals[0];
}
Modified: stable/8/sys/fs/nwfs/nwfs_io.c
==
--- stable/8/sys/fs/nwfs/nwfs_io.c Mon Jun 13 18:27:09 2011
(r223053)
+++ stable/8/sys/fs/nwfs/nwfs_io.c Mon Jun 13 19:33:13 2011
(r223054)
@@ -553,7 +553,7 @@ nwfs_putpages(ap)
npages = btoc(count);
for (i = 0; i npages; i++) {
- rtvals[i] = VM_PAGER_AGAIN;
+ rtvals[i] = VM_PAGER_ERROR;
}
bp = getpbuf(nwfs_pbuf_freecnt);
@@ -578,15 +578,8 @@ nwfs_putpages(ap)
pmap_qremove(kva, npages);
relpbuf(bp, nwfs_pbuf_freecnt);
- if (!error) {
- int nwritten = round_page(count - uio.uio_resid) / PAGE_SIZE;
- vm_page_lock_queues();
- for (i = 0; i nwritten; i++) {
- rtvals[i] = VM_PAGER_OK;
- vm_page_undirty(pages[i]);
- }
- vm_page_unlock_queues();
- }
+ if (!error)
+ vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid);
return rtvals[0];
#endif /* NWFS_RWCACHE */
}
Modified: stable/8/sys/fs/smbfs/smbfs_io.c
==
--- stable/8/sys/fs/smbfs/smbfs_io.cMon Jun 13 18:27:09 2011
(r223053)
+++ stable/8/sys/fs/smbfs/smbfs_io.cMon Jun 13 19:33:13 2011
(r223054)
@@ -618,7 +618,7 @@ smbfs_putpages(ap)
npages = btoc(count);
for (i = 0; i npages; i++) {
- rtvals[i] = VM_PAGER_AGAIN;
+ rtvals[i] = VM_PAGER_ERROR;
}
bp = getpbuf(smbfs_pbuf_freecnt);
@@ -648,15 +648,8 @@ smbfs_putpages(ap)
relpbuf(bp, smbfs_pbuf_freecnt);
- if (!error) {
- int nwritten = round_page(count - uio.uio_resid) / PAGE_SIZE;
- vm_page_lock_queues();
- for (i = 0; i nwritten; i++) {
- rtvals[i] = VM_PAGER_OK;
- vm_page_undirty(pages[i]);
- }
- vm_page_unlock_queues();
- }
+if (!error)
+ vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid);
return rtvals[0];
#endif /* SMBFS_RWGENERIC */
}
Modified: stable/8/sys/nfsclient/nfs_bio.c
==
--- stable/8/sys/nfsclient/nfs_bio.cMon Jun 13 18:27:09 2011
(r223053)
+++ stable/8/sys/nfsclient/nfs_bio.cMon Jun 13 19:33:13 2011
(r223054)
@@ -295,7 +295,7 @@ nfs_putpages(struct vop_putpages_args *a
}
for (i = 0; i npages; i++)
- rtvals[i] = VM_PAGER_AGAIN;
+
svn commit: r223055 - stable/8/sys/ufs/ffs
Author: kib
Date: Mon Jun 13 19:40:09 2011
New Revision: 223055
URL: http://svn.freebsd.org/changeset/base/223055
Log:
Cherry-pick a single bit from r222958. Do not pass '3' as the sleepflag
to bufobj_wwait() in the ffs_syncvnode(). It only mangles the priority
argument of msleep().
Discussed with: jeff
Modified:
stable/8/sys/ufs/ffs/ffs_vnops.c
Modified: stable/8/sys/ufs/ffs/ffs_vnops.c
==
--- stable/8/sys/ufs/ffs/ffs_vnops.cMon Jun 13 19:33:13 2011
(r223054)
+++ stable/8/sys/ufs/ffs/ffs_vnops.cMon Jun 13 19:40:09 2011
(r223055)
@@ -322,7 +322,7 @@ loop:
}
if (wait) {
- bufobj_wwait(bo, 3, 0);
+ bufobj_wwait(bo, 0, 0);
BO_UNLOCK(bo);
/*
___
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: r223056 - head/etc/periodic/daily
Author: jpaetzel
Date: Mon Jun 13 19:45:01 2011
New Revision: 223056
URL: http://svn.freebsd.org/changeset/base/223056
Log:
Convert the allowed characters '-', '.', and ':' in a ZFS pool name to _
to avoid causing errors in the shell script.
Submitted by: William Grzybowski willia...@gmail.com
Approved by: kib (mentor)
MFC after:7 days
Sponsored by: iXsystems
Modified:
head/etc/periodic/daily/800.scrub-zfs
Modified: head/etc/periodic/daily/800.scrub-zfs
==
--- head/etc/periodic/daily/800.scrub-zfs Mon Jun 13 19:40:09 2011
(r223055)
+++ head/etc/periodic/daily/800.scrub-zfs Mon Jun 13 19:45:01 2011
(r223056)
@@ -46,7 +46,7 @@ case $daily_scrub_zfs_enable in
esac
# determine how many days shall be between scrubs
- eval _pool_threshold=\${daily_scrub_zfs_${pool}_threshold}
+ eval _pool_threshold=\${daily_scrub_zfs_$(echo ${pool}|tr -s
- _|tr -s . _|tr -s : _)_threshold}
if [ -z ${_pool_threshold} ];then
_pool_threshold=${daily_scrub_zfs_default_threshold}
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r223057 - head/contrib/pf/pfctl
Author: bz
Date: Mon Jun 13 20:11:28 2011
New Revision: 223057
URL: http://svn.freebsd.org/changeset/base/223057
Log:
Add a new option -P to suppress getservbyport(3) calls when printing rules.
This allows one to force consistent printing of numeric port numbers like
we do with -n for other tools like netstat (just that -n was already taken)
rather than the service names.
-P is currently unused in OpenBSD so the change is eligible for upstreaming.
PR: misc/151015
Submitted by: Matt Koivisto (mkoivisto sandvine.com)
Sponsored by: Sandvine Incorporated
MFC after:1 week
Modified:
head/contrib/pf/pfctl/pfctl.8
head/contrib/pf/pfctl/pfctl.c
head/contrib/pf/pfctl/pfctl_optimize.c
head/contrib/pf/pfctl/pfctl_parser.c
head/contrib/pf/pfctl/pfctl_parser.h
Modified: head/contrib/pf/pfctl/pfctl.8
==
--- head/contrib/pf/pfctl/pfctl.8 Mon Jun 13 19:45:01 2011
(r223056)
+++ head/contrib/pf/pfctl/pfctl.8 Mon Jun 13 20:11:28 2011
(r223057)
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD$
.\
-.Dd November 20, 2002
+.Dd June 13, 2011
.Dt PFCTL 8
.Os
.Sh NAME
@@ -35,7 +35,7 @@
.Sh SYNOPSIS
.Nm pfctl
.Bk -words
-.Op Fl AdeghmNnOqRrvz
+.Op Fl AdeghmNnOPqRrvz
.Op Fl a Ar anchor
.Oo Fl D Ar macro Ns =
.Ar value Oc
@@ -350,6 +350,9 @@ without any options will enable
optimizations, and a second
.Fl o
will enable profiling.
+.It Fl P
+Do not perform service name lookup for port specific rules,
+instead display the ports numerically.
.It Fl p Ar device
Use the device file
.Ar device
@@ -670,6 +673,7 @@ Passive operating system fingerprint dat
.Xr pf.conf 5 ,
.Xr pf.os 5 ,
.Xr rc.conf 5 ,
+.Xr services 5 ,
.Xr sysctl.conf 5 ,
.Xr authpf 8 ,
.Xr ftp-proxy 8 ,
Modified: head/contrib/pf/pfctl/pfctl.c
==
--- head/contrib/pf/pfctl/pfctl.c Mon Jun 13 19:45:01 2011
(r223056)
+++ head/contrib/pf/pfctl/pfctl.c Mon Jun 13 20:11:28 2011
(r223057)
@@ -235,7 +235,7 @@ usage(void)
{
extern char *__progname;
- fprintf(stderr, usage: %s [-AdeghmNnOqRrvz] , __progname);
+ fprintf(stderr, usage: %s [-AdeghmNnOPqRrvz] , __progname);
fprintf(stderr, [-a anchor] [-D macro=value] [-F modifier]\n);
fprintf(stderr, \t[-f file] [-i interface] [-K host | network] );
fprintf(stderr, [-k host | network ]\n);
@@ -770,6 +770,7 @@ pfctl_show_rules(int dev, char *path, in
struct pfioc_rule pr;
u_int32_t nr, mnr, header = 0;
int rule_numbers = opts (PF_OPT_VERBOSE2 | PF_OPT_DEBUG);
+ int numeric = opts PF_OPT_NUMERIC;
int len = strlen(path);
int brace;
char *p;
@@ -834,7 +835,7 @@ pfctl_show_rules(int dev, char *path, in
case PFCTL_SHOW_RULES:
if (pr.rule.label[0] (opts PF_OPT_SHOWALL))
labels = 1;
- print_rule(pr.rule, pr.anchor_call, rule_numbers);
+ print_rule(pr.rule, pr.anchor_call, rule_numbers,
numeric);
printf(\n);
pfctl_print_rule_counters(pr.rule, opts);
break;
@@ -894,7 +895,7 @@ pfctl_show_rules(int dev, char *path, in
} else
p = pr.anchor_call[0];
- print_rule(pr.rule, p, rule_numbers);
+ print_rule(pr.rule, p, rule_numbers, numeric);
if (brace)
printf( {\n);
else
@@ -951,7 +952,7 @@ pfctl_show_nat(int dev, int opts, char *
dotitle = 0;
}
print_rule(pr.rule, pr.anchor_call,
- opts PF_OPT_VERBOSE2);
+ opts PF_OPT_VERBOSE2, opts PF_OPT_NUMERIC);
printf(\n);
pfctl_print_rule_counters(pr.rule, opts);
pfctl_clear_pool(pr.rule.rpool);
@@ -1318,7 +1319,8 @@ pfctl_load_rule(struct pfctl *pf, char *
if (pf-opts PF_OPT_VERBOSE) {
INDENT(depth, !(pf-opts PF_OPT_VERBOSE2));
print_rule(r, r-anchor ? r-anchor-name : ,
- pf-opts PF_OPT_VERBOSE2);
+ pf-opts PF_OPT_VERBOSE2,
+ pf-opts PF_OPT_NUMERIC);
}
path[len] = '\0';
pfctl_clear_pool(r-rpool);
@@ -1978,7 +1980,7 @@ main(int argc, char *argv[])
usage();
while ((ch = getopt(argc, argv,
- a:AdD:eqf:F:ghi:k:K:mnNOo::p:rRs:t:T:vx:z)) != -1) {
+ a:AdD:eqf:F:ghi:k:K:mnNOo::Pp:rRs:t:T:vx:z)) != -1) {
switch (ch) {
case 'a':
anchoropt = optarg;
@@ -2080,6
Re: svn commit: r223056 - head/etc/periodic/daily
On Mon, Jun 13, 2011 at 12:45 PM, Josh Paetzel jpaet...@freebsd.org wrote: Author: jpaetzel Date: Mon Jun 13 19:45:01 2011 New Revision: 223056 URL: http://svn.freebsd.org/changeset/base/223056 Log: Convert the allowed characters '-', '.', and ':' in a ZFS pool name to _ to avoid causing errors in the shell script. This could be done like: sed -E -e 's/[-\.:]/_/g' to avoid the need for pipelining multiple tr calls. Example: $ echo :-. | sed -E -e 's/[-\.:]/_/g' ___ $ ___ 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: r223058 - head/sys/dev/sound/pci/hda
Author: mav
Date: Mon Jun 13 20:34:12 2011
New Revision: 223058
URL: http://svn.freebsd.org/changeset/base/223058
Log:
Add bunch of Conexant codec IDs. For some of them add quirks to disable
excessive signal paths to simplify tracer's life.
Modified:
head/sys/dev/sound/pci/hda/hdac.c
Modified: head/sys/dev/sound/pci/hda/hdac.c
==
--- head/sys/dev/sound/pci/hda/hdac.c Mon Jun 13 20:11:28 2011
(r223057)
+++ head/sys/dev/sound/pci/hda/hdac.c Mon Jun 13 20:34:12 2011
(r223058)
@@ -754,7 +754,17 @@ static const struct {
#define HDA_CODEC_CX20561 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5051)
#define HDA_CODEC_CX20582 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5066)
#define HDA_CODEC_CX20583 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5067)
+#define HDA_CODEC_CX20584 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5068)
#define HDA_CODEC_CX20585 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5069)
+#define HDA_CODEC_CX20590 HDA_CODEC_CONSTRUCT(CONEXANT, 0x506e)
+#define HDA_CODEC_CX20631 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5097)
+#define HDA_CODEC_CX20632 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5098)
+#define HDA_CODEC_CX20641 HDA_CODEC_CONSTRUCT(CONEXANT, 0x50a1)
+#define HDA_CODEC_CX20642 HDA_CODEC_CONSTRUCT(CONEXANT, 0x50a2)
+#define HDA_CODEC_CX20651 HDA_CODEC_CONSTRUCT(CONEXANT, 0x50ab)
+#define HDA_CODEC_CX20652 HDA_CODEC_CONSTRUCT(CONEXANT, 0x50ac)
+#define HDA_CODEC_CX20664 HDA_CODEC_CONSTRUCT(CONEXANT, 0x50b8)
+#define HDA_CODEC_CX20665 HDA_CODEC_CONSTRUCT(CONEXANT, 0x50b9)
#define HDA_CODEC_CX HDA_CODEC_CONSTRUCT(CONEXANT, 0x)
/* VIA */
@@ -939,7 +949,17 @@ static const struct {
{ HDA_CODEC_CX20561, Conexant CX20561 (Hermosa) },
{ HDA_CODEC_CX20582, Conexant CX20582 (Pebble) },
{ HDA_CODEC_CX20583, Conexant CX20583 (Pebble HSF) },
+ { HDA_CODEC_CX20584, Conexant CX20584 },
{ HDA_CODEC_CX20585, Conexant CX20585 },
+ { HDA_CODEC_CX20590, Conexant CX20590 },
+ { HDA_CODEC_CX20631, Conexant CX20631 },
+ { HDA_CODEC_CX20632, Conexant CX20632 },
+ { HDA_CODEC_CX20641, Conexant CX20641 },
+ { HDA_CODEC_CX20642, Conexant CX20642 },
+ { HDA_CODEC_CX20651, Conexant CX20651 },
+ { HDA_CODEC_CX20652, Conexant CX20652 },
+ { HDA_CODEC_CX20664, Conexant CX20664 },
+ { HDA_CODEC_CX20665, Conexant CX20665 },
{ HDA_CODEC_VT1708_8, VIA VT1708_8 },
{ HDA_CODEC_VT1708_9, VIA VT1708_9 },
{ HDA_CODEC_VT1708_A, VIA VT1708_A },
@@ -4921,6 +4941,25 @@ hdac_vendor_patch_parse(struct hdac_devi
if (w != NULL)
w-connsenable[0] = 0;
break;
+ case HDA_CODEC_CX20582:
+ case HDA_CODEC_CX20583:
+ case HDA_CODEC_CX20584:
+ case HDA_CODEC_CX20585:
+ case HDA_CODEC_CX20590:
+ /*
+* These codecs have extra connectivity on record side
+* too reach for the present parser.
+*/
+ w = hdac_widget_get(devinfo, 20);
+ if (w != NULL)
+ w-connsenable[1] = 0;
+ w = hdac_widget_get(devinfo, 21);
+ if (w != NULL)
+ w-connsenable[1] = 0;
+ w = hdac_widget_get(devinfo, 22);
+ if (w != NULL)
+ w-connsenable[0] = 0;
+ break;
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r223059 - head/sys/dev/xen/blkback
Author: gibbs
Date: Mon Jun 13 20:36:29 2011
New Revision: 223059
URL: http://svn.freebsd.org/changeset/base/223059
Log:
Several enhancements to the Xen block back driver.
sys/dev/xen/blkback/blkback.c:
o Implement front-end request coalescing. This greatly improves the
performance of front-end clients that are unaware of the dynamic
request-size/number of requests negotiation available in the
FreeBSD backend driver. This required a large restructuring
in how this driver records in-flight transactions and how those
transactions are mapped into kernel KVA. For example, the driver
now includes a mini KVA manager that allocates ranges of
contiguous KVA to patches of requests that are physically
contiguous in the backing store so that a single bio or UIO
segment can be used to represent the I/O.
o Refuse to open any backend files or devices if the system
has yet to mount root. This avoids a panic.
o Properly handle onlined devices. An onlined backend
device stays attached to its backing store across front-end
disconnections. This feature is intended to reduce latency
when a front-end does a hand-off to another driver (e.g.
PV aware bootloader to OS kernel) or during a VM reboot.
o Harden the driver against a pathological/buggy front-end
by carefully vetting front-end XenStore data such as the
front-end state.
o Add sysctls that report the negotiated number of
segments per-request and the number of requests that
can be concurrently in flight.
Submitted by: kdm
Reviewed by: gibbs
Sponsored by: Spectra Logic Corporation
MFC after:1 week
Modified:
head/sys/dev/xen/blkback/blkback.c
Modified: head/sys/dev/xen/blkback/blkback.c
==
--- head/sys/dev/xen/blkback/blkback.c Mon Jun 13 20:34:12 2011
(r223058)
+++ head/sys/dev/xen/blkback/blkback.c Mon Jun 13 20:36:29 2011
(r223059)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2009-2010 Spectra Logic Corporation
+ * Copyright (c) 2009-2011 Spectra Logic Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,8 @@ __FBSDID($FreeBSD$);
#include sys/types.h
#include sys/vnode.h
#include sys/mount.h
+#include sys/sysctl.h
+#include sys/bitstring.h
#include geom/geom.h
@@ -153,9 +155,19 @@ MALLOC_DEFINE(M_XENBLOCKBACK, xbbd, X
#defineXBB_MAX_RING_PAGES
\
BLKIF_RING_PAGES(BLKIF_SEGS_TO_BLOCKS(XBB_MAX_SEGMENTS_PER_REQUEST) \
* XBB_MAX_REQUESTS)
+/**
+ * The maximum number of ring pages that we can allow per request list.
+ * We limit this to the maximum number of segments per request, because
+ * that is already a reasonable number of segments to aggregate. This
+ * number should never be smaller than XBB_MAX_SEGMENTS_PER_REQUEST,
+ * because that would leave situations where we can't dispatch even one
+ * large request.
+ */
+#defineXBB_MAX_SEGMENTS_PER_REQLIST XBB_MAX_SEGMENTS_PER_REQUEST
/*--- Forward Declarations
---*/
struct xbb_softc;
+struct xbb_xen_req;
static void xbb_attach_failed(struct xbb_softc *xbb, int err, const char *fmt,
...) __attribute__((format(printf, 3, 4)));
@@ -163,16 +175,15 @@ static int xbb_shutdown(struct xbb_soft
static int xbb_detach(device_t dev);
/*-- Data Structures
-*/
-/**
- * \brief Object tracking an in-flight I/O from a Xen VBD consumer.
- */
-struct xbb_xen_req {
- /**
-* Linked list links used to aggregate idle request in the
-* request free pool (xbb-request_free_slist).
-*/
- SLIST_ENTRY(xbb_xen_req) links;
+STAILQ_HEAD(xbb_xen_req_list, xbb_xen_req);
+
+typedef enum {
+ XBB_REQLIST_NONE= 0x00,
+ XBB_REQLIST_MAPPED = 0x01
+} xbb_reqlist_flags;
+
+struct xbb_xen_reqlist {
/**
* Back reference to the parent block back instance for this
* request. Used during bio_done handling.
@@ -180,17 +191,71 @@ struct xbb_xen_req {
struct xbb_softc*xbb;
/**
-* The remote domain's identifier for this I/O request.
+* BLKIF_OP code for this request.
+*/
+ int operation;
+
+ /**
+* Set to BLKIF_RSP_* to indicate request status.
+*
+* This field allows an error status to be recorded even if the
+* delivery of this status must be deferred. Deferred reporting
+* is necessary, for example, when an error is detected during
+* completion processing of one bio when other bios
svn commit: r223060 - in head/bin/sh: . bltin
Author: jilles
Date: Mon Jun 13 21:03:27 2011
New Revision: 223060
URL: http://svn.freebsd.org/changeset/base/223060
Log:
sh: Fix duplicate prototypes for builtins.
Have mkbuiltins write the prototypes for the *cmd functions to builtins.h
instead of builtins.c and include builtins.h in more .c files instead of
duplicating prototypes for *cmd functions in other headers.
Modified:
head/bin/sh/alias.c
head/bin/sh/alias.h
head/bin/sh/arith.h
head/bin/sh/bltin/bltin.h
head/bin/sh/cd.c
head/bin/sh/cd.h
head/bin/sh/eval.h
head/bin/sh/exec.h
head/bin/sh/expand.c
head/bin/sh/expand.h
head/bin/sh/histedit.c
head/bin/sh/jobs.c
head/bin/sh/jobs.h
head/bin/sh/main.c
head/bin/sh/main.h
head/bin/sh/mkbuiltins
head/bin/sh/myhistedit.h
head/bin/sh/options.c
head/bin/sh/options.h
head/bin/sh/trap.c
head/bin/sh/trap.h
head/bin/sh/var.c
head/bin/sh/var.h
Modified: head/bin/sh/alias.c
==
--- head/bin/sh/alias.c Mon Jun 13 20:36:29 2011(r223059)
+++ head/bin/sh/alias.c Mon Jun 13 21:03:27 2011(r223060)
@@ -46,6 +46,7 @@ __FBSDID($FreeBSD$);
#include mystring.h
#include alias.h
#include options.h /* XXX for argptr (should remove?) */
+#include builtins.h
#define ATABSIZE 39
Modified: head/bin/sh/alias.h
==
--- head/bin/sh/alias.h Mon Jun 13 20:36:29 2011(r223059)
+++ head/bin/sh/alias.h Mon Jun 13 21:03:27 2011(r223060)
@@ -43,5 +43,3 @@ struct alias {
};
struct alias *lookupalias(const char *, int);
-int aliascmd(int, char **);
-int unaliascmd(int, char **);
Modified: head/bin/sh/arith.h
==
--- head/bin/sh/arith.h Mon Jun 13 20:36:29 2011(r223059)
+++ head/bin/sh/arith.h Mon Jun 13 21:03:27 2011(r223060)
@@ -36,4 +36,3 @@
arith_t arith(const char *);
void arith_lex_reset(void);
-int expcmd(int, char **);
Modified: head/bin/sh/bltin/bltin.h
==
--- head/bin/sh/bltin/bltin.h Mon Jun 13 20:36:29 2011(r223059)
+++ head/bin/sh/bltin/bltin.h Mon Jun 13 21:03:27 2011(r223060)
@@ -43,6 +43,7 @@
#include ../mystring.h
#ifdef SHELL
#include ../output.h
+#include builtins.h
#define FILE struct output
#undef stdout
#define stdout out1
@@ -75,7 +76,4 @@ pointer stalloc(int);
void error(const char *, ...) __printf0like(1, 2);
pid_t getjobpgrp(char *);
-int echocmd(int, char **);
-int testcmd(int, char **);
-
extern char *commandname;
Modified: head/bin/sh/cd.c
==
--- head/bin/sh/cd.cMon Jun 13 20:36:29 2011(r223059)
+++ head/bin/sh/cd.cMon Jun 13 21:03:27 2011(r223060)
@@ -63,6 +63,7 @@ __FBSDID($FreeBSD$);
#include mystring.h
#include show.h
#include cd.h
+#include builtins.h
static int cdlogical(char *);
static int cdphysical(char *);
Modified: head/bin/sh/cd.h
==
--- head/bin/sh/cd.hMon Jun 13 20:36:29 2011(r223059)
+++ head/bin/sh/cd.hMon Jun 13 21:03:27 2011(r223060)
@@ -30,5 +30,3 @@
*/
voidpwd_init(int);
-int cdcmd (int, char **);
-int pwdcmd(int, char **);
Modified: head/bin/sh/eval.h
==
--- head/bin/sh/eval.h Mon Jun 13 20:36:29 2011(r223059)
+++ head/bin/sh/eval.h Mon Jun 13 21:03:27 2011(r223060)
@@ -51,19 +51,10 @@ struct backcmd {/* result of evalbackc
#define EV_TESTED 02 /* exit status is checked; ignore -e flag */
#define EV_BACKCMD 04 /* command executing within back quotes */
-int evalcmd(int, char **);
void evalstring(char *, int);
union node;/* BLETCH for ansi C */
void evaltree(union node *, int);
void evalbackcmd(union node *, struct backcmd *);
-int bltincmd(int, char **);
-int breakcmd(int, char **);
-int returncmd(int, char **);
-int falsecmd(int, char **);
-int truecmd(int, char **);
-int execcmd(int, char **);
-int timescmd(int, char **);
-int commandcmd(int, char **);
/* in_function returns nonzero if we are currently evaluating a function */
#define in_function() funcnest
Modified: head/bin/sh/exec.h
==
--- head/bin/sh/exec.h Mon Jun 13 20:36:29 2011(r223059)
+++ head/bin/sh/exec.h Mon Jun 13 21:03:27 2011(r223060)
@@ -66,7 +66,6 @@ extern int exerrno; /* last exec error
void shellexec(char **, char **, const char *, int) __dead2;
char *padvance(const char **, const char *);
-int hashcmd(int, char **);
void find_command(const char *, struct cmdentry *, int, const char *);
int
svn commit: r223061 - head/sys/kern
Author: gibbs
Date: Mon Jun 13 21:21:02 2011
New Revision: 223061
URL: http://svn.freebsd.org/changeset/base/223061
Log:
Fix a couple of race conditions in devstat(9) initialization.
In devstat_new_entry(), there is no need to initialize the queue
and the mutex in this function. There are ways to do static
initialization on both, so use STAILQ_HEAD_INITIALIZER and
MTX_SYSINIT to initialize the queue and the mutex.
In devstat_alloc(), use an atomic test and set routine to guard
making our entry in /dev. Using just a plain static variable
creates a race condition on multiprocessor machines. If you
attempt to create a second entry in devfs, the kernel will panic.
Submitted by: kdm
Reviewed by: gibbs
Sponsored by: Spectra Logic Corporation
MFC after:1 week.
Modified:
head/sys/kern/subr_devstat.c
Modified: head/sys/kern/subr_devstat.c
==
--- head/sys/kern/subr_devstat.cMon Jun 13 21:03:27 2011
(r223060)
+++ head/sys/kern/subr_devstat.cMon Jun 13 21:21:02 2011
(r223061)
@@ -49,8 +49,9 @@ static long devstat_generation = 1;
static int devstat_version = DEVSTAT_VERSION;
static int devstat_current_devnumber;
static struct mtx devstat_mutex;
+MTX_SYSINIT(devstat_mutex, devstat_mutex, devstat, MTX_DEF);
-static struct devstatlist device_statq;
+static struct devstatlist device_statq = STAILQ_HEAD_INITIALIZER(device_statq);
static struct devstat *devstat_alloc(void);
static void devstat_free(struct devstat *);
static void devstat_add_entry(struct devstat *ds, const void *dev_name,
@@ -70,13 +71,7 @@ devstat_new_entry(const void *dev_name,
devstat_priority priority)
{
struct devstat *ds;
- static int once;
- if (!once) {
- STAILQ_INIT(device_statq);
- mtx_init(devstat_mutex, devstat, NULL, MTX_DEF);
- once = 1;
- }
mtx_assert(devstat_mutex, MA_NOTOWNED);
ds = devstat_alloc();
@@ -475,10 +470,9 @@ devstat_alloc(void)
static int once;
mtx_assert(devstat_mutex, MA_NOTOWNED);
- if (!once) {
+ if (!once atomic_cmpset_int(once, 0, 1)) {
make_dev_credf(MAKEDEV_ETERNAL, devstat_cdevsw, 0, NULL,
UID_ROOT, GID_WHEEL, 0400, DEVSTAT_DEVICE_NAME);
- once = 1;
}
spp2 = NULL;
mtx_lock(devstat_mutex);
___
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: r223061 - head/sys/kern
On Mon, Jun 13, 2011 at 09:21:02PM +, Justin T. Gibbs wrote: Author: gibbs Date: Mon Jun 13 21:21:02 2011 New Revision: 223061 URL: http://svn.freebsd.org/changeset/base/223061 Log: Fix a couple of race conditions in devstat(9) initialization. In devstat_new_entry(), there is no need to initialize the queue and the mutex in this function. There are ways to do static initialization on both, so use STAILQ_HEAD_INITIALIZER and MTX_SYSINIT to initialize the queue and the mutex. In devstat_alloc(), use an atomic test and set routine to guard making our entry in /dev. Using just a plain static variable creates a race condition on multiprocessor machines. If you attempt to create a second entry in devfs, the kernel will panic. Devfs returns an error if MAKEDEV_CHECKNAME flag is supplied and attempt is made to create the existing node. The static guard is still useful, since make_dev() call is costly, but you can remove the atomic, since the race should be of limited scope. pgp7NTBL2jlKg.pgp Description: PGP signature
svn commit: r223062 - head/sys/kern
Author: ken
Date: Mon Jun 13 22:08:24 2011
New Revision: 223062
URL: http://svn.freebsd.org/changeset/base/223062
Log:
Instead of using an atomic operation to determine whether the devstat(9)
device node has been created, pass MAKEDEV_CHECKNAME in so that the devfs
code will do the check.
Use a regular static variable as before, that's good enough to keep us from
calling into devfs most of the time.
Suggested by: kib
MFC after:1 week
Sponsored by: Spectra Logic Corporation
Modified:
head/sys/kern/subr_devstat.c
Modified: head/sys/kern/subr_devstat.c
==
--- head/sys/kern/subr_devstat.cMon Jun 13 21:21:02 2011
(r223061)
+++ head/sys/kern/subr_devstat.cMon Jun 13 22:08:24 2011
(r223062)
@@ -470,9 +470,11 @@ devstat_alloc(void)
static int once;
mtx_assert(devstat_mutex, MA_NOTOWNED);
- if (!once atomic_cmpset_int(once, 0, 1)) {
- make_dev_credf(MAKEDEV_ETERNAL, devstat_cdevsw, 0, NULL,
- UID_ROOT, GID_WHEEL, 0400, DEVSTAT_DEVICE_NAME);
+ if (!once) {
+ make_dev_credf(MAKEDEV_ETERNAL | MAKEDEV_CHECKNAME,
+ devstat_cdevsw, 0, NULL, UID_ROOT, GID_WHEEL, 0400,
+ DEVSTAT_DEVICE_NAME);
+ once = 1;
}
spp2 = NULL;
mtx_lock(devstat_mutex);
___
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: r223061 - head/sys/kern
On Tue, Jun 14, 2011 at 00:31:50 +0300, Kostik Belousov wrote: On Mon, Jun 13, 2011 at 09:21:02PM +, Justin T. Gibbs wrote: Author: gibbs Date: Mon Jun 13 21:21:02 2011 New Revision: 223061 URL: http://svn.freebsd.org/changeset/base/223061 Log: Fix a couple of race conditions in devstat(9) initialization. In devstat_new_entry(), there is no need to initialize the queue and the mutex in this function. There are ways to do static initialization on both, so use STAILQ_HEAD_INITIALIZER and MTX_SYSINIT to initialize the queue and the mutex. In devstat_alloc(), use an atomic test and set routine to guard making our entry in /dev. Using just a plain static variable creates a race condition on multiprocessor machines. If you attempt to create a second entry in devfs, the kernel will panic. Devfs returns an error if MAKEDEV_CHECKNAME flag is supplied and attempt is made to create the existing node. The static guard is still useful, since make_dev() call is costly, but you can remove the atomic, since the race should be of limited scope. Done, thanks for the suggestion! Ken -- Kenneth Merry k...@freebsd.org ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r223063 - in vendor/sendmail/dist: . cf/cf cf/feature cf/m4 cf/ostype contrib devtools/OS doc/op include/sm libmilter libmilter/docs libsm makemap src
Author: gshapiro Date: Tue Jun 14 03:55:17 2011 New Revision: 223063 URL: http://svn.freebsd.org/changeset/base/223063 Log: Import sendmail 8.14.5 Added: vendor/sendmail/dist/cf/ostype/solaris11.m4 (contents, props changed) vendor/sendmail/dist/devtools/OS/Darwin.10.x (contents, props changed) Modified: vendor/sendmail/dist/CACerts vendor/sendmail/dist/KNOWNBUGS vendor/sendmail/dist/LICENSE vendor/sendmail/dist/PGPKEYS vendor/sendmail/dist/RELEASE_NOTES vendor/sendmail/dist/cf/cf/generic-bsd4.4.cf vendor/sendmail/dist/cf/cf/generic-hpux10.cf vendor/sendmail/dist/cf/cf/generic-hpux9.cf vendor/sendmail/dist/cf/cf/generic-linux.cf vendor/sendmail/dist/cf/cf/generic-mpeix.cf vendor/sendmail/dist/cf/cf/generic-nextstep3.3.cf vendor/sendmail/dist/cf/cf/generic-osf1.cf vendor/sendmail/dist/cf/cf/generic-solaris.cf vendor/sendmail/dist/cf/cf/generic-sunos4.1.cf vendor/sendmail/dist/cf/cf/generic-ultrix4.cf vendor/sendmail/dist/cf/cf/submit.cf vendor/sendmail/dist/cf/feature/ldap_routing.m4 vendor/sendmail/dist/cf/m4/cfhead.m4 vendor/sendmail/dist/cf/m4/proto.m4 vendor/sendmail/dist/cf/m4/version.m4 vendor/sendmail/dist/contrib/qtool.pl vendor/sendmail/dist/doc/op/op.me vendor/sendmail/dist/doc/op/op.ps vendor/sendmail/dist/include/sm/conf.h vendor/sendmail/dist/libmilter/docs/overview.html vendor/sendmail/dist/libmilter/docs/smfi_stop.html vendor/sendmail/dist/libmilter/docs/xxfi_envrcpt.html vendor/sendmail/dist/libmilter/engine.c vendor/sendmail/dist/libmilter/sm_gethost.c vendor/sendmail/dist/libmilter/worker.c vendor/sendmail/dist/libsm/ldap.c vendor/sendmail/dist/makemap/makemap.c vendor/sendmail/dist/src/Makefile.m4 vendor/sendmail/dist/src/conf.c vendor/sendmail/dist/src/daemon.c vendor/sendmail/dist/src/deliver.c vendor/sendmail/dist/src/domain.c vendor/sendmail/dist/src/envelope.c vendor/sendmail/dist/src/err.c vendor/sendmail/dist/src/main.c vendor/sendmail/dist/src/map.c vendor/sendmail/dist/src/mci.c vendor/sendmail/dist/src/parseaddr.c vendor/sendmail/dist/src/queue.c vendor/sendmail/dist/src/readcf.c vendor/sendmail/dist/src/sendmail.0 vendor/sendmail/dist/src/sendmail.8 vendor/sendmail/dist/src/sendmail.h vendor/sendmail/dist/src/sm_resolve.c vendor/sendmail/dist/src/srvrsmtp.c vendor/sendmail/dist/src/tls.c vendor/sendmail/dist/src/udb.c vendor/sendmail/dist/src/usersmtp.c vendor/sendmail/dist/src/version.c Modified: vendor/sendmail/dist/CACerts == --- vendor/sendmail/dist/CACertsMon Jun 13 22:08:24 2011 (r223062) +++ vendor/sendmail/dist/CACertsTue Jun 14 03:55:17 2011 (r223063) @@ -1,4 +1,4 @@ -# $Id: CACerts,v 8.4 2009/06/26 05:46:10 ca Exp $ +# $Id: CACerts,v 8.5 2011/05/06 23:05:10 ca Exp $ # This file contains some CA certificates that are used to sign the # certificates of mail servers of members of the sendmail consortium # who may reply to questions etc sent to sendmail.org. @@ -9,73 +9,6 @@ Certificate: Data: Version: 3 (0x2) -Serial Number: 0 (0x0) -Signature Algorithm: md5WithRSAEncryption -Issuer: C=US, ST=Illinois, L=De Kalb, O=Northern Illinois University, OU=Computer Science, CN=Neil Rickert/emailAddress=rick...@cs.niu.edu -Validity -Not Before: May 12 00:40:50 2000 GMT -Not After : May 20 00:40:50 2010 GMT -Subject: C=US, ST=Illinois, L=De Kalb, O=Northern Illinois University, OU=Computer Science, CN=Neil Rickert/emailAddress=rick...@cs.niu.edu -Subject Public Key Info: -Public Key Algorithm: rsaEncryption -RSA Public Key: (1024 bit) -Modulus (1024 bit): -00:b1:1b:49:06:ef:3f:44:e0:93:ad:8c:a7:f7:21: -7c:87:cb:da:35:f6:4b:a2:fd:8a:a0:07:5b:cc:6a: -9b:89:33:fc:24:f5:b1:24:59:5a:25:50:fd:16:d7: -d4:bc:c7:04:1d:df:90:9b:5e:c3:a8:e9:8b:7d:a3: -5d:9a:e9:7f:e5:2b:ea:15:a7:ad:ba:58:26:0a:11: -49:4f:da:9a:67:7f:b0:a6:66:f4:27:b6:61:4e:3c: -c8:3e:a0:2f:6a:b4:0e:15:d6:39:f8:92:60:85:df: -a6:34:f3:fa:a4:a5:e4:47:49:e7:87:a4:a5:5c:8e: -6a:2f:13:76:5f:29:f3:64:73 -Exponent: 65537 (0x10001) -X509v3 extensions: -X509v3 Subject Key Identifier: -B6:31:78:BB:7E:AA:4D:A1:5D:FD:A2:24:18:C6:90:5A:2D:2F:19:48 -X509v3 Authority Key Identifier: -keyid:B6:31:78:BB:7E:AA:4D:A1:5D:FD:A2:24:18:C6:90:5A:2D:2F:19:48 -DirName:/C=US/ST=Illinois/L=De Kalb/O=Northern Illinois University/OU=Computer Science/CN=Neil Rickert/emailAddress=rick...@cs.niu.edu -serial:00 - -X509v3 Basic Constraints: -CA:TRUE -Signature Algorithm: md5WithRSAEncryption -
svn commit: r223064 - vendor/sendmail/dist/src
Author: gshapiro Date: Tue Jun 14 03:59:08 2011 New Revision: 223064 URL: http://svn.freebsd.org/changeset/base/223064 Log: Import errata patch as published at http://www.sendmail.com/sm/open_source/download/8.14.5/ Modified: vendor/sendmail/dist/src/sendmail.h Modified: vendor/sendmail/dist/src/sendmail.h == --- vendor/sendmail/dist/src/sendmail.h Tue Jun 14 03:55:17 2011 (r223063) +++ vendor/sendmail/dist/src/sendmail.h Tue Jun 14 03:59:08 2011 (r223064) @@ -721,9 +721,9 @@ MCI #if STARTTLS #define MCIF_TLS 0x0010 /* STARTTLS supported */ #define MCIF_TLSACT0x0020 /* STARTTLS active */ -#define MCIF_EXTENS(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS) #else /* STARTTLS */ -#define MCIF_EXTENS(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT) +#define MCIF_TLS 0 +#define MCIF_TLSACT0 #endif /* STARTTLS */ #define MCIF_DLVR_BY 0x0040 /* DELIVERBY */ #if _FFR_IGNORE_EXT_ON_HELO @@ -733,6 +733,8 @@ MCI #define MCIF_AUTH2 0x0200 /* got 2 AUTH lines */ #define MCIF_ONLY_EHLO 0x1000 /* use only EHLO in smtpinit */ +#define MCIF_EXTENS(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2) + /* states */ #define MCIS_CLOSED0 /* no traffic on this connection */ #define MCIS_OPENING 1 /* sending initial protocol */ ___ 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: r223065 - vendor/sendmail/8.14.5
Author: gshapiro Date: Tue Jun 14 04:02:30 2011 New Revision: 223065 URL: http://svn.freebsd.org/changeset/base/223065 Log: Tag sendmail 8.14.5 Added: vendor/sendmail/8.14.5/ - copied from r223064, vendor/sendmail/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r223066 - stable/8/sys/dev/cxgbe
Author: np
Date: Tue Jun 14 04:20:17 2011
New Revision: 223066
URL: http://svn.freebsd.org/changeset/base/223066
Log:
MFC r222973:
- driver ioctl to get SGE context for any given queue
- sysctls to display the context id, cidx, and pidx of all kinds of queues.
Modified:
stable/8/sys/dev/cxgbe/adapter.h
stable/8/sys/dev/cxgbe/t4_ioctl.h
stable/8/sys/dev/cxgbe/t4_main.c
stable/8/sys/dev/cxgbe/t4_sge.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)
Modified: stable/8/sys/dev/cxgbe/adapter.h
==
--- stable/8/sys/dev/cxgbe/adapter.hTue Jun 14 04:02:30 2011
(r223065)
+++ stable/8/sys/dev/cxgbe/adapter.hTue Jun 14 04:20:17 2011
(r223066)
@@ -307,7 +307,7 @@ struct sge_eq {
uint16_t pidx; /* producer idx (desc idx) */
uint16_t pending; /* # of descriptors used since last doorbell */
uint16_t iqid; /* iq that gets egr_update for the eq */
- uint32_t cntxt_id; /* SGE context id for the eq */
+ unsigned int cntxt_id; /* SGE context id for the eq */
};
struct sge_fl {
Modified: stable/8/sys/dev/cxgbe/t4_ioctl.h
==
--- stable/8/sys/dev/cxgbe/t4_ioctl.h Tue Jun 14 04:02:30 2011
(r223065)
+++ stable/8/sys/dev/cxgbe/t4_ioctl.h Tue Jun 14 04:20:17 2011
(r223066)
@@ -46,6 +46,7 @@ enum {
T4_GET_FILTER, /* get information about a filter */
T4_SET_FILTER, /* program a filter */
T4_DEL_FILTER, /* delete a filter */
+ T4_GET_SGE_CONTEXT, /* get SGE context for a queue */
};
struct t4_reg {
@@ -184,6 +185,20 @@ struct t4_filter {
struct t4_filter_specification fs;
};
+#define T4_SGE_CONTEXT_SIZE 24
+enum {
+ SGE_CONTEXT_EGRESS,
+ SGE_CONTEXT_INGRESS,
+ SGE_CONTEXT_FLM,
+ SGE_CONTEXT_CNM
+};
+
+struct t4_sge_context {
+ uint32_t mem_id;
+ uint32_t cid;
+ uint32_t data[T4_SGE_CONTEXT_SIZE / 4];
+};
+
#define CHELSIO_T4_GETREG _IOWR('f', T4_GETREG, struct t4_reg)
#define CHELSIO_T4_SETREG _IOW('f', T4_SETREG, struct t4_reg)
#define CHELSIO_T4_REGDUMP _IOWR('f', T4_REGDUMP, struct t4_regdump)
@@ -192,4 +207,6 @@ struct t4_filter {
#define CHELSIO_T4_GET_FILTER _IOWR('f', T4_GET_FILTER, struct t4_filter)
#define CHELSIO_T4_SET_FILTER _IOW('f', T4_SET_FILTER, struct t4_filter)
#define CHELSIO_T4_DEL_FILTER _IOW('f', T4_DEL_FILTER, struct t4_filter)
+#define CHELSIO_T4_GET_SGE_CONTEXT _IOWR('f', T4_GET_SGE_CONTEXT, \
+struct t4_sge_context)
#endif
Modified: stable/8/sys/dev/cxgbe/t4_main.c
==
--- stable/8/sys/dev/cxgbe/t4_main.cTue Jun 14 04:02:30 2011
(r223065)
+++ stable/8/sys/dev/cxgbe/t4_main.cTue Jun 14 04:20:17 2011
(r223066)
@@ -315,6 +315,7 @@ static void clear_filter(struct filter_e
static int set_filter_wr(struct adapter *, int);
static int del_filter_wr(struct adapter *, int);
void filter_rpl(struct adapter *, const struct cpl_set_tcb_rpl *);
+static int get_sge_context(struct adapter *, struct t4_sge_context *);
static int t4_mod_event(module_t, int, void *);
struct t4_pciids {
@@ -3423,6 +3424,35 @@ filter_rpl(struct adapter *sc, const str
}
}
+static int
+get_sge_context(struct adapter *sc, struct t4_sge_context *cntxt)
+{
+ int rc = EINVAL;
+
+ if (cntxt-cid M_CTXTQID)
+ return (rc);
+
+ if (cntxt-mem_id != CTXT_EGRESS cntxt-mem_id != CTXT_INGRESS
+ cntxt-mem_id != CTXT_FLM cntxt-mem_id != CTXT_CNM)
+ return (rc);
+
+ if (sc-flags FW_OK) {
+ ADAPTER_LOCK(sc); /* Avoid parallel t4_wr_mbox */
+ rc = -t4_sge_ctxt_rd(sc, sc-mbox, cntxt-cid, cntxt-mem_id,
+ cntxt-data[0]);
+ ADAPTER_UNLOCK(sc);
+ }
+
+ if (rc != 0) {
+ /* Read via firmware failed or wasn't even attempted */
+
+ rc = -t4_sge_ctxt_rd_bd(sc, cntxt-cid, cntxt-mem_id,
+ cntxt-data[0]);
+ }
+
+ return (rc);
+}
+
int
t4_os_find_pci_capability(struct adapter *sc, int cap)
{
@@ -3586,6 +3616,9 @@ t4_ioctl(struct cdev *dev, unsigned long
rc = del_filter(sc, (struct t4_filter *)data);
ADAPTER_UNLOCK(sc);
break;
+ case CHELSIO_T4_GET_SGE_CONTEXT:
+ rc = get_sge_context(sc, (struct t4_sge_context *)data);
+ break;
default:
rc = EINVAL;
}
Modified:
svn commit: r223067 - in head/contrib/sendmail: . cf/cf cf/feature cf/m4 cf/ostype contrib doc/op include/sm libmilter libmilter/docs libsm makemap src
Author: gshapiro Date: Tue Jun 14 04:20:18 2011 New Revision: 223067 URL: http://svn.freebsd.org/changeset/base/223067 Log: Merge sendmail 8.14.5 to HEAD MFC after:4 days Added: - copied unchanged from r223065, vendor/sendmail/dist/cf/ostype/solaris11.m4 Directory Properties: head/contrib/sendmail/cf/ostype/solaris11.m4 (props changed) Modified: head/contrib/sendmail/CACerts head/contrib/sendmail/KNOWNBUGS head/contrib/sendmail/LICENSE head/contrib/sendmail/PGPKEYS head/contrib/sendmail/RELEASE_NOTES head/contrib/sendmail/cf/cf/submit.cf head/contrib/sendmail/cf/feature/ldap_routing.m4 head/contrib/sendmail/cf/m4/cfhead.m4 head/contrib/sendmail/cf/m4/proto.m4 head/contrib/sendmail/cf/m4/version.m4 head/contrib/sendmail/contrib/qtool.pl head/contrib/sendmail/doc/op/op.me head/contrib/sendmail/include/sm/conf.h head/contrib/sendmail/libmilter/docs/overview.html head/contrib/sendmail/libmilter/docs/smfi_stop.html head/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html head/contrib/sendmail/libmilter/engine.c head/contrib/sendmail/libmilter/sm_gethost.c head/contrib/sendmail/libmilter/worker.c head/contrib/sendmail/libsm/ldap.c head/contrib/sendmail/makemap/makemap.c head/contrib/sendmail/src/Makefile.m4 head/contrib/sendmail/src/conf.c head/contrib/sendmail/src/daemon.c head/contrib/sendmail/src/deliver.c head/contrib/sendmail/src/domain.c head/contrib/sendmail/src/envelope.c head/contrib/sendmail/src/err.c head/contrib/sendmail/src/main.c head/contrib/sendmail/src/map.c head/contrib/sendmail/src/mci.c head/contrib/sendmail/src/parseaddr.c head/contrib/sendmail/src/queue.c head/contrib/sendmail/src/readcf.c head/contrib/sendmail/src/sendmail.8 head/contrib/sendmail/src/sendmail.h head/contrib/sendmail/src/sm_resolve.c head/contrib/sendmail/src/srvrsmtp.c head/contrib/sendmail/src/tls.c head/contrib/sendmail/src/udb.c head/contrib/sendmail/src/usersmtp.c head/contrib/sendmail/src/version.c Directory Properties: head/contrib/sendmail/ (props changed) Modified: head/contrib/sendmail/CACerts == --- head/contrib/sendmail/CACerts Tue Jun 14 04:20:17 2011 (r223066) +++ head/contrib/sendmail/CACerts Tue Jun 14 04:20:18 2011 (r223067) @@ -1,4 +1,4 @@ -# $Id: CACerts,v 8.4 2009/06/26 05:46:10 ca Exp $ +# $Id: CACerts,v 8.5 2011/05/06 23:05:10 ca Exp $ # This file contains some CA certificates that are used to sign the # certificates of mail servers of members of the sendmail consortium # who may reply to questions etc sent to sendmail.org. @@ -9,73 +9,6 @@ Certificate: Data: Version: 3 (0x2) -Serial Number: 0 (0x0) -Signature Algorithm: md5WithRSAEncryption -Issuer: C=US, ST=Illinois, L=De Kalb, O=Northern Illinois University, OU=Computer Science, CN=Neil Rickert/emailAddress=rick...@cs.niu.edu -Validity -Not Before: May 12 00:40:50 2000 GMT -Not After : May 20 00:40:50 2010 GMT -Subject: C=US, ST=Illinois, L=De Kalb, O=Northern Illinois University, OU=Computer Science, CN=Neil Rickert/emailAddress=rick...@cs.niu.edu -Subject Public Key Info: -Public Key Algorithm: rsaEncryption -RSA Public Key: (1024 bit) -Modulus (1024 bit): -00:b1:1b:49:06:ef:3f:44:e0:93:ad:8c:a7:f7:21: -7c:87:cb:da:35:f6:4b:a2:fd:8a:a0:07:5b:cc:6a: -9b:89:33:fc:24:f5:b1:24:59:5a:25:50:fd:16:d7: -d4:bc:c7:04:1d:df:90:9b:5e:c3:a8:e9:8b:7d:a3: -5d:9a:e9:7f:e5:2b:ea:15:a7:ad:ba:58:26:0a:11: -49:4f:da:9a:67:7f:b0:a6:66:f4:27:b6:61:4e:3c: -c8:3e:a0:2f:6a:b4:0e:15:d6:39:f8:92:60:85:df: -a6:34:f3:fa:a4:a5:e4:47:49:e7:87:a4:a5:5c:8e: -6a:2f:13:76:5f:29:f3:64:73 -Exponent: 65537 (0x10001) -X509v3 extensions: -X509v3 Subject Key Identifier: -B6:31:78:BB:7E:AA:4D:A1:5D:FD:A2:24:18:C6:90:5A:2D:2F:19:48 -X509v3 Authority Key Identifier: -keyid:B6:31:78:BB:7E:AA:4D:A1:5D:FD:A2:24:18:C6:90:5A:2D:2F:19:48 -DirName:/C=US/ST=Illinois/L=De Kalb/O=Northern Illinois University/OU=Computer Science/CN=Neil Rickert/emailAddress=rick...@cs.niu.edu -serial:00 - -X509v3 Basic Constraints: -CA:TRUE -Signature Algorithm: md5WithRSAEncryption -60:69:23:65:97:51:5c:06:a4:42:cb:00:e7:9a:dc:39:70:c3: -d3:5d:bf:0f:e0:04:54:4d:d9:dc:12:57:12:6c:67:fd:5b:b0: -39:63:ea:c4:12:65:51:bb:3d:f1:f7:25:b4:cd:0b:f6:5b:7a: -61:25:ad:06:0a:01:55:dc:71:05:29:0d:73:e9:30:51:be:d3: -e1:b2:89:fc:0f:28:f7:06:75:96:1b:34:75:e0:07:e5:3b:b3: -0b:28:24:e5:79:ea:55:39:e7:d2:ee:ec:63:b4:e4:c6:ee:cb: -
svn commit: r223068 - head/etc/sendmail
Author: gshapiro
Date: Tue Jun 14 04:33:43 2011
New Revision: 223068
URL: http://svn.freebsd.org/changeset/base/223068
Log:
Update DNSBL information (MAPS has been acquired, used a generic example)
Modified:
head/etc/sendmail/freebsd.mc
Modified: head/etc/sendmail/freebsd.mc
==
--- head/etc/sendmail/freebsd.mcTue Jun 14 04:20:18 2011
(r223067)
+++ head/etc/sendmail/freebsd.mcTue Jun 14 04:33:43 2011
(r223068)
@@ -66,12 +66,10 @@ dnl so this file will not serve as a dat
dnl For that, visit
dnl http://www.google.com/Top/Computers/Internet/E-mail/Spam/Blacklists/
-dnl Uncomment to activate Realtime Blackhole List
-dnl information available at http://www.mail-abuse.com/
-dnl NOTE: This is a subscription service as of July 31, 2001
-dnl FEATURE(dnsbl)
+dnl Uncomment to activate your chosen DNS based blacklist
+dnl FEATURE(dnsbl, `dnsbl.example.com')
dnl Alternatively, you can provide your own server and rejection message:
-dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', ``550 Mail from
${client_addr} rejected, see http://mail-abuse.org/cgi-bin/lookup?;
${client_addr}'')
+dnl FEATURE(dnsbl, `dnsbl.example.com', ``550 Mail from ${client_addr}
rejected'')
dnl Dialup users should uncomment and define this appropriately
dnl define(`SMART_HOST', `your.isp.mail.server')
___
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: r223069 - head/etc/sendmail
Author: gshapiro Date: Tue Jun 14 04:34:20 2011 New Revision: 223069 URL: http://svn.freebsd.org/changeset/base/223069 Log: Minor change to force commit this file so new freebsd*.cf files are built to use the new sendmail-8.14.5/cf tree. MFC after:4 days Modified: head/etc/sendmail/freebsd.submit.mc Modified: head/etc/sendmail/freebsd.submit.mc == --- head/etc/sendmail/freebsd.submit.mc Tue Jun 14 04:33:43 2011 (r223068) +++ head/etc/sendmail/freebsd.submit.mc Tue Jun 14 04:34:20 2011 (r223069) @@ -25,4 +25,3 @@ define(`confBIND_OPTS', `WorkAroundBroke dnl dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1] FEATURE(`msp', `[127.0.0.1]')dnl - ___ 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: r223070 - in stable/8: sbin/ipfw sys/netinet/ipfw
Author: ae
Date: Tue Jun 14 04:37:09 2011
New Revision: 223070
URL: http://svn.freebsd.org/changeset/base/223070
Log:
MFC r222473:
Add tablearg support for ipfw setfib.
PR: kern/156410
MFC r222474:
Wrap long line.
Modified:
stable/8/sbin/ipfw/ipfw.8
stable/8/sbin/ipfw/ipfw2.c
stable/8/sys/netinet/ipfw/ip_fw2.c
stable/8/sys/netinet/ipfw/ip_fw_sockopt.c
Directory Properties:
stable/8/sbin/ipfw/ (props changed)
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)
Modified: stable/8/sbin/ipfw/ipfw.8
==
--- stable/8/sbin/ipfw/ipfw.8 Tue Jun 14 04:34:20 2011(r223069)
+++ stable/8/sbin/ipfw/ipfw.8 Tue Jun 14 04:37:09 2011(r223070)
@@ -1,7 +1,7 @@
.\
.\ $FreeBSD$
.\
-.Dd July 27, 2010
+.Dd May 30, 2011
.Dt IPFW 8
.Os
.Sh NAME
@@ -867,13 +867,16 @@ for more information on
and
.Cm ngtee
actions.
-.It Cm setfib Ar fibnum
+.It Cm setfib Ar fibnum | tablearg
The packet is tagged so as to use the FIB (routing table)
.Ar fibnum
in any subsequent forwarding decisions.
Initially this is limited to the values 0 through 15, see
.Xr setfib 1 .
Processing continues at the next rule.
+It is possible to use the
+.Cm tablearg
+keyword with a setfib. If tablearg value is not within compiled FIB range
packet fib is set to 0.
.It Cm reass
Queue and reassemble ip fragments.
If the packet is not fragmented, counters are updated and processing continues
with the next rule.
@@ -1697,7 +1700,7 @@ is used.
The
.Cm tablearg
argument can be used with the following actions:
-.Cm nat, pipe , queue, divert, tee, netgraph, ngtee, fwd, skipto
+.Cm nat, pipe , queue, divert, tee, netgraph, ngtee, fwd, skipto, setfib,
action parameters:
.Cm tag, untag,
rule options:
Modified: stable/8/sbin/ipfw/ipfw2.c
==
--- stable/8/sbin/ipfw/ipfw2.c Tue Jun 14 04:34:20 2011(r223069)
+++ stable/8/sbin/ipfw/ipfw2.c Tue Jun 14 04:37:09 2011(r223070)
@@ -2826,14 +2826,19 @@ chkarg:
size_t intsize = sizeof(int);
action-opcode = O_SETFIB;
- NEED1(missing fib number);
- action-arg1 = strtoul(*av, NULL, 10);
- if (sysctlbyname(net.fibs, numfibs, intsize, NULL, 0) == -1)
- errx(EX_DATAERR, fibs not suported.\n);
- if (action-arg1 = numfibs) /* Temporary */
- errx(EX_DATAERR, fib too large.\n);
- av++;
- break;
+ NEED1(missing fib number);
+ if (_substrcmp(*av, tablearg) == 0) {
+ action-arg1 = IP_FW_TABLEARG;
+ } else {
+ action-arg1 = strtoul(*av, NULL, 10);
+ if (sysctlbyname(net.fibs, numfibs, intsize,
+ NULL, 0) == -1)
+ errx(EX_DATAERR, fibs not suported.\n);
+ if (action-arg1 = numfibs) /* Temporary */
+ errx(EX_DATAERR, fib too large.\n);
+ }
+ av++;
+ break;
}
case TOK_REASS:
Modified: stable/8/sys/netinet/ipfw/ip_fw2.c
==
--- stable/8/sys/netinet/ipfw/ip_fw2.c Tue Jun 14 04:34:20 2011
(r223069)
+++ stable/8/sys/netinet/ipfw/ip_fw2.c Tue Jun 14 04:37:09 2011
(r223070)
@@ -2101,14 +2101,21 @@ do {
\
done = 1; /* exit outer loop */
break;
- case O_SETFIB:
+ case O_SETFIB: {
+ uint32_t fib;
+
f-pcnt++; /* update stats */
f-bcnt += pktlen;
f-timestamp = time_uptime;
- M_SETFIB(m, cmd-arg1);
- args-f_id.fib = cmd-arg1;
+ fib = (cmd-arg1 == IP_FW_TABLEARG) ? tablearg:
+ cmd-arg1;
+ if (fib = rt_numfibs)
+ fib = 0;
+ M_SETFIB(m, fib);
+ args-f_id.fib = fib;
l = 0; /* exit inner loop */
break;
+ }
case O_NAT:
if (!IPFW_NAT_LOADED) {
Modified: stable/8/sys/netinet/ipfw/ip_fw_sockopt.c
