svn commit: r192297 - head/sys/dev/nge
Author: yongari
Date: Mon May 18 07:04:03 2009
New Revision: 192297
URL: http://svn.freebsd.org/changeset/base/192297
Log:
style(9)
Modified:
head/sys/dev/nge/if_nge.c
Modified: head/sys/dev/nge/if_nge.c
==
--- head/sys/dev/nge/if_nge.c Mon May 18 06:54:53 2009(r192296)
+++ head/sys/dev/nge/if_nge.c Mon May 18 07:04:03 2009(r192297)
@@ -246,7 +246,7 @@ DRIVER_MODULE(miibus, nge, miibus_driver
static void
nge_delay(struct nge_softc *sc)
{
- int idx;
+ int idx;
for (idx = (300 / 33) + 1; idx > 0; idx--)
CSR_READ_4(sc, NGE_CSR);
@@ -255,7 +255,7 @@ nge_delay(struct nge_softc *sc)
static void
nge_eeprom_idle(struct nge_softc *sc)
{
- int i;
+ int i;
SIO_SET(NGE_MEAR_EE_CSEL);
nge_delay(sc);
@@ -282,7 +282,7 @@ nge_eeprom_idle(struct nge_softc *sc)
static void
nge_eeprom_putbyte(struct nge_softc *sc, int addr)
{
- int d, i;
+ int d, i;
d = addr | NGE_EECMD_READ;
@@ -309,8 +309,8 @@ nge_eeprom_putbyte(struct nge_softc *sc,
static void
nge_eeprom_getword(struct nge_softc *sc, int addr, uint16_t *dest)
{
- int i;
- uint16_tword = 0;
+ int i;
+ uint16_t word = 0;
/* Force EEPROM to idle state. */
nge_eeprom_idle(sc);
@@ -352,8 +352,8 @@ nge_eeprom_getword(struct nge_softc *sc,
static void
nge_read_eeprom(struct nge_softc *sc, caddr_t dest, int off, int cnt, int swap)
{
- int i;
- uint16_tword = 0, *ptr;
+ int i;
+ uint16_t word = 0, *ptr;
for (i = 0; i < cnt; i++) {
nge_eeprom_getword(sc, off + i, &word);
@@ -371,7 +371,7 @@ nge_read_eeprom(struct nge_softc *sc, ca
static void
nge_mii_sync(struct nge_softc *sc)
{
- int i;
+ int i;
SIO_SET(NGE_MEAR_MII_DIR|NGE_MEAR_MII_DATA);
@@ -389,7 +389,7 @@ nge_mii_sync(struct nge_softc *sc)
static void
nge_mii_send(struct nge_softc *sc, uint32_t bits, int cnt)
{
- int i;
+ int i;
SIO_CLR(NGE_MEAR_MII_CLK);
@@ -412,7 +412,7 @@ nge_mii_send(struct nge_softc *sc, uint3
static int
nge_mii_readreg(struct nge_softc *sc, struct nge_mii_frame *frame)
{
- int i, ack;
+ int i, ack;
/*
* Set up frame for RX.
@@ -538,8 +538,8 @@ nge_mii_writereg(struct nge_softc *sc, s
static int
nge_miibus_readreg(device_t dev, int phy, int reg)
{
- struct nge_softc*sc;
- struct nge_mii_frameframe;
+ struct nge_softc *sc;
+ struct nge_mii_frame frame;
sc = device_get_softc(dev);
@@ -555,8 +555,8 @@ nge_miibus_readreg(device_t dev, int phy
static int
nge_miibus_writereg(device_t dev, int phy, int reg, int data)
{
- struct nge_softc*sc;
- struct nge_mii_frameframe;
+ struct nge_softc *sc;
+ struct nge_mii_frame frame;
sc = device_get_softc(dev);
@@ -573,9 +573,9 @@ nge_miibus_writereg(device_t dev, int ph
static void
nge_miibus_statchg(device_t dev)
{
- int status;
- struct nge_softc*sc;
- struct mii_data *mii;
+ int status;
+ struct nge_softc *sc;
+ struct mii_data *mii;
sc = device_get_softc(dev);
if (sc->nge_tbi) {
@@ -628,10 +628,10 @@ nge_miibus_statchg(device_t dev)
static void
nge_setmulti(struct nge_softc *sc)
{
- struct ifnet*ifp;
- struct ifmultiaddr *ifma;
- uint32_th = 0, i, filtsave;
- int bit, index;
+ struct ifnet *ifp;
+ struct ifmultiaddr *ifma;
+ uint32_t h = 0, i, filtsave;
+ int bit, index;
NGE_LOCK_ASSERT(sc);
ifp = sc->nge_ifp;
@@ -687,7 +687,7 @@ nge_setmulti(struct nge_softc *sc)
static void
nge_reset(struct nge_softc *sc)
{
- int i;
+ int i;
NGE_SETBIT(sc, NGE_CSR, NGE_CSR_RESET);
@@ -717,7 +717,7 @@ nge_reset(struct nge_softc *sc)
static int
nge_probe(device_t dev)
{
- struct nge_type *t;
+ struct nge_type *t;
t = nge_devs;
@@ -740,10 +740,10 @@ nge_probe(device_t dev)
static int
nge_attach(device_t dev)
{
- u_char eaddr[ETHER_ADDR_LEN];
- struct nge_softc*sc;
- struct ifnet*ifp = NULL;
- int error = 0, rid;
+ u_char eaddr[ETHER_ADDR_LEN];
+ struct nge_softc *sc;
+ struct ifnet *ifp = NULL;
+ int error = 0, rid;
sc = device_get_softc(dev);
sc->nge_dev = dev;
@@ -892,8 +892,8 @@ fail:
static int
nge_detach(device_t dev)
{
- struct nge_softc*sc;
- struct ifnet*if
svn commit: r192298 - head/sys/dev/nge
Author: yongari
Date: Mon May 18 07:10:48 2009
New Revision: 192298
URL: http://svn.freebsd.org/changeset/base/192298
Log:
Consistently use tab characters instead of spaces.
Modified:
head/sys/dev/nge/if_nge.c
head/sys/dev/nge/if_ngereg.h
Modified: head/sys/dev/nge/if_nge.c
==
--- head/sys/dev/nge/if_nge.c Mon May 18 07:04:03 2009(r192297)
+++ head/sys/dev/nge/if_nge.c Mon May 18 07:10:48 2009(r192298)
@@ -394,11 +394,11 @@ nge_mii_send(struct nge_softc *sc, uint3
SIO_CLR(NGE_MEAR_MII_CLK);
for (i = (0x1 << (cnt - 1)); i; i >>= 1) {
-if (bits & i) {
+ if (bits & i) {
SIO_SET(NGE_MEAR_MII_DATA);
-} else {
+ } else {
SIO_CLR(NGE_MEAR_MII_DATA);
-}
+ }
DELAY(1);
SIO_CLR(NGE_MEAR_MII_CLK);
DELAY(1);
@@ -1028,8 +1028,8 @@ nge_newbuf(struct nge_softc *sc, struct
static __inline void
nge_fixup_rx(struct mbuf *m)
{
-int i;
-uint16_t *src, *dst;
+ int i;
+ uint16_t *src, *dst;
src = mtod(m, uint16_t *);
dst = src - 1;
@@ -1050,8 +1050,8 @@ nge_fixup_rx(struct mbuf *m)
static void
nge_rxeof(struct nge_softc *sc)
{
-struct mbuf *m;
-struct ifnet *ifp;
+ struct mbuf *m;
+ struct ifnet *ifp;
struct nge_desc *cur_rx;
int i, total_len = 0;
uint32_t rxstat;
Modified: head/sys/dev/nge/if_ngereg.h
==
--- head/sys/dev/nge/if_ngereg.hMon May 18 07:04:03 2009
(r192297)
+++ head/sys/dev/nge/if_ngereg.hMon May 18 07:10:48 2009
(r192298)
@@ -481,15 +481,15 @@ struct nge_desc_64 {
#define nge_txstat nge_cmdsts
#define nge_ctlnge_cmdsts
volatile uint32_t nge_extsts;
-/* Driver software section */
-union {
-struct mbuf *nge_mbuf;
-uint64_tnge_dummy;
-} nge_mb_u;
-union {
-struct nge_desc_32 *nge_nextdesc;
-uint64_tnge_dummy;
-} nge_nd_u;
+ /* Driver software section */
+ union {
+ struct mbuf *nge_mbuf;
+ uint64_tnge_dummy;
+ } nge_mb_u;
+ union {
+ struct nge_desc_32 *nge_nextdesc;
+ uint64_tnge_dummy;
+ } nge_nd_u;
};
struct nge_desc_32 {
@@ -501,15 +501,15 @@ struct nge_desc_32 {
#define nge_txstat nge_cmdsts
#define nge_ctlnge_cmdsts
volatile uint32_t nge_extsts;
-/* Driver software section */
-union {
-struct mbuf *nge_mbuf;
-uint64_tnge_dummy;
-} nge_mb_u;
-union {
-struct nge_desc_32 *nge_nextdesc;
-uint64_tnge_dummy;
-} nge_nd_u;
+ /* Driver software section */
+ union {
+ struct mbuf *nge_mbuf;
+ uint64_tnge_dummy;
+ } nge_mb_u;
+ union {
+ struct nge_desc_32 *nge_nextdesc;
+ uint64_tnge_dummy;
+ } nge_nd_u;
};
#define nge_mbufnge_mb_u.nge_mbuf
___
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: r192299 - head/sys/dev/nge
Author: yongari
Date: Mon May 18 07:13:42 2009
New Revision: 192299
URL: http://svn.freebsd.org/changeset/base/192299
Log:
Remove extra parenthesis used in macros. These macros are not used
in driver, though.
Modified:
head/sys/dev/nge/if_ngereg.h
Modified: head/sys/dev/nge/if_ngereg.h
==
--- head/sys/dev/nge/if_ngereg.hMon May 18 07:10:48 2009
(r192298)
+++ head/sys/dev/nge/if_ngereg.hMon May 18 07:13:42 2009
(r192299)
@@ -525,8 +525,8 @@ struct nge_desc_32 {
#define NGE_CMDSTS_MORE0x4000
#define NGE_CMDSTS_OWN 0x8000
-#define NGE_LASTDESC(x)(!((x)->nge_ctl & NGE_CMDSTS_MORE)))
-#define NGE_MORE(x)((x)->nge_ctl & NGE_CMDSTS_MORE))
+#define NGE_LASTDESC(x)(!((x)->nge_ctl & NGE_CMDSTS_MORE))
+#define NGE_MORE(x)((x)->nge_ctl & NGE_CMDSTS_MORE)
#define NGE_OWNDESC(x) ((x)->nge_ctl & NGE_CMDSTS_OWN)
#define NGE_INC(x, y) (x) = (x + 1) % y
#define NGE_RXBYTES(x) ((x)->nge_ctl & NGE_CMDSTS_BUFLEN)
___
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: r192300 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb kern vm
Author: alc
Date: Mon May 18 07:24:06 2009
New Revision: 192300
URL: http://svn.freebsd.org/changeset/base/192300
Log:
MFC r180308
Enable the creation of a kmem map larger than 4GB.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/kern/kern_malloc.c
stable/7/sys/vm/vm_kern.h
Modified: stable/7/sys/kern/kern_malloc.c
==
--- stable/7/sys/kern/kern_malloc.c Mon May 18 07:13:42 2009
(r192299)
+++ stable/7/sys/kern/kern_malloc.c Mon May 18 07:24:06 2009
(r192300)
@@ -181,19 +181,19 @@ struct {
*/
static uma_zone_t mt_zone;
-u_int vm_kmem_size;
-SYSCTL_UINT(_vm, OID_AUTO, kmem_size, CTLFLAG_RD, &vm_kmem_size, 0,
+u_long vm_kmem_size;
+SYSCTL_ULONG(_vm, OID_AUTO, kmem_size, CTLFLAG_RD, &vm_kmem_size, 0,
"Size of kernel memory");
-u_int vm_kmem_size_min;
-SYSCTL_UINT(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RD, &vm_kmem_size_min, 0,
+static u_long vm_kmem_size_min;
+SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RD, &vm_kmem_size_min, 0,
"Minimum size of kernel memory");
-u_int vm_kmem_size_max;
-SYSCTL_UINT(_vm, OID_AUTO, kmem_size_max, CTLFLAG_RD, &vm_kmem_size_max, 0,
+static u_long vm_kmem_size_max;
+SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_max, CTLFLAG_RD, &vm_kmem_size_max, 0,
"Maximum size of kernel memory");
-u_int vm_kmem_size_scale;
+static u_int vm_kmem_size_scale;
SYSCTL_UINT(_vm, OID_AUTO, kmem_size_scale, CTLFLAG_RD, &vm_kmem_size_scale, 0,
"Scale factor for kernel memory size");
@@ -589,7 +589,7 @@ kmeminit(void *dummy)
#if defined(VM_KMEM_SIZE_MIN)
vm_kmem_size_min = VM_KMEM_SIZE_MIN;
#endif
- TUNABLE_INT_FETCH("vm.kmem_size_min", &vm_kmem_size_min);
+ TUNABLE_ULONG_FETCH("vm.kmem_size_min", &vm_kmem_size_min);
if (vm_kmem_size_min > 0 && vm_kmem_size < vm_kmem_size_min) {
vm_kmem_size = vm_kmem_size_min;
}
@@ -597,16 +597,16 @@ kmeminit(void *dummy)
#if defined(VM_KMEM_SIZE_MAX)
vm_kmem_size_max = VM_KMEM_SIZE_MAX;
#endif
- TUNABLE_INT_FETCH("vm.kmem_size_max", &vm_kmem_size_max);
+ TUNABLE_ULONG_FETCH("vm.kmem_size_max", &vm_kmem_size_max);
if (vm_kmem_size_max > 0 && vm_kmem_size >= vm_kmem_size_max)
vm_kmem_size = vm_kmem_size_max;
/* Allow final override from the kernel environment */
#ifndef BURN_BRIDGES
- if (TUNABLE_INT_FETCH("kern.vm.kmem.size", &vm_kmem_size) != 0)
+ if (TUNABLE_ULONG_FETCH("kern.vm.kmem.size", &vm_kmem_size) != 0)
printf("kern.vm.kmem.size is now called vm.kmem_size!\n");
#endif
- TUNABLE_INT_FETCH("vm.kmem_size", &vm_kmem_size);
+ TUNABLE_ULONG_FETCH("vm.kmem_size", &vm_kmem_size);
/*
* Limit kmem virtual size to twice the physical memory.
Modified: stable/7/sys/vm/vm_kern.h
==
--- stable/7/sys/vm/vm_kern.h Mon May 18 07:13:42 2009(r192299)
+++ stable/7/sys/vm/vm_kern.h Mon May 18 07:24:06 2009(r192300)
@@ -69,6 +69,6 @@ extern vm_map_t kernel_map;
extern vm_map_t kmem_map;
extern vm_map_t exec_map;
extern vm_map_t pipe_map;
-extern u_int vm_kmem_size;
+extern u_long vm_kmem_size;
#endif /* _VM_VM_KERN_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"
Re: svn commit: r192098 - in stable/6: gnu/usr.bin/gdb/libgdb lib/libthr/thread lib/libthread_db lib/libthread_db/arch/alpha lib/libthread_db/arch/amd64 lib/libthread_db/arch/i386 lib/libthread_db/arc
On Thu, 14 May 2009, Attilio Rao wrote:
Author: attilio
Date: Thu May 14 13:36:39 2009
New Revision: 192098
URL: http://svn.freebsd.org/changeset/base/192098
Log:
MFC libthread_db modifies until r181651:
- Introduce and use new functions pthread_{read, write}_*
- Move psaddr_t from void * to uintptr_t
- Fix some ABI mismatches
- Introduce WARN 6 for compilation
The 6-STABLE amd64 build has been broken for four days now. Please fix, or
back out this change.
Robert N M Watson
Computer Laboratory
University of Cambridge
Added:
stable/6/lib/libthread_db/libc_r_db.h (contents, props changed)
Modified:
stable/6/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
stable/6/lib/libthr/thread/thr_event.c
stable/6/lib/libthread_db/Makefile
stable/6/lib/libthread_db/arch/alpha/libc_r_md.c
stable/6/lib/libthread_db/arch/alpha/libpthread_md.c
stable/6/lib/libthread_db/arch/amd64/libc_r_md.c
stable/6/lib/libthread_db/arch/amd64/libpthread_md.c
stable/6/lib/libthread_db/arch/i386/libc_r_md.c
stable/6/lib/libthread_db/arch/i386/libpthread_md.c
stable/6/lib/libthread_db/arch/ia64/libc_r_md.c
stable/6/lib/libthread_db/arch/ia64/libpthread_md.c
stable/6/lib/libthread_db/arch/sparc64/libc_r_md.c
stable/6/lib/libthread_db/arch/sparc64/libpthread_md.c
stable/6/lib/libthread_db/libc_r_db.c
stable/6/lib/libthread_db/libpthread_db.c
stable/6/lib/libthread_db/libpthread_db.h
stable/6/lib/libthread_db/libthr_db.c
stable/6/lib/libthread_db/thread_db.c
stable/6/lib/libthread_db/thread_db.h
stable/6/lib/libthread_db/thread_db_int.h
stable/6/sys/sys/procfs.h
Modified: stable/6/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
==
--- stable/6/gnu/usr.bin/gdb/libgdb/fbsd-threads.c Thu May 14 13:32:33
2009(r192097)
+++ stable/6/gnu/usr.bin/gdb/libgdb/fbsd-threads.c Thu May 14 13:36:39
2009(r192098)
@@ -710,7 +710,7 @@ check_event (ptid_t ptid)
error ("Cannot get thread event message: %s",
thread_db_err_str (err));
}
- err = td_thr_get_info_p (msg.th_p, &ti);
+ err = td_thr_get_info_p ((void*)(uintptr_t)msg.th_p, &ti);
if (err != TD_OK)
error ("Cannot get thread info: %s", thread_db_err_str (err));
ptid = BUILD_THREAD (ti.ti_tid, GET_PID (ptid));
@@ -720,7 +720,7 @@ check_event (ptid_t ptid)
/* We may already know about this thread, for instance when the
user has issued the `info threads' command before the SIGTRAP
for hitting the thread creation breakpoint was reported. */
- attach_thread (ptid, msg.th_p, &ti, 1);
+ attach_thread (ptid, (void *)(uintptr_t)msg.th_p, &ti, 1);
break;
case TD_DEATH:
if (!in_thread_list (ptid))
@@ -1178,13 +1178,14 @@ fbsd_thread_pid_to_str (ptid_t ptid)
if (ti.ti_lid != 0)
{
- snprintf (buf, sizeof (buf), "Thread %p (LWP %d)",
-th.th_thread, ti.ti_lid);
+ snprintf (buf, sizeof (buf), "Thread %llx (LWP %d)",
+(unsigned long long)th.th_thread, ti.ti_lid);
}
else
{
- snprintf (buf, sizeof (buf), "Thread %p (%s)",
-th.th_thread, thread_db_state_str (ti.ti_state));
+ snprintf (buf, sizeof (buf), "Thread %llx (%s)",
+(unsigned long long)th.th_thread,
+thread_db_state_str (ti.ti_state));
}
return buf;
Modified: stable/6/lib/libthr/thread/thr_event.c
==
--- stable/6/lib/libthr/thread/thr_event.c Thu May 14 13:32:33 2009
(r192097)
+++ stable/6/lib/libthr/thread/thr_event.c Thu May 14 13:36:39 2009
(r192098)
@@ -42,7 +42,7 @@ void
_thr_report_creation(struct pthread *curthread, struct pthread *newthread)
{
curthread->event_buf.event = TD_CREATE;
- curthread->event_buf.th_p = (td_thrhandle_t *)newthread;
+ curthread->event_buf.th_p = (uintptr_t)newthread;
curthread->event_buf.data = 0;
THR_UMTX_LOCK(curthread, &_thr_event_lock);
_thread_last_event = curthread;
@@ -55,7 +55,7 @@ void
_thr_report_death(struct pthread *curthread)
{
curthread->event_buf.event = TD_DEATH;
- curthread->event_buf.th_p = (td_thrhandle_t *)curthread;
+ curthread->event_buf.th_p = (uintptr_t)curthread;
curthread->event_buf.data = 0;
THR_UMTX_LOCK(curthread, &_thr_event_lock);
_thread_last_event = curthread;
Modified: stable/6/lib/libthread_db/Makefile
==
--- stable/6/lib/libthread_db/Makefile Thu May 14 13:32:33 2009
(r192097)
+++ stable/6/lib/libthread_db/Makefile Thu May 14 13:36:39 2009
(r192098)
@@ -9,7 +9,7 @@ SRCS+= libpthread_db.c libpthread_md.c
SRCS+= libc_r_db.c libc_r_md.c
SRCS+= libthr_db.c
INCS= thread_d
svn commit: r192301 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb fs/devfs
Author: kib
Date: Mon May 18 08:41:59 2009
New Revision: 192301
URL: http://svn.freebsd.org/changeset/base/192301
Log:
MFC r192151:
Initialize f_vnode before calling d_fdopen() cdevsw method.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/fs/devfs/devfs_vnops.c
Modified: stable/7/sys/fs/devfs/devfs_vnops.c
==
--- stable/7/sys/fs/devfs/devfs_vnops.c Mon May 18 07:24:06 2009
(r192300)
+++ stable/7/sys/fs/devfs/devfs_vnops.c Mon May 18 08:41:59 2009
(r192301)
@@ -890,6 +890,7 @@ devfs_open(struct vop_open_args *ap)
if (fp != NULL) {
FILE_LOCK(fp);
fp->f_data = dev;
+ fp->f_vnode = vp;
FILE_UNLOCK(fp);
}
fpop = td->td_fpop;
___
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: r192302 - head/sys/net
Author: rwatson
Date: Mon May 18 10:33:23 2009
New Revision: 192302
URL: http://svn.freebsd.org/changeset/base/192302
Log:
Garbage collect unused NETISR_{ATM,NETGRAPH,PPP} netisr constants.
Modified:
head/sys/net/netisr.h
Modified: head/sys/net/netisr.h
==
--- head/sys/net/netisr.h Mon May 18 08:41:59 2009(r192301)
+++ head/sys/net/netisr.h Mon May 18 10:33:23 2009(r192302)
@@ -53,11 +53,8 @@
#defineNETISR_ATALK1 17 /* Appletalk phase 1 */
#defineNETISR_ARP 18 /* same as AF_LINK */
#defineNETISR_IPX 23 /* same as AF_IPX */
-#defineNETISR_PPP 26 /* PPP soft interrupt */
#defineNETISR_IPV6 27
#defineNETISR_NATM 28
-#defineNETISR_ATM 29
-#defineNETISR_NETGRAPH 30
#defineNETISR_POLLMORE 31 /* polling callback, must be
last */
#ifndef LOCORE
___
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: r192303 - head/share/man/man4
Author: brueffer Date: Mon May 18 11:23:15 2009 New Revision: 192303 URL: http://svn.freebsd.org/changeset/base/192303 Log: Remove license clauses 3 and 4 as per rev. 1.2 from NetBSD. Also, FreeBSD 8.0 will be the first release including this driver. (1) PR: 134093 (1) Submitted by: gavin Modified: head/share/man/man4/uchcom.4 Modified: head/share/man/man4/uchcom.4 == --- head/share/man/man4/uchcom.4Mon May 18 10:33:23 2009 (r192302) +++ head/share/man/man4/uchcom.4Mon May 18 11:23:15 2009 (r192303) @@ -1,4 +1,4 @@ -.\" $NetBSD: uchcom.4,v 1.1 2007/09/03 18:02:17 tshiozak Exp $ +.\" $NetBSD: uchcom.4,v 1.2 2008/04/30 13:10:54 martin Exp $ .\" .\" Copyright (c) 2007 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -14,13 +14,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\"notice, this list of conditions and the following disclaimer in the .\"documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\"must display the following acknowledgement: -.\"This product includes software developed by the NetBSD -.\"Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\"contributors may be used to endorse or promote products derived -.\"from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -36,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 15, 2009 +.Dd May 18, 2009 .Dt UCHCOM 4 .Os .Sh NAME @@ -88,7 +81,7 @@ driver first appeared in The first .Fx release to include it was -.Fx 7.0 . +.Fx 8.0 . .Sh BUGS Actually, this chip seems unable to drive other than 8 data bits and 1 stop bit line. ___ 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: r192304 - head/sys/kern
Author: ed Date: Mon May 18 12:03:43 2009 New Revision: 192304 URL: http://svn.freebsd.org/changeset/base/192304 Log: Mark the clock sysctls as MPSAFE. These sysctls don't need any form of locking. At least cp_times is used by powerd very often, which means I get 50% less calls to non-MPSAFE sysctls on my system. The other 50% is consumed by dev.cpu.0.freq, but this seems to need Giant for Newbus. Modified: head/sys/kern/kern_clock.c Modified: head/sys/kern/kern_clock.c == --- head/sys/kern/kern_clock.c Mon May 18 11:23:15 2009(r192303) +++ head/sys/kern/kern_clock.c Mon May 18 12:03:43 2009(r192304) @@ -112,7 +112,7 @@ sysctl_kern_cp_time(SYSCTL_HANDLER_ARGS) return error; } -SYSCTL_PROC(_kern, OID_AUTO, cp_time, CTLTYPE_LONG|CTLFLAG_RD, +SYSCTL_PROC(_kern, OID_AUTO, cp_time, CTLTYPE_LONG|CTLFLAG_RD|CTLFLAG_MPSAFE, 0,0, sysctl_kern_cp_time, "LU", "CPU time statistics"); static long empty[CPUSTATES]; @@ -156,7 +156,7 @@ sysctl_kern_cp_times(SYSCTL_HANDLER_ARGS return error; } -SYSCTL_PROC(_kern, OID_AUTO, cp_times, CTLTYPE_LONG|CTLFLAG_RD, +SYSCTL_PROC(_kern, OID_AUTO, cp_times, CTLTYPE_LONG|CTLFLAG_RD|CTLFLAG_MPSAFE, 0,0, sysctl_kern_cp_times, "LU", "per-CPU time statistics"); void @@ -559,7 +559,8 @@ sysctl_kern_clockrate(SYSCTL_HANDLER_ARG return (sysctl_handle_opaque(oidp, &clkinfo, sizeof clkinfo, req)); } -SYSCTL_PROC(_kern, KERN_CLOCKRATE, clockrate, CTLTYPE_STRUCT|CTLFLAG_RD, +SYSCTL_PROC(_kern, KERN_CLOCKRATE, clockrate, + CTLTYPE_STRUCT|CTLFLAG_RD|CTLFLAG_MPSAFE, 0, 0, sysctl_kern_clockrate, "S,clockinfo", "Rate and period of various kernel clocks"); ___ 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: r192305 - head/sys/kern
Author: rwatson
Date: Mon May 18 14:02:55 2009
New Revision: 192305
URL: http://svn.freebsd.org/changeset/base/192305
Log:
Binding interrupts to a CPU consists of two parts: setting up CPU
affinity for the interrupt thread, and requesting that underlying
hardware direct interrupts to the CPU. For software interrupt
threads, implement a no-op interrupt event binder that returns
success, so that the interrupt management code will just set the
ithread's affinity and succeed.
Reviewed by: jhb
MFC after:1 week
Modified:
head/sys/kern/kern_intr.c
Modified: head/sys/kern/kern_intr.c
==
--- head/sys/kern/kern_intr.c Mon May 18 12:03:43 2009(r192304)
+++ head/sys/kern/kern_intr.c Mon May 18 14:02:55 2009(r192305)
@@ -968,6 +968,18 @@ intr_event_schedule_thread(struct intr_e
#endif
/*
+ * Allow interrupt event binding for software interrupt handlers -- a no-op,
+ * since interrupts are generated in software rather than being directed by
+ * a PIC.
+ */
+static int
+swi_assign_cpu(void *arg, u_char cpu)
+{
+
+ return (0);
+}
+
+/*
* Add a software interrupt handler to a specified event. If a given event
* is not specified, then a new event is created.
*/
@@ -988,7 +1000,7 @@ swi_add(struct intr_event **eventp, cons
return (EINVAL);
} else {
error = intr_event_create(&ie, NULL, IE_SOFT, 0,
- NULL, NULL, NULL, NULL, "swi%d:", pri);
+ NULL, NULL, NULL, swi_assign_cpu, "swi%d:", pri);
if (error)
return (error);
if (eventp != NULL)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r192098 - in stable/6: gnu/usr.bin/gdb/libgdb lib/libthr/thread lib/libthread_db lib/libthread_db/arch/alpha lib/libthread_db/arch/amd64 lib/libthread_db/arch/i386 lib/libthread_db/a
2009/5/18 Robert Watson :
> On Thu, 14 May 2009, Attilio Rao wrote:
>
>> Author: attilio
>> Date: Thu May 14 13:36:39 2009
>> New Revision: 192098
>> URL: http://svn.freebsd.org/changeset/base/192098
>>
>> Log:
>> MFC libthread_db modifies until r181651:
>> - Introduce and use new functions pthread_{read, write}_*
>> - Move psaddr_t from void * to uintptr_t
>> - Fix some ABI mismatches
>> - Introduce WARN 6 for compilation
>
> The 6-STABLE amd64 build has been broken for four days now. Please fix, or
> back out this change.
Yes, sorry, I just saw the report. I'm not sure what happened as this
part was supposed to be tested, but in any case, I'm going to fix.
Thanks,
Attilio
--
Peace can only be achieved by understanding - A. Einstein
___
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: r192098 - in stable/6: gnu/usr.bin/gdb/libgdb lib/libthr/thread lib/libthread_db lib/libthread_db/arch/alpha lib/libthread_db/arch/amd64 lib/libthread_db/arch/i386 lib/libthread_db/a
On Mon, 18 May 2009, Attilio Rao wrote:
MFC libthread_db modifies until r181651:
- Introduce and use new functions pthread_{read, write}_*
- Move psaddr_t from void * to uintptr_t
- Fix some ABI mismatches
- Introduce WARN 6 for compilation
The 6-STABLE amd64 build has been broken for four days now. Please fix, or
back out this change.
Yes, sorry, I just saw the report. I'm not sure what happened as this part
was supposed to be tested, but in any case, I'm going to fix.
As a general rule, developers should not commit to stable/, releng/, or
release/ branches without being subscribed to the freebsd-stable mailing list
-- not just to catch tinderbox results, but also to field reports of problems,
feedback on changes, etc.
Robert N M Watson
Computer Laboratory
University of Cambridge___
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: r192306 - head/sys/dev/bwi
Author: imp
Date: Mon May 18 15:31:26 2009
New Revision: 192306
URL: http://svn.freebsd.org/changeset/base/192306
Log:
Fix a typo from the original driver. We need to write ctrl2 into RF
register 0x52, not ctrl1. This appears to be a mistake in the bcm
reverse engineering page, and has been corrected there. Tracing
through the code, this is more in keeping with the "documented"
register. Sephe thinks it looks interesting and may be worth
fixing. :)
Submitted by: ddkprog at yahoo com
Reviewed by: Sepherosa Ziehau
Modified:
head/sys/dev/bwi/bwiphy.c
Modified: head/sys/dev/bwi/bwiphy.c
==
--- head/sys/dev/bwi/bwiphy.c Mon May 18 14:02:55 2009(r192305)
+++ head/sys/dev/bwi/bwiphy.c Mon May 18 15:31:26 2009(r192306)
@@ -375,7 +375,7 @@ bwi_phy_init_11g(struct bwi_mac *mac)
RF_WRITE(mac, 0x52,
(tpctl->tp_ctrl1 << 4) | tpctl->tp_ctrl2);
} else {
- RF_FILT_SETBITS(mac, 0x52, 0xfff0, tpctl->tp_ctrl1);
+ RF_FILT_SETBITS(mac, 0x52, 0xfff0, tpctl->tp_ctrl2);
}
if (phy->phy_rev >= 6) {
___
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: r192307 - head/sys/dev/bwi
Author: imp
Date: Mon May 18 15:46:34 2009
New Revision: 192307
URL: http://svn.freebsd.org/changeset/base/192307
Log:
Remove unnecessary comments. 11A read/write is the same: its just the
classic indirect register dance.
Submitted by: ddkprog at yahoo not com
Modified:
head/sys/dev/bwi/bwiphy.c
Modified: head/sys/dev/bwi/bwiphy.c
==
--- head/sys/dev/bwi/bwiphy.c Mon May 18 15:31:26 2009(r192306)
+++ head/sys/dev/bwi/bwiphy.c Mon May 18 15:46:34 2009(r192307)
@@ -135,7 +135,6 @@ bwi_phy_write(struct bwi_mac *mac, uint1
{
struct bwi_softc *sc = mac->mac_sc;
- /* TODO: 11A */
CSR_WRITE_2(sc, BWI_PHY_CTRL, ctrl);
CSR_WRITE_2(sc, BWI_PHY_DATA, data);
}
@@ -145,7 +144,6 @@ bwi_phy_read(struct bwi_mac *mac, uint16
{
struct bwi_softc *sc = mac->mac_sc;
- /* TODO: 11A */
CSR_WRITE_2(sc, BWI_PHY_CTRL, ctrl);
return CSR_READ_2(sc, BWI_PHY_DATA);
}
___
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: r192308 - head/usr.sbin/bluetooth/btpand
Author: emax
Date: Mon May 18 16:00:18 2009
New Revision: 192308
URL: http://svn.freebsd.org/changeset/base/192308
Log:
Teach btpand(8) to recognized Bluetooth device node names.
Tested by:Daniel O'Connor
MFC after:3 days
Modified:
head/usr.sbin/bluetooth/btpand/btpand.c
Modified: head/usr.sbin/bluetooth/btpand/btpand.c
==
--- head/usr.sbin/bluetooth/btpand/btpand.c Mon May 18 15:46:34 2009
(r192307)
+++ head/usr.sbin/bluetooth/btpand/btpand.c Mon May 18 16:00:18 2009
(r192308)
@@ -101,7 +101,7 @@ main(int argc, char *argv[])
break;
case 'd': /* local address */
- if (!bt_aton(optarg, &local_bdaddr)) {
+ if (!bt_devaddr(optarg, &local_bdaddr)) {
struct hostent *he;
if ((he = bt_gethostbyname(optarg)) == NULL)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r192050 - in head/sys: amd64/amd64 amd64/include conf i386/i386 i386/include
On Saturday 16 May 2009 2:39:25 pm Alan Cox wrote: > John Baldwin wrote: > > Author: jhb > > Date: Wed May 13 17:53:04 2009 > > New Revision: 192050 > > URL: http://svn.freebsd.org/changeset/base/192050 > > > > Log: > > Implement simple machine check support for amd64 and i386. > > - For CPUs that only support MCE (the machine check exception) but not MCA > > (i.e. Pentium), all this does is print out the value of the machine check > > registers and then panic when a machine check exception occurs. > > - For CPUs that support MCA (the machine check architecture), the support is > > a bit more involved. > > - First, there is limited support for decoding the CPU-independent MCA > > error codes in the kernel, and the kernel uses this to output a short > > description of any machine check events that occur. > > - When a machine check exception occurs, all of the MCx banks on the > > current CPU are scanned and any events are reported to the console > > before panic'ing. > > - To catch events for correctable errors, a periodic timer kicks off a > > task which scans the MCx banks on all CPUs. The frequency of these > > checks is controlled via the "hw.mca.interval" sysctl. > > - Userland can request an immediate scan of the MCx banks by writing > > a non-zero value to "hw.mca.force_scan". > > - If any correctable events are encountered, the appropriate details > > are stored in a 'struct mca_record' (defined in ). > > The "hw.mca.count" is a count of such records and each record may > > be queried via the "hw.mca.records" tree by specifying the record > > index (0 .. count - 1) as the next name in the MIB similar to using > > PIDs with the kern.proc.* sysctls. The idea is to export machine > > check events to userland for more detailed processing. > > - The periodic timer and hw.mca sysctls are only present if the CPU > > supports MCA. > > > > Discussed with: emaste (briefly) > > MFC after:1 month > > > > Added: > > head/sys/amd64/amd64/mca.c (contents, props changed) > > head/sys/amd64/include/mca.h (contents, props changed) > > head/sys/i386/i386/mca.c (contents, props changed) > > head/sys/i386/include/mca.h (contents, props changed) > > Modified: > > head/sys/amd64/amd64/machdep.c > > head/sys/amd64/amd64/mp_machdep.c > > head/sys/amd64/amd64/trap.c > > head/sys/amd64/include/specialreg.h > > head/sys/conf/files.amd64 > > head/sys/conf/files.i386 > > head/sys/i386/i386/machdep.c > > head/sys/i386/i386/mp_machdep.c > > head/sys/i386/i386/trap.c > > head/sys/i386/include/specialreg.h > > > > After this change my Phenom II locks up hard within minutes of booting. > There are no messages, and I am unable to break into the debugger from a > serial console. > > The same exact kernel is running fine on a Core 2 Quad. I will probably add a tunable to enable machine checks and disable them by default then. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r192122 - in head/sys: amd64/conf i386/conf
On Friday 15 May 2009 6:38:02 pm Ivan Voras wrote: > 2009/5/14 John Baldwin : > > Author: jhb > > Date: Thu May 14 21:53:35 2009 > > New Revision: 192122 > > URL: http://svn.freebsd.org/changeset/base/192122 > > > > Log: > > Trim the default set of device hints on i386 and amd64: > > - Remove vga0 and the disabled uart2/uart3 hints from both platforms. > > - Remove hints for ISA adv0, bt0, aha0, aic0, ed0, cs0, sn0, ie0, fe0, and > > le0 from i386. All these hints were marked 'disabled' and thus already > > did not work "out of the box". > > > -hint.le.0.at="isa" > > -hint.le.0.disabled="1" > > -hint.le.0.port="0x280" > > -hint.le.0.irq="10" > > -hint.le.0.drq="0" > > Heh, this will again change the behaviour under virtualization hosts > that emulate this hardware. Sometime before 7.0 the addition of this > hint caused all leX devices to be renamed le(X+1) because le0 was > taken and disabled. Restoring this will cause the same thing in > reverse. Unless someone actually has this hardware (as opposed to its > emulation) and needs the hint for something, I'd suggest these > particular lines be removed before 8.0 to restore the original > behaviour quickly. Obviously, they cannot be MFC-ed to 7-STABLE Err, I think you are confused. I made changes back at the end of 2008 to HEAD only that made hints always reserve unit numbers. 7.x has never had those changes. My earlier changes made network devices in 8.0 change from le0 to le1 in certain VMs. This commit now lets them use le0 as 7.x and earlier releases do. In fact, that was was the primary reason for this commit, to avoid breaking POLA for 8.0. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r192311 - in stable/7/sys: . amd64/amd64 arm/arm contrib/pf dev/ath/ath_hal dev/cxgb i386/i386 ia64/ia64 kern powerpc/powerpc sparc64/sparc64 sys
Author: jhb
Date: Mon May 18 17:14:23 2009
New Revision: 192311
URL: http://svn.freebsd.org/changeset/base/192311
Log:
MFC: Simplify the interrupt code a bit by always including the ie_disable
and ie_eoi methods and collapsing down to a single intr_event_create()
routine.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/amd64/amd64/intr_machdep.c
stable/7/sys/arm/arm/intr.c
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/i386/i386/intr_machdep.c
stable/7/sys/ia64/ia64/interrupt.c
stable/7/sys/kern/kern_intr.c
stable/7/sys/powerpc/powerpc/intr_machdep.c
stable/7/sys/sparc64/sparc64/intr_machdep.c
stable/7/sys/sys/interrupt.h
Modified: stable/7/sys/amd64/amd64/intr_machdep.c
==
--- stable/7/sys/amd64/amd64/intr_machdep.c Mon May 18 17:10:26 2009
(r192310)
+++ stable/7/sys/amd64/amd64/intr_machdep.c Mon May 18 17:14:23 2009
(r192311)
@@ -77,12 +77,6 @@ static struct sx intr_table_lock;
static struct mtx intrcnt_lock;
static STAILQ_HEAD(, pic) pics;
-#ifdef INTR_FILTER
-static void intr_eoi_src(void *arg);
-static void intr_disab_eoi_src(void *arg);
-static void intr_event_stray(void *cookie);
-#endif
-
#ifdef SMP
static int assign_cpu;
@@ -90,6 +84,10 @@ static void intr_assign_next_cpu(struct
#endif
static int intr_assign_cpu(void *arg, u_char cpu);
+static voidintr_disable_src(void *arg);
+#ifdef INTR_FILTER
+static voidintr_event_stray(void *cookie);
+#endif
static voidintr_init(void *__dummy);
static int intr_pic_registered(struct pic *pic);
static voidintrcnt_setname(const char *name, int index);
@@ -144,16 +142,10 @@ intr_register_source(struct intsrc *isrc
vector = isrc->is_pic->pic_vector(isrc);
if (interrupt_sources[vector] != NULL)
return (EEXIST);
-#ifdef INTR_FILTER
- error = intr_event_create(&isrc->is_event, isrc, 0,
- (mask_fn)isrc->is_pic->pic_enable_source,
- intr_eoi_src, intr_disab_eoi_src, intr_assign_cpu, "irq%d:",
- vector);
-#else
error = intr_event_create(&isrc->is_event, isrc, 0,
- (mask_fn)isrc->is_pic->pic_enable_source, intr_assign_cpu, "irq%d:",
+ intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source,
+ (mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:",
vector);
-#endif
if (error)
return (error);
sx_xlock(&intr_table_lock);
@@ -237,6 +229,15 @@ intr_config_intr(int vector, enum intr_t
return (isrc->is_pic->pic_config_intr(isrc, trig, pol));
}
+static void
+intr_disable_src(void *arg)
+{
+ struct intsrc *isrc;
+
+ isrc = arg;
+ isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
+}
+
#ifdef INTR_FILTER
void
intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
@@ -289,24 +290,6 @@ intr_event_stray(void *cookie)
"too many stray irq %d's: not logging anymore\n",
isrc->is_pic->pic_vector(isrc));
}
-
-static void
-intr_eoi_src(void *arg)
-{
- struct intsrc *isrc;
-
- isrc = arg;
- isrc->is_pic->pic_eoi_source(isrc);
-}
-
-static void
-intr_disab_eoi_src(void *arg)
-{
- struct intsrc *isrc;
-
- isrc = arg;
- isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
-}
#else
void
intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
Modified: stable/7/sys/arm/arm/intr.c
==
--- stable/7/sys/arm/arm/intr.c Mon May 18 17:10:26 2009(r192310)
+++ stable/7/sys/arm/arm/intr.c Mon May 18 17:14:23 2009(r192311)
@@ -50,6 +50,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+typedef void (*mask_fn)(void *);
+
static struct intr_event *intr_events[NIRQ];
static int intrcnt_tab[NIRQ];
static int intrcnt_index = 0;
@@ -57,27 +59,6 @@ static int last_printed = 0;
void arm_handler_execute(struct trapframe *, int);
-#ifdef INTR_FILTER
-static void
-intr_disab_eoi_src(void *arg)
-{
- uintptr_t nb;
-
- nb = (uintptr_t)arg;
- arm_mask_irq(nb);
-}
-
-static void
-intr_eoi_src(void *arg)
-{
- uintptr_t nb;
-
- nb = (uintptr_t)arg;
- arm_unmask_irq(nb);
-}
-
-#endif
-
void
arm_setup_irqhandler(const char *name, driver_filter_t *filt,
void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)
@@ -89,14 +70,9 @@ arm_setup_irqhandler(const char *name, d
return;
event = intr_events[irq];
if (event == NULL) {
-#ifdef INTR_FILTER
- error = intr_event_create(&event, (void *)irq, 0,
- (void (*)(void *))arm_unmask_irq, intr_eoi_src,
- intr_disab_eoi_src, NULL, "intr%d:", irq);
-#else
error = intr_event_
svn commit: r192313 - in head/sys: net sys
Author: sam Date: Mon May 18 17:18:40 2009 New Revision: 192313 URL: http://svn.freebsd.org/changeset/base/192313 Log: add bpf_track eventhandler for monitoring bpf taps attached/detached Reviewed by: csjp Modified: head/sys/net/bpf.c head/sys/sys/eventhandler.h Modified: head/sys/net/bpf.c == --- head/sys/net/bpf.c Mon May 18 17:14:48 2009(r192312) +++ head/sys/net/bpf.c Mon May 18 17:18:40 2009(r192313) @@ -534,6 +534,8 @@ bpf_attachd(struct bpf_d *d, struct bpf_ bpf_bpfd_cnt++; BPFIF_UNLOCK(bp); + + EVENTHANDLER_INVOKE(bpf_track, bp->bif_ifp, 1); } /* @@ -561,6 +563,8 @@ bpf_detachd(struct bpf_d *d) BPFD_UNLOCK(d); BPFIF_UNLOCK(bp); + EVENTHANDLER_INVOKE(bpf_track, ifp, 0); + /* * Check if this descriptor had requested promiscuous mode. * If so, turn it off. Modified: head/sys/sys/eventhandler.h == --- head/sys/sys/eventhandler.h Mon May 18 17:14:48 2009(r192312) +++ head/sys/sys/eventhandler.h Mon May 18 17:18:40 2009(r192313) @@ -182,6 +182,11 @@ typedef void (*vlan_unconfig_fn)(void *, EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn); EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn); +/* BPF attach/detach events */ +struct ifnet; +typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* 1 =>'s attach */); +EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn); + /* * Process events * process_fork and exit handlers are called without Giant. ___ 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: r192314 - in head/sys: gnu/fs/xfs/FreeBSD modules/xfs
Author: kan Date: Mon May 18 17:20:24 2009 New Revision: 192314 URL: http://svn.freebsd.org/changeset/base/192314 Log: Remove empty files and do nto try to build them. Apparently, they are problematic for CTF users. PR: 119298 Submitted by: Julian H. Stacey Deleted: head/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c head/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c head/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c Modified: head/sys/modules/xfs/Makefile Modified: head/sys/modules/xfs/Makefile == --- head/sys/modules/xfs/Makefile Mon May 18 17:18:40 2009 (r192313) +++ head/sys/modules/xfs/Makefile Mon May 18 17:20:24 2009 (r192314) @@ -54,9 +54,6 @@ SRCS = vnode_if.h \ xfs_iget.c \ xfs_attr_leaf.c \ xfs_attr.c \ - xfsrtstubs.c \ - xfsquotasstubs.c \ - xfsdmapistubs.c \ xfs_dmops.c \ xfs_qmops.c \ xfs_mountops.c \ ___ 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: r192316 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb sys
Author: jhb Date: Mon May 18 17:39:12 2009 New Revision: 192316 URL: http://svn.freebsd.org/changeset/base/192316 Log: MFC: Use __null for NULL for GNU C++ 4.x and use the same value for NULL in the kernel as in userland. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/sys/_null.h Modified: stable/7/sys/sys/_null.h == --- stable/7/sys/sys/_null.hMon May 18 17:37:27 2009(r192315) +++ stable/7/sys/sys/_null.hMon May 18 17:39:12 2009(r192316) @@ -28,14 +28,18 @@ #ifndef NULL -#if defined(_KERNEL) || !defined(__cplusplus) +#if !defined(__cplusplus) #defineNULL((void *)0) #else +#if defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4 +#defineNULL__null +#else #if defined(__LP64__) #defineNULL(0L) #else #defineNULL0 #endif /* __LP64__ */ -#endif /* _KERNEL || !__cplusplus */ +#endif /* __GNUG__ */ +#endif /* !__cplusplus */ #endif ___ 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: r192318 - head/sys/netinet6
Author: bz
Date: Mon May 18 17:48:46 2009
New Revision: 192318
URL: http://svn.freebsd.org/changeset/base/192318
Log:
Add two missing INIT_VNET_INET6(curvnet) to make VIMAGE kernels happier.
Modified:
head/sys/netinet6/ip6_mroute.c
Modified: head/sys/netinet6/ip6_mroute.c
==
--- head/sys/netinet6/ip6_mroute.c Mon May 18 17:42:25 2009
(r192317)
+++ head/sys/netinet6/ip6_mroute.c Mon May 18 17:48:46 2009
(r192318)
@@ -363,6 +363,7 @@ pim6_init(void)
int
X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt)
{
+ INIT_VNET_INET6(curvnet);
int error = 0;
int optval;
struct mif6ctl mifc;
@@ -1715,6 +1716,7 @@ phyint_send(struct ip6_hdr *ip6, struct
static int
register_send(struct ip6_hdr *ip6, struct mif6 *mif, struct mbuf *m)
{
+ INIT_VNET_INET6(curvnet);
struct mbuf *mm;
int i, len = m->m_pkthdr.len;
static struct sockaddr_in6 sin6 = { sizeof(sin6), AF_INET6 };
@@ -2036,6 +2038,7 @@ pim6_input(struct mbuf **mp, int *offp,
static int
ip6_mroute_modevent(module_t mod, int type, void *unused)
{
+ INIT_VNET_INET6(curvnet);
switch (type) {
case MOD_LOAD:
___
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: r192320 - stable/6/lib/libthread_db/arch/amd64
Author: attilio
Date: Mon May 18 18:04:42 2009
New Revision: 192320
URL: http://svn.freebsd.org/changeset/base/192320
Log:
Fix the world breakage, on amd64, introduced by the last libthread_db
commit.
Reported by: many
Sponsored by: Sandvine Incorporated
Pointy hat to:attilio
Modified:
stable/6/lib/libthread_db/arch/amd64/libpthread_md.c
Modified: stable/6/lib/libthread_db/arch/amd64/libpthread_md.c
==
--- stable/6/lib/libthread_db/arch/amd64/libpthread_md.cMon May 18
17:57:33 2009(r192319)
+++ stable/6/lib/libthread_db/arch/amd64/libpthread_md.cMon May 18
18:04:42 2009(r192320)
@@ -29,6 +29,7 @@
__FBSDID("$FreeBSD$");
#include
+#include
#include
#include
___
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: r192098 - in stable/6: gnu/usr.bin/gdb/libgdb lib/libthr/thread lib/libthread_db lib/libthread_db/arch/alpha lib/libthread_db/arch/amd64 lib/libthread_db/arch/i386 lib/libthread_db/a
2009/5/18 Robert Watson :
>
> On Mon, 18 May 2009, Attilio Rao wrote:
>
MFC libthread_db modifies until r181651:
- Introduce and use new functions pthread_{read, write}_*
- Move psaddr_t from void * to uintptr_t
- Fix some ABI mismatches
- Introduce WARN 6 for compilation
>>>
>>> The 6-STABLE amd64 build has been broken for four days now. Please fix,
>>> or back out this change.
>>
>> Yes, sorry, I just saw the report. I'm not sure what happened as this part
>> was supposed to be tested, but in any case, I'm going to fix.
>
> As a general rule, developers should not commit to stable/, releng/, or
> release/ branches without being subscribed to the freebsd-stable mailing
> list -- not just to catch tinderbox results, but also to field reports of
> problems, feedback on changes, etc.
Code fixed, sorry for the mis-service and the late response.
Attilio
--
Peace can only be achieved by understanding - A. Einstein
___
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: r192321 - head/tools/tools/net80211/scripts
Author: sam Date: Mon May 18 18:12:45 2009 New Revision: 192321 URL: http://svn.freebsd.org/changeset/base/192321 Log: fix typo Modified: head/tools/tools/net80211/scripts/setup.tdma-slave Modified: head/tools/tools/net80211/scripts/setup.tdma-slave == --- head/tools/tools/net80211/scripts/setup.tdma-slave Mon May 18 18:04:42 2009(r192320) +++ head/tools/tools/net80211/scripts/setup.tdma-slave Mon May 18 18:12:45 2009(r192321) @@ -10,7 +10,7 @@ PATH=.:$PATH SSID='freebsd+tdma' WLAN=`ifconfig wlan create wlanmode tdma wlandev $WIRELESS` -ifconfig $WLAN ssid "$SSID" 0 +ifconfig $WLAN ssid "$SSID" wlandebug -i $WLAN state+scan+tdma BRIDGE=`ifconfig bridge create` ___ 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: r192323 - in head/sys: amd64/amd64 arm/arm dev/md i386/i386 ia64/ia64 mips/mips nfs pc98/pc98 powerpc/aim powerpc/booke sparc64/sparc64 sun4v/sun4v sys
Author: marcel
Date: Mon May 18 18:37:18 2009
New Revision: 192323
URL: http://svn.freebsd.org/changeset/base/192323
Log:
Add cpu_flush_dcache() for use after non-DMA based I/O so that a
possible future I-cache coherency operation can succeed. On ARM
for example the L1 cache can be (is) virtually mapped, which
means that any I/O that uses temporary mappings will not see the
I-cache made coherent. On ia64 a similar behaviour has been
observed. By flushing the D-cache, execution of binaries backed
by md(4) and/or NFS work reliably.
For Book-E (powerpc), execution over NFS exhibits SIGILL once in
a while as well, though cpu_flush_dcache() hasn't been implemented
yet.
Doing an explicit D-cache flush as part of the non-DMA based I/O
read operation eliminates the need to do it as part of the
I-cache coherency operation itself and as such avoids pessimizing
the DMA-based I/O read operations for which D-cache are already
flushed/invalidated. It also allows future optimizations whereby
the bcopy() followed by the D-cache flush can be integrated in a
single operation, which could be implemented using on-chips DMA
engines, by-passing the D-cache altogether.
Modified:
head/sys/amd64/amd64/machdep.c
head/sys/arm/arm/machdep.c
head/sys/dev/md/md.c
head/sys/i386/i386/machdep.c
head/sys/ia64/ia64/machdep.c
head/sys/mips/mips/machdep.c
head/sys/nfs/nfs_common.c
head/sys/pc98/pc98/machdep.c
head/sys/powerpc/aim/machdep.c
head/sys/powerpc/booke/machdep.c
head/sys/sparc64/sparc64/machdep.c
head/sys/sun4v/sun4v/machdep.c
head/sys/sys/systm.h
Modified: head/sys/amd64/amd64/machdep.c
==
--- head/sys/amd64/amd64/machdep.c Mon May 18 18:34:03 2009
(r192322)
+++ head/sys/amd64/amd64/machdep.c Mon May 18 18:37:18 2009
(r192323)
@@ -506,6 +506,16 @@ cpu_boot(int howto)
{
}
+/*
+ * Flush the D-cache for non-DMA I/O so that the I-cache can
+ * be made coherent later.
+ */
+void
+cpu_flush_dcache(void *ptr, size_t len)
+{
+ /* Not applicable */
+}
+
/* Get current clock frequency for the given cpu id. */
int
cpu_est_clockrate(int cpu_id, uint64_t *rate)
Modified: head/sys/arm/arm/machdep.c
==
--- head/sys/arm/arm/machdep.c Mon May 18 18:34:03 2009(r192322)
+++ head/sys/arm/arm/machdep.c Mon May 18 18:37:18 2009(r192323)
@@ -316,6 +316,18 @@ cpu_startup(void *dummy)
SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL);
+/*
+ * Flush the D-cache for non-DMA I/O so that the I-cache can
+ * be made coherent later.
+ */
+void
+cpu_flush_dcache(void *ptr, size_t len)
+{
+
+ cpu_dcache_wb_range((uintptr_t)ptr, len);
+ cpu_l2cache_wb_range((uintptr_t)ptr, len);
+}
+
/* Get current clock frequency for the given cpu id. */
int
cpu_est_clockrate(int cpu_id, uint64_t *rate)
Modified: head/sys/dev/md/md.c
==
--- head/sys/dev/md/md.cMon May 18 18:34:03 2009(r192322)
+++ head/sys/dev/md/md.cMon May 18 18:37:18 2009(r192323)
@@ -436,10 +436,11 @@ mdstart_malloc(struct md_s *sc, struct b
if (osp == 0)
bzero(dst, sc->sectorsize);
else if (osp <= 255)
- for (i = 0; i < sc->sectorsize; i++)
- dst[i] = osp;
- else
+ memset(dst, osp, sc->sectorsize);
+ else {
bcopy((void *)osp, dst, sc->sectorsize);
+ cpu_flush_dcache(dst, sc->sectorsize);
+ }
osp = 0;
} else if (bp->bio_cmd == BIO_WRITE) {
if (sc->flags & MD_COMPRESS) {
@@ -491,6 +492,7 @@ mdstart_preload(struct md_s *sc, struct
case BIO_READ:
bcopy(sc->pl_ptr + bp->bio_offset, bp->bio_data,
bp->bio_length);
+ cpu_flush_dcache(bp->bio_data, bp->bio_length);
break;
case BIO_WRITE:
bcopy(bp->bio_data, sc->pl_ptr + bp->bio_offset,
@@ -633,6 +635,7 @@ mdstart_swap(struct md_s *sc, struct bio
break;
}
bcopy((void *)(sf_buf_kva(sf) + offs), p, len);
+ cpu_flush_dcache(p, len);
} else if (bp->bio_cmd == BIO_WRITE) {
if (len != PAGE_SIZE && m->valid != VM_PAGE_BITS_ALL)
rv = vm_pager_get_pages(sc->object, &m, 1, 0);
Modified: head/sys/i386/i386/machdep.c
==
--- head/sys/i386/i386/machdep.cMon Ma
svn commit: r192324 - in head/sys/ia64: ia64 include
Author: marcel
Date: Mon May 18 18:44:54 2009
New Revision: 192324
URL: http://svn.freebsd.org/changeset/base/192324
Log:
Rename ia64_invalidate_icache() to ia64_sync_icache(). We're
not invalidating anything.
Modified:
head/sys/ia64/ia64/elf_machdep.c
head/sys/ia64/ia64/machdep.c
head/sys/ia64/ia64/pmap.c
head/sys/ia64/include/md_var.h
Modified: head/sys/ia64/ia64/elf_machdep.c
==
--- head/sys/ia64/ia64/elf_machdep.cMon May 18 18:37:18 2009
(r192323)
+++ head/sys/ia64/ia64/elf_machdep.cMon May 18 18:44:54 2009
(r192324)
@@ -300,9 +300,12 @@ elf_cpu_load_file(linker_file_t lf)
++ph;
}
- /* Invalidate the I-cache, but not for the kernel itself. */
+ /*
+* Make the I-cache coherent, but don't worry obout the kernel
+* itself because the loader needs to do that.
+*/
if (lf->id != 1)
- ia64_invalidate_icache((uintptr_t)lf->address, lf->size);
+ ia64_sync_icache((uintptr_t)lf->address, lf->size);
return (0);
}
Modified: head/sys/ia64/ia64/machdep.c
==
--- head/sys/ia64/ia64/machdep.cMon May 18 18:37:18 2009
(r192323)
+++ head/sys/ia64/ia64/machdep.cMon May 18 18:44:54 2009
(r192324)
@@ -122,7 +122,7 @@ struct fpswa_iface *fpswa_iface;
u_int64_t ia64_pal_base;
u_int64_t ia64_port_base;
-static int ia64_inval_icache_needed;
+static int ia64_sync_icache_needed;
char machine[] = MACHINE;
SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
@@ -216,7 +216,7 @@ identifycpu(void)
}
break;
case 0x20:
- ia64_inval_icache_needed = 1;
+ ia64_sync_icache_needed = 1;
family_name = "Itanium 2";
switch (model) {
@@ -1537,11 +1537,11 @@ ia64_highfp_save(struct thread *td)
}
void
-ia64_invalidate_icache(vm_offset_t va, vm_offset_t sz)
+ia64_sync_icache(vm_offset_t va, vm_offset_t sz)
{
vm_offset_t lim;
- if (!ia64_inval_icache_needed)
+ if (!ia64_sync_icache_needed)
return;
lim = va + sz;
Modified: head/sys/ia64/ia64/pmap.c
==
--- head/sys/ia64/ia64/pmap.c Mon May 18 18:37:18 2009(r192323)
+++ head/sys/ia64/ia64/pmap.c Mon May 18 18:44:54 2009(r192324)
@@ -1500,7 +1500,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
}
if (prot & VM_PROT_EXECUTE)
- ia64_invalidate_icache(sva, PAGE_SIZE);
+ ia64_sync_icache(sva, PAGE_SIZE);
pmap_pte_prot(pmap, pte, prot);
pmap_invalidate_page(pmap, sva);
@@ -1635,7 +1635,7 @@ validate:
/* Invalidate the I-cache when needed. */
if (icache_inval)
- ia64_invalidate_icache(va, PAGE_SIZE);
+ ia64_sync_icache(va, PAGE_SIZE);
if ((prot & VM_PROT_WRITE) != 0)
vm_page_flag_set(m, PG_WRITEABLE);
Modified: head/sys/ia64/include/md_var.h
==
--- head/sys/ia64/include/md_var.h Mon May 18 18:37:18 2009
(r192323)
+++ head/sys/ia64/include/md_var.h Mon May 18 18:44:54 2009
(r192324)
@@ -88,8 +88,8 @@ uint64_t ia64_get_hcdp(void);
intia64_highfp_drop(struct thread *);
intia64_highfp_save(struct thread *);
struct ia64_init_return ia64_init(void);
-void ia64_invalidate_icache(vm_offset_t, vm_size_t);
void ia64_probe_sapics(void);
+void ia64_sync_icache(vm_offset_t, vm_size_t);
void interrupt(struct trapframe *);
void map_gateway_page(void);
void map_pal_code(void);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r192328 - head/sys/net80211
Author: sam
Date: Mon May 18 19:02:55 2009
New Revision: 192328
URL: http://svn.freebsd.org/changeset/base/192328
Log:
add block ack frame id
Modified:
head/sys/net80211/ieee80211.h
Modified: head/sys/net80211/ieee80211.h
==
--- head/sys/net80211/ieee80211.h Mon May 18 19:01:32 2009
(r192327)
+++ head/sys/net80211/ieee80211.h Mon May 18 19:02:55 2009
(r192328)
@@ -133,6 +133,7 @@ struct ieee80211_qosframe_addr4 {
#defineIEEE80211_FC0_SUBTYPE_ACTION0xd0
/* for TYPE_CTL */
#defineIEEE80211_FC0_SUBTYPE_BAR 0x80
+#defineIEEE80211_FC0_SUBTYPE_BA0x90
#defineIEEE80211_FC0_SUBTYPE_PS_POLL 0xa0
#defineIEEE80211_FC0_SUBTYPE_RTS 0xb0
#defineIEEE80211_FC0_SUBTYPE_CTS 0xc0
___
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: r192331 - in head/sys: amd64/include i386/include
Author: jhb Date: Mon May 18 19:33:59 2009 New Revision: 192331 URL: http://svn.freebsd.org/changeset/base/192331 Log: Bump CACHE_LINE_SIZE to 128 for x86. Intel's manuals explicitly recommend using 128 byte alignment for locks. (See IA-32 SDM Vol 3A 7.11.6.7) Modified: head/sys/amd64/include/param.h head/sys/i386/include/param.h Modified: head/sys/amd64/include/param.h == --- head/sys/amd64/include/param.h Mon May 18 19:26:25 2009 (r192330) +++ head/sys/amd64/include/param.h Mon May 18 19:33:59 2009 (r192331) @@ -93,7 +93,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#defineCACHE_LINE_SHIFT6 +#defineCACHE_LINE_SHIFT7 #defineCACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) /* Size of the level 1 page table units */ Modified: head/sys/i386/include/param.h == --- head/sys/i386/include/param.h Mon May 18 19:26:25 2009 (r192330) +++ head/sys/i386/include/param.h Mon May 18 19:33:59 2009 (r192331) @@ -78,7 +78,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#defineCACHE_LINE_SHIFT6 +#defineCACHE_LINE_SHIFT7 #defineCACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) #define PAGE_SHIFT 12 /* LOG2(PAGE_SIZE) */ ___ 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: r192336 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netinet
Author: jhb
Date: Mon May 18 20:23:16 2009
New Revision: 192336
URL: http://svn.freebsd.org/changeset/base/192336
Log:
MFC: Convert IPFW_DEFAULT_TO_ACCEPT into a loader tunable.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/netinet/ip_fw2.c
Modified: stable/7/sys/netinet/ip_fw2.c
==
--- stable/7/sys/netinet/ip_fw2.c Mon May 18 19:56:06 2009
(r192335)
+++ stable/7/sys/netinet/ip_fw2.c Mon May 18 20:23:16 2009
(r192336)
@@ -111,6 +111,11 @@ static int fw_verbose;
static struct callout ipfw_timeout;
static int verbose_limit;
+#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
+static int default_to_accept = 1;
+#else
+static int default_to_accept;
+#endif
static uma_zone_t ipfw_dyn_rule_zone;
/*
@@ -170,6 +175,9 @@ SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, d
NULL, IPFW_DEFAULT_RULE, "The default/max possible rule number.");
SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, tables_max, CTLFLAG_RD,
NULL, IPFW_TABLES_MAX, "The maximum number of tables.");
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, default_to_accept, CTLFLAG_RDTUN,
+&default_to_accept, 0, "Make the default rule accept all packets.");
+TUNABLE_INT("net.inet.ip.fw.default_to_accept", &default_to_accept);
#endif /* SYSCTL_NODE */
/*
@@ -4514,11 +4522,7 @@ ipfw_init(void)
default_rule.set = RESVD_SET;
default_rule.cmd[0].len = 1;
- default_rule.cmd[0].opcode =
-#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
- 1 ? O_ACCEPT :
-#endif
- O_DENY;
+ default_rule.cmd[0].opcode = default_to_accept ? O_ACCEPT : O_DENY;
error = add_rule(&layer3_chain, &default_rule);
if (error != 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: r192337 - in head/sys/fs: nfs nfsclient
Author: rmacklem
Date: Mon May 18 21:22:03 2009
New Revision: 192337
URL: http://svn.freebsd.org/changeset/base/192337
Log:
Change the experimental NFSv4 client so that it does not do
the NFSv4 Close operations until ncl_inactive(). This is
necessary so that the Open StateIDs are available for doing
I/O on mmap'd files after VOP_CLOSE(). I also changed some
indentation for the nfscl_getclose() function.
Approved by: kib (mentor)
Modified:
head/sys/fs/nfs/nfs_var.h
head/sys/fs/nfsclient/nfs_clnode.c
head/sys/fs/nfsclient/nfs_clrpcops.c
head/sys/fs/nfsclient/nfs_clstate.c
head/sys/fs/nfsclient/nfs_clvnops.c
Modified: head/sys/fs/nfs/nfs_var.h
==
--- head/sys/fs/nfs/nfs_var.h Mon May 18 20:23:16 2009(r192336)
+++ head/sys/fs/nfs/nfs_var.h Mon May 18 21:22:03 2009(r192337)
@@ -351,7 +351,7 @@ int nfsrpc_openrpc(struct nfsmount *, vn
u_int32_t, struct ucred *, NFSPROC_T *, int, int);
int nfsrpc_opendowngrade(vnode_t, u_int32_t, struct nfsclopen *,
struct ucred *, NFSPROC_T *);
-int nfsrpc_close(vnode_t, struct ucred *, NFSPROC_T *);
+int nfsrpc_close(vnode_t, int, NFSPROC_T *);
int nfsrpc_closerpc(struct nfsrv_descript *, struct nfsmount *,
struct nfsclopen *, struct ucred *, NFSPROC_T *, int);
int nfsrpc_openconfirm(vnode_t, u_int8_t *, int, struct nfsclopen *,
@@ -457,8 +457,7 @@ void nfscl_initiate_recovery(struct nfsc
int nfscl_hasexpired(struct nfsclclient *, u_int32_t, NFSPROC_T *);
void nfscl_dumpstate(struct nfsmount *, int, int, int, int);
void nfscl_dupopen(vnode_t, int);
-int nfscl_getclose(vnode_t, struct ucred *, NFSPROC_T *,
-struct nfsclclient **, struct nfsclopenhead *);
+int nfscl_getclose(vnode_t, struct nfsclclient **, struct nfsclopenhead *);
int nfscl_deleg(mount_t, struct nfsclclient *, u_int8_t *, int,
struct ucred *, NFSPROC_T *, struct nfscldeleg **);
void nfscl_lockinit(struct nfsv4lock *);
Modified: head/sys/fs/nfsclient/nfs_clnode.c
==
--- head/sys/fs/nfsclient/nfs_clnode.c Mon May 18 20:23:16 2009
(r192336)
+++ head/sys/fs/nfsclient/nfs_clnode.c Mon May 18 21:22:03 2009
(r192337)
@@ -190,6 +190,13 @@ ncl_inactive(struct vop_inactive_args *a
np = VTONFS(ap->a_vp);
if (prtactive && vrefcnt(ap->a_vp) != 0)
vprint("ncl_inactive: pushing active", ap->a_vp);
+
+ /*
+* Since mmap()'d files to I/O after VOP_CLOSE(), the NFSv4 Close
+* operations are delayed until now.
+*/
+ (void) nfsrpc_close(ap->a_vp, 1, td);
+
if (ap->a_vp->v_type != VDIR) {
sp = np->n_sillyrename;
np->n_sillyrename = NULL;
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==
--- head/sys/fs/nfsclient/nfs_clrpcops.cMon May 18 20:23:16 2009
(r192336)
+++ head/sys/fs/nfsclient/nfs_clrpcops.cMon May 18 21:22:03 2009
(r192337)
@@ -550,7 +550,7 @@ nfsmout:
* V4 Close operation.
*/
APPLESTATIC int
-nfsrpc_close(vnode_t vp, struct ucred *cred, NFSPROC_T *p)
+nfsrpc_close(vnode_t vp, int doclose, NFSPROC_T *p)
{
struct nfsclclient *clp;
struct nfsclopenhead oh;
@@ -558,11 +558,14 @@ nfsrpc_close(vnode_t vp, struct ucred *c
if (vnode_vtype(vp) != VREG)
return (0);
- error = nfscl_getclose(vp, cred, p, &clp, &oh);
+ if (doclose)
+ error = nfscl_getclose(vp, &clp, &oh);
+ else
+ error = nfscl_getclose(vp, &clp, NULL);
if (error)
return (error);
- if (!LIST_EMPTY(&oh))
+ if (doclose && !LIST_EMPTY(&oh))
nfsrpc_doclose(VFSTONFS(vnode_mount(vp)), &oh, p);
nfscl_clientrelease(clp);
return (0);
@@ -997,7 +1000,7 @@ nfsrpc_setattr(vnode_t vp, struct vattr
if (lckp != NULL)
nfscl_lockderef(lckp);
if (!openerr)
- (void) nfsrpc_close(vp, cred, p);
+ (void) nfsrpc_close(vp, 0, p);
if (error == NFSERR_GRACE || error == NFSERR_STALESTATEID ||
error == NFSERR_STALEDONTRECOVER || error == NFSERR_DELAY ||
error == NFSERR_OLDSTATEID) {
Modified: head/sys/fs/nfsclient/nfs_clstate.c
==
--- head/sys/fs/nfsclient/nfs_clstate.c Mon May 18 20:23:16 2009
(r192336)
+++ head/sys/fs/nfsclient/nfs_clstate.c Mon May 18 21:22:03 2009
(r192337)
@@ -663,6 +663,9 @@ nfscl_openrelease(struct nfsclopen *op,
* client data structures to do the SetClientId/SetClientId_confirm,
* but will release that lock and return the clientid with a refernce
* count on it.
+ * If the p argument is NULL, it will
svn commit: r192340 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb net
Author: jhb
Date: Mon May 18 21:44:33 2009
New Revision: 192340
URL: http://svn.freebsd.org/changeset/base/192340
Log:
MFC: Remove dependency of vlan.ko on miibus.ko.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/net/if_vlan.c
Modified: stable/7/sys/net/if_vlan.c
==
--- stable/7/sys/net/if_vlan.c Mon May 18 21:36:17 2009(r192339)
+++ stable/7/sys/net/if_vlan.c Mon May 18 21:44:33 2009(r192340)
@@ -567,7 +567,6 @@ static moduledata_t vlan_mod = {
DECLARE_MODULE(if_vlan, vlan_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
MODULE_VERSION(if_vlan, 3);
-MODULE_DEPEND(if_vlan, miibus, 1, 1, 1);
static struct ifnet *
vlan_clone_match_ethertag(struct if_clone *ifc, const char *name, int *tag)
___
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: r192341 - head/sys/netinet
Author: jhb Date: Mon May 18 21:46:46 2009 New Revision: 192341 URL: http://svn.freebsd.org/changeset/base/192341 Log: - Fix typo in description of 'net.inet.ip.fw.autoinc_step'. - Use 'vnet_ipfw' instead of 'vnet_inet' for 'net.inet.ip.fw.one_pass'. Modified: head/sys/netinet/ip_fw2.c Modified: head/sys/netinet/ip_fw2.c == --- head/sys/netinet/ip_fw2.c Mon May 18 21:44:33 2009(r192340) +++ head/sys/netinet/ip_fw2.c Mon May 18 21:46:46 2009(r192341) @@ -181,8 +181,8 @@ SYSCTL_V_PROC(V_NET, vnet_ipfw, _net_ine CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, fw_enable, 0, ipfw_chg_hook, "I", "Enable ipfw"); SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, autoinc_step, -CTLFLAG_RW, autoinc_step, 0, "Rule number autincrement step"); -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_fw, OID_AUTO, one_pass, +CTLFLAG_RW, autoinc_step, 0, "Rule number auto-increment step"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, one_pass, CTLFLAG_RW | CTLFLAG_SECURE3, fw_one_pass, 0, "Only do a single pass through ipfw when using dummynet(4)"); SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, verbose, ___ 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: r192342 - in head/sys: amd64/pci i386/pci
Author: jhb
Date: Mon May 18 21:47:32 2009
New Revision: 192342
URL: http://svn.freebsd.org/changeset/base/192342
Log:
Add a read-only sysctl hw.pci.mcfg to mirror the tunable by the same name.
MFC after:1 week
Modified:
head/sys/amd64/pci/pci_cfgreg.c
head/sys/i386/pci/pci_cfgreg.c
Modified: head/sys/amd64/pci/pci_cfgreg.c
==
--- head/sys/amd64/pci/pci_cfgreg.c Mon May 18 21:46:46 2009
(r192341)
+++ head/sys/amd64/pci/pci_cfgreg.c Mon May 18 21:47:32 2009
(r192342)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -56,6 +57,8 @@ static void pciereg_cfgwrite(int bus, un
static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes);
static voidpcireg_cfgwrite(int bus, int slot, int func, int reg, int data,
int bytes);
+SYSCTL_DECL(_hw_pci);
+
static int cfgmech;
static vm_offset_t pcie_base;
static int pcie_minbus, pcie_maxbus;
@@ -63,6 +66,8 @@ static uint32_t pcie_badslots;
static struct mtx pcicfg_mtx;
static int mcfg_enable = 1;
TUNABLE_INT("hw.pci.mcfg", &mcfg_enable);
+SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0,
+"Enable support for PCI-e memory mapped config access");
/*
* Initialise access to PCI configuration space
Modified: head/sys/i386/pci/pci_cfgreg.c
==
--- head/sys/i386/pci/pci_cfgreg.c Mon May 18 21:46:46 2009
(r192341)
+++ head/sys/i386/pci/pci_cfgreg.c Mon May 18 21:47:32 2009
(r192342)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -75,6 +76,8 @@ enum {
CFGMECH_PCIE,
};
+SYSCTL_DECL(_hw_pci);
+
static TAILQ_HEAD(pcie_cfg_list, pcie_cfg_elem) pcie_list[MAXCPU];
static uint64_t pcie_base;
static int pcie_minbus, pcie_maxbus;
@@ -84,6 +87,8 @@ static int devmax;
static struct mtx pcicfg_mtx;
static int mcfg_enable = 1;
TUNABLE_INT("hw.pci.mcfg", &mcfg_enable);
+SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0,
+"Enable support for PCI-e memory mapped config access");
static uint32_tpci_docfgregread(int bus, int slot, int func, int reg,
int bytes);
___
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: r192343 - in head/sys: amd64/amd64 i386/i386
Author: jhb
Date: Mon May 18 21:50:06 2009
New Revision: 192343
URL: http://svn.freebsd.org/changeset/base/192343
Log:
- Add a tunable 'hw.mca.enabled' that can be used to enable/disable the
machine check code. Disable it by default for now.
- When computing the mask of bits that determines a non-restartable event
during a machine check exception, or-in the overflow flag rather than
replacing the other flags.
PR: i386/134586 [2]
Submitted by: Andi Kleen andi-fbsd firstfloor.org
Modified:
head/sys/amd64/amd64/mca.c
head/sys/i386/i386/mca.c
Modified: head/sys/amd64/amd64/mca.c
==
--- head/sys/amd64/amd64/mca.c Mon May 18 21:47:32 2009(r192342)
+++ head/sys/amd64/amd64/mca.c Mon May 18 21:50:06 2009(r192343)
@@ -55,10 +55,15 @@ struct mca_internal {
static MALLOC_DEFINE(M_MCA, "MCA", "Machine Check Architecture");
-static struct sysctl_oid *mca_sysctl_tree;
-
static int mca_count; /* Number of records stored. */
+SYSCTL_NODE(_hw, OID_AUTO, mca, CTLFLAG_RD, NULL, "Machine Check
Architecture");
+
+static int mca_enabled = 0;
+TUNABLE_INT("hw.mca.enabled", &mca_enabled);
+SYSCTL_INT(_hw_mca, OID_AUTO, enabled, CTLFLAG_RDTUN, &mca_enabled, 0,
+"Administrative toggle for machine check support");
+
static STAILQ_HEAD(, mca_internal) mca_records;
static struct callout mca_timer;
static int mca_ticks = 3600; /* Check hourly by default. */
@@ -346,7 +351,7 @@ mca_scan(int mcip)
/* When handling a MCE#, treat the OVER flag as non-restartable. */
if (mcip)
- ucmask = MC_STATUS_OVER;
+ ucmask |= MC_STATUS_OVER;
mcg_cap = rdmsr(MSR_MCG_CAP);
for (i = 0; i < (mcg_cap & MCG_CAP_COUNT); i++) {
rec = mca_record_entry(i);
@@ -426,7 +431,7 @@ static void
mca_startup(void *dummy)
{
- if (!(cpu_feature & CPUID_MCA))
+ if (!mca_enabled || !(cpu_feature & CPUID_MCA))
return;
callout_reset(&mca_timer, mca_ticks * hz, mca_periodic_scan,
@@ -442,17 +447,15 @@ mca_setup(void)
STAILQ_INIT(&mca_records);
TASK_INIT(&mca_task, 0x8000, mca_scan_cpus, NULL);
callout_init(&mca_timer, CALLOUT_MPSAFE);
- mca_sysctl_tree = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_hw),
- OID_AUTO, "mca", CTLFLAG_RW, NULL, "MCA container");
- SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(mca_sysctl_tree), OID_AUTO,
+ SYSCTL_ADD_INT(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO,
"count", CTLFLAG_RD, &mca_count, 0, "Record count");
- SYSCTL_ADD_PROC(NULL, SYSCTL_CHILDREN(mca_sysctl_tree), OID_AUTO,
+ SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO,
"interval", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &mca_ticks,
0, sysctl_mca_ticks, "I",
"Periodic interval in seconds to scan for machine checks");
- SYSCTL_ADD_NODE(NULL, SYSCTL_CHILDREN(mca_sysctl_tree), OID_AUTO,
+ SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO,
"records", CTLFLAG_RD, sysctl_mca_records, "Machine check records");
- SYSCTL_ADD_PROC(NULL, SYSCTL_CHILDREN(mca_sysctl_tree), OID_AUTO,
+ SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO,
"force_scan", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0,
sysctl_mca_scan, "I", "Force an immediate scan for machine checks");
}
@@ -465,7 +468,7 @@ mca_init(void)
int i;
/* MCE is required. */
- if (!(cpu_feature & CPUID_MCE))
+ if (!mca_enabled || !(cpu_feature & CPUID_MCE))
return;
if (cpu_feature & CPUID_MCA) {
Modified: head/sys/i386/i386/mca.c
==
--- head/sys/i386/i386/mca.cMon May 18 21:47:32 2009(r192342)
+++ head/sys/i386/i386/mca.cMon May 18 21:50:06 2009(r192343)
@@ -55,10 +55,15 @@ struct mca_internal {
static MALLOC_DEFINE(M_MCA, "MCA", "Machine Check Architecture");
-static struct sysctl_oid *mca_sysctl_tree;
-
static int mca_count; /* Number of records stored. */
+SYSCTL_NODE(_hw, OID_AUTO, mca, CTLFLAG_RD, NULL, "Machine Check
Architecture");
+
+static int mca_enabled = 0;
+TUNABLE_INT("hw.mca.enabled", &mca_enabled);
+SYSCTL_INT(_hw_mca, OID_AUTO, enabled, CTLFLAG_RDTUN, &mca_enabled, 0,
+"Administrative toggle for machine check support");
+
static STAILQ_HEAD(, mca_internal) mca_records;
static struct callout mca_timer;
static int mca_ticks = 3600; /* Check hourly by default. */
@@ -346,7 +351,7 @@ mca_scan(int mcip)
/* When handling a MCE#, treat the OVER flag as non-restartable. */
if (mcip)
- ucmask = MC_STATUS_OVER;
+ ucmask |= MC_STATUS_OVER;
mcg_cap = rdmsr(MSR_MCG_CAP);
for (i = 0; i < (mcg_cap & MCG_CAP_
svn commit: r192346 - in stable/6/sys: . contrib/pf dev/cxgb net
Author: jhb
Date: Mon May 18 21:58:57 2009
New Revision: 192346
URL: http://svn.freebsd.org/changeset/base/192346
Log:
MFC: Remove dependency of vlan.ko on miibus.ko.
Modified:
stable/6/sys/ (props changed)
stable/6/sys/contrib/pf/ (props changed)
stable/6/sys/dev/cxgb/ (props changed)
stable/6/sys/net/if_vlan.c
Modified: stable/6/sys/net/if_vlan.c
==
--- stable/6/sys/net/if_vlan.c Mon May 18 21:58:21 2009(r192345)
+++ stable/6/sys/net/if_vlan.c Mon May 18 21:58:57 2009(r192346)
@@ -315,7 +315,6 @@ static moduledata_t vlan_mod = {
};
DECLARE_MODULE(if_vlan, vlan_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
-MODULE_DEPEND(if_vlan, miibus, 1, 1, 1);
static struct ifnet *
vlan_clone_match_ethertag(struct if_clone *ifc, const char *name, int *tag)
___
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: r192341 - head/sys/netinet
On Mon, 18 May 2009, John Baldwin wrote: Author: jhb Date: Mon May 18 21:46:46 2009 New Revision: 192341 URL: http://svn.freebsd.org/changeset/base/192341 Log: - Fix typo in description of 'net.inet.ip.fw.autoinc_step'. - Use 'vnet_ipfw' instead of 'vnet_inet' for 'net.inet.ip.fw.one_pass'. grep _fw_one_pass sys/netinet/vinet.h grep _fw_one_pass sys/netinet/ip_fw.h The problem with this one is/was that it is/was a classic ip_input variable and not an ipfw2 one. You just broke the build (at least for some kernel configs ;-) Modified: head/sys/netinet/ip_fw2.c Modified: head/sys/netinet/ip_fw2.c == --- head/sys/netinet/ip_fw2.c Mon May 18 21:44:33 2009(r192340) +++ head/sys/netinet/ip_fw2.c Mon May 18 21:46:46 2009(r192341) @@ -181,8 +181,8 @@ SYSCTL_V_PROC(V_NET, vnet_ipfw, _net_ine CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, fw_enable, 0, ipfw_chg_hook, "I", "Enable ipfw"); SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, autoinc_step, -CTLFLAG_RW, autoinc_step, 0, "Rule number autincrement step"); -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_fw, OID_AUTO, one_pass, +CTLFLAG_RW, autoinc_step, 0, "Rule number auto-increment step"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, one_pass, CTLFLAG_RW | CTLFLAG_SECURE3, fw_one_pass, 0, "Only do a single pass through ipfw when using dummynet(4)"); SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, verbose, -- Bjoern A. Zeeb The greatest risk is not taking one. ___ 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: r192348 - in vendor/file/dist: . Magdir tests
Author: delphij Date: Mon May 18 22:27:42 2009 New Revision: 192348 URL: http://svn.freebsd.org/changeset/base/192348 Log: Virgin import of Christos Zoulas's FILE 5.03. Security: CVE-2009-1515 Added: vendor/file/dist/Magdir/kml vendor/file/dist/strlcat.c vendor/file/dist/strlcpy.c Deleted: vendor/file/dist/config.guess vendor/file/dist/config.sub Modified: vendor/file/dist/ChangeLog vendor/file/dist/Magdir/cafebabe vendor/file/dist/Magdir/compress vendor/file/dist/Magdir/database vendor/file/dist/Magdir/erlang vendor/file/dist/Magdir/filesystems vendor/file/dist/Magdir/fonts vendor/file/dist/Magdir/fortran vendor/file/dist/Magdir/linux vendor/file/dist/Magdir/lisp vendor/file/dist/Magdir/python vendor/file/dist/Magdir/troff vendor/file/dist/Magdir/windows vendor/file/dist/Makefile.am vendor/file/dist/Makefile.in vendor/file/dist/README vendor/file/dist/acinclude.m4 vendor/file/dist/aclocal.m4 vendor/file/dist/apprentice.c vendor/file/dist/apptype.c vendor/file/dist/cdf.c vendor/file/dist/cdf.h vendor/file/dist/cdf_time.c vendor/file/dist/compress.c vendor/file/dist/config.h.in vendor/file/dist/configure vendor/file/dist/configure.ac vendor/file/dist/file.c vendor/file/dist/file.h vendor/file/dist/funcs.c vendor/file/dist/getopt_long.c vendor/file/dist/magic.c vendor/file/dist/patchlevel.h vendor/file/dist/readcdf.c vendor/file/dist/softmagic.c vendor/file/dist/tests/Makefile.in Modified: vendor/file/dist/ChangeLog == --- vendor/file/dist/ChangeLog Mon May 18 22:16:51 2009(r192347) +++ vendor/file/dist/ChangeLog Mon May 18 22:27:42 2009(r192348) @@ -1,3 +1,59 @@ +2009-05-06 10:25 Christos Zoulas + + * Avoid null dereference in cdf code (Drew Yao) + + * More cdf bounds checks and overflow checks + +2009-05-01 18:37 Christos Zoulas + + * Buffer overflow fixes from Drew Yao + +2009-04-30 17:10 Christos Zoulas + + * Fix more cdf lossage. All the documents I have + right now print the correct information. + +2009-03-27 18:43 Christos Zoulas + + * don't print \012- separators in the same magic entry + if it consists of multiple magic printing lines. + +2009-03-23 10:20 Christos Zoulas + + * Avoid file descriptor leak in compress code from + (Daniel Novotny) + +2009-03-18 16:50 Christos Zoulas + + * Allow escaping of relation characters, so that we can say \^[A-Z] + and the ^ is not eaten as a relation char. + + * Fix troff and fortran to their previous glory using + regex. This was broken since their removel from ascmagic. + +2009-03-10 16:50 Christos Zoulas + + * don't use strlen in strndup() (Toby Peterson) + +2009-03-10 7:45 Christos Zoulas + + * avoid c99 syntax. + +2009-02-23 15:45 Christos Zoulas + + * make the cdf code use the buffer first if available, + and then the fd code. + +2009-02-13 13:45 Christos Zoulas + + * look for struct option to determine if getopt.h is usable for IRIX. + + * sanitize cdf document strings + +2009-02-04 13:25 Christos Zoulas + + * fix OS/2 warnings. + 2008-12-12 15:50 Christos Zoulas * fix initial offset calculation for non 4K sector files Modified: vendor/file/dist/Magdir/cafebabe == --- vendor/file/dist/Magdir/cafebabeMon May 18 22:16:51 2009 (r192347) +++ vendor/file/dist/Magdir/cafebabeMon May 18 22:27:42 2009 (r192348) @@ -17,6 +17,15 @@ >4 belong >30 compiled Java class data, >>6beshort x version %d. >>4beshort x \b%d +# Which is which? +#>>4 belong 0x032d (Java 1.0) +#>>4 belong 0x032d (Java 1.1) +>>4belong 0x002e (Java 1.2) +>>4belong 0x002f (Java 1.3) +>>4belong 0x0030 (Java 1.4) +>>4belong 0x0031 (Java 1.5) +>>4belong 0x0032 (Java 1.6) + 0 belong 0xcafebabe >4 belong 1 Mach-O fat file with 1 architecture Modified: vendor/file/dist/Magdir/compress == --- vendor/file/dist/Magdir/compressMon May 18 22:16:51 2009 (r192347) +++ vendor/file/dist/Magdir/compressMon May 18 22:27:42 2009 (r192348) @@ -195,6 +195,10 @@ # bug #364260) #0 string ]\000\000\200\000 LZMA compressed data +# http://tukaani.org/xz/xz-file-format.txt +0 ustring \xFD7zXZ\x00xz compressed data +!:mime application/x-xz + # AFX compressed files (Wolfram Kleff) 2 string -afx- AFX compressed file data @@ -
svn commit: r192349 - vendor/file/5.03
Author: delphij Date: Mon May 18 22:29:44 2009 New Revision: 192349 URL: http://svn.freebsd.org/changeset/base/192349 Log: "Tag" the file 5.03 vendor import. Added: vendor/file/5.03/ - copied from r192348, vendor/file/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: r192350 - in head/contrib/file: . Magdir tests
Author: delphij Date: Mon May 18 22:34:33 2009 New Revision: 192350 URL: http://svn.freebsd.org/changeset/base/192350 Log: Merge vendor/file/d...@192348, bringing FILE 5.03 to 8-CURRENT. Security: CVE-2009-1515 Added: head/contrib/file/Magdir/kml - copied unchanged from r192349, vendor/file/dist/Magdir/kml head/contrib/file/strlcat.c - copied unchanged from r192349, vendor/file/dist/strlcat.c head/contrib/file/strlcpy.c - copied unchanged from r192349, vendor/file/dist/strlcpy.c Deleted: head/contrib/file/config.guess head/contrib/file/config.sub Modified: head/contrib/file/ (props changed) head/contrib/file/ChangeLog head/contrib/file/Magdir/cafebabe head/contrib/file/Magdir/compress head/contrib/file/Magdir/database head/contrib/file/Magdir/erlang head/contrib/file/Magdir/filesystems head/contrib/file/Magdir/fonts head/contrib/file/Magdir/fortran head/contrib/file/Magdir/linux head/contrib/file/Magdir/lisp head/contrib/file/Magdir/python head/contrib/file/Magdir/troff head/contrib/file/Magdir/windows head/contrib/file/Makefile.am head/contrib/file/Makefile.in head/contrib/file/README head/contrib/file/acinclude.m4 head/contrib/file/aclocal.m4 head/contrib/file/apprentice.c head/contrib/file/apptype.c head/contrib/file/cdf.c head/contrib/file/cdf.h head/contrib/file/cdf_time.c head/contrib/file/compress.c head/contrib/file/config.h.in head/contrib/file/configure head/contrib/file/configure.ac head/contrib/file/file.c head/contrib/file/file.h head/contrib/file/funcs.c head/contrib/file/getopt_long.c head/contrib/file/magic.c head/contrib/file/patchlevel.h head/contrib/file/readcdf.c head/contrib/file/softmagic.c head/contrib/file/tests/Makefile.in Modified: head/contrib/file/ChangeLog == --- head/contrib/file/ChangeLog Mon May 18 22:29:44 2009(r192349) +++ head/contrib/file/ChangeLog Mon May 18 22:34:33 2009(r192350) @@ -1,3 +1,59 @@ +2009-05-06 10:25 Christos Zoulas + + * Avoid null dereference in cdf code (Drew Yao) + + * More cdf bounds checks and overflow checks + +2009-05-01 18:37 Christos Zoulas + + * Buffer overflow fixes from Drew Yao + +2009-04-30 17:10 Christos Zoulas + + * Fix more cdf lossage. All the documents I have + right now print the correct information. + +2009-03-27 18:43 Christos Zoulas + + * don't print \012- separators in the same magic entry + if it consists of multiple magic printing lines. + +2009-03-23 10:20 Christos Zoulas + + * Avoid file descriptor leak in compress code from + (Daniel Novotny) + +2009-03-18 16:50 Christos Zoulas + + * Allow escaping of relation characters, so that we can say \^[A-Z] + and the ^ is not eaten as a relation char. + + * Fix troff and fortran to their previous glory using + regex. This was broken since their removel from ascmagic. + +2009-03-10 16:50 Christos Zoulas + + * don't use strlen in strndup() (Toby Peterson) + +2009-03-10 7:45 Christos Zoulas + + * avoid c99 syntax. + +2009-02-23 15:45 Christos Zoulas + + * make the cdf code use the buffer first if available, + and then the fd code. + +2009-02-13 13:45 Christos Zoulas + + * look for struct option to determine if getopt.h is usable for IRIX. + + * sanitize cdf document strings + +2009-02-04 13:25 Christos Zoulas + + * fix OS/2 warnings. + 2008-12-12 15:50 Christos Zoulas * fix initial offset calculation for non 4K sector files Modified: head/contrib/file/Magdir/cafebabe == --- head/contrib/file/Magdir/cafebabe Mon May 18 22:29:44 2009 (r192349) +++ head/contrib/file/Magdir/cafebabe Mon May 18 22:34:33 2009 (r192350) @@ -17,6 +17,15 @@ >4 belong >30 compiled Java class data, >>6beshort x version %d. >>4beshort x \b%d +# Which is which? +#>>4 belong 0x032d (Java 1.0) +#>>4 belong 0x032d (Java 1.1) +>>4belong 0x002e (Java 1.2) +>>4belong 0x002f (Java 1.3) +>>4belong 0x0030 (Java 1.4) +>>4belong 0x0031 (Java 1.5) +>>4belong 0x0032 (Java 1.6) + 0 belong 0xcafebabe >4 belong 1 Mach-O fat file with 1 architecture Modified: head/contrib/file/Magdir/compress == --- head/contrib/file/Magdir/compress Mon May 18 22:29:44 2009 (r192349) +++ head/contrib/file/Magdir/compress Mon May 18 22:34:33 2009 (r192350) @@ -195,6 +195,10 @@ # bug #364260) #0 string
svn commit: r192351 - head/sys/netinet
Author: bz Date: Mon May 18 22:34:44 2009 New Revision: 192351 URL: http://svn.freebsd.org/changeset/base/192351 Log: Revert the logical change of r192341. net.inet.ip.fw.one_pass is a classic ip_input.c variable and is used in the pfil and bridge code as well. As ipfw is loadable we need to always provide it. That is the reason why it lives in struct vnet_inet and not in struct vnet_ipfw. Modified: head/sys/netinet/ip_fw2.c Modified: head/sys/netinet/ip_fw2.c == --- head/sys/netinet/ip_fw2.c Mon May 18 22:34:33 2009(r192350) +++ head/sys/netinet/ip_fw2.c Mon May 18 22:34:44 2009(r192351) @@ -182,7 +182,7 @@ SYSCTL_V_PROC(V_NET, vnet_ipfw, _net_ine ipfw_chg_hook, "I", "Enable ipfw"); SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, autoinc_step, CTLFLAG_RW, autoinc_step, 0, "Rule number auto-increment step"); -SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, one_pass, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_fw, OID_AUTO, one_pass, CTLFLAG_RW | CTLFLAG_SECURE3, fw_one_pass, 0, "Only do a single pass through ipfw when using dummynet(4)"); SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, verbose, ___ 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: r192352 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/uart
Author: marcel
Date: Mon May 18 22:45:09 2009
New Revision: 192352
URL: http://svn.freebsd.org/changeset/base/192352
Log:
MFC r190834:
Fix hangs caused by hardware that signals receive errors
(framing, parity, etc), but does not indicate characters
being received. Since no chracters have been received,
ignore the line errors.
PR: 131006
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/dev/uart/uart_dev_ns8250.c
Modified: stable/7/sys/dev/uart/uart_dev_ns8250.c
==
--- stable/7/sys/dev/uart/uart_dev_ns8250.c Mon May 18 22:34:44 2009
(r192351)
+++ stable/7/sys/dev/uart/uart_dev_ns8250.c Mon May 18 22:45:09 2009
(r192352)
@@ -50,14 +50,16 @@ __FBSDID("$FreeBSD$");
static void
ns8250_clrint(struct uart_bas *bas)
{
- uint8_t iir;
+ uint8_t iir, lsr;
iir = uart_getreg(bas, REG_IIR);
while ((iir & IIR_NOPEND) == 0) {
iir &= IIR_IMASK;
- if (iir == IIR_RLS)
- (void)uart_getreg(bas, REG_LSR);
- else if (iir == IIR_RXRDY || iir == IIR_RXTOUT)
+ if (iir == IIR_RLS) {
+ lsr = uart_getreg(bas, REG_LSR);
+ if (lsr & (LSR_BI|LSR_FE|LSR_PE))
+ (void)uart_getreg(bas, REG_DATA);
+ } else if (iir == IIR_RXRDY || iir == IIR_RXTOUT)
(void)uart_getreg(bas, REG_DATA);
else if (iir == IIR_MLSC)
(void)uart_getreg(bas, REG_MSR);
@@ -563,7 +565,6 @@ ns8250_bus_ipend(struct uart_softc *sc)
ipend = 0;
if (iir & IIR_RXRDY) {
lsr = uart_getreg(bas, REG_LSR);
- uart_unlock(sc->sc_hwmtx);
if (lsr & LSR_OE)
ipend |= SER_INT_OVERRUN;
if (lsr & LSR_BI)
@@ -571,12 +572,14 @@ ns8250_bus_ipend(struct uart_softc *sc)
if (lsr & LSR_RXRDY)
ipend |= SER_INT_RXREADY;
} else {
- uart_unlock(sc->sc_hwmtx);
if (iir & IIR_TXRDY)
ipend |= SER_INT_TXIDLE;
else
ipend |= SER_INT_SIGCHG;
}
+ if (ipend == 0)
+ ns8250_clrint(bas);
+ uart_unlock(sc->sc_hwmtx);
return ((sc->sc_leaving) ? 0 : ipend);
}
___
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: r192353 - head/release/doc/en_US.ISO8859-1/relnotes
Author: delphij Date: Mon May 18 22:46:59 2009 New Revision: 192353 URL: http://svn.freebsd.org/changeset/base/192353 Log: FILE has been upgraded from 4.23 to 5.03. Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.sgml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Mon May 18 22:45:09 2009(r192352) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Mon May 18 22:46:59 2009(r192353) @@ -443,6 +443,9 @@ CVS has been updated from 1.11.17 to a post-1.11.22 snapshot from 10 March 2008. +FILE has been updated from 4.23 + to 5.03. + hostapd has been updated from 0.5.8 to 0.5.10. ___ 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: r192360 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs vm
Author: kmacy
Date: Tue May 19 01:14:37 2009
New Revision: 192360
URL: http://svn.freebsd.org/changeset/base/192360
Log:
- back out direct map hack
- it is no longer needed
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
head/sys/vm/vm_contig.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue May 19
00:02:58 2009(r192359)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue May 19
01:14:37 2009(r192360)
@@ -172,7 +172,6 @@ uint64_t zfs_arc_max;
uint64_t zfs_arc_min;
uint64_t zfs_arc_meta_limit = 0;
int zfs_mdcomp_disable = 0;
-int arc_large_memory_enabled = 0;
TUNABLE_QUAD("vfs.zfs.arc_max", &zfs_arc_max);
TUNABLE_QUAD("vfs.zfs.arc_min", &zfs_arc_min);
@@ -3430,13 +3429,17 @@ arc_init(void)
arc_min_prefetch_lifespan = 1 * hz;
/* Start out with 1/8 of all memory */
-#if defined(_KERNEL) && (__amd64__)
- arc_c = physmem*PAGE_SIZE / 8;
- if (physmem*PAGE_SIZE > kmem_size() && (physmem > (1UL<<31)))
- arc_large_memory_enabled = 1;
-#else
arc_c = kmem_size() / 8;
-#endif
+#if 0
+#ifdef _KERNEL
+ /*
+* On architectures where the physical memory can be larger
+* than the addressable space (intel in 32-bit mode), we may
+* need to limit the cache to 1/8 of VM size.
+*/
+ arc_c = MIN(arc_c, vmem_size(heap_arena, VMEM_ALLOC | VMEM_FREE) / 8);
+#endif
+#endif
/* set min cache to 1/32 of all memory, or 16MB, whichever is more */
arc_c_min = MAX(arc_c / 4, 64<<18);
/* set max to 1/2 of all memory, or all but 1GB, whichever is more */
@@ -3450,13 +3453,8 @@ arc_init(void)
* Allow the tunables to override our calculations if they are
* reasonable (ie. over 16MB)
*/
-#if defined(_KERNEL) && defined(__amd64__)
- if (zfs_arc_max >= 64<<18)
- arc_c_max = zfs_arc_max;
-#else
if (zfs_arc_max >= 64<<18 && zfs_arc_max < kmem_size())
arc_c_max = zfs_arc_max;
-#endif
if (zfs_arc_min >= 64<<18 && zfs_arc_min <= arc_c_max)
arc_c_min = zfs_arc_min;
#endif
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Tue May 19
00:02:58 2009(r192359)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Tue May 19
01:14:37 2009(r192360)
@@ -33,9 +33,6 @@
#include
#include
-#if defined(_KERNEL) && defined(__amd64__)
-#include
-#endif
/*
* ==
* I/O priority table
@@ -88,8 +85,6 @@ extern vmem_t *zio_alloc_arena;
#defineIO_IS_ALLOCATING(zio) \
((zio)->io_orig_pipeline & (1U << ZIO_STAGE_DVA_ALLOCATE))
-extern int arc_large_memory_enabled;
-
void
zio_init(void)
{
@@ -210,80 +205,6 @@ zio_buf_alloc(size_t size)
#endif
}
-#if defined(_KERNEL) && defined(__amd64__)
-extern int vm_contig_launder(int queue);
-
-static void *
-zio_large_malloc(size_t size)
-{
- void *ret;
- vm_page_t pages;
- unsigned long npgs;
- int actl, actmax, inactl, inactmax, tries;
- int flags = M_WAITOK;
- vm_paddr_t low = (1UL<<29); /* leave lower 512MB untouched */
- vm_paddr_t high = ~(vm_paddr_t)0;
- unsigned long alignment = 1;
- unsigned long boundary = 0;
-
- npgs = round_page(size) >> PAGE_SHIFT;
- tries = 0;
-retry:
- pages = vm_phys_alloc_contig(npgs, low, high, alignment, boundary);
- if (pages == NULL) {
- if (tries < ((flags & M_NOWAIT) != 0 ? 1 : 3)) {
- vm_page_lock_queues();
- inactl = 0;
- inactmax = tries < 1 ? 0 : cnt.v_inactive_count;
- actl = 0;
- actmax = tries < 2 ? 0 : cnt.v_active_count;
-again:
- if (inactl < inactmax &&
- vm_contig_launder(PQ_INACTIVE)) {
- inactl++;
- goto again;
- }
- if (actl < actmax &&
- vm_contig_launder(PQ_ACTIVE)) {
- actl++;
- goto again;
- }
- vm_page_unlock_queues();
- tries++;
- goto retry;
- }
-
- ret = NULL;
- } else {
- int i;
-
- vm_page_lock_queues();
- for (i = 0; i < npgs; i++)
- vm_
svn commit: r192361 - head/sys/dev/ciss
Author: scottl
Date: Tue May 19 01:41:11 2009
New Revision: 192361
URL: http://svn.freebsd.org/changeset/base/192361
Log:
Updated PCI ID's from the vendor
Modified:
head/sys/dev/ciss/ciss.c
Modified: head/sys/dev/ciss/ciss.c
==
--- head/sys/dev/ciss/ciss.cTue May 19 01:14:37 2009(r192360)
+++ head/sys/dev/ciss/ciss.cTue May 19 01:41:11 2009(r192361)
@@ -314,17 +314,20 @@ static struct
{ 0x103C, 0x3234, CISS_BOARD_SA5, "HP Smart Array P400" },
{ 0x103C, 0x3235, CISS_BOARD_SA5, "HP Smart Array P400i" },
{ 0x103C, 0x3236, CISS_BOARD_SA5, "HP Smart Array" },
-{ 0x103C, 0x3237, CISS_BOARD_SA5, "HP Smart Array" },
+{ 0x103C, 0x3237, CISS_BOARD_SA5, "HP Smart Array E500" },
{ 0x103C, 0x3238, CISS_BOARD_SA5, "HP Smart Array" },
{ 0x103C, 0x3239, CISS_BOARD_SA5, "HP Smart Array" },
{ 0x103C, 0x323A, CISS_BOARD_SA5, "HP Smart Array" },
{ 0x103C, 0x323B, CISS_BOARD_SA5, "HP Smart Array" },
{ 0x103C, 0x323C, CISS_BOARD_SA5, "HP Smart Array" },
+{ 0x103C, 0x323D, CISS_BOARD_SA5, "HP Smart Array P700m" },
{ 0x103C, 0x3241, CISS_BOARD_SA5, "HP Smart Array P212" },
{ 0x103C, 0x3243, CISS_BOARD_SA5, "HP Smart Array P410" },
{ 0x103C, 0x3245, CISS_BOARD_SA5, "HP Smart Array P410i" },
{ 0x103C, 0x3247, CISS_BOARD_SA5, "HP Smart Array P411" },
{ 0x103C, 0x3249, CISS_BOARD_SA5, "HP Smart Array P812" },
+{ 0x103C, 0x324A, CISS_BOARD_SA5, "HP Smart Array P712m" },
+{ 0x103C, 0x324B, CISS_BOARD_SA5, "HP Smart Array" },
{ 0, 0, 0, NULL }
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
