svn commit: r367481 - in head: share/man/man4 sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Sun Nov  8 09:50:58 2020
New Revision: 367481
URL: https://svnweb.freebsd.org/changeset/base/367481

Log:
   - add more linux socket options (sorted by value)
   - map those IPv4 / IPv6 socket options which exist in FreeBSD
 + most of them visually verified to have the same type/layout of arguments
 + not tested with linux programs to behave as intended
   - be more human readable for known options which are not handled
   - be more verbose for unhandled socket message flags we know about
   - print the jail ID in linux_msg if run in a jail
   - add possibility to print debug message about known missing parts only once
   - add multiple levels of sysctl linux.debug:
 1: print debug messages, tell about unimplemented stuff (only once)
 2: like 1, but also print messages about implemented but not tested
stuff (only once)
 3+: like 2, but no rate limiting of messages
   - increase default linux debug level from 1 to 3
  
  We are a lot more verbose in as we need to be (e.g. some of the IP socket
  options which are the same, and share the same memory layout, and are
  believed to work). The reason is that we have no good testsuite to test those
  linux-bits. The LTP or other test suites like the python one, are not fully
  up to the task we need. As such the excessive messages about emulated but not
  tested socket options.
  
  IMO any MFC (possible, but most probably not by me) should set the default
  debug level to 1.
  
  Discussed with:   trasz

Modified:
  head/share/man/man4/linux.4
  head/sys/compat/linux/linux_mib.c
  head/sys/compat/linux/linux_socket.c
  head/sys/compat/linux/linux_socket.h
  head/sys/compat/linux/linux_util.c
  head/sys/compat/linux/linux_util.h

Modified: head/share/man/man4/linux.4
==
--- head/share/man/man4/linux.4 Sun Nov  8 09:49:51 2020(r367480)
+++ head/share/man/man4/linux.4 Sun Nov  8 09:50:58 2020(r367481)
@@ -98,7 +98,12 @@ tunables:
 .It Va compat.linux.debug
 Enable debugging messages.
 Set to 0 to silence them.
-Defaults to 1.
+Defaults to 3.
+A setting of 1 prints debug messages, tells about unimplemented stuff (only
+once).
+Set to 2 is like 1, but also prints messages about implemented but not tested
+stuff (only once).
+Setting it to 3 or higher is like 2, but no rate limiting of messages.
 .It Va compat.linux.default_openfiles
 Default soft openfiles resource limit for Linux applications.
 Set to -1 to disable the limit.

Modified: head/sys/compat/linux/linux_mib.c
==
--- head/sys/compat/linux/linux_mib.c   Sun Nov  8 09:49:51 2020
(r367480)
+++ head/sys/compat/linux/linux_mib.c   Sun Nov  8 09:50:58 2020
(r367481)
@@ -63,7 +63,7 @@ static unsigned linux_osd_jail_slot;
 SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
 "Linux mode");
 
-int linux_debug = 1;
+int linux_debug = 3;
 SYSCTL_INT(_compat_linux, OID_AUTO, debug, CTLFLAG_RWTUN,
 _debug, 0, "Log warnings from linux(4); or 0 to disable");
 

Modified: head/sys/compat/linux/linux_socket.c
==
--- head/sys/compat/linux/linux_socket.cSun Nov  8 09:49:51 2020
(r367480)
+++ head/sys/compat/linux/linux_socket.cSun Nov  8 09:50:58 2020
(r367481)
@@ -112,12 +112,37 @@ linux_to_bsd_ip_sockopt(int opt)
 {
 
switch (opt) {
+   /* known and translated sockopts */
case LINUX_IP_TOS:
return (IP_TOS);
case LINUX_IP_TTL:
return (IP_TTL);
+   case LINUX_IP_HDRINCL:
+   return (IP_HDRINCL);
case LINUX_IP_OPTIONS:
return (IP_OPTIONS);
+   case LINUX_IP_RECVOPTS:
+   LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_RECVOPTS");
+   return (IP_RECVOPTS);
+   case LINUX_IP_RETOPTS:
+   LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_REETOPTS");
+   return (IP_RETOPTS);
+   case LINUX_IP_RECVTTL:
+   LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_RECVTTL");
+   return (IP_RECVTTL);
+   case LINUX_IP_RECVTOS:
+   LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_RECVTOS");
+   return (IP_RECVTOS);
+   case LINUX_IP_FREEBIND:
+   LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_FREEBIND");
+   return (IP_BINDANY);
+   case LINUX_IP_IPSEC_POLICY:
+   /* we have this option, but not documented in ip(4) manpage */
+   LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option 
IP_IPSEC_POLICY");
+   return (IP_IPSEC_POLICY);
+   case LINUX_IP_MINTTL:
+   LINUX_RATELIMIT_MSG_NOTTESTED("IPv4 socket option IP_MINTTL");
+   return (IP_MINTTL);

svn commit: r366311 - head/usr.sbin/crashinfo

[Alexander Leidinger]

Author: netchild
Date: Thu Oct  1 08:57:36 2020
New Revision: 366311
URL: https://svnweb.freebsd.org/changeset/base/366311

Log:
  Remove nfsstat. Running nfsstat in crashinfo will give the stats of the
  running kernel instead of the stats of the crashed kernel. The current
  version uses sysctls to query the stats and does not work at all (anymore)
  on crash dumps.

Modified:
  head/usr.sbin/crashinfo/crashinfo.sh

Modified: head/usr.sbin/crashinfo/crashinfo.sh
==
--- head/usr.sbin/crashinfo/crashinfo.shThu Oct  1 08:46:21 2020
(r366310)
+++ head/usr.sbin/crashinfo/crashinfo.shThu Oct  1 08:57:36 2020
(r366311)
@@ -314,12 +314,6 @@ echo
 fi
 
 echo ""
-echo "nfsstat"
-echo
-nfsstat -M $VMCORE -N $KERNEL
-echo
-
-echo ""
 echo "netstat -s"
 echo
 netstat -M $VMCORE -N $KERNEL -s
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r364375 - head

[Alexander Leidinger]

Author: netchild
Date: Wed Aug 19 10:01:05 2020
New Revision: 364375
URL: https://svnweb.freebsd.org/changeset/base/364375

Log:
  Fix the real shared libraries (lib*.so.X) from OLD_FILES to OLD_LIBS,
  as it is supposed to be.

Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc  Wed Aug 19 08:05:37 2020(r364374)
+++ head/ObsoleteFiles.inc  Wed Aug 19 10:01:05 2020(r364375)
@@ -537,7 +537,7 @@ OLD_LIBS+=usr/lib32/padlock.so
 OLD_FILES+=usr/include/private/event/event.h
 OLD_FILES+=usr/lib/libprivateevent.a
 OLD_FILES+=usr/lib/libprivateevent.so
-OLD_FILES+=usr/lib/libprivateevent.so.1
+OLD_LIBS+=usr/lib/libprivateevent.so.1
 OLD_FILES+=usr/lib/libprivateevent_p.a
 OLD_DIRS+=usr/include/private/event
 
@@ -2274,7 +2274,7 @@ OLD_FILES+=usr/include/sys/dir.h
 # 20190729: gzip'ed a.out support removed
 OLD_FILES+=usr/include/sys/inflate.h
 # 20190722: cap_random(3) removed
-OLD_FILES+=lib/casper/libcap_random.so.1
+OLD_LIBS+=lib/casper/libcap_random.so.1
 OLD_FILES+=usr/include/casper/cap_random.h
 OLD_FILES+=usr/share/man/man3/cap_random.3.gz
 OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz
@@ -2465,7 +2465,7 @@ OLD_FILES+=usr/share/man/man4/wb.4.gz
 OLD_FILES+=usr/share/man/man4/xe.4.gz
 OLD_FILES+=usr/share/man/man4/if_xe.4.gz
 # 20190513: libcap_sysctl interface change
-OLD_FILES+=lib/casper/libcap_sysctl.so.1
+OLD_LIBS+=lib/casper/libcap_sysctl.so.1
 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.py
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.pyc
@@ -4585,7 +4585,7 @@ OLD_FILES+=usr/include/netnatm/natm.h
 OLD_FILES+=usr/lib/debug/sbin/atmconfig.debug
 OLD_FILES+=usr/lib/debug/usr/lib/snmp_atm.so.6.debug
 OLD_FILES+=usr/lib/snmp_atm.so
-OLD_FILES+=usr/lib/snmp_atm.so.6
+OLD_LIBS+=usr/lib/snmp_atm.so.6
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
 OLD_DIRS+=usr/share/doc/atm
@@ -7079,11 +7079,11 @@ OLD_FILES+=usr/share/examples/libusb20/aux.h
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/lib/libiconv.a
 OLD_FILES+=usr/lib/libiconv.so
-OLD_FILES+=usr/lib/libiconv.so.3
+OLD_LIBS+=usr/lib/libiconv.so.3
 OLD_FILES+=usr/lib/libiconv_p.a
 OLD_FILES+=usr/lib32/libiconv.a
 OLD_FILES+=usr/lib32/libiconv.so
-OLD_FILES+=usr/lib32/libiconv.so.3
+OLD_LIBS+=usr/lib32/libiconv.so.3
 OLD_FILES+=usr/lib32/libiconv_p.a
 # 20131103: removal of utxrm(8), use 'utx rm' instead.
 OLD_FILES+=usr/sbin/utxrm
@@ -9598,14 +9598,14 @@ OLD_FILES+=usr/lib/libalias_pptp.so
 OLD_FILES+=usr/lib/libalias_skinny.so
 OLD_FILES+=usr/lib/libalias_smedia.so
 # 20061201: remove old *.so.4 libalias modules
-OLD_FILES+=lib/libalias_cuseeme.so.4
-OLD_FILES+=lib/libalias_dummy.so.4
-OLD_FILES+=lib/libalias_ftp.so.4
-OLD_FILES+=lib/libalias_irc.so.4
-OLD_FILES+=lib/libalias_nbt.so.4
-OLD_FILES+=lib/libalias_pptp.so.4
-OLD_FILES+=lib/libalias_skinny.so.4
-OLD_FILES+=lib/libalias_smedia.so.4
+OLD_LIBS+=lib/libalias_cuseeme.so.4
+OLD_LIBS+=lib/libalias_dummy.so.4
+OLD_LIBS+=lib/libalias_ftp.so.4
+OLD_LIBS+=lib/libalias_irc.so.4
+OLD_LIBS+=lib/libalias_nbt.so.4
+OLD_LIBS+=lib/libalias_pptp.so.4
+OLD_LIBS+=lib/libalias_skinny.so.4
+OLD_LIBS+=lib/libalias_smedia.so.4
 # 20061126: remove old man page
 OLD_FILES+=usr/share/man/man3/archive_read_set_bytes_per_block.3.gz
 # 20061125: remove old man page
@@ -9988,10 +9988,10 @@ OLD_FILES+=usr/share/man/man3/tree_mung.3.gz
 OLD_FILES+=usr/share/man/man3/tree_srch.3.gz
 OLD_FILES+=usr/share/man/man3/tree_trav.3.gz
 # 2004XXYY: OS internal libs, no ports use them, no need to use OLD_LIBS
-OLD_FILES+=lib/geom/geom_concat.so.1
-OLD_FILES+=lib/geom/geom_label.so.1
-OLD_FILES+=lib/geom/geom_nop.so.1
-OLD_FILES+=lib/geom/geom_stripe.so.1
+OLD_LIBS+=lib/geom/geom_concat.so.1
+OLD_LIBS+=lib/geom/geom_label.so.1
+OLD_LIBS+=lib/geom/geom_nop.so.1
+OLD_LIBS+=lib/geom/geom_stripe.so.1
 # 20040728: GCC 3.4.2
 OLD_DIRS+=usr/include/c++/3.3
 OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r363125 - head/sys/compat/linux

[Alexander Leidinger]

Quoting Conrad Meyer  (from Sun, 12 Jul 2020 16:27:49 -0700):


Hi Alexander,

On Sun, Jul 12, 2020 at 2:51 AM Alexander Leidinger
 wrote:


Author: netchild
Date: Sun Jul 12 09:51:09 2020
New Revision: 363125
URL: https://svnweb.freebsd.org/changeset/base/363125

Log:
  Implement CLOCK_MONOTONIC_RAW (linux >= 2.6.28).

  It is documented as a raw hardware-based clock not subject to NTP or
  incremental adjustments. With this "not as precise as CLOCK_MONOTONIC"
  description in mind, map it to our CLOCK_MONOTNIC_FAST (the same
  mapping as for the linux CLOCK_MONOTONIC_COARSE).


Can you point at the documentation suggesting CLOCK_MONOTONIC_RAW is
any less precise than CLOCK_MONOTONIC?  I'm looking at the Linux
manual page and it does not seem to contain any language to that
effect.


It depends what each of us means by "less precise".
I only had a look at the man page online, and what I refer to her in  
terms of precision is the "not subject to NTP or incremental  
adjustments". I understand this as: MONOTINIC is rather precise about  
the rate of change (e.g. it is close to the rate of change as far as  
you can get with NTP and the hardware you have), whereas MONOTIC_RAW  
may increase faster or slower than MONOTONIC, but it stays monotonic.



  This is needed for the webcomponent of steam (chromium) and some
  other steam component or game.

  The linux-steam-utils port contains a LD_PRELOAD based fix for this.
  There this is mapped to CLOCK_MONOTONIC.
  As an untrained ear/eye (= the majority of people) is normaly not
  noticing a difference of jitter in the 10-20 ms range, specially
  if you don't pay attention like for example in a browser session
  while watching a video stream, the mapping to CLOCK_MONOTONIC_FAST
  seems more appropriate than to CLOCK_MONOTONIC.


I don't know how these programs use the clock, but 10-20 ms of jitter
in the UI is noticeable to even casual users.  (In FreeBSD these


A german DIY electronic magazine had once (about 20 years ago) a  
little device with which you was able to test your sensitivity between  
two audio or visual events. It simply activated the left and right  
device for a short moment of time (LED or a click in the headphone).  
It displayed how far in time the two events were apart (the scale was  
from 10ms to 100ms in 10ms steps). I should have still this device  
somehere...
In my twenties, I tested it. I was able to distinguish 2 different  
events which were 40-60ms apart (don't remember if I was able to  
detect shorter pauses in the audio test or in the visual test, but  
both weren't at the same level). They told with age your ability gets  
worse.
This device was able to train your abilities in this regard. The  
training mode did the same, but instead of only one type of test, you  
was testing both (audio + visual). This not onlxy brought the slower  
of both down to the level of the faster one (when testing afterwards  
only one of the types), but with some repetition you was able to  
distinguish two different events which were too close in time to each  
other before. I was able to get down to 20ms (and sometimes 10ms). But  
I had to be concentrated on the test.


So I have first hand experience of being able to notice two events  
which are 20ms apart... 20 years ago, after some days of training.


And this is the sole reason why I mentioned 10-20ms in the commit log.  
See further down before commenting on this sentence.


Bring me 3 people which swear that they notice a difference when  
running steam / linux-chrome (comparing MONOTONIC_FAST vs MONOTONIC),  
and which tell that it annoys them, and I fully agree to switch to  
MONOTONIC. Please see below before commenting on this sentence.



functions are purportedly accurate to 1 timer tick, which is 1ms on
HZ=1000 (amd64) — much better than 10-20ms.)  However, I'm concerned


Our MONOTONIC_FAST is documented to have an accuracy of one timer  
tick. So we _are_ with this setting at 1ms (with HZ=1000). This  
accuracy is a worst case accuracy. If your call to get the clock is  
0.1ms after the update of the value MONOTONIC_FAST reads out, you are  
as accurate as 0.1ms... So the accuracy we achieve with the mapping to  
MONOTONIC_FAST is between 0ms and 1ms (with HZ=1000). To come back to  
what I said before and change it a little bit: if you bring 3 people  
which swear they notice a difference of upto 1ms in their use of steam  
/ linux-chrome which annoys them, and if they switch to MONOTONIC and  
they do not notice a difference anymore, I fully agree to switch to  
MONOTONIC. Until them I'm sceptical that this can be noticed.



this is still insufficient precision compared with the documented
behavior of the Linux functions.  I think regular CLOCK_MONOTONIC is
the closest thing we've got to Linux's CLOCK_MONOTONIC_RAW.  The Linux
analog of _FAST is _COARSE.


I do not know which one is closer. I consider the linux man page I've  
r

Re: svn commit: r363125 - head/sys/compat/linux

[Alexander Leidinger via svn-src-all]

Quoting Dimitry Andric  (from Sun, 12 Jul 2020  
15:36:25 +0200):



On 12 Jul 2020, at 11:51, Alexander Leidinger  wrote:


Author: netchild
Date: Sun Jul 12 09:51:09 2020
New Revision: 363125
URL: https://svnweb.freebsd.org/changeset/base/363125

Log:
 Implement CLOCK_MONOTONIC_RAW (linux >= 2.6.28).

 It is documented as a raw hardware-based clock not subject to NTP or
 incremental adjustments. With this "not as precise as CLOCK_MONOTONIC"
 description in mind, map it to our CLOCK_MONOTNIC_FAST (the same
 mapping as for the linux CLOCK_MONOTONIC_COARSE).


Okay, but:


@@ -212,6 +212,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)
*n = CLOCK_THREAD_CPUTIME_ID;
break;
case LINUX_CLOCK_REALTIME_COARSE:
+   case LINUX_CLOCK_MONOTONIC_RAW:
*n = CLOCK_REALTIME_FAST;
break;
case LINUX_CLOCK_MONOTONIC_COARSE:


this shows it is actually mapped to CLOCK_REALTIME_FAST, not
CLOCK_MONOTONIC_FAST. Is the code right, or the commit message? :)


The commit message and the code I have running are right, the code I  
committed from a "no other change than that"-svn-tree was not. :(

I think I should switch to "diff | patch" even for one-liners like that.

I commited the fix based upon another message I've seen before this  
one, but thanks for looking at the code.


Bye,
Alexander.

--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF


pgpWt6J1gVLa9.pgp
Description: Digitale PGP-Signatur

svn commit: r363130 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Sun Jul 12 14:57:29 2020
New Revision: 363130
URL: https://svnweb.freebsd.org/changeset/base/363130

Log:
  Fix r363125 (Implement CLOCK_MONOTONIC_RAW (linux >= 2.6.28)),
  by realy using the MONOTONIC version and not the REALTIME version.
  
  Noticed by:   myfreeweb at github

Modified:
  head/sys/compat/linux/linux_time.c

Modified: head/sys/compat/linux/linux_time.c
==
--- head/sys/compat/linux/linux_time.c  Sun Jul 12 14:50:12 2020
(r363129)
+++ head/sys/compat/linux/linux_time.c  Sun Jul 12 14:57:29 2020
(r363130)
@@ -212,10 +212,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)
*n = CLOCK_THREAD_CPUTIME_ID;
break;
case LINUX_CLOCK_REALTIME_COARSE:
-   case LINUX_CLOCK_MONOTONIC_RAW:
*n = CLOCK_REALTIME_FAST;
break;
case LINUX_CLOCK_MONOTONIC_COARSE:
+   case LINUX_CLOCK_MONOTONIC_RAW:
*n = CLOCK_MONOTONIC_FAST;
break;
case LINUX_CLOCK_BOOTTIME:
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r363125 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Sun Jul 12 09:51:09 2020
New Revision: 363125
URL: https://svnweb.freebsd.org/changeset/base/363125

Log:
  Implement CLOCK_MONOTONIC_RAW (linux >= 2.6.28).
  
  It is documented as a raw hardware-based clock not subject to NTP or
  incremental adjustments. With this "not as precise as CLOCK_MONOTONIC"
  description in mind, map it to our CLOCK_MONOTNIC_FAST (the same
  mapping as for the linux CLOCK_MONOTONIC_COARSE).
  
  This is needed for the webcomponent of steam (chromium) and some
  other steam component or game.
  
  The linux-steam-utils port contains a LD_PRELOAD based fix for this.
  There this is mapped to CLOCK_MONOTONIC.
  As an untrained ear/eye (= the majority of people) is normaly not
  noticing a difference of jitter in the 10-20 ms range, specially
  if you don't pay attention like for example in a browser session
  while watching a video stream, the mapping to CLOCK_MONOTONIC_FAST
  seems more appropriate than to CLOCK_MONOTONIC.

Modified:
  head/sys/compat/linux/linux_time.c

Modified: head/sys/compat/linux/linux_time.c
==
--- head/sys/compat/linux/linux_time.c  Sun Jul 12 09:49:53 2020
(r363124)
+++ head/sys/compat/linux/linux_time.c  Sun Jul 12 09:51:09 2020
(r363125)
@@ -212,6 +212,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)
*n = CLOCK_THREAD_CPUTIME_ID;
break;
case LINUX_CLOCK_REALTIME_COARSE:
+   case LINUX_CLOCK_MONOTONIC_RAW:
*n = CLOCK_REALTIME_FAST;
break;
case LINUX_CLOCK_MONOTONIC_COARSE:
@@ -220,7 +221,6 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)
case LINUX_CLOCK_BOOTTIME:
*n = CLOCK_UPTIME;
break;
-   case LINUX_CLOCK_MONOTONIC_RAW:
case LINUX_CLOCK_REALTIME_ALARM:
case LINUX_CLOCK_BOOTTIME_ALARM:
case LINUX_CLOCK_SGI_CYCLE:
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359325 - head/tools/kerneldoc/subsys

[Alexander Leidinger]

Author: netchild
Date: Thu Mar 26 09:23:16 2020
New Revision: 359325
URL: https://svnweb.freebsd.org/changeset/base/359325

Log:
  Remove deprecated options.

Modified:
  head/tools/kerneldoc/subsys/common-Doxyfile

Modified: head/tools/kerneldoc/subsys/common-Doxyfile
==
--- head/tools/kerneldoc/subsys/common-Doxyfile Thu Mar 26 08:23:09 2020
(r359324)
+++ head/tools/kerneldoc/subsys/common-Doxyfile Thu Mar 26 09:23:16 2020
(r359325)
@@ -66,7 +66,6 @@ GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS   = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES= YES
-SHOW_DIRECTORIES   = YES
 FILE_VERSION_FILTER= 
 #---
 # configuration options related to warning and progress messages
@@ -159,7 +158,6 @@ HTML_FILE_EXTENSION= .html
 HTML_HEADER= 
 HTML_FOOTER= 
 HTML_STYLESHEET= 
-HTML_ALIGN_MEMBERS = YES
 GENERATE_HTMLHELP  = NO
 CHM_FILE   = 
 HHC_LOCATION   = 
@@ -206,8 +204,6 @@ MAN_LINKS  = NO
 #---
 GENERATE_XML   = NO
 XML_OUTPUT = xml
-XML_SCHEMA = 
-XML_DTD= 
 XML_PROGRAMLISTING = YES
 #---
 # configuration options for the AutoGen Definitions output
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r357774 - head/tools/kerneldoc/subsys

[Alexander Leidinger]

Author: netchild
Date: Tue Feb 11 19:39:59 2020
New Revision: 357774
URL: https://svnweb.freebsd.org/changeset/base/357774

Log:
  Fix duplicate target warning.

Modified:
  head/tools/kerneldoc/subsys/Makefile

Modified: head/tools/kerneldoc/subsys/Makefile
==
--- head/tools/kerneldoc/subsys/MakefileTue Feb 11 19:13:34 2020
(r357773)
+++ head/tools/kerneldoc/subsys/MakefileTue Feb 11 19:39:59 2020
(r357774)
@@ -10,7 +10,7 @@ TARGET_ARCH?= ${MACHINE_ARCH}
 S?=/usr/src/sys
 LOCALBASE?=/usr/local
 
-MFILES!= find ${S} -name \*.m | sed -e 's:${S}/::g'
+MFILES!= find ${S} -name \*.m | egrep 
'/(dev|libkern|kgssapi|opencrypto|isa|geom|kern|xen|net|${TARGET_ARCH})/' | sed 
-e 's:${S}/::g'
 HFILES=${MFILES:T:S/.m$/.h/}
 AWK?=  awk
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r354458 - head/libexec/rc/rc.d

[Alexander Leidinger via svn-src-all]

Quoting Edward Tomasz Napierała  (from Sun, 10 Nov  
2019 20:25:04 +):



On 1110T1147, Conrad Meyer wrote:



I am on board with making this stuff more “batteries included” and usable
by default, but just echoing the request for configurable knobs (I don’t
care about the defaults).


My point is... well, there are two.  First is, it's configurable already:
you can comment out parts of the rc script you don't want, or you can not


We want to have the system rc scripts "no touch" scripts, don't we?


set linux_enable in the first place and do things it would otherwise do
for you by in the usual manner - add the modules to loader.conf, add a
line to sysctl.conf etc.  The script simply provides a shortcut to match
what 90% of users want.


I agree.


Second, in order to implement something properly, I need to understand
how it's going to be used.  I guess I worded it quite badly in the
previous mail; it's wasn't supposed to sound like "Can you give me some
use case because I think you're wrong", but rather a "Can you give me
some use case, because without it I have no idea how to design it to
fit it".


What about a config variable which enables or disables the mounts?  
That way we don't have to modify the rc script to get back to the old  
behavior in cases were we need it.


Bye,
Alexander.

--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF


pgpJT_fAArT08.pgp
Description: Digitale PGP-Signatur

Re: svn commit: r354458 - head/libexec/rc/rc.d

[Alexander Leidinger via svn-src-all]

Quoting Edward Tomasz Napierala  (from Thu, 7 Nov  
2019 18:15:24 + (UTC)):



Author: trasz
Date: Thu Nov  7 18:15:24 2019
New Revision: 354458
URL: https://svnweb.freebsd.org/changeset/base/354458

Log:
  Extend the linux rc script to mount the neccessary file systems,
  set ELF fallback brand, and load pty(4).


We never did something like that. We have it documented everywhere  
that it needs to be done manually. So this is at least a POLA  
violation. It is great that the nocover option is used in the mount,  
but it's still some kind of layering violation (I may want to have  
only a subset mounted, or nothing at all).


I do not object to the functionality, but I think it needs to be  
configurable (an option to influence if the auto-mount is done or not,  
doesn't matter to me what the default behavior is, as long as it is  
configurable) and documented (UPDATING, handbook, man-pages, maybe  
even the release notes).


Bye,
Alexander.

--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF


pgpbro90Jzsyt.pgp
Description: Digitale PGP-Signatur

svn commit: r344796 - head/tools/kerneldoc/subsys

[Alexander Leidinger]

Author: netchild
Date: Tue Mar  5 15:23:28 2019
New Revision: 344796
URL: https://svnweb.freebsd.org/changeset/base/344796

Log:
  remove the removed-from-source drm/drm2 parts

Deleted:
  head/tools/kerneldoc/subsys/Doxyfile-dev_drm
  head/tools/kerneldoc/subsys/Doxyfile-dev_drm2
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r343478 - head/tools/kerneldoc/subsys

[Alexander Leidinger]

Author: netchild
Date: Sat Jan 26 18:23:19 2019
New Revision: 343478
URL: https://svnweb.freebsd.org/changeset/base/343478

Log:
  Catch up with some years of driver development.
  Most impressive in terms of doxygen stuff are the isci and
  ocs_fc drivers.

