119583 Commits

Author SHA1 Message Date
emax
a459bffc46 MFC:
Fix an unwanted gcc4 warning.

Submitted by:	delphij
2006-06-09 21:00:10 +00:00
hsu
85416acdd7 Merge rev 1.41 from current: correct test for fragmented packet. 2006-06-09 18:19:16 +00:00
flz
28e479d336 Backout this commit since new bug reports have raised after the MFC:
- Set a two read-only variables (${prefix} and ${etcdir}). This is
    especially useful when using /etc/rc.d scripts with third-party
    software installed from ports.
    - Fix rc.d/sshd to work with openssh from ports using ${etcdir}
    instead of hardcoded /etc.
    - Reflect prefix/etcdir changes in rc.subr.8.
2006-06-09 10:14:39 +00:00
rwatson
fa95682921 Merge ipx_usrreq.c:1.56 from HEAD to RELENG_6:
Make this compile without INVARIANTS.
2006-06-08 23:36:39 +00:00
rwatson
de2494a01d Merge README:1.8 from HEAD to RELENG_6:
Add a simple netipx TODO list to the end of README, since there are a
  number of problems with netipx that I have not yet resolved, and I
  don't want them lost track of.
2006-06-08 23:36:03 +00:00
rwatson
42b5ee0134 Merge ipx_input.c:1.55 from HEAD to RELENG_6:
Canonicalize copyright order in one more file that contains my
  copyright.
2006-06-08 23:35:42 +00:00
rwatson
c17170d981 Merge spx_usrreq.c:1.82 from HEAD to RELENG_6:
In spx_output(), use M_DONTWAIT instead of M_TRYWAIT, as we hold the
  ipxpcb mutex.  Contrary to the comment, even in 4.x this was unsafe,
  as parallel use of the socket by another process would result in pcb
  corruption if the mbuf allocation slept.
2006-06-08 23:35:16 +00:00
rwatson
f853872905 Merge spx_usrreq.c:1.81 from HEAD to RELENG_6:
In spx_input(), change a '&&' to a '||', as the spx trace code is able
  to handle a NULL 'cb' here.
2006-06-08 23:34:43 +00:00
rwatson
10b7eb98dd Merge spx_usrreq.c:1.80 from HEAD to RELENG_6:
In spx_accept, assert ipxp != NULL, not == NULL.
2006-06-08 23:33:58 +00:00
rwatson
d17fc2ac36 Merge spx_usrreq.c:1.79 from HEAD to RELENG_6:
In various SPX protocol entry points from the socket layer, check
  IPXP_DROPPED before continuing, and return EINVAL or ECONNRESET if
  it is flagged.  It's unclear why each situation should be one or
  the other, but it is copied from netinet which has the same bugs.
2006-06-08 23:33:24 +00:00
rwatson
2df45add94 Merge ipx_pcb.h:1.26, spx_usrreq.c:1.78 from HEAD to RELENG_6:
Add a new ipxpcb flag, IPXP_SPX, which is set on ipxpcb's to mark them
  as belonging to SPX.  This replaces the implicit assumption that the cb
  pointer for non-SPX pcb's will be NULL.  This isn't required in TCP/IP
  as different pcb lists are maintained for different IP protocols; IPX
  stores all pcbs on the same global ipxpcb_list.

  Foot provided by:       gnn
2006-06-08 23:32:42 +00:00
rwatson
0c607a85c6 Merge spx_usrreq.c:1.77 from HEAD to RELENG_6:
Restore original formulation of SPX segment queue draining during SPX
  PCB detach.
2006-06-08 23:31:47 +00:00
rwatson
0fb4154318 Merge ipx_pcb.c:1.45, ipx_pcb.h:1.25, ipx_usrreq.c:1.53, spx_usrreq.c:1.76
from HEAD to RELENG_6:

  Rework IPX/SPX socket and pcb reference model:

  - Introduce invariant that all IPX/SPX sockets will have valid so_pcb
    pointers to ipxpcb structures, and that for SPX, the control block
    pointer will always be valid.  Don't attempt to free the socket or
    pcb at various odd points, such as disconnect.

  - Add a new ipxpcb flag, IPXP_DROPPED, which will be set in place of
    freeing PCB's so that this invariant can be maintained.  This flag
    is now checked instead of a NULL check in various socket protocol
    calls.

  - Introduce many assertions that this invariant holds.

  - Various pieces of code, such as the SPX timer code, no longer needs
    to jump through hoops in case it frees a PCB while running.

  - Break out ipx_pcbfree() from ipx_pcbdetach().  Likewise
    spx_pcbdetach().

  - Comment on some SMP-related limitations to the SPX code.

  - Update copyrights.
