Re: svn commit: r334617 - in head: . etc
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 pgpMENNdr_LKa.pgp Description: Digitale PGP-Signatur
Re: svn commit: r319611 - in head: sys/kern sys/sys usr.sbin/jail
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
pgpOvSpn6EloG.pgp
Description: Digitale PGP-Signatur
svn commit: r320826 - head/sys/sys
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-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r320827 - head/sys/dev/drm
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-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r363125 - head/sys/compat/linux
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r363130 - head/sys/compat/linux
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r363125 - head/sys/compat/linux
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.
svn commit: r364375 - head
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r367481 - in head: share/man/man4 sys/compat/linux
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,
&linux_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);
Re: svn commit: r325294 - head/sys/dev/evdev
Quoting Vladimir Kondratyev (from Wed, 1 Nov 2017 22:09:10 + (UTC)): Author: wulf Date: Wed Nov 1 22:09:10 2017 New Revision: 325294 URL: https://svnweb.freebsd.org/changeset/base/325294 Log: evdev: Hide "kern.evdev.rcpt_mask" sysctl if kernel is compiled w/o EVDEV_SUPPORT as it's value has no meaning in this case. Now presence of this sysctl can be used for discovery if evdev support for hybrid devices is compiled into kernel or not. If you want to show the presence of a feature in the kernel: we have the FEATURE() macro for this. It's in sys/sysctl.h and you can use it like: FEATURE(evdev, "evdev protocol support"); You can then query it either via "sysctl kern.features.evdev" or via the "feature_present()" function in libc. Bye, Alexander. -- http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.orgnetch...@freebsd.org : PGP 0x8F31830F9F2772BF pgpNRfEQIV8rL.pgp Description: Digitale PGP-Signatur
svn commit: r357774 - head/tools/kerneldoc/subsys
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-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359325 - head/tools/kerneldoc/subsys
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r219028 - in head/sys: cam fs/nfsclient fs/nfsserver kern nfsclient nfsserver security/audit security/mac
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
#include
#include
+
+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
#include
+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
#include
+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
#include
#include
+#include
#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 INVARIANTS option");
+
#ifndef INVARIANTS
#undef _lockmgr_assert
#endif
Modified: head/sys/kern/kern_ntptime.c
==
svn commit: r219029 - in head/sys/geom: . bde cache concat eli gate journal label linux_lvm mirror multipath part raid3 shsec stripe uzip virstor
Author: netchild
Date: Fri Feb 25 10:24:35 2011
New Revision: 219029
URL: http://svn.freebsd.org/changeset/base/219029
Log:
Add some FEATURE macros for various GEOM classes.
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: silence on geom@ during 2 weeks
X-MFC after: to be determined in last commit with code from this project
Modified:
head/sys/geom/bde/g_bde.c
head/sys/geom/cache/g_cache.c
head/sys/geom/concat/g_concat.c
head/sys/geom/eli/g_eli.c
head/sys/geom/gate/g_gate.c
head/sys/geom/geom_bsd.c
head/sys/geom/geom_fox.c
head/sys/geom/geom_mbr.c
head/sys/geom/geom_pc98.c
head/sys/geom/geom_sunlabel.c
head/sys/geom/geom_vol_ffs.c
head/sys/geom/journal/g_journal.c
head/sys/geom/label/g_label.c
head/sys/geom/linux_lvm/g_linux_lvm.c
head/sys/geom/mirror/g_mirror.c
head/sys/geom/multipath/g_multipath.c
head/sys/geom/part/g_part_apm.c
head/sys/geom/part/g_part_bsd.c
head/sys/geom/part/g_part_ebr.c
head/sys/geom/part/g_part_gpt.c
head/sys/geom/part/g_part_mbr.c
head/sys/geom/part/g_part_pc98.c
head/sys/geom/part/g_part_vtoc8.c
head/sys/geom/raid3/g_raid3.c
head/sys/geom/shsec/g_shsec.c
head/sys/geom/stripe/g_stripe.c
head/sys/geom/uzip/g_uzip.c
head/sys/geom/virstor/g_virstor.c
Modified: head/sys/geom/bde/g_bde.c
==
--- head/sys/geom/bde/g_bde.c Fri Feb 25 10:11:01 2011(r219028)
+++ head/sys/geom/bde/g_bde.c Fri Feb 25 10:24:35 2011(r219029)
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
#include
#include
@@ -48,6 +49,8 @@
#include
#define BDE_CLASS_NAME "BDE"
+FEATURE(geom_bde, "GEOM-based Disk Encryption");
+
static void
g_bde_start(struct bio *bp)
{
Modified: head/sys/geom/cache/g_cache.c
==
--- head/sys/geom/cache/g_cache.c Fri Feb 25 10:11:01 2011
(r219028)
+++ head/sys/geom/cache/g_cache.c Fri Feb 25 10:24:35 2011
(r219029)
@@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+FEATURE(geom_cache, "GEOM cache module");
+
static MALLOC_DEFINE(M_GCACHE, "gcache_data", "GEOM_CACHE Data");
SYSCTL_DECL(_kern_geom);
Modified: head/sys/geom/concat/g_concat.c
==
--- head/sys/geom/concat/g_concat.c Fri Feb 25 10:11:01 2011
(r219028)
+++ head/sys/geom/concat/g_concat.c Fri Feb 25 10:24:35 2011
(r219029)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+FEATURE(geom_concat, "GEOM concatenation support");
static MALLOC_DEFINE(M_CONCAT, "concat_data", "GEOM_CONCAT Data");
Modified: head/sys/geom/eli/g_eli.c
==
--- head/sys/geom/eli/g_eli.c Fri Feb 25 10:11:01 2011(r219028)
+++ head/sys/geom/eli/g_eli.c Fri Feb 25 10:24:35 2011(r219029)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+FEATURE(geom_eli, "GEOM crypto module");
MALLOC_DEFINE(M_ELI, "eli data", "GEOM_ELI Data");
Modified: head/sys/geom/gate/g_gate.c
==
--- head/sys/geom/gate/g_gate.c Fri Feb 25 10:11:01 2011(r219028)
+++ head/sys/geom/gate/g_gate.c Fri Feb 25 10:24:35 2011(r219029)
@@ -53,6 +53,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+FEATURE(geom_gate, "GEOM Gate module");
+
static MALLOC_DEFINE(M_GATE, "gg_data", "GEOM Gate Data");
SYSCTL_DECL(_kern_geom);
Modified: head/sys/geom/geom_bsd.c
==
--- head/sys/geom/geom_bsd.cFri Feb 25 10:11:01 2011(r219028)
+++ head/sys/geom/geom_bsd.cFri Feb 25 10:24:35 2011(r219029)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -60,6 +61,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+FEATURE(geom_bsd, "GEOM BSD disklabels support");
+
#defineBSD_CLASS_NAME "BSD"
#define ALPHA_LABEL_OFFSET 64
Modified: head/sys/geom/geom_fox.c
==
--- head/sys/geom/geom_fox.cFri Feb 25 10:11:01 2011(r219028)
+++ head/sys/geom/geom_fox.cFri Feb 25 10:24:35 2011(r219029)
@@ -37,6 +37,7 @@
#include
#include
+#include
#include
#include
#include
@@ -52,6 +53,8 @@
#define FOX_CLASS_NAME "FOX"
#define FOX_MAGIC "GEOM::FOX"
+FEATURE(geom_fox, "GEOM FOX redundant path mitigation support");
+
struct g_fox_softc {
off_t mediasize;
u_int se
svn commit: r219030 - head/sys/kern
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
-FEATURE(p1003_1b_semaphores, "POSIX1003.1B semaphores support");
+FEATURE(p1003_1b_semaphores, "POSIX P1003.1B semaphores support");
/*
* TODO
*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r219129 - in head/sys: compat/freebsd32 conf kern sys
Quoting Robert Watson (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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r219138 - head/usr.bin/kdump
Quoting Dmitry Chagin (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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r219138 - head/usr.bin/kdump
Quoting Robert Watson (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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r219138 - head/usr.bin/kdump
Quoting Chagin Dmitry (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 (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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r219258 - in head/sys: kern security/mac
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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r219559 - in head/sys: amd64/linux32 compat/freebsd32 i386/linux kern
On Sat, 12 Mar 2011 08:51:43 + (UTC) Andriy Gapon
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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-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
On Sat, 12 Mar 2011 09:09:25 + (UTC) Andriy Gapon 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 > > #ifdef LINUX_SYSTRACE > -#include > -#include > -#include > -#include > -#include > +#if defined(__amd64__) > +#include > +#include > +#include > +#include > +#elif defined(__i386__) > +#include > +#include > +#include > +#include 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 PROVNAME"linsyscall" > +#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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r219559 - in head/sys: amd64/linux32 compat/freebsd32 i386/linux kern
On Sat, 12 Mar 2011 22:24:09 -0800 Artem Belevich 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r219668 - head/sys/compat/linux
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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r221348 - head/sys/boot/i386/boot2
Quoting Roman Divacky (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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r221423 - head/sys/compat/linux
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
+ * Justin Schoeman
+ * et al.
+ */
+#ifdef __KERNEL__
+#include /* need struct timeval */
+#include
+#include
+#include
+#endif
+#include /* 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
+
svn commit: r221424 - head/sys/compat/linux
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 /* need struct timeval */ #include @@ -20,6 +34,7 @@ #include #endif #include /* need __user */ +#endif #define OBSOLETE_OWNER 1 /* It will be removed for 2.6.17 */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r221425 - head/sys/compat/linux
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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r221426 - head/sys/compat/linux
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
#include
#include
+#include
+#include
+#include
#include
#include
@@ -83,6 +86,9 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
+#include
+
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
+#ifdef V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY
+ || lvf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY
+#endif
+ )
svn commit: r221428 - head/sys/compat/linux
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
#include
#include
+#include
#include
#include
#include
@@ -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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r221430 - head/etc/periodic/daily
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
echo " WARNING: 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"*)
echo " starting first scrub (since reboot) of
pool '${pool}':"
zpool scrub ${pool}
+ [ $rc -eq 0 ] && rc=1
;;
*)
echo " starting scrub of pool '${pool}':"
zpool scrub ${pool}
+ [ $rc -eq 0 ] && rc=1
;;
esac
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r221432 - head/etc/periodic/daily
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
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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r221434 - head/sys/compat/linux
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
Quoting Ivan Klymenko (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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r206082 - in head: . share/man/man7 share/mk sys/conf
Quoting Kostik Belousov (from Sun, 4 Apr 2010 18:36:53 +0300): On Fri, Apr 02, 2010 at 06:55:32AM +, Alexander Leidinger wrote: Author: netchild Date: Fri Apr 2 06:55:31 2010 New Revision: 206082 URL: http://svn.freebsd.org/changeset/base/206082 Log: WITH_CTF can now be specified in src.conf (not recommended, there are some problems with static executables), make.conf (would also affect ports which do not use GNU make and do not override the compile targets) or in the kernel config (via "makeoptions WITH_CTF=yes"). I think this commit started the kernel build to emit lines like this [ -z "ctfconvert" -o -n "1" ] || ctfconvert -L VERSION -g vm_init.o after compilation of each file from the kernel (but not modules) source. Could you, please, look for missed '@' ? I just reviewed the diff again and there is only one place where no @ is, this is for NORMAL_CTFCONVERT. Before I committed the patch, I searched where it is used, but I didn't find a place where it is used. Maybe I overlooked something (I didn't review the Makfile which is generated by running the config program on the kernel-config, and I will not get time to do this today). Can you please confirm that you did an installworld before building the kernel? Bye, Alexander. -- http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 BOFH excuse #396: Mail server hit by UniSpammer ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r206082 - in head: . share/man/man7 share/mk sys/conf
Quoting Kostik Belousov (from Mon, 5 Apr 2010 16:35:05 +0300): On Mon, Apr 05, 2010 at 02:31:23PM +0200, Alexander Leidinger wrote: Quoting Kostik Belousov (from Sun, 4 Apr 2010 18:36:53 +0300): >On Fri, Apr 02, 2010 at 06:55:32AM +0000, Alexander Leidinger wrote: >>Author: netchild >>Date: Fri Apr 2 06:55:31 2010 >>New Revision: 206082 >>URL: http://svn.freebsd.org/changeset/base/206082 >> >>Log: >> WITH_CTF can now be specified in src.conf (not recommended, there >> are some problems with static executables), make.conf (would also >> affect ports which do not use GNU make and do not override the >> compile targets) or in the kernel config (via "makeoptions >> WITH_CTF=yes"). > >I think this commit started the kernel build to emit lines like this >[ -z "ctfconvert" -o -n "1" ] || ctfconvert -L VERSION -g vm_init.o >after compilation of each file from the kernel (but not modules) >source. Could you, please, look for missed '@' ? I just reviewed the diff again and there is only one place where no @ is, this is for NORMAL_CTFCONVERT. Before I committed the patch, I searched where it is used, but I didn't find a place where it is used. Maybe I overlooked something (I didn't review the Makfile which is generated by running the config program on the kernel-config, and I will not get time to do this today). Can you please confirm that you did an installworld before building the kernel? I can confirm that r206179 fixed the issue. To answer your question, no, I did not performed installworld. I do buildkernel in cross-build environment, i.e. I do buildworld and then buildkernel. Ok, thanks for the info. Warner, do you mind if I back-out r206082 and change the place where NORMAL_CTFCONVERT is used instead (fist I have to search for it again... not today)? It would make it consistent with all other places (SYSTEM_CTFCONVERT and the plain test and use of CTFxxx). Bye, Alexander. -- http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 When the doubt vanishes and the issue becomes evident, stupidity reigns. -- Poul Henningsen [1894-1967] ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r206082 - in head: . share/man/man7 share/mk sys/conf
Quoting "M. Warner Losh" (from Tue, 06 Apr 2010
10:54:17 -0600 (MDT)):
In message: <20100405181450.13494itjj2ehj...@webmail.leidinger.net>
Alexander Leidinger writes:
: Warner, do you mind if I back-out r206082 and change the place where
: NORMAL_CTFCONVERT is used instead (fist I have to search for it
: again... not today)? It would make it consistent with all other places
: (SYSTEM_CTFCONVERT and the plain test and use of CTFxxx).
Go ahead. I just did the fast and dirty fix. I though it was
consistent with how other things were done, but if not, feel free to
correct it. Also, see bde's commentary :)
I can not find it, can you please forward it to me?
Here is what I have ATM (copy&paste, so tabs are probably mangled):
---snip---
Index: usr.sbin/config/mkmakefile.c
===
--- usr.sbin/config/mkmakefile.c(revision 206031)
+++ usr.sbin/config/mkmakefile.c(working copy)
@@ -741,7 +741,7 @@
printf("config: don't know rules for
%s\n", np);break;
}
- snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n.if
defined(NORMAL_CTFCONVERT) &&
!empty(NORMAL_CTFCONVERT)\n\t${NORMAL_CTFCONVERT}\n.endif", ftype,
+ snprintf(cmd, sizeof(cmd),
"${%s_%c%s}\...@${normal_ctfconvert}", ftype,
toupper(och),
ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
compilewith = cmd;
Index: sys/conf/kern.pre.mk
===
--- sys/conf/kern.pre.mk(revision 206248)
+++ sys/conf/kern.pre.mk(working copy)
@@ -128,7 +128,7 @@
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
-NORMAL_CTFCONVERT= @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] ||
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] ||
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
---snip---
Bye,
Alexander.
--
http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
Look before you leap.
-- Samuel Butler
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r206082 - in head: . share/man/man7 share/mk sys/conf
Quoting "M. Warner Losh" (from Thu, 08 Apr 2010
15:12:13 -0600 (MDT)):
In message: <20100407100015.117169nw2iu6x...@webmail.leidinger.net>
Alexander Leidinger writes:
: Quoting "M. Warner Losh" (from Tue, 06 Apr 2010
: 10:54:17 -0600 (MDT)):
:
: > In message: <20100405181450.13494itjj2ehj...@webmail.leidinger.net>
: > Alexander Leidinger writes:
: > : Warner, do you mind if I back-out r206082 and change the place where
: > : NORMAL_CTFCONVERT is used instead (fist I have to search for it
: > : again... not today)? It would make it consistent with all other
: > places
: > : (SYSTEM_CTFCONVERT and the plain test and use of CTFxxx).
: >
: > Go ahead. I just did the fast and dirty fix. I though it was
: > consistent with how other things were done, but if not, feel free to
: > correct it. Also, see bde's commentary :)
:
: I can not find it, can you please forward it to me?
Will do.
: Here is what I have ATM (copy&paste, so tabs are probably mangled):
: ---snip---
: Index: usr.sbin/config/mkmakefile.c
: ===
: --- usr.sbin/config/mkmakefile.c(revision 206031)
: +++ usr.sbin/config/mkmakefile.c(working copy)
: @@ -741,7 +741,7 @@
: printf("config: don't know rules for %s\n",
: np); break;
: }
: - snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n.if
: - defined(NORMAL_CTFCONVERT) &&
: -
!empty(NORMAL_CTFCONVERT)\n\t${NORMAL_CTFCONVERT}\n.endif",
: - ftype,
: + snprintf(cmd, sizeof(cmd), "${%s_%c%s}\...@${normal_ctfconvert}",
: ftype,
: toupper(och),
: ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
: compilewith = cmd;
Uggg, this should have never been put into mkmakefile.c in the first
place. I'm concerned that a change like this will have bad effects
for people that have cross-threaded config and kernels. :(
You need to have a look at the complete code, there is more than only
the use of NORMAL_CTFCONVERT. Regarding the cross-case, I think it can
be done by overriding NORMAL_CTFCONVERT (if needed).
However, go ahead and fix it. I worry about people with
cross-threaded kernels, but that won't be a huge deal, I don't think.
Please monitor the lists to make sure...
Do I understand this right, that you think I shall do it before I get
the forwarded mail?
Bye,
Alexander.
--
http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
There is a 20% chance of tomorrow.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r206452 - head/sys/netinet
Quoting Bruce Simpson (from Thu, 15 Apr 2010 18:10:04 +0100): On 04/10/10 13:05, Bruce M Simpson wrote: Log: Fix a few issues related to the legacy 4.4 BSD multicast APIs. IPv4 addresses can and do change during normal operation. Testing by pfSense developers exposed an issue where OpenOSPFD was using the IPv4 address to leave the OSPF link-scope multicast groups on a dynamic OpenVPN tun interface, rather than using RFC 3678 with the interface index, which won't be raced when the interface's addresses change. I should point out that IP multicast is counter-intuitive in many areas. It seems that knowledge of how to work with it effectively is not that widespread. People who have a need to use it, often have very specific requirements. IP multicast group membership is always scoped to physical links [1]. The 4.4BSD API originally used the "primary IP address" to identify each link. Unfortunately this is not a persistent identifier, especially so in the use-case which had problems. Is/was this the reason why multicast does not work in jails? In the updated API specified in RFC 3678, the primary key for multicast memberships, changes to the interface index. routed(8) in FreeBSD's SVN tree uses this new API; thanks to phk for reviewing and testing my change. Will this change make it possible to use multicast in jails now? Bye, Alexander. -- Dentist, n.: A Prestidigitator who, putting metal in one's mouth, pulls coins out of one's pockets. -- Ambrose Bierce, "The Devil's Dictionary" http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r207056 - in head: sys/conf usr.sbin/config
Author: netchild
Date: Thu Apr 22 09:20:17 2010
New Revision: 207056
URL: http://svn.freebsd.org/changeset/base/207056
Log:
Revert r206179 (by imp) and do something similar which is more consistent
with all other corresponding CTF places by changing the corresponding
code which is generated by config(8). Or in short, move the '@' from
the variable definition to the use of the variable. [1]
While I'm here break up a long line. [2]
Discussed with: imp [1,2], bde [2]
Modified:
head/sys/conf/kern.pre.mk
head/usr.sbin/config/mkmakefile.c
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Thu Apr 22 06:58:59 2010(r207055)
+++ head/sys/conf/kern.pre.mk Thu Apr 22 09:20:17 2010(r207056)
@@ -128,7 +128,8 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
-NORMAL_CTFCONVERT= @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT}
${CTFFLAGS} ${.TARGET}
+NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
Modified: head/usr.sbin/config/mkmakefile.c
==
--- head/usr.sbin/config/mkmakefile.c Thu Apr 22 06:58:59 2010
(r207055)
+++ head/usr.sbin/config/mkmakefile.c Thu Apr 22 09:20:17 2010
(r207056)
@@ -741,7 +741,7 @@ do_rules(FILE *f)
printf("config: don't know rules for %s\n", np);
break;
}
- snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n.if
defined(NORMAL_CTFCONVERT) &&
!empty(NORMAL_CTFCONVERT)\n\t${NORMAL_CTFCONVERT}\n.endif", ftype,
+ snprintf(cmd, sizeof(cmd),
"${%s_%c%s}\...@${normal_ctfconvert}", ftype,
toupper(och),
ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
compilewith = cmd;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r207057 - head/sys/conf
Author: netchild
Date: Thu Apr 22 09:24:01 2010
New Revision: 207057
URL: http://svn.freebsd.org/changeset/base/207057
Log:
Do the ctfmerge (= all symbols, not only symbols from one object file) for
KLDs too.
Noticed by: np
Modified:
head/sys/conf/kmod.mk
Modified: head/sys/conf/kmod.mk
==
--- head/sys/conf/kmod.mk Thu Apr 22 09:20:17 2010(r207056)
+++ head/sys/conf/kmod.mk Thu Apr 22 09:24:01 2010(r207057)
@@ -137,6 +137,10 @@ CFLAGS+= -mlongcall -fno-omit-frame-poin
CFLAGS+= -G0 -fno-pic -mno-abicalls -mlong-calls
.endif
+.if defined(DEBUG) || defined(DEBUG_FLAGS)
+CTFFLAGS+= -g
+.endif
+
.if defined(FIRMWS)
.if !exists(@)
${KMOD:S/$/.c/}: @
@@ -202,6 +206,7 @@ ${KMOD}.kld: ${OBJS}
${FULLPROG}: ${OBJS}
.endif
${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
+ @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || ${CTFMERGE} ${CTFFLAGS} -o
${.TARGET} ${OBJS}
.if defined(EXPORT_SYMS)
.if ${EXPORT_SYMS} != YES
.if ${EXPORT_SYMS} == NO
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r207058 - head
Author: netchild
Date: Thu Apr 22 09:30:02 2010
New Revision: 207058
URL: http://svn.freebsd.org/changeset/base/207058
Log:
Remove explicit setting of NO_CTF in WMAKEENV and in the make call for
the buildkernel. This way makeoptions WITH_CTF=yes not only works when
compiling the tradtitional way, but also when using buildkernel. This
does not enable the CTF part of the world, it still defaults to without
CTF info.
The cross/build-tools/bootstrap targets are not affected by this, they
still have and should keep the explicit NO_CTF.
Notified by: np
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Apr 22 09:24:01 2010(r207057)
+++ head/Makefile.inc1 Thu Apr 22 09:30:02 2010(r207058)
@@ -259,7 +259,7 @@ WMAKEENV= ${CROSSENV} \
VERSION="${VERSION}" \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
-.if ${MK_CDDL} == "no" || defined(NO_CTF)
+.if ${MK_CDDL} == "no"
WMAKEENV+= NO_CTF=1
.endif
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -780,7 +780,7 @@ buildkernel:
@echo "--"
cd ${KRNLOBJDIR}/${_kernel}; \
MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
- ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \
+ ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS \
-f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) &&
exists(${KERNSRCDIR}/modules)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r207569 - head/sys/compat/linux
Author: netchild
Date: Mon May 3 14:19:58 2010
New Revision: 207569
URL: http://svn.freebsd.org/changeset/base/207569
Log:
- #ifdef out the cliplist part, skype seems like using an uninitialized
variable and can cause problems, without the cliplist handling it works
without problems
- improve the cliplist error handling
- fix VIDIOCGTUNER and VIDIOCSMICROCODE (still no hardware available to test)
Submitted by: J.R. Oldroyd
X-MFC after: soon (together with all the v4l stuff)
Modified:
head/sys/compat/linux/linux_ioctl.c
Modified: head/sys/compat/linux/linux_ioctl.c
==
--- head/sys/compat/linux/linux_ioctl.c Mon May 3 12:43:17 2010
(r207568)
+++ head/sys/compat/linux/linux_ioctl.c Mon May 3 14:19:58 2010
(r207569)
@@ -2628,6 +2628,7 @@ bsd_to_linux_v4l_tuner(struct video_tune
return (0);
}
+#ifdef COMPAT_LINUX_V4L_CLIPLIST
static int
linux_to_bsd_v4l_clip(struct l_video_clip *lvc, struct video_clip *vc)
{
@@ -2638,6 +2639,7 @@ linux_to_bsd_v4l_clip(struct l_video_cli
vc->next = PTRIN(lvc->next);/* possible pointer size conversion */
return (0);
}
+#endif
static int
linux_to_bsd_v4l_window(struct l_video_window *lvw, struct video_window *vw)
@@ -2698,6 +2700,7 @@ linux_to_bsd_v4l_code(struct l_video_cod
return (0);
}
+#ifdef COMPAT_LINUX_V4L_CLIPLIST
static int
linux_v4l_clip_copy(void *lvc, struct video_clip **ppvc)
{
@@ -2772,15 +2775,18 @@ linux_v4l_cliplist_copy(struct l_video_w
* example of cliplist use.
*/
plvc = PTRIN(lvw->clips);
+ vw->clips = NULL;
ppvc = &(vw->clips);
while (clipcount-- > 0) {
- if (plvc == 0)
+ if (plvc == 0) {
error = EFAULT;
- if (!error)
- error = linux_v4l_clip_copy(plvc, ppvc);
- if (error) {
- linux_v4l_cliplist_free(vw);
break;
+ } else {
+ error = linux_v4l_clip_copy(plvc, ppvc);
+ if (error) {
+ linux_v4l_cliplist_free(vw);
+ break;
+ }
}
ppvc = &((*ppvc)->next);
plvc = PTRIN(((struct l_video_clip *) plvc)->next);
@@ -2795,6 +2801,7 @@ linux_v4l_cliplist_copy(struct l_video_w
}
return (error);
}
+#endif
static int
linux_ioctl_v4l(struct thread *td, struct linux_ioctl_args *args)
@@ -2818,6 +2825,12 @@ linux_ioctl_v4l(struct thread *td, struc
case LINUX_VIDIOCGTUNER:
if ((error = fget(td, args->fd, &fp)) != 0)
return (error);
+ error = copyin((void *) args->arg, &l_vtun, sizeof(l_vtun));
+ if (error) {
+ fdrop(fp, td);
+ return (error);
+ }
+ linux_to_bsd_v4l_tuner(&l_vtun, &vtun);
error = fo_ioctl(fp, VIDIOCGTUNER, &vtun, td->td_ucred, td);
if (!error) {
bsd_to_linux_v4l_tuner(&vtun, &l_vtun);
@@ -2836,7 +2849,7 @@ linux_ioctl_v4l(struct thread *td, struc
return (error);
}
linux_to_bsd_v4l_tuner(&l_vtun, &vtun);
- error = fo_ioctl(fp, VIDIOCSMICROCODE, &vtun, td->td_ucred, td);
+ error = fo_ioctl(fp, VIDIOCSTUNER, &vtun, td->td_ucred, td);
fdrop(fp, td);
return (error);
@@ -2865,14 +2878,18 @@ linux_ioctl_v4l(struct thread *td, struc
return (error);
}
linux_to_bsd_v4l_window(&l_vwin, &vwin);
+#ifdef COMPAT_LINUX_V4L_CLIPLIST
error = linux_v4l_cliplist_copy(&l_vwin, &vwin);
if (error) {
fdrop(fp, td);
return (error);
}
+#endif
error = fo_ioctl(fp, VIDIOCSWIN, &vwin, td->td_ucred, td);
fdrop(fp, td);
+#ifdef COMPAT_LINUX_V4L_CLIPLIST
linux_v4l_cliplist_free(&vwin);
+#endif
return (error);
case LINUX_VIDIOCGFBUF:
@@ -2924,7 +2941,7 @@ linux_ioctl_v4l(struct thread *td, struc
return (error);
}
linux_to_bsd_v4l_code(&l_vcode, &vcode);
- error = fo_ioctl(fp, VIDIOCSTUNER, &vcode, td->td_ucred, td);
+ error = fo_ioctl(fp, VIDIOCSMICROCODE, &vcode, td->td_ucred,
td);
fdrop(fp, td);
return (error);
___
svn-src-head@freebsd.org ma
Re: svn commit: r207612 - head/usr.sbin/mergemaster
Quoting Norikatsu Shigemura (from Tue, 4 May 2010 11:25:04 + (UTC)): Author: nork Date: Tue May 4 11:25:04 2010 New Revision: 207612 URL: http://svn.freebsd.org/changeset/base/207612 Log: Add support run services_mkdb(8). Shouldn't this (and similar messages) only be done if there is a corresponding DB file? Everything is working just fine without the DB files, and the man-pages only recommend to create DB files for performance reasons. By default the DB files are not created, and as such it looks a bit strange to tell to "make sure" to create the DB file(s). Bye, Alexander. -- The best laid plans of mice and men are held up in the legal department. http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r207612 - head/usr.sbin/mergemaster
Quoting Norikatsu Shigemura (from Tue, 4 May 2010 23:22:46 +0900): Hi netchild. On Tue, 04 May 2010 16:02:55 +0200 Alexander Leidinger wrote: > URL: http://svn.freebsd.org/changeset/base/207612 > Log: > Add support run services_mkdb(8). Shouldn't this (and similar messages) only be done if there is a corresponding DB file? Everything is working just fine without the DB files, and the man-pages only recommend to create DB files for performance reasons. By default the DB files are not created, and as such it looks a bit strange to tell to "make sure" to create the DB file(s). My first patch has a test code '[ -f /var/db/services.db ] &&', However, as the result, I discussed with dougb, he said that existing /var/db/services.db is harmless. So I don't have any objection, and remove a test code. I do not complain about your patch, you just had the bad luck that I noticed an extension of something which I think is not user friendly. I just used your commit to tell Doug (and others) about it. I would print such a message only (for login.conf, services or whatever), if the DB file exists. Because if it exists, not updating the DB file is harmful (it does not contain what people would expect). If the file does not exist, there is nothing to do. The user does not want or does not know how to use this feature, so do not tell him to do or use something he doesn't want or doesn't understand (lack of knowledge, not lack of capability). Bye, Alexander. -- Sometime in 1993 NANCY SINATRA will lead a BLOODLESS COUP on GUAM!! http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r207612 - head/usr.sbin/mergemaster
Quoting Doug Barton (from Tue, 04 May 2010 09:00:33 -0700): On 5/4/2010 7:02 AM, Alexander Leidinger wrote: Quoting Norikatsu Shigemura (from Tue, 4 May 2010 11:25:04 + (UTC)): Author: nork Date: Tue May 4 11:25:04 2010 New Revision: 207612 URL: http://svn.freebsd.org/changeset/base/207612 Log: Add support run services_mkdb(8). Shouldn't this (and similar messages) only be done if there is a corresponding DB file? This is the first case where the db file is "optional." All the others No, the DB for login.conf is optional too. The man page of login.conf is wrong. The cgetent(3) man-page explicitely tells that it first looks in the DB file, but falls back to the ASCII file if the DB file is not available. have been created by default for ages now, and nork was simply copying the existing code (including the "make sure" bit). I was assuming that it is just a copy of what exists. As he pointed out, I asked him to make the prompt unconditional since the db file is small, and harmless if not being used. Making it conditional now is a pointless micro-optimization that will have to be removed down the road when having/needing it becomes the default. Is there some movement to make it not optional? I do not think it is a micro-optimization. I do not talk about some performance impact (be it work which has to do be done by a person or by a CPU), it is about system knowledge. The DB is optional, if you ask someone without enough knowledge (and there are a lot of such people which do sysadministration stuff) to do this, he will not understand what this implies (that he has to run such a command every time /etc/services is changed). The DB file is only harmless if it is in sync with the ASCII file. If they are not in sync, the DB file is harmful to people which do not know about this feature. As an example of what I talk about: my client is a part of the european comission. This means we talk about a some kind of government entity (what follows can be told about big corporations too). They outsource the work for some specific time, and after that they make a new call for tender for this position. Most of the time the cheapest offer wins (decission of the bean counters, not by people which know what it means technically). I was there in the previous contract and in the current contract. In the previous contract we all where highly skilled. Now with a new manager (who has himself some sysadmin knowledge) everything changed. Junior admins are taking care about all sysadmin stuff, and the few seniors which are left are some kind of firefighters and do some kind of special investigations work. Now, if a junior admin sees some kind of procedure, he follows it. He does not see strange things, he does not know the implications of a lot of stuff, and not all ask questions of what it means for the system if he runs a command he does not know about. That's bad, but this is life. They do what they get told to do to earn money. To make my life a little bit more easy, I wrote a script which checks a system (Solaris) for the correct setup. It checks a lot of things, simple things (hostname, domainname, TZ, ...) and complex things (multipathing, ZFS/VxVM stuff, Zones, SMF, ...), generic stuff and the site specific configs. There I do not say only OK or ERROR, I also give infos. The infos are not only like 'do this', but also sometimes also 'ask someone with knowledge about this'. What I try to do there is to be as precise as possible (if there are conditions, I check the conditions if possible, or to tell as good as possible how to check conditions, which the script can not check itself), because I've already seen what people make out of not so detailed explanations. To come back to FreeBSD: a port may tell to modify /etc/services, but it may not tell to recreate the optional DB file (or the user may decide to not act because of the 'optional' and because he does not know what this is). The ports we can fix, but if someone is using some 3rd party application which is not in ports, and this application tells to modify /etc/services, then it is not within our control to fix the problem which may be caused by a stale DB file which the person installing the application does not know about. I hope this makes it more clear what kind of problem I see with the DB files for login.conf and the services file. Bye, Alexander. -- My brain is my second favorite organ. -- Woody Allen http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r209195 - in head: etc/periodic/daily share/man/man5
Author: netchild
Date: Tue Jun 15 08:58:16 2010
New Revision: 209195
URL: http://svn.freebsd.org/changeset/base/209195
Log:
Add a periodic zfs scrub script.
Features:
- configurable amount of days between scrubs (default value or per pool)
- do not scrub directly after pool creation (respects the configured
number of days between scrubs)
- do not scrub if a scrub is in progress
- tells how to see the status of the scrub
- tells how many days since the last scrub if it skips the scrubbing
- warns if a non-existent pool is specified explicitely
(default: no pools specified -> all currently imported pools are
handled)
- runs late in the periodic run to not slow down the other periodic daily
scripts
Discussed on: fs@
Added:
head/etc/periodic/daily/800.scrub-zfs (contents, props changed)
Modified:
head/share/man/man5/periodic.conf.5
Added: head/etc/periodic/daily/800.scrub-zfs
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/periodic/daily/800.scrub-zfs Tue Jun 15 08:58:16 2010
(r209195)
@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+. /etc/defaults/periodic.conf
+source_periodic_confs
+fi
+
+: ${daily_scrub_zfs_default_threshold=30}
+
+case "$daily_scrub_zfs_enable" in
+[Yy][Ee][Ss])
+ echo
+ echo 'Scrubbing of zfs pools:'
+
+ if [ -z "${daily_scrub_zfs_pools}" ]; then
+ daily_scrub_zfs_pools="$(zpool list -H -o name)"
+ fi
+
+ for pool in ${daily_scrub_zfs_pools}; do
+ # sanity check
+ zpool list ${pool} >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ echo " WARNING: pool '${pool}' specified in"
+ echo "
'/etc/periodic.conf:daily_scrub_zfs_pools'"
+ echo "does not exist"
+ continue
+ fi
+
+ # 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
+ _pool_threshold=${daily_scrub_zfs_default_threshold}
+ fi
+
+ _last_scrub=$(zpool history ${pool} | \
+ egrep "^[0-9\.\:\-]{19} zpool scrub ${pool}\$" | tail -1 |\
+ cut -d ' ' -f 1)
+ if [ -z "${_last_scrub}" ]; then
+ # creation time of the pool if no scrub was done
+ _last_scrub=$(zpool history ${pool} | \
+ sed -ne '2s/ .*$//p')
+ fi
+
+ # Now minus last scrub (both in seconds) converted to days.
+ _scrub_diff=$(expr -e \( $(date +%s) - \
+ $(date -j -f %F.%T ${_last_scrub} +%s) \) / 60 / 60 / 24)
+ if [ ${_scrub_diff} -le ${_pool_threshold} ]; then
+ echo " skipping scrubbing of pool '${pool}':"
+ echo " last scrubbing is ${_scrub_diff} days ago,
threshold is set to ${_pool_threshold} days"
+ continue
+ fi
+
+ _status="$(zpool status ${pool} | grep scrub:)"
+ case "${_status}" in
+ *"scrub in progress"*)
+ echo " scrubbing of pool '${pool}' already in
progress, skipping:"
+ ;;
+ *"none requested"*)
+ echo " starting first scrubbing (after
reboot) of pool '${pool}':"
+ zpool scrub ${pool}
+ ;;
+ *)
+ echo " starting scrubbing of pool '${pool}':"
+ zpool scrub ${pool}
+ ;;
+ esac
+
+ echo " consult 'zpool status ${pool}' for the result"
+ done
+ ;;
+
+*)
+ rc=0
+ ;;
+esac
+
+exit $rc
Modified: head/share/man/man5/periodic.conf.5
==
--- head/share/man/man5/periodic.conf.5 Tue Jun 15 08:53:13 2010
(r209194)
+++ head/share/man/man5/periodic.conf.5 Tue Jun 15 08:58:16 2010
(r209195)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 12, 2007
+.Dd June 15, 2010
.Dt PERIODIC.CONF 5
.Os
.Sh NAME
@@ -611,6 +611,25 @@ when
.Va daily_queuerun_enable
is set to
.Dq Li YES .
+.It Va daily_scrub_zfs_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run a zfs scrub periodically.
+.It Va daily_scrub_zfs_pools
+.Pq V
svn commit: r209250 - head/etc/periodic/daily
Author: netchild
Date: Thu Jun 17 12:25:47 2010
New Revision: 209250
URL: http://svn.freebsd.org/changeset/base/209250
Log:
- add the zfs scrub script
- move the zfs status script into the MK_ZFS conditional to respect
WITHOUT_ZFS
Noticed by: Andrzej Tobola
Modified:
head/etc/periodic/daily/Makefile
Modified: head/etc/periodic/daily/Makefile
==
--- head/etc/periodic/daily/MakefileThu Jun 17 12:05:47 2010
(r209249)
+++ head/etc/periodic/daily/MakefileThu Jun 17 12:25:47 2010
(r209250)
@@ -8,7 +8,6 @@ FILES= 100.clean-disks \
200.backup-passwd \
330.news \
400.status-disks \
- 404.status-zfs \
405.status-ata-raid \
406.status-gmirror \
407.status-graid3 \
@@ -53,4 +52,9 @@ FILES+= 150.clean-hoststat \
500.queuerun
.endif
+.if ${MK_ZFS} != "no"
+FILES+=404.status-zfs \
+ 800.scrub-zfs
+.endif
+
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r209253 - head/tools/build/mk
Author: netchild Date: Thu Jun 17 12:37:50 2010 New Revision: 209253 URL: http://svn.freebsd.org/changeset/base/209253 Log: Add the ZFS periodic daily scripts to the ZFS part. Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Thu Jun 17 12:35:17 2010(r209252) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Thu Jun 17 12:37:50 2010(r209253) @@ -596,6 +596,8 @@ OLD_FILES+=usr/share/man/man1/dtrace.1.g OLD_FILES+=boot/gptzfsboot OLD_FILES+=boot/zfsboot OLD_FILES+=boot/zfsloader +OLD_FILES+=etc/periodic/daily/404.status-zfs +OLD_FILES+=etc/periodic/daily/800.scrub-zfs OLD_LIBS+=lib/libzfs.so.2 OLD_LIBS+=lib/libzpool.so.2 OLD_FILES+=rescue/zfs ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r228124 - in head: share/mk sys/conf
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 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
svn commit: r230500 - head/tools/kerneldoc/subsys
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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r230509 - head/tools/kerneldoc/subsys
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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r222272 - in head/sys: netinet netinet6
Quoting "Bjoern A. Zeeb" (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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r223173 - head/usr.bin/kdump
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 (initial author) Requested by: Otto Moerbeek 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" . 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r223989 - head/sys/dev/usb/input
On Fri, 22 Jul 2011 13:46:28 +0300 Andriy Gapon 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r211800 - head/etc/periodic/daily
Author: netchild
Date: Wed Aug 25 08:09:42 2010
New Revision: 211800
URL: http://svn.freebsd.org/changeset/base/211800
Log:
- Change the threshold from 'running next scrub the th day after the
last one' to 'running next scrub the th day after the last one'.
- Improve wording.
Requested by: jhell
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 Aug 25 07:33:35 2010
(r211799)
+++ head/etc/periodic/daily/800.scrub-zfs Wed Aug 25 08:09:42 2010
(r211800)
@@ -53,7 +53,7 @@ case "$daily_scrub_zfs_enable" in
# Now minus last scrub (both in seconds) converted to days.
_scrub_diff=$(expr -e \( $(date +%s) - \
$(date -j -f %F.%T ${_last_scrub} +%s) \) / 60 / 60 / 24)
- if [ ${_scrub_diff} -le ${_pool_threshold} ]; then
+ if [ ${_scrub_diff} -lt ${_pool_threshold} ]; then
echo " skipping scrubbing of pool '${pool}':"
echo " last scrubbing is ${_scrub_diff} days ago,
threshold is set to ${_pool_threshold} days"
continue
@@ -65,11 +65,11 @@ case "$daily_scrub_zfs_enable" in
echo " scrubbing of pool '${pool}' already in
progress, skipping:"
;;
*"none requested"*)
- echo " starting first scrubbing (after
reboot) of pool '${pool}':"
+ echo " starting first scrub (since reboot) of
pool '${pool}':"
zpool scrub ${pool}
;;
*)
- echo " starting scrubbing of pool '${pool}':"
+ echo " starting scrub of pool '${pool}':"
zpool scrub ${pool}
;;
esac
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r212964 - head/sys/kern
Quoting John Baldwin (from Mon, 27 Sep 2010 09:28:47 -0400):
savecore already has support for a 'minfree' file to prevent
crashdumps filling the crashdir. Maybe the default install should
include a minfree set to (say) 512MB.
The one problem this approach is it implements a FIFO instead of a LIFO. I
want the N most recent crashdumps to be saved, not the first N.
Check the size in the shell script before, remove older ones ("ls -1t
| grep pattern | tail +" gives you possible candidates).
Bye,
Alexander.
--
Applause, n.:
The echo of a platitude from the mouth of a fool.
-- Ambrose Bierce, "The Devil's Dictionary"
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r213471 - head/sys/compat/linux
Author: netchild Date: Wed Oct 6 07:34:41 2010 New Revision: 213471 URL: http://svn.freebsd.org/changeset/base/213471 Log: Fix a comparision of an uninitialised pointer. Submitted by: arundel Found by: clang analysis (automatic service by uqs@) Reviewed by: rdivacky Modified: head/sys/compat/linux/linux_futex.c Modified: head/sys/compat/linux/linux_futex.c == --- head/sys/compat/linux/linux_futex.c Wed Oct 6 07:22:56 2010 (r213470) +++ head/sys/compat/linux/linux_futex.c Wed Oct 6 07:34:41 2010 (r213471) @@ -431,7 +431,7 @@ linux_sys_futex(struct thread *td, struc int op_ret, val, ret, nrwake; struct linux_emuldata *em; struct waiting_proc *wp; - struct futex *f, *f2; + struct futex *f, *f2 = NULL; int error = 0; /* ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r213472 - head/tools/build/mk
Author: netchild
Date: Wed Oct 6 07:49:28 2010
New Revision: 213472
URL: http://svn.freebsd.org/changeset/base/213472
Log:
Add some missing files to optionally delete.
Submitted by: Paul B Mahol
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Oct 6 07:34:41
2010(r213471)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Oct 6 07:49:28
2010(r213472)
@@ -141,6 +141,7 @@ OLD_FILES+=usr/share/man/man8/authpf.8.g
.endif
.if ${MK_BIND} == no
+OLD_FILES+=etc/periodic/daily/470.status-named
OLD_FILES+=usr/bin/dig
OLD_FILES+=usr/bin/host
OLD_FILES+=usr/bin/nslookup
@@ -943,6 +944,7 @@ OLD_FILES+=rescue/ping6
#.endif
.if ${MK_IPFILTER} == no
+OLD_FILES+=etc/periodic/security/510.ipfdenied
OLD_FILES+=rescue/ipf
OLD_FILES+=sbin/ipf
OLD_FILES+=sbin/ipfs
@@ -1517,6 +1519,20 @@ OLD_FILES+=usr/share/man/man8/verify_krb
# to be filled in
#.endif
+.if ${MK_LOCATE} == no
+OLD_FILES+=etc/locate.rc
+OLD_FILES+=etc/periodic/weekly/310.locate
+OLD_FILES+=usr/bin/locate
+OLD_FILES+=usr/libexec/locate.bigram
+OLD_FILES+=usr/libexec/locate.code
+OLD_FILES+=usr/libexec/locate.concatdb
+OLD_FILES+=usr/libexec/locate.mklocatedb
+OLD_FILES+=usr/libexec/locate.updatedb
+OLD_FILES+=usr/share/man/man1/locate.1.gz
+OLD_FILES+=usr/share/man/man8/locate.updatedb.8.gz
+OLD_FILES+=usr/share/man/man8/updatedb.8.gz
+.endif
+
.if ${MK_LPR} == no
OLD_FILES+=etc/hosts.lpd
OLD_FILES+=etc/printcap
@@ -1549,6 +1565,7 @@ OLD_FILES+=usr/share/man/man8/pac.8.gz
.endif
.if ${MK_MAIL} == no
+OLD_FILES+=etc/periodic/daily/130.clean-msgs
OLD_FILES+=usr/bin/Mail
OLD_FILES+=usr/bin/biff
OLD_FILES+=usr/bin/from
@@ -1772,7 +1789,12 @@ OLD_FILES+=usr/share/man/man8/tftp-proxy
.endif
.if ${MK_PKGTOOLS} == no
+OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
OLD_FILES+=etc/periodic/weekly/400.status-pkg
+OLD_FILES+=usr/include/pkg.h
+OLD_FILES+=usr/lib/libpkg.a
+OLD_FILES+=usr/lib/libpkg.so
+OLD_LIBS+=usr/lib/libpkg.so.0
OLD_FILES+=usr/sbin/pkg_add
OLD_FILES+=usr/sbin/pkg_create
OLD_FILES+=usr/sbin/pkg_delete
@@ -1976,6 +1998,11 @@ OLD_FILES+=usr/share/man/man8/rtquery.8.
.endif
.if ${MK_SENDMAIL} == no
+OLD_FILES+=etc/periodic/daily/150.clean-hoststat
+OLD_FILES+=etc/periodic/daily/210.backup-aliases
+OLD_FILES+=etc/periodic/daily/440.status-mailq
+OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
+OLD_FILES+=etc/periodic/daily/500.queuerun
OLD_FILES+=bin/rmail
OLD_FILES+=usr/bin/vacation
OLD_FILES+=usr/include/libmilter/mfapi.h
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r213479 - head/usr.bin/kdump
Author: netchild Date: Wed Oct 6 12:41:42 2010 New Revision: 213479 URL: http://svn.freebsd.org/changeset/base/213479 Log: Fix regex for some socket- and acl-related syscall values. Submitted by: Mikhail PR: 149295 MFC-after:2 weeks Modified: head/usr.bin/kdump/mksubr Modified: head/usr.bin/kdump/mksubr == --- head/usr.bin/kdump/mksubr Wed Oct 6 10:00:37 2010(r213478) +++ head/usr.bin/kdump/mksubr Wed Oct 6 12:41:42 2010(r213479) @@ -324,7 +324,7 @@ auto_or_type "nfssvcname" "NFSSVC_[A-Z]+ auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h" auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+" "sys/resource.h" -auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/socket.h" +auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h" auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h" auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h" auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" @@ -333,7 +333,7 @@ auto_switch_type "kldunloadfflagsname" " auto_switch_type "extattrctlname" "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h" auto_switch_type "kldsymcmdname" "KLDSYM_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h" auto_switch_type "sendfileflagsname" "SF_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h" -auto_switch_type "acltypename" "ACL_TYPE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/acl.h" +auto_switch_type "acltypename" "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+" "sys/acl.h" auto_switch_type "sigprocmaskhowname" "SIG_[A-Z]+[[:space:]]+[0-9]+" "sys/signal.h" auto_switch_type "lio_listioname" "LIO_(NO)?WAIT[[:space:]]+[0-9]+" "aio.h" auto_switch_type "minheritname" "INHERIT_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h" ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r213472 - head/tools/build/mk
Quoting Doug Barton (from Wed, 06 Oct 2010
11:15:00 -0700):
On 10/6/2010 12:49 AM, Alexander Leidinger wrote:
Author: netchild
Date: Wed Oct 6 07:49:28 2010
New Revision: 213472
URL: http://svn.freebsd.org/changeset/base/213472
Log:
Add some missing files to optionally delete.
Submitted by: Paul B Mahol
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Oct 6
07:34:41 2010 (r213471)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Oct 6
07:49:28 2010 (r213472)
@@ -141,6 +141,7 @@ OLD_FILES+=usr/share/man/man8/authpf.8.g
.endif
.if ${MK_BIND} == no
+OLD_FILES+=etc/periodic/daily/470.status-named
Traditionally we haven't deleted these. In the case of named-related
files I would prefer that we did not because:
1. That check is off by default
2. If the user is not running named it won't do any harm
3. The default for installing named from the ports is to continue to
use the infrastructure in the base (such as this script, and
/etc/rc.d/named).
I'm not sure what the right answer for all the periodic scripts is,
but for this one I would like it not to be included in the obsolete
files.
Please confirm that this file is installed during installworld when
MK_BIND is equal to "no" (as I read it, it is not installed).
I agree that it makes sense to keep this file (and at least one which
is covered by the sendmail knob), but the design of "delete-old" is to
remove everything which is not installed anymore (= the file has to be
deleted if MK_BIND is equal to "no").
If the script is installed during installworld (= I haven't read the
Makefile correctly), the script is not allowed to be deleted (and the
above piece of the patch is wrong = pointyhat to me). If the script is
not installed during installworld, the above patch is 100% correct and
the delete-old is working as designed.
If you do not want to have it deleted by delete-old, do not exclude it
during installworld (you have my vote for this) and remove its entry
from OptionalObsoleteFiles.inc.
Bye,
Alexander.
--
http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
Postmen never die, they just lose their zip.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r213585 - head/tools/build/mk
On Fri, 8 Oct 2010 17:42:10 + (UTC) Mark Murray wrote: > Author: markm > Date: Fri Oct 8 17:42:09 2010 > New Revision: 213585 > URL: http://svn.freebsd.org/changeset/base/213585 > > Log: > Don't blow away /bin/rmail symlink if we are keeping mailwrapper. > Mailwrapper can provide a perfectly good rmail with other > mailers. Can you please point out where rmail is installed when MK_SENDMAIL=no and MK_MAILWRAPPER!=no? I can not find such a place. If not: your commit is wrong, it either 1) misses to add this functionality to build-/installworld or 2) needs to be reverted if you do not want to do 2), as the goal for delete-old is to remove files which are not not installed by installworld now, but where installed by installworld before. Bye, Alexander. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r213585 - head/tools/build/mk
Quoting Mark Murray (from Sun, 10 Oct 2010 11:20:23 +0100): Alexander Leidinger writes: Can you please point out where rmail is installed when MK_SENDMAIL=no and MK_MAILWRAPPER!=no? I can not find such a place. src/usr.sbin/mailwrapper/Makefile What am I doing wrong? ---snip--- % grep rmail /usr/src/usr.sbin/mailwrapper % cd /usr/src/usr.sbin/mailwrapper % svnversion 213680 ---snip--- Bye, Alexander. M -- Mark R V Murray Cert APS(Open) Dip Phys(Open) BSc Open(Open) BSc(Hons)(Open) Pi: 132511160 -- Whenever people agree with me I always feel I must be wrong. -- Oscar Wilde http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r213585 - head/tools/build/mk
Quoting Alexander Leidinger (from Mon, 11 Oct 2010 10:28:01 +0200): Quoting Mark Murray (from Sun, 10 Oct 2010 11:20:23 +0100): Alexander Leidinger writes: Can you please point out where rmail is installed when MK_SENDMAIL=no and MK_MAILWRAPPER!=no? I can not find such a place. src/usr.sbin/mailwrapper/Makefile What am I doing wrong? I did not do a correct copy&paste... put the result is the same. ---snip--- % grep rmail /usr/src/usr.sbin/mailwrapper % grep rmail /usr/src/usr.sbin/mailwrapper/Makefile Bye, Alexander. % cd /usr/src/usr.sbin/mailwrapper % svnversion 213680 ---snip--- Bye, Alexander. M -- Mark R V Murray Cert APS(Open) Dip Phys(Open) BSc Open(Open) BSc(Hons)(Open) Pi: 132511160 -- Whenever people agree with me I always feel I must be wrong. -- Oscar Wilde http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 -- How's the wife? Is she at home enjoying capitalism? http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r214431 - head/bin/rm
Quoting Garrett Cooper (from Thu, 28 Oct 2010 14:11:14 -0700): Unfortunately it's implied superficially by the 3 pass tort; but as most people who understand magnetic disks know, unless you completely obliterate a disk, wipe over it with random data enough times, whatever, the content is still on the disk and retrievable via various methods... Can you please elaborate? I've read somewhere that someone (some kind of computer magazine) made a test of this (yes, to much somewhere and someone, sorry). They took a full harddisk with random data (random as in pictures, music, ...) and overwrote it once with zeros and gave it to one (or several) data rescue companies. The result was that for a price which makes still sense to pay for a business (like a bank), only a fraction of data (as in non-zero bytes) was recoverable, and that none of the original files, and no useful sequence of data, was recovered. For myself I kept the info that I've did not read it at an untrusty place and that for any normal person (even with some malicious intent to remove traces of the existence of something) overwritting a harddisk one time completely is enough. Bye, Alexander. -- Christ died for our sins, so let's not disappoint Him. http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r215338 - head/sys/compat/linux
Author: netchild
Date: Mon Nov 15 13:03:35 2010
New Revision: 215338
URL: http://svn.freebsd.org/changeset/base/215338
Log:
- print out the PID and program name of the program trying to use an
unsupported futex operation
- for those futex operations which are known to be not supported,
print out which futex operation it is
- shortcut the error return of the unsupported FUTEX_CLOCK_REALTIME in
some cases:
FUTEX_CLOCK_REALTIME can be used to tell linux to use
CLOCK_REALTIME instead of CLOCK_MONOTONIC. FUTEX_CLOCK_REALTIME
however must only be set, if either FUTEX_WAIT_BITSET or
FUTEX_WAIT_REQUEUE_PI are set too. If that's not the case
we can die with ENOSYS right at the beginning.
Submitted by: arundel
Reviewed by: rdivacky (earlier iteration of the patch)
MFC after:1 week
Modified:
head/sys/compat/linux/linux_futex.c
head/sys/compat/linux/linux_futex.h
Modified: head/sys/compat/linux/linux_futex.c
==
--- head/sys/compat/linux/linux_futex.c Mon Nov 15 09:41:46 2010
(r215337)
+++ head/sys/compat/linux/linux_futex.c Mon Nov 15 13:03:35 2010
(r215338)
@@ -416,7 +416,7 @@ futex_atomic_op(struct thread *td, int e
int
linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args)
{
- int op_ret, val, ret, nrwake;
+ int clockrt, nrwake, op_ret, ret, val;
struct linux_emuldata *em;
struct waiting_proc *wp;
struct futex *f, *f2 = NULL;
@@ -429,7 +429,19 @@ linux_sys_futex(struct thread *td, struc
* in most cases (ie. when futexes are not shared on file descriptor
* or between different processes.).
*/
- args->op = (args->op & ~LINUX_FUTEX_PRIVATE_FLAG);
+ args->op = args->op & ~LINUX_FUTEX_PRIVATE_FLAG;
+
+ /*
+* Currently support for switching between CLOCK_MONOTONIC and
+* CLOCK_REALTIME is not present. However Linux forbids the use of
+* FUTEX_CLOCK_REALTIME with any op except FUTEX_WAIT_BITSET and
+* FUTEX_WAIT_REQUEUE_PI.
+*/
+ clockrt = args->op & LINUX_FUTEX_CLOCK_REALTIME;
+ args->op = args->op & ~LINUX_FUTEX_CLOCK_REALTIME;
+ if (clockrt && args->op != LINUX_FUTEX_WAIT_BITSET &&
+ args->op != LINUX_FUTEX_WAIT_REQUEUE_PI)
+ return (ENOSYS);
switch (args->op) {
case LINUX_FUTEX_WAIT:
@@ -612,14 +624,23 @@ linux_sys_futex(struct thread *td, struc
case LINUX_FUTEX_LOCK_PI:
/* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op LINUX_FUTEX_LOCK_PI not implemented.\n");
return (ENOSYS);
case LINUX_FUTEX_UNLOCK_PI:
/* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op LINUX_FUTEX_UNLOCK_PI not implemented.\n");
return (ENOSYS);
case LINUX_FUTEX_TRYLOCK_PI:
/* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op LINUX_FUTEX_TRYLOCK_PI not implemented.\n");
return (ENOSYS);
case LINUX_FUTEX_REQUEUE:
@@ -632,15 +653,30 @@ linux_sys_futex(struct thread *td, struc
*/
em = em_find(td->td_proc, EMUL_DONTLOCK);
if (em->used_requeue == 0) {
- printf("linux(%s (%d)) sys_futex: "
- "unsupported futex_requeue op\n",
- td->td_proc->p_comm, td->td_proc->p_pid);
+ linux_msg(td,
+ "linux_sys_futex: "
+ "unsupported futex_requeue op\n");
em->used_requeue = 1;
}
return (EINVAL);
+ case LINUX_FUTEX_WAIT_BITSET:
+ /* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op FUTEX_WAIT_BITSET not implemented.\n");
+ return (ENOSYS);
+
+ case LINUX_FUTEX_WAIT_REQUEUE_PI:
+ /* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op FUTEX_WAIT_REQUEUE_PI not implemented.\n");
+ return (ENOSYS);
+
default:
- printf("linux_sys_futex: unknown op %d\n", args->op);
+ linux_msg(td,
+ "linux_sys_futex: unknown op %d\n", args->op);
return (ENOSYS);
}
Modified: head/sys/compat/linux/linux_futex.h
==
--- head/sys/compat/linux/linux_futex.h Mon Nov 15 09:41:46 2010
(r215337)
+++ head/sys/compat/linux/li
svn commit: r215339 - head/sys/compat/linux
Author: netchild
Date: Mon Nov 15 13:07:10 2010
New Revision: 215339
URL: http://svn.freebsd.org/changeset/base/215339
Log:
Some style(9) fixes.
Submitted by: arundel
MFC after:1 week
Modified:
head/sys/compat/linux/linux_futex.c
Modified: head/sys/compat/linux/linux_futex.c
==
--- head/sys/compat/linux/linux_futex.c Mon Nov 15 13:03:35 2010
(r215338)
+++ head/sys/compat/linux/linux_futex.c Mon Nov 15 13:07:10 2010
(r215339)
@@ -656,7 +656,7 @@ linux_sys_futex(struct thread *td, struc
linux_msg(td,
"linux_sys_futex: "
"unsupported futex_requeue op\n");
- em->used_requeue = 1;
+ em->used_requeue = 1;
}
return (EINVAL);
@@ -701,7 +701,7 @@ linux_set_robust_list(struct thread *td,
em->robust_futexes = args->head;
EMUL_UNLOCK(&emul_lock);
- return (0);
+ return (0);
}
int
@@ -719,7 +719,7 @@ linux_get_robust_list(struct thread *td,
if (!args->pid) {
em = em_find(td->td_proc, EMUL_DONTLOCK);
- head = em->robust_futexes;
+ head = em->robust_futexes;
} else {
struct proc *p;
@@ -729,14 +729,14 @@ linux_get_robust_list(struct thread *td,
em = em_find(p, EMUL_DONTLOCK);
/* XXX: ptrace? */
- if (priv_check(td, PRIV_CRED_SETUID) ||
+ if (priv_check(td, PRIV_CRED_SETUID) ||
priv_check(td, PRIV_CRED_SETEUID) ||
p_candebug(td, p)) {
PROC_UNLOCK(p);
return (EPERM);
}
head = em->robust_futexes;
-
+
PROC_UNLOCK(p);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r215664 - in head/sys: compat/linux kern
Author: netchild
Date: Mon Nov 22 09:06:59 2010
New Revision: 215664
URL: http://svn.freebsd.org/changeset/base/215664
Log:
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 , gk
Reviewed by: rdivacky (in april 2010)
MFC after:5 days
Modified:
head/sys/compat/linux/linux_emul.c
head/sys/compat/linux/linux_emul.h
head/sys/compat/linux/linux_misc.c
head/sys/kern/kern_exit.c
Modified: head/sys/compat/linux/linux_emul.c
==
--- head/sys/compat/linux/linux_emul.c Mon Nov 22 09:04:29 2010
(r215663)
+++ head/sys/compat/linux/linux_emul.c Mon Nov 22 09:06:59 2010
(r215664)
@@ -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,12 @@ linux_proc_exit(void *arg __unused, stru
} else
EMUL_SHARED_WUNLOCK(&emul_shared_lock);
+ if ((shared_flags & EMUL_SHARED_HASXSTAT) != 0) {
+ PROC_LOCK(p);
+ p->p_xstat = shared_xstat;
+ PROC_UNLOCK(p);
+ }
+
if (child_clear_tid != NULL) {
struct linux_sys_futex_args cup;
int null = 0;
@@ -257,6 +265,9 @@ 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 == &elf_linux_sysvec))
+ /* 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 +345,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: head/sys/compat/linux/linux_emul.h
==
--- head/sys/compat/linux/linux_emul.h Mon Nov 22 09:04:29 2010
(r215663)
+++ head/sys/compat/linux/linux_emul.h Mon Nov 22 09:06:59 2010
(r215664)
@@ -31,8 +31,12 @@
#ifndef _LINUX_EMUL_H_
#define_LINUX_EMUL_H_
+#define EMUL_SHARED_HASXSTAT 0x01
+
struct linux_emuldata_shared {
int refs;
+ int flags;
+ int xstat;
pid_t group_pid;
LIST_HEAD(, linux_emuldata) threads; /* head of list of linux threads */
@@ -76,6 +80,7 @@ int linux_proc_init(struct thread *, pid
void linux_proc_exit(void *, struct proc *);
void linux_schedtail(void *, struct proc *);
void linux_proc_exec(void *, struct proc *, struct image_params *);
+void linux_kill_threads(struct thread *, int);
extern struct sx emul_shared_lock;
extern struct mtx emul_lock;
Mo
svn commit: r215666 - head/sys/compat/linux
Author: netchild Date: Mon Nov 22 09:25:32 2010 New Revision: 215666 URL: http://svn.freebsd.org/changeset/base/215666 Log: Remove trailing dot from the unimplemented futex messages to make them consistent with the syscall and ipc messages. Submitted by: arundel MFC after:3 days Modified: head/sys/compat/linux/linux_futex.c Modified: head/sys/compat/linux/linux_futex.c == --- head/sys/compat/linux/linux_futex.c Mon Nov 22 09:13:25 2010 (r215665) +++ head/sys/compat/linux/linux_futex.c Mon Nov 22 09:25:32 2010 (r215666) @@ -626,21 +626,21 @@ linux_sys_futex(struct thread *td, struc /* not yet implemented */ linux_msg(td, "linux_sys_futex: " - "op LINUX_FUTEX_LOCK_PI not implemented.\n"); + "op LINUX_FUTEX_LOCK_PI not implemented\n"); return (ENOSYS); case LINUX_FUTEX_UNLOCK_PI: /* not yet implemented */ linux_msg(td, "linux_sys_futex: " - "op LINUX_FUTEX_UNLOCK_PI not implemented.\n"); + "op LINUX_FUTEX_UNLOCK_PI not implemented\n"); return (ENOSYS); case LINUX_FUTEX_TRYLOCK_PI: /* not yet implemented */ linux_msg(td, "linux_sys_futex: " - "op LINUX_FUTEX_TRYLOCK_PI not implemented.\n"); + "op LINUX_FUTEX_TRYLOCK_PI not implemented\n"); return (ENOSYS); case LINUX_FUTEX_REQUEUE: @@ -664,14 +664,14 @@ linux_sys_futex(struct thread *td, struc /* not yet implemented */ linux_msg(td, "linux_sys_futex: " - "op FUTEX_WAIT_BITSET not implemented.\n"); + "op FUTEX_WAIT_BITSET not implemented\n"); return (ENOSYS); case LINUX_FUTEX_WAIT_REQUEUE_PI: /* not yet implemented */ linux_msg(td, "linux_sys_futex: " - "op FUTEX_WAIT_REQUEUE_PI not implemented.\n"); + "op FUTEX_WAIT_REQUEUE_PI not implemented\n"); return (ENOSYS); default: ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r215669 - head
Author: netchild Date: Mon Nov 22 09:37:52 2010 New Revision: 215669 URL: http://svn.freebsd.org/changeset/base/215669 Log: 1) Add a hint to check for duplicates with optional files. The committed text is a little bit modified to what was submitted. The code example to automate a part of this was proposed by Dmitry Morozovsky. 2) Remove trailing whitespace. Submitted by: arundel Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Nov 22 09:34:38 2010(r215668) +++ head/ObsoleteFiles.inc Mon Nov 22 09:37:52 2010(r215669) @@ -13,6 +13,15 @@ # # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# Before you commit changes to this file please check if any entries in +# tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following +# command tells which files are listed more than once regardless of some +# architecture specific conditionals, so you can not blindly trust the +# output: +# ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \ +# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \ +# sort | uniq -d +# # 20101112: vgonel(9) has gone to private API a while ago OLD_FILES+=usr/share/man/man9/vgonel.9.gz @@ -1634,7 +1643,7 @@ OLD_DIRS+=usr/include/c++/3.4 OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed -OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth # 20070421: worm.4 removed OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r215664 - in head/sys: compat/linux kern
Quoting Kostik Belousov (from Mon, 22 Nov 2010
11:31:34 +0200):
On Mon, Nov 22, 2010 at 09:07:00AM +, Alexander Leidinger wrote:
Author: netchild
Date: Mon Nov 22 09:06:59 2010
New Revision: 215664
URL: http://svn.freebsd.org/changeset/base/215664
Log:
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.
@@ -196,6 +198,12 @@ linux_proc_exit(void *arg __unused, stru
} else
EMUL_SHARED_WUNLOCK(&emul_shared_lock);
+ if ((shared_flags & EMUL_SHARED_HASXSTAT) != 0) {
+ PROC_LOCK(p);
+ p->p_xstat = shared_xstat;
+ PROC_UNLOCK(p);
+ }
Why is process lock taken there ? 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.
Change below.
+
if (child_clear_tid != NULL) {
struct linux_sys_futex_args cup;
int null = 0;
@@ -257,6 +265,9 @@ 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 == &elf_linux_sysvec))
+ /* Kill threads regardless of imgp->sysent value */
+ linux_kill_threads(FIRST_THREAD_IN_PROC(p), SIGKILL);
This is better expressed by
if ((p->p_sysent->sv_flags & SV_ABI_MASK) == SV_ABI_LINUX)
Is this OK for you?
---snip---
Index: compat/linux/linux_emul.c
===
--- compat/linux/linux_emul.c (Revision 215664)
+++ compat/linux/linux_emul.c (Arbeitskopie)
@@ -198,11 +198,8 @@
} else
EMUL_SHARED_WUNLOCK(&emul_shared_lock);
- if ((shared_flags & EMUL_SHARED_HASXSTAT) != 0) {
- PROC_LOCK(p);
+ if ((shared_flags & EMUL_SHARED_HASXSTAT) != 0)
p->p_xstat = shared_xstat;
- PROC_UNLOCK(p);
- }
if (child_clear_tid != NULL) {
struct linux_sys_futex_args cup;
@@ -265,7 +262,8 @@
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 == &elf_linux_sysvec))
+ 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
---snip---
Regardless of this mostly cosmetic issue, this is racy. Other
linux thread in the same process might do an execve(3).
More, if execve(3) call fails, then you return into the process
that lacks all threads except the one that called execve(3).
How critical is this in your opinion (relative to the issue this patch
is fixing)? Do you prefer a backout or do you think the probability
that the someone wins the race is low enough?
Do you see a solution for the race?
Bye,
Alexander.
--
http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
This generation doesn't have emotional baggage.
We have emotional moving vans.
-- Bruce Feirstein
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r215675 - head/sys/compat/linux
Author: netchild
Date: Mon Nov 22 12:42:32 2010
New Revision: 215675
URL: http://svn.freebsd.org/changeset/base/215675
Log:
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
X-MFC:together with r215664
Modified:
head/sys/compat/linux/linux_emul.c
Modified: head/sys/compat/linux/linux_emul.c
==
--- head/sys/compat/linux/linux_emul.c Mon Nov 22 12:33:48 2010
(r215674)
+++ head/sys/compat/linux/linux_emul.c Mon Nov 22 12:42:32 2010
(r215675)
@@ -198,11 +198,8 @@ linux_proc_exit(void *arg __unused, stru
} else
EMUL_SHARED_WUNLOCK(&emul_shared_lock);
- if ((shared_flags & EMUL_SHARED_HASXSTAT) != 0) {
- PROC_LOCK(p);
+ if ((shared_flags & EMUL_SHARED_HASXSTAT) != 0)
p->p_xstat = shared_xstat;
- PROC_UNLOCK(p);
- }
if (child_clear_tid != NULL) {
struct linux_sys_futex_args cup;
@@ -265,7 +262,8 @@ 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 == &elf_linux_sysvec))
+ 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
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r215706 - head/sys/compat/linux
Quoting Dimitry Andric (from Mon, 22 Nov 2010 20:23:18 + (UTC)): Author: dim Date: Mon Nov 22 20:23:18 2010 New Revision: 215706 URL: http://svn.freebsd.org/changeset/base/215706 Log: Fix linux kernel module breakage introduced in r215675, by including . Thanks! Noticed by: many Pointy hat to:netchild Modified: head/sys/compat/linux/linux_emul.c Bye, Alexander. -- "I keep seeing spots in front of my eyes." "Did you ever see a doctor?" "No, just spots." http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r216119 - head
Quoting Ulrich Spoerlein (from Thu, 2 Dec 2010 10:46:05 + (UTC)): Author: uqs Date: Thu Dec 2 10:46:05 2010 New Revision: 216119 URL: http://svn.freebsd.org/changeset/base/216119 Log: Remove more duplicates. Just so that I can lookup the command for the next time: Can you please add it to OldFiles.inc instead, with a comment what it does? for t in `make -V TARGETS universe`; do __MAKE_CONF=/dev/null make -f Makefile.inc1 -m $PWD/share/mk TARGET=$t \ -V OLD_FILES -V OLD_LIBS -V OLD_DIRS delete-old | \ xargs -n1|sort|uniq -c|egrep -v "^ *1 "; done While it does not matter for "-V OLD*", the spirit of the command is more like the check-old target (which is including shared libs) than the delete-old target (which does not delete shared libs but only static libs). Using check-old would also remove the (wrong, but not far fetched) fear of actually deleting something with this command. Bye, Alexander. -- Each kiss is as the first. -- Miramanee, Kirk's wife, "The Paradise Syndrome", stardate 4842.6 http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r216119 - head
Quoting Ulrich Spoerlein (from Thu, 2 Dec 2010 21:43:49 +0100): On Thu, 02.12.2010 at 15:45:22 +0100, Alexander Leidinger wrote: Quoting Ulrich Spoerlein (from Thu, 2 Dec 2010 10:46:05 + (UTC)): > Author: uqs > Date: Thu Dec 2 10:46:05 2010 > New Revision: 216119 > URL: http://svn.freebsd.org/changeset/base/216119 > > Log: > Remove more duplicates. > > Just so that I can lookup the command for the next time: Can you please add it to OldFiles.inc instead, with a comment what it does? > for t in `make -V TARGETS universe`; do > __MAKE_CONF=/dev/null make -f Makefile.inc1 -m $PWD/share/mk TARGET=$t \ > -V OLD_FILES -V OLD_LIBS -V OLD_DIRS delete-old | \ > xargs -n1|sort|uniq -c|egrep -v "^ *1 "; > done While it does not matter for "-V OLD*", the spirit of the command is more like the check-old target (which is including shared libs) than the delete-old target (which does not delete shared libs but only static libs). Using check-old would also remove the (wrong, but not far fetched) fear of actually deleting something with this command. Something that bugs me more, is all the TARGET_ARCH conditionals in that file, that serve practically no purpose. If a file only existed on i386, and it has been removed on i386, there's no point in wrapping this under TARGET_ARCH=i386. The wrapping of all lib32 files for amd64 is a great example :/ My initial conditionals where only for things which where available everywhere, but got removed only on some platforms. Examples are the change in the threading libs, which where changed on most arches except for one or two, and the disk labeling things (IIRC the MBR stuff was removed from non-x86ish platforms). If this changed, it is a bug when you still have the initial design in mind. The wrapping is only ever required, if some file has been removed from a set of arches, but must be retained on others. Correct. Anyway, please see attached. Does not look bad... Bye, Alexander. -- If at first you don't succeed, try, try again. Then quit. No use being a damn fool about it. -- W. C. Fields [Also attributed to Roy Mengot. Ed.] http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r216483 - head
On Thu, 16 Dec 2010 14:22:30 + (UTC) "Bjoern A. Zeeb" wrote: [descsription of the original ordering] > I think grouping by date and then by file/lib/dir is actually better > as it'll keep things logically together rather than possibly splitting > it over 3 sections? As the person who did the initial ordering: whatever makes sense. Way back when I did it, the original ordering made some things more easy. Now that the lists grown very big, everyone is welcome to change it to something which makes sense today. BTW: Should or should we not remove old entries which are way beyond what we support, e.g. files from 2nd previous branches? The idea behind is, that this prevents to have an abnormal big list of old stuff, and that an update from e.g. 6 to 8 is not supported, so people need to go from 6 to 7, can delete old stuff, update to 8 and delete again old stuff. I am aware that people would have to rebuild all ports on 7 and on 8 again, if they want to update libs. I am not sure if this matters. If it matters, what about removing stuff which is from a 3rd previous branch, e.g. if we delete on 8 it will remove outdated files from 7 and 6, but not from 5? Bye, Alexander. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r216591 - head
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: [3] mergemaster -p [5] make installworld - make delete-old mergemaster -i [4] + make delete-old [6] @@ -1174,8 +1174,8 @@ COMMON ITEMS: [3] mergemaster -p [5] make installworld - make delete-old mergemaster -i [4] + make delete-old [6] 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r216591 - head
On Mon, 20 Dec 2010 19:42:51 -0500 Ben Kaduk wrote: > On Mon, Dec 20, 2010 at 10:17 AM, Alexander Leidinger > 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: > > [3] > > mergemaster -p [5] > > make installworld > > - make delete-old > > mergemaster -i [4] > > + make delete-old [6] > > > > 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218485 - in head/sys/ufs: ffs ufs
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
+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
static vop_accessx_t ufs_accessx;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218497 - head/sys/compat/linux
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
Submitted by: Andre Albsmeier
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
#include
+#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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218513 - head/sys/ufs/ufs
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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r336313 - in head/sys: dev/bnxt dev/e1000 dev/ixgbe dev/ixl net sys
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
svn commit: r337620 - head/share/man/man4
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r337621 - in head/share/man: man5 man7
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r337630 - head/sbin/restore
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-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r337638 - head/usr.bin/at
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r337658 - head/cddl/contrib/opensolaris/cmd/zfs
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r337863 - in head: sys/sys usr.sbin/jail
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 */
IP_EXEC_STA
Re: svn commit: r338507 - in head/sys: sys vm
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r338571 - in head/sys: netinet netinet6
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r323516 - in head/sys: dev/bnxt dev/e1000 kern net sys
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 pgpmPAwC0gZTI.pgp Description: Digitale PGP-Signatur
Re: svn commit: r340181 - in head/sys: amd64/linux32 compat/linux
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(&futex_list);
> mtx_init(&futex_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(&futex_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, &linux_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(, lin
svn commit: r343478 - head/tools/kerneldoc/subsys
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 cha
svn commit: r344796 - head/tools/kerneldoc/subsys
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-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r261266 - in head: sys/dev/drm sys/kern sys/sys usr.sbin/jail
On Wed, 29 Jan 2014 06:49:01 -0700 James Gritton 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r261266 - in head: sys/dev/drm sys/kern sys/sys usr.sbin/jail
On Fri, 31 Jan 2014 12:34:48 + (GMT) Robert Watson 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r261266 - in head: sys/dev/drm sys/kern sys/sys usr.sbin/jail
On Wed, 05 Feb 2014 14:05:29 -0500 John Baldwin 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r261266 - in head: sys/dev/drm sys/kern sys/sys usr.sbin/jail
Quoting Adrian Chadd (from Mon, 10 Feb 2014 17:24:09 -0800): On 10 February 2014 17:07, James Gritton 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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274329 - head
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-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298129 - head/tools/kerneldoc/subsys
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-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
