117703 Commits

Author SHA1 Message Date
cvs2svn
1ad5f43971 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-24 05:35:41 +00:00
imp
971bfd368d MFC: 1.2.
Mempage size needs to be 1k rather than 4k.  Prior versions of FreeBSD
used this value and it was recently increased to 4k.  This broke the
two 16-bit card at boot scenario.  Revert it back to 1k.

Approved by: re (scottl)
2005-10-23 18:22:16 +00:00
delphij
0e1eb2fee5 Remove a note that claims that the debugging options are turned on
by default, to match the reality that these has been turned off on
the 6-STABLE branch since 6.0-BETA6.

This is a direct commit against RELENG_6 since it is not applicable
for HEAD.

Approved by:	re (scottl)
2005-10-23 03:34:43 +00:00
thompsa
35a7273cfa MFC ng_ether support for if_bridge and cleanup of bridge hooks.
bridgestp.c; r1.8
 if_bridge.c; r1.25, 1.27
 if_bridgevar.h; r1.5
 if_ethersubr.c; r1.201, 1.202, 1.206
 ng_ether.c; r1.52 - 1.54

Approved by:	re (scottl)
2005-10-23 02:36:58 +00:00
glebius
e01fc073e8 Sync with HEAD. Revisions merged:
- rev. 1.76. Removed FreeBSD 4.x code.
  - rev. 1.77, 1.79. Together with rev. 1.71 (already merged) this
    fixes problems when some code is executed in driver when
    em_process_receive_interrupts() drops lock. This can occur
    at runtime, when polling(4) mode is changed to interrupt driver
    or vise versa, but more likely this can happen when administrator
    issues some ifconfig commands.
  - rev. 1.78. In em_process_receive_interrupts(), call bus_dmamap_sync()
    for the descriptors set each time we modify one descriptor, instead
    of doing it only at the function exit.
  - rev. 1.80. Loop in em_intr() until interrupt cause register is clear,
    don't mask overrun interrupt.
  - rev. 1.81. Several locking and other fixes.

See particular revision logs for more detailed information.

Approved by:	re
2005-10-22 21:20:17 +00:00
yar
4c02686eae MFC notes on ifconfig(8): -tunnel, -vlandev.
Approved by:	re (hrs)
2005-10-21 15:44:47 +00:00
suz
af06cff4f6 MFC 1.56 (added a missing unlock)
Approved by: re(scottl)
2005-10-20 11:49:25 +00:00
cvs2svn
e87417d77f This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-20 11:10:44 +00:00
ups
6293539098 MFC vm_machdep.c 1.261-1.263
Rev: 1.261

  Ensure that a thread stays on same CPU when calculating per CPU
  TLB shootdown requirements. Otherwise a CPU may not get the needed
  TLB invalidation.

  The PTE valid and access flags can not be used here to avoid TLB
  shootdowns unless sf->cpumask == all_cpus.
  ( Otherwise some CPUs may still hold an even older entry in the TLB)
  Since sf_buf_alloc mappings are normally always used this is
  also not really useful and presetting accessed and modified
  allows the CPU to speculatively load the entry into the TLB.

  Both bugs can cause random data corruption.

Rev: 1.262

  Restore optimizations to reduce TLB shootdowns.
  Alan Cox pointed out that they are really useful for
  sendfile().

Rev: 1.263
  Restore the UP optimization to reduce the number of TLB
  invalidations.  The
  previous revision only restored the MP optimization.

  Describe the optimization strategy for TLB invalidations in a comment.

Approved by:	re@ (scottl)
2005-10-20 01:03:23 +00:00
phk
484eb21391 MFC:
Use correct criteria to determine if dirent can be removed
	right away.

Approved by:	re@ (scottl)
2005-10-19 21:25:31 +00:00
thompsa
73007defbe MFC: if_bridge.c r1.26, if_ethersubr.c r1.205
>   Use bridge_ifdetach() to notify the bridge that a member has been detached.
>   The bridge can then remove it from its interface list and not try to send
>   out via a dead pointer.