Added:
  head/tools/kerneldoc/subsys/Doxyfile-dev_aacraid   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_al_eth   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_alpm   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_altera   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_amd_ecc_inject   (contents, props 
changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_amdgpio   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_amdpm   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_amdsmb   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_amdsmn   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_axgbe   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_beri   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_bhnd   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_bnxt   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_bvm   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_cadence   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_chromebook_platform   (contents, 
props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_cyapa   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_dme   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_dpaa   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_drm2   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_dwc   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_efidev   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_ena   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_etherswitch   (contents, props 
changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_evdev   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_extres   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_ffec   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_filemon   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_gxemul   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_hdmi   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_hptnr   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_hyperv   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_ichiic   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_imcsmb   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_intel   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_intpm   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_ioat   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_isci   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_iscsi_initiator   (contents, props 
changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_iser   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_isl   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_ismt   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_iwm   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_ixl   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_jedec_dimm   (contents, props 
changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_liquidio   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_mbox   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_mdio   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_mlx4   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_mlx5   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_mmcnull   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_mpr   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_mrsas   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_mthca   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_nand   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_nctgpio   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_neta   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_netfpga10g   (contents, props 
changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_nfsmb   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_ntb   (contents, props changed)
  head/tools/kerneldoc/subsys/Doxyfile-dev_nvd   (contents, props 

Re: svn commit: r340181 - in head/sys: amd64/linux32 compat/linux

[Alexander Leidinger]

Targeted for 12.0-release?
Relnotes yes (linux64 support for NVidia driver)?

--
Send from a mobile device, please forgive brevity and misspellings.
Am 06.11.2018 2:51 nachm. schrieb Tijl Coosemans :
>
> Author: tijl 
> Date: Tue Nov  6 13:51:08 2018 
> New Revision: 340181 
> URL: https://svnweb.freebsd.org/changeset/base/340181 
>
> Log: 
>   On amd64 both Linux compat modules, linux.ko and linux64.ko, provide 
>   linux_ioctl_(un)register_handler that allows other driver modules to 
>   register ioctl handlers.  The ioctl syscall implementation in each Linux 
>   compat module iterates over the list of handlers and forwards the call to 
>   the appropriate driver.  Because the registration functions have the same 
>   name in each module it is not possible for a driver to support both 32 and 
>   64 bit linux compatibility. 
>   
>   Move the list of ioctl handlers to linux_common.ko so it is shared by 
>   both Linux modules and all drivers receive both 32 and 64 bit ioctl calls 
>   with one registration.  These ioctl handlers normally forward the call 
>   to the FreeBSD ioctl handler which can handle both 32 and 64 bit. 
>   
>   Keep the special COMPAT_LINUX32 ioctl handlers in linux.ko in a separate 
>   list for now and let the ioctl syscall iterate over that list first. 
>   Later, COMPAT_LINUX32 support can be added to the 64 bit ioctl handlers 
>   via a runtime check for ILP32 like is done for COMPAT_FREEBSD32 and then 
>   this separate list would disappear again.  That is a much bigger effort 
>   however and this commit is meant to be MFCable. 
>   
>   This enables linux64 support in x11/nvidia-driver*. 
>   
>   PR: 206711  http://www.FreeBSD.org/cgi/query-pr.cgi?pr=206711 
>   Reviewed by: kib 
>   MFC after: 3 days 
>
> Modified: 
>   head/sys/amd64/linux32/linux32_sysvec.c 
> https://svnweb.FreeBSD.org/base/head/sys/amd64/linux32/linux32_sysvec 
>   head/sys/compat/linux/linux_common.c 
> https://svnweb.FreeBSD.org/base/head/sys/compat/linux/linux_common 
>   head/sys/compat/linux/linux_ioctl.c 
> https://svnweb.FreeBSD.org/base/head/sys/compat/linux/linux_ioctl 
>   head/sys/compat/linux/linux_ioctl.h 
> https://svnweb.FreeBSD.org/base/head/sys/compat/linux/linux_ioctl 
>
> Modified: head/sys/amd64/linux32/linux32_sysvec.c 
> ==
>  
> --- head/sys/amd64/linux32/linux32_sysvec.c Tue Nov  6 12:57:38 2018 
> (r340180) 
> +++ head/sys/amd64/linux32/linux32_sysvec.c Tue Nov  6 13:51:08 2018 
> (r340181) 
> @@ -1071,7 +1071,7 @@ linux_elf_modevent(module_t mod, int type, void *data) 
> error = EINVAL; 
> if (error == 0) { 
> SET_FOREACH(lihp, linux_ioctl_handler_set) 
> - linux_ioctl_register_handler(*lihp); 
> + linux32_ioctl_register_handler(*lihp); 
> LIST_INIT(_list); 
> mtx_init(_mtx, "ftllk", NULL, MTX_DEF); 
> stclohz = (stathz ? stathz : hz); 
> @@ -1093,7 +1093,7 @@ linux_elf_modevent(module_t mod, int type, void *data) 
> } 
> if (error == 0) { 
> SET_FOREACH(lihp, linux_ioctl_handler_set) 
> - linux_ioctl_unregister_handler(*lihp); 
> + linux32_ioctl_unregister_handler(*lihp); 
> mtx_destroy(_mtx); 
> if (bootverbose) 
> printf("Linux ELF exec handler removed\n"); 
>
> Modified: head/sys/compat/linux/linux_common.c 
> ==
>  
> --- head/sys/compat/linux/linux_common.c Tue Nov  6 12:57:38 2018 (r340180) 
> +++ head/sys/compat/linux/linux_common.c Tue Nov  6 13:51:08 2018 (r340181) 
> @@ -35,9 +35,11 @@ __FBSDID("$FreeBSD$"); 
> #include  
> #include  
> #include  
> +#include  
> #include  
>
> #include  
> +#include  
> #include  
> #include  
>
> @@ -47,6 +49,11 @@ FEATURE(linuxulator_v4l2, "V4L2 ioctl wrapper support 
> MODULE_VERSION(linux_common, 1); 
>
> SET_DECLARE(linux_device_handler_set, struct linux_device_handler); 
> + 
> +TAILQ_HEAD(, linux_ioctl_handler_element) linux_ioctl_handlers = 
> +    TAILQ_HEAD_INITIALIZER(linux_ioctl_handlers); 
> +struct sx linux_ioctl_sx; 
> +SX_SYSINIT(linux_ioctl, _ioctl_sx, "Linux ioctl handlers"); 
>
> static eventhandler_tag linux_exec_tag; 
> static eventhandler_tag linux_thread_dtor_tag; 
>
> Modified: head/sys/compat/linux/linux_ioctl.c 
> ==
>  
> --- head/sys/compat/linux/linux_ioctl.c Tue Nov  6 12:57:38 2018 (r340180) 
> +++ head/sys/compat/linux/linux_ioctl.c Tue Nov  6 13:51:08 2018 (r340181) 
> @@ -161,17 +161,19 @@ DATA_SET(linux_ioctl_handler_set, video2_handler); 
> DATA_SET(linux_ioctl_handler_set, fbsd_usb); 
> DATA_SET(linux_ioctl_handler_set, evdev_handler); 
>
> -struct handler_element 
> -{ 
> - TAILQ_ENTRY(handler_element) list; 
> - int (*func)(struct thread *, struct linux_ioctl_args *); 
> - int low, high, span; 
> -}; 
> - 
> -static TAILQ_HEAD(, handler_element) handlers = 
> -    TAILQ_HEAD_INITIALIZER(handlers); 
> +#ifdef __i386__ 
> +static TAILQ_HEAD(, 

Re: svn commit: r338571 - in head/sys: netinet netinet6

[Alexander Leidinger]

Quoting Mark Johnston  (from Mon, 10 Sep 2018  
19:00:29 + (UTC)):



Author: markj
Date: Mon Sep 10 19:00:29 2018
New Revision: 338571
URL: https://svnweb.freebsd.org/changeset/base/338571

Log:
  Fix synchronization of LB group access.

  Lookups are protected by an epoch section, so the LB group linkage must
  be a CK_LIST rather than a plain LIST.  Furthermore, we were not
  deferring LB group frees, so in_pcbremlbgrouphash() could race with
  readers and cause a use-after-free.


Is this related to PR 230950?
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230950

Bye,
Alexander.

--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r338507 - in head/sys: sys vm

[Alexander Leidinger]

Quoting Mark Johnston  (from Thu, 6 Sep 2018  
19:28:53 + (UTC)):



Author: markj
Date: Thu Sep  6 19:28:52 2018
New Revision: 338507
URL: https://svnweb.freebsd.org/changeset/base/338507

Log:
  Avoid resource deadlocks when one domain has exhausted its memory. Attempt
  other allowed domains if the requested domain is below the minimum paging
  threshold.  Block in fork only if all domains available to the forking
  thread are below the severe threshold rather than any.


Could the problem you fixed manifest itself in e.g. a hanging system  
due to not enough memory free despite top displaying a lot of memory  
free (let's assume 2 memory domains and several gigs in both)?


I have a system which never went below a specific amount of memory  
(before the fix of the no-rebalancing bug in the scheduler) if NUMA  
was enabled. With NUMA disabled I see much less memory free. I haven't  
tried NUMA after the fix of the scheduler, but would give it a try  
again if you think this could be a manifestation of the problem.


Bye,
Alexander.
--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r337863 - in head: sys/sys usr.sbin/jail

[Alexander Leidinger]

Author: netchild
Date: Wed Aug 15 18:35:42 2018
New Revision: 337863
URL: https://svnweb.freebsd.org/changeset/base/337863

Log:
  - Add exec hook "exec.created". This is called when the jail is
created and before exec.start is called.[1]
  - Bump __FreeBSD_version.
  
  This allows to attach ZFS datasets and various other things to be
  done before any command/service/rc-script is started in the new
  jail.
  
  PR:   228066  [1]
  Reviewed by:  jamie   [1]
  Submitted by: Stefan Grönke[1]
  Differential Revision:https://reviews.freebsd.org/D15330  [1]

Modified:
  head/sys/sys/param.h
  head/usr.sbin/jail/command.c
  head/usr.sbin/jail/config.c
  head/usr.sbin/jail/jail.8
  head/usr.sbin/jail/jail.c
  head/usr.sbin/jail/jailp.h

Modified: head/sys/sys/param.h
==
--- head/sys/sys/param.hWed Aug 15 18:19:45 2018(r337862)
+++ head/sys/sys/param.hWed Aug 15 18:35:42 2018(r337863)
@@ -60,7 +60,7 @@
  * in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200077  /* Master, propagated to newvers */
+#define __FreeBSD_version 1200078  /* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

Modified: head/usr.sbin/jail/command.c
==
--- head/usr.sbin/jail/command.cWed Aug 15 18:19:45 2018
(r337862)
+++ head/usr.sbin/jail/command.cWed Aug 15 18:35:42 2018
(r337863)
@@ -147,8 +147,8 @@ next_command(struct cfjail *j)
}
if (j->comstring == NULL || j->comstring->len == 0 ||
(create_failed && (comparam == IP_EXEC_PRESTART ||
-   comparam == IP_EXEC_START || comparam == IP_COMMAND ||
-   comparam == IP_EXEC_POSTSTART)))
+   comparam == IP_EXEC_CREATED || comparam == IP_EXEC_START ||
+   comparam == IP_COMMAND || comparam == IP_EXEC_POSTSTART)))
continue;
switch (run_command(j)) {
case -1:

Modified: head/usr.sbin/jail/config.c
==
--- head/usr.sbin/jail/config.c Wed Aug 15 18:19:45 2018(r337862)
+++ head/usr.sbin/jail/config.c Wed Aug 15 18:35:42 2018(r337863)
@@ -73,6 +73,7 @@ static const struct ipspec intparams[] = {
 [IP_EXEC_POSTSTOP] =   {"exec.poststop",   PF_INTERNAL},
 [IP_EXEC_PRESTART] =   {"exec.prestart",   PF_INTERNAL},
 [IP_EXEC_PRESTOP] ={"exec.prestop",PF_INTERNAL},
+[IP_EXEC_CREATED] ={"exec.created",PF_INTERNAL},
 [IP_EXEC_START] =  {"exec.start",  PF_INTERNAL},
 [IP_EXEC_STOP] =   {"exec.stop",   PF_INTERNAL},
 [IP_EXEC_SYSTEM_JAIL_USER]={"exec.system_jail_user",

Modified: head/usr.sbin/jail/jail.8
==
--- head/usr.sbin/jail/jail.8   Wed Aug 15 18:19:45 2018(r337862)
+++ head/usr.sbin/jail/jail.8   Wed Aug 15 18:35:42 2018(r337863)
@@ -706,6 +706,9 @@ The pseudo-parameters are:
 .Bl -tag -width indent
 .It Va exec.prestart
 Command(s) to run in the system environment before a jail is created.
+.It Va exec.created
+Command(s) to run in the system environment right after a jail has been
+created, but before commands (or services) get executed in the jail.
 .It Va exec.start
 Command(s) to run in the jail environment when a jail is created.
 A typical command to run is

Modified: head/usr.sbin/jail/jail.c
==
--- head/usr.sbin/jail/jail.c   Wed Aug 15 18:19:45 2018(r337862)
+++ head/usr.sbin/jail/jail.c   Wed Aug 15 18:35:42 2018(r337863)
@@ -98,6 +98,7 @@ static const enum intparam startcommands[] = {
 IP_MOUNT_PROCFS,
 IP_EXEC_PRESTART,
 IP__OP,
+IP_EXEC_CREATED,
 IP_VNET_INTERFACE,
 IP_EXEC_START,
 IP_COMMAND,

Modified: head/usr.sbin/jail/jailp.h
==
--- head/usr.sbin/jail/jailp.h  Wed Aug 15 18:19:45 2018(r337862)
+++ head/usr.sbin/jail/jailp.h  Wed Aug 15 18:35:42 2018(r337863)
@@ -88,6 +88,7 @@ enum intparam {
IP_EXEC_POSTSTOP,   /* Commands run outside jail after removing */
IP_EXEC_PRESTART,   /* Commands run outside jail before creating */
IP_EXEC_PRESTOP,/* Commands run outside jail before removing */
+   IP_EXEC_CREATED,/* Commands run outside jail right after it was 
started */

svn commit: r337658 - head/cddl/contrib/opensolaris/cmd/zfs

[Alexander Leidinger]

Author: netchild
Date: Sat Aug 11 20:49:19 2018
New Revision: 337658
URL: https://svnweb.freebsd.org/changeset/base/337658

Log:
  Extend the info about the limitations of datasets in jails.
  
  Reviewed by:  allanjude
  Sponsored by: Essen Hackathon

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs.8

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Aug 11 20:47:35 2018
(r337657)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Aug 11 20:49:19 2018
(r337658)
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 6, 2017
+.Dd August 11, 2018
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -462,8 +462,11 @@ responsible for mounting and unmounting the file syste
 dataset can be attached to a jail by using the
 .Qq Nm Cm jail
 subcommand. You cannot attach a dataset to one jail and the children of the
-same dataset to another jails. To allow management of the dataset from within
-a jail, the
+same dataset to another jail. You can also not attach the root file system
+of the jail or any dataset which needs to be mounted before the zfs rc script
+is run inside the jail, as it would be attached unmounted until it is
+mounted from the rc script inside the jail. To allow management of the
+dataset from within a jail, the
 .Sy jailed
 property has to be set and the jail needs access to the
 .Pa /dev/zfs
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r337638 - head/usr.bin/at

[Alexander Leidinger]

Author: netchild
Date: Sat Aug 11 16:29:54 2018
New Revision: 337638
URL: https://svnweb.freebsd.org/changeset/base/337638

Log:
   - Correct the description when jobs are executed related to load avg
 to match reality (slightly different to what was submitted in the
 PR: use english word instead of math-symbol).
   - Wrap the corresponding part to below 80 characters per line.
  
  Submitted by: yam...@yamagi.org
  PR:   202202
  Sponsored by: Essen Hackathon

Modified:
  head/usr.bin/at/at.man

Modified: head/usr.bin/at/at.man
==
--- head/usr.bin/at/at.man  Sat Aug 11 16:29:51 2018(r337637)
+++ head/usr.bin/at/at.man  Sat Aug 11 16:29:54 2018(r337638)
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.Dd June 1, 2018
+.Dd August 11, 2018
 .Dt "AT" 1
 .Os
 .Sh NAME
@@ -64,8 +64,9 @@ case, everybody's jobs are listed;
 .It Nm atrm
 deletes jobs;
 .It Nm batch
-executes commands when system load levels permit; in other words, when the 
load average
-drops below _LOADAVG_MX, or the value specified in the invocation of
+executes commands when system load levels permit; in other words, when
+the load average drops below _LOADAVG_MX times number of active CPUs,
+or the value specified in the invocation of
 .Nm atrun .
 .El
 .Pp
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r337630 - head/sbin/restore

[Alexander Leidinger]

Author: netchild
Date: Sat Aug 11 16:12:23 2018
New Revision: 337630
URL: https://svnweb.freebsd.org/changeset/base/337630

Log:
  Re-enable reading byte swapped NFS_MAGIC dumps.
  
  Fix bug introduced in r98542: previously to this revision the byte-swapped
  value was compared at this place. The current check is in a conditional
  section where the non-byte-swapped value was already checked to be not
  the value which is checked again. As byte-swapping is activated afterwards,
  it only makes sense if the byte-swapped value is checked.
  
  Submitted by: Keith White 
  PR:   200059
  MFC after:1 month
  Sponsored by: Essen Hackathon

Modified:
  head/sbin/restore/tape.c

Modified: head/sbin/restore/tape.c
==
--- head/sbin/restore/tape.cSat Aug 11 16:06:32 2018(r337629)
+++ head/sbin/restore/tape.cSat Aug 11 16:12:23 2018(r337630)
@@ -1314,8 +1314,8 @@ gethead(struct s_spcl *buf)
return (FAIL);
}
if (swabl(buf->c_magic) != FS_UFS2_MAGIC &&
-   buf->c_magic != NFS_MAGIC) {
-   if (buf->c_magic == OFS_MAGIC) {
+   swabl(buf->c_magic) != NFS_MAGIC) {
+   if (swabl(buf->c_magic) == OFS_MAGIC) {
fprintf(stderr,
  "Format of dump tape is too old. Must use\n");
fprintf(stderr,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r337621 - in head/share/man: man5 man7

[Alexander Leidinger]

Author: netchild
Date: Sat Aug 11 13:18:19 2018
New Revision: 337621
URL: https://svnweb.freebsd.org/changeset/base/337621

Log:
  Add svnlite to places where svn is mentioned.
  
  The Makefile part in the PR is solved already differently, so this
  part is skipped form the PR The man page change change is slightly
  changed to adapt to the way the Makefile works and to the spirit
  of what is intended here.
  
  Submitted by: Juan Ramón Molina Menor 
  PR:   194910
  Sponsored by: Essen Hackathon

Modified:
  head/share/man/man5/make.conf.5
  head/share/man/man7/build.7

Modified: head/share/man/man5/make.conf.5
==
--- head/share/man/man5/make.conf.5 Sat Aug 11 13:01:46 2018
(r337620)
+++ head/share/man/man5/make.conf.5 Sat Aug 11 13:18:19 2018
(r337621)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 20, 2018
+.Dd August 11, 2018
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -234,12 +234,13 @@ Set this to not update the ports tree during
 .Pq Vt bool
 Set this to use
 .Xr svn 1
+or
+.Xr svnlite 1
 to update your
 .Pa src
 tree with
 .Dq Li "make update" .
-Note that since a subversion client is not included in the base system,
-you will need to set
+Note that you can set
 .Va SVN
 to the full path of a
 .Xr svn 1

Modified: head/share/man/man7/build.7
==
--- head/share/man/man7/build.7 Sat Aug 11 13:01:46 2018(r337620)
+++ head/share/man/man7/build.7 Sat Aug 11 13:18:19 2018(r337621)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 24, 2017
+.Dd August 11, 2018
 .Dt BUILD 7
 .Os
 .Sh NAME
@@ -42,6 +42,8 @@ and
 These directories may be initially empty or non-existent until updated with
 .Xr svn 1
 or
+.Xr svnlite 1
+or
 .Xr portsnap 8 .
 Directory
 .Pa /usr/src
@@ -789,6 +791,7 @@ make TARGET_ARCH=armv6 DESTDIR=/clients/arm64 installw
 .Xr install 1 ,
 .Xr make 1 ,
 .Xr svn 1 ,
+.Xr svnlite 1 ,
 .Xr make.conf 5 ,
 .Xr src.conf 5 ,
 .Xr arch 7 ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r337620 - head/share/man/man4

[Alexander Leidinger]

Author: netchild
Date: Sat Aug 11 13:01:46 2018
New Revision: 337620
URL: https://svnweb.freebsd.org/changeset/base/337620

Log:
  Add "ESI Juli@ XTe" as a supported device.
  
  Submitted by: Vladislav Movchan  
  PR:   222025
  Sponsored by: Essen Hackathon

Modified:
  head/share/man/man4/snd_envy24ht.4

Modified: head/share/man/man4/snd_envy24ht.4
==
--- head/share/man/man4/snd_envy24ht.4  Sat Aug 11 11:28:51 2018
(r337619)
+++ head/share/man/man4/snd_envy24ht.4  Sat Aug 11 13:01:46 2018
(r337620)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 1, 2014
+.Dd August 11, 2018
 .Dt SND_ENVY24HT 4
 .Os
 .Sh NAME
@@ -68,6 +68,8 @@ Audiotrak Prodigy 7.1 XT
 Audiotrak Prodigy HD2
 .It
 ESI Juli@
+.It
+ESI Juli@ XTe
 .It
 M-Audio Audiophile 192
 .It
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r336313 - in head/sys: dev/bnxt dev/e1000 dev/ixgbe dev/ixl net sys

[Alexander Leidinger]

Quoting Marius Strobl  (from Sun, 15 Jul 2018  
19:04:23 + (UTC)):



Author: marius
Date: Sun Jul 15 19:04:23 2018
New Revision: 336313
URL: https://svnweb.freebsd.org/changeset/base/336313

Log:
  Assorted TSO fixes for em(4)/iflib(9) and dead code removal:

[...]

  Okayed by:sbruno@ at 201806 DevSummit Transport Working Group [1]
  Reviewed by:  sbruno (earlier version), erj
  PR:   219428 (part of; comment #10) [1], 220997 (part of; comment #3)


Hi Marius,

thanks a lot for this change, it improves the situation (PR 220997) a  
lot. The system is running at r336329, as such I don't have your  
change r336356 yet on the system. Maybe the 2 panics (more below) I've  
seen are fixed by this. Before I try your second change (surely not  
before the WE), here at least the report in case it is related to your  
changes and not related to r336313:


I got 2 panics, both within 6 minutes (based upon the timestamp of the  
coredumps in the filesystem):


1)
panic: Assertion ifsd_m[next] == NULL failed at /usr/src/sys/net/iflib.c:3151
cpuid = 2
time = 1531944124
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfe008af85850
vpanic() at vpanic+0x1a3/frame 0xfe008af858b0
doadump() at doadump/frame 0xfe008af85930
iflib_txq_drain() at iflib_txq_drain+0xe58/frame 0xfe008af85aa0
ifmp_ring_check_drainage() at ifmp_ring_check_drainage+0x16c/frame  
0xfe008af85b00

_task_fn_tx() at _task_fn_tx+0x76/frame 0xfe008af85b30
gtaskqueue_run_locked() at gtaskqueue_run_locked+0x139/frame  
0xfe008af85b80
gtaskqueue_thread_loop() at gtaskqueue_thread_loop+0x88/frame  
0xfe008af85bb0

fork_exit() at fork_exit+0x84/frame 0xfe008af85bf0
fork_trampoline() at fork_trampoline+0xe/frame 0xfe008af85bf0
--- trap 0, rip = 0, rsp = 0, rbp = 0 ---
Uptime: 1d22h51m17s
Dumping 2990 out of 8037 MB:..1%..11%..21%..31%..41%..51%..61%..71%..81%..91%

__curthread () at ./machine/pcpu.h:230
230 __asm("movq %%gs:%1,%0" : "=r" (td)
(kgdb) #0  __curthread () at ./machine/pcpu.h:230
#1  doadump (textdump=1) at /usr/src/sys/kern/kern_shutdown.c:366
#2  0x80485ea1 in kern_reboot (howto=260)
at /usr/src/sys/kern/kern_shutdown.c:446
#3  0x80486483 in vpanic (fmt=, ap=0xfe008af858f0)
at /usr/src/sys/kern/kern_shutdown.c:863
#4  0x804861f0 in kassert_panic (
fmt=0x807e085f "Assertion %s failed at %s:%d")
at /usr/src/sys/kern/kern_shutdown.c:749
#5  0x8059cd78 in iflib_busdma_load_mbuf_sg (flags=0,
txq=, tag=, map=,
m0=, segs=, nsegs=,
max_segs=) at /usr/src/sys/net/iflib.c:3151
#6  iflib_encap (txq=0xf800028dc000, m_headp=0xfe00959bdd30)
at /usr/src/sys/net/iflib.c:3321
#7  iflib_txq_drain (r=0xfe00959ba000, cidx=,
pidx=41319936) at /usr/src/sys/net/iflib.c:3636
#8  0x805a0f4c in drain_ring_lockless (r=, os=...,
prev=, budget=)
at /usr/src/sys/net/mp_ring.c:199
#9  ifmp_ring_check_drainage (r=, budget=32)
at /usr/src/sys/net/mp_ring.c:502
#10 0x80599c46 in _task_fn_tx (context=)
at /usr/src/sys/net/iflib.c:3747
#11 0x804cd2c9 in gtaskqueue_run_locked (queue=0xf800025e0d00)
at /usr/src/sys/kern/subr_gtaskqueue.c:332
#12 0x804cd048 in gtaskqueue_thread_loop (arg=)
at /usr/src/sys/kern/subr_gtaskqueue.c:507
#13 0x8044cc34 in fork_exit (
callout=0x804ccfc0 ,
arg=0xfe0007ffd038, frame=0xfe008af85c00)
at /usr/src/sys/kern/kern_fork.c:1057
(kgdb) up 5
#5  0x8059cd78 in iflib_busdma_load_mbuf_sg (flags=0,  
txq=, tag=,
map=, m0=, segs=,  
nsegs=, max_segs=)

at /usr/src/sys/net/iflib.c:3151
3151MPASS(ifsd_m[next] == NULL);
(kgdb) list
3146/*
3147 * see if we can't be smarter about physically
3148 * contiguous mappings
3149 */
3150next = (pidx + count) & (ntxd-1);
3151MPASS(ifsd_m[next] == NULL);
3152#if MEMORY_LOGGING
3153txq->ift_enqueued++;
3154#endif
3155ifsd_m[next] = m;
(kgdb) print ifsd_m
$1 = (struct mbuf **) 0xfe00959b8000
(kgdb) print next
$2 = 
(kgdb) print pidx
$3 = 277
(kgdb) print count
$4 = 0
(kgdb) print ntxd
$5 = 


2)
Unread portion of the kernel message buffer:
panic: Assertion ifsd_m[next] == NULL failed at /usr/src/sys/net/iflib.c:3151
cpuid = 2
time = 1531944550
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfe008af85850
vpanic() at vpanic+0x1a3/frame 0xfe008af858b0
doadump() at doadump/frame 0xfe008af85930
iflib_txq_drain() at iflib_txq_drain+0xe58/frame 0xfe008af85aa0
ifmp_ring_check_drainage() at ifmp_ring_check_drainage+0x16c/frame  
0xfe008af85b00

_task_fn_tx() at _task_fn_tx+0x76/frame 0xfe008af85b30
gtaskqueue_run_locked() at 

Re: svn commit: r334617 - in head: . etc

[Alexander Leidinger]

Quoting Brad Davis  (from Mon, 04 Jun 2018 12:55:50 -0600):


On Mon, Jun 4, 2018, at 12:47 PM, Rodney W. Grimes wrote:

[ Charset UTF-8 unsupported, converting... ]
> On Mon, Jun 4, 2018, at 10:57 AM, Rodney W. Grimes wrote:
> > > On Mon, Jun 4, 2018, at 9:29 AM, Rodney W. Grimes wrote:



> > > > I believe there are also other external consumers of this.
> > >
> > > Such as?
> >
> > Iirc some of the make release stuff calls into here, but that
> > may of changed to use src/Makefile targets.  distrib-dirs comes
> > to mind.
>
> Sure, but those can go away or be updated as needed..

So again, no plan yet?


Most of them are gone, I am still in progress on some of it.  See  
the github branch above.


My testing is all done by building release VMs and comparing them  
against a VM built from the last merge from HEAD.  So I will update  
the release stuff as I go.  It is my responsibility to keep the  
release stuff working as I change these.


Have you checked mergemaster? IIRC it uses the distribution target.

Bye,
Alexander.

--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF


pgpef93PHwsd7.pgp
Description: Digitale PGP-Signatur

Re: svn commit: r323516 - in head/sys: dev/bnxt dev/e1000 kern net sys

[Alexander Leidinger]

Quoting Bruce Evans  (from Sat, 16 Sep 2017  
13:46:37 +1000 (EST)):



It gives lesser breakage here:
- with an old PCI em, an error that occur every few makeworlds over nfs now
  hang the hardware.  It used to be recovered from afger about 10 seconds.
  This only happened once.  I then applied my old fix which ignores the
  error better so as to recover from it immediately.  This seems to work as
  before.


As I also have an em device which switches into non-working state:  
what's the patch you have for this? I would like to see if your change  
also helps my device to get back into working shape again.


Bye,
Alexander.


--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF


pgp8nG3VSVTOC.pgp
Description: Digitale PGP-Signatur

svn commit: r320827 - head/sys/dev/drm

[Alexander Leidinger]

Author: netchild
Date: Sun Jul  9 06:50:15 2017
New Revision: 320827
URL: https://svnweb.freebsd.org/changeset/base/320827

Log:
  Switch prison check from PROV_DRIVER to PRIV_KMEM_WRITE (like /dev/mem).
  
  Access to the dri device gives effectively access to the entire memory of the 
machine (you can program
  the graphic card to do DMA).
  
  For current/stable/release this is a NOP, as access to memory is not allowed 
in a jail. This puts the dri
  device into the same (in)security class than /dev/mem for future use.
  
  Discussed with:   anholt(?) several years ago
  Sponsored by: Hackathon Essen 2017

Modified:
  head/sys/dev/drm/drmP.h

Modified: head/sys/dev/drm/drmP.h
==
--- head/sys/dev/drm/drmP.h Sun Jul  9 06:40:16 2017(r320826)
+++ head/sys/dev/drm/drmP.h Sun Jul  9 06:50:15 2017(r320827)
@@ -220,7 +220,7 @@ enum {
 
 #define PAGE_ALIGN(addr) round_page(addr)
 /* DRM_SUSER returns true if the user is superuser */
-#define DRM_SUSER(p)   (priv_check(p, PRIV_DRIVER) == 0)
+#define DRM_SUSER(p)   (priv_check(p, PRIV_KMEM_WRITE) == 0)
 #define DRM_AGP_FIND_DEVICE()  agp_find_device()
 #define DRM_MTRR_WCMDF_WRITECOMBINE
 #define jiffiesticks
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320826 - head/sys/sys

[Alexander Leidinger]

Author: netchild
Date: Sun Jul  9 06:40:16 2017
New Revision: 320826
URL: https://svnweb.freebsd.org/changeset/base/320826

Log:
   - Extend pr_allow flags visually to 32 bits, to make it more obvious at 
first look how much flags we still
 have available to use in the future.
   - Add kmem_access flag as a placeholder (reserve it), not used yet.
  
  Differential Revision:D11451
  Reviewed by:  jamie
  Sponsored by: Hackathon Essen 2017

Modified:
  head/sys/sys/jail.h

Modified: head/sys/sys/jail.h
==
--- head/sys/sys/jail.h Sun Jul  9 04:34:22 2017(r320825)
+++ head/sys/sys/jail.h Sun Jul  9 06:40:16 2017(r320826)
@@ -215,23 +215,24 @@ struct prison_racct {
/* by this jail or an ancestor */
 
 /* Flags for pr_allow */
-#definePR_ALLOW_SET_HOSTNAME   0x0001
-#definePR_ALLOW_SYSVIPC0x0002
-#definePR_ALLOW_RAW_SOCKETS0x0004
-#definePR_ALLOW_CHFLAGS0x0008
-#definePR_ALLOW_MOUNT  0x0010
-#definePR_ALLOW_QUOTAS 0x0020
-#definePR_ALLOW_SOCKET_AF  0x0040
-#definePR_ALLOW_MOUNT_DEVFS0x0080
-#definePR_ALLOW_MOUNT_NULLFS   0x0100
-#definePR_ALLOW_MOUNT_ZFS  0x0200
-#definePR_ALLOW_MOUNT_PROCFS   0x0400
-#definePR_ALLOW_MOUNT_TMPFS0x0800
-#definePR_ALLOW_MOUNT_FDESCFS  0x1000
-#definePR_ALLOW_MOUNT_LINPROCFS0x2000
-#definePR_ALLOW_MOUNT_LINSYSFS 0x4000
-#definePR_ALLOW_RESERVED_PORTS 0x8000
-#definePR_ALLOW_ALL0x
+#definePR_ALLOW_SET_HOSTNAME   0x0001
+#definePR_ALLOW_SYSVIPC0x0002
+#definePR_ALLOW_RAW_SOCKETS0x0004
+#definePR_ALLOW_CHFLAGS0x0008
+#definePR_ALLOW_MOUNT  0x0010
+#definePR_ALLOW_QUOTAS 0x0020
+#definePR_ALLOW_SOCKET_AF  0x0040
+#definePR_ALLOW_MOUNT_DEVFS0x0080
+#definePR_ALLOW_MOUNT_NULLFS   0x0100
+#definePR_ALLOW_MOUNT_ZFS  0x0200
+#definePR_ALLOW_MOUNT_PROCFS   0x0400
+#definePR_ALLOW_MOUNT_TMPFS0x0800
+#definePR_ALLOW_MOUNT_FDESCFS  0x1000
+#definePR_ALLOW_MOUNT_LINPROCFS0x2000
+#definePR_ALLOW_MOUNT_LINSYSFS 0x4000
+#definePR_ALLOW_RESERVED_PORTS 0x8000
+#definePR_ALLOW_KMEM_ACCESS0x0001  /* reserved, 
not used yet */
+#definePR_ALLOW_ALL0x0001
 
 /*
  * OSD methods
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r319611 - in head: sys/kern sys/sys usr.sbin/jail

[Alexander Leidinger]

Quoting Allan Jude  (from Tue, 6 Jun 2017  
02:15:01 + (UTC)):



Author: allanjude
Date: Tue Jun  6 02:15:00 2017
New Revision: 319611
URL: https://svnweb.freebsd.org/changeset/base/319611

Log:
  Jails: Optionally prevent jailed root from binding to privileged ports

  You may now optionally specify allow.noreserved_ports to prevent root
  inside a jail from using privileged ports (less than 1024)


What about a different name than "noreserved_ports"? This is very  
close to "nonreserverd_ports", and as such it's easy to get wrong the  
first time. IMO "block_reserved_ports" and "noblock_reserved_ports"  
(or another similar explicit wording) is less likely to get  
misunderstood (please take potential lack of language learning skills  
into account...).



Modified: head/sys/kern/kern_jail.c
==
--- head/sys/kern/kern_jail.c   Tue Jun  6 02:03:22 2017(r319610)
+++ head/sys/kern/kern_jail.c   Tue Jun  6 02:15:00 2017(r319611)
@@ -199,6 +199,7 @@ static char *pr_allow_names[] = {
"allow.mount.fdescfs",
"allow.mount.linprocfs",
"allow.mount.linsysfs",
+   "allow.reserved_ports",
 };
 const size_t pr_allow_names_size = sizeof(pr_allow_names);

@@ -218,10 +219,11 @@ static char *pr_allow_nonames[] = {
"allow.mount.nofdescfs",
"allow.mount.nolinprocfs",
"allow.mount.nolinsysfs",
+   "allow.noreserved_ports",


Bye,
Alexander.
--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF


pgpoY4_dbmIMD.pgp
Description: Digitale PGP-Signatur

Re: svn commit: r311849 - in head: . sys/amd64/conf sys/arm64/conf sys/conf sys/dev/e1000 sys/i386/conf sys/mips/conf sys/modules sys/modules/em sys/modules/igb sys/powerpc/conf

[Alexander Leidinger]

Quoting Roger Pau Monné  (from Wed, 15 Feb 2017  
10:06:37 +):



On Tue, Jan 10, 2017 at 03:23:22AM +, Sean Bruno wrote:

Author: sbruno
Date: Tue Jan 10 03:23:22 2017
New Revision: 311849
URL: https://svnweb.freebsd.org/changeset/base/311849

Log:
  Migrate e1000 to the IFLIB framework:
  - em(4) igb(4) and lem(4)
  - deprecate the igb device from kernel configurations
  - create a symbolic link in /boot/kernel from if_em.ko to if_igb.ko


This linking causes mfsBSD to choke when building an image from  
HEAD. It tries

to issue the following command:

${_v}${CP} -rp ${_BOOTDIR}/kernel ${WRKDIR}/disk/boot

Which fails when finding the symbol link. I can send a patch to  
change that to

-Rp, which would work fine, but wouldn't it be better to either completely
remove if_igb.ko, or simply copy if_em.ko to if_igb.ko?

I'm wondering if for example anyone strips down it's /boot/kernel/  
manually, by

removing unused modules, and what would happen if if_em.ko is removed but not
if_igb.ko.


We need to add here, that a symlink is not loaded by loader. What  
about a hardlink instead?


Bye,
Alexander.

--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0x8F31830F9F2772BF


pgpJgfiJlxd0d.pgp
Description: Digitale PGP-Signatur

Re: svn commit: r298131 - head/sys/conf

[Alexander Leidinger]

Quoting Luiz Otavio O Souza  (from Sat, 16 Apr 2016  
20:54:55 + (UTC)):



Author: loos
Date: Sat Apr 16 20:54:55 2016
New Revision: 298131
URL: https://svnweb.freebsd.org/changeset/base/298131

Log:
  Add Codel to NOTES.


I haven't found much documentation about this. It looks like it is  
only available in PF, but not in dummynet. Is this correct? Are there  
somewhere examples for the use of codel (options/parameters/HOWTO)? I  
would expect in places where e.g. "red" could be used, but I don't  
find any mention of codel in e.g. the FreeBSD handbook.


Bye,
Alexander.

--
http://www.Leidinger.net alexan...@leidinger.net: PGP 0xC773696B3BAC17DC
http://www.FreeBSD.orgnetch...@freebsd.org  : PGP 0xC773696B3BAC17DC


pgpVaJVhj7h2c.pgp
Description: Digitale PGP-Signatur

svn commit: r298129 - head/tools/kerneldoc/subsys

[Alexander Leidinger]

Author: netchild
Date: Sat Apr 16 20:41:13 2016
New Revision: 298129
URL: https://svnweb.freebsd.org/changeset/base/298129

Log:
  Quote variable for architectures where we have more than
  one linuxulator (32/64bit) and as such may have a space
  between both linuxulator locations.
  
  Noticed by:   Miltiadis Margaronis 
  Tested by:Miltiadis Margaronis 

Modified:
  head/tools/kerneldoc/subsys/Makefile

Modified: head/tools/kerneldoc/subsys/Makefile
==
--- head/tools/kerneldoc/subsys/MakefileSat Apr 16 20:01:08 2016
(r298128)
+++ head/tools/kerneldoc/subsys/MakefileSat Apr 16 20:41:13 2016
(r298129)
@@ -58,7 +58,7 @@ ${.OBJDIR}/${target}/${target}.tag:
DOXYGEN_DEST_PATH=${DOXYGEN_DEST_PATH} \
DOXYGEN_SRC_INCLUDE_PATH="${S}/sys ${S}/../include 
${S}/${TARGET_ARCH}/include ${.OBJDIR}/include" \
DOXYGEN_TARGET_ARCH=${TARGET_ARCH} \
-   DOXYGEN_LINUX_PATH=${DOXYGEN_LINUX_PATH} \
+   DOXYGEN_LINUX_PATH="${DOXYGEN_LINUX_PATH}" \
NOTREVIEWED=${.CURDIR}/notreviewed.dox \
PATH=${LOCALBASE}/bin:${PATH} \
doxygen ${.CURDIR}/Doxyfile-${target}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r274329 - head

[Alexander Leidinger]

Author: netchild
Date: Sun Nov  9 20:43:50 2014
New Revision: 274329
URL: https://svnweb.freebsd.org/changeset/base/274329

Log:
  We moved to ada a while ago, reflect that in the example.

Modified:
  head/UPDATING

Modified: head/UPDATING
==
--- head/UPDATING   Sun Nov  9 20:39:08 2014(r274328)
+++ head/UPDATING   Sun Nov  9 20:43:50 2014(r274329)
@@ -833,8 +833,8 @@ COMMON ITEMS:
2.) update the ZFS boot block on your boot drive
 
The following example updates the ZFS boot block on the first
-   partition (freebsd-boot) of a GPT partitioned drive ad0:
-   gpart bootcode -p /boot/gptzfsboot -i 1 ad0
+   partition (freebsd-boot) of a GPT partitioned drive ada0:
+   gpart bootcode -p /boot/gptzfsboot -i 1 ada0
 
Non-boot pools do not need these updates.
 
___
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: r261266 - in head: sys/dev/drm sys/kern sys/sys usr.sbin/jail

[Alexander Leidinger]

Quoting Adrian Chadd adr...@freebsd.org (from Mon, 10 Feb 2014  
17:24:09 -0800):



On 10 February 2014 17:07, James Gritton ja...@freebsd.org wrote:



So is it worthwhile to add a new jail parameter called insecure (or
somesuch)?  That way you could easily add the encapsulation without
any of the security.  The other vibe I'm getting is not to do
anything.  Either way, it sounds like the Xorg-enabling patch will
remain a patch - not seeing a lot of buy-in here.

I'm not against more optional and obscure holes if they have a use; I
just call that a fine-grained capabilities model.


I'd rather it stay a patch. IMHO the only viable solution is to create
a sandboxable API for this DRI/IO-MMU stuff to, well, DRI via.

So hm. Can you actually run clients in different jails, but have them
access the same DRI window(s)? Or does running a client in a jail
force it to go all over the socket(s) and not via DRI?


I would assume that a client somehow determines if he is rendering  
local or remotely. If he is doing it local (= in the same container  
as the X server) it uses DRI. I do not expect that two jails with  
allow.kmem allow to use DRI to the same X server, but I haven't  
tested it, so take it only as a gut-feeling.


Bye,
Alexander.

--
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r261266 - in head: sys/dev/drm sys/kern sys/sys usr.sbin/jail

[Alexander Leidinger]

On Wed, 05 Feb 2014 14:05:29 -0500
John Baldwin j...@freebsd.org wrote:

 I think having a kmem flag for jails is a hack and not the right
 approach. It does make a jail useless security-wise, but by
 masquerading as a flag, it implies that it is only partially
 violating security which gives a false sense of security.

I think we need to differentiate between security and safety here. The
allow_kmem flag disables security (protections against a malicious
program which was written specially to make use of kmem/io to do
something nasty and requires much more knowledge to write) but does not
allow all the other things for which we have flags (raw sockets,
chflags, mount). The safety aspect comes into play when you have badly
behaving programs (in the sense of bugs, stupid programmers or unwanted
behavior in some parts of a program). In such a case you may want to
allow kmem access, but not raw socket / ... access.

Having it as a flag does not imply to me that is is only partly
violating security, I think it is just a matter of wording. Either in
the description of the flag, or additionally in the naming of the
flag (maybe more in the sense of allow.open_backdoor?)

 A short term solution that would permit non-security jails without
 having to do the longer term work that Robert would like might be to
 add a new per-jail flag that in effect means no security at all.

Personally I wouldn't object if we replace the kmem flag with a no
security at all solution, I would keep the patch locally until the
long term solution may or may not surface.

Note: over the years I had several people which were interested in my
patch. Not an overwhelming amount, but still, there are people
interested in it.

Bye,
Alexander.

-- 
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r261266 - in head: sys/dev/drm sys/kern sys/sys usr.sbin/jail

[Alexander Leidinger]

On Fri, 31 Jan 2014 12:34:48 + (GMT)
Robert Watson rwat...@freebsd.org wrote:

 On Wed, 29 Jan 2014, Alexander Leidinger wrote:
 
  It does.  I included a warning in jail.8 that this will pretty
  much undo jail security.  There are still reasons some may want to
  do this, but it's definitely not for everyone or even most people.
 
  It only unjails (= basically the same security level as the
  jail-host with the added benefit of the flexibility of a jail like
  easy moving from one system to another) the jail which has this
  flag set. All other jails without the flag can not escape to the
  host.
 
  I also have to add that just setting this flag does not give access
  to the host, you also have to configure a non-default devfs rule
  for this jail (to have the devices appear in the jail).
 
 This is not correct: devices do not need to be delegated in devfs for
 PRIV_IO to allow bypass of the Jail security model, due to sysarch()
 and the Linux-emulated equivalent, which turn out direct I/O access
 from a user process without use of a device node.

Ok, then it is just the non-default flag, not the additional devfs part.

I agree with your other post that we are better of to document better
what it means if an admin allows kmem access for a specific jail.

Bye,
Alexander.

-- 
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r261266 - in head: sys/dev/drm sys/kern sys/sys usr.sbin/jail

[Alexander Leidinger]

On Wed, 29 Jan 2014 06:49:01 -0700
James Gritton ja...@freebsd.org wrote:

 On 1/29/2014 6:43 AM, Gleb Smirnoff wrote:

  Doesn't this allow to easily unjail self? :)

 It does.  I included a warning in jail.8 that this will pretty much
 undo jail security.  There are still reasons some may want to do this,
 but it's definitely not for everyone or even most people.

It only unjails (= basically the same security level as the jail-host
with the added benefit of the flexibility of a jail like easy moving
from one system to another) the jail which has this flag set. All other
jails without the flag can not escape to the host.

I also have to add that just setting this flag does not give access to
the host, you also have to configure a non-default devfs rule for this
jail (to have the devices appear in the jail).

Bye,
Alexander.

-- 
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r253144 - head/sys/contrib/v4l

[Alexander Leidinger]

Author: netchild
Date: Wed Jul 10 10:40:52 2013
New Revision: 253144
URL: http://svnweb.freebsd.org/changeset/base/253144

Log:
  Fix build for gcc users by declaring variables for unions in structs which
  don't declare a variable. The size before/after this change of the structs
  doesn't change with gcc/clang.
  
  Noticed by:   several
  Suggested by: Gary Jennejohn gljennj...@googlemail.com

Modified:
  head/sys/contrib/v4l/videodev2.h

Modified: head/sys/contrib/v4l/videodev2.h
==
--- head/sys/contrib/v4l/videodev2.hWed Jul 10 10:38:43 2013
(r253143)
+++ head/sys/contrib/v4l/videodev2.hWed Jul 10 10:40:52 2013
(r253144)
@@ -427,7 +427,7 @@ struct v4l2_frmsizeenum {
union { /* Frame size */
struct v4l2_frmsize_discretediscrete;
struct v4l2_frmsize_stepwisestepwise;
-   };
+   } x;
 
__u32   reserved[2];/* Reserved space for future 
use */
 };
@@ -457,7 +457,7 @@ struct v4l2_frmivalenum {
union { /* Frame interval */
struct v4l2_fract   discrete;
struct v4l2_frmival_stepwisestepwise;
-   };
+   } x;
 
__u32   reserved[2];/* Reserved space for future 
use */
 };
@@ -834,7 +834,7 @@ struct v4l2_dv_timings {
union {
struct v4l2_bt_timings  bt;
__u32   reserved[32];
-   };
+   } x;
 } __attribute__ ((packed));
 
 /* Values for the type field */
@@ -927,7 +927,7 @@ struct v4l2_ext_control {
__s32 value;
__s64 value64;
char *string;
-   };
+   } x;
 } __attribute__ ((packed));
 
 struct v4l2_ext_controls {
@@ -1475,7 +1475,7 @@ struct v4l2_encoder_cmd {
struct {
__u32 data[8];
} raw;
-   };
+   } x;
 };
 
 #endif
@@ -1597,7 +1597,7 @@ struct v4l2_mpeg_vbi_fmt_ivtv {
union {
struct v4l2_mpeg_vbi_itv0 itv0;
struct v4l2_mpeg_vbi_ITV0 ITV0;
-   };
+   } x;
 } __attribute__ ((packed));
 
 /*
@@ -1648,7 +1648,7 @@ struct v4l2_dbg_match {
union { /* Match this chip, meaning determined by type */
__u32 addr;
char name[32];
-   };
+   } x;
 } __attribute__ ((packed));
 
 struct v4l2_dbg_register {
___
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: r252892 - in head/sys: compat/linux contrib/v4l

[Alexander Leidinger]

Author: netchild
Date: Sat Jul  6 19:59:06 2013
New Revision: 252892
URL: http://svnweb.freebsd.org/changeset/base/252892

Log:
  - Move videodev headers from compat/linux to contrib/v4l (cp from vendor and
apply diff to compat/linux versions).
  - The cp implies an update of videodev2.h to the linux kernel 2.6.34.14 one.
  
  The update makes video in skype v4 work on FreeBSD.
  
  Tested by:Artyom Mirgorodskiy artyom.mirgorod...@gmail.com
(update of header only)

Added:
  head/sys/contrib/v4l/
 - copied from r252890, vendor/v4l/dist/
Deleted:
  head/sys/compat/linux/linux_videodev.h
  head/sys/compat/linux/linux_videodev2.h
Modified:
  head/sys/compat/linux/linux_ioctl.c
  head/sys/contrib/v4l/videodev.h
  head/sys/contrib/v4l/videodev2.h

Modified: head/sys/compat/linux/linux_ioctl.c
==
--- head/sys/compat/linux/linux_ioctl.c Sat Jul  6 19:43:42 2013
(r252891)
+++ head/sys/compat/linux/linux_ioctl.c Sat Jul  6 19:59:06 2013
(r252892)
@@ -85,10 +85,10 @@ __FBSDID($FreeBSD$);
 #include compat/linux/linux_socket.h
 #include compat/linux/linux_util.h
 
-#include compat/linux/linux_videodev.h
+#include contrib/v4l/videodev.h
 #include compat/linux/linux_videodev_compat.h
 
-#include compat/linux/linux_videodev2.h
+#include contrib/v4l/videodev2.h
 #include compat/linux/linux_videodev2_compat.h
 
 CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ);