2006-06-08 23:31:16 +00:00
rwatson
97f7b74500 Merge spx_usrreq.c:1.75 from HEAD to RELENG_6:
Restructure spx_attach() to properly free memory in the event that one
  of its allocations fails.  Allocate the ipxp last so as to avoid having
  to free it if another allocation goes wrong.

  Normalize retrieval of ipxp and cb from socket in spx_sp_attach(), and
  add assertions.
2006-06-08 23:28:55 +00:00
rwatson
1f464a1347 Merge spx_usrreq.c:1.74 from HEAD to RELENG_6:
Don't bother restoring host byte order of mbuf fields when we're just
  about to free the mbuf in the spx_input() error path.
2006-06-08 23:22:47 +00:00
rwatson
d5fff948ad Merge spx_usrreq.c:1.73 from HEAD to RELENG_6:
In spx_ctloutput(), acquire the ipxp lock around read operations,
  especially reads of spx header structures, which will now be cached
  in the stack until they can be copied out after releasing the lock.
  Panic if a bad socket option direction is passed in by the caller.
2006-06-08 23:22:02 +00:00
rwatson
b60fd3c465 Merge spx_usrreq.c:1.72 from HEAD to RELENG_6:
Slight style reformatting of spx_timers() comments; panic if an
  unrecognized timer is passed into the function.
2006-06-08 23:21:25 +00:00
rwatson
12b89b7e1c Merge ipx_pcb.c:1.44, spx_usrreq.c:1.71 from HEAD to RELENG_6:
Clean up and style(9) SPX code prior to significant functional changes
  being committed:

  - Wrap comments more evenly on right border.
  - Clean up braces.

  Also, along similar lines:

  - Assert some pointers are non-NULL before dereferencing them.
  - Remove one assertion that looks, on face value, poor.
2006-06-08 23:20:37 +00:00
rwatson
42cd5f7b8b Merge spx_usrreq.c:1.70 from HEAD to RELENG_6:
Protect spx_iss using its own mutex, spx_mtx, rather than piggy-backing
  on the global IPX mutex, which is not held at all necessary strategic
  points.
2006-06-08 23:18:40 +00:00
rwatson
1cf5c31809 Merge spx_usrreq.c:1.69 from HEAD to RELENG_6:
Move definition of spxrexmtthresh to top of file with other global
  variables.
2006-06-08 23:18:01 +00:00
rwatson
34b8bc8d25 Merge spx_usrreq.c:1.68 from HEAD to RELENG_6:
Canonicalize, update copyright.
  Remove 'register'.
  Use ANSI prototypes, not K&R.
2006-06-08 23:17:29 +00:00
rwatson
828233b8f9 Merge ipx_input.c:1.53, spx_usrreq.c:1.66 from HEAD to RELENG_6:
Admit to ourselves that we don't actually implement pr_ctlinput() for
  IPX or SPX, as the code in the implementing functions is essentially
  a no-op.  Replace with a comment indicating we don't implement these
  currently.
2006-06-08 23:15:28 +00:00
rwatson
322724cc00 Merge spx_usrreq.c:1.65 from HEAD to RELENG_6:
In spx_attach() and spx_detach(), there is no need to check whether the
  ipxpcb is NULL or not: in attach it will be, and on detach it won't be.
  If for any reason these invariants don't hold true, panicking is a good
  idea.

  Noticed by:     Coverity Prevent analysis tool
2006-06-08 23:12:22 +00:00
rwatson
1c3e4ff79e Merge README:1.7 from HEAD to RELENG_6:
Update copyright to 2006, comment on my contribution to this code in the
  style of previous contributors.
2006-06-08 23:05:53 +00:00
rwatson
482ab51a1e Merge ipx_input.c:1.54 from HEAD to RELENG_6:
Comment that raw output filter code for IPX should run in a netisr so as
  to avoid recursing the socket code, as this input path can run in the
  call stack of an output path.
2006-06-08 23:05:19 +00:00
rwatson
be1414f73b Merge ipx_pcb.h:1.24, spx_usrreq.c:1.67 from HEAD to RELENG_6:
Move spx_savesi from being a global variable to an automatically allocated
  variable on the spx_input() stack.  It's not very large, and this will
  avoid parallelism issues when spx_input() runs in more than one thread at
  a time.