Approved by:	re (scottl)
2005-10-19 20:46:16 +00:00
truckman
35158d47d9 MFC ufs_lookup.c 1.78 and 1.79.
Original commit messages:
  Modified files:
    sys/ufs/ufs          ufs_lookup.c
  Log:
  Close a race in the ufs_lookup() code that handles the ISDOTDOT
  case by saving the value of dp->i_ino before unlocking the vnode
  for the current directory and passing the saved value to VFS_VGET().

  Without this change, another thread can overwrite dp->i_ino after
  the current directory is unlocked, causing  ufs_lookup() to lock
  and return the wrong vnode in place of the vnode for its parent
  directory.  A deadlock can occur if dp->i_ino was changed to a
  subdirectory of the current directory because the root to leaf vnode
  lock ordering will be violated.  A vnode lock can be leaked if
  dp->i_ino was changed to point to the current directory, which
  causes the current vnode lock for the current directory to be
  recursed, which confuses lookup() into calling vrele() when it
  should be calling vput().

  The probability of this bug being triggered seems to be quite low
  unless the sysctl variable debug.vfscache is set to 0.

  Reviewed by:    jhb
  MFC after:      2 weeks

  Revision  Changes    Path
  1.78      +3 -1      src/sys/ufs/ufs/ufs_lookup.c

  Modified files:
    sys/ufs/ufs          ufs_lookup.c
  Log:
  Correct the type of the temporary variable used by ufs_lookup.c:1.78
  to fix the race condition in the ufs_lookup() ISDOTDOT code.

  Noticed by:     bde
  MFC after:      12 days

  Revision  Changes    Path
  1.79      +1 -1      src/sys/ufs/ufs/ufs_lookup.c

Approved by:	re (scottl)
2005-10-19 20:31:45 +00:00
truckman
ac3fe75ffe MFC nwfs_vnops.c 1.42
Original commit message:
  Modified files:
    sys/fs/nwfs          nwfs_vnops.c
  Log:
  Update nwfs_lookup() to match the current cache_lookup() API.
  cache_lookup() has returned a ref'ed and locked vnode since
  vfs_cache.c:1.96, dated Tue Mar 29 12:59:06 2005 UTC.  This change
  is similar to the change made to smbfs_lookup() in smbfs_vnops.c:1.58.

  Tested by:      "Antony Mawer" ant AT mawer.org
  MFC after:      2 weeks

  Revision  Changes    Path
  1.42      +11 -26    src/sys/fs/nwfs/nwfs_vnops.c

Approved by:	re (scottl)
2005-10-19 20:18:44 +00:00
cvs2svn
5e71b059f3 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-17 12:20:06 +00:00
imp
3159ac2409 MFC: Fixes for RTL8029 and qemu.
> imp         2005-10-13 22:06:02 UTC
>   Modified files:
>     sys/dev/ed           if_ed_rtl80x9.c
>   Log:
>   o Fix probing of rtl80x9 parts.  We shouldn't be calling
>     ed_probe_generic8390 where we're calling it.  It will be done as part
>     of ed_probe_Novel_generic after things are setup in a way that
>     ed_probe_generic8390 will grok.
>   o Fix operator precedence botch that causes a panic when setting the media
>     type for 10baseT connections.
>   o Save the type of device so that it prints with the rest of the probe.
>
>   # this should make it work with qemu again, but only if it has my patches
>   # to actually implement the RTL8029 specific registers.
>   Revision  Changes    Path
>   1.2       +6 -5      src/sys/dev/ed/if_ed_rtl80x9.c
>
>   Modified files:
>     sys/dev/ed           if_ed_pci.c
>   Log:
>   If we can't probe the RTL80x9 for some reason, fall back to probing it
>   as a Novell NE-2000.  This is necessary for unpatched qemu working
>   correctly.  qemu claims to be a RTL8029, but doesn't implement the
>   RTL8029 specific registers at this time.  I've created patches for
>   that, but there's no reason we can't use qemu's emulation w/o these
>   patches.  This should make life easier for those folks that boot
>   FreeBSD via qemu.
>   Revision  Changes    Path
>   1.48      +9 -2      src/sys/dev/ed/if_ed_pci.c

Approved by: re@ (kensmith)
2005-10-17 02:17:49 +00:00
kris
f8865b0e0a MFC r1.20:
Add a default value for VM_BCACHE_SIZE_MAX of 400MB.  This is copied from
amd64, and is a factor of 3 less than the value previously auto-sized on
a 12GB machine, which would cause an overflow in calculations involving the
maxbcache int, causing bufinit() to loop forever at boot.

Approved by:	 re (kensmith)
2005-10-17 00:19:00 +00:00
kris
ae517b7386 MFC r1.72: Partially revert r1.67 which changed maxbcache and maxswzone
from int to long without updating the <sys/buf.h> version.  This broke the
corresponding tunables on sparc.

Approved by:	re (kensmith)
2005-10-17 00:16:54 +00:00
delphij
c9d952495f MFC Release Notes Language Improvements
Approved by:	re (hrs)
2005-10-16 07:31:59 +00:00
rwatson
bf446dfcca Merge ufs_extattr.c:1.82 from HEAD to RELENG_6:
When performing a VOP_LOOKUP() as part of UFS1 extended attribute
  auto-start, set cnp.cn_lkflags to LK_EXCLUSIVE.  This flag must now
  be set so that lockmgr knows what kind of lock to acquire, and it
  will panic if not specified.  This resulted in a panic when using
  extended attributes on UFS1 as of locking work present in the 6.x
  branch.

  This is a RELENG_6_0 merge candidate.

  Reported by:    lofi

