Commit Graph

117106 Commits

Author SHA1 Message Date
cvs2svn
aa9ad453cc This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-08-15 17:07:38 +00:00
jkoshy
e4543b7002 MFC r1.8 "Correctly print system-wide PMC counts for short-lived command lines".
Approved by:	re (hrs)
2005-08-15 15:33:59 +00:00
tegge
9f6c2d705f MFC: Check for marker pages when scanning active and inactive page queues.
Approved by:	re (kensmith)
2005-08-15 14:28:48 +00:00
kan
4d72fc60d0 MFC: Do not use vm_pager_init() to initialize vnode_pbuf_freecnt variable.
vm_pager_init() is run before required nswbuf variable has been set
to correct value. This caused system to run with single pbuf available
for vnode_pager. Handle both cluster_pbuf_freecnt and vnode_pbuf_freecnt
variableis in the same way.

Approved by:	re (kensmith)
2005-08-15 14:04:47 +00:00
tobez
e539dc2e3b MFC: Recognize D-Link DGE-528(T) Gigabit as an re(4) device.
Approved by:	re (kensmith)
2005-08-15 14:02:37 +00:00
kan
0b90ddcccf MFC r1.639: Do not drop the vnode interlock if vdropl is called on already
doomed vnode. vdropl callers expect it to return with interlock still being
held.

Approved by:	re (hrs)
2005-08-15 13:50:38 +00:00
rwatson
94e21c7fb2 Merge if_atm.c:1.20 from HEAD to RELENG_6:
Add NATM_LOCK() and NATM_UNLOCK() in places where npcb_add() and
  npcb_free() are called, in order to eliminate witness panics.
  This was overlooked in removal of GIANT from ATM.

Approved by:	re (hrs)
2005-08-15 09:54:00 +00:00
rwatson
beea59f75f Merge natm.c:1.39, natm.h:1.12, natm_proto.c:1.17 from HEAD to RELENG_6:
Remove FreeBSD 2.2 protocol usrreq compatibility code.

  Remove minor #ifdefs for early NetBSD and OpenBSD compatibility.

  Remove spl-related definitions.

Approved by:	re (hrs)
2005-08-15 09:52:22 +00:00
rwatson
2b598d0e5c Merge if_atmsubr.c:1.38, natm.c:1.38, natm.h:1.11, natm_pcb.c:1.16,
natm_proto.c:1.16 from HEAD to RELENG_6:

  Lock down netnatm and mark as MPSAFE:

  - Introduce a subsystem mutex, natm_mtx, manipulated with accessor macros
    NATM_LOCK_INIT(), NATM_LOCK(), NATM_UNLOCK(), NATM_LOCK_ASSERT().  It
    protects the consistency of pcb-related data structures.  Finer grained
    locking is possible, but should be done in the context of specific
    measurements (as very little work is done in netnatm -- most is in the
    ATM device driver or socket layer, so there's probably not much
    contention).

  - Remove GIANT_REQUIRED, mark as NETISR_MPSAFE, remove
    NET_NEEDS_GIANT("netnatm").

  - Conditionally acquire Giant when entering network interfaces for
    ifp->if_ioctl() using IFF_LOCKGIANT(ifp)/IFF_UNLOCKGIANT(ifp) in order
    to coexist with non-MPSAFE atm ifnet drivers..

  - De-spl.

  Reviewed by:    harti, bms (various versions)

Approved by:	re (hrs)
2005-08-15 09:51:15 +00:00
rwatson
35ba6a1de5 Merge mac_policy.h:1.69 from HEAD to RELENG_6:
Insert a series of place-holder function pointers in mac_policy.h for
  entry points that will be inserted over the life-time of the 6.x branch,
  including for:

  - New struct file labeling (void * already added to struct file), events,
    access control checks.
  - Additional struct mount access control checks, internalization/
    externalization.
  - mac_check_cap()
  - System call enter/exit check and event.
  - Socket and vnode ioctl entry points.

Approved by:	re (hrs)
2005-08-15 09:03:50 +00:00
rwatson
26b1b83850 Merge vm_page.h:1.137 from HEAD to RELENG_6:
Don't perform a nested include of opt_vmpage.h if LIBMEMSTAT is defined,
  as opt_vmpage.h will not be available to user space library builds.  A
  similar existing check is present for KLD_MODULE for similar reasons.

Approved by:	re (hrs)
2005-08-15 09:02:01 +00:00
rwatson
634870d90c Merge uma_int.h:1.37 from HEAD to RELENG_6:
Wrap inlines in uma_int.h in #ifdef _KERNEL so that uma_int.h can be
  used from memstat_uma.c for the purposes of kvm access without lots
  of additional unsafe includes.