Modified: head/sys/contrib/v4l/videodev.h
==
--- vendor/v4l/dist/videodev.h  Sat Jul  6 18:28:06 2013(r252890)
+++ head/sys/contrib/v4l/videodev.h Sat Jul  6 19:59:06 2013
(r252892)
@@ -1,48 +1,41 @@
+/*
+ * This header comes from linux, but it has no license. The author
+ * (Alan Cox @ Redhat) gave explicit permissions to use it in FreeBSD.
+ * The FreeBSD vendor branch for v4l gives a more detailed description
+ * about this in the README.
+ *
+ * $FreeBSD$
+ */
+
 #ifndef __LINUX_VIDEODEV_H
 #define __LINUX_VIDEODEV_H
 
-#include linux/types.h
+#include sys/types.h
+typedef int32_t __s32;
+typedef uint32_t __u32;
+typedef uint16_t __u16;
+typedef uint8_t __u8;
 
+#if 0
 #define HAVE_V4L1 1
 
 #include linux/videodev2.h
+#endif 
 
-#ifdef __KERNEL__
-
-#include linux/mm.h
-
-extern struct video_device* video_devdata(struct file*);
-
-#define to_video_device(cd) container_of(cd, struct video_device, class_dev)
-static inline void
-video_device_create_file(struct video_device *vfd,
-struct class_device_attribute *attr)
-{
-   class_device_create_file(vfd-class_dev, attr);
-}
-static inline void
-video_device_remove_file(struct video_device *vfd,
-struct class_device_attribute *attr)
-{
-   class_device_remove_file(vfd-class_dev, attr);
-}
-
-#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
-/* helper functions to access driver private data. */
-static inline void *video_get_drvdata(struct video_device *dev)
-{
-   return dev-priv;
-}
-
-static inline void video_set_drvdata(struct video_device *dev, void *data)
-{
-   dev-priv = data;
-}
-#endif
-
-extern int video_exclusive_open(struct inode *inode, struct file *file);
-extern int video_exclusive_release(struct inode *inode, struct file *file);
-#endif /* __KERNEL__ */
+#define VID_TYPE_CAPTURE   1   /* Can capture */
+#define VID_TYPE_TUNER 2   /* Can tune */
+#define VID_TYPE_TELETEXT  4   /* Does teletext */
+#define VID_TYPE_OVERLAY   8   /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY 16  /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING  32  /* Can clip */
+#define VID_TYPE_FRAMERAM  64  /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES128 /* Scalable */
+#define VID_TYPE_MONOCHROME256 /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE512 /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER  1024/* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER  2048/* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096/* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192/* Can encode MJPEG streams */
 
 struct video_capability
 {
@@ -157,7 +150,7 @@ struct video_window
__u32   width,height;   /* Its size */
__u32   chromakey;
__u32   flags;
-   struct  video_clip __user *clips;   /* Set only */
+   struct  video_clip *clips;  /* Set only */
int clipcount;
 #define VIDEO_WINDOW_INTERLACE 1
 #define VIDEO_WINDOW_CHROMAKEY 16  /* Overlay by chromakey */
@@ -197,6 +190,8 @@ struct video_key
__u32   flags;
 };
 
+#define VIDEO_MAX_FRAME32
+
 struct video_mbuf
 {
int size;   /* Total memory to map */

Modified: head/sys/contrib/v4l/videodev2.h

svn commit: r252590 - vendor/v4l/dist

[Alexander Leidinger]

Author: netchild
Date: Wed Jul  3 19:56:39 2013
New Revision: 252590
URL: http://svnweb.freebsd.org/changeset/base/252590

Log:
  Update videodev2.h to the version from linux kernel 2.6.34.14.
  This version is dual-licensed: 3 clause BSD license and GPL v2+.

Modified:
  vendor/v4l/dist/videodev2.h

Modified: vendor/v4l/dist/videodev2.h
==
--- vendor/v4l/dist/videodev2.h Wed Jul  3 19:55:24 2013(r252589)
+++ vendor/v4l/dist/videodev2.h Wed Jul  3 19:56:39 2013(r252590)
@@ -1,37 +1,81 @@
-#ifndef __LINUX_VIDEODEV2_H
-#define __LINUX_VIDEODEV2_H
 /*
- * Video for Linux Two
+ *  Video for Linux Two header file
+ *
+ *  Copyright (C) 1999-2007 the contributors
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Header file for v4l or V4L2 drivers and applications, for
- * Linux kernels 2.2.x or 2.4.x.
+ *  Alternatively you can redistribute this file under the terms of the
+ *  BSD license as stated below:
  *
- * See http://bytesex.org/v4l/ for API specs and other
- * v4l2 documentation.
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *  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. The names of its contributors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
  *
- * Author: Bill Dirks bdi...@pacbell.net
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Header file for v4l or V4L2 drivers and applications
+ * with public API.
+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
+ * no #if __KERNEL tests are allowed here
+ *
+ * See http://linuxtv.org for more info
+ *
+ * Author: Bill Dirks b...@thedirks.org
  * Justin Schoeman
+ *  Hans Verkuil hverk...@xs4all.nl
  * et al.
  */
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
+
 #ifdef __KERNEL__
-#include linux/time.h /* need struct timeval */
-#include linux/poll.h
-#include linux/device.h
-#include linux/mutex.h
+#include linux/time.h /* need struct timeval */
+#else
+#include sys/time.h
 #endif
-#include linux/compiler.h /* need __user */
-
-
-#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.17 */
-#define HAVE_V4L2 1
+#include linux/compiler.h
+#include linux/ioctl.h
+#include linux/types.h
 
 /*
  * Common stuff for both V4L1 and V4L2
  * Moved from videodev.h
  */
-
 #define VIDEO_MAX_FRAME   32
 
+#ifndef __KERNEL__
+
+/* These defines are V4L1 specific and should not be used with the V4L2 API!
+   They will be removed from this header in the future. */
+
 #define VID_TYPE_CAPTURE   1   /* Can capture */
 #define VID_TYPE_TUNER 2   /* Can tune */
 #define VID_TYPE_TELETEXT  4   /* Does teletext */
@@ -46,70 +90,6 @@
 #define VID_TYPE_MPEG_ENCODER  2048/* Can encode MPEG streams */
 #define VID_TYPE_MJPEG_DECODER 4096/* Can decode MJPEG streams */
 #define VID_TYPE_MJPEG_ENCODER 8192/* Can encode MJPEG streams */
-
-#ifdef __KERNEL__
-
-/* Minor device allocation */
-#define MINOR_VFL_TYPE_GRABBER_MIN   0
-#define MINOR_VFL_TYPE_GRABBER_MAX  63
-#define MINOR_VFL_TYPE_RADIO_MIN64
-#define MINOR_VFL_TYPE_RADIO_MAX   127
-#define MINOR_VFL_TYPE_VTX_MIN 192

svn commit: r252591 - vendor/v4l/2.6.34.14

[Alexander Leidinger]

Author: netchild
Date: Wed Jul  3 20:08:22 2013
New Revision: 252591
URL: http://svnweb.freebsd.org/changeset/base/252591

Log:
  Tag 2.6.34.14.

Added:
  vendor/v4l/2.6.34.14/
 - copied from r252372, vendor/v4l/dist/
Replaced:
  vendor/v4l/2.6.34.14/videodev2.h
 - copied unchanged from r252590, vendor/v4l/dist/videodev2.h

Copied: vendor/v4l/2.6.34.14/videodev2.h (from r252590, 
vendor/v4l/dist/videodev2.h)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/v4l/2.6.34.14/videodev2.hWed Jul  3 20:08:22 2013
(r252591, copy of r252590, vendor/v4l/dist/videodev2.h)
@@ -0,0 +1,1761 @@
+/*
+ *  Video for Linux Two header file
+ *
+ *  Copyright (C) 1999-2007 the contributors
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  Alternatively you can redistribute this file under the terms of the
+ *  BSD license as stated below:
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *  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. The names of its contributors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Header file for v4l or V4L2 drivers and applications
+ * with public API.
+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
+ * no #if __KERNEL tests are allowed here
+ *
+ * See http://linuxtv.org for more info
+ *
+ * Author: Bill Dirks b...@thedirks.org
+ * Justin Schoeman
+ *  Hans Verkuil hverk...@xs4all.nl
+ * et al.
+ */
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
+
+#ifdef __KERNEL__
+#include linux/time.h /* need struct timeval */
+#else
+#include sys/time.h
+#endif
+#include linux/compiler.h
+#include linux/ioctl.h
+#include linux/types.h
+
+/*
+ * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
+ */
+#define VIDEO_MAX_FRAME   32
+
+#ifndef __KERNEL__
+
+/* These defines are V4L1 specific and should not be used with the V4L2 API!
+   They will be removed from this header in the future. */
+
+#define VID_TYPE_CAPTURE   1   /* Can capture */
+#define VID_TYPE_TUNER 2   /* Can tune */
+#define VID_TYPE_TELETEXT  4   /* Does teletext */
+#define VID_TYPE_OVERLAY   8   /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY 16  /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING  32  /* Can clip */
+#define VID_TYPE_FRAMERAM  64  /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES128 /* Scalable */
+#define VID_TYPE_MONOCHROME256 /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE512 /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER  1024/* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER  2048/* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096/* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192/* Can encode MJPEG streams */
+#endif
+
+/*
+ * M I S C E L L A N E O U S
+ */
+
+/*  Four-character-code (FOURCC) */
+#define v4l2_fourcc(a, b, c, d)\
+   ((__u32)(a) | ((__u32)(b)  8) | ((__u32)(c)  

Re: svn commit: r235063 - in head/sys: amd64/linux32 compat/linux i386/linux

[Alexander Leidinger]

On Sun, 3 Feb 2013 10:52:50 +0400
Chagin Dmitry chagin.dmi...@gmail.com wrote:

 On Sat, May 05, 2012 at 07:42:39PM +, Alexander Leidinger wrote:
  Author: netchild
  Date: Sat May  5 19:42:38 2012
  New Revision: 235063
  URL: http://svn.freebsd.org/changeset/base/235063
  
  Log:
- 500 static DTrace probes for the linuxulator

 Hi, what about to merge this to 9, 8? 

Theoretically it should be easy to merge, but it depends upon some
fixes to the dtrace code to DTRT (no crash) when the dtrace module is
unloaded while other dtrace providers like the linuxulator-ones stay in
the kernel. I don't know if those fixes are in 9 or 8.

Apart from that I'm low on time, my time slots for FreeBSD are already
reserved for some other things.

I don't mind if someone else merges this (after verifying that the
required dtrace fixes are merged).

Bye,
Alexander.

-- 
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r234504 - in head/sys: amd64/conf i386/conf

[Alexander Leidinger]

Hi,

I had this once. I took the time to kill the ctf process which hangs. Well, not 
only once, but multiple times during the kernel build. The resulting kernel 
booted. After that I did a complete 
buildword/installworld/reboot/buildkernel/installkernel/reboot without any 
problems.

I didn't try a kernel without ctf afterwards.

Maybe this serves as a data point.

Bye,
Alexander.

-- 
Send via an Android device, please forgive brevity and typographic and spelling 
errors. 

Bjoern A. Zeeb b...@freebsd.org hat geschrieben:
On 21. Apr 2012, at 17:11 , Brooks Davis wrote:

 On Sat, Apr 21, 2012 at 09:45:57AM -0400, Ryan Stone wrote:
 On Fri, Apr 20, 2012 at 5:37 PM, Brooks Davis bro...@freebsd.org wrote:
 Author: brooks
 Date: Fri Apr 20 21:37:42 2012
 New Revision: 234504
 URL: http://svn.freebsd.org/changeset/base/234504
 
 Log:
 ?Enable DTrace hooks in GENERIC.
 
 ?Reviewed by: ?gnn
 ?Approved by: ?core (jhb, imp)
 ?Requested by: a cast of thousands
 ?MFC after: ? ?3 days
 
 Excellent!  Thanks to everybody who helped make this happen, starting
 with the participants at dtrace.conf who gave us the requisite whacks
 with the clue-by-four.
 
 However, what is our policy for enabling features in -STABLE that are
 known to be unstable?  If we MFC this I don't have the slightest worry
 that somebody might see instability in their system just because the
 hooks are all of a sudden there, but I would worry that somebody make
 take DTrace hooks being enabled in GENERIC on -STABLE to imply that
 DTrace is stable, start using it and being upset when they trip over a
 DTrace bug.
 
 I think we should note that it remains experimental and somewhat buggy
 in the release notes and probably in the MFC message.  Otherwise, it's
 like any new feature.  If you start using a feature in production
 without extensive testing you may be surprised.

I am sorry but I am close to requesting a backout now but I hope someone
else might be able to debug it further, so I'll wait for another couple
of days.

I have heard this from multiple people and I am now at the point where
I wasted almost a day or work on this over the course of two weeks.

I am not able to finish HEAD snapshot release builds even after updating
the underlying kernel and world to a today's HEAD  (I had to disable the
WITH_CTF= to get the kernel now booted to build).

I have seen this on multiple setups for about two weeks.
The common factor is always that ctfmerge is hanging forever.  I have seen
this on both i386 and amd64.  I have seen it with modules and with
kernels built with NO_MODULES.  I have seen it on NFS and on local disks.

As son as I add the
# Temprary as ctfmerge hangs.
nomakeoptions   WITH_CTF
things are fine again.

At the moment it looks like this:

root 34611   0.0  0.1 35908  8736  -  I 4:19PM   0:00.07 ctfmerge -L 
VERSION -g -o if_ath.ko.debug if_ath.o if_ath_debug.o if_ath_keycache.o 
if_ath_sysctl.o if_ath_tx.o if_ath_tx_ht.o if_ath_led.o ah_osdep.o ah.o 
ah_regdom
root 39282   0.0  0.2 44104 14516  -  I 4:20PM   0:00.06 ctfmerge -L 
VERSION -g -o kernel.debug locore.o aic7xxx_reg_print.o aic79xx_reg_print.o 
cam.o cam_periph.o cam_queue.o cam_sim.o cam_xpt.o ata_all.o ata_xpt.o ata_pm


root@bz1:/home/bz # procstat -k 34611
  PID    TID COMM TDNAME   KSTACK   
34611 100228 ctfmerge -    mi_switch sleepq_catch_signals 
sleepq_wait_sig _sleep _do_lock_umutex do_lock_umutex __umtx_op_wait_umutex 
amd64_syscall Xfast_syscall 
34611 100452 ctfmerge -    mi_switch sleepq_catch_signals 
sleepq_wait_sig _sleep _do_lock_umutex do_lock_umutex __umtx_op_wait_umutex 
amd64_syscall Xfast_syscall 
34611 100453 ctfmerge -    mi_switch sleepq_catch_signals 
sleepq_wait_sig _sleep _do_lock_umutex do_lock_umutex __umtx_op_wait_umutex 
amd64_syscall Xfast_syscall 
34611 100454 ctfmerge -    mi_switch sleepq_catch_signals 
sleepq_wait_sig _sleep _do_lock_umutex do_lock_umutex __umtx_op_wait_umutex 
amd64_syscall Xfast_syscall 
34611 100455 ctfmerge -    mi_switch sleepq_catch_signals 
sleepq_wait_sig _sleep _do_lock_umutex do_lock_umutex __umtx_op_wait_umutex 
amd64_syscall Xfast_syscall 
34611 100456 ctfmerge -    mi_switch sleepq_catch_signals 
sleepq_wait_sig _sleep _do_lock_umutex do_lock_umutex __umtx_op_wait_umutex 
amd64_syscall Xfast_syscall 
root@bz1:/home/bz # procstat -k 39282
  PID    TID COMM TDNAME   KSTACK   
39282 100348 ctfmerge -    mi_switch sleepq_catch_signals 
sleepq_wait_sig _sleep do_wait __umtx_op_wait_uint_private amd64_syscall 
Xfast_syscall 
39282 100457 ctfmerge -    mi_switch sleepq_catch_signals 
sleepq_wait_sig _sleep _do_lock_umutex do_lock_umutex __umtx_op_wait_umutex 
amd64_syscall Xfast_syscall 
39282 100458 ctfmerge -    mi_switch sleepq_catch_signals 

svn commit: r235063 - in head/sys: amd64/linux32 compat/linux i386/linux

[Alexander Leidinger]

Author: netchild
Date: Sat May  5 19:42:38 2012
New Revision: 235063
URL: http://svn.freebsd.org/changeset/base/235063

Log:
  - 500 static DTrace probes for the linuxulator
  - DTrace scripts to check for errors, performance, ...
they serve mostly as examples of what you can do with the static probe;s
with moderate load the scripts may be overwhelmed, excessive lock-tracing
may influence program behavior (see the last design decission)
  
  Design decissions:
   - use linuxulator as the provider for the native bitsize; add the
 bitsize for the non-native emulation (e.g. linuxuator32 on amd64)
   - Add probes only for locks which are acquired in one function and released
 in another function. Locks which are aquired and released in the same
 function should be easy to pair in the code, inter-function
 locking is more easy to verify in DTrace.
   - Probes for locks should be fired after locking and before releasing to
 prevent races (to provide data/function stability in DTrace, see the
 man-page of dtrace -v ... and the corresponding DTrace docs).

Added:
  head/sys/compat/linux/check_error.d   (contents, props changed)
  head/sys/compat/linux/check_internal_locks.d   (contents, props changed)
  head/sys/compat/linux/linux_dtrace.h   (contents, props changed)
  head/sys/compat/linux/stats_timing.d   (contents, props changed)
  head/sys/compat/linux/trace_futexes.d   (contents, props changed)
Modified:
  head/sys/amd64/linux32/linux.h
  head/sys/amd64/linux32/linux32_dummy.c
  head/sys/compat/linux/linux_emul.c
  head/sys/compat/linux/linux_emul.h
  head/sys/compat/linux/linux_fork.c
  head/sys/compat/linux/linux_futex.c
  head/sys/compat/linux/linux_mib.c
  head/sys/compat/linux/linux_misc.c
  head/sys/compat/linux/linux_sysctl.c
  head/sys/compat/linux/linux_time.c
  head/sys/compat/linux/linux_uid16.c
  head/sys/compat/linux/linux_util.c
  head/sys/compat/linux/linux_util.h
  head/sys/i386/linux/linux.h
  head/sys/i386/linux/linux_dummy.c

Modified: head/sys/amd64/linux32/linux.h
==
--- head/sys/amd64/linux32/linux.h  Sat May  5 17:20:12 2012
(r235062)
+++ head/sys/amd64/linux32/linux.h  Sat May  5 19:42:38 2012
(r235063)
@@ -42,6 +42,7 @@ extern u_char linux_debug_map[];
 #defineldebug(name)isclr(linux_debug_map, LINUX_SYS_linux_ ## name)
 #defineARGS(nm, fmt)   linux(%ld): #nm(fmt)\n, 
(long)td-td_proc-p_pid
 #defineLMSG(fmt)   linux(%ld): fmt\n, (long)td-td_proc-p_pid
+#defineLINUX_DTRACElinuxulator32
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_LINUX);