Approved by:	re (kensmith)
MFC after:	1 day
2005-10-15 18:32:55 +00:00
rwatson
4e2bc98699 Merge in.c:1.89,1.90 from HEAD to RELENG_6:
Acquire Giant conditionally in in_addmulti() and in_delmulti() based on
  whether the interface being accessed is IFF_NEEDSGIANT or not.  This
  avoids lock order reversals when calling into the interface ioctl
  handler, which could potentially lead to deadlock.

  The long term solution is to eliminate non-MPSAFE network drivers.

  Discussed with: jhb

  Unlock Giant symmetrically with respect to lock acquire order as that's
  generally nicer.

  Spotted by:     johan

RELENG_6_0 candidate.

MFC after:	1 day
Approved by:	re (kensmith)
2005-10-15 16:58:21 +00:00
jhb
c921ab0db7 MFC: Update the critical(9) manpage including dropping references to
cpu_critical_*() as they no longer exist.

Approved by:	re (kensmith)
2005-10-14 18:34:29 +00:00
joel
23bcbeb7ad MFC r1.1334:
snd_ess needs snd_sbc, so add a note about that.

Approved by:	re (hrs)
2005-10-14 18:25:41 +00:00
joel
d786c2e85d MFC r1.59:
Add support for ATI IXP[234]00.

Approved by:	re (hrs)
2005-10-14 18:17:13 +00:00
glebius
dc34959a86 Merge the 'kldstat -q' functionality, that is required for proper
operation of the /etc/rc.d/pfsync script, that was merged before
the RELENG_6_0 has been forked.

Approved by:	re (kensmith)
2005-10-14 14:02:25 +00:00
delphij
2f43cebbb6 MFC (by gibbs):
| Correct bug that caused the completed "recovery" scb to have its
| timer reset rather than the timer of an SCB still pending on the
| controller after recovery completed.  This should correct timeout
| loops seen in the field.
|
| Revision  Changes    Path
| 1.22      +2 -1      src/sys/dev/aic7xxx/aic79xx_osm.c
| 1.43      +2 -1      src/sys/dev/aic7xxx/aic7xxx_osm.c

Approved by:	re (kensmith)
2005-10-14 02:03:27 +00:00
cvs2svn
769ea47baf This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-13 18:12:47 +00:00
cvs2svn
8494e77c0e This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-10-13 17:57:35 +00:00
delphij
5d601b8b09 MFC Simplified Chinese translation of Release Documentations
Approved by:	re (hrs)
2005-10-13 17:30:59 +00:00
sos
80d71f6514 Disable RAID5 for the release.
The RIAD5 code is not complete, it does not use nor maintain the parity, so
it does actually only do RAID0. This is not wanted for a production release.

Approved by: re@ (scottl)
2005-10-13 08:15:48 +00:00
sos
c43f86ba12 MFC:
Add support for ATI IXP[234]00 series chipsets.

Approved by: re@ (scottl)
2005-10-13 08:07:46 +00:00
sos
4ecb87dfee MFC:
Properly react to allocation failures.
        Correct the former patch to the way it would have looked after review.

Approved by: re@ (scottl)
2005-10-12 20:17:34 +00:00
davidxu
cd55799acc MFC revision 1.24:
> The pthread_attr_set_createsuspend_np was broken, fix it by
 > replacing THR_FLAGS_SUSPENDED with THR_FLAGS_NEED_SUSPEND.

Approved by: re (scottl)
2005-10-11 23:24:25 +00:00
cperciva
801fe04163 Correct a man-in-the-middle SSL version rollback vulnerability.
Security:       FreeBSD-SA-05:21.openssl
Approved by:    re@ (scottl)
2005-10-11 11:53:03 +00:00
phk
5470b47e36 MFC:
Various adjustments.

Approved by:	re@ (scottl)
2005-10-11 06:42:02 +00:00
peadar
b6a59515a1 MFC revision 1.181
When breaking up a large request into smaller ones for the strategy
	routine, create all the child bio objects before starting the
	requests, rather than starting them as created. This closes a race
	whereby some number of child operations could complete before the
	rest were ever created, and prematurely freeing the parent bio.
	This fixes the panics installing in VMWare and qemu