Approved by:	re (hrs)
2005-08-15 09:01:11 +00:00
ssouhlal
871d11a963 MFC rev 1.222:
Use atomic operations on runningbufspace.

 PR:             kern/84318
 Submitted by:   ade

Approved by:	re (kensmith)
2005-08-15 06:22:09 +00:00
ssouhlal
7567e889d8 MFC rev 1.73:
The kernel is usually at /boot/kernel/kernel nowadays.

 PR:     i386/81756
 Submitted by:   trasz <trasz@buziaczek.pl>

Approved by:	re (kensmith)
2005-08-15 06:14:07 +00:00
ssouhlal
e5998244ea MFC rev 1.11:
it's actually 11 minutes when the machine is assumed to be down and removed
  from the output.

  Obtained from:  DragonFlyBSD

Approved by:	re (kensmith)
2005-08-15 06:07:23 +00:00
ssouhlal
defd686212 MFC:
Holding a vnode doesn't prevent v_mount from disappearing (when the
  vnode is inactivated), possibly leading to a NULL dereference when
  checking if the mount wants knotes to be activated in the VOP hooks.
  So, we add a new vnode flag VV_NOKNOTE that is only set in  getnewvnode(),
  if necessary, and check it when activating knotes.
  Since the flags are not erased when a vnode is being held, we can safely
  read them.

Approved by:	re (kensmith)
2005-08-15 06:01:36 +00:00
suz
3fe0825ea6 MFC Rev. 1.31
fixed a kernel crash at the start-up time of an IPv6 multicast daemon
  (e.g. pim6sd/pim6dd)

Approved by: re(kensmith)
2005-08-15 00:28:31 +00:00
murray
653f656813 MFC: r1.46 - grammar improvements.
Approved by:	re (kensmith)
2005-08-14 18:52:34 +00:00
murray
f3fc5b4aa0 MFC: r1.15 - Fix typo.
Approved by:	re (kensmith)
2005-08-14 18:48:54 +00:00
rwatson
925c1d32f3 Bump __FreeBSD_version for dev_clone eventhandler to add credential.
Approved by:	re
2005-08-13 21:27:58 +00:00
rwatson
71a8cbcb20 Merge two sets of changes relating to devfs device node cloning from
HEAD to RELENG_6: changes to introduce a credentialed version of the
clone event handler, and then changes to merge the regular and
credentialed versions into a single interface (along with updates to
existing consumers).  With this merge, 6.x and 7.x are in sync.

First batch merges devfs_devs.c:1.37, devfs_vnops.c:1.115,
kern_conf.c:1.187, tty_pty.c:1.138, mac_vfs.c:1.109, mac_biba.c:1.36,
mac_lomac.c:1.36, mac_mls.c:1.73, mac_stub.c:1.53, mac_test.c:1.61,
conf.h:1.223, mac.h:1.68, mac_policy.h:1.67 from HEAD to RELENG_6:

  When devfs cloning takes place, provide access to the credential of the
  process that caused the clone event to take place for the device driver
  creating the device.  This allows cloned device drivers to adapt the
  device node based on security aspects of the process, such as the uid,
  gid, and MAC label.

  - Add a cred reference to struct cdev, so that when a device node is
    instantiated as a vnode, the cloning credential can be exposed to
    MAC.

  - Add make_dev_cred(), a version of make_dev() that additionally
    accepts the credential to stick in the struct cdev.  Implement it and
    make_dev() in terms of a back-end make_dev_credv().

  - Add a new event handler, dev_clone_cred, which can be registered to
    receive the credential instead of dev_clone, if desired.

  - Modify the MAC entry point mac_create_devfs_device() to accept an
    optional credential pointer (may be NULL), so that MAC policies can
    inspect and act on the label or other elements of the credential
    when initializing the skeleton device protections.

  - Modify tty_pty.c to register clone_dev_cred and invoke make_dev_cred(),
    so that the pty clone credential is exposed to the MAC Framework.

  While currently primarily focussed on MAC policies, this change is also
  a prerequisite for changes to allow ptys to be instantiated with the UID
  of the process looking up the pty.  This requires further changes to the
  pty driver -- in particular, to immediately recycle pty nodes on last
  close so that the credential-related state can be recreated on next
  lookup.

  Submitted by:   Andrew Reisse <andrew.reisse@sparta.com>
  Obtained from:  TrustedBSD Project
  Sponsored by:   SPAWAR, SPARTA

