delphij [Sun, 9 Oct 2005 03:15:36 +0000 (03:15 +0000)]
MFC (by ps)
| In nfs_nget() if two threads race on the same filehandle, the loser
| should cause the nfsnode to get freed. This fixes a potential vnode
| (and nfsnode) leak in that path.
|
| Submitted by: Mohan Srinivasan
| Reviewed by: phk
|
| Revision Changes Path
| 1.78 +2 -1 src/sys/nfsclient/nfs_node.c
delphij [Sun, 9 Oct 2005 03:13:49 +0000 (03:13 +0000)]
MFC (by andre)
| Remove bogous semicolons at the end of the definitions of
| 'do { ... } while (0)' macros.
|
| PR: kern/83088
| Sumbitted by: <antoine.brodin at laposte.net>
rodrigc [Sat, 8 Oct 2005 22:11:38 +0000 (22:11 +0000)]
MFC 1.58
Fix so that when a slice or a partition is removed through g_slice_config(),
it is destroyed in GEOM, in addition to being removed from /dev.
Before this patch, if you applied a new MBR which deleted a slice,
the deleted slice would not be in /dev, but it would still appear
in kern.geom.conftxt and kern.geom.confxml, which would confused
the diskPartitionEditor in sysinstall.
Submitted by: pjd
Requested by: delphij
Approved by: re (scottl)
imp [Sat, 8 Oct 2005 18:00:41 +0000 (18:00 +0000)]
MFC: Bring in support for new PC Card chipset (TC5299J) and old
ISA/PCI chipset (RTL8019 and RTL8029). Eliminate ED_NO_MIIBUS option.
You are now required to have miibus if you have pccard in your kernel
(but not required if you don't!). Split out register definitions for
possible future subsetting.
delphij [Sat, 8 Oct 2005 17:57:28 +0000 (17:57 +0000)]
MFC (by deischen)
| Add a cancellation point for usleep().
|
| While here, fix sleep() so that it is also a cancellation point (a
| missing weak reference prevented that).
|
| Revision Changes Path
| 1.10 +19 -0 src/lib/libthr/thread/thr_syscalls.c
Approved by: re (kensmith)
Ok'ed by: deischen, davidxu
delphij [Sat, 8 Oct 2005 17:57:10 +0000 (17:57 +0000)]
MFC (by deischen)
| Make syslog() use the internal (non-cancellation point) _usleep().
| Prior to this it was calling the cancellable usleep() while holding
| a lock.
|
| Revision Changes Path
| 1.36 +1 -1 src/lib/libc/gen/syslog.c
Approved by: re (kensmith)
Ok'ed by: deischen, davidxu
delphij [Sat, 8 Oct 2005 17:56:53 +0000 (17:56 +0000)]
MFC (by deischen)
| Make usleep() overridable by the thread libraries so they can provide
| cancellation points.
|
| Noticed by: phk
|
| Revision Changes Path
| 1.29 +4 -1 src/lib/libc/gen/usleep.c
Approved by: re (kensmith)
Ok'ed by: deischen, davidxu
delphij [Sat, 8 Oct 2005 17:37:29 +0000 (17:37 +0000)]
MFC 1.50 (by keramida):
| Add a short description of how a literal colon ':' can be inlined in the
| value of capability databases, since it's not really obvious how a colon
| can be escaped, and a pointer to the getcap(3) manpage for more details.
|
| Triggered by: a question by Ceri on -questions
yar [Sat, 8 Oct 2005 03:32:54 +0000 (03:32 +0000)]
MFC:
Add an rc.d script to start the pfsync interface after all
the conventional network interfaces have been started so that
pfsync can be attached to any of the latter.
Record the dependency of rc.d/pf on the newly added rc.d/pfsync.
Also make rc.d/pf start as early as before rc.d/routing to improve
system security.
glebius [Fri, 7 Oct 2005 14:00:06 +0000 (14:00 +0000)]
Big overall MFC of polling(4) cleanup:
o First attempt on removing Giant from polling. Details:
http://lists.freebsd.org/pipermail/cvs-src/2005-September/051848.html
o Second attempt, and big polling cleanup including:
- Functinal approach to turning polling on/off
- Deprecating of poll_in_trap
- Removal of ifnet knowledge from kern_poll.c
Details:
http://lists.freebsd.org/pipermail/cvs-src/2005-October/053267.html
o Improved checking of user configurable sysctls. Details:
http://lists.freebsd.org/pipermail/cvs-src/2005-October/053351.html
o Moving DEVICE_POLLING from opt_global.h to opt_device_polling.h:
http://lists.freebsd.org/pipermail/cvs-src/2005-October/053479.html
o All related documentation fixes.
Approved by: re (kensmith)
Thanks to: everyone, who helped with testing
glebius [Fri, 7 Oct 2005 13:55:58 +0000 (13:55 +0000)]
MFC:
Define HAVE_KERNEL_OPTION_HEADERS when building kernel and when building
modules along with kernel.
After this change it is possible to embrace opt_*.h includes with ifdef
HAVE_KERNEL_OPTION_HEADERS. And thus, avoid editing a lot of Makefiles
in modules directory each time we introduce a new opt_xxx.h.
thompsa [Fri, 7 Oct 2005 01:51:29 +0000 (01:51 +0000)]
MFC r1.144
When bridging is enabled and an ARP request is recieved on a member interface,
the arp code will search all local interfaces for a match. This triggers a
kernel log if the bridge has been assigned an address.
arp: ac:de:48:18:83:3d is using my IP address 192.168.0.142!
bridge0: flags=8041<UP,RUNNING,MULTICAST> mtu 1500
inet 192.168.0.142 netmask 0xffffff00
ether ac:de:48:18:83:3d
Silence this warning for 6.0 to stop unnecessary bug reports, the code will need
to be reworked.
jhb [Thu, 6 Oct 2005 20:20:12 +0000 (20:20 +0000)]
MFC: Minor fixups:
- Use if_printf() and device_printf().
- Don't zero the softc.
- Cleanup error handling in attach().
- Don't double init the callout handle.
jhb [Thu, 6 Oct 2005 20:05:04 +0000 (20:05 +0000)]
MFC: Consolidate common code for assigning interrupts to PCI devices and
add a sledgehammer tunable to override PCI interrupt routing for any PCI
device.
delphij [Thu, 6 Oct 2005 19:23:02 +0000 (19:23 +0000)]
MFC 1.280 (by des):
| Two minor optimizations of fdalloc():
|
| - if minfd < fd_freefile (as is most often the case, since minfd is
| usually 0), set it to fd_freefile.
|
| - remove a call to fd_first_free() which duplicates work already done
| by fdused().
|
| This change results in a small but measurable speedup for processes
| with large numbers (several thousands) of open files.
|
| PR: kern/85176
| Submitted by: Divacky Roman <xdivac02@stud.fit.vutbr.cz>
|
| Revision Changes Path
| 1.280 +3 -1 src/sys/kern/kern_descrip.c
delphij [Thu, 6 Oct 2005 18:58:59 +0000 (18:58 +0000)]
MFC (by alc):
| Eliminate an unneeded reference on a vm object. If, in fact, the nearby
| vm_map_find() fails, then the excess reference causes the vm object to be
| leaked.
|
| Reviewed by: tegge
|
| Revision Changes Path
| 1.83 +0 -2 src/sys/kern/link_elf.c
| 1.88 +0 -2 src/sys/kern/link_elf_obj.c
delphij [Thu, 6 Oct 2005 18:57:13 +0000 (18:57 +0000)]
MFC 1.82:
| Revert the previous change for two reasons: (1) If vm_map_find() succeeds
| but vm_map_wire() fails, then a vm object, vm map entries, and kernel_map
| free space is leaked and (2) unwiring is handled automatically by
| vm_map_remove().
|
| Suggested by: tegge
|
| Revision Changes Path
| 1.82 +10 -17 src/sys/kern/link_elf.c
delphij [Thu, 6 Oct 2005 18:47:58 +0000 (18:47 +0000)]
MFC Import of the new version of the HPTMV driver from Highpoint.
The major change here is the support for amd64, as well as possible
support for PAE. Many thanks to Highpoint for continuing to support
FreeBSD.
delphij [Thu, 6 Oct 2005 18:29:30 +0000 (18:29 +0000)]
MFC 1.12 (by netchild)
| The resource_xxx routines in subr_hints.c are called before and after the
| kenv environment in kern_environment.c switches to dynamic kenv. The prior
| call sets the static variable hintp to the static hints in subr_hints.c
| (hintmode==0).
|
| However, changes to the environment are not detected by the resource_xxx
| lookups after the change to dynamic kernel environment, so the lookup
| routines only report the old stuff of hintmode==0, even after the change to
| the dynamic kenv. This causes kenv users to see a different environment than
| the kernel routines.
|
| This is a problem in the mixer.c code that looks up initial mixer volume
| settings from the hints: If the hints are dynamic and not from the
| device.hints file, mixer.c doesn't see them, but kenv does.
|
| The patch from the PR (modified to comply to the style of the function)
| solves this.
|
| PR: 83686
| Submitted by: Harry Coin <harrycoin@qconline.com>
delphij [Thu, 6 Oct 2005 18:27:27 +0000 (18:27 +0000)]
MFC 1.154 (by rodrigc)
| In ext2_mountfs(), check that the superblock size, SBSIZE,
| is aligned with the sectorsize value returned by GEOM, before
| doing a bread() of the superblock.
| This eliminates a panic when trying the following on an empty CD-ROM drive:
| mount_ext2fs /dev/acd0 /mnt
|
| Reviewed by: phk
|
| Revision Changes Path
| 1.154 +12 -0 src/sys/gnu/fs/ext2fs/ext2_vfsops.c
pjd [Thu, 6 Oct 2005 18:17:29 +0000 (18:17 +0000)]
MFC: sys/geom/eli/g_eli.h 1.4
Add a __packed keyword to g_eli_metadata struct definition, so
sizeof(struct g_eli_metadata) will return the exact number of bytes needed
for storing it on the disk.
Without this change GELI was unusable on amd64 (and probably other 64-bit
archs), because sizeof(struct g_eli_metadata) was greater than 512 bytes
and geli(8) was failing on assertion.
Reported by: Michael Reifenberger <mike@Reifenberger.com>
Reminded by: delphij
Approved by: re (scottl)
jhb [Thu, 6 Oct 2005 18:12:06 +0000 (18:12 +0000)]
MFC: Add atomic_fetchadd(9) operation for types int and 32.
Other small updates to atomic(9) include:
- Note that arm and ppc don't provide 64-bit atomic ops.
- Update sample code.
ups [Thu, 6 Oct 2005 17:53:46 +0000 (17:53 +0000)]
MFC: 1.176
Don't pretend to be thread0 when calling sync().
It confuses the lock manager since in some places thread0 is
then used for vnode locking while curthread is used for vnode unlocking.
yar [Thu, 6 Oct 2005 15:01:56 +0000 (15:01 +0000)]
MFC:
ifconfig.c 1.116
For the sake of consistency and easier typing,
introduce "-tunnel" as an alias for "deletetunnel".
The latter is overly long and prone to typos, but
keep it for POLA since it costs nothing.
ifvlan.c 1.8
Deprecate the useless argument to -vlandev.
ifconfig.8 1.102-1.105
Document the above changes.
Logically group vlan- and tunnel-related parameters.
rwatson [Thu, 6 Oct 2005 13:15:21 +0000 (13:15 +0000)]
Merge db_command.c:1.62 from HEAD to RELENG_6:
Add a DDB "traceall" function, which stack traces all known process
threads. This is quite useful if generating a debug log for post-mortem
by another developer, in which case the person at the console may not
know which threads are of interest. The output of this can be quite
long.
- In gem_ioctl() move the call to ether_ioctl() to the default case of
the switch statement in order to make this driver more like other
Ethernet NIC drivers.
- In gem_attach() call gem_stop() in addition to gem_reset() to make
sure the chip actually is stopped and not just reset.
- In gem_stop() also stop the gem_rint_timeout() callout in case the
driver is compiled with GEM_RINT_TIMEOUT defined.
- Remove NOP spl*() calls and add locking (making gem(4) MPSAFE).
This MFC actually brings the RELENG_6 gem(4) in line with HEAD which
means that it additionally includes a comment update regarding the
IFF_OACTIVE -> IFF_DRV_OACTIVE rename which was part of if_gem.c 1.33
but missed in the respective MFC in 1.29.2.2.
Add a font width argument to vi_load_font_t, vi_save_font_t and vi_putm_t
and do some preparations for handling 12x22 fonts (currently lots of code
implies and/or hardcodes a font width of 8 pixels). This will be required
on sparc64 which uses a default font size of 12x22 in order to add font
loading and saving support as well as to use a syscons(4)-supplied mouse
pointer image.
rwatson [Wed, 5 Oct 2005 10:31:05 +0000 (10:31 +0000)]
Merge init_main.c:1.258, mac_vfs.c:1.110, mac_biba.c:1.89,
mac_lomac.c:1.37, mac_mls.c:1.74, mac_stub.c:1.55, mac_test.c:1.62,
mac.h:1.69, mac_policy.h:1.70 from HEAD to RELENG_6:
Remove mac_create_root_mount() and mpo_create_root_mount(), which
provided access to the root file system before the start of the
init process. This was used briefly by SEBSD before it knew about
preloading data in the loader, and using that method to gain
access to data earlier results in fewer inconsistencies in the
approach. Policy modules still have access to the root file system
creation event through the mac_create_mount() entry point.
Removed now, and will be removed from RELENG_6, in order to gain
third party policy dependencies on the entry point for the lifetime
of the 6.x branch.
Obtained from: TrustedBSD Project
Submitted by: Chris Vance <Christopher dot Vance at SPARTA dot com>
truckman [Wed, 5 Oct 2005 05:30:24 +0000 (05:30 +0000)]
MFC kern_proc.c - fix locking in sysctl_kern_proc()
Original commit message:
FreeBSD src repository
Modified files:
sys/kern kern_proc.c
Log:
Always wire the sysctl output buffer in sysctl_kern_proc() before
calling sysctl_out_proc(). -- fix from jhb
Move the code in fill_kinfo_thread() that gathers data from struct proc
into the new function fill_kinfo_proc_only().
Change all callers of fill_kinfo_thread() to call both
fill_kinfo_proc_only() and fill_kinfo() thread. When gathering
data from a multi-threaded process, fill_kinfo_proc_only() only needs
to be called once.
Grab sched_lock before accessing the process thread list or calling
fill_kinfo_thread().
truckman [Wed, 5 Oct 2005 05:24:53 +0000 (05:24 +0000)]
MFC ffs_alloc.c 1.135 - clear i_flag field in recycled inodes
Original commit message:
FreeBSD src repository
Modified files:
sys/ufs/ffs ffs_alloc.c
Log:
Initialize the inode i_flag field in ffs_valloc() to clean up any
stale flag bits left over from before the inode was recycled.
Without this change, a leftover IN_SPACECOUNTED flag could prevent
softdep_freefile() and softdep_releasefile() from incrementing
fs_pendinginodes. Because handle_workitem_freefile() unconditionally
decrements fs_pendinginodes, a negative value could be reported at
file system unmount time with a message like:
unmount pending error: blocks 0 files -3
The pending block count in fs_pendingblocks could also be negative
for similar reasons. These errors can cause the data returned by
statfs() to be slightly incorrect. Some other cleanup code in
softdep_releasefile() could also be incorrectly bypassed.
rse [Tue, 4 Oct 2005 17:29:00 +0000 (17:29 +0000)]
MFC to RELENG_6:
| Fix system shutdown timeout handling by again supporting longer running
| shutdown procedures (which have a duration of more than 120 seconds).
|
| We have two user-space affecting shutdown timeouts: a "soft" one in
| /etc/rc.shutdown and a "hard" one in init(8). The first one can be
| configured via /etc/rc.conf variable "rcshutdown_timeout" and defaults
| to 30 seconds. The second one was originally (in 1998) intended to be
| configured via sysctl(8) variable "kern.shutdown_timeout" and defaults
| to 120 seconds.
|
| Unfortunately, the "kern.shutdown_timeout" was declared "unused" in 1999
| (as it obviously is actually not used within the kernel itself) and
| hence was intentionally but misleadingly removed in revision 1.107 from
| init_main.c. Kernel sysctl(8) variables are certainly a wrong way to
| control user-space processes in general, but in this particular case the
| sysctl(8) variable should have remained as it supports init(8), which
| isn't passed command line flags (which in turn could have been set via
| /etc/rc.conf), etc.
|
| As there is already a similar "kern.init_path" sysctl(8) variable which
| directly affects init(8), resurrect the init(8) shutdown timeout under
| sysctl(8) variable "kern.init_shutdown_timeout". But this time document
| it as being intentionally unused within the kernel and used by init(8).
| Also document it in the manpages init(8) and rc.conf(5).
|
| Reviewed by: phk
| MFC after: 2 weeks
|
| Revision Changes Path
| 1.48 +7 -1 src/sbin/init/init.8
| 1.61 +1 -1 src/sbin/init/init.c
| 1.264 +16 -1 src/share/man/man5/rc.conf.5
| 1.257 +11 -0 src/sys/kern/init_main.c
dds [Tue, 4 Oct 2005 15:26:10 +0000 (15:26 +0000)]
MFC 1.28
Bug fix: a numeric flag specification in the substitute command would
cause the next substitute flag to be ignored.
While working at it, detect and report overflows.
Reported by: Jingsong Liu
Bugged by: Xin Li
Approved by: re (kensmith)
glebius [Tue, 4 Oct 2005 14:07:44 +0000 (14:07 +0000)]
MFC 1.73:
In em_process_receive_interrupts() store and clear adapter->fmt. This
make function reenterable. In the runtime the race is masked by
serializing
of em_process_receive_interrupts() either by interrupt thread, or by
polling. The race can be triggered when polling is switched on or off.
peadar [Tue, 4 Oct 2005 13:13:57 +0000 (13:13 +0000)]
MFC BOOTSIG[23] removal:
msdosfs_vfsops.c v1.146
bootsect.h v1.13
Remove checks for BOOTSIG[23] from FAT32 bootblocks.
There seems to be very little documentary evidence outside this
implementation to suggest a these checks are neccessary, and more
than one camera-formatted flash disk fails the check, but mounts
successfully on most other systems.
cognet [Tue, 4 Oct 2005 12:50:11 +0000 (12:50 +0000)]
MFC rev 1.146 (and 1.147)
revision 1.146
date: 2005/09/28 16:05:13; author: cognet; state: Exp; lines: +7 -1
Use SO_REUSEADDR on the socket, to make the use of syslogd in jails easier.
Submitted by: Jeremie Le Hen <jeremie le-hen org>
Approved by: re
Log:
Un-staticize runningbufwakeup() and staticize updateproc.
Add a new private thread flag to indicate that the thread should
not sleep if runningbufspace is too large.
Set this flag on the bufdaemon and syncer threads so that they skip
the waitrunningbufspace() call in bufwrite() rather than than
checking the proc pointer vs. the known proc pointers for these two
threads. A way of preventing these threads from being starved for
I/O but still placing limits on their outstanding I/O would be
desirable.
Set this flag in ffs_copyonwrite() to prevent bufwrite() calls from
blocking on the runningbufspace check while holding snaplk. This
prevents snaplk from being held for an arbitrarily long period of
time if runningbufspace is high and greatly reduces the contention
for snaplk. The disadvantage is that ffs_copyonwrite() can start
a large amount of I/O if there are a large number of snapshots,
which could cause a deadlock in other parts of the code.
Call runningbufwakeup() in ffs_copyonwrite() to decrement runningbufspace
before attempting to grab snaplk so that I/O requests waiting on
snaplk are not counted in runningbufspace as being in-progress.
Increment runningbufspace again before actually launching the
original I/O request.
Prior to the above two changes, the system could deadlock if enough
I/O requests were blocked by snaplk to prevent runningbufspace from
falling below lorunningspace and one of the bawrite() calls in
ffs_copyonwrite() blocked in waitrunningbufspace() while holding
snaplk.
Log:
Correct previous commit to fix the sense of the TDP_NORUNNINGBUF
check in ffs_copyonwrite() that is a precondition for calling
waitrunningbufspace().
Pointed out by: tegge
Pointy hat to: truckman
MFC after: 3 days
truckman [Tue, 4 Oct 2005 04:29:08 +0000 (04:29 +0000)]
MFC kern_exec.c 1.276 (and 1.278)
Original commit messages:
truckman 2005-10-01 08:33:57 UTC
FreeBSD src repository
Modified files:
sys/kern kern_exec.c
Log:
Copy new process argument list in do_execve() before grabbing PROC_LOCK
to avoid touching pageable memory while holding a mutex.
Simplify argument list replacement logic.
PR: kern/84935
Submitted by: "Antoine Pelisse" apelisse AT gmail.com (in a different form)
MFC after: 3 days
projects / FreeBSD / FreeBSD.git / log