Approved by: re (scottl@)
2005-10-09 21:24:11 +00:00
ps
29c6215782 MFC:
> revision 1.277
> date: 2005/10/03 12:49:54;  author: cperciva;  state: Exp;  lines: +8 -0
> If sufficiently bad things happen during a call to kern_execve(), it is
> possible for do_execve() to call exit1() rather than returning.  As a
> result, the sequence "allocate memory; call kern_execve; free memory"
> can end up leaking memory.
>
> This commit documents this astonishing behaviour and adds a call to
> exec_free_args() before the exit1() call in do_execve().  Since all
> the users of kern_execve() in the tree use exec_free_args() to free
> the command-line arguments after kern_execve() returns, this should
> be safe, and it fixes the memory leak which can otherwise occur.
>
> Submitted by:   Peter Holm
> MFC after:      3 days
> Security:       Local denial of service

Approved by:	re (scottl)
2005-10-09 17:28:12 +00:00
scottl
2474c1243b Move on to 6.0-RC1.
Approved by: re
2005-10-09 16:59:34 +00:00
delphij
24b61ed7a8 MFC (by des)
| Eliminate an unnecessary bcopy().
|
| Revision  Changes    Path
| 1.57      +15 -15    src/sys/fs/pseudofs/pseudofs_vnops.c

Approved by:	re (scottl)
No objection:	des
2005-10-09 08:59:34 +00:00
maxim
53f8761303 MFC rev. 1.234: teach sysctl_drop() how to deal with the sockets
in TIME_WAIT state.

Approved by:	re (scottl)
2005-10-09 08:21:34 +00:00
rik
47f527c6ee MFC:
----------------------------
	revision 1.281
	date: 2005/10/04 16:27:54;  author: rik;  state: Exp;  lines: +3 -1
	Use FILEDESC_UNLOCK(fdp) after FILE_UNLOCK(p), not before to avoid LOR.
	Slightly discussed on current@.

	LOR #055

Approved by:	re(scottl)
Requested by:	delphij
2005-10-09 08:13:56 +00:00
netchild
42d9558509 MFC:
Don't use the builtin vaalist for icc.

  Submitted by:	Igor Sysoev <is@rambler-co.ru>

Approved by:	re (scottl)
2005-10-09 07:48:48 +00:00
ume
a2ab4a826b MFC: be consistent on naming advanced API functions; use ip6_XXXpktopt(s).
sys/netinet6/ip6_output.c:	1.93
	sys/netinet6/ip6_var.h:		1.31
	sys/netinet6/mld6.c:		1.20
	sys/netinet6/raw_ip6.c:		1.51
	sys/netinet6/udp6_output.c:	1.20

Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 06:51:11 +00:00
ume
c5c002ca03 MFC 1.92: NULL is not zero.
Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 06:46:27 +00:00
ume
77e5d0b3fb MFC 1.49: do not hardcode if_mtu values in here, except for IFT_{ARC,FDDI} -
they need special handling.  makes it possible to take advantage of 9k ether
frames.

Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 06:42:41 +00:00
scottl
e4b2748d1b MFC: Support new adapters and new communication protocol.
Submitted by: Adaptec, Inc.
Approved by: re
2005-10-09 06:39:21 +00:00
ume
af6b9d9bdc MFC: move RFC3542 related definitions into ip6.h.
sys/contrib/pf/net/pf_norm.c:	1.12
	sys/netinet/ip6.h:		1.15

Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 05:50:43 +00:00
ume
5960dca5d2 MFC 1.18: add missing RFC3542 definition.
Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 05:34:33 +00:00
ume
3c63662444 MFC: update comments:
- RFC2292bis -> RFC3542
    - typo fixes

	sys/netinet/icmp6.h		1.17
	sys/netinet/ip6.h:		1.14
	sys/netinet6/in6.h:		1.37
	sys/netinet6/ip6_input.c:	1.82
	sys/netinet6/ip6_mroute.h:	1.7
	sys/netinet6/ip6_output.c:	1.91

Approved by:    re (scottl)
Committed at:   CBUG Meeting meets XCAST6 Festival
2005-10-09 05:21:18 +00:00
delphij
741522667a MFC (by stefanf)
| Fix a comment.
|
| Submitted by:   Liam J. Foy
|
| Revision  Changes    Path
| 1.20      +1 -1      src/bin/sleep/sleep.c

Approved by:	re (scottl)
2005-10-09 04:39:07 +00:00
delphij
6dbb98c55a MFC (by le)
| Set the G_PF_WITHER flag on the subdisk provider that is about to
| be destroyed.  That way the GEOM system handles all deallocations
| and we don't have to do it ourselves.
|
| Revision  Changes    Path
| 1.8       +1 -34     src/sys/geom/vinum/geom_vinum_rm.c

Approved by:	re (scottl)
2005-10-09 04:37:34 +00:00