Second batch merges scsi_target.c:1.68, coda_fbsd.c:1.43,
firewirereg.h:1.38, fwdev.c:1.47, nmdm.c:1.36, snp.c:1.100, dsp.c:1.82,
mixer.c:1.45, vkbd.c:1.9, devfs_vnops.c:1.117, tty_pty.c:1.139,
tty_tty.c:1.57, bpf.c:1.156, if_tap.c:1.56, if_tun.c:1.153,
smb_dev.c:1.28, conf.h:1.224 from HEAD to RELENG_6:

  Merge the dev_clone and dev_clone_cred event handlers into a single
  event handler, dev_clone, which accepts a credential argument.
  Implementors of the event can ignore it if they're not interested,
  and most do.  This avoids having multiple event handler types and
  fall-back/precedence logic in devfs.

  This changes the kernel API for /dev cloning, and may affect third
  party packages containg cloning kernel modules.

  Requested by:   phk

These changes modifies the kernel device driver API for device cloning,
and might require minor modifications to third party device drivers that
make use of devfs cloning.  It will not be merged to RELENG_5.

Approved by:	re (scottl)
2005-08-13 21:24:18 +00:00
brueffer
6aba85be97 MFC: rev. 1.70
Add some more info about jail startup and shutdown.

Approved by:	re (hrs)
2005-08-12 22:29:42 +00:00
brueffer
0fb381140f MFC: rev. 1.42
Remove stray comma

Approved by:	re (hrs)
2005-08-12 22:28:25 +00:00
brueffer
a9c41e2e6b MFC: rev. 1.5
nForce3 and nForce4 are supported as well.

Approved by:	re (hrs)
2005-08-12 22:27:37 +00:00
brueffer
0f8d8f6a47 MFC: rev. 1.18
Sort the list of supported hardware.

Approved by:	re (hrs)
2005-08-12 22:26:03 +00:00
jhb
f3790ed7c5 MFC: Call tulip_start() rather than tulip_ifstart() from the interrupt
handler to avoid recursing on the driver lock.

Approved by:	re (kensmith)
2005-08-12 17:57:38 +00:00
njl
10f961b659 MFC 1.18: Fix for 99% being reported instead of 100% when one battery
is missing.

Approved by:	re (kensmith)
2005-08-12 17:29:58 +00:00
njl
1658d65505 MFC rev 1.15: use more reasonable boundary for user setting of lowest
Approved by:	re (kensmith)
2005-08-12 17:25:59 +00:00
tegge
979b6a27c8 MFC: Don't allow pagedaemon to skip pages while scanning active and
inactive page queues due to the vm object being locked.

Approved by:	re (kensmith)
2005-08-12 16:43:27 +00:00
brueffer
c270668583 MFC:
More tcpdump 8->1 cleanup.

Approved by:	re (hrs)
2005-08-12 16:15:24 +00:00
thompsa
c048ed5e39 MFC: if_bridge.c, r.1.5
> Use m_copypacket() which is an optimization of the common case
> m_copym(m, 0, M_COPYALL, how).
>
> This is required for strict alignment architectures where we align the
> IP header in the input path but m_copym() will create an unaligned copy
> in bridge_broadcast(). m_copypacket() preserves alignment of the first
> mbuf.
>
> Noticed by:     Petri Simolin
> Approved by:    mlaier (mentor)

Approved by:	re (kensmith), mlaier (mentor)
2005-08-11 20:57:59 +00:00
markus
4748e88afa MFC Rev. 1.8:
Don't lock when holding led_mtx, instead use AcpiOsQueueForExecution to defer
  the locking.

  Idea taken from: acpi_asus(4)

  Approved by:    philip
  Reported by:    avatar
                  Gordon Bergling <gbergling@0xfce3.net>

Approved by:	re (kensmith)
2005-08-11 15:35:58 +00:00
jhb
9817d79419 MFC: Correct some if tests to fix a confusing printf when we route a new
IRQ for a link.

Approved by:	re (kensmith)
2005-08-11 15:35:41 +00:00
tobez
21e7ad9511 MFC 1.4: make kernel build succeed when with "options CPU_DISABLE_SSE".
Approved by:	re (kensmith)
2005-08-11 14:28:42 +00:00
iedowse
6c4eb2f0bb MFC 1.78: fix two bugs that caused page faults when using mice with
tilt movements.