2006-06-08 23:04:44 +00:00
rwatson
1fdce3be4a Merge sysctl.9:1.1-1.3, Makefile:1.274, sysctl_add_oid.9:1.21,
sysctl_ctx_init.9 from HEAD to RELENG_6:

  Add a basic man page for the sysctl(9) macro interfaces.  Previously man
  pages existed only for the dynamic sysctl interfaces.  There's probably
  more complete and accurate content, better advice, etc, that could be
  added here.

  Per scottl's suggest, add a small piece of moralizing text regarding the
  fact that sysctl names quickly get embedded in system configuration files,
  libraries, third party applications, and even books, so renaming and
  removing names after they've been published is a tricky issue.
--
  Fix typo.

  Submitted by:   Antoine Brodin <antoine dot brodin@laposte dot net>
--
  Fix a couple of typos and other minor nits

  Reviewed by:    rwatson
2006-06-08 23:02:15 +00:00
rwatson
9a0e4c7010 Merge nfs_nfsiod.c:1.89 from HEAD to RELENG_6:
Adjust minimum iod threads from 4 to 0 -- since we compile the NFS
  client into the kernel by default, and many users won't use NFS,
  don't start an extra 4 kernel threads that are unused.  Once NFS
  becomes active, it will start nfsiod's as it needs them.

  We might consider mandating a minimum iod's equal to the number of
  active NFS mounts (truncated to some value), which would force some
  to remain available without having to create a new one if the file
  system is mostly inactive.

  PR:             70880
  Prodded by:     cel
  Head nod:       peter
  Pointed out by: Joe <fbsd_user at a1poweruser dot com>
2006-06-08 22:57:07 +00:00
mjacob
d70a82fe55 MFC sequential scan probing changes 2006-06-08 17:51:27 +00:00
mjacob
76c0175250 MFC -current mpt driver to support FC target mode and SAS HBAs plus
probably correct U320 negotiations.
2006-06-08 17:48:35 +00:00
delphij
2db0e80596 MFC: Add -u and -U which functions like the jail(8) that allow
commands to be executed under a different credential.

PR:		bin/95777
Submitted by:	clsung
2006-06-08 17:29:05 +00:00
markus
1302798964 MFV rev. 1.9:
- Document the new Read_Node_List command, autodetection of HCI nodes and
    that the '-n' parameter is now optional
  - Grammar fixes

Approved by:	emax (mentor)
2006-06-07 22:54:02 +00:00
markus
73f892b2f1 MFC:
- Add HCI node autodetection. As a consequence of this, make the '-n'
    parameter optional.
  - Add Read_Node_List command which prints a list of available HCI nodes,
    their Netgraph IDs and connected hooks

Revisions:
	hccontrol.h	rev. 1.6
	hccontrol.c	rev. 1.4 + 1.5
	node.c		rev. 1.4

Approved by:	emax (mentor)
2006-06-07 22:53:56 +00:00
marius
4997211968 MFC: sys/sparc64/sparc64/machdep.c 1.129 (partial),
sys/sparc64/sparc64/trap.c 1.80 (partial)

- s,tramoline,trampoline, in a comment.
- Use FBSDID in trap.c
- Make the global trap_sig[] static as it's not used outside of trap.c.
- Sync cpu_thread_siginfo() and sendsig() with the other archs; for fast
  data access MMU miss and data access protection traps set ksi_addr to
  the SFAR reg which contains the faulting address and otherwise to the
  TPC reg. Generally the TCP reg contains the address of the instruction
  that caused the exception, except for fast instruction access traps
  (and some others; more refinement may be needed here) it also contains
  the faulting address.
  Previously, sendsig() always set si_addr to the SFAR reg which is wrong
  for most traps and cpu_thread_siginfo() didn't set it at all.
- In sendsig() add support for FreeBSD old-style signals.
2006-06-07 19:08:27 +00:00
bmah
893a2dbc53 Update errata: Touch the date of the rc.d/jail item to reflect a
recently-merged fix.  UMA bug fixed on RELENG_6.
2006-06-07 15:37:57 +00:00
flz
5fac6874c1 MFC:
- Fix rc.d/sshd test on kern.random.sys.seeded.

      src/etc/rc.d/sshd: rev 1.10 -> 1.11