Modified: head/sys/amd64/linux32/linux32_dummy.c
==
--- head/sys/amd64/linux32/linux32_dummy.c  Sat May  5 17:20:12 2012
(r235062)
+++ head/sys/amd64/linux32/linux32_dummy.c  Sat May  5 19:42:38 2012
(r235063)
@@ -29,14 +29,23 @@
 #include sys/cdefs.h
 __FBSDID($FreeBSD$);
 
+#include opt_compat.h
+#include opt_kdtrace.h
+
 #include sys/param.h
+#include sys/kernel.h
+#include sys/sdt.h
 #include sys/systm.h
 #include sys/proc.h
 
 #include amd64/linux32/linux.h
 #include amd64/linux32/linux32_proto.h
+#include compat/linux/linux_dtrace.h
 #include compat/linux/linux_util.h
 
+/* DTrace init */
+LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE);
+
 DUMMY(stime);
 DUMMY(olduname);
 DUMMY(syslog);

Added: head/sys/compat/linux/check_error.d
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/compat/linux/check_error.d Sat May  5 19:42:38 2012
(r235063)
@@ -0,0 +1,144 @@
+#!/usr/sbin/dtrace -qs
+
+/*-
+ * Copyright (c) 2008-2012 Alexander Leidinger netch...@freebsd.org
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer
+ *in this position and unchanged.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY

svn commit: r234316 - in stable/9/sys: amd64/linux32 i386/conf i386/linux kern

[Alexander Leidinger]

Author: netchild
Date: Sun Apr 15 16:52:48 2012
New Revision: 234316
URL: http://svn.freebsd.org/changeset/base/234316

Log:
  MFC r232799:
- add comments to syscalls.master and linux(32)_dummy about which linux
  kernel version introduced the sysctl (based upon a linux man-page)
- add comments to syscalls.master regarding some names of sysctls which are
  different than the linux-names (based upon the linux unistd.h)
- add some dummy sysctls
- name an unimplemented sysctl

Modified:
  stable/9/sys/amd64/linux32/linux32_dummy.c
  stable/9/sys/amd64/linux32/syscalls.master
  stable/9/sys/i386/linux/linux_dummy.c
  stable/9/sys/i386/linux/syscalls.master
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/amd64/linux32/linux32_dummy.c
==
--- stable/9/sys/amd64/linux32/linux32_dummy.c  Sun Apr 15 16:00:32 2012
(r234315)
+++ stable/9/sys/amd64/linux32/linux32_dummy.c  Sun Apr 15 16:52:48 2012
(r234316)
@@ -82,22 +82,69 @@ DUMMY(mq_notify);
 DUMMY(mq_getsetattr);
 DUMMY(kexec_load);
 DUMMY(waitid);
+/* linux 2.6.11: */
 DUMMY(add_key);
 DUMMY(request_key);
 DUMMY(keyctl);
+/* linux 2.6.13: */
 DUMMY(ioprio_set);
 DUMMY(ioprio_get);
 DUMMY(inotify_init);
 DUMMY(inotify_add_watch);
 DUMMY(inotify_rm_watch);
+/* linux 2.6.16: */
 DUMMY(migrate_pages);
 DUMMY(pselect6);
 DUMMY(ppoll);
 DUMMY(unshare);
+/* linux 2.6.17: */
 DUMMY(splice);
 DUMMY(sync_file_range);
 DUMMY(tee);
 DUMMY(vmsplice);
+/* linux 2.6.18: */
+DUMMY(move_pages);
+/* linux 2.6.19: */
+DUMMY(getcpu);
+DUMMY(epoll_pwait);
+/* linux 2.6.22: */
+DUMMY(utimensat);
+DUMMY(signalfd);
+DUMMY(timerfd_create);
+DUMMY(eventfd);
+/* linux 2.6.23: */
+DUMMY(fallocate);
+/* linux 2.6.25: */
+DUMMY(timerfd_settime);
+DUMMY(timerfd_gettime);
+/* linux 2.6.27: */
+DUMMY(signalfd4);
+DUMMY(eventfd2);
+DUMMY(epoll_create1);
+DUMMY(dup3);
+DUMMY(pipe2);
+DUMMY(inotify_init1);
+/* linux 2.6.30: */
+DUMMY(preadv);
+DUMMY(pwritev);
+/* linux 2.6.31: */
+DUMMY(rt_tsigqueueinfo);
+DUMMY(perf_event_open);
+/* linux 2.6.33: */
+DUMMY(recvmmsg);
+DUMMY(fanotify_init);
+DUMMY(fanotify_mark);
+/* linux 2.6.36: */
+DUMMY(prlimit64);
+/* later: */
+DUMMY(name_to_handle_at);
+DUMMY(open_by_handle_at);
+DUMMY(clock_adjtime);
+DUMMY(syncfs);
+DUMMY(sendmmsg);
+DUMMY(setns);
+DUMMY(process_vm_readv);
+DUMMY(process_vm_writev);
 
 #define DUMMY_XATTR(s) \
 int\

Modified: stable/9/sys/amd64/linux32/syscalls.master
==
--- stable/9/sys/amd64/linux32/syscalls.master  Sun Apr 15 16:00:32 2012
(r234315)
+++ stable/9/sys/amd64/linux32/syscalls.master  Sun Apr 15 16:52:48 2012
(r234316)
@@ -157,6 +157,7 @@
 82 AUE_SELECT  STD { int linux_old_select( \
struct l_old_select_argv *ptr); }
 83 AUE_SYMLINK STD { int linux_symlink(char *path, char *to); }