Approved by:	re (kensmith)
2005-08-11 00:22:28 +00:00
jcamou
1686889ae3 MFC: config-recursive target.
Approved by:	re (hrs)
2005-08-10 20:43:27 +00:00
bz
64ec698deb MFC: rev. 1.33 src/sys/net/if_gre.c, rev. 1.20 src/sys/netinet/ip_gre.c
Add support for IPv6 over GRE [1]. PR kern/80340 includes the
  FreeBSD specific ip_newid() changes NetBSD does not have.
Correct handling of non AF_INET packets passed to bpf [2].

PR:		kern/80340[1], NetBSD PRs 29150[1], 30844[2]
Obtained from:	NetBSD ip_gre.c rev. 1.34,1.35, if_gre.c rev. 1.56
Submitted by:	Gert Doering <gert at greenie.muc.de>[2]
Approved by:	re (kensmith)
2005-08-10 19:12:32 +00:00
jcamou
8d44c64aec MFC: Information about starting jails
at boot time if specified in rc.conf.

Submitted by:	matteo
Approved by:	re (hrs), trhodes (mentor)
2005-08-10 19:00:43 +00:00
sam
d1cf2bfbff MFC: m_align
Approved by:	re (kensmith)
2005-08-10 17:02:29 +00:00
nyan
50bc0c511d MFi386: revision 1.1202.2.1 (r300 DRM support).
Approved by:	re (kensmith)
2005-08-10 15:56:13 +00:00
glebius
ff5247fe56 MFC 1.10:
Check that we have first fragment before pulling up TCP/UDP header.

Approved by:	re (kensmith)
2005-08-10 15:00:57 +00:00
glebius
7943163abe MFC:
Enhance struct ng_hook - add hk_type field and bump NG_ABI_VERSION.

Approved by:	re (kensmith)
2005-08-10 14:58:18 +00:00
glebius
c3a5dea7f4 MFC 1.103, 1.105:
avoid recursion problems in netgraph(4). See 1.103 log for
more information.

Approved by:	re (kensmith)
2005-08-10 14:54:52 +00:00
pjd
a996384698 MFC: rc.d/jail 1.24
Allow to give more than one jail's name, eg.:

	# /etc/rc.d/jail start www mail

Approved by:	re (kensmith)
2005-08-10 14:30:05 +00:00
ups
31fe0d40f0 MFC ffs_softdep.c 1.182, softdep.h 1.18
Delay freeing disk space for file system blocks until all
dirty buffers are safely released. This fixes softdep
problems on truncation (deletion) of files with dirty
buffers.

Approved by:	re (kensmith)
2005-08-10 14:09:25 +00:00
brian
b4a6392763 MFC: Mention that console= can set multiple consoles.
Relate boot_ options to their kernel command line flags and make it clear
     how kenv(1) is used.

Approved by:	re (hrs)
2005-08-09 12:38:17 +00:00
avatar
b9be0961d1 MFC: (1.10) Fixing compilation bustage.
Approved by:	re (kensmith)
2005-08-09 01:27:31 +00:00
avatar
810c836d08 MFC: (1.7) Fixing compilation bustage.
Approved by:	re (kensmith)
2005-08-09 01:25:32 +00:00
grehan
3a2c301d92 MFC machdep.c r1.90
trap.c    r1.55
     trap_subr.S r1.15

   Temporary band-aid to fix hang when a process exec's Altivec
 instructions.

    trap_subr.S:  declare a stub for the a-unavailable trap
                  that does an absolute jump to the vector-assist trap.
                  This is due to the fact that the vec-unavail trap
                  doesn't start at a 256-byte boundary, so the trick of
                  masking the bottom 8 bits of the link register to identify
                  the interrupt doesn't work, so let the vec-assist
                  case handle Altivec-disabled for the time being.

                  Note that this will be fixed in the future with a much
                  smaller vector code-stub (< 16 bytes) that will allow
                  use of strange vector offsets that are also present in
                  4xx processors, and also allow smaller differences in
                  vector codepaths on the G5.

    trap.c:       Treat altivec-unavailable/assist process traps as SIGILL.
                  Not quite correct, since altivec-assist should really
 		  be a panic,
                  but it is fine for the moment due to the above measure.

    machdep.c     Install the stub code for the altivec-unavailable trap, and
                  the standard trap code at the altivec-assist.

Approved by:	re (Ken Smith)
2005-08-08 07:02:12 +00:00
ceri
477011fe9d MFC r1.71.
Correct the description of the TAPE environment variable.
  Based on:

PR:             docs/84200
Submitted by:   Gary W. Swearingen <garys at opusnet dot com>
Approved by:	re (hrs)
2005-08-07 18:49:50 +00:00