PR:		conf/94377
Submitted by:	dwhite
2006-06-07 10:35:33 +00:00
flz
ac74e6c969 MFC:
- Set a two read-only variables (${prefix} and ${etcdir}). This is
  especially useful when using /etc/rc.d scripts with third-party
  software installed from ports.
  - Fix rc.d/sshd to work with openssh from ports using ${etcdir}
  instead of hardcoded /etc.
  - Reflect prefix/etcdir changes in rc.subr.8.

      src/etc/rc.d/sshd: rev 1.9 -> 1.10
      src/etc/rc.subr: rev 1.51 -> 1.52
      src/share/man/man8/rc.subr.8: rev 1.11 -> 1.12
2006-06-07 10:33:36 +00:00
marius
6f00c03e99 MFC: 1.8
For _Qp_{fge,fgt,fle,flt}() the SCD states that "Exceptions mimic fcmpeq",
this means they should set the cmpe flag when calling __fpu_compare().
2006-06-06 20:10:07 +00:00
marius
a0d42b4ae0 MFC: 1.61
Revert the (int *) -> (intptr_t *) conversion done as part of rev. 1.59
(MFC'ed in rev. 1.55.2.3) for IOCTLs where casting data to intptr_t *
isn't the right thing to do, fixing tap(4) on big-endian LP64 machines.
2006-06-06 20:03:37 +00:00
flz
f042dcd86d MFC:
- Change the "jail_" prefix for internal script variables. This fixes an
  issue where some global jail_* variables were overriden in the script. [1]
  - Change "jid" to "jname" in rc.conf(5), since it's more a jail name than a
  jail id. [1]
  - Update examples and comments in defaults/rc.conf to advertise new
  variables and the fact that some of the jail-specific variables may be made
  jail-global. [2]

      src/share/man/man5/rc.conf.5: rev 1.293 -> 1.294
      src/etc/rc.d/jail: rev 1.31 -> 1.32
      src/etc/defaults/rc.conf: rev 1.282 -> 1.283

Reported by:	pjd [1], clsung [2]
2006-06-06 15:04:39 +00:00
flz
1cd79ba7c7 MFC:
- Add new ntpd_config variable so that people can override it in rc.conf.
  - Add default value in /etc/defaults/rc.conf.
  - Add documentation bits to rc.conf(5).

      src/etc/rc.d/ntpd: rev 1.12 -> 1.13
      src/share/man/man5/rc.conf.5: rev 1.292 -> 1.293
      src/etc/defaults/rc.conf: rev 1.280 -> 1.281
2006-06-06 11:17:09 +00:00
flz
8febb4dd86 MFC:
- Harmless typo (s/overide/override/).
  - Sync rc.subr with NetBSD.
  - Merge some documentation bits.

      src/share/man/man8/rc.subr.8: rev 1.10 -> 1.11
      src/etc/rc.subr: rev 1.49 -> 1.51, 1.55 -> 1.56

Obtained from:	NetBSD
2006-06-06 10:35:55 +00:00
flz
a34acc2f8b MFC:
- Fix amd startup when amd is installed from ports.
  - Add the according amd_program default value in defaults.

      src/etc/rc.d/amd: rev 1.16 -> 1.17
      src/etc/defaults/rc.conf: rev 1.277 -> 1.278

PR:		conf/82738
Submitted by:	TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
2006-06-06 09:47:09 +00:00
bmah
59b5ae999c We shouldn't have any MFC markers on any codeline except for HEAD, so
remove the entity definition from RELENG_6.
2006-06-05 22:28:35 +00:00
bmah
2766f33ebf Delete a sentence related to merged features that doesn't apply to
RELENG_*.
2006-06-05 22:26:57 +00:00
brueffer
bde32f9929 MFC: rev. 1.23
Make this example more real world usable:  When the manpage first appeared
is not interesting, when the driver appeared is.  Most people who use this
example leave the manpage appearance date in and the driver date out.
2006-06-05 19:31:57 +00:00
brueffer
b2dfc22806 MFC:
Convert to use a SYNPOSIS section that mentions kernel modules.
Also add "device scbus" where needed.
2006-06-05 19:30:28 +00:00
brueffer
8390b14b17 MFC: rev 1.17
Fix a formatting issue.
2006-06-05 19:20:13 +00:00
jkim
c56a6fff7e MFC: Move SiS 760 to where it belongs.
PR:		98094
Submitted by:	Mike M < mmcgus at yahoo dot com >
2006-06-05 18:34:13 +00:00
kensmith
c0acb776da MFC v1.898:
> date: 2006/01/30 14:24:31;  author: kensmith;  state: Exp;  lines: +1 -0
> Enable splitting up the MFSROOT floppy on amd64, the contents now overflow
> one floppy's worth of space.
2006-06-05 17:05:09 +00:00