+; 84: oldlstat
 84 AUE_LSTAT   STD { int linux_lstat(char *path, struct 
linux_lstat *up); }
 85 AUE_READLINKSTD { int linux_readlink(char *name, char *buf, \
l_int count); }
@@ -164,8 +165,10 @@
 87 AUE_SWAPON  NOPROTO { int swapon(char *name); }
 88 AUE_REBOOT  STD { int linux_reboot(l_int magic1, \
l_int magic2, l_uint cmd, void *arg); }
+; 89: old_readdir
 89 AUE_GETDIRENTRIES   STD { int linux_readdir(l_uint fd, \
struct l_dirent *dent, l_uint count); }
+; 90: old_mmap
 90 AUE_MMAPSTD { int linux_mmap(struct l_mmap_argv *ptr); }
 91 AUE_MUNMAP  NOPROTO { int munmap(caddr_t addr, int len); }
 92 AUE_TRUNCATESTD { int linux_truncate(char *path, \
@@ -197,6 +200,7 @@
struct l_newstat *buf); }
 108AUE_FSTAT   STD { int linux_newfstat(l_uint fd, \
struct l_newstat *buf); 

svn commit: r234317 - in stable/9/sys: amd64/linux32 i386/linux

[Alexander Leidinger]

Author: netchild
Date: Sun Apr 15 16:53:44 2012
New Revision: 234317
URL: http://svn.freebsd.org/changeset/base/234317

Log:
  regen

Modified:
  stable/9/sys/amd64/linux32/linux32_proto.h
  stable/9/sys/amd64/linux32/linux32_syscall.h
  stable/9/sys/amd64/linux32/linux32_syscalls.c
  stable/9/sys/amd64/linux32/linux32_sysent.c
  stable/9/sys/amd64/linux32/linux32_systrace_args.c
  stable/9/sys/i386/linux/linux_proto.h
  stable/9/sys/i386/linux/linux_syscall.h
  stable/9/sys/i386/linux/linux_syscalls.c
  stable/9/sys/i386/linux/linux_sysent.c
  stable/9/sys/i386/linux/linux_systrace_args.c

Modified: stable/9/sys/amd64/linux32/linux32_proto.h
==
--- stable/9/sys/amd64/linux32/linux32_proto.h  Sun Apr 15 16:52:48 2012
(r234316)
+++ stable/9/sys/amd64/linux32/linux32_proto.h  Sun Apr 15 16:53:44 2012
(r234317)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/9/sys/amd64/linux32/syscalls.master 231145 
2012-02-07 19:11:54Z jhb 
+ * created from FreeBSD: stable/9/sys/amd64/linux32/syscalls.master 234316 
2012-04-15 16:52:48Z netchild 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -1001,6 +1001,102 @@ struct linux_tee_args {
 struct linux_vmsplice_args {
register_t dummy;
 };
+struct linux_move_pages_args {
+   register_t dummy;
+};
+struct linux_getcpu_args {
+   register_t dummy;
+};
+struct linux_epoll_pwait_args {
+   register_t dummy;
+};
+struct linux_utimensat_args {
+   register_t dummy;
+};
+struct linux_signalfd_args {
+   register_t dummy;
+};
+struct linux_timerfd_create_args {
+   register_t dummy;
+};
+struct linux_eventfd_args {
+   register_t dummy;
+};
+struct linux_fallocate_args {
+   register_t dummy;
+};
+struct linux_timerfd_settime_args {
+   register_t dummy;
+};
+struct linux_timerfd_gettime_args {
+   register_t dummy;
+};
+struct linux_signalfd4_args {
+   register_t dummy;
+};
+struct linux_eventfd2_args {
+   register_t dummy;
+};
+struct linux_epoll_create1_args {
+   register_t dummy;
+};
+struct linux_dup3_args {
+   register_t dummy;
+};
+struct linux_pipe2_args {
+   register_t dummy;
+};
+struct linux_inotify_init1_args {
+   register_t dummy;
+};
+struct linux_preadv_args {
+   register_t dummy;
+};
+struct linux_pwritev_args {
+   register_t dummy;
+};
+struct linux_rt_tsigqueueinfo_args {
+   register_t dummy;
+};
+struct linux_perf_event_open_args {
+   register_t dummy;
+};
+struct linux_recvmmsg_args {
+   register_t dummy;
+};
+struct linux_fanotify_init_args {
+   register_t dummy;
+};
+struct linux_fanotify_mark_args {
+   register_t dummy;
+};
+struct linux_prlimit64_args {
+   register_t dummy;
+};
+struct linux_name_to_handle_at_args {
+   register_t dummy;
+};
+struct linux_open_by_handle_at_args {
+   register_t dummy;
+};
+struct linux_clock_adjtime_args {
+   register_t dummy;
+};
+struct linux_syncfs_args {
+   register_t dummy;
+};
+struct linux_sendmmsg_args {
+   register_t dummy;
+};
+struct linux_setns_args {
+   register_t dummy;
+};
+struct linux_process_vm_readv_args {
+   register_t dummy;
+};
+struct linux_process_vm_writev_args {
+   register_t dummy;
+};
 #definenosys   linux_nosys
 intlinux_fork(struct thread *, struct linux_fork_args *);
 intlinux_open(struct thread *, struct linux_open_args *);
@@ -1244,6 +1340,38 @@ int  linux_splice(struct thread *, struct
 intlinux_sync_file_range(struct thread *, struct 
linux_sync_file_range_args *);
 intlinux_tee(struct thread *, struct linux_tee_args *);
 intlinux_vmsplice(struct thread *, struct linux_vmsplice_args *);
+intlinux_move_pages(struct thread *, struct linux_move_pages_args *);
+intlinux_getcpu(struct thread *, struct linux_getcpu_args *);
+intlinux_epoll_pwait(struct thread *, struct linux_epoll_pwait_args *);
+intlinux_utimensat(struct thread *, struct linux_utimensat_args *);
+intlinux_signalfd(struct thread *, struct linux_signalfd_args *);
+intlinux_timerfd_create(struct thread *, struct linux_timerfd_create_args 
*);
+intlinux_eventfd(struct thread *, struct linux_eventfd_args *);
+intlinux_fallocate(struct thread *, struct linux_fallocate_args *);
+intlinux_timerfd_settime(struct thread *, struct 
linux_timerfd_settime_args *);
+intlinux_timerfd_gettime(struct thread *, struct 
linux_timerfd_gettime_args *);
+intlinux_signalfd4(struct thread *, struct linux_signalfd4_args *);
+intlinux_eventfd2(struct thread *, struct linux_eventfd2_args *);
+intlinux_epoll_create1(struct thread *, struct linux_epoll_create1_args *);
+intlinux_dup3(struct thread *, struct linux_dup3_args *);
+intlinux_pipe2(struct thread *, struct linux_pipe2_args *);
+intlinux_inotify_init1(struct thread *, struct 

svn commit: r234318 - in stable/8/sys: amd64/linux32 i386/conf i386/linux

[Alexander Leidinger]

Author: netchild
Date: Sun Apr 15 16:55:26 2012
New Revision: 234318
URL: http://svn.freebsd.org/changeset/base/234318

Log:
  MFC r232799:
- add comments to syscalls.master and linux(32)_dummy about which linux
  kernel version introduced the sysctl (based upon a linux man-page)
- add comments to syscalls.master regarding some names of sysctls which are
  different than the linux-names (based upon the linux unistd.h)
- add some dummy sysctls
- name an unimplemented sysctl

Modified:
  stable/8/sys/amd64/linux32/linux32_dummy.c
  stable/8/sys/amd64/linux32/syscalls.master
  stable/8/sys/i386/linux/linux_dummy.c
  stable/8/sys/i386/linux/syscalls.master
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)
  stable/8/sys/i386/conf/XENHVM   (props changed)

Modified: stable/8/sys/amd64/linux32/linux32_dummy.c
==
--- stable/8/sys/amd64/linux32/linux32_dummy.c  Sun Apr 15 16:53:44 2012
(r234317)
+++ stable/8/sys/amd64/linux32/linux32_dummy.c  Sun Apr 15 16:55:26 2012
(r234318)
@@ -82,22 +82,69 @@ DUMMY(mq_notify);
 DUMMY(mq_getsetattr);
 DUMMY(kexec_load);
 DUMMY(waitid);
+/* linux 2.6.11: */
 DUMMY(add_key);
 DUMMY(request_key);
 DUMMY(keyctl);
+/* linux 2.6.13: */
 DUMMY(ioprio_set);
 DUMMY(ioprio_get);
 DUMMY(inotify_init);
 DUMMY(inotify_add_watch);
 DUMMY(inotify_rm_watch);
+/* linux 2.6.16: */
 DUMMY(migrate_pages);
 DUMMY(pselect6);
 DUMMY(ppoll);
 DUMMY(unshare);
+/* linux 2.6.17: */
 DUMMY(splice);
 DUMMY(sync_file_range);
 DUMMY(tee);
 DUMMY(vmsplice);
+/* linux 2.6.18: */
+DUMMY(move_pages);
+/* linux 2.6.19: */
+DUMMY(getcpu);
+DUMMY(epoll_pwait);
+/* linux 2.6.22: */
+DUMMY(utimensat);
+DUMMY(signalfd);
+DUMMY(timerfd_create);
+DUMMY(eventfd);
+/* linux 2.6.23: */
+DUMMY(fallocate);
+/* linux 2.6.25: */
+DUMMY(timerfd_settime);
+DUMMY(timerfd_gettime);
+/* linux 2.6.27: */
+DUMMY(signalfd4);
+DUMMY(eventfd2);
+DUMMY(epoll_create1);
+DUMMY(dup3);
+DUMMY(pipe2);
+DUMMY(inotify_init1);
+/* linux 2.6.30: */
+DUMMY(preadv);
+DUMMY(pwritev);
+/* linux 2.6.31: */
+DUMMY(rt_tsigqueueinfo);
+DUMMY(perf_event_open);
+/* linux 2.6.33: */
+DUMMY(recvmmsg);
+DUMMY(fanotify_init);
+DUMMY(fanotify_mark);
+/* linux 2.6.36: */
+DUMMY(prlimit64);
+/* later: */
+DUMMY(name_to_handle_at);
+DUMMY(open_by_handle_at);
+DUMMY(clock_adjtime);
+DUMMY(syncfs);
+DUMMY(sendmmsg);
+DUMMY(setns);
+DUMMY(process_vm_readv);
+DUMMY(process_vm_writev);
 
 #define DUMMY_XATTR(s) \
 int\

Modified: stable/8/sys/amd64/linux32/syscalls.master
==
--- stable/8/sys/amd64/linux32/syscalls.master  Sun Apr 15 16:53:44 2012
(r234317)
+++ stable/8/sys/amd64/linux32/syscalls.master  Sun Apr 15 16:55:26 2012
(r234318)
@@ -157,6 +157,7 @@
 82 AUE_SELECT  STD { int linux_old_select( \
struct l_old_select_argv *ptr); }
 83 AUE_SYMLINK STD { int linux_symlink(char *path, char *to); }
+; 84: oldlstat
 84 AUE_LSTAT   STD { int linux_lstat(char *path, struct 
linux_lstat *up); }
 85 AUE_READLINKSTD { int linux_readlink(char *name, char *buf, \
l_int count); }
@@ -164,8 +165,10 @@
 87 AUE_SWAPON  NOPROTO { int swapon(char *name); }
 88 AUE_REBOOT  STD { int linux_reboot(l_int magic1, \
l_int magic2, l_uint cmd, void *arg); }
+; 89: old_readdir
 89 AUE_GETDIRENTRIES   STD { int linux_readdir(l_uint fd, \
struct l_dirent *dent, l_uint count); }
+; 90: old_mmap
 90 AUE_MMAPSTD { int linux_mmap(struct l_mmap_argv *ptr); }
 91 AUE_MUNMAP  NOPROTO { int munmap(caddr_t addr, int len); }
 92 AUE_TRUNCATESTD { int linux_truncate(char *path, \
@@ -197,6 +200,7 @@
struct l_newstat *buf); }
 108AUE_FSTAT   STD { int linux_newfstat(l_uint fd, \
struct l_newstat *buf); }
+; 109: olduname
 109AUE_NULLSTD { int linux_uname(void); }
 110AUE_NULLSTD { int linux_iopl(l_ulong level); }
 111AUE_NULLSTD { int linux_vhangup(void); }
@@ -244,6 +248,7 @@
l_uint whence); }
 141AUE_GETDIRENTRIES   STD { int linux_getdents(l_uint fd, void *dent, 
\
l_uint count); }
+; 142: newselect
 142AUE_SELECT  STD { int 

svn commit: r234319 - in stable/8/sys: amd64/linux32 i386/linux

[Alexander Leidinger]

Author: netchild
Date: Sun Apr 15 16:56:28 2012
New Revision: 234319
URL: http://svn.freebsd.org/changeset/base/234319

Log:
  regen

Modified:
  stable/8/sys/amd64/linux32/linux32_proto.h
  stable/8/sys/amd64/linux32/linux32_syscall.h
  stable/8/sys/amd64/linux32/linux32_syscalls.c
  stable/8/sys/amd64/linux32/linux32_sysent.c
  stable/8/sys/amd64/linux32/linux32_systrace_args.c
  stable/8/sys/i386/linux/linux_proto.h
  stable/8/sys/i386/linux/linux_syscall.h
  stable/8/sys/i386/linux/linux_syscalls.c
  stable/8/sys/i386/linux/linux_sysent.c
  stable/8/sys/i386/linux/linux_systrace_args.c

Modified: stable/8/sys/amd64/linux32/linux32_proto.h
==
--- stable/8/sys/amd64/linux32/linux32_proto.h  Sun Apr 15 16:55:26 2012
(r234318)
+++ stable/8/sys/amd64/linux32/linux32_proto.h  Sun Apr 15 16:56:28 2012
(r234319)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/8/sys/amd64/linux32/syscalls.master 231146 
2012-02-07 19:12:21Z jhb 
+ * created from FreeBSD: stable/8/sys/amd64/linux32/syscalls.master 234318 
2012-04-15 16:55:26Z netchild 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -1001,6 +1001,102 @@ struct linux_tee_args {
 struct linux_vmsplice_args {
register_t dummy;
 };
+struct linux_move_pages_args {
+   register_t dummy;
+};
+struct linux_getcpu_args {
+   register_t dummy;
+};
+struct linux_epoll_pwait_args {
+   register_t dummy;
+};
+struct linux_utimensat_args {
+   register_t dummy;
+};
+struct linux_signalfd_args {
+   register_t dummy;
+};
+struct linux_timerfd_create_args {
+   register_t dummy;
+};
+struct linux_eventfd_args {
+   register_t dummy;
+};
+struct linux_fallocate_args {
+   register_t dummy;
+};
+struct linux_timerfd_settime_args {
+   register_t dummy;
+};
+struct linux_timerfd_gettime_args {
+   register_t dummy;
+};
+struct linux_signalfd4_args {
+   register_t dummy;
+};
+struct linux_eventfd2_args {
+   register_t dummy;
+};
+struct linux_epoll_create1_args {
+   register_t dummy;
+};
+struct linux_dup3_args {
+   register_t dummy;
+};
+struct linux_pipe2_args {
+   register_t dummy;
+};
+struct linux_inotify_init1_args {
+   register_t dummy;
+};
+struct linux_preadv_args {
+   register_t dummy;
+};
+struct linux_pwritev_args {
+   register_t dummy;
+};
+struct linux_rt_tsigqueueinfo_args {
+   register_t dummy;
+};
+struct linux_perf_event_open_args {
+   register_t dummy;
+};
+struct linux_recvmmsg_args {
+   register_t dummy;
+};
+struct linux_fanotify_init_args {
+   register_t dummy;
+};
+struct linux_fanotify_mark_args {
+   register_t dummy;
+};
+struct linux_prlimit64_args {
+   register_t dummy;
+};
+struct linux_name_to_handle_at_args {
+   register_t dummy;
+};
+struct linux_open_by_handle_at_args {
+   register_t dummy;
+};
+struct linux_clock_adjtime_args {
+   register_t dummy;
+};
+struct linux_syncfs_args {
+   register_t dummy;
+};
+struct linux_sendmmsg_args {
+   register_t dummy;
+};
+struct linux_setns_args {
+   register_t dummy;
+};
+struct linux_process_vm_readv_args {
+   register_t dummy;
+};
+struct linux_process_vm_writev_args {
+   register_t dummy;
+};
 #definenosys   linux_nosys
 intlinux_fork(struct thread *, struct linux_fork_args *);
 intlinux_open(struct thread *, struct linux_open_args *);
@@ -1244,6 +1340,38 @@ int  linux_splice(struct thread *, struct
 intlinux_sync_file_range(struct thread *, struct 
linux_sync_file_range_args *);
 intlinux_tee(struct thread *, struct linux_tee_args *);
 intlinux_vmsplice(struct thread *, struct linux_vmsplice_args *);
+intlinux_move_pages(struct thread *, struct linux_move_pages_args *);
+intlinux_getcpu(struct thread *, struct linux_getcpu_args *);
+intlinux_epoll_pwait(struct thread *, struct linux_epoll_pwait_args *);
+intlinux_utimensat(struct thread *, struct linux_utimensat_args *);
+intlinux_signalfd(struct thread *, struct linux_signalfd_args *);
+intlinux_timerfd_create(struct thread *, struct linux_timerfd_create_args 
*);
+intlinux_eventfd(struct thread *, struct linux_eventfd_args *);
+intlinux_fallocate(struct thread *, struct linux_fallocate_args *);
+intlinux_timerfd_settime(struct thread *, struct 
linux_timerfd_settime_args *);
+intlinux_timerfd_gettime(struct thread *, struct 
linux_timerfd_gettime_args *);
+intlinux_signalfd4(struct thread *, struct linux_signalfd4_args *);
+intlinux_eventfd2(struct thread *, struct linux_eventfd2_args *);
+intlinux_epoll_create1(struct thread *, struct linux_epoll_create1_args *);
+intlinux_dup3(struct thread *, struct linux_dup3_args *);
+intlinux_pipe2(struct thread *, struct linux_pipe2_args *);
+intlinux_inotify_init1(struct thread *, struct 

Re: svn commit: r234316 - in stable/9/sys: amd64/linux32 i386/conf i386/linux kern

[Alexander Leidinger]

On Sun, 15 Apr 2012 22:38:42 +0400 Andrey Zonov and...@zonov.org
wrote:

 On 15.04.2012 20:52, Alexander Leidinger wrote:
  Author: netchild
  Date: Sun Apr 15 16:52:48 2012
  New Revision: 234316
  URL: http://svn.freebsd.org/changeset/base/234316
 
  Log:
 MFC r232799:
   - add comments to syscalls.master and linux(32)_dummy about
  which linux kernel version introduced the sysctl (based upon a
  linux man-page)
   - add comments to syscalls.master regarding some names of
  sysctls which are different than the linux-names (based upon the
  linux unistd.h)
   - add some dummy sysctls
   - name an unimplemented sysctl
 
 
 Did you mean s/sysctl/syscall/?

Yes, I already did it wrong in the original commit and overlooked it in
the copypaste (while fixing another typo). But it is obvious from the
context of the change that it has to be syscall (sysctls do not
belong into syscalls.master).

Bye,
Alexander.

-- 
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r234298 - svnadmin/conf

[Alexander Leidinger]

Author: netchild
Date: Sat Apr 14 21:02:42 2012
New Revision: 234298
URL: http://svn.freebsd.org/changeset/base/234298

Log:
  Add myself for a large IFC.

Modified:
  svnadmin/conf/sizelimit.conf

Modified: svnadmin/conf/sizelimit.conf
==
--- svnadmin/conf/sizelimit.confSat Apr 14 21:01:44 2012
(r234297)
+++ svnadmin/conf/sizelimit.confSat Apr 14 21:02:42 2012
(r234298)
@@ -29,6 +29,7 @@ jb
 jeff
 kmacy
 lstewart
+netchild
 obrien
 rpaulo
 rwatson
___
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: r234300 - svnadmin/conf

[Alexander Leidinger]

Author: netchild
Date: Sat Apr 14 21:08:55 2012
New Revision: 234300
URL: http://svn.freebsd.org/changeset/base/234300

Log:
  Reenable FSP for myself.

Modified:
  svnadmin/conf/sizelimit.conf

Modified: svnadmin/conf/sizelimit.conf
==
--- svnadmin/conf/sizelimit.confSat Apr 14 21:05:39 2012
(r234299)
+++ svnadmin/conf/sizelimit.confSat Apr 14 21:08:55 2012
(r234300)
@@ -29,7 +29,6 @@ jb
 jeff
 kmacy
 lstewart
-netchild
 obrien
 rpaulo
 rwatson
___
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: r233552 - in head/sys: cddl/dev/sdt kern sys

[Alexander Leidinger]

On Tue, 27 Mar 2012 15:07:43 + (UTC) Ryan Stone
rst...@freebsd.org wrote:

 Author: rstone
 Date: Tue Mar 27 15:07:43 2012
 New Revision: 233552
 URL: http://svn.freebsd.org/changeset/base/233552
 
 Log:
   Instead of only iterating over the set of known SDT probes when
 sdt.ko is loaded and unloaded, also have sdt.ko register callbacks
 with kern_sdt.c that will be called when a newly loaded KLD module
 adds more probes or a module with probes is unloaded.

Great!
Is this automatic, or do I need to do something in the newly loaded KLD?

   This makes it possible to create SDT probes in KLD modules,
 although there are still two caveats: first, any SDT probes in a KLD
 module must be part of a DTrace provider that is defined in that
 module.

To make sure I understand it correctly:
If I have the provider linuxulator, all probes for this provider
need to be within the KLD. No other KLD is allowed to reference this
provider. To stay with the linuxulator example: if a module which
depends upon linux.ko wants to have some SDT probes, it has to use a
different provider.

Bye,
Alexander.

-- 
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r233048 - head/etc/defaults

[Alexander Leidinger]

Quoting Martin Matuska m...@freebsd.org (from Sun, 18 Mar 2012  
22:50:13 +0100):



On 18.3.2012 22:29, Martin Matuska wrote:

On 17.3.2012 16:35, Alexander Leidinger wrote:

On Fri, 16 Mar 2012 21:30:26 + (UTC) Martin Matuska
m...@freebsd.org wrote:


Author: mm
Date: Fri Mar 16 21:30:26 2012
New Revision: 233048
URL: http://svn.freebsd.org/changeset/base/233048

Log:
  Unhide /dev/zfs in devfsrules_jail.

  The /dev/zfs device is required for managing jailed ZFS datasets.

This may give more info to a jail (ZFS is in use on this machine) than
what someone may want to provide. I have separate rulesets for jails
without and with ZFS (actually the one without is the default one and
the one with is a new one):
---snip---
...

[devfsrules_unhide_zfs=12]
add path zfs unhide

...

[devfsrules_jail_withzfs=16]
add include $devfsrules_hide_all
add include $devfsrules_unhide_basic
add include $devfsrules_unhide_login
add include $devfsrules_unhide_zfs
---snip---

Anyone with arguments why this may be overly paranoid? If not, I would
suggest that we go this way instead.

Bye,
Alexander.


The only disclosed information I know of is whether the zfs module is
loaded on your system.
Other alternative I was thinking of would be using a new ruleset (e.g.
devfsrules_jail_zfs=5).
The disadvantage here is that users that already have defined a ruleset
with this number should be informed somehow.


Well... we always have this issue. If the rulsets in defaults changes,  
the user has to change his own rulesets. I have a lot of rules on my  
system and there was at least one occasion where I had to handle a  
change because of this. I don't remember if there was an entry in  
UPDATING or not, but I don't think we should make a decission about it  
based upon if an user has to renumber his rulesets or not. As the  
rulesets do not need to be continous, we may want to add an advise to  
the man-page(s) to start at a specifc value for the ruleset-numbers  
and reserve everything below for the system. I didn't do this myself,  
and I have a lot of rulesets, for me this falls within 'nice to have  
but easy to handle'.



Btw. jail has access to sysctl(8) and this discloses a *LOT* of
information, including if ZFS is loaded or not (existence of vfs.zfs)
and all its settings and statistics, hardware devices, geom devices,
network card counters and many more. Compared to this is /dev/zfs really
a minor issue :-)


I agree.


Until we limit the output of sysctl() we don't hide this information
just by hiding /dev/zfs.


What about not imported pools. Can I see them in jails or are they  
hidden (I don't have one around to test ATM)?


Bye,
Alexander.

--
Don't drink when you drive -- you might hit a bump and spill it.

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137

___
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: r233048 - head/etc/defaults

[Alexander Leidinger]

On Fri, 16 Mar 2012 21:30:26 + (UTC) Martin Matuska
m...@freebsd.org wrote:

 Author: mm
 Date: Fri Mar 16 21:30:26 2012
 New Revision: 233048
 URL: http://svn.freebsd.org/changeset/base/233048
 
 Log:
   Unhide /dev/zfs in devfsrules_jail.
   
   The /dev/zfs device is required for managing jailed ZFS datasets.

This may give more info to a jail (ZFS is in use on this machine) than
what someone may want to provide. I have separate rulesets for jails
without and with ZFS (actually the one without is the default one and
the one with is a new one):
---snip---
...

[devfsrules_unhide_zfs=12]
add path zfs unhide

...

[devfsrules_jail_withzfs=16]
add include $devfsrules_hide_all
add include $devfsrules_unhide_basic
add include $devfsrules_unhide_login
add include $devfsrules_unhide_zfs
---snip---

Anyone with arguments why this may be overly paranoid? If not, I would
suggest that we go this way instead.

Bye,
Alexander.

-- 
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r232799 - in head/sys: amd64/linux32 i386/linux

[Alexander Leidinger]

Author: netchild
Date: Sat Mar 10 23:10:18 2012
New Revision: 232799
URL: http://svn.freebsd.org/changeset/base/232799

Log:
  - add comments to syscalls.master and linux(32)_dummy about which linux
kernel version introduced the sysctl (based upon a linux man-page)
  - add comments to sscalls.master regarding some names of sysctls which are
different than the linux-names (based upon the linux unistd.h)
  - add some dummy sysctls
  - name an unimplemented sysctl
  
  MFC after:1 month

Modified:
  head/sys/amd64/linux32/linux32_dummy.c
  head/sys/amd64/linux32/syscalls.master
  head/sys/i386/linux/linux_dummy.c
  head/sys/i386/linux/syscalls.master

Modified: head/sys/amd64/linux32/linux32_dummy.c
==
--- head/sys/amd64/linux32/linux32_dummy.c  Sat Mar 10 21:58:08 2012
(r232798)
+++ head/sys/amd64/linux32/linux32_dummy.c  Sat Mar 10 23:10:18 2012
(r232799)
@@ -82,22 +82,69 @@ DUMMY(mq_notify);
 DUMMY(mq_getsetattr);
 DUMMY(kexec_load);
 DUMMY(waitid);
+/* linux 2.6.11: */
 DUMMY(add_key);
 DUMMY(request_key);
 DUMMY(keyctl);
+/* linux 2.6.13: */
 DUMMY(ioprio_set);
 DUMMY(ioprio_get);
 DUMMY(inotify_init);
 DUMMY(inotify_add_watch);
 DUMMY(inotify_rm_watch);
+/* linux 2.6.16: */
 DUMMY(migrate_pages);
 DUMMY(pselect6);
 DUMMY(ppoll);
 DUMMY(unshare);
+/* linux 2.6.17: */
 DUMMY(splice);
 DUMMY(sync_file_range);
 DUMMY(tee);
 DUMMY(vmsplice);
+/* linux 2.6.18: */
+DUMMY(move_pages);
+/* linux 2.6.19: */
+DUMMY(getcpu);
+DUMMY(epoll_pwait);
+/* linux 2.6.22: */
+DUMMY(utimensat);
+DUMMY(signalfd);
+DUMMY(timerfd_create);
+DUMMY(eventfd);
+/* linux 2.6.23: */
+DUMMY(fallocate);
+/* linux 2.6.25: */
+DUMMY(timerfd_settime);
+DUMMY(timerfd_gettime);
+/* linux 2.6.27: */
+DUMMY(signalfd4);
+DUMMY(eventfd2);
+DUMMY(epoll_create1);
+DUMMY(dup3);
+DUMMY(pipe2);
+DUMMY(inotify_init1);
+/* linux 2.6.30: */
+DUMMY(preadv);
+DUMMY(pwritev);
+/* linux 2.6.31: */
+DUMMY(rt_tsigqueueinfo);
+DUMMY(perf_event_open);
+/* linux 2.6.33: */
+DUMMY(recvmmsg);
+DUMMY(fanotify_init);
+DUMMY(fanotify_mark);
+/* linux 2.6.36: */
+DUMMY(prlimit64);
+/* later: */
+DUMMY(name_to_handle_at);
+DUMMY(open_by_handle_at);
+DUMMY(clock_adjtime);
+DUMMY(syncfs);
+DUMMY(sendmmsg);
+DUMMY(setns);
+DUMMY(process_vm_readv);
+DUMMY(process_vm_writev);
 
 #define DUMMY_XATTR(s) \
 int\

Modified: head/sys/amd64/linux32/syscalls.master
==
--- head/sys/amd64/linux32/syscalls.master  Sat Mar 10 21:58:08 2012
(r232798)
+++ head/sys/amd64/linux32/syscalls.master  Sat Mar 10 23:10:18 2012
(r232799)
@@ -157,6 +157,7 @@
 82 AUE_SELECT  STD { int linux_old_select( \
struct l_old_select_argv *ptr); }
 83 AUE_SYMLINK STD { int linux_symlink(char *path, char *to); }
+; 84: oldlstat
 84 AUE_LSTAT   STD { int linux_lstat(char *path, struct 
linux_lstat *up); }
 85 AUE_READLINKSTD { int linux_readlink(char *name, char *buf, \
l_int count); }
@@ -164,8 +165,10 @@
 87 AUE_SWAPON  NOPROTO { int swapon(char *name); }
 88 AUE_REBOOT  STD { int linux_reboot(l_int magic1, \
l_int magic2, l_uint cmd, void *arg); }
+; 89: old_readdir
 89 AUE_GETDIRENTRIES   STD { int linux_readdir(l_uint fd, \
struct l_dirent *dent, l_uint count); }
+; 90: old_mmap
 90 AUE_MMAPSTD { int linux_mmap(struct l_mmap_argv *ptr); }
 91 AUE_MUNMAP  NOPROTO { int munmap(caddr_t addr, int len); }
 92 AUE_TRUNCATESTD { int linux_truncate(char *path, \
@@ -197,6 +200,7 @@
struct l_newstat *buf); }
 108AUE_FSTAT   STD { int linux_newfstat(l_uint fd, \
struct l_newstat *buf); }
+; 109: olduname
 109AUE_NULLSTD { int linux_uname(void); }
 110AUE_NULLSTD { int linux_iopl(l_ulong level); }
 111AUE_NULLSTD { int linux_vhangup(void); }
@@ -244,6 +248,7 @@
l_uint whence); }
 141AUE_GETDIRENTRIES   STD { int linux_getdents(l_uint fd, void *dent, 
\
l_uint count); }
+; 142: newselect
 142AUE_SELECT  STD { int linux_select(l_int nfds, \
l_fd_set *readfds, l_fd_set *writefds, \
l_fd_set *exceptfds, \
@@ -336,6 +341,7 @@
 188AUE_GETPMSG UNIMPL  getpmsg
 189AUE_PUTPMSG UNIMPL  putpmsg
 190AUE_VFORK   STD { int linux_vfork(void); }
+; 191: ugetrlimit
 191AUE_GETRLIMIT   STD { int linux_getrlimit(l_uint resource, \

svn commit: r232800 - in head/sys: amd64/linux32 i386/linux

[Alexander Leidinger]

Author: netchild
Date: Sat Mar 10 23:11:21 2012
New Revision: 232800
URL: http://svn.freebsd.org/changeset/base/232800

Log:
  regen

Modified:
  head/sys/amd64/linux32/linux32_proto.h
  head/sys/amd64/linux32/linux32_syscall.h
  head/sys/amd64/linux32/linux32_syscalls.c
  head/sys/amd64/linux32/linux32_sysent.c
  head/sys/amd64/linux32/linux32_systrace_args.c
  head/sys/i386/linux/linux_proto.h
  head/sys/i386/linux/linux_syscall.h
  head/sys/i386/linux/linux_syscalls.c
  head/sys/i386/linux/linux_sysent.c
  head/sys/i386/linux/linux_systrace_args.c

Modified: head/sys/amd64/linux32/linux32_proto.h
==
--- head/sys/amd64/linux32/linux32_proto.h  Sat Mar 10 23:10:18 2012
(r232799)
+++ head/sys/amd64/linux32/linux32_proto.h  Sat Mar 10 23:11:21 2012
(r232800)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957 
2011-12-29 15:34:59Z jhb 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 232799 
2012-03-10 23:10:18Z netchild 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -1003,6 +1003,102 @@ struct linux_tee_args {
 struct linux_vmsplice_args {
register_t dummy;
 };
+struct linux_move_pages_args {
+   register_t dummy;
+};
+struct linux_getcpu_args {
+   register_t dummy;
+};
+struct linux_epoll_pwait_args {
+   register_t dummy;
+};
+struct linux_utimensat_args {
+   register_t dummy;
+};
+struct linux_signalfd_args {
+   register_t dummy;
+};
+struct linux_timerfd_create_args {
+   register_t dummy;
+};
+struct linux_eventfd_args {
+   register_t dummy;
+};
+struct linux_fallocate_args {
+   register_t dummy;
+};
+struct linux_timerfd_settime_args {
+   register_t dummy;
+};
+struct linux_timerfd_gettime_args {
+   register_t dummy;
+};
+struct linux_signalfd4_args {
+   register_t dummy;
+};
+struct linux_eventfd2_args {
+   register_t dummy;
+};
+struct linux_epoll_create1_args {
+   register_t dummy;
+};
+struct linux_dup3_args {
+   register_t dummy;
+};
+struct linux_pipe2_args {
+   register_t dummy;
+};
+struct linux_inotify_init1_args {
+   register_t dummy;
+};
+struct linux_preadv_args {
+   register_t dummy;
+};
+struct linux_pwritev_args {
+   register_t dummy;
+};
+struct linux_rt_tsigqueueinfo_args {
+   register_t dummy;
+};
+struct linux_perf_event_open_args {
+   register_t dummy;
+};
+struct linux_recvmmsg_args {
+   register_t dummy;
+};
+struct linux_fanotify_init_args {
+   register_t dummy;
+};
+struct linux_fanotify_mark_args {
+   register_t dummy;
+};
+struct linux_prlimit64_args {
+   register_t dummy;
+};
+struct linux_name_to_handle_at_args {
+   register_t dummy;
+};
+struct linux_open_by_handle_at_args {
+   register_t dummy;
+};
+struct linux_clock_adjtime_args {
+   register_t dummy;
+};
+struct linux_syncfs_args {
+   register_t dummy;
+};
+struct linux_sendmmsg_args {
+   register_t dummy;
+};
+struct linux_setns_args {
+   register_t dummy;
+};
+struct linux_process_vm_readv_args {
+   register_t dummy;
+};
+struct linux_process_vm_writev_args {
+   register_t dummy;
+};
 #definenosys   linux_nosys
 intlinux_fork(struct thread *, struct linux_fork_args *);
 intlinux_open(struct thread *, struct linux_open_args *);
@@ -1246,6 +1342,38 @@ int  linux_splice(struct thread *, struct
 intlinux_sync_file_range(struct thread *, struct 
linux_sync_file_range_args *);
 intlinux_tee(struct thread *, struct linux_tee_args *);
 intlinux_vmsplice(struct thread *, struct linux_vmsplice_args *);
+intlinux_move_pages(struct thread *, struct linux_move_pages_args *);
+intlinux_getcpu(struct thread *, struct linux_getcpu_args *);
+intlinux_epoll_pwait(struct thread *, struct linux_epoll_pwait_args *);
+intlinux_utimensat(struct thread *, struct linux_utimensat_args *);
+intlinux_signalfd(struct thread *, struct linux_signalfd_args *);
+intlinux_timerfd_create(struct thread *, struct linux_timerfd_create_args 
*);
+intlinux_eventfd(struct thread *, struct linux_eventfd_args *);
+intlinux_fallocate(struct thread *, struct linux_fallocate_args *);
+intlinux_timerfd_settime(struct thread *, struct 
linux_timerfd_settime_args *);
+intlinux_timerfd_gettime(struct thread *, struct 
linux_timerfd_gettime_args *);
+intlinux_signalfd4(struct thread *, struct linux_signalfd4_args *);
+intlinux_eventfd2(struct thread *, struct linux_eventfd2_args *);
+intlinux_epoll_create1(struct thread *, struct linux_epoll_create1_args *);
+intlinux_dup3(struct thread *, struct linux_dup3_args *);
+intlinux_pipe2(struct thread *, struct linux_pipe2_args *);
+intlinux_inotify_init1(struct thread *, struct linux_inotify_init1_args *);
+intlinux_preadv(struct thread *, struct 

svn commit: r230500 - head/tools/kerneldoc/subsys

[Alexander Leidinger]

Author: netchild
Date: Tue Jan 24 11:06:22 2012
New Revision: 230500
URL: http://svn.freebsd.org/changeset/base/230500

Log:
  We are in FreeBSD 10 now: define __FreeBSD__ to 10.

Modified:
  head/tools/kerneldoc/subsys/common-Doxyfile

Modified: head/tools/kerneldoc/subsys/common-Doxyfile
==
--- head/tools/kerneldoc/subsys/common-Doxyfile Tue Jan 24 10:56:40 2012
(r230499)
+++ head/tools/kerneldoc/subsys/common-Doxyfile Tue Jan 24 11:06:22 2012
(r230500)
@@ -231,7 +231,7 @@ INCLUDE_PATH   = $(DOXYGEN_SRC_I
  .
 INCLUDE_FILE_PATTERNS  = *.h
 PREDEFINED = _KERNEL \
- __FreeBSD__=9 \
+ __FreeBSD__=10 \
  __${TARGET_ARCH}__=1 \
  __${TARGET_ARCH}=1
 EXPAND_AS_DEFINED  = 
___
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: r230509 - head/tools/kerneldoc/subsys

[Alexander Leidinger]

Author: netchild
Date: Tue Jan 24 15:13:55 2012
New Revision: 230509
URL: http://svn.freebsd.org/changeset/base/230509

Log:
  Just define __FreeBSD__ to 1 instead of doing what the compiler does.
  The kernel is supposed to DTRT based upon the __FreeBSD_version value,
  not the value of __FreeBSD__.
  
  Discussed with:   bz

Modified:
  head/tools/kerneldoc/subsys/common-Doxyfile

Modified: head/tools/kerneldoc/subsys/common-Doxyfile
==
--- head/tools/kerneldoc/subsys/common-Doxyfile Tue Jan 24 14:27:14 2012
(r230508)
+++ head/tools/kerneldoc/subsys/common-Doxyfile Tue Jan 24 15:13:55 2012
(r230509)
@@ -230,8 +230,12 @@ SEARCH_INCLUDES= YES
 INCLUDE_PATH   = $(DOXYGEN_SRC_INCLUDE_PATH) \
  .
 INCLUDE_FILE_PATTERNS  = *.h
+# __FreeBSD__ is normally defined to the the major version number of
+# FreeBSD. In the kernel source it is just checked for != 0, and
+# __FreeBSD_version is used for version dependend code.
+# To make live simple on major version bumps, just define __FreeBSD__ to 1.
 PREDEFINED = _KERNEL \
- __FreeBSD__=10 \
+ __FreeBSD__=1 \
  __${TARGET_ARCH}__=1 \
  __${TARGET_ARCH}=1
 EXPAND_AS_DEFINED  = 
___
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: r228124 - in head: share/mk sys/conf

[Alexander Leidinger]

Hi,

did you verify that this works with settings in src.conf for buildworld and for 
corresponding makeoptions in the kernel config for buildkernel and for the old 
way of building kernels?

The reason we had the shell conditionals was because we didn't manage to get 
all cases working with make conditionals due to the evaluation order of the 
various files.

Bye,
Alexander.

-- 
Send via an Android device, please forgive brevity and typographic and spelling 
errors. Max Khon f...@freebsd.org hat geschrieben:Author: fjoe
Date: Tue Nov 29 08:38:47 2011
New Revision: 228124
URL: http://svn.freebsd.org/changeset/base/228124

Log:
  Conditionalize ctfconvert/ctfmerge runs on make level (.if/.endif) instead
  of executing a shell on every object or executable/library file.
  
  This shaves off more than 30,000 shell invocations during buildworld.

Modified:
  head/share/mk/bsd.lib.mk
  head/share/mk/bsd.prog.mk
  head/share/mk/sys.mk
  head/sys/conf/kern.post.mk
  head/sys/conf/kern.pre.mk
  head/sys/conf/kmod.mk

Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkTue Nov 29 08:33:40 2011(r228123)
+++ head/share/mk/bsd.lib.mkTue Nov 29 08:38:47 2011(r228124)
@@ -75,15 +75,15 @@ PO_FLAG=-pg

.c.po:
${CC} ${PO_FLAG} ${STATIC_CFLAGS} ${PO_CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

.c.So:
${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

.cc.o:
${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
@@ -96,47 +96,47 @@ PO_FLAG=-pg

.f.po:
${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

.f.So:
${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

.s.po .s.So:
${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

.asm.po:
${CC} -x assembler-with-cpp -DPROF ${PO_CFLAGS} ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

.asm.So:
${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \
    -c ${.IMPSRC} -o ${.TARGET}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

.S.po:
${CC} -DPROF ${PO_CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

.S.So:
${CC} ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-   @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}  \
-${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+.if !defined(NO_CTF)
+   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif

all: objwarn

@@ -211,9 +211,9 @@ ${SHLIB_NAME}: ${SOBJS}
    -o ${.TARGET} -Wl,-soname,${SONAME} \
    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
.endif
-   @[ -z ${CTFMERGE} -o -n ${NO_CTF} ] || \
-(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}  \
-${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
+.if !defined(NO_CTF)
+   ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+.endif
.endif

.if defined(INSTALL_PIC_ARCHIVE)  defined(LIB)  !empty(LIB)  
${MK_TOOLCHAIN} != no

Modified: head/share/mk/bsd.prog.mk
==
--- head/share/mk/bsd.prog.mk   Tue Nov 29 08:33:40 2011(r228123)
+++ head/share/mk/bsd.prog.mk   Tue Nov 29 08:38:47 2011(r228124)
@@ 

Re: svn commit: r223989 - head/sys/dev/usb/input

[Alexander Leidinger]

On Fri, 22 Jul 2011 13:46:28 +0300 Andriy Gapon a...@freebsd.org wrote:

 I think that your suggestion makes a lot of sense and is the proper
 approach to fixing this issue.  Now we need some sole to actually do
 the work :-)

Or at least someone who documents the need to do it (and either the
explanation or a link to it) in the wiki in the ideas list... ENOTIME
ATM from my side.

Bye,
Alexander.

-- 
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r223592 - stable/8/usr.bin/kdump

[Alexander Leidinger]

Author: netchild
Date: Mon Jun 27 11:49:58 2011
New Revision: 223592
URL: http://svn.freebsd.org/changeset/base/223592

Log:
  MFC r223173:
Add 2-clause BSD license.
  
Approved by:David Kirchner d...@dpk.net (initial author)
Requested by:   Otto Moerbeek o...@drijf.net

Modified:
  stable/8/usr.bin/kdump/mksubr
Directory Properties:
  stable/8/usr.bin/kdump/   (props changed)

Modified: stable/8/usr.bin/kdump/mksubr
==
--- stable/8/usr.bin/kdump/mksubr   Mon Jun 27 11:13:58 2011
(r223591)
+++ stable/8/usr.bin/kdump/mksubr   Mon Jun 27 11:49:58 2011
(r223592)
@@ -1,5 +1,28 @@
 #!/bin/sh
 #
+# Copyright (c) 2006 David Kirchner d...@dpk.net. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
 # $FreeBSD$
 #
 # Generates kdump_subr.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: r223173 - head/usr.bin/kdump

[Alexander Leidinger]

Author: netchild
Date: Fri Jun 17 06:12:28 2011
New Revision: 223173
URL: http://svn.freebsd.org/changeset/base/223173

Log:
  Add 2-clause BSD license.
  
  Approved by:  David Kirchner d...@dpk.net (initial author)
  Requested by: Otto Moerbeek o...@drijf.net
  MFC after:1 week

Modified:
  head/usr.bin/kdump/mksubr

Modified: head/usr.bin/kdump/mksubr
==
--- head/usr.bin/kdump/mksubr   Fri Jun 17 05:55:41 2011(r223172)
+++ head/usr.bin/kdump/mksubr   Fri Jun 17 06:12:28 2011(r223173)
@@ -1,5 +1,28 @@
 #!/bin/sh
 #
+# Copyright (c) 2006 David Kirchner d...@dpk.net. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
 # $FreeBSD$
 #
 # Generates kdump_subr.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: r222914 - stable/8/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Fri Jun 10 07:54:38 2011
New Revision: 222914
URL: http://svn.freebsd.org/changeset/base/222914

Log:
  MFC r221423, r221424, r221426, r221428, r221434:
  
This is v4l2 support for the linuxulator. This allows to access FreeBSD
native devices which support the v4l2 API from processes running within
the linuxulator, e.g. skype or flash can access the multimedia/pwcbsd
or multimedia/webcamd supplied drivers.
  
  MFC r221425:
  
Fix typo in comment, improve comment.
  
  MFC tested by:nox

Added:
  stable/8/sys/compat/linux/linux_videodev2.h
 - copied, changed from r221423, head/sys/compat/linux/linux_videodev2.h
  stable/8/sys/compat/linux/linux_videodev2_compat.h
 - copied unchanged from r221434, 
head/sys/compat/linux/linux_videodev2_compat.h
Modified:
  stable/8/sys/compat/linux/linux_ioctl.c
  stable/8/sys/compat/linux/linux_ioctl.h
  stable/8/sys/compat/linux/linux_videodev.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/compat/linux/linux_ioctl.c
==
--- stable/8/sys/compat/linux/linux_ioctl.c Fri Jun 10 06:11:33 2011
(r222913)
+++ stable/8/sys/compat/linux/linux_ioctl.c Fri Jun 10 07:54:38 2011
(r222914)
@@ -57,8 +57,12 @@ __FBSDID($FreeBSD$);
 #include sys/soundcard.h
 #include sys/stdint.h
 #include sys/sx.h
+#include sys/sysctl.h
 #include sys/tty.h
 #include sys/uio.h
+#include sys/types.h
+#include sys/mman.h
+#include sys/resourcevar.h
 
 #include net/if.h
 #include net/if_dl.h
@@ -81,8 +85,14 @@ __FBSDID($FreeBSD$);
 #include compat/linux/linux_videodev.h
 #include compat/linux/linux_videodev_compat.h
 
+#include compat/linux/linux_videodev2.h
+#include compat/linux/linux_videodev2_compat.h
+
 CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ);
 
+FEATURE(linuxulator_v4l, V4L ioctl wrapper support in the linuxulator);
+FEATURE(linuxulator_v4l2, V4L2 ioctl wrapper support in the linuxulator);
+
 static linux_ioctl_function_t linux_ioctl_cdrom;
 static linux_ioctl_function_t linux_ioctl_vfat;
 static linux_ioctl_function_t linux_ioctl_console;
@@ -95,6 +105,7 @@ static linux_ioctl_function_t linux_ioct
 static linux_ioctl_function_t linux_ioctl_drm;
 static linux_ioctl_function_t linux_ioctl_sg;
 static linux_ioctl_function_t linux_ioctl_v4l;
+static linux_ioctl_function_t linux_ioctl_v4l2;
 static linux_ioctl_function_t linux_ioctl_special;
 
 static struct linux_ioctl_handler cdrom_handler =
@@ -121,6 +132,8 @@ static struct linux_ioctl_handler sg_han
 { linux_ioctl_sg, LINUX_IOCTL_SG_MIN, LINUX_IOCTL_SG_MAX };
 static struct linux_ioctl_handler video_handler =
 { linux_ioctl_v4l, LINUX_IOCTL_VIDEO_MIN, LINUX_IOCTL_VIDEO_MAX };
+static struct linux_ioctl_handler video2_handler =
+{ linux_ioctl_v4l2, LINUX_IOCTL_VIDEO2_MIN, LINUX_IOCTL_VIDEO2_MAX };
 
 DATA_SET(linux_ioctl_handler_set, cdrom_handler);
 DATA_SET(linux_ioctl_handler_set, vfat_handler);
@@ -134,6 +147,7 @@ DATA_SET(linux_ioctl_handler_set, privat
 DATA_SET(linux_ioctl_handler_set, drm_handler);
 DATA_SET(linux_ioctl_handler_set, sg_handler);
 DATA_SET(linux_ioctl_handler_set, video_handler);
+DATA_SET(linux_ioctl_handler_set, video2_handler);
 
 struct handler_element
 {
@@ -2982,6 +2996,302 @@ linux_ioctl_special(struct thread *td, s
return (error);
 }
 
+static int
+linux_to_bsd_v4l2_standard(struct l_v4l2_standard *lvstd, struct v4l2_standard 
*vstd)
+{
+   vstd-index = lvstd-index;
+   vstd-id = lvstd-id;
+   memcpy(vstd-name, lvstd-name, sizeof(*lvstd) - offsetof(struct 
l_v4l2_standard, name));
+   return (0);
+}
+
+static int
+bsd_to_linux_v4l2_standard(struct v4l2_standard *vstd, struct l_v4l2_standard 
*lvstd)
+{
+   lvstd-index = vstd-index;
+   lvstd-id = vstd-id;
+   memcpy(lvstd-name, vstd-name, sizeof(*lvstd) - offsetof(struct 
l_v4l2_standard, name));
+   return (0);
+}
+
+static int
+linux_to_bsd_v4l2_buffer(struct l_v4l2_buffer *lvb, struct v4l2_buffer *vb)
+{
+   vb-index = lvb-index;
+   vb-type = lvb-type;
+   vb-bytesused = lvb-bytesused;
+   vb-flags = lvb-flags;
+   vb-field = lvb-field;
+   vb-timestamp.tv_sec = lvb-timestamp.tv_sec;
+   vb-timestamp.tv_usec = lvb-timestamp.tv_usec;
+   memcpy(vb-timecode, lvb-timecode, sizeof (lvb-timecode));
+   vb-sequence = lvb-sequence;
+   vb-memory = lvb-memory;
+   if (lvb-memory == V4L2_MEMORY_USERPTR)
+   /* possible pointer size conversion */
+   vb-m.userptr = (unsigned long)PTRIN(lvb-m.userptr);
+   else
+   vb-m.offset = lvb-m.offset;
+   vb-length = lvb-length;
+   vb-input = lvb-input;
+   vb-reserved = lvb-reserved;
+   return (0);
+}
+

svn commit: r222857 - stable/8/etc/periodic/daily

[Alexander Leidinger]

Author: netchild
Date: Wed Jun  8 11:36:06 2011
New Revision: 222857
URL: http://svn.freebsd.org/changeset/base/222857

Log:
  MFC r221430:
Use proper return codes (valuable output, invalid config, problems).

Modified:
  stable/8/etc/periodic/daily/800.scrub-zfs
Directory Properties:
  stable/8/etc/periodic/   (props changed)

Modified: stable/8/etc/periodic/daily/800.scrub-zfs
==
--- stable/8/etc/periodic/daily/800.scrub-zfs   Wed Jun  8 10:59:36 2011
(r222856)
+++ stable/8/etc/periodic/daily/800.scrub-zfs   Wed Jun  8 11:36:06 2011
(r222857)
@@ -26,10 +26,12 @@ case $daily_scrub_zfs_enable in
daily_scrub_zfs_pools=$(zpool list -H -o name)
fi
 
+   rc=0
for pool in ${daily_scrub_zfs_pools}; do
# sanity check
_status=$(zpool list ${pool} 2 /dev/null)
if [ $? -ne 0 ]; then
+   rc=2
echoWARNING: pool '${pool}' specified in
echo 
'/etc/periodic.conf:daily_scrub_zfs_pools'
echo does not exist
@@ -38,13 +40,11 @@ case $daily_scrub_zfs_enable in
_status=${_status##*$newline}
case ${_status} in
*FAULTED*)
+   rc=3
echo Skipping faulted pool: ${pool}
continue ;;
esac
 
-   # successful only if there is at least one pool to scrub
-   rc=0
-
# determine how many days shall be between scrubs
eval _pool_threshold=\${daily_scrub_zfs_${pool}_threshold}
if [ -z ${_pool_threshold} ];then
@@ -77,10 +77,12 @@ case $daily_scrub_zfs_enable in
*none requested*)
echostarting first scrub (since reboot) of 
pool '${pool}':
zpool scrub ${pool}
+   [ $rc -eq 0 ]  rc=1
;;
*)
echostarting scrub of pool '${pool}':
zpool scrub ${pool}
+   [ $rc -eq 0 ]  rc=1
;;
esac
 
___
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: r222272 - in head/sys: netinet netinet6

[Alexander Leidinger]

Quoting Bjoern A. Zeeb b...@freebsd.org (from Wed, 25 May 2011  
00:34:25 + (UTC)):



Author: bz
Date: Wed May 25 00:34:25 2011
New Revision: 72
URL: http://svn.freebsd.org/changeset/base/72

Log:
  Add FEATURE() definitions for IPv4 and IPv6 so that we can use
  feature_present(3) to dynamically decide whether to use one or the
  other family.


Any estimate when you can get to the network related FEATURE macros  
I've send to you (those which where produced during GSoC 2010 by  
kibab@)? When all are in, I have a final oommit to do for the userland  
application which can query them (including the masking of existing  
features feature).


Or do you prefer that I ask on net@ for a review of the network  
related feature macros?



  Reviewed by:  gnn
  Sponsored by: The FreeBSD Foundation
  Sponsored by: iXsystems
  MFC after:10 days


Bye,
Alexander.

--
We don't really understand it, so we'll give it to the programmers.

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r221421 - vendor/v4l/dist

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 08:21:24 2011
New Revision: 221421
URL: http://svn.freebsd.org/changeset/base/221421

Log:
  Add the v4l2 header now that we have an use case for it.

Added:
  vendor/v4l/dist/videodev2.h   (contents, props changed)

Added: vendor/v4l/dist/videodev2.h
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/v4l/dist/videodev2.h Wed May  4 08:21:24 2011(r221421)
@@ -0,0 +1,1164 @@
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
+/*
+ * Video for Linux Two
+ *
+ * Header file for v4l or V4L2 drivers and applications, for
+ * Linux kernels 2.2.x or 2.4.x.
+ *
+ * See http://bytesex.org/v4l/ for API specs and other
+ * v4l2 documentation.
+ *
+ * Author: Bill Dirks bdi...@pacbell.net
+ * Justin Schoeman
+ * et al.
+ */
+#ifdef __KERNEL__
+#include linux/time.h /* need struct timeval */
+#include linux/poll.h
+#include linux/device.h
+#include linux/mutex.h
+#endif
+#include linux/compiler.h /* need __user */
+
+
+#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.17 */
+#define HAVE_V4L2 1
+
+/*
+ * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
+ */
+
+#define VIDEO_MAX_FRAME   32
+
+#define VID_TYPE_CAPTURE   1   /* Can capture */
+#define VID_TYPE_TUNER 2   /* Can tune */
+#define VID_TYPE_TELETEXT  4   /* Does teletext */
+#define VID_TYPE_OVERLAY   8   /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY 16  /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING  32  /* Can clip */
+#define VID_TYPE_FRAMERAM  64  /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES128 /* Scalable */
+#define VID_TYPE_MONOCHROME256 /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE512 /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER  1024/* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER  2048/* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096/* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192/* Can encode MJPEG streams */
+
+#ifdef __KERNEL__
+
+/* Minor device allocation */
+#define MINOR_VFL_TYPE_GRABBER_MIN   0
+#define MINOR_VFL_TYPE_GRABBER_MAX  63
+#define MINOR_VFL_TYPE_RADIO_MIN64
+#define MINOR_VFL_TYPE_RADIO_MAX   127
+#define MINOR_VFL_TYPE_VTX_MIN 192
+#define MINOR_VFL_TYPE_VTX_MAX 223
+#define MINOR_VFL_TYPE_VBI_MIN 224
+#define MINOR_VFL_TYPE_VBI_MAX 255
+
+#define VFL_TYPE_GRABBER   0
+#define VFL_TYPE_VBI   1
+#define VFL_TYPE_RADIO 2
+#define VFL_TYPE_VTX   3
+
+struct video_device
+{
+   /* device info */
+   struct device *dev;
+   char name[32];
+   int type;   /* v4l1 */
+   int type2;  /* v4l2 */
+   int hardware;
+   int minor;
+
+   /* device ops + callbacks */
+   const struct file_operations *fops;
+   void (*release)(struct video_device *vfd);
+
+
+#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
+   /* obsolete -- fops-owner is used instead */
+   struct module *owner;
+   /* dev-driver_data will be used instead some day.
+* Use the video_{get|set}_drvdata() helper functions,
+* so the switch over will be transparent for you.
+* Or use {pci|usb}_{get|set}_drvdata() directly. */
+   void *priv;
+#endif
+
+   /* for videodev.c intenal usage -- please don't touch */
+   int users; /* video_exclusive_{open|close} ... */
+   struct mutex lock; /* ... helper function uses these   */
+   char devfs_name[64];   /* devfs */
+   struct class_device class_dev; /* sysfs */
+};
+
+#define VIDEO_MAJOR81
+
+extern int video_register_device(struct video_device *, int type, int nr);
+extern void video_unregister_device(struct video_device *);
+extern int video_usercopy(struct inode *inode, struct file *file,
+ unsigned int cmd, unsigned long arg,
+ int (*func)(struct inode *inode, struct file *file,
+ unsigned int cmd, void *arg));
+
+/* helper functions to alloc / release struct video_device, the
+   later can be used for video_device-release() */
+struct video_device *video_device_alloc(void);
+void video_device_release(struct video_device *vfd);
+
+#endif
+
+/*
+ * M I S C E L L A N E O U S
+ */
+
+/*  Four-character-code (FOURCC) */
+#define v4l2_fourcc(a,b,c,d)\
+   (((__u32)(a)0)|((__u32)(b)8)|((__u32)(c)16)|((__u32)(d)24))
+
+/*
+ * E N U M S
+ */
+enum v4l2_field {
+   V4L2_FIELD_ANY= 0, /* driver can choose from none,
+ top, bottom, interlaced
+ depending on whatever it thinks
+ 

svn commit: r221422 - vendor/v4l/2.6.17

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 08:22:58 2011
New Revision: 221422
URL: http://svn.freebsd.org/changeset/base/221422

Log:
  Tag the v4l2 header with the linux kernel version where I took it from.

Added:
  vendor/v4l/2.6.17/videodev2.h
 - copied unchanged from r221421, vendor/v4l/dist/videodev2.h

Copied: vendor/v4l/2.6.17/videodev2.h (from r221421, 
vendor/v4l/dist/videodev2.h)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ vendor/v4l/2.6.17/videodev2.h   Wed May  4 08:22:58 2011
(r221422, copy of r221421, vendor/v4l/dist/videodev2.h)
@@ -0,0 +1,1164 @@
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
+/*
+ * Video for Linux Two
+ *
+ * Header file for v4l or V4L2 drivers and applications, for
+ * Linux kernels 2.2.x or 2.4.x.
+ *
+ * See http://bytesex.org/v4l/ for API specs and other
+ * v4l2 documentation.
+ *
+ * Author: Bill Dirks bdi...@pacbell.net
+ * Justin Schoeman
+ * et al.
+ */
+#ifdef __KERNEL__
+#include linux/time.h /* need struct timeval */
+#include linux/poll.h
+#include linux/device.h
+#include linux/mutex.h
+#endif
+#include linux/compiler.h /* need __user */
+
+
+#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.17 */
+#define HAVE_V4L2 1
+
+/*
+ * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
+ */
+
+#define VIDEO_MAX_FRAME   32
+
+#define VID_TYPE_CAPTURE   1   /* Can capture */
+#define VID_TYPE_TUNER 2   /* Can tune */
+#define VID_TYPE_TELETEXT  4   /* Does teletext */
+#define VID_TYPE_OVERLAY   8   /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY 16  /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING  32  /* Can clip */
+#define VID_TYPE_FRAMERAM  64  /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES128 /* Scalable */
+#define VID_TYPE_MONOCHROME256 /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE512 /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER  1024/* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER  2048/* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096/* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192/* Can encode MJPEG streams */
+
+#ifdef __KERNEL__
+
+/* Minor device allocation */
+#define MINOR_VFL_TYPE_GRABBER_MIN   0
+#define MINOR_VFL_TYPE_GRABBER_MAX  63
+#define MINOR_VFL_TYPE_RADIO_MIN64
+#define MINOR_VFL_TYPE_RADIO_MAX   127
+#define MINOR_VFL_TYPE_VTX_MIN 192
+#define MINOR_VFL_TYPE_VTX_MAX 223
+#define MINOR_VFL_TYPE_VBI_MIN 224
+#define MINOR_VFL_TYPE_VBI_MAX 255
+
+#define VFL_TYPE_GRABBER   0
+#define VFL_TYPE_VBI   1
+#define VFL_TYPE_RADIO 2
+#define VFL_TYPE_VTX   3
+
+struct video_device
+{
+   /* device info */
+   struct device *dev;
+   char name[32];
+   int type;   /* v4l1 */
+   int type2;  /* v4l2 */
+   int hardware;
+   int minor;
+
+   /* device ops + callbacks */
+   const struct file_operations *fops;
+   void (*release)(struct video_device *vfd);
+
+
+#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
+   /* obsolete -- fops-owner is used instead */
+   struct module *owner;
+   /* dev-driver_data will be used instead some day.
+* Use the video_{get|set}_drvdata() helper functions,
+* so the switch over will be transparent for you.
+* Or use {pci|usb}_{get|set}_drvdata() directly. */
+   void *priv;
+#endif
+
+   /* for videodev.c intenal usage -- please don't touch */
+   int users; /* video_exclusive_{open|close} ... */
+   struct mutex lock; /* ... helper function uses these   */
+   char devfs_name[64];   /* devfs */
+   struct class_device class_dev; /* sysfs */
+};
+
+#define VIDEO_MAJOR81
+
+extern int video_register_device(struct video_device *, int type, int nr);
+extern void video_unregister_device(struct video_device *);
+extern int video_usercopy(struct inode *inode, struct file *file,
+ unsigned int cmd, unsigned long arg,
+ int (*func)(struct inode *inode, struct file *file,
+ unsigned int cmd, void *arg));
+
+/* helper functions to alloc / release struct video_device, the
+   later can be used for video_device-release() */
+struct video_device *video_device_alloc(void);
+void video_device_release(struct video_device *vfd);
+
+#endif
+
+/*
+ * M I S C E L L A N E O U S
+ */
+
+/*  Four-character-code (FOURCC) */
+#define v4l2_fourcc(a,b,c,d)\
+   (((__u32)(a)0)|((__u32)(b)8)|((__u32)(c)16)|((__u32)(d)24))
+
+/*
+ * E N U M S
+ */
+enum v4l2_field {
+   V4L2_FIELD_ANY= 0, /* driver can choose from none,
+

svn commit: r221423 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 08:31:58 2011
New Revision: 221423
URL: http://svn.freebsd.org/changeset/base/221423

Log:
  Copy the v4l2 header unchanged from the vendor branch.

Added:
  head/sys/compat/linux/linux_videodev2.h
 - copied unchanged from r221422, vendor/v4l/dist/videodev2.h

Copied: head/sys/compat/linux/linux_videodev2.h (from r221422, 
vendor/v4l/dist/videodev2.h)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/compat/linux/linux_videodev2.h Wed May  4 08:31:58 2011
(r221423, copy of r221422, vendor/v4l/dist/videodev2.h)
@@ -0,0 +1,1164 @@
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
+/*
+ * Video for Linux Two
+ *
+ * Header file for v4l or V4L2 drivers and applications, for
+ * Linux kernels 2.2.x or 2.4.x.
+ *
+ * See http://bytesex.org/v4l/ for API specs and other
+ * v4l2 documentation.
+ *
+ * Author: Bill Dirks bdi...@pacbell.net
+ * Justin Schoeman
+ * et al.
+ */
+#ifdef __KERNEL__
+#include linux/time.h /* need struct timeval */
+#include linux/poll.h
+#include linux/device.h
+#include linux/mutex.h
+#endif
+#include linux/compiler.h /* need __user */
+
+
+#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.17 */
+#define HAVE_V4L2 1
+
+/*
+ * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
+ */
+
+#define VIDEO_MAX_FRAME   32
+
+#define VID_TYPE_CAPTURE   1   /* Can capture */
+#define VID_TYPE_TUNER 2   /* Can tune */
+#define VID_TYPE_TELETEXT  4   /* Does teletext */
+#define VID_TYPE_OVERLAY   8   /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY 16  /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING  32  /* Can clip */
+#define VID_TYPE_FRAMERAM  64  /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES128 /* Scalable */
+#define VID_TYPE_MONOCHROME256 /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE512 /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER  1024/* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER  2048/* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096/* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192/* Can encode MJPEG streams */
+
+#ifdef __KERNEL__
+
+/* Minor device allocation */
+#define MINOR_VFL_TYPE_GRABBER_MIN   0
+#define MINOR_VFL_TYPE_GRABBER_MAX  63
+#define MINOR_VFL_TYPE_RADIO_MIN64
+#define MINOR_VFL_TYPE_RADIO_MAX   127
+#define MINOR_VFL_TYPE_VTX_MIN 192
+#define MINOR_VFL_TYPE_VTX_MAX 223
+#define MINOR_VFL_TYPE_VBI_MIN 224
+#define MINOR_VFL_TYPE_VBI_MAX 255
+
+#define VFL_TYPE_GRABBER   0
+#define VFL_TYPE_VBI   1
+#define VFL_TYPE_RADIO 2
+#define VFL_TYPE_VTX   3
+
+struct video_device
+{
+   /* device info */
+   struct device *dev;
+   char name[32];
+   int type;   /* v4l1 */
+   int type2;  /* v4l2 */
+   int hardware;
+   int minor;
+
+   /* device ops + callbacks */
+   const struct file_operations *fops;
+   void (*release)(struct video_device *vfd);
+
+
+#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
+   /* obsolete -- fops-owner is used instead */
+   struct module *owner;
+   /* dev-driver_data will be used instead some day.
+* Use the video_{get|set}_drvdata() helper functions,
+* so the switch over will be transparent for you.
+* Or use {pci|usb}_{get|set}_drvdata() directly. */
+   void *priv;
+#endif
+
+   /* for videodev.c intenal usage -- please don't touch */
+   int users; /* video_exclusive_{open|close} ... */
+   struct mutex lock; /* ... helper function uses these   */
+   char devfs_name[64];   /* devfs */
+   struct class_device class_dev; /* sysfs */
+};
+
+#define VIDEO_MAJOR81
+
+extern int video_register_device(struct video_device *, int type, int nr);
+extern void video_unregister_device(struct video_device *);
+extern int video_usercopy(struct inode *inode, struct file *file,
+ unsigned int cmd, unsigned long arg,
+ int (*func)(struct inode *inode, struct file *file,
+ unsigned int cmd, void *arg));
+
+/* helper functions to alloc / release struct video_device, the
+   later can be used for video_device-release() */
+struct video_device *video_device_alloc(void);
+void video_device_release(struct video_device *vfd);
+
+#endif
+
+/*
+ * M I S C E L L A N E O U S
+ */
+
+/*  Four-character-code (FOURCC) */
+#define v4l2_fourcc(a,b,c,d)\
+   (((__u32)(a)0)|((__u32)(b)8)|((__u32)(c)16)|((__u32)(d)24))
+
+/*
+ * E N U M S
+ */
+enum v4l2_field {
+   V4L2_FIELD_ANY= 0, /* driver can choose from none,
+ 

svn commit: r221424 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 08:41:55 2011
New Revision: 221424
URL: http://svn.freebsd.org/changeset/base/221424

Log:
  Add explanation about the use-permission and FreeBSDify it.

Modified:
  head/sys/compat/linux/linux_videodev2.h

Modified: head/sys/compat/linux/linux_videodev2.h
==
--- head/sys/compat/linux/linux_videodev2.h Wed May  4 08:31:58 2011
(r221423)
+++ head/sys/compat/linux/linux_videodev2.h Wed May  4 08:41:55 2011
(r221424)
@@ -1,3 +1,12 @@
+/*
+ * This header comes from linux, but it has no license. The author
+ * (Bill Dirks) gave explicit permissions to use it in FreeBSD.
+ * The FreeBSD vendor branch for v4l gives a more detailed description
+ * about this in the README.
+ *
+ * $FreeBSD$
+ */
+
 #ifndef __LINUX_VIDEODEV2_H
 #define __LINUX_VIDEODEV2_H
 /*
@@ -13,6 +22,11 @@
  * Justin Schoeman
  * et al.
  */
+#ifdef __FreeBSD__
+#define __user
+typedef uint64_t   __u64;
+typedef int64_t__s64;
+#else
 #ifdef __KERNEL__
 #include linux/time.h /* need struct timeval */
 #include linux/poll.h
@@ -20,6 +34,7 @@
 #include linux/mutex.h
 #endif
 #include linux/compiler.h /* need __user */
+#endif
 
 
 #define OBSOLETE_OWNER 1 /* It will be removed for 2.6.17 */
___
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: r221425 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 08:42:31 2011
New Revision: 221425
URL: http://svn.freebsd.org/changeset/base/221425

Log:
  Fix typo in comment, improve comment.

Modified:
  head/sys/compat/linux/linux_videodev.h

Modified: head/sys/compat/linux/linux_videodev.h
==
--- head/sys/compat/linux/linux_videodev.h  Wed May  4 08:41:55 2011
(r221424)
+++ head/sys/compat/linux/linux_videodev.h  Wed May  4 08:42:31 2011
(r221425)
@@ -1,8 +1,8 @@
 /*
  * This header comes from linux, but it has no license. The author
  * (Alan Cox @ Redhat) gave explicit permissions to use it in FreeBSD.
- * The freeBSD vendor branch for v4l gives a more detailed description
- * about this.
+ * The FreeBSD vendor branch for v4l gives a more detailed description
+ * about this in the README.
  *
  * $FreeBSD$
  */
___
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: r221426 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 09:05:39 2011
New Revision: 221426
URL: http://svn.freebsd.org/changeset/base/221426

Log:
  This is v4l2 support for the linuxulator. This allows to access FreeBSD
  native devices which support the v4l2 API from processes running within
  the linuxulator, e.g. skype or flash can access the multimedia/pwcbsd
  or multimedia/webcamd supplied drivers.
  
  Submitted by: nox
  MFC after:1 month

Modified:
  head/sys/compat/linux/linux_ioctl.c
  head/sys/compat/linux/linux_ioctl.h

Modified: head/sys/compat/linux/linux_ioctl.c
==
--- head/sys/compat/linux/linux_ioctl.c Wed May  4 08:42:31 2011
(r221425)
+++ head/sys/compat/linux/linux_ioctl.c Wed May  4 09:05:39 2011
(r221426)
@@ -59,6 +59,9 @@ __FBSDID($FreeBSD$);
 #include sys/sx.h
 #include sys/tty.h
 #include sys/uio.h
+#include sys/types.h
+#include sys/mman.h
+#include sys/resourcevar.h
 
 #include net/if.h
 #include net/if_dl.h
@@ -83,6 +86,9 @@ __FBSDID($FreeBSD$);
 #include compat/linux/linux_videodev.h
 #include compat/linux/linux_videodev_compat.h
 
+#include compat/linux/linux_videodev2.h
+#include compat/linux/linux_videodev2_compat.h
+
 CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ);
 
 static linux_ioctl_function_t linux_ioctl_cdrom;
@@ -97,6 +103,7 @@ static linux_ioctl_function_t linux_ioct
 static linux_ioctl_function_t linux_ioctl_drm;
 static linux_ioctl_function_t linux_ioctl_sg;
 static linux_ioctl_function_t linux_ioctl_v4l;
+static linux_ioctl_function_t linux_ioctl_v4l2;
 static linux_ioctl_function_t linux_ioctl_special;
 static linux_ioctl_function_t linux_ioctl_fbsd_usb;
 
@@ -124,6 +131,8 @@ static struct linux_ioctl_handler sg_han
 { linux_ioctl_sg, LINUX_IOCTL_SG_MIN, LINUX_IOCTL_SG_MAX };
 static struct linux_ioctl_handler video_handler =
 { linux_ioctl_v4l, LINUX_IOCTL_VIDEO_MIN, LINUX_IOCTL_VIDEO_MAX };
+static struct linux_ioctl_handler video2_handler =
+{ linux_ioctl_v4l2, LINUX_IOCTL_VIDEO2_MIN, LINUX_IOCTL_VIDEO2_MAX };
 static struct linux_ioctl_handler fbsd_usb =
 { linux_ioctl_fbsd_usb, FBSD_LUSB_MIN, FBSD_LUSB_MAX };
 
@@ -139,6 +148,7 @@ DATA_SET(linux_ioctl_handler_set, privat
 DATA_SET(linux_ioctl_handler_set, drm_handler);
 DATA_SET(linux_ioctl_handler_set, sg_handler);
 DATA_SET(linux_ioctl_handler_set, video_handler);
+DATA_SET(linux_ioctl_handler_set, video2_handler);
 DATA_SET(linux_ioctl_handler_set, fbsd_usb);
 
 struct handler_element
@@ -2988,6 +2998,302 @@ linux_ioctl_special(struct thread *td, s
return (error);
 }
 
+static int
+linux_to_bsd_v4l2_standard(struct l_v4l2_standard *lvstd, struct v4l2_standard 
*vstd)
+{
+   vstd-index = lvstd-index;
+   vstd-id = lvstd-id;
+   memcpy(vstd-name, lvstd-name, sizeof(*lvstd) - offsetof(struct 
l_v4l2_standard, name));
+   return (0);
+}
+
+static int
+bsd_to_linux_v4l2_standard(struct v4l2_standard *vstd, struct l_v4l2_standard 
*lvstd)
+{
+   lvstd-index = vstd-index;
+   lvstd-id = vstd-id;
+   memcpy(lvstd-name, vstd-name, sizeof(*lvstd) - offsetof(struct 
l_v4l2_standard, name));
+   return (0);
+}
+
+static int
+linux_to_bsd_v4l2_buffer(struct l_v4l2_buffer *lvb, struct v4l2_buffer *vb)
+{
+   vb-index = lvb-index;
+   vb-type = lvb-type;
+   vb-bytesused = lvb-bytesused;
+   vb-flags = lvb-flags;
+   vb-field = lvb-field;
+   vb-timestamp.tv_sec = lvb-timestamp.tv_sec;
+   vb-timestamp.tv_usec = lvb-timestamp.tv_usec;
+   memcpy(vb-timecode, lvb-timecode, sizeof (lvb-timecode));
+   vb-sequence = lvb-sequence;
+   vb-memory = lvb-memory;
+   if (lvb-memory == V4L2_MEMORY_USERPTR)
+   /* possible pointer size conversion */
+   vb-m.userptr = (unsigned long)PTRIN(lvb-m.userptr);
+   else
+   vb-m.offset = lvb-m.offset;
+   vb-length = lvb-length;
+   vb-input = lvb-input;
+   vb-reserved = lvb-reserved;
+   return (0);
+}
+
+static int
+bsd_to_linux_v4l2_buffer(struct v4l2_buffer *vb, struct l_v4l2_buffer *lvb)
+{
+   lvb-index = vb-index;
+   lvb-type = vb-type;
+   lvb-bytesused = vb-bytesused;
+   lvb-flags = vb-flags;
+   lvb-field = vb-field;
+   lvb-timestamp.tv_sec = vb-timestamp.tv_sec;
+   lvb-timestamp.tv_usec = vb-timestamp.tv_usec;
+   memcpy(lvb-timecode, vb-timecode, sizeof (vb-timecode));
+   lvb-sequence = vb-sequence;
+   lvb-memory = vb-memory;
+   if (vb-memory == V4L2_MEMORY_USERPTR)
+   /* possible pointer size conversion */
+   lvb-m.userptr = PTROUT(vb-m.userptr);
+   else
+   lvb-m.offset = vb-m.offset;
+   lvb-length = vb-length;
+   lvb-input = vb-input;
+   lvb-reserved = vb-reserved;
+   return (0);
+}
+
+static int
+linux_to_bsd_v4l2_format(struct l_v4l2_format *lvf, struct v4l2_format *vf)
+{
+   vf-type = lvf-type;
+   if (lvf-type == V4L2_BUF_TYPE_VIDEO_OVERLAY

svn commit: r221428 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 09:52:34 2011
New Revision: 221428
URL: http://svn.freebsd.org/changeset/base/221428

Log:
  Add FEATURE macros for v4l and v4l2 to the linuxulator.
  
  Suggested by: ae

Modified:
  head/sys/compat/linux/linux_ioctl.c

Modified: head/sys/compat/linux/linux_ioctl.c
==
--- head/sys/compat/linux/linux_ioctl.c Wed May  4 09:26:33 2011
(r221427)
+++ head/sys/compat/linux/linux_ioctl.c Wed May  4 09:52:34 2011
(r221428)
@@ -57,6 +57,7 @@ __FBSDID($FreeBSD$);
 #include sys/soundcard.h
 #include sys/stdint.h
 #include sys/sx.h
+#include sys/sysctl.h
 #include sys/tty.h
 #include sys/uio.h
 #include sys/types.h
@@ -91,6 +92,9 @@ __FBSDID($FreeBSD$);
 
 CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ);
 
+FEATURE(linuxulator_v4l, V4L ioctl wrapper support in the linuxulator);
+FEATURE(linuxulator_v4l2, V4L2 ioctl wrapper support in the linuxulator);
+
 static linux_ioctl_function_t linux_ioctl_cdrom;
 static linux_ioctl_function_t linux_ioctl_vfat;
 static linux_ioctl_function_t linux_ioctl_console;
___
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: r221430 - head/etc/periodic/daily

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 12:37:10 2011
New Revision: 221430
URL: http://svn.freebsd.org/changeset/base/221430

Log:
  Use proper return codes (valuable output, invalid config, problems).
  
  MFC after:1 week

Modified:
  head/etc/periodic/daily/800.scrub-zfs

Modified: head/etc/periodic/daily/800.scrub-zfs
==
--- head/etc/periodic/daily/800.scrub-zfs   Wed May  4 11:22:52 2011
(r221429)
+++ head/etc/periodic/daily/800.scrub-zfs   Wed May  4 12:37:10 2011
(r221430)
@@ -26,10 +26,12 @@ case $daily_scrub_zfs_enable in
daily_scrub_zfs_pools=$(zpool list -H -o name)
fi
 
+   rc=0
for pool in ${daily_scrub_zfs_pools}; do
# sanity check
_status=$(zpool list ${pool} 2 /dev/null)
if [ $? -ne 0 ]; then
+   rc=2
echoWARNING: pool '${pool}' specified in
echo 
'/etc/periodic.conf:daily_scrub_zfs_pools'
echo does not exist
@@ -38,13 +40,11 @@ case $daily_scrub_zfs_enable in
_status=${_status##*$newline}
case ${_status} in
*FAULTED*)
+   rc=3
echo Skipping faulted pool: ${pool}
continue ;;
esac
 
-   # successful only if there is at least one pool to scrub
-   rc=0
-
# determine how many days shall be between scrubs
eval _pool_threshold=\${daily_scrub_zfs_${pool}_threshold}
if [ -z ${_pool_threshold} ];then
@@ -77,10 +77,12 @@ case $daily_scrub_zfs_enable in
*none requested*)
echostarting first scrub (since reboot) of 
pool '${pool}':
zpool scrub ${pool}
+   [ $rc -eq 0 ]  rc=1
;;
*)
echostarting scrub of pool '${pool}':
zpool scrub ${pool}
+   [ $rc -eq 0 ]  rc=1
;;
esac
 
___
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: r221432 - head/etc/periodic/daily

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 12:48:02 2011
New Revision: 221432
URL: http://svn.freebsd.org/changeset/base/221432

Log:
  The security run requests unmaskable output, even if the only output is to
  tell that there is a separate email or that the output is logged to a file.
  
  This commit changes the return code for the non-inline case to tell that
  this message is not important enough and can be masked if necessary. The
  messages from the security checks themself are not affected by this and
  show up as before in the periodic security email/file.
  
  The inline case still requests to not mask the output, as with the current
  way of handling this there is no easy way to handle this.
  
  PR:   138692
  Analysis/patch atch by:   Chris Cowart ccow...@timesinks.net
  X-MFC after:  on request

Modified:
  head/etc/periodic/daily/450.status-security

Modified: head/etc/periodic/daily/450.status-security
==
--- head/etc/periodic/daily/450.status-security Wed May  4 12:44:46 2011
(r221431)
+++ head/etc/periodic/daily/450.status-security Wed May  4 12:48:02 2011
(r221432)
@@ -23,16 +23,17 @@ case $daily_status_security_enable in
export security_output=${daily_status_security_output}
case ${daily_status_security_output} in
)
-   ;;
+   rc=3;;
/*)
-   echo (output logged separately);;
+   echo (output logged separately)
+   rc=0;;
*)
-   echo (output mailed separately);;
+   echo (output mailed separately)
+   rc=0;;
esac;;
esac
 
-   periodic security
-   rc=3;;
+   periodic security || rc=3;;
 
 *)  rc=0;;
 esac
___
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: r221434 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Wed May  4 13:09:20 2011
New Revision: 221434
URL: http://svn.freebsd.org/changeset/base/221434

Log:
  Commit the missing linux_videdev2_compat.h (lost somewhere between
  commit tree patch generation - successful compile tree build test - 
commmit).
  
  Pointy hat to:netchild

Added:
  head/sys/compat/linux/linux_videodev2_compat.h   (contents, props changed)

Added: head/sys/compat/linux/linux_videodev2_compat.h
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/compat/linux/linux_videodev2_compat.h  Wed May  4 13:09:20 
2011(r221434)
@@ -0,0 +1,137 @@
+/*
+ * $FreeBSD$
+ */
+
+/*
+ * This file defines compatibility versions of several video structures
+ * defined in the Linux videodev2.h header (linux_videodev2.h).  The
+ * structures defined in this file are the ones that have been determined
+ * to have 32- to 64-bit size dependencies.
+ */
+
+#ifndef _LINUX_VIDEODEV2_COMPAT_H_
+#define_LINUX_VIDEODEV2_COMPAT_H_
+
+struct l_v4l2_buffer {
+   uint32_tindex;
+   enum v4l2_buf_type  type;
+   uint32_tbytesused;
+   uint32_tflags;
+   enum v4l2_field field;
+   l_timeval   timestamp;
+   struct v4l2_timecodetimecode;
+   uint32_tsequence;
+
+   /* memory location */
+   enum v4l2_memorymemory;
+   union {
+   uint32_toffset;
+   l_ulong userptr;
+   } m;
+   uint32_tlength;
+   uint32_tinput;
+   uint32_treserved;
+};
+
+struct l_v4l2_framebuffer {
+   uint32_tcapability;
+   uint32_tflags;
+/* FIXME: in theory we should pass something like PCI device + memory
+ * region + offset instead of some physical address */
+   l_uintptr_t base;
+   struct v4l2_pix_format  fmt;
+};
+
+struct l_v4l2_clip {
+   struct v4l2_rectc;
+   l_uintptr_t next;
+};
+
+struct l_v4l2_window {
+   struct v4l2_rectw;
+   enum v4l2_field field;
+   uint32_tchromakey;
+   l_uintptr_t clips;
+   uint32_tclipcount;
+   l_uintptr_t bitmap;
+   uint8_t global_alpha;
+};
+
+struct l_v4l2_standard {
+   uint32_tindex;
+   v4l2_std_id id;
+   uint8_t name[24];
+   struct v4l2_fract   frameperiod; /* Frames, not fields */
+   uint32_tframelines;
+   uint32_treserved[4];
+}
+#ifdef COMPAT_LINUX32 /* 32bit linuxolator */
+__attribute__ ((packed))
+#endif
+;
+
+struct l_v4l2_ext_control {
+   uint32_t id;
+   uint32_t size;
+   uint32_t reserved2[1];
+   union {
+   int32_t value;
+   int64_t value64;
+   l_uintptr_t string;
+   } u;
+} __attribute__ ((packed));
+
+struct l_v4l2_ext_controls {
+   uint32_t ctrl_class;
+   uint32_t count;
+   uint32_t error_idx;
+   uint32_t reserved[2];
+   l_uintptr_t controls;
+};
+
+struct l_v4l2_format {
+   enum v4l2_buf_type type;
+   union {
+   struct v4l2_pix_format  pix; /* 
V4L2_BUF_TYPE_VIDEO_CAPTURE */
+   struct l_v4l2_windowwin; /* 
V4L2_BUF_TYPE_VIDEO_OVERLAY */
+   struct v4l2_vbi_format  vbi; /* 
V4L2_BUF_TYPE_VBI_CAPTURE */
+   struct v4l2_sliced_vbi_format   sliced;  /* 
V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
+   uint8_t raw_data[200];   /* user-defined */
+   } fmt;
+}
+#ifdef COMPAT_LINUX32 /* 32bit linuxolator */
+__attribute__ ((packed))
+#endif
+;
+
+#ifdef VIDIOC_DQEVENT
+struct l_v4l2_event {
+   uint32_ttype;
+   union {
+   struct v4l2_event_vsync vsync;
+   uint8_t data[64];
+   } u;
+   uint32_tpending;
+   uint32_tsequence;
+   struct l_timespec   timestamp;
+   uint32_treserved[9];
+};
+#endif
+
+struct l_v4l2_input {
+   uint32_t index; /*  Which input */
+   uint8_t  name[32];  /*  Label */
+   uint32_t type;  /*  Type of input */
+   uint32_t audioset;  /*  Associated audios 
(bitfield) */
+   uint32_t tuner; /*  Associated tuner */
+   v4l2_std_id  std;
+   uint32_t status;
+   uint32_t capabilities;
+   uint32_t reserved[3];
+}
+#ifdef COMPAT_LINUX32 /* 32bit linuxolator */

Re: svn commit: r221426 - head/sys/compat/linux

[Alexander Leidinger]

Quoting Ivan Klymenko fi...@ukr.net (from Wed, 4 May 2011 14:32:20 +0300):


...
/usr/src/sys/modules/linux/../../compat/linux/linux_ioctl.c:91:49:  
error: compat/linux/linux_videodev2_compat.h: No such file or  
directory

...


Fixed.

Thanks,
Alexander.


--
http://www.Leidinger.net  Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org  : PGP ID = 72077137
In every hierarchy the cream rises until it sours.
-- Dr. Laurence J. Peter

___
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: r221348 - head/sys/boot/i386/boot2

[Alexander Leidinger]

Quoting Roman Divacky rdiva...@freebsd.org (from Tue, 3 May 2011  
15:39:27 +0200):



With the recent libobjc removal this means that we can compile
all (no exceptions) of FreeBSD/{i386,amd64} with clang.

Quite a milestone in my opinion :)


Newsflash?

Bye,
Alexander.

--
Alas, how love can trifle with itself!
-- William Shakespeare, The Two Gentlemen of Verona

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r219666 - stable/8/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Tue Mar 15 13:19:26 2011
New Revision: 219666
URL: http://svn.freebsd.org/changeset/base/219666

Log:
  MFC r218497:
Linux' shm_open() fails because it wants to find some funky shmfs
to construct the full pathname. It starts to search at the default
mountpoint which is /dev/shm. If this fails it runs through fstab
and searches for shmfs and tmpfs. Whatever it finds will be
statfs()'ed to be checked for Linux' fs magic for shmfs (0x01021994).
  
Ideally our tmpfs should deliver this fs magic to Linux processes, but
as our tmpfs is considered to be an experimental feature we can not
assume that there is always a tmpfs available.
  
To make shared memory work in the Linuxulator, force the fs type of
/dev/shm (which can be a symlink) to match what Linux expects. The user
is responsible (info has to be added to the linux base ports and the docs)
to setup a suitable link for /dev/shm.
  
Noticed by:Andre Albsmeier andre.albsme...@siemens.com
Submitted by:  Andre Albsmeier andre.albsme...@siemens.com

Modified:
  stable/8/sys/compat/linux/linux_stats.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/compat/linux/linux_stats.c
==
--- stable/8/sys/compat/linux/linux_stats.c Tue Mar 15 12:24:40 2011
(r219665)
+++ stable/8/sys/compat/linux/linux_stats.c Tue Mar 15 13:19:26 2011
(r219666)
@@ -60,6 +60,8 @@ __FBSDID($FreeBSD$);
 
 #include security/mac/mac_framework.h
 
+#defineLINUX_SHMFS_MAGIC 0x01021994
+
 static void
 translate_vnhook_major_minor(struct vnode *vp, struct stat *sb)
 {
@@ -390,7 +392,7 @@ linux_statfs(struct thread *td, struct l
struct l_statfs linux_statfs;
struct statfs bsd_statfs;
char *path;
-   int error;
+   int error, dev_shm;
 
LCONVPATHEXIST(td, args-path, path);
 
@@ -398,11 +400,17 @@ linux_statfs(struct thread *td, struct l
if (ldebug(statfs))
printf(ARGS(statfs, %s, *), path);
 #endif
+   dev_shm = 0;
error = kern_statfs(td, path, UIO_SYSSPACE, bsd_statfs);
+   if (strncmp(path, /dev/shm, sizeof(/dev/shm) - 1) == 0)
+   dev_shm = (path[8] == '\0'
+   || (path[8] == '/'  path[9] == '\0'));
LFREEPATH(path);
if (error)
return (error);
bsd_to_linux_statfs(bsd_statfs, linux_statfs);
+   if (dev_shm)
+   linux_statfs.f_type = LINUX_SHMFS_MAGIC;
return copyout(linux_statfs, args-buf, sizeof(linux_statfs));
 }
 
___
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: r219668 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Tue Mar 15 13:40:47 2011
New Revision: 219668
URL: http://svn.freebsd.org/changeset/base/219668

Log:
  Staticize functions which are not used somewhere else, move the
  corresponding prototypes from the header to the code file.

Modified:
  head/sys/compat/linux/linux_mib.c
  head/sys/compat/linux/linux_mib.h

Modified: head/sys/compat/linux/linux_mib.c
==
--- head/sys/compat/linux/linux_mib.c   Tue Mar 15 13:27:34 2011
(r219667)
+++ head/sys/compat/linux/linux_mib.c   Tue Mar 15 13:40:47 2011
(r219668)
@@ -69,6 +69,10 @@ static unsigned linux_osd_jail_slot;
 SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0,
Linux mode);
 
+static int linux_set_osname(struct thread *td, char *osname);
+static int linux_set_osrelease(struct thread *td, char *osrelease);
+static int linux_set_oss_version(struct thread *td, int oss_version);
+
 static int
 linux_sysctl_osname(SYSCTL_HANDLER_ARGS)
 {
@@ -469,7 +473,7 @@ linux_get_osname(struct thread *td, char
mtx_unlock(pr-pr_mtx);
 }
 
-int
+static int
 linux_set_osname(struct thread *td, char *osname)
 {
struct prison *pr;
@@ -505,7 +509,7 @@ linux_kernver(struct thread *td)
return (osrel);
 }
 
-int
+static int
 linux_set_osrelease(struct thread *td, char *osrelease)
 {
struct prison *pr;
@@ -533,7 +537,7 @@ linux_get_oss_version(struct thread *td)
return (version);
 }
 
-int
+static int
 linux_set_oss_version(struct thread *td, int oss_version)
 {
struct prison *pr;

Modified: head/sys/compat/linux/linux_mib.h
==
--- head/sys/compat/linux/linux_mib.h   Tue Mar 15 13:27:34 2011
(r219667)
+++ head/sys/compat/linux/linux_mib.h   Tue Mar 15 13:40:47 2011
(r219668)
@@ -35,13 +35,10 @@ voidlinux_osd_jail_register(void);
 void   linux_osd_jail_deregister(void);
 
 void   linux_get_osname(struct thread *td, char *dst);
-intlinux_set_osname(struct thread *td, char *osname);
 
 void   linux_get_osrelease(struct thread *td, char *dst);
-intlinux_set_osrelease(struct thread *td, char *osrelease);
 
 intlinux_get_oss_version(struct thread *td);
-intlinux_set_oss_version(struct thread *td, int oss_version);
 
 intlinux_kernver(struct thread *td);
 
___
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: r219559 - in head/sys: amd64/linux32 compat/freebsd32 i386/linux kern

[Alexander Leidinger]

On Sat, 12 Mar 2011 22:24:09 -0800 Artem Belevich fbsdl...@src.cx
wrote:

  Modified: head/sys/i386/linux/syscalls.master
  -                                 l_handler_t handler); }
  +                                 void *handler); }
 
  What's wrong with l_handler_t?
 
 I don't recall the details, but I believe that the way l_handler_t is
 defined resulted in compilation errors in generated glue code. Glue
 generation code relies on '*' before the argument name in order to
 tell scalars from pointers. l_handler_t was interpreted as a scalar
 and on i386 where l_handler_t is a pointer, it produced compilation
 warning.

What about documenting it with a comment nearby?

Bye,
Alexander.

___
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: r219559 - in head/sys: amd64/linux32 compat/freebsd32 i386/linux kern

[Alexander Leidinger]

On Sat, 12 Mar 2011 08:51:43 + (UTC) Andriy Gapon a...@freebsd.org
wrote:

 Author: avg
 Date: Sat Mar 12 08:51:43 2011
 New Revision: 219559
 URL: http://svn.freebsd.org/changeset/base/219559
 
 Log:
   add DTrace systrace support for linux32 and freebsd32 on amd64
 syscalls 
   This commits makes necessary changes in syscall/sysent generation
   infrastructure.

I assume this also includes syscall provider support for linux syscalls
on i386. Some questions below.

 Modified: head/sys/i386/linux/syscalls.master
 ==
 --- head/sys/i386/linux/syscalls.master   Sat Mar 12 07:47:05 2011
 (r219558)
 +++ head/sys/i386/linux/syscalls.master   Sat Mar 12 08:51:43 2011
 (r219559)
 @@ -102,7 +102,7 @@
 46AUE_SETGID STD  { int linux_setgid16(l_gid16_t gid); }
 47AUE_GETGID STD  { int linux_getgid16(void); }
 48AUE_NULL STD{ int linux_signal(l_int sig, \
 - l_handler_t handler); }
 + void *handler); }

What's wrong with l_handler_t?

 @@ -148,7 +148,7 @@
   struct timeval *tp, \
   struct timezone *tzp); }
  79   AUE_SETTIMEOFDAYNOPROTO { int
 settimeofday( \
 - struct timeval *tp, \
 + struct timeval *tv, \

What's wrong with tp?

Bye,
Alexander.
___
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: r219561 - in head/sys: cddl/dev/systrace modules/dtrace modules/dtrace/dtraceall modules/dtrace/systrace_freebsd32 modules/dtrace/systrace_linux32

[Alexander Leidinger]

On Sat, 12 Mar 2011 09:09:25 + (UTC) Andriy Gapon a...@freebsd.org
wrote:

 Author: avg
 Date: Sat Mar 12 09:09:25 2011
 New Revision: 219561
 URL: http://svn.freebsd.org/changeset/base/219561
 
 Log:
   add DTrace systrace support for linux32 and freebsd32 on amd64
 syscalls 
   Add systrace_linux32 and systrace_freebsd32 modules which provide
   support for tracing compat system calls in addition to native system
   call tracing provided by systrace module.
   
   Provided that all the systrace modules are loaded now you can select
   what syscalls to trace in the following manner:
   
   syscall::xxx:yyy - work on all system calls that match the
 specification syscall:freebsd:xxx:yyy - only native system calls
   syscall:linux32:xxx:yyy - linux32 compat system calls
   syscall:freebsd32:xxx:yyy - freebsd32 compat system calls on amd64

I am working on some SDT probes for the linuxulator. The way I handle it
there is to use linuxulator for the native size, and linuxulator32
for the current 32-bit linux emulation on amd64. When the amd64 arch
gets a native linux emulation (dchagin@ has patches) this would allow to
trace both in a sane way.

Is it possible to have linux as the modname on i386? Is it easy to
have both linux syscall types (64 bit and 32 bit) on amd64 in case
native support arrives in this code?

 Modified: head/sys/cddl/dev/systrace/systrace.c
 ==
 --- head/sys/cddl/dev/systrace/systrace.c Sat Mar 12 08:58:19
 2011  (r219560) +++
 head/sys/cddl/dev/systrace/systrace.c Sat Mar 12 09:09:25
 2011  (r219561) @@ -59,17 +59,38 @@ #include sys/dtrace.h
  
  #ifdef LINUX_SYSTRACE
 -#include linux.h
 -#include linux_syscall.h
 -#include linux_proto.h
 -#include linux_syscallnames.c
 -#include linux_systrace.c
 +#if defined(__amd64__)
 +#include amd64/linux32/linux.h
 +#include amd64/linux32/linux32_proto.h
 +#include amd64/linux32/linux32_syscalls.c
 +#include amd64/linux32/linux32_systrace_args.c
 +#elif defined(__i386__)
 +#include i386/linux/linux.h
 +#include i386/linux/linux_proto.h
 +#include i386/linux/linux_syscalls.c
 +#include i386/linux/linux_systrace_args.c

This looks like there is also support for linux syscalls on 386.

 +#else
 +#error Only i386 and amd64 are supported.
 +#endif
  extern struct sysent linux_sysent[];
 -#define  DEVNAME dtrace/linsystrace
 -#define  PROVNAMElinsyscall
 +#define  MODNAME linux32

But this looks like it will be named linux32 in any case. In the short
term I would prefer:
---snip---
#if defined(__amd64__)
#define MODNAME linux32
#elif defined(__i386__)
#define MODNAME linux
#endif
---snip---

  #define  MAXSYSCALL  LINUX_SYS_MAXSYSCALL
  #define  SYSCALLNAMESlinux_syscallnames
  #define  SYSENT  linux_sysent

Bye,
Alexander.
___
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: r218970 - in head/sys: compat/linux sys

[Alexander Leidinger]

Quoting Chagin Dmitry dcha...@freebsd.org (from Sat, 5 Mar 2011  
22:45:28 +0300):



On Sat, Mar 05, 2011 at 08:02:44PM +0100, Lucius Windschuh wrote:



BTW, is there an easy way to debug such futex issues, other than
perhaps linux_kdump?



try r219242. kdump now (in HEAD) decode linux syscalls. also see ktr(4).


DTrace is much more leightwight, does not need as much configuration  
in the kernel as KTR (once KDTRACE_HOOKS is inside), and is much more  
flexibel.


Bye,
Alexander.

--
Greatness is a transitory experience. It is never consistent.

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r219138 - head/usr.bin/kdump

[Alexander Leidinger]

Quoting Chagin Dmitry dcha...@freebsd.org (from Thu, 3 Mar 2011  
21:05:07 +0300):



On Thu, Mar 03, 2011 at 02:14:58PM +0100, Alexander Leidinger wrote:

Quoting Robert Watson rwat...@freebsd.org (from Thu, 3 Mar 2011
11:14:59 + (GMT)):


 On Tue, 1 Mar 2011, Dmitry Chagin wrote:

 Teach kdump to decode linux syscalls names too.

 Fix bug introduced in my previous commit: the kernel always dump native
 signal numbers, so no need to check the ABI in ktrpsig().

 Does this mean that we're eliminating the need for the long-broken
 linux_kdump?

For the linux parts there is (L?)GPLed code in linux_kdump (the main
reason that it is a port, I think), it is unlikely that someone sits
there and will do a clean-room implementation of those linux-kernel
derived things (I like to get proven wrong, anyone out there accepts
the challenge? ;-) ). Dmitry provided an updated linux-kdump which
contains preprocessed things (no need to have a non-default
linuxulator setup). I have the corresponding PR assigned to me, but
from his comments it looks like his new version depends upon his
changes and does not DTRT without them (I am awaiting confirmation,
and I asked about changes to let it DTRT if this is true).



It will be mergeed soon, I'll let you know. thnx!


My comments where not about a MFC, they are about modifying the new  
linux_kdump to still work on 8.1 or 7.4 (we still support those  
release in ports).


Bye,
Alexander.

--
Go away, I'm all right.
-- H. G. Wells' last words

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r219258 - in head/sys: kern security/mac

[Alexander Leidinger]

Author: netchild
Date: Fri Mar  4 09:03:54 2011
New Revision: 219258
URL: http://svn.freebsd.org/changeset/base/219258

Log:
  - Add a FEATURE for capsicum (security_capabilities).
  - Rename mac FEATURE to security_mac.
  
  Discussed with:   rwatson

Modified:
  head/sys/kern/sys_capability.c
  head/sys/security/mac/mac_syscalls.c

Modified: head/sys/kern/sys_capability.c
==
--- head/sys/kern/sys_capability.c  Fri Mar  4 07:01:45 2011
(r219257)
+++ head/sys/kern/sys_capability.c  Fri Mar  4 09:03:54 2011
(r219258)
@@ -61,6 +61,8 @@ __FBSDID($FreeBSD$);
 
 #ifdef CAPABILITIES
 
+FEATURE(security_capabilities, Capsicum Capability Mode);
+
 /*
  * We don't currently have any MIB entries for sysctls, but we do expose
  * security.capabilities so that it's easy to tell if options CAPABILITIES is

Modified: head/sys/security/mac/mac_syscalls.c
==
--- head/sys/security/mac/mac_syscalls.cFri Mar  4 07:01:45 2011
(r219257)
+++ head/sys/security/mac/mac_syscalls.cFri Mar  4 09:03:54 2011
(r219258)
@@ -73,7 +73,7 @@ __FBSDID($FreeBSD$);
 
 #ifdef MAC
 
-FEATURE(mac, Mandatory Access Control Framework support);
+FEATURE(security_mac, Mandatory Access Control Framework support);
 
 int
 __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
___
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: r219138 - head/usr.bin/kdump

[Alexander Leidinger]

Quoting Robert Watson rwat...@freebsd.org (from Thu, 3 Mar 2011  
11:14:59 + (GMT)):




On Tue, 1 Mar 2011, Dmitry Chagin wrote:


Teach kdump to decode linux syscalls names too.

Fix bug introduced in my previous commit: the kernel always dump native
signal numbers, so no need to check the ABI in ktrpsig().


Does this mean that we're eliminating the need for the long-broken  
linux_kdump?


For the linux parts there is (L?)GPLed code in linux_kdump (the main  
reason that it is a port, I think), it is unlikely that someone sits  
there and will do a clean-room implementation of those linux-kernel  
derived things (I like to get proven wrong, anyone out there accepts  
the challenge? ;-) ). Dmitry provided an updated linux-kdump which  
contains preprocessed things (no need to have a non-default  
linuxulator setup). I have the corresponding PR assigned to me, but  
from his comments it looks like his new version depends upon his  
changes and does not DTRT without them (I am awaiting confirmation,  
and I asked about changes to let it DTRT if this is true).


Bye,
Alexander.

--
Commitment, n.:
Commitment can be illustrated by a breakfast of ham and eggs.
The chicken was involved, the pig was committed.

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r219138 - head/usr.bin/kdump

[Alexander Leidinger]

Quoting Dmitry Chagin dcha...@freebsd.org (from Tue, 1 Mar 2011  
16:42:29 + (UTC)):



Author: dchagin
Date: Tue Mar  1 16:42:28 2011
New Revision: 219138
URL: http://svn.freebsd.org/changeset/base/219138

Log:
  Teach kdump to decode linux syscalls names too.



Modified: head/usr.bin/kdump/kdump.c
==
--- head/usr.bin/kdump/kdump.c  Tue Mar  1 14:54:14 2011(r219137)
+++ head/usr.bin/kdump/kdump.c  Tue Mar  1 16:42:28 2011(r219138)



+/*
+ * from linux.h
+ * Linux syscalls return negative errno's, we do positive and map them
+ */
+static int bsd_to_linux_errno[ELAST + 1] = {
+   -0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,  -8,  -9,


Can you please specify the full path within SRC for the linux.h you  
copied this from, and also add a comment to this linux.h to tell to  
not forget to update kdump.c if this is updated (or seperate this into  
another header and include it here)?


Bye,
Alexander.

--
Committee, n.:
A group of men who individually can do nothing but as a group
decide that nothing can be done.
-- Fred Allen

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r219173 - in stable/8/sys: compat/linux kern

[Alexander Leidinger]

Author: netchild
Date: Wed Mar  2 09:53:13 2011
New Revision: 219173
URL: http://svn.freebsd.org/changeset/base/219173

Log:
  MFC r215664:
By using the 32-bit Linux version of Sun's Java Development Kit 1.6
on FreeBSD (amd64), invocations of javac (or java) eventually
end with the output of Killed and exit code 137.
  
This is caused by:
1. After calling exec() in multithreaded linux program threads are not
   destroyed and continue running. They get killed after program being
   executed finishes.
  
2. linux_exit_group doesn't return correct exit code when called not
   from group leader. Which happens regularly using sun jvm.
  
The submitters fix this in a similar way to how NetBSD handles this.
  
I took the PRs away from dchagin, who seems to be out of touch of
this since a while (no response from him).
  
The patches committed here are from [2], with some little modifications
from me to the style.
  
PR:141439 [1], 144194 [2]
Submitted by:Stefan Schmidt stefan.schm...@stadtbuch.de, gk
Reviewed by:rdivacky (in april 2010)
  
  MFC r215675:
Do not take the process lock. The assignment to u_short inside the
properly aligned structure is atomic on all supported architectures, and
the thread that should see side-effect of assignment is the same thread
that does assignment.
  
Use a more appropriate conditional to detect the linux ABI.
  
Suggested by:kib

Modified:
  stable/8/sys/compat/linux/linux_emul.c
  stable/8/sys/compat/linux/linux_emul.h
  stable/8/sys/compat/linux/linux_misc.c
  stable/8/sys/kern/kern_exit.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/compat/linux/linux_emul.c
==
--- stable/8/sys/compat/linux/linux_emul.c  Wed Mar  2 06:24:46 2011
(r219172)
+++ stable/8/sys/compat/linux/linux_emul.c  Wed Mar  2 09:53:13 2011
(r219173)
@@ -155,7 +155,7 @@ void
 linux_proc_exit(void *arg __unused, struct proc *p)
 {
struct linux_emuldata *em;
-   int error;
+   int error, shared_flags, shared_xstat;
struct thread *td = FIRST_THREAD_IN_PROC(p);
int *child_clear_tid;
struct proc *q, *nq;
@@ -187,6 +187,8 @@ linux_proc_exit(void *arg __unused, stru
}
 
EMUL_SHARED_WLOCK(emul_shared_lock);
+   shared_flags = em-shared-flags;
+   shared_xstat = em-shared-xstat;
LIST_REMOVE(em, threads);
 
em-shared-refs--;
@@ -196,6 +198,9 @@ linux_proc_exit(void *arg __unused, stru
} else  
EMUL_SHARED_WUNLOCK(emul_shared_lock);
 
+   if ((shared_flags  EMUL_SHARED_HASXSTAT) != 0)
+   p-p_xstat = shared_xstat;
+
if (child_clear_tid != NULL) {
struct linux_sys_futex_args cup;
int null = 0;
@@ -257,6 +262,10 @@ linux_proc_exec(void *arg __unused, stru
if (__predict_false(imgp-sysent == elf_linux_sysvec
 p-p_sysent != elf_linux_sysvec))
linux_proc_init(FIRST_THREAD_IN_PROC(p), p-p_pid, 0);
+   if (__predict_false((p-p_sysent-sv_flags  SV_ABI_MASK) ==
+   SV_ABI_LINUX))
+   /* Kill threads regardless of imgp-sysent value */
+   linux_kill_threads(FIRST_THREAD_IN_PROC(p), SIGKILL);
if (__predict_false(imgp-sysent != elf_linux_sysvec
 p-p_sysent == elf_linux_sysvec)) {
struct linux_emuldata *em;
@@ -334,3 +343,29 @@ linux_set_tid_address(struct thread *td,
EMUL_UNLOCK(emul_lock);
return 0;
 }
+
+void
+linux_kill_threads(struct thread *td, int sig)
+{
+   struct linux_emuldata *em, *td_em, *tmp_em;
+   struct proc *sp;
+
+   td_em = em_find(td-td_proc, EMUL_DONTLOCK);
+
+   KASSERT(td_em != NULL, (linux_kill_threads: emuldata not found.\n));
+
+   EMUL_SHARED_RLOCK(emul_shared_lock);
+   LIST_FOREACH_SAFE(em, td_em-shared-threads, threads, tmp_em) {
+   if (em-pid == td_em-pid)
+   continue;
+
+   sp = pfind(em-pid);
+   if ((sp-p_flag  P_WEXIT) == 0)
+   psignal(sp, sig);
+   PROC_UNLOCK(sp);
+#ifdef DEBUG
+   printf(LMSG(linux_kill_threads: kill PID %d\n), em-pid);
+#endif
+   }
+   EMUL_SHARED_RUNLOCK(emul_shared_lock);
+}

Modified: stable/8/sys/compat/linux/linux_emul.h
==
--- stable/8/sys/compat/linux/linux_emul.h  Wed Mar  2 06:24:46 2011
(r219172)
+++ stable/8/sys/compat/linux/linux_emul.h  Wed Mar  2 09:53:13 2011
(r219173)
@@ -31,8 +31,12 

svn commit: r219176 - stable/8/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Wed Mar  2 13:06:47 2011
New Revision: 219176
URL: http://svn.freebsd.org/changeset/base/219176

Log:
  Fix kernel build with MFC of r215706:
Fix linux kernel module breakage introduced in r215675, by including
sys/sysent.h.
  
  Pointyhat to: netchild
  Noticed by:   kib

Modified:
  stable/8/sys/compat/linux/linux_emul.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/compat/linux/linux_emul.c
==
--- stable/8/sys/compat/linux/linux_emul.c  Wed Mar  2 11:09:34 2011
(r219175)
+++ stable/8/sys/compat/linux/linux_emul.c  Wed Mar  2 13:06:47 2011
(r219176)
@@ -41,6 +41,7 @@ __FBSDID($FreeBSD$);
 #include sys/sx.h
 #include sys/proc.h
 #include sys/syscallsubr.h
+#include sys/sysent.h
 #include sys/sysproto.h
 #include sys/unistd.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: r219173 - in stable/8/sys: compat/linux kern

[Alexander Leidinger]

Quoting Kostik Belousov kostik...@gmail.com (from Wed, 2 Mar 2011  
14:49:22 +0200):



On Wed, Mar 02, 2011 at 09:53:13AM +, Alexander Leidinger wrote:

Author: netchild
Date: Wed Mar  2 09:53:13 2011
New Revision: 219173
URL: http://svn.freebsd.org/changeset/base/219173



See r215706, that was a followup to the commit. Without it, stable/8
is broken:

/usr/bsd/src/sys/modules/linux/../../compat/linux/linux_emul.c: In  
function 'linux_proc_exec':
/usr/bsd/src/sys/modules/linux/../../compat/linux/linux_emul.c:265:  
error: dereferencing pointer to incomplete type
/usr/bsd/src/sys/modules/linux/../../compat/linux/linux_emul.c:265:  
error: 'SV_ABI_MASK' undeclared (first use in this function)


Double pointyhat to me...

Commit in progress.

Thanks,
Alexander.

--
http://www.Leidinger.net  Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org  : PGP ID = 72077137
Behind every great man, there is a woman -- urging him on.
-- Harry Mudd, I, Mudd, stardate 4513.3

___
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: r219129 - in head/sys: compat/freebsd32 conf kern sys

[Alexander Leidinger]

Quoting Robert Watson rwat...@freebsd.org (from Tue, 1 Mar 2011  
13:23:37 + (UTC)):



Author: rwatson
Date: Tue Mar  1 13:23:37 2011
New Revision: 219129
URL: http://svn.freebsd.org/changeset/base/219129

Log:
  Add initial support for Capsicum's Capability Mode to the FreeBSD kernel,
  compiled conditionally on options CAPABILITIES:


Typo in NOTES.
What about adding a FEATURE to sys_capabilities.c, could it be useful?


Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Tue Mar  1 13:14:28 2011(r219128)
+++ head/sys/conf/NOTES Tue Mar  1 13:23:37 2011(r219129)
@@ -1157,6 +1157,9 @@ options   MAC_SEEOTHERUIDS
 optionsMAC_STUB
 optionsMAC_TEST

+# Support for Capsicum
+optionsCAPABILIITES
+

 #
 # CLOCK OPTIONS




Added: head/sys/kern/sys_capability.c


Bye,
Alexander.

--
A woman has got to love a bad man once or twice in her life to be
thankful for a good one.
-- Marjorie Kinnan Rawlings

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r219084 - in head: bin/test tools/regression/bin/test

[Alexander Leidinger]

Quoting Joerg Sonnenberger jo...@britannica.bec.de (from Sun, 27 Feb  
2011 15:29:10 +0100):



On Sun, Feb 27, 2011 at 03:11:43PM +0100, Erik Trulsson wrote:

On Sun, Feb 27, 2011 at 01:30:58PM +0100, Joerg Sonnenberger wrote:
 On Sun, Feb 27, 2011 at 12:28:06PM +, Xin LI wrote:
  Author: delphij
  Date: Sun Feb 27 12:28:06 2011
  New Revision: 219084
  URL: http://svn.freebsd.org/changeset/base/219084
 
  Log:
Accept == as an alias of = which is a popular GNU extension.

 It is not a popular GNU extension. It is crap only bash supports.
 Do you really want to encourage that?

In what way is it 'crap', and in what way would adding support for it
be a problem?


It is completely redundant and inconsistent with pretty much every other
test(1) implementation. E.g. it isn't even supported by /bin/test from
coretutils. The very presence of this in various shell scripts is a
direct result of silently accepting it in bash, even in sh mode. This is
just further encouragement to legalize it.


For your info, at work we got a script (for Solaris) which had a mix  
of = and == (and [ ] and [[ ]]) as a delivery of some software.  
Needless to say it didn't work as expected. I also think that adding  
support for == encourages bad scripts.


Bye,
Alexander.

--
10.0 times 0.1 is hardly ever 1.0.

http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org   netchild @ FreeBSD.org  : PGP ID = 72077137
___
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: r219028 - in head/sys: cam fs/nfsclient fs/nfsserver kern nfsclient nfsserver security/audit security/mac

[Alexander Leidinger]

Author: netchild
Date: Fri Feb 25 10:11:01 2011
New Revision: 219028
URL: http://svn.freebsd.org/changeset/base/219028

Log:
  Add some FEATURE macros for various features (AUDIT/CAM/IPC/KTR/MAC/NFS/NTP/
  PMC/SYSV/...).
  
  No FreeBSD version bump, the userland application to query the features will
  be committed last and can serve as an indication of the availablility if
  needed.
  
  Sponsored by:   Google Summer of Code 2010
  Submitted by:   kibab
  Reviewed by:arch@ (parts by rwatson, trasz, jhb)
  X-MFC after:to be determined in last commit with code from this project

Modified:
  head/sys/cam/cam.c
  head/sys/fs/nfsclient/nfs_clvfsops.c
  head/sys/fs/nfsserver/nfs_nfsdport.c
  head/sys/kern/kern_dtrace.c
  head/sys/kern/kern_ktr.c
  head/sys/kern/kern_ktrace.c
  head/sys/kern/kern_lock.c
  head/sys/kern/kern_ntptime.c
  head/sys/kern/kern_pmc.c
  head/sys/kern/kern_prot.c
  head/sys/kern/ksched.c
  head/sys/kern/subr_mchain.c
  head/sys/kern/subr_stack.c
  head/sys/kern/sysv_msg.c
  head/sys/kern/sysv_sem.c
  head/sys/kern/sysv_shm.c
  head/sys/kern/uipc_cow.c
  head/sys/kern/uipc_mqueue.c
  head/sys/kern/uipc_sem.c
  head/sys/nfsclient/nfs_vfsops.c
  head/sys/nfsserver/nfs_serv.c
  head/sys/security/audit/audit.c
  head/sys/security/mac/mac_syscalls.c

Modified: head/sys/cam/cam.c
==
--- head/sys/cam/cam.c  Fri Feb 25 09:40:17 2011(r219027)
+++ head/sys/cam/cam.c  Fri Feb 25 10:11:01 2011(r219028)
@@ -51,6 +51,9 @@ __FBSDID($FreeBSD$);
 #include sys/libkern.h
 #include cam/cam_queue.h
 #include cam/cam_xpt.h
+
+FEATURE(scbus, SCSI devices support);
+
 #endif
 
 static int camstatusentrycomp(const void *key, const void *member);

Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==
--- head/sys/fs/nfsclient/nfs_clvfsops.cFri Feb 25 09:40:17 2011
(r219027)
+++ head/sys/fs/nfsclient/nfs_clvfsops.cFri Feb 25 10:11:01 2011
(r219028)
@@ -73,6 +73,8 @@ __FBSDID($FreeBSD$);
 #include fs/nfsclient/nfs.h
 #include fs/nfsclient/nfsdiskless.h
 
+FEATURE(nfscl, NFSv4 client);
+
 extern int nfscl_ticks;
 extern struct timeval nfsboottime;
 extern struct nfsstats newnfsstats;

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==
--- head/sys/fs/nfsserver/nfs_nfsdport.cFri Feb 25 09:40:17 2011
(r219027)
+++ head/sys/fs/nfsserver/nfs_nfsdport.cFri Feb 25 10:11:01 2011
(r219028)
@@ -46,6 +46,8 @@ __FBSDID($FreeBSD$);
 #include nlm/nlm_prot.h
 #include nlm/nlm.h
 
+FEATURE(nfsd, NFSv4 server);
+
 extern u_int32_t newnfs_true, newnfs_false, newnfs_xdrneg1;
 extern int nfsrv_useacl;
 extern int newnfs_numnfsd;

Modified: head/sys/kern/kern_dtrace.c
==
--- head/sys/kern/kern_dtrace.c Fri Feb 25 09:40:17 2011(r219027)
+++ head/sys/kern/kern_dtrace.c Fri Feb 25 10:11:01 2011(r219028)
@@ -37,10 +37,14 @@ __FBSDID($FreeBSD$);
 #include sys/malloc.h
 #include sys/proc.h
 #include sys/dtrace_bsd.h
+#include sys/sysctl.h
 
 #define KDTRACE_PROC_SIZE  64
 #defineKDTRACE_THREAD_SIZE 256
 
+FEATURE(kdtrace_hooks,
+Kernel DTrace hooks which are required to load DTrace kernel modules);
+
 MALLOC_DEFINE(M_KDTRACE, kdtrace, DTrace hooks);
 
 /* Return the DTrace process data size compiled in the kernel hooks. */

Modified: head/sys/kern/kern_ktr.c
==
--- head/sys/kern/kern_ktr.cFri Feb 25 09:40:17 2011(r219027)
+++ head/sys/kern/kern_ktr.cFri Feb 25 10:11:01 2011(r219028)
@@ -80,6 +80,8 @@ __FBSDID($FreeBSD$);
 #defineKTR_CPU PCPU_GET(cpuid)
 #endif
 
+FEATURE(ktr, Kernel support for KTR kernel tracing facility);
+
 SYSCTL_NODE(_debug, OID_AUTO, ktr, CTLFLAG_RD, 0, KTR options);
 
 intktr_cpumask = KTR_CPUMASK;

Modified: head/sys/kern/kern_ktrace.c
==
--- head/sys/kern/kern_ktrace.c Fri Feb 25 09:40:17 2011(r219027)
+++ head/sys/kern/kern_ktrace.c Fri Feb 25 10:11:01 2011(r219028)
@@ -83,6 +83,8 @@ static MALLOC_DEFINE(M_KTRACE, KTRACE,
 
 #ifdef KTRACE
 
+FEATURE(ktrace, Kernel support for system-call tracing);
+
 #ifndef KTRACE_REQUEST_POOL
 #defineKTRACE_REQUEST_POOL 100
 #endif

Modified: head/sys/kern/kern_lock.c
==
--- head/sys/kern/kern_lock.c   Fri Feb 25 09:40:17 2011(r219027)
+++ head/sys/kern/kern_lock.c   Fri Feb 25 10:11:01 2011(r219028)
@@ -1299,6 +1299,10 @@ lockstatus(struct lock *lk)
 }
 
 #ifdef INVARIANT_SUPPORT
+
+FEATURE(invariant_support,
+Support for modules compiled with 

svn commit: r219030 - head/sys/kern

[Alexander Leidinger]

Author: netchild
Date: Fri Feb 25 12:46:43 2011
New Revision: 219030
URL: http://svn.freebsd.org/changeset/base/219030

Log:
  Make the description of the feature consistent with another similar
  description for another feature.
  
  Noticed by:   trasz

Modified:
  head/sys/kern/uipc_sem.c

Modified: head/sys/kern/uipc_sem.c
==
--- head/sys/kern/uipc_sem.cFri Feb 25 10:24:35 2011(r219029)
+++ head/sys/kern/uipc_sem.cFri Feb 25 12:46:43 2011(r219030)
@@ -65,7 +65,7 @@ __FBSDID($FreeBSD$);
 
 #include security/mac/mac_framework.h
 
-FEATURE(p1003_1b_semaphores, POSIX1003.1B semaphores support);
+FEATURE(p1003_1b_semaphores, POSIX P1003.1B semaphores support);
 /*
  * TODO
  *
___
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: r219034 - in stable/8: . contrib/bsnmp/snmpd contrib/top contrib/xz gnu/usr.bin lib/libusb release/picobsd/floppy.tree/sbin sbin/geom/class/sched tools/regression/lib/msun tools/regress...

[Alexander Leidinger]

Author: netchild
Date: Fri Feb 25 15:32:44 2011
New Revision: 219034
URL: http://svn.freebsd.org/changeset/base/219034

Log:
  MFC r216591:
Suggest to run the delete-old target after the second mergemaster. If you 
run
it before, your rc scripts may still reference old files/directories and
if you are in the unlucky situation to have triggered a reboot 
(intentionally
or not) between the delete-old run and the mergemaster, your system may not
start anymore.
  
While I'm here, give a hint about delete-old-libs.
  
Noticed by:bcr (luckily in a discussion and not by getting hit by
this)

Modified:
  stable/8/UPDATING   (contents, props changed)
Directory Properties:
  stable/8/   (props changed)
  stable/8/COPYRIGHT   (props changed)
  stable/8/Makefile   (props changed)
  stable/8/Makefile.inc1   (props changed)
  stable/8/ObsoleteFiles.inc   (props changed)
  stable/8/bin/   (props changed)
  stable/8/bin/chio/   (props changed)
  stable/8/bin/chmod/   (props changed)
  stable/8/bin/cp/   (props changed)
  stable/8/bin/csh/   (props changed)
  stable/8/bin/date/   (props changed)
  stable/8/bin/df/   (props changed)
  stable/8/bin/echo/   (props changed)
  stable/8/bin/ed/   (props changed)
  stable/8/bin/expr/   (props changed)
  stable/8/bin/getfacl/   (props changed)
  stable/8/bin/kenv/   (props changed)
  stable/8/bin/kill/   (props changed)
  stable/8/bin/ln/   (props changed)
  stable/8/bin/ls/   (props changed)
  stable/8/bin/mv/   (props changed)
  stable/8/bin/pax/   (props changed)
  stable/8/bin/pkill/   (props changed)
  stable/8/bin/ps/   (props changed)
  stable/8/bin/pwait/   (props changed)
  stable/8/bin/setfacl/   (props changed)
  stable/8/bin/sh/   (props changed)
  stable/8/bin/sleep/   (props changed)
  stable/8/bin/test/   (props changed)
  stable/8/cddl/compat/opensolaris/   (props changed)
  stable/8/cddl/contrib/opensolaris/   (props changed)
  stable/8/cddl/lib/   (props changed)
  stable/8/cddl/lib/libnvpair/   (props changed)
  stable/8/cddl/lib/libzpool/   (props changed)
  stable/8/cddl/usr.bin/   (props changed)
  stable/8/cddl/usr.sbin/   (props changed)
  stable/8/contrib/   (props changed)
  stable/8/contrib/bind9/   (props changed)
  stable/8/contrib/binutils/   (props changed)
  stable/8/contrib/bsnmp/   (props changed)
  stable/8/contrib/bsnmp/snmpd/bsnmpd.1   (props changed)
  stable/8/contrib/bzip2/   (props changed)
  stable/8/contrib/com_err/   (props changed)
  stable/8/contrib/csup/   (props changed)
  stable/8/contrib/ee/   (props changed)
  stable/8/contrib/expat/   (props changed)
  stable/8/contrib/file/   (props changed)
  stable/8/contrib/gcc/   (props changed)
  stable/8/contrib/gdb/   (props changed)
  stable/8/contrib/gdtoa/   (props changed)
  stable/8/contrib/groff/   (props changed)
  stable/8/contrib/ipfilter/   (props changed)
  stable/8/contrib/less/   (props changed)
  stable/8/contrib/libpcap/   (props changed)
  stable/8/contrib/ncurses/   (props changed)
  stable/8/contrib/netcat/   (props changed)
  stable/8/contrib/ntp/   (props changed)
  stable/8/contrib/nvi/   (props changed)
  stable/8/contrib/one-true-awk/   (props changed)
  stable/8/contrib/openbsm/   (props changed)
  stable/8/contrib/openpam/   (props changed)
  stable/8/contrib/pf/   (props changed)
  stable/8/contrib/sendmail/   (props changed)
  stable/8/contrib/tcp_wrappers/   (props changed)
  stable/8/contrib/tcpdump/   (props changed)
  stable/8/contrib/tcsh/   (props changed)
  stable/8/contrib/telnet/   (props changed)
  stable/8/contrib/top/   (props changed)
  stable/8/contrib/top/install-sh   (props changed)
  stable/8/contrib/traceroute/   (props changed)
  stable/8/contrib/wpa/   (props changed)
  stable/8/contrib/xz/   (props changed)
  stable/8/contrib/xz/AUTHORS   (props changed)
  stable/8/contrib/xz/COPYING   (props changed)
  stable/8/contrib/xz/ChangeLog   (props changed)
  stable/8/contrib/xz/FREEBSD-Xlist   (props changed)
  stable/8/contrib/xz/FREEBSD-upgrade   (props changed)
  stable/8/contrib/xz/README   (props changed)
  stable/8/contrib/xz/THANKS   (props changed)
  stable/8/contrib/xz/TODO   (props changed)
  stable/8/contrib/xz/po/   (props changed)
  stable/8/contrib/xz/src/   (props changed)
  stable/8/crypto/heimdal/   (props changed)
  stable/8/crypto/openssh/   (props changed)
  stable/8/crypto/openssl/   (props changed)
  stable/8/etc/   (props changed)
  stable/8/games/factor/   (props changed)
  stable/8/games/fortune/   (props changed)
  stable/8/games/grdc/   (props changed)
  stable/8/games/pom/   (props changed)
  stable/8/gnu/lib/csu/   (props changed)
  stable/8/gnu/lib/libgcc/   (props changed)
  stable/8/gnu/lib/libstdc++/   (props changed)
  stable/8/gnu/usr.bin/   (props changed)
  stable/8/gnu/usr.bin/Makefile   (props changed)
  stable/8/gnu/usr.bin/dialog/   (props changed)
  stable/8/gnu/usr.bin/gdb/   (props changed)
  stable/8/gnu/usr.bin/gdb/kgdb/   (props changed)

svn commit: r219035 - in stable/7: . contrib/bsnmp/snmpd contrib/wpa_supplicant gnu/usr.bin/groff/tmac share/misc tools/tools/nanobsd usr.sbin usr.sbin/bsnmpd/modules/snmp_hostres usr.sbin/makefs u...

[Alexander Leidinger]

Author: netchild
Date: Fri Feb 25 16:08:31 2011
New Revision: 219035
URL: http://svn.freebsd.org/changeset/base/219035

Log:
  MFC r216591:
Suggest to run the delete-old target after the second mergemaster. If you 
run
it before, your rc scripts may still reference old files/directories and
if you are in the unlucky situation to have triggered a reboot 
(intentionally
or not) between the delete-old run and the mergemaster, your system may not
start anymore.
  
While I'm here, give a hint about delete-old-libs.
  
Noticed by:bcr (luckily in a discussion and not by getting hit by
this)

Modified:
  stable/7/UPDATING   (contents, props changed)
Directory Properties:
  stable/7/   (props changed)
  stable/7/COPYRIGHT   (props changed)
  stable/7/Makefile   (props changed)
  stable/7/Makefile.inc1   (props changed)
  stable/7/ObsoleteFiles.inc   (props changed)
  stable/7/bin/   (props changed)
  stable/7/bin/chflags/   (props changed)
  stable/7/bin/chio/   (props changed)
  stable/7/bin/cp/   (props changed)
  stable/7/bin/csh/   (props changed)
  stable/7/bin/dd/   (props changed)
  stable/7/bin/df/   (props changed)
  stable/7/bin/echo/   (props changed)
  stable/7/bin/ed/   (props changed)
  stable/7/bin/expr/   (props changed)
  stable/7/bin/kill/   (props changed)
  stable/7/bin/ln/   (props changed)
  stable/7/bin/ls/   (props changed)
  stable/7/bin/pax/   (props changed)
  stable/7/bin/ps/   (props changed)
  stable/7/bin/rm/   (props changed)
  stable/7/bin/sh/   (props changed)
  stable/7/bin/test/   (props changed)
  stable/7/cddl/contrib/opensolaris/   (props changed)
  stable/7/cddl/lib/libzpool/   (props changed)
  stable/7/contrib/bind9/   (props changed)
  stable/7/contrib/binutils/   (props changed)
  stable/7/contrib/bsnmp/   (props changed)
  stable/7/contrib/bsnmp/snmpd/bsnmpd.1   (props changed)
  stable/7/contrib/cpio/   (props changed)
  stable/7/contrib/csup/   (props changed)
  stable/7/contrib/expat/   (props changed)
  stable/7/contrib/gcc/   (props changed)
  stable/7/contrib/gdb/   (props changed)
  stable/7/contrib/gdtoa/   (props changed)
  stable/7/contrib/groff/   (props changed)
  stable/7/contrib/ipfilter/   (props changed)
  stable/7/contrib/less/   (props changed)
  stable/7/contrib/libpcap/   (props changed)
  stable/7/contrib/ncurses/   (props changed)
  stable/7/contrib/netcat/   (props changed)
  stable/7/contrib/ntp/   (props changed)
  stable/7/contrib/nvi/   (props changed)
  stable/7/contrib/pf/   (props changed)
  stable/7/contrib/sendmail/   (props changed)
  stable/7/contrib/smbfs/   (props changed)
  stable/7/contrib/tcp_wrappers/   (props changed)
  stable/7/contrib/tcsh/   (props changed)
  stable/7/contrib/telnet/   (props changed)
  stable/7/contrib/top/   (props changed)
  stable/7/contrib/traceroute/   (props changed)
  stable/7/contrib/wpa_supplicant/   (props changed)
  stable/7/contrib/wpa_supplicant/wpa_supplicant.conf   (props changed)
  stable/7/crypto/openssh/   (props changed)
  stable/7/crypto/openssl/   (props changed)
  stable/7/etc/   (props changed)
  stable/7/games/factor/   (props changed)
  stable/7/games/fortune/   (props changed)
  stable/7/games/grdc/   (props changed)
  stable/7/gnu/   (props changed)
  stable/7/gnu/lib/libstdc++/   (props changed)
  stable/7/gnu/usr.bin/   (props changed)
  stable/7/gnu/usr.bin/cc/   (props changed)
  stable/7/gnu/usr.bin/cpio/   (props changed)
  stable/7/gnu/usr.bin/cvs/   (props changed)
  stable/7/gnu/usr.bin/gdb/   (props changed)
  stable/7/gnu/usr.bin/gdb/kgdb/   (props changed)
  stable/7/gnu/usr.bin/grep/   (props changed)
  stable/7/gnu/usr.bin/groff/   (props changed)
  stable/7/gnu/usr.bin/groff/tmac/mdoc.local   (props changed)
  stable/7/gnu/usr.bin/man/   (props changed)
  stable/7/gnu/usr.bin/sort/   (props changed)
  stable/7/include/   (props changed)
  stable/7/kerberos5/   (props changed)
  stable/7/lib/   (props changed)
  stable/7/lib/bind/   (props changed)
  stable/7/lib/csu/   (props changed)
  stable/7/lib/libarchive/   (props changed)
  stable/7/lib/libbluetooth/   (props changed)
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)
  stable/7/lib/libc_r/   (props changed)
  stable/7/lib/libcam/   (props changed)
  stable/7/lib/libdisk/   (props changed)
  stable/7/lib/libdwarf/   (props changed)
  stable/7/lib/libelf/   (props changed)
  stable/7/lib/libexpat/   (props changed)
  stable/7/lib/libfetch/   (props changed)
  stable/7/lib/libftpio/   (props changed)
  stable/7/lib/libgeom/   (props changed)
  stable/7/lib/libgssapi/   (props changed)
  stable/7/lib/libkse/   (props changed)
  stable/7/lib/libkvm/   (props changed)
  stable/7/lib/libmagic/   (props changed)
  stable/7/lib/libmemstat/   (props changed)
  stable/7/lib/libpmc/   (props changed)
  stable/7/lib/libradius/   (props changed)
  stable/7/lib/libsm/   (props changed)
  stable/7/lib/libstand/   (props changed)

svn commit: r218513 - head/sys/ufs/ufs

[Alexander Leidinger]

Author: netchild
Date: Thu Feb 10 08:06:56 2011
New Revision: 218513
URL: http://svn.freebsd.org/changeset/base/218513

Log:
  Wrap long line.
  
  Noticed by:   bz

Modified:
  head/sys/ufs/ufs/ufs_vnops.c

Modified: head/sys/ufs/ufs/ufs_vnops.c
==
--- head/sys/ufs/ufs/ufs_vnops.cThu Feb 10 07:56:55 2011
(r218512)
+++ head/sys/ufs/ufs/ufs_vnops.cThu Feb 10 08:06:56 2011
(r218513)
@@ -91,7 +91,8 @@ FEATURE(ufs_quota64, 64bit UFS disk quo
 #endif
 
 #ifdef SUIDDIR
-FEATURE(suiddir, Give all new files in directory the same ownership as the 
directory);
+FEATURE(suiddir,
+Give all new files in directory the same ownership as the directory);
 #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: r218485 - in head/sys/ufs: ffs ufs

[Alexander Leidinger]

Author: netchild
Date: Wed Feb  9 15:33:13 2011
New Revision: 218485
URL: http://svn.freebsd.org/changeset/base/218485

Log:
  Add some FEATURE macros for some UFS features.
  
  SU+J is not included as a FEATURE macro:
   - it was not in the tree during the GSoC
   - I do not see an option to en-/disable it in NOTES
  
  Two minor changes where made during the review compared to what was developed
  during GSoC 2010.
  
  No FreeBSD version bump, the userland application to query the features will
  be committed last and can serve as an indication of the availablility if
  needed.
  
  Sponsored by: Google Summer of Code 2010
  Submitted by: kibab
  Reviewed by:  kib
  X-MFC after:  to be determined in last commit with code from this project

Modified:
  head/sys/ufs/ffs/ffs_snapshot.c
  head/sys/ufs/ffs/ffs_softdep.c
  head/sys/ufs/ufs/ufs_acl.c
  head/sys/ufs/ufs/ufs_vnops.c

Modified: head/sys/ufs/ffs/ffs_snapshot.c
==
--- head/sys/ufs/ffs/ffs_snapshot.c Wed Feb  9 15:32:04 2011
(r218484)
+++ head/sys/ufs/ffs/ffs_snapshot.c Wed Feb  9 15:33:13 2011
(r218485)
@@ -124,6 +124,7 @@ ffs_copyonwrite(devvp, bp)
 }
 
 #else
+FEATURE(ffs_snapshot, FFS snapshot support);
 
 TAILQ_HEAD(snaphead, inode);
 

Modified: head/sys/ufs/ffs/ffs_softdep.c
==
--- head/sys/ufs/ffs/ffs_softdep.c  Wed Feb  9 15:32:04 2011
(r218484)
+++ head/sys/ufs/ffs/ffs_softdep.c  Wed Feb  9 15:33:13 2011
(r218485)
@@ -575,6 +575,9 @@ softdep_get_depcounts(struct mount *mp,
 }
 
 #else
+
+FEATURE(softupdates, FFS soft-updates support);
+
 /*
  * These definitions need to be adapted to the system to which
  * this file is being ported.

Modified: head/sys/ufs/ufs/ufs_acl.c
==
--- head/sys/ufs/ufs/ufs_acl.c  Wed Feb  9 15:32:04 2011(r218484)
+++ head/sys/ufs/ufs/ufs_acl.c  Wed Feb  9 15:33:13 2011(r218485)
@@ -57,6 +57,8 @@ __FBSDID($FreeBSD$);
 
 #ifdef UFS_ACL
 
+FEATURE(ufs_acl, ACL support for UFS);
+
 /*
  * Synchronize an ACL and an inode by copying over appropriate inode fields
  * to the passed ACL.  Assumes an ACL that would satisfy acl_posix1e_check(),

Modified: head/sys/ufs/ufs/ufs_vnops.c
==
--- head/sys/ufs/ufs/ufs_vnops.cWed Feb  9 15:32:04 2011
(r218484)
+++ head/sys/ufs/ufs/ufs_vnops.cWed Feb  9 15:33:13 2011
(r218485)
@@ -82,8 +82,19 @@ __FBSDID($FreeBSD$);
 #endif
 #ifdef UFS_GJOURNAL
 #include ufs/ufs/gjournal.h
+FEATURE(ufs_gjournal, Journaling support through GEOM for UFS);
 #endif
 
+#ifdef QUOTA
+FEATURE(ufs_quota, UFS disk quotas support);
+FEATURE(ufs_quota64, 64bit UFS disk quotas support);
+#endif
+
+#ifdef SUIDDIR
+FEATURE(suiddir, Give all new files in directory the same ownership as the 
directory);
+#endif
+
+
 #include ufs/ffs/ffs_extern.h
 
 static vop_accessx_t   ufs_accessx;
___
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: r218497 - head/sys/compat/linux

[Alexander Leidinger]

Author: netchild
Date: Wed Feb  9 20:23:22 2011
New Revision: 218497
URL: http://svn.freebsd.org/changeset/base/218497

Log:
  Linux' shm_open() fails because it wants to find some funky shmfs
  to construct the full pathname. It starts to search at the default
  mountpoint which is /dev/shm. If this fails it runs through fstab
  and searches for shmfs and tmpfs. Whatever it finds will be
  statfs()'ed to be checked for Linux' fs magic for shmfs (0x01021994).
  
  Ideally our tmpfs should deliver this fs magic to Linux processes, but
  as our tmpfs is considered to be an experimental feature we can not
  assume that there is always a tmpfs available.
  
  To make shared memory work in the Linuxulator, force the fs type of
  /dev/shm (which can be a symlink) to match what Linux expects. The user
  is responsible (info has to be added to the linux base ports and the docs)
  to setup a suitable link for /dev/shm.
  
  Noticed by:   Andre Albsmeier andre.albsme...@siemens.com
  Submitted by: Andre Albsmeier andre.albsme...@siemens.com
  MFC after:1 month

Modified:
  head/sys/compat/linux/linux_stats.c

Modified: head/sys/compat/linux/linux_stats.c
==
--- head/sys/compat/linux/linux_stats.c Wed Feb  9 19:57:00 2011
(r218496)
+++ head/sys/compat/linux/linux_stats.c Wed Feb  9 20:23:22 2011
(r218497)
@@ -58,6 +58,8 @@ __FBSDID($FreeBSD$);
 #include compat/linux/linux_util.h
 #include compat/linux/linux_file.h
 
+#defineLINUX_SHMFS_MAGIC 0x01021994
+
 static void
 translate_vnhook_major_minor(struct vnode *vp, struct stat *sb)
 {
@@ -394,7 +396,7 @@ linux_statfs(struct thread *td, struct l
struct l_statfs linux_statfs;
struct statfs bsd_statfs;
char *path;
-   int error;
+   int error, dev_shm;
 
LCONVPATHEXIST(td, args-path, path);
 
@@ -402,11 +404,17 @@ linux_statfs(struct thread *td, struct l
if (ldebug(statfs))
printf(ARGS(statfs, %s, *), path);
 #endif
+   dev_shm = 0;
error = kern_statfs(td, path, UIO_SYSSPACE, bsd_statfs);
+   if (strncmp(path, /dev/shm, sizeof(/dev/shm) - 1) == 0)
+   dev_shm = (path[8] == '\0'
+   || (path[8] == '/'  path[9] == '\0'));
LFREEPATH(path);
if (error)
return (error);
bsd_to_linux_statfs(bsd_statfs, linux_statfs);
+   if (dev_shm)
+   linux_statfs.f_type = LINUX_SHMFS_MAGIC;
return copyout(linux_statfs, args-buf, sizeof(linux_statfs));
 }
 
___
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: r216591 - head

[Alexander Leidinger]

On Mon, 20 Dec 2010 19:42:51 -0500 Ben Kaduk minimar...@gmail.com
wrote:

 On Mon, Dec 20, 2010 at 10:17 AM, Alexander Leidinger
 netch...@freebsd.org wrote:
 ==
  --- head/UPDATING       Mon Dec 20 14:54:24 2010        (r216590)
  +++ head/UPDATING       Mon Dec 20 15:17:34 2010        (r216591)
  @@ -1136,8 +1136,8 @@ COMMON ITEMS:
         reboot in single user                         [3]
         mergemaster -p                                  [5]
         make installworld
  -       make delete-old
         mergemaster -i                                  [4]
  +       make delete-old                                 [6]
         reboot
 
 There is of course the issue of when a file is erroneously listed in
 ObsoleteFiles.inc and deleted by delete-old.  The previous order would
 have installworld come in and correct the error, but the current
 version leaves that file deleted.  So there is something of a
 tradeoff.

delete-old was never before installworld.

Bye,
Alexander.
___
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: r216591 - head

[Alexander Leidinger]

Author: netchild
Date: Mon Dec 20 15:17:34 2010
New Revision: 216591
URL: http://svn.freebsd.org/changeset/base/216591

Log:
  Suggest to run the delete-old target after the second mergemaster. If you run
  it before, your rc scripts may still reference old files/directories and
  if you are in the unlucky situation to have triggered a reboot (intentionally
  or not) between the delete-old run and the mergemaster, your system may not
  start anymore.
  
  While I'm here, give a hint about delete-old-libs.
  
  Noticed by:   bcr (luckily in a discussion and not by getting hit by this)
  MFC after:1 week

Modified:
  head/UPDATING

Modified: head/UPDATING
==
--- head/UPDATING   Mon Dec 20 14:54:24 2010(r216590)
+++ head/UPDATING   Mon Dec 20 15:17:34 2010(r216591)
@@ -1136,8 +1136,8 @@ COMMON ITEMS:
reboot in single user [3]
mergemaster -p  [5]
make installworld
-   make delete-old
mergemaster -i  [4]
+   make delete-old [6]
reboot
 
 
@@ -1174,8 +1174,8 @@ COMMON ITEMS:
reboot in single user [3]
mergemaster -p  [5]
make installworld
-   make delete-old
mergemaster -i  [4]
+   make delete-old [6]
reboot
 
Make sure that you've read the UPDATING file to understand the
@@ -1218,6 +1218,10 @@ COMMON ITEMS:
install) after the buildworld before this step if you last updated
from current before 20020224 or from -stable before 20020408.
 
+   [6] This only deletes old files and directories. Old libraries
+   can be deleted by make delete-old-libs, but you have to make
+   sure that no program is using those libraries anymore.
+
[8] In order to have a kernel that can run the 4.x binaries needed to
do an installworld, you must include the COMPAT_FREEBSD4 option in
your kernel.  Failure to do so may leave you with a system that is